新建已注册设备管理Controller

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

@@ -1,21 +1,94 @@
 package com.huimv.center.controller;
 
 
+import com.huimv.center.service.BizDeviceRegisterService;
+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.text.ParseException;
+import java.util.Map;
+
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author zn
  * @since 2022-06-21
  */
 @RestController
-@RequestMapping("/biz-device-register")
+@RequestMapping("/bizDeviceRegister")
 public class BizDeviceRegisterController {
+    @Autowired
+    private BizDeviceRegisterService bizDeviceRegisterService;
+
+    @PostMapping("/add")
+    public Result add(@RequestParam Map<String, Object> paramsMap) throws ParseException {
+        String chipId = paramsMap.get("chipId").toString();
+        String deviceCode = paramsMap.get("deviceCode").toString();
+        String farmCode = paramsMap.get("farmCode").toString();
+        String serverIp = paramsMap.get("serverIp").toString();
+        String serverPort = paramsMap.get("serverPort").toString();
+        String remark = paramsMap.get("remark").toString();
+        String farmName = "";
+        if(paramsMap.get("farmName") != null){
+            farmName = paramsMap.get("farmName").toString();
+        }
+        return bizDeviceRegisterService.add(farmName,farmCode,chipId, deviceCode, serverIp, serverPort, remark);
+    }
+
+    @PostMapping("/edit")
+    public Result edit(@RequestParam Map<String, Object> paramsMap) throws ParseException {
+        String id = paramsMap.get("id").toString();
+        String chipId = paramsMap.get("chipId").toString();
+        String deviceCode = paramsMap.get("deviceCode").toString();
+        String serverIp = paramsMap.get("serverIp").toString();
+        String serverPort = paramsMap.get("serverPort").toString();
+        String remark = paramsMap.get("remark").toString();
+        return bizDeviceRegisterService.edit( Integer.parseInt(id),  chipId,  deviceCode,  serverIp,  serverPort,  remark);
+    }
+
+    @PostMapping("/remove")
+    public Result remove(@RequestParam String ids) {
+        return bizDeviceRegisterService.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 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 bizDeviceRegisterService.listAll(Integer.parseInt(pageNo), Integer.parseInt(pageSize), farmCode, chipId, deviceCode,startDate, endDate);
+    }
 }
 

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

@@ -8,6 +8,7 @@
         <result column="chip_id" property="chipId" />
         <result column="device_code" property="deviceCode" />
         <result column="farm_code" property="farmCode" />
+        <result column="farm_name" property="farmName" />
         <result column="register_date" property="registerDate" />
         <result column="server_ip" property="serverIp" />
         <result column="server_port" property="serverPort" />

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

