新建已注册设备流水Controller，并增加farm_code字段。

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

@@ -1,10 +1,18 @@
 package com.huimv.center.controller;
 
 
+import com.huimv.center.service.BizDeviceRegisteredFlowService;
+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.sql.ResultSet;
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -14,8 +22,67 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-06-22
  */
 @RestController
-@RequestMapping("/biz-device-registered-flow")
+@RequestMapping("/bizDeviceRegisteredFlow")
 public class BizDeviceRegisteredFlowController {
+    @Autowired
+    private BizDeviceRegisteredFlowService bizDeviceRegisteredFlowService;
+
+    @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 deviceCode = "";
+        if (paramsMap.get("deviceCode") != null) {
+            deviceCode = paramsMap.get("deviceCode").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();
+        }
+        String endDate = "";
+        if (paramsMap.get("endDate") != null) {
+            endDate = paramsMap.get("endDate").toString();
+        }
+        return bizDeviceRegisteredFlowService.listDeviceRegisteredFlow(Integer.parseInt(pageNo), Integer.parseInt(pageSize), farmCode, chipId, deviceCode,startDate, endDate);
+    }
 
+    @PostMapping("/remove")
+    public Result remove(@RequestParam Map<String, Object> paramsMap){
+        String farmCode = "";
+        if (paramsMap.get("farmCode") != null) {
+            farmCode = paramsMap.get("farmCode").toString();
+        }
+        String chipId = "";
+        if (paramsMap.get("chipId") != null) {
+            chipId = paramsMap.get("chipId").toString();
+        }
+        String deviceCode = "";
+        if (paramsMap.get("deviceCode") != null) {
+            deviceCode = paramsMap.get("deviceCode").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 bizDeviceRegisteredFlowService.removeDeviceRegisteredFlow(farmCode,chipId,deviceCode,startDate,endDate);
+    }
 }
 

registration-center/src/main/java/com/huimv/center/mapper/xml/BizDeviceRegisteredFlowMapper.xml

@@ -9,6 +9,7 @@
         <result column="device_code" property="deviceCode" />
         <result column="add_time" property="addTime" />
         <result column="client_ip" property="clientIp" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

registration-center/src/main/java/com/huimv/center/mapper/xml/BizRawDataMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <result column="ask_cmd" property="askCmd" />
         <result column="add_time" property="addTime" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

registration-center/src/main/java/com/huimv/center/pojo/BizDeviceRegisteredFlow.java

@@ -33,5 +33,5 @@ public class BizDeviceRegisteredFlow implements Serializable {
 
     private String clientIp;
 
-
+    private String farmCode;
 }

registration-center/src/main/java/com/huimv/center/pojo/BizRawData.java

@@ -29,5 +29,6 @@ public class BizRawData implements Serializable {
 
     private Date addTime;
 
+    private String farmCode;
 
 }

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

@@ -21,4 +21,8 @@ public interface BizDeviceRegisteredFlowService extends IService<BizDeviceRegist
     Result removeDeviceRegisteredFlow(String ids);
 
     Result listDeviceRegisteredFlow(Integer pageNo, Integer pageSize, String chipId, String deviceCode);
+
+    Result listDeviceRegisteredFlow(Integer pageNo, Integer pageSize,  String farmCode, String chipId, String deviceCode, String startDate, String endDate);
+
+    Result removeDeviceRegisteredFlow(String farmCode, String chipId, String deviceCode, String startDate, String endDate);
 }

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

