新建应答流水流水Controller，并增加farm_code字段。

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

@@ -1,10 +1,17 @@
 package com.huimv.center.controller;
 
 
+import com.huimv.center.service.BizDeviceAnswerFlowService;
+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 +21,68 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-06-22
  */
 @RestController
-@RequestMapping("/biz-device-answer-flow")
+@RequestMapping("/bizDeviceAnswerFlow")
 public class BizDeviceAnswerFlowController {
+    @Autowired
+    private BizDeviceAnswerFlowService bizDeviceAnswerFlowService;
+
+    @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 farmCode = "";
+        if (paramsMap.get("farmCode") != null) {
+            farmCode = paramsMap.get("farmCode").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 bizDeviceAnswerFlowService.listDeviceAnswer( Integer.parseInt(pageNo),  Integer.parseInt(pageSize),  chipId,  deviceCode,farmCode,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 bizDeviceAnswerFlowService.removeDeviceAnswer(farmCode,chipId,deviceCode,startDate,endDate);
+    }
 
 }
 

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

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

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

@@ -33,5 +33,5 @@ public class BizDeviceAnswerFlow implements Serializable {
 
     private Date addTime;
 
-
+    private String farmCode;
 }

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

@@ -20,5 +20,7 @@ public interface BizDeviceAnswerFlowService extends IService<BizDeviceAnswerFlow
 
     Result removeDeviceAnswer(String ids);
 
-    Result listDeviceAnswer(Integer pageNo, Integer pageSize, String chipId, String deviceCode);
+    Result listDeviceAnswer(Integer pageNo, Integer pageSize, String chipId, String deviceCode, String farmCode, String startDate, String endDate);
+
+    Result removeDeviceAnswer(String farmCode, String chipId, String deviceCode, String startDate, String endDate);
 }

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

@@ -5,6 +5,7 @@ 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;
@@ -33,6 +34,8 @@ public class BizDeviceAnswerFlowServiceImpl extends ServiceImpl<BizDeviceAnswerF
     private com.huimv.center.utils.ResultUtil ResultUtil;
     @Autowired
     private IDUtil idUtil;
+    @Autowired
+    private com.huimv.center.utils.DateUtil dateUtil;
 
     /**
      * @Method      : addDeviceAnswer
@@ -83,20 +86,47 @@ public class BizDeviceAnswerFlowServiceImpl extends ServiceImpl<BizDeviceAnswerF
      * @Time        : 19:33
      */
     @Override
-    public Result listDeviceAnswer(Integer pageNo, Integer pageSize, String chipId, String deviceCode){
+    public Result listDeviceAnswer(Integer pageNo, Integer pageSize, String chipId, String deviceCode, String farmCode, String startDate, String endDate){
         if(pageNo == 0){
             pageNo = 1;
         }
+        startDate = dateUtil.buildStartDate(startDate);
+        endDate = dateUtil.buildEndDate(endDate);
         Page<BizDeviceAnswerFlow> page = new Page<>(pageNo, pageSize);
         QueryWrapper<BizDeviceAnswerFlow> queryWrapper = new QueryWrapper<>();
 //        if(StringUtils.isNotEmpty(chipId)){
 //            queryWrapper.eq("chip_id", chipId);
 //        }
+        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<BizDeviceAnswerFlow> pageBizDeviceAnswerFlow = deviceAnswerFlowMapper.selectPage(page, queryWrapper);
         return new Result(ResultCode.SUCCESS,pageBizDeviceAnswerFlow);
     }
+
+    /**
+     * @Method      : removeDeviceAnswer
+     * @Description : 
+     * @Params      : [farmCode, chipId, deviceCode, startDate, endDate]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/26       
+     * @Time        : 19:08
+     */
+    @Override
+    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.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, deviceAnswerFlowMapper.delete(queryWrapper));
+    }
 }

registration-center/src/test/java/com/huimv/center/service/BizDeviceAnswerFlowServiceTest.java

@@ -35,17 +35,17 @@ public class BizDeviceAnswerFlowServiceTest {
         chipId = "869401041283458";
         String deviceCode = "";
         deviceCode = "hz001b";
-        Result result = deviceAnswerFlowService.listDeviceAnswer(pageNo, pageSize, chipId,deviceCode);
-        System.out.println("isSuccess>>"+result.isSuccess());
-        Page page = (Page) result.getData();
-        System.out.println(page.getTotal());
-        System.out.println(page.getPages());
-        System.out.println(page.getCurrent());
-        System.out.println(page.getSize());
-        List<BizDeviceAnswerFlow> listBizDeviceAnswerFlow = page.getRecords();
-        System.out.println("listBizDeviceAnswerFlow.size="+listBizDeviceAnswerFlow.size());
-        for(BizDeviceAnswerFlow BizDeviceAnswerFlow:listBizDeviceAnswerFlow){
-            System.out.println(""+BizDeviceAnswerFlow);
-        }
+//        Result result = deviceAnswerFlowService.listDeviceAnswer(pageNo, pageSize, chipId,deviceCode);
+//        System.out.println("isSuccess>>"+result.isSuccess());
+//        Page page = (Page) result.getData();
+//        System.out.println(page.getTotal());
+//        System.out.println(page.getPages());
+//        System.out.println(page.getCurrent());
+//        System.out.println(page.getSize());
+//        List<BizDeviceAnswerFlow> listBizDeviceAnswerFlow = page.getRecords();
+//        System.out.println("listBizDeviceAnswerFlow.size="+listBizDeviceAnswerFlow.size());
+//        for(BizDeviceAnswerFlow BizDeviceAnswerFlow:listBizDeviceAnswerFlow){
+//            System.out.println(""+BizDeviceAnswerFlow);
+//        }
     }
 }

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

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

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

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