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

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

@@ -1,10 +1,17 @@
 package com.huimv.center.controller;
 
 
+import com.huimv.center.service.BizDeviceUnregisteredFlowService;
+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,88 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-06-22
  */
 @RestController
-@RequestMapping("/biz-device-unregistered-flow")
+@RequestMapping("/bizDeviceUnregisteredFlow")
 public class BizDeviceUnregisteredFlowController {
+    @Autowired
+    private BizDeviceUnregisteredFlowService bizDeviceUnregisteredFlowService;
+
+    @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 startDate = "";
+        if (paramsMap.get("startDate") != null) {
+            startDate = paramsMap.get("startDate").toString();
+        }
+        String endDate = "";
+        if (paramsMap.get("endDate") != null) {
+            endDate = paramsMap.get("endDate").toString();
+        }
+        return bizDeviceUnregisteredFlowService.removeByChipIdAndLastTime(farmCode,chipId,startDate,endDate);
+    }
+
+    @PostMapping("/listByFarmCode")
+    public Result listByFarmCode(@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 startDate = "";
+        if (paramsMap.get("startDate") != null) {
+            startDate = paramsMap.get("startDate").toString();
+        }
+        String endDate = "";
+        if (paramsMap.get("endDate") != null) {
+            endDate = paramsMap.get("endDate").toString();
+        }
+        return bizDeviceUnregisteredFlowService.listByFarmCode(Integer.parseInt(pageNo), Integer.parseInt(pageSize), farmCode, chipId, startDate, endDate);
+    }
 
+    @PostMapping("/listByChipId")
+    public Result listByChipId(@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 startDate = "";
+        if (paramsMap.get("startDate") != null) {
+            startDate = paramsMap.get("startDate").toString();
+        }
+        String endDate = "";
+        if (paramsMap.get("endDate") != null) {
+            endDate = paramsMap.get("endDate").toString();
+        }
+        return bizDeviceUnregisteredFlowService.listChipId(Integer.parseInt(pageNo), Integer.parseInt(pageSize), chipId, startDate, endDate);
+    }
 }
 

registration-center/src/main/java/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>
 
     <!-- 通用查询结果列 -->

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

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

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

@@ -19,4 +19,10 @@ public interface BizDeviceUnregisteredFlowService extends IService<BizDeviceUnre
     Result addDeviceUnregisteredFlow(String chipId) throws ParseException;
 
     Result listDeviceUnregisteredFlow(Integer pageNo, Integer pageSize, String chipId);
+
+    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 listChipId(Integer parseInt, Integer parseInt1, String chipId, String startDate, String endDate);
 }

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

@@ -34,6 +34,8 @@ public class BizDeviceUnregisteredFlowServiceImpl extends ServiceImpl<BizDeviceU
     private com.huimv.center.utils.ResultUtil ResultUtil;
     @Autowired
     private IDUtil idUtil;
+    @Autowired
+    private com.huimv.center.utils.DateUtil dateUtil;
 
     /**
      * @Method      : addDeviceUnregisteredFlow
@@ -78,4 +80,83 @@ public class BizDeviceUnregisteredFlowServiceImpl extends ServiceImpl<BizDeviceU
         Page<BizDeviceUnregisteredFlow> pageBizDeviceUnregisteredFlow = deviceUnregisteredFlowMapper.selectPage(page, queryWrapper);
         return new Result(ResultCode.SUCCESS,pageBizDeviceUnregisteredFlow);
     }
+
+    /**
+     * @Method      : removeByChipIdAndLastTime
+     * @Description : 
+     * @Params      : [chipId, startDate, endDate]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/26       
+     * @Time        : 16:52
+     */
+    @Override
+    public Result removeByChipIdAndLastTime(String farmCode,String chipId, String startDate, String endDate) {
+        QueryWrapper<BizDeviceUnregisteredFlow> 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.ge(StringUtils.isNotBlank(startDate),"add_time", startDate);
+        queryWrapper.le(StringUtils.isNotBlank(endDate),"add_time", endDate);
+        return new Result(ResultCode.SUCCESS, deviceUnregisteredFlowMapper.delete(queryWrapper));
+    }
+
+    /**
+     * @Method      : listByFarmCode
+     * @Description : 
+     * @Params      : [pageNo, pageSize, farmCode, chipId, startDate, endDate]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/26       
+     * @Time        : 16:52
+     */
+    @Override
+    public Result listByFarmCode(Integer pageNo, Integer pageSize, String farmCode, String chipId, String startDate, String endDate) {
+        if(pageNo == 0){
+            pageNo = 1;
+        }
+        startDate = dateUtil.buildStartDate(startDate);
+        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(chipId),"chip_id", chipId);
+        queryWrapper.ge(StringUtils.isNotBlank(startDate),"add_time", startDate);
+        queryWrapper.le(StringUtils.isNotBlank(endDate),"add_time", endDate);
+
+        //创建时间降序
+        queryWrapper.orderByDesc("id");
+        Page<BizDeviceUnregisteredFlow> pageBizDeviceUnregisteredFlow = deviceUnregisteredFlowMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,pageBizDeviceUnregisteredFlow);
+    }
+
+    /**
+     * @Method      : listChipId
+     * @Description : 
+     * @Params      : [pageNo, pageSize, chipId, startDate, endDate]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/26       
+     * @Time        : 16:52
+     */
+    @Override
+    public Result listChipId(Integer pageNo, Integer pageSize, String chipId, String startDate, String endDate) {
+        if(pageNo == 0){
+            pageNo = 1;
+        }
+        startDate = dateUtil.buildStartDate(startDate);
+        endDate = dateUtil.buildEndDate(endDate);
+        Page<BizDeviceUnregisteredFlow> page = new Page<>(pageNo, pageSize);
+        QueryWrapper<BizDeviceUnregisteredFlow> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
+        queryWrapper.ge(StringUtils.isNotBlank(startDate),"add_time", startDate);
+        queryWrapper.le(StringUtils.isNotBlank(endDate),"add_time", endDate);
+        //创建时间降序
+        queryWrapper.orderByDesc("id");
+        Page<BizDeviceUnregisteredFlow> pageBizDeviceUnregisteredFlow = deviceUnregisteredFlowMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,pageBizDeviceUnregisteredFlow);
+    }
 }

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

@@ -9,6 +9,7 @@
         <result column="first_time" property="firstTime" />
         <result column="last_time" property="lastTime" />
         <result column="ask_times" property="askTimes" />
+        <result column="farm_code" property="farmCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->