@@ -122,7 +122,7 @@ public class BizDeviceAnswerFlowServiceImpl extends ServiceImpl<BizDeviceAnswerF
     public Result removeDeviceAnswer(String farmCode, String chipId, String deviceCode, String startDate, String endDate) {
         QueryWrapper<BizDeviceAnswerFlow> queryWrapper = new QueryWrapper<>();
 //        queryWrapper.like(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
-//        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("farm_code", farmCode);
         queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
         queryWrapper.like(StringUtils.isNotBlank(deviceCode),"device_code", deviceCode);
         queryWrapper.ge(StringUtils.isNotBlank(startDate),"add_time", startDate);

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

@@ -2,6 +2,7 @@ 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;
@@ -32,6 +33,8 @@ public class BizDeviceRegisteredFlowServiceImpl extends ServiceImpl<BizDeviceReg
     private com.huimv.center.utils.ResultUtil ResultUtil;
     @Autowired
     private IDUtil idUtil;
+    @Autowired
+    private com.huimv.center.utils.DateUtil dateUtil;
 
     /**
      * @Method      : addRegisteredFlow
@@ -88,9 +91,6 @@ public class BizDeviceRegisteredFlowServiceImpl extends ServiceImpl<BizDeviceReg
         }
         Page<BizDeviceRegisteredFlow> page = new Page<>(pageNo, pageSize);
         QueryWrapper<BizDeviceRegisteredFlow> queryWrapper = new QueryWrapper<>();
-//        if(StringUtils.isNotEmpty(chipId)){
-//            queryWrapper.eq("chip_id", chipId);
-//        }
         queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
         queryWrapper.like(StringUtils.isNotBlank(deviceCode),"device_code", deviceCode);
         //创建时间降序
@@ -99,4 +99,56 @@ public class BizDeviceRegisteredFlowServiceImpl extends ServiceImpl<BizDeviceReg
         return new Result(ResultCode.SUCCESS,pageBizDeviceRegisteredFlow);
     }
 
+    /**
+     * @Method      : listDeviceRegisteredFlow
+     * @Description : 
+     * @Params      : [pageNo, pageSize, farmCode, chipId, deviceCode, startDate, endDate]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/26       
+     * @Time        : 20:41
+     */
+    @Override
+    public Result listDeviceRegisteredFlow(Integer pageNo, Integer pageSize, String farmCode, String chipId, String deviceCode, String startDate, String endDate) {
+        if(pageNo == 0){
+            pageNo = 1;
+        }
+        startDate = dateUtil.buildStartDate(startDate);
+        endDate = dateUtil.buildEndDate(endDate);
+        Page<BizDeviceRegisteredFlow> page = new Page<>(pageNo, pageSize);
+        QueryWrapper<BizDeviceRegisteredFlow> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
+        queryWrapper.like(StringUtils.isNotBlank(deviceCode),"device_code", deviceCode);
+        queryWrapper.ge(StringUtils.isNotBlank(startDate),"add_time", startDate);
+        queryWrapper.le(StringUtils.isNotBlank(endDate),"add_time", endDate);
+        //创建时间降序
+        queryWrapper.orderByDesc("id");
+        Page<BizDeviceRegisteredFlow> pageBizDeviceRegisteredFlow = deviceRegisteredFlowMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,pageBizDeviceRegisteredFlow);
+    }
+
+    /**
+     * @Method      : removeDeviceRegisteredFlow
+     * @Description : 
+     * @Params      : [farmCode, chipId, deviceCode, startDate, endDate]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/26       
+     * @Time        : 21:01
+     */
+    @Override
+    public Result removeDeviceRegisteredFlow(String farmCode, String chipId, String deviceCode, String startDate, String endDate) {
+        QueryWrapper<BizDeviceRegisteredFlow> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.like(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
+        queryWrapper.like(StringUtils.isNotBlank(deviceCode),"device_code", deviceCode);
+        queryWrapper.ge(StringUtils.isNotBlank(startDate),"add_time", startDate);
+        queryWrapper.le(StringUtils.isNotBlank(endDate),"add_time", endDate);
+        return new Result(ResultCode.SUCCESS, deviceRegisteredFlowMapper.delete(queryWrapper));
+    }
+
 }

registration-center/target/classes/com/huimv/center/mapper/xml/BizDeviceRegisteredFlowMapper.xml

@@ -9,6 +9,7 @@
         <result column="device_code" property="deviceCode" />
         <result column="add_time" property="addTime" />
         <result column="client_ip" property="clientIp" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

registration-center/target/classes/com/huimv/center/mapper/xml/BizRawDataMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <result column="ask_cmd" property="askCmd" />
         <result column="add_time" property="addTime" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->