新建未注册设备管理Controller，优化部分代码，并增加farm_code字段。

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

@@ -1,10 +1,17 @@
 package com.huimv.center.controller;
 
 
+import com.huimv.center.service.BizDeviceUnregisteredService;
+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,44 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-06-22
  */
 @RestController
-@RequestMapping("/biz-device-unregistered")
+@RequestMapping("/bizDeviceUnregistered")
 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();
+        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 bizDeviceUnregisteredService.listDeviceUnregistered(Integer.parseInt(pageNo), Integer.parseInt(pageSize), farmCode, chipId, startDate, endDate);
+    }
 
 }
 

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

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

@@ -33,5 +33,6 @@ public class BizDeviceUnregistered implements Serializable {
 
     private Integer askTimes;
 
+    private String farmCode;
 
 }

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

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

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

@@ -93,12 +93,32 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
         return ResultUtil.result(rows);
     }
 
+    /**
+     * @Method      : remove
+     * @Description : 
+     * @Params      : [ids]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/26       
+     * @Time        : 15:12
+     */
     @Override
     public Result remove(String ids){
         int rows = bizDeviceRegisterMapper.deleteBatchIds(idUtil.convert(ids));
         return ResultUtil.result(rows);
     }
 
+    /**
+     * @Method      : listAll
+     * @Description : 
+     * @Params      : [pageNo, pageSize, farmCode, chipId, deviceCode, startDate, endDate]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/26       
+     * @Time        : 14:50
+     */
     @Override
     public Result listAll(Integer pageNo,Integer pageSize,String farmCode,String chipId,String deviceCode,String startDate,String endDate){
         if(pageNo == 0){

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

@@ -8,6 +8,7 @@ import com.huimv.center.pojo.BizDeviceUnregistered;
 import com.huimv.center.mapper.BizDeviceUnregisteredMapper;
 import com.huimv.center.service.BizDeviceUnregisteredService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.center.utils.IDUtil;
 import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
@@ -31,6 +32,10 @@ public class BizDeviceUnregisteredServiceImpl extends ServiceImpl<BizDeviceUnreg
     private BizDeviceUnregisteredMapper deviceUnregisteredMapper;
     @Autowired
     private com.huimv.center.utils.ResultUtil ResultUtil;
+    @Autowired
+    private IDUtil idUtil;
+    @Autowired
+    private com.huimv.center.utils.DateUtil dateUtil;
 
     /**
      * @Method      : updateDeviceRegisterTimes
@@ -80,17 +85,27 @@ public class BizDeviceUnregisteredServiceImpl extends ServiceImpl<BizDeviceUnreg
      * @Time        : 20:22
      */
     @Override
-    public Result listDeviceUnregistered(Integer pageNo,Integer pageSize,String chipId){
+    public Result listDeviceUnregistered(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<BizDeviceUnregistered> page = new Page<>(pageNo, pageSize);
         QueryWrapper<BizDeviceUnregistered> queryWrapper = new QueryWrapper<>();
+        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);
         //创建时间降序
         queryWrapper.orderByDesc("id");
         Page<BizDeviceUnregistered> pageBizDeviceUnregistered = deviceUnregisteredMapper.selectPage(page, queryWrapper);
         return new Result(ResultCode.SUCCESS,pageBizDeviceUnregistered);
     }
 
+    @Override
+    public Result remove(String ids) {
+        return new Result(ResultCode.SUCCESS, deviceUnregisteredMapper.deleteBatchIds(idUtil.convert(ids)));
+    }
+
 }