@@ -33,6 +33,8 @@ public class BizDeviceRegister implements Serializable {
 
     private String farmCode;
 
+    private String farmName;
+
     private Date registerDate;
 
     private String serverIp;

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

@@ -17,13 +17,13 @@ import java.util.Map;
  */
 public interface BizDeviceRegisterService extends IService<BizDeviceRegister> {
 
-    Result add(String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException;
+    Result add(String farmName,String farmCode,String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException;
 
     Result edit(Integer id, String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException;
 
     Result remove(String ids);
 
-    Result listAll(Integer pageNo,Integer pageSize);
+    Result listAll(Integer pageNo,Integer pageSize,String farmCode,String chipId,String deviceCode,String startDate,String endDate);
 
     Map getServerAndIpByChipId(String idCode);
 

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

@@ -6,12 +6,14 @@ 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;
 import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -38,7 +40,8 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
 //    private DateUtil dateUtil;
     @Autowired
     private IDUtil idUtil;
-
+    @Autowired
+    private com.huimv.center.utils.DateUtil dateUtil;
     /**
      * @Method      : add
      * @Description : 
@@ -50,7 +53,7 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
      * @Time        : 20:47
      */
     @Override
-    public Result add(String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException {
+    public Result add(String farmName,String farmCode,String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException {
         DateUtil dateUtil = new DateUtil();
         BizDeviceRegister deviceRegister = new BizDeviceRegister();
         deviceRegister.setChipId(chipId);
@@ -61,8 +64,9 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
         deviceRegister.setRemark(remark);
         deviceRegister.setAskTimes(0);
         deviceRegister.setAnswerTimes(0);
-        int rows = bizDeviceRegisterMapper.insert(deviceRegister);
-        return ResultUtil.result(rows);
+        deviceRegister.setFarmCode(farmCode);
+        deviceRegister.setFarmName(farmName);
+        return ResultUtil.result(bizDeviceRegisterMapper.insert(deviceRegister));
     }
 
     /**
@@ -96,14 +100,22 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
     }
 
     @Override
-    public Result listAll(Integer pageNo,Integer pageSize){
+    public Result listAll(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<BizDeviceRegister> page = new Page<>(pageNo, pageSize);
-        List<BizDeviceRegister> deviceRegisterList = bizDeviceRegisterMapper.findPage(page);
-        page.setRecords(deviceRegisterList);
-        return new Result(ResultCode.SUCCESS,page);
+        QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
+        queryWrapper.like(StringUtils.isNotBlank(deviceCode),"device_code", deviceCode);
+        queryWrapper.like(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
+        queryWrapper.ge(StringUtils.isNotBlank(startDate),"last_time", startDate);
+        queryWrapper.le(StringUtils.isNotBlank(endDate),"last_time", endDate);
+        //创建时间降序
+        queryWrapper.orderByDesc("id");
+        return new Result(ResultCode.SUCCESS,bizDeviceRegisterMapper.selectPage(page, queryWrapper));
     }
 
     /**
@@ -127,7 +139,6 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
         Map resultMap = new HashMap();
         if(deviceRegisterList.size() > 0){
             BizDeviceRegister deviceRegister = deviceRegisterList.get(0);
-            System.out.println("deviceRegister>>"+deviceRegister);
             resultMap.put("ip",deviceRegister.getServerIp());
             resultMap.put("port",deviceRegister.getServerPort());
             resultMap.put("deviceCode",deviceRegister.getDeviceCode());

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

@@ -122,6 +122,7 @@ public class BizFarmServiceImpl extends ServiceImpl<BizFarmMapper, BizFarm> impl
         queryWrapper.le(StringUtils.isNotBlank(endDate),"add_time", endDate);
         //创建时间降序
         queryWrapper.orderByDesc("id");
-        return new Result(ResultCode.SUCCESS,BizFarmMapper.selectPage(page, queryWrapper));
+        Page<BizFarm> pageBizFarm = BizFarmMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,pageBizFarm);
     }
 }

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

@@ -43,7 +43,7 @@ public class BizDeviceRegisterTest {
     public void testListAll(){
         Integer pageNo =1 ;
         Integer pageSize = 10;
-        bizDeviceRegisterService.listAll(pageNo,pageSize);
+//        bizDeviceRegisterService.listAll(pageNo,pageSize);
     }
 
     @Test
@@ -54,7 +54,9 @@ public class BizDeviceRegisterTest {
         String serverIp = "192.168.1.5";
         String serverPort = "10023";
         String remark = "备注";
-        Result result = bizDeviceRegisterService.add( chipId,  deviceCode,  serverIp,  serverPort,  remark);
+        String farmCode = "xxxx";
+        String farmName = "";
+        Result result = bizDeviceRegisterService.add(farmName,farmCode, chipId,  deviceCode,  serverIp,  serverPort,  remark);
         System.out.println("result>>"+result);
     }
 

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

@@ -8,6 +8,7 @@
         <result column="chip_id" property="chipId" />
         <result column="device_code" property="deviceCode" />
         <result column="farm_code" property="farmCode" />
+        <result column="farm_name" property="farmName" />
         <result column="register_date" property="registerDate" />
         <result column="server_ip" property="serverIp" />
         <result column="server_port" property="serverPort" />