新建原始数据流水Controller。

registration-center/src/main/java/com/huimv/center/controller/BizDeviceAnswerFlowController.java

@@ -84,5 +84,10 @@ public class BizDeviceAnswerFlowController {
         return bizDeviceAnswerFlowService.removeDeviceAnswer(farmCode,chipId,deviceCode,startDate,endDate);
     }
 
+    @PostMapping("/removeById")
+    public Result removeById(@RequestParam String ids){
+        return bizDeviceAnswerFlowService.removeDeviceAnswer(ids);
+    }
+
 }
 

registration-center/src/main/java/com/huimv/center/controller/BizDeviceRegisterController.java

@@ -76,6 +76,10 @@ public class BizDeviceRegisterController {
         if (paramsMap.get("deviceCode") != null) {
             deviceCode = paramsMap.get("deviceCode").toString();
         }
+        String farmName = "";
+        if (paramsMap.get("farmName") != null) {
+            farmName = paramsMap.get("farmName").toString();
+        }
         String farmCode = "";
         if (paramsMap.get("farmCode") != null) {
             farmCode = paramsMap.get("farmCode").toString();
@@ -88,7 +92,7 @@ public class BizDeviceRegisterController {
         if (paramsMap.get("endDate") != null) {
             endDate = paramsMap.get("endDate").toString();
         }
-        return bizDeviceRegisterService.listAll(Integer.parseInt(pageNo), Integer.parseInt(pageSize), farmCode, chipId, deviceCode,startDate, endDate);
+        return bizDeviceRegisterService.listAll(Integer.parseInt(pageNo), Integer.parseInt(pageSize), farmName,farmCode, chipId, deviceCode,startDate, endDate);
     }
 }
 

registration-center/src/main/java/com/huimv/center/controller/BizDeviceRegisteredFlowController.java

@@ -3,6 +3,7 @@ package com.huimv.center.controller;
 
 import com.huimv.center.service.BizDeviceRegisteredFlowService;
 import com.huimv.eartag2.common.utils.Result;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,7 +16,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zn
@@ -28,7 +29,7 @@ public class BizDeviceRegisteredFlowController {
     private BizDeviceRegisteredFlowService bizDeviceRegisteredFlowService;
 
     @PostMapping("/list")
-    public Result list(@RequestParam Map<String, Object> paramsMap){
+    public Result list(@RequestParam Map<String, Object> paramsMap) {
         String pageNo = paramsMap.get("pageNo").toString();
         if (pageNo == null) {
             pageNo = "1";
@@ -57,32 +58,55 @@ public class BizDeviceRegisteredFlowController {
         if (paramsMap.get("endDate") != null) {
             endDate = paramsMap.get("endDate").toString();
         }
-        return bizDeviceRegisteredFlowService.listDeviceRegisteredFlow(Integer.parseInt(pageNo), Integer.parseInt(pageSize), farmCode, chipId, deviceCode,startDate, endDate);
+        return bizDeviceRegisteredFlowService.listDeviceRegisteredFlow(Integer.parseInt(pageNo), Integer.parseInt(pageSize), farmCode, chipId, deviceCode, startDate, endDate);
     }
 
     @PostMapping("/remove")
-    public Result remove(@RequestParam Map<String, Object> paramsMap){
+    public Result remove(@RequestParam Map<String, Object> paramsMap) {
+        boolean deleteStatus = false;
         String farmCode = "";
         if (paramsMap.get("farmCode") != null) {
             farmCode = paramsMap.get("farmCode").toString();
+            deleteStatus = true;
         }
         String chipId = "";
         if (paramsMap.get("chipId") != null) {
             chipId = paramsMap.get("chipId").toString();
+            deleteStatus = true;
         }
         String deviceCode = "";
         if (paramsMap.get("deviceCode") != null) {
             deviceCode = paramsMap.get("deviceCode").toString();
+            deleteStatus = true;
         }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
             startDate = paramsMap.get("startDate").toString();
+            deleteStatus = true;
         }
         String endDate = "";
         if (paramsMap.get("endDate") != null) {
             endDate = paramsMap.get("endDate").toString();
+            deleteStatus = true;
         }
-        return bizDeviceRegisteredFlowService.removeDeviceRegisteredFlow(farmCode,chipId,deviceCode,startDate,endDate);
+        String ids = "";
+        if (paramsMap.get("ids") != null) {
+            ids = paramsMap.get("ids").toString();
+            deleteStatus = true;
+        }
+        if (!deleteStatus) {
+            return new Result(10001, "删除条件都为空.", false);
+        }
+        if (StringUtils.isNotBlank(ids)) {
+            return bizDeviceRegisteredFlowService.removeDeviceRegisteredFlow(ids);
+        } else {
+            return bizDeviceRegisteredFlowService.removeDeviceRegisteredFlow(farmCode, chipId, deviceCode, startDate, endDate);
+        }
+    }
+
+    @PostMapping("/removeById")
+    public Result removeById(@RequestParam String ids) {
+        return bizDeviceRegisteredFlowService.removeDeviceRegisteredFlow(ids);
     }
 }
 

registration-center/src/main/java/com/huimv/center/controller/BizDeviceUnregisteredController.java

@@ -26,11 +26,6 @@ public class BizDeviceUnregisteredController {
     @Autowired
     private BizDeviceUnregisteredService bizDeviceUnregisteredService;
 
-    @PostMapping("/remove")
-    public Result remove(@RequestParam String ids){
-        return bizDeviceUnregisteredService.remove(ids);
-    }
-
     @PostMapping("/list")
     public Result list(@RequestParam Map<String, Object> paramsMap){
         String pageNo = paramsMap.get("pageNo").toString();
@@ -45,10 +40,6 @@ public class BizDeviceUnregisteredController {
         if (paramsMap.get("chipId") != null) {
             chipId = paramsMap.get("chipId").toString();
         }
-        String farmCode = "";
-        if (paramsMap.get("farmCode") != null) {
-            farmCode = paramsMap.get("farmCode").toString();
-        }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
             startDate = paramsMap.get("startDate").toString();
@@ -57,7 +48,12 @@ public class BizDeviceUnregisteredController {
         if (paramsMap.get("endDate") != null) {
             endDate = paramsMap.get("endDate").toString();
         }
-        return bizDeviceUnregisteredService.listDeviceUnregistered(Integer.parseInt(pageNo), Integer.parseInt(pageSize), farmCode, chipId, startDate, endDate);
+        return bizDeviceUnregisteredService.listDeviceUnregistered(Integer.parseInt(pageNo), Integer.parseInt(pageSize),  chipId, startDate, endDate);
+    }
+
+    @PostMapping("/remove")
+    public Result remove(@RequestParam String ids){
+        return bizDeviceUnregisteredService.remove(ids);
     }
 
 }

registration-center/src/main/java/com/huimv/center/controller/BizDeviceUnregisteredFlowController.java

@@ -47,6 +47,11 @@ public class BizDeviceUnregisteredFlowController {
         return bizDeviceUnregisteredFlowService.removeByChipIdAndLastTime(farmCode,chipId,startDate,endDate);
     }
 
+    @PostMapping("/removeById")
+    public Result removeById(@RequestParam String ids){
+        return bizDeviceUnregisteredFlowService.removeById(ids);
+    }
+
     @PostMapping("/listByFarmCode")
     public Result listByFarmCode(@RequestParam Map<String, Object> paramsMap){
         String pageNo = paramsMap.get("pageNo").toString();
@@ -61,10 +66,6 @@ public class BizDeviceUnregisteredFlowController {
         if (paramsMap.get("chipId") != null) {
             chipId = paramsMap.get("chipId").toString();
         }
-        String farmCode = "";
-        if (paramsMap.get("farmCode") != null) {
-            farmCode = paramsMap.get("farmCode").toString();
-        }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
             startDate = paramsMap.get("startDate").toString();
@@ -73,7 +74,7 @@ public class BizDeviceUnregisteredFlowController {
         if (paramsMap.get("endDate") != null) {
             endDate = paramsMap.get("endDate").toString();
         }
-        return bizDeviceUnregisteredFlowService.listByFarmCode(Integer.parseInt(pageNo), Integer.parseInt(pageSize), farmCode, chipId, startDate, endDate);
+        return bizDeviceUnregisteredFlowService.listByFarmCode(Integer.parseInt(pageNo), Integer.parseInt(pageSize), chipId, startDate, endDate);
     }
 
     @PostMapping("/listByChipId")
@@ -90,10 +91,6 @@ public class BizDeviceUnregisteredFlowController {
         if (paramsMap.get("chipId") != null) {
             chipId = paramsMap.get("chipId").toString();
         }
-        String farmCode = "";
-        if (paramsMap.get("farmCode") != null) {
-            farmCode = paramsMap.get("farmCode").toString();
-        }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
             startDate = paramsMap.get("startDate").toString();

registration-center/src/main/java/com/huimv/center/controller/BizRawDataController.java

@@ -1,10 +1,18 @@
 package com.huimv.center.controller;
 
 
+import com.huimv.center.service.BizDeviceUnregisteredService;
+import com.huimv.center.service.BizRawDataService;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -14,8 +22,40 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-06-23
  */
 @RestController
-@RequestMapping("/biz-raw-data")
+@RequestMapping("/bizRawData")
 public class BizRawDataController {
 
+    @Autowired
+    private BizRawDataService bizRawDataService;
+
+    @PostMapping("/list")
+    public Result list(@RequestParam Map<String, Object> paramsMap){
+        String pageNo = paramsMap.get("pageNo").toString();
+        if (pageNo == null) {
+            pageNo = "1";
+        }
+        String pageSize = paramsMap.get("pageSize").toString();
+        if (pageSize == null) {
+            pageSize = "10";
+        }
+        String chipId = "";
+        if (paramsMap.get("chipId") != null) {
+            chipId = paramsMap.get("chipId").toString();
+        }
+        String startDate = "";
+        if (paramsMap.get("startDate") != null) {
+            startDate = paramsMap.get("startDate").toString();
+        }
+        String endDate = "";
+        if (paramsMap.get("endDate") != null) {
+            endDate = paramsMap.get("endDate").toString();
+        }
+        return bizRawDataService.listRawData(Integer.parseInt(pageNo), Integer.parseInt(pageSize),  chipId, startDate, endDate);
+    }
+
+    @PostMapping("/remove")
+    public Result remove(@RequestParam String ids){
+        return bizRawDataService.remove(ids);
+    }
 }
 

registration-center/src/main/java/com/huimv/center/listener/DeviceListener.java

@@ -48,7 +48,7 @@ public class DeviceListener {
      * @Date        : 2022/6/22
      * @Time        : 20:11
      */
-//    @RabbitListener(queues = Const.QUEUE_DEVICE_REGISTERED)
+    @RabbitListener(queues = Const.QUEUE_DEVICE_REGISTERED)
     @RabbitHandler
     @Transactional
     public void processDeviceRegisteredFlow(Map askMap) throws ParseException {
@@ -56,10 +56,12 @@ public class DeviceListener {
         String chipId = askMap.get("chipId").toString();
         String deviceCode = askMap.get("deviceCode").toString();
         String clientIp = askMap.get("clientIp").toString();
+        String farmCode = askMap.get("farmCode").toString();
+        String farmName = askMap.get("farmName").toString();
         System.out.println("<<<<<<<<<<<<<<<<<<<<<<< 处理注册设备 1 <<<<<<<<<<<<<<<<<<<<<<<");
 
         // 添加已注册流水
-        deviceRegisteredFlowService.addRegisteredFlow(chipId,deviceCode,clientIp);
+        deviceRegisteredFlowService.addRegisteredFlow(chipId,deviceCode,clientIp,farmCode,farmName);
         // 更新已注册设备信息
         deviceRegisterService.updateDeviceRegisterTimes(chipId);
 
@@ -79,7 +81,7 @@ public class DeviceListener {
      * @Date        : 2022/6/22       
      * @Time        : 20:13
      */
-//    @RabbitListener(queues = Const.QUEUE_DEVICE_UNREGISTERED)
+    @RabbitListener(queues = Const.QUEUE_DEVICE_UNREGISTERED)
     @RabbitHandler
     @Transactional
     public void processDeviceUnregisteredFlow(Map askMap) throws ParseException {
@@ -103,25 +105,27 @@ public class DeviceListener {
      * @Date        : 2022/6/22
      * @Time        : 20:15
      */
-//    @RabbitListener(queues = Const.QUEUE_DEVICE_ANSWER)
+    @RabbitListener(queues = Const.QUEUE_DEVICE_ANSWER)
     @RabbitHandler
     @Transactional
     public void processDeviceAnswer(Map askMap) throws ParseException {
         System.out.println("<<<<<<<<<<<<<<< askMap>>"+askMap.toString());
         String askText = askMap.get("deviceAnswer").toString();
         String chipId = askMap.get("chipId").toString();
+        String farmCode = askMap.get("farmCode").toString();
+        String farmName = askMap.get("farmName").toString();
         String deviceCode = askMap.get("deviceCode").toString();
         System.out.println("<<<<<<<<<<<<<<<<<<<<<<< 处理应答 3 <<<<<<<<<<<<<<<<<<<<<<<");
 
         // 添加设备应答信息流水信息
-        deviceAnswerFlowService.addDeviceAnswer(chipId,deviceCode,askText);
+        deviceAnswerFlowService.addDeviceAnswer(chipId,deviceCode,askText,farmCode);
         // 计算应答次数
         deviceRegisterService.updateDeviceAnswerTimes(chipId);
         //+++++++++++++++++++++++++++++++++++++++++++++++++++++
 
     }
 
-//    @RabbitListener(queues = Const.QUEUE_ASK_CMD)
+    @RabbitListener(queues = Const.QUEUE_ASK_CMD)
     @RabbitHandler
     public void processAskCmd(Map askMap) throws ParseException {
         System.out.println("<<<<<<<<<<<<<<< askMap>>"+askMap.toString());

registration-center/src/main/java/com/huimv/center/producer/Producer.java

@@ -25,10 +25,12 @@ public class Producer {
     RabbitTemplate rabbitTemplate;  //使用RabbitTemplate,这提供了接收/发送等等方法
 
     //发送已注册消息
-    public String sendDeviceRegistered(String idCode, String deviceCode, String registerText, String clientIp) {
+    public String sendDeviceRegistered(String idCode, Map resultMap,String registerText, String clientIp) {
         Map map = new HashMap();
         map.put("chipId",idCode);
-        map.put("deviceCode",deviceCode);
+        map.put("deviceCode",resultMap.get("deviceCode").toString());
+        map.put("farmCode",resultMap.get("farmCode").toString());
+        map.put("farmName",resultMap.get("farmName").toString());
         map.put("deviceRegistered",registerText);
         map.put("clientIp",clientIp);
         rabbitTemplate.convertAndSend(Const.EXCHANGE_DEVICE_REGISTERED, Const.ROUTING_KEY_DEVICE_REGISTERED, map);
@@ -37,7 +39,7 @@ public class Producer {
     }
 
     //发送未注册消息
-    public String sendDeviceUnregistered(String idCode, String unregisterText) {
+    public String sendDeviceUnregistered(String idCode,String unregisterText) {
         Map map = new HashMap();
         map.put("deviceUnregistered",unregisterText);
         map.put("chipId",idCode);
@@ -47,10 +49,12 @@ public class Producer {
     }
 
     // 发送应答消息
-    public String sendDeviceAnswer(String idCode, String deviceCode, String answerText) {
+    public String sendDeviceAnswer(String idCode, Map resultMap,  String answerText) {
         Map map = new HashMap();
         map.put("chipId",idCode);
-        map.put("deviceCode",deviceCode);
+        map.put("deviceCode",resultMap.get("deviceCode").toString());
+        map.put("farmCode",resultMap.get("farmCode").toString());
+        map.put("farmName",resultMap.get("farmName").toString());
         map.put("deviceAnswer",answerText);
         rabbitTemplate.convertAndSend(Const.EXCHANGE_DEVICE_ANSWER, Const.ROUTING_KEY_DEVICE_ANSWER, map);
         System.out.println("--------------------------------------- 发送设备应答消息 >>"+answerText);

registration-center/src/main/java/com/huimv/center/server/RegisterServerHandler.java

@@ -136,16 +136,15 @@ public class RegisterServerHandler extends ChannelInboundHandlerAdapter {
                 Map resultMap = bizDeviceRegisterService.getServerAndIpByChipId(idCode);
                 System.out.println("获取服务器IP>>"+resultMap);
                 if(resultMap.size()>0){
-                    String deviceCode = resultMap.get("deviceCode").toString();
                     // 发送设备已注册消息
-                    producer.sendDeviceRegistered(idCode,deviceCode,askText,clientIp);
+                    producer.sendDeviceRegistered(idCode,resultMap,askText,clientIp);
                     String ip = resultMap.get("ip").toString();
                     String port = resultMap.get("port").toString();
                     String answer = "hm+0+0+"+ip+"+"+port+"+8+end";
                     log.info(">>命令0设备编码-应答数据>>" + answer);
                     ctx.writeAndFlush(Unpooled.copiedBuffer(answer.getBytes()));
                     // 发送设备应答消息
-                    producer.sendDeviceAnswer(idCode,deviceCode,answer);
+                    producer.sendDeviceAnswer(idCode,resultMap,answer);
                 }else{
                     // 发送设备未注册消息
                     producer.sendDeviceUnregistered(idCode,askText);

registration-center/src/main/java/com/huimv/center/service/BizDeviceAnswerFlowService.java

@@ -16,7 +16,7 @@ import java.text.ParseException;
  */
 public interface BizDeviceAnswerFlowService extends IService<BizDeviceAnswerFlow> {
 
-    Result addDeviceAnswer(String chipId, String deviceCode, String answer) throws ParseException;
+    Result addDeviceAnswer(String chipId, String deviceCode, String answer, String farmCode) throws ParseException;
 
     Result removeDeviceAnswer(String ids);
 

registration-center/src/main/java/com/huimv/center/service/BizDeviceRegisterService.java

@@ -23,7 +23,7 @@ public interface BizDeviceRegisterService extends IService<BizDeviceRegister> {
 
     Result remove(String ids);
 
-    Result listAll(Integer pageNo,Integer pageSize,String farmCode,String chipId,String deviceCode,String startDate,String endDate);
+    Result listAll(Integer pageNo, Integer pageSize, String farmName, String farmCode, String chipId, String deviceCode, String startDate, String endDate);
 
     Map getServerAndIpByChipId(String idCode);
 

registration-center/src/main/java/com/huimv/center/service/BizDeviceRegisteredFlowService.java

@@ -16,7 +16,7 @@ import java.text.ParseException;
  */
 public interface BizDeviceRegisteredFlowService extends IService<BizDeviceRegisteredFlow> {
 
-    Result addRegisteredFlow(String chipId, String deviceCode, String clientIp) throws ParseException;
+    Result addRegisteredFlow(String chipId, String deviceCode, String clientIp, String farmCode, String farmName) throws ParseException;
 
     Result removeDeviceRegisteredFlow(String ids);
 

registration-center/src/main/java/com/huimv/center/service/BizDeviceUnregisteredFlowService.java

@@ -22,7 +22,9 @@ public interface BizDeviceUnregisteredFlowService extends IService<BizDeviceUnre
 
     Result removeByChipIdAndLastTime(String farmCode,String chipId,String startDate,String endDate);
 
-    Result listByFarmCode(Integer parseInt, Integer parseInt1, String farmCode, String chipId, String startDate, String endDate);
+    Result listByFarmCode(Integer parseInt, Integer parseInt1, String chipId, String startDate, String endDate);
 
     Result listChipId(Integer parseInt, Integer parseInt1, String chipId, String startDate, String endDate);
+
+    Result removeById(String ids);
 }

registration-center/src/main/java/com/huimv/center/service/BizDeviceUnregisteredService.java

@@ -18,7 +18,7 @@ public interface BizDeviceUnregisteredService extends IService<BizDeviceUnregist
 
     Result updateDeviceRegisterTimes(String chipId) throws ParseException;
 
-    Result listDeviceUnregistered(Integer pageNo, Integer pageSize,String farmCode, String chipId,String startDate,String endDate);
+    Result listDeviceUnregistered(Integer pageNo, Integer pageSize,String chipId,String startDate,String endDate);
 
     Result remove(String ids);
 }

registration-center/src/main/java/com/huimv/center/service/BizRawDataService.java

@@ -19,4 +19,6 @@ public interface BizRawDataService extends IService<BizRawData> {
     Result addRawData(String askCmd) throws ParseException;
 
     Result listRawData(Integer pageNo, Integer pageSize, String searchText, String startDate, String endDate);
+
+    Result remove(String ids);
 }

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceAnswerFlowServiceImpl.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.center.pojo.BizDeviceAnswerFlow;
 import com.huimv.center.mapper.BizDeviceAnswerFlowMapper;
-import com.huimv.center.pojo.BizDeviceRegisteredFlow;
-import com.huimv.center.pojo.BizDeviceUnregisteredFlow;
 import com.huimv.center.service.BizDeviceAnswerFlowService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.center.utils.IDUtil;
@@ -48,13 +46,14 @@ public class BizDeviceAnswerFlowServiceImpl extends ServiceImpl<BizDeviceAnswerF
      * @Time        : 19:25
      */
     @Override
-    public Result addDeviceAnswer(String chipId, String deviceCode, String answer) throws ParseException {
+    public Result addDeviceAnswer(String chipId, String deviceCode, String answer, String farmCode) throws ParseException {
         DateUtil dateUtil = new DateUtil();
         BizDeviceAnswerFlow deviceAnswerFlow = new BizDeviceAnswerFlow();
         deviceAnswerFlow.setChipId(chipId);
         deviceAnswerFlow.setDeviceCode(deviceCode);
         deviceAnswerFlow.setAnswer(answer);
         deviceAnswerFlow.setAddTime(dateUtil.getTodayDatetime());
+        deviceAnswerFlow.setFarmCode(farmCode);
         int rows = deviceAnswerFlowMapper.insert(deviceAnswerFlow);
         return ResultUtil.result(rows);
     }

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceRegisterServiceImpl.java

@@ -1,12 +1,10 @@
 package com.huimv.center.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.center.mapper.BizDeviceRegisterMapper;
 import com.huimv.center.pojo.BizDeviceRegister;
-import com.huimv.center.pojo.BizFarm;
 import com.huimv.center.service.BizDeviceRegisterService;
 //import com.huimv.center.utils.DateUtil;
 import com.huimv.center.utils.IDUtil;
@@ -105,8 +103,7 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
      */
     @Override
     public Result remove(String ids){
-        int rows = bizDeviceRegisterMapper.deleteBatchIds(idUtil.convert(ids));
-        return ResultUtil.result(rows);
+        return ResultUtil.result(bizDeviceRegisterMapper.deleteBatchIds(idUtil.convert(ids)));
     }
 
     /**
@@ -120,7 +117,7 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
      * @Time        : 14:50
      */
     @Override
-    public Result listAll(Integer pageNo,Integer pageSize,String farmCode,String chipId,String deviceCode,String startDate,String endDate){
+    public Result listAll(Integer pageNo, Integer pageSize, String farmName, String farmCode, String chipId, String deviceCode, String startDate, String endDate){
         if(pageNo == 0){
             pageNo = 1;
         }
@@ -128,6 +125,7 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
         endDate = dateUtil.buildEndDate(endDate);
         Page<BizDeviceRegister> page = new Page<>(pageNo, pageSize);
         QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(farmName),"farm_name", farmName);
         queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
         queryWrapper.like(StringUtils.isNotBlank(deviceCode),"device_code", deviceCode);
         queryWrapper.like(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
@@ -162,6 +160,8 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
             resultMap.put("ip",deviceRegister.getServerIp());
             resultMap.put("port",deviceRegister.getServerPort());
             resultMap.put("deviceCode",deviceRegister.getDeviceCode());
+            resultMap.put("farmCode",deviceRegister.getFarmCode());
+            resultMap.put("farmName",deviceRegister.getFarmName());
         }
         return resultMap;
     }

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceRegisteredFlowServiceImpl.java

@@ -2,7 +2,6 @@ package com.huimv.center.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huimv.center.pojo.BizDeviceAnswerFlow;
 import com.huimv.center.pojo.BizDeviceRegisteredFlow;
 import com.huimv.center.mapper.BizDeviceRegisteredFlowMapper;
 import com.huimv.center.service.BizDeviceRegisteredFlowService;
@@ -47,13 +46,14 @@ public class BizDeviceRegisteredFlowServiceImpl extends ServiceImpl<BizDeviceReg
      * @Time        : 17:07
      */
     @Override
-    public Result addRegisteredFlow(String chipId,String deviceCode,String clientIp) throws ParseException {
+    public Result addRegisteredFlow(String chipId, String deviceCode, String clientIp, String farmCode, String farmName) throws ParseException {
         DateUtil dateUtil = new DateUtil();
         BizDeviceRegisteredFlow deviceRegisteredFlow = new BizDeviceRegisteredFlow();
         deviceRegisteredFlow.setChipId(chipId);
         deviceRegisteredFlow.setDeviceCode(deviceCode);
         deviceRegisteredFlow.setClientIp(clientIp);
         deviceRegisteredFlow.setAddTime(dateUtil.getTodayDatetime());
+        deviceRegisteredFlow.setFarmCode(farmCode);
         int rows = deviceRegisteredFlowMapper.insert(deviceRegisteredFlow);
         return ResultUtil.result(rows);
     }

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceUnregisteredFlowServiceImpl.java

@@ -2,8 +2,6 @@ package com.huimv.center.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huimv.center.mapper.BizDeviceAnswerFlowMapper;
-import com.huimv.center.pojo.BizDeviceAnswerFlow;
 import com.huimv.center.pojo.BizDeviceUnregisteredFlow;
 import com.huimv.center.mapper.BizDeviceUnregisteredFlowMapper;
 import com.huimv.center.service.BizDeviceUnregisteredFlowService;
@@ -113,7 +111,7 @@ public class BizDeviceUnregisteredFlowServiceImpl extends ServiceImpl<BizDeviceU
      * @Time        : 16:52
      */
     @Override
-    public Result listByFarmCode(Integer pageNo, Integer pageSize, String farmCode, String chipId, String startDate, String endDate) {
+    public Result listByFarmCode(Integer pageNo, Integer pageSize, String chipId, String startDate, String endDate) {
         if(pageNo == 0){
             pageNo = 1;
         }
@@ -121,7 +119,7 @@ public class BizDeviceUnregisteredFlowServiceImpl extends ServiceImpl<BizDeviceU
         endDate = dateUtil.buildEndDate(endDate);
         Page<BizDeviceUnregisteredFlow> page = new Page<>(pageNo, pageSize);
         QueryWrapper<BizDeviceUnregisteredFlow> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
+//        queryWrapper.like(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
         queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
         queryWrapper.ge(StringUtils.isNotBlank(startDate),"add_time", startDate);
         queryWrapper.le(StringUtils.isNotBlank(endDate),"add_time", endDate);
@@ -159,4 +157,9 @@ public class BizDeviceUnregisteredFlowServiceImpl extends ServiceImpl<BizDeviceU
         Page<BizDeviceUnregisteredFlow> pageBizDeviceUnregisteredFlow = deviceUnregisteredFlowMapper.selectPage(page, queryWrapper);
         return new Result(ResultCode.SUCCESS,pageBizDeviceUnregisteredFlow);
     }
+
+    @Override
+    public Result removeById(String ids) {
+        return ResultUtil.result(deviceUnregisteredFlowMapper.deleteBatchIds(idUtil.convert(ids)));
+    }
 }

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceUnregisteredServiceImpl.java

@@ -2,8 +2,6 @@ package com.huimv.center.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huimv.center.pojo.BizDeviceAnswerFlow;
-import com.huimv.center.pojo.BizDeviceRegister;
 import com.huimv.center.pojo.BizDeviceUnregistered;
 import com.huimv.center.mapper.BizDeviceUnregisteredMapper;
 import com.huimv.center.service.BizDeviceUnregisteredService;
@@ -85,7 +83,7 @@ public class BizDeviceUnregisteredServiceImpl extends ServiceImpl<BizDeviceUnreg
      * @Time        : 20:22
      */
     @Override
-    public Result listDeviceUnregistered(Integer pageNo,Integer pageSize,String farmCode,String chipId,String startDate,String endDate){
+    public Result listDeviceUnregistered(Integer pageNo,Integer pageSize,String chipId,String startDate,String endDate){
         if(pageNo == 0){
             pageNo = 1;
         }
@@ -93,7 +91,7 @@ public class BizDeviceUnregisteredServiceImpl extends ServiceImpl<BizDeviceUnreg
         endDate = dateUtil.buildEndDate(endDate);
         Page<BizDeviceUnregistered> page = new Page<>(pageNo, pageSize);
         QueryWrapper<BizDeviceUnregistered> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
+//        queryWrapper.like(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
         queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
         queryWrapper.ge(StringUtils.isNotBlank(startDate),"last_time", startDate);
         queryWrapper.le(StringUtils.isNotBlank(endDate),"last_time", endDate);

registration-center/src/main/java/com/huimv/center/service/impl/BizRawDataServiceImpl.java

@@ -32,6 +32,8 @@ public class BizRawDataServiceImpl extends ServiceImpl<BizRawDataMapper, BizRawD
     private com.huimv.center.utils.ResultUtil ResultUtil;
     @Autowired
     private com.huimv.center.utils.DateUtil dateUtil;
+    @Autowired
+    private com.huimv.center.utils.IDUtil idUtil;
 
     /**
      * @Method      : addRawData
@@ -83,5 +85,8 @@ public class BizRawDataServiceImpl extends ServiceImpl<BizRawDataMapper, BizRawD
         return new Result(ResultCode.SUCCESS,pageBizRawData);
     }
 
-
+    @Override
+    public Result remove(String ids){
+        return ResultUtil.result(BizRawDataMapper.deleteBatchIds(idUtil.convert(ids)));
+    }
 }