修改controller参数接收方式。

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

@@ -7,7 +7,7 @@ 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.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
@@ -27,65 +27,65 @@ public class BizDeviceAnswerFlowController {
     private BizDeviceAnswerFlowService bizDeviceAnswerFlowService;
 
     @PostMapping("/list")
-    public Result list(@RequestParam Map<String, Object> paramsMap){
-        String pageNo = paramsMap.get("pageNo").toString();
+    public Result list(@RequestBody Map<String, Object> paramsMap){
+        String pageNo = paramsMap.get("pageNo")+"";
         if (pageNo == null) {
             pageNo = "1";
         }
-        String pageSize = paramsMap.get("pageSize").toString();
+        String pageSize = paramsMap.get("pageSize")+"";
         if (pageSize == null) {
             pageSize = "10";
         }
         String chipId = "";
         if (paramsMap.get("chipId") != null) {
-            chipId = paramsMap.get("chipId").toString();
+            chipId = paramsMap.get("chipId")+"";
         }
         String farmCode = "";
         if (paramsMap.get("farmCode") != null) {
-            farmCode = paramsMap.get("farmCode").toString();
+            farmCode = paramsMap.get("farmCode")+"";
         }
         String deviceCode = "";
         if (paramsMap.get("deviceCode") != null) {
-            deviceCode = paramsMap.get("deviceCode").toString();
+            deviceCode = paramsMap.get("deviceCode")+"";
         }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
-            startDate = paramsMap.get("startDate").toString();
+            startDate = paramsMap.get("startDate")+"";
         }
         String endDate = "";
         if (paramsMap.get("endDate") != null) {
-            endDate = paramsMap.get("endDate").toString();
+            endDate = paramsMap.get("endDate")+"";
         }
         return bizDeviceAnswerFlowService.listDeviceAnswer( Integer.parseInt(pageNo),  Integer.parseInt(pageSize),  chipId,  deviceCode,farmCode,startDate,endDate);
     }
 
     @PostMapping("/remove")
-    public Result remove(@RequestParam Map<String, Object> paramsMap){
+    public Result remove(@RequestBody Map<String, Object> paramsMap){
         String farmCode = "";
         if (paramsMap.get("farmCode") != null) {
-            farmCode = paramsMap.get("farmCode").toString();
+            farmCode = paramsMap.get("farmCode")+"";
         }
         String chipId = "";
         if (paramsMap.get("chipId") != null) {
-            chipId = paramsMap.get("chipId").toString();
+            chipId = paramsMap.get("chipId")+"";
         }
         String deviceCode = "";
         if (paramsMap.get("deviceCode") != null) {
-            deviceCode = paramsMap.get("deviceCode").toString();
+            deviceCode = paramsMap.get("deviceCode")+"";
         }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
-            startDate = paramsMap.get("startDate").toString();
+            startDate = paramsMap.get("startDate")+"";
         }
         String endDate = "";
         if (paramsMap.get("endDate") != null) {
-            endDate = paramsMap.get("endDate").toString();
+            endDate = paramsMap.get("endDate")+"";
         }
         return bizDeviceAnswerFlowService.removeDeviceAnswer(farmCode,chipId,deviceCode,startDate,endDate);
     }
 
     @PostMapping("/removeById")
-    public Result removeById(@RequestParam String ids){
+    public Result removeById(@RequestBody String ids){
         return bizDeviceAnswerFlowService.removeDeviceAnswer(ids);
     }
 

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

@@ -7,7 +7,7 @@ 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.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
@@ -28,69 +28,69 @@ public class BizDeviceRegisterController {
     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();
+    public Result add(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        String chipId = paramsMap.get("chipId")+"";
+        String deviceCode = paramsMap.get("deviceCode")+"";
+        String farmCode = paramsMap.get("farmCode")+"";
+        String serverIp = paramsMap.get("serverIp")+"";
+        String serverPort = paramsMap.get("serverPort")+"";
+        String remark = paramsMap.get("remark")+"";
         String farmName = "";
         if(paramsMap.get("farmName") != null){
-            farmName = paramsMap.get("farmName").toString();
+            farmName = paramsMap.get("farmName")+"";
         }
         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();
+    public Result edit(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        String id = paramsMap.get("id")+"";
+        String chipId = paramsMap.get("chipId")+"";
+        String deviceCode = paramsMap.get("deviceCode")+"";
+        String serverIp = paramsMap.get("serverIp")+"";
+        String serverPort = paramsMap.get("serverPort")+"";
+        String remark = paramsMap.get("remark")+"";
         return bizDeviceRegisterService.edit( Integer.parseInt(id),  chipId,  deviceCode,  serverIp,  serverPort,  remark);
     }
 
     @PostMapping("/remove")
-    public Result remove(@RequestParam String ids) {
+    public Result remove(@RequestBody String ids) {
         return bizDeviceRegisterService.remove(ids);
     }
 
     @PostMapping("/list")
-    public Result list(@RequestParam Map<String, Object> paramsMap) {
-        String pageNo = paramsMap.get("pageNo").toString();
+    public Result list(@RequestBody Map<String, Object> paramsMap) {
+        String pageNo = paramsMap.get("pageNo")+"";
         if (pageNo == null) {
             pageNo = "1";
         }
-        String pageSize = paramsMap.get("pageSize").toString();
+        String pageSize = paramsMap.get("pageSize")+"";
         if (pageSize == null) {
             pageSize = "10";
         }
         String chipId = "";
         if (paramsMap.get("chipId") != null) {
-            chipId = paramsMap.get("chipId").toString();
+            chipId = paramsMap.get("chipId")+"";
         }
         String deviceCode = "";
         if (paramsMap.get("deviceCode") != null) {
-            deviceCode = paramsMap.get("deviceCode").toString();
+            deviceCode = paramsMap.get("deviceCode")+"";
         }
         String farmName = "";
         if (paramsMap.get("farmName") != null) {
-            farmName = paramsMap.get("farmName").toString();
+            farmName = paramsMap.get("farmName")+"";
         }
         String farmCode = "";
         if (paramsMap.get("farmCode") != null) {
-            farmCode = paramsMap.get("farmCode").toString();
+            farmCode = paramsMap.get("farmCode")+"";
         }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
-            startDate = paramsMap.get("startDate").toString();
+            startDate = paramsMap.get("startDate")+"";
         }
         String endDate = "";
         if (paramsMap.get("endDate") != null) {
-            endDate = paramsMap.get("endDate").toString();
+            endDate = paramsMap.get("endDate")+"";
         }
         return bizDeviceRegisterService.listAll(Integer.parseInt(pageNo), Integer.parseInt(pageSize), farmName,farmCode, chipId, deviceCode,startDate, endDate);
     }

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

@@ -8,7 +8,7 @@ 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.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.sql.ResultSet;
@@ -29,69 +29,69 @@ public class BizDeviceRegisteredFlowController {
     private BizDeviceRegisteredFlowService bizDeviceRegisteredFlowService;
 
     @PostMapping("/list")
-    public Result list(@RequestParam Map<String, Object> paramsMap) {
-        String pageNo = paramsMap.get("pageNo").toString();
+    public Result list(@RequestBody Map<String, Object> paramsMap) {
+        String pageNo = paramsMap.get("pageNo")+"";
         if (pageNo == null) {
             pageNo = "1";
         }
-        String pageSize = paramsMap.get("pageSize").toString();
+        String pageSize = paramsMap.get("pageSize")+"";
         if (pageSize == null) {
             pageSize = "10";
         }
         String chipId = "";
         if (paramsMap.get("chipId") != null) {
-            chipId = paramsMap.get("chipId").toString();
+            chipId = paramsMap.get("chipId")+"";
         }
         String deviceCode = "";
         if (paramsMap.get("deviceCode") != null) {
-            deviceCode = paramsMap.get("deviceCode").toString();
+            deviceCode = paramsMap.get("deviceCode")+"";
         }
         String farmCode = "";
         if (paramsMap.get("farmCode") != null) {
-            farmCode = paramsMap.get("farmCode").toString();
+            farmCode = paramsMap.get("farmCode")+"";
         }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
-            startDate = paramsMap.get("startDate").toString();
+            startDate = paramsMap.get("startDate")+"";
         }
         String endDate = "";
         if (paramsMap.get("endDate") != null) {
-            endDate = paramsMap.get("endDate").toString();
+            endDate = paramsMap.get("endDate")+"";
         }
         return bizDeviceRegisteredFlowService.listDeviceRegisteredFlow(Integer.parseInt(pageNo), Integer.parseInt(pageSize), farmCode, chipId, deviceCode, startDate, endDate);
     }
 
     @PostMapping("/remove")
-    public Result remove(@RequestParam Map<String, Object> paramsMap) {
+    public Result remove(@RequestBody Map<String, Object> paramsMap) {
         boolean deleteStatus = false;
         String farmCode = "";
         if (paramsMap.get("farmCode") != null) {
-            farmCode = paramsMap.get("farmCode").toString();
+            farmCode = paramsMap.get("farmCode")+"";
             deleteStatus = true;
         }
         String chipId = "";
         if (paramsMap.get("chipId") != null) {
-            chipId = paramsMap.get("chipId").toString();
+            chipId = paramsMap.get("chipId")+"";
             deleteStatus = true;
         }
         String deviceCode = "";
         if (paramsMap.get("deviceCode") != null) {
-            deviceCode = paramsMap.get("deviceCode").toString();
+            deviceCode = paramsMap.get("deviceCode")+"";
             deleteStatus = true;
         }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
-            startDate = paramsMap.get("startDate").toString();
+            startDate = paramsMap.get("startDate")+"";
             deleteStatus = true;
         }
         String endDate = "";
         if (paramsMap.get("endDate") != null) {
-            endDate = paramsMap.get("endDate").toString();
+            endDate = paramsMap.get("endDate")+"";
             deleteStatus = true;
         }
         String ids = "";
         if (paramsMap.get("ids") != null) {
-            ids = paramsMap.get("ids").toString();
+            ids = paramsMap.get("ids")+"";
             deleteStatus = true;
         }
         if (!deleteStatus) {
@@ -105,7 +105,7 @@ public class BizDeviceRegisteredFlowController {
     }
 
     @PostMapping("/removeById")
-    public Result removeById(@RequestParam String ids) {
+    public Result removeById(@RequestBody String ids) {
         return bizDeviceRegisteredFlowService.removeDeviceRegisteredFlow(ids);
     }
 }

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

@@ -7,7 +7,7 @@ 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.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
@@ -27,32 +27,32 @@ public class BizDeviceUnregisteredController {
     private BizDeviceUnregisteredService bizDeviceUnregisteredService;
 
     @PostMapping("/list")
-    public Result list(@RequestParam Map<String, Object> paramsMap){
-        String pageNo = paramsMap.get("pageNo").toString();
+    public Result list(@RequestBody Map<String, Object> paramsMap){
+        String pageNo = paramsMap.get("pageNo")+"";
         if (pageNo == null) {
             pageNo = "1";
         }
-        String pageSize = paramsMap.get("pageSize").toString();
+        String pageSize = paramsMap.get("pageSize")+"";
         if (pageSize == null) {
             pageSize = "10";
         }
         String chipId = "";
         if (paramsMap.get("chipId") != null) {
-            chipId = paramsMap.get("chipId").toString();
+            chipId = paramsMap.get("chipId")+"";
         }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
-            startDate = paramsMap.get("startDate").toString();
+            startDate = paramsMap.get("startDate")+"";
         }
         String endDate = "";
         if (paramsMap.get("endDate") != null) {
-            endDate = paramsMap.get("endDate").toString();
+            endDate = paramsMap.get("endDate")+"";
         }
         return bizDeviceUnregisteredService.listDeviceUnregistered(Integer.parseInt(pageNo), Integer.parseInt(pageSize),  chipId, startDate, endDate);
     }
 
     @PostMapping("/remove")
-    public Result remove(@RequestParam String ids){
+    public Result remove(@RequestBody String ids){
         return bizDeviceUnregisteredService.remove(ids);
     }
 

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

@@ -7,7 +7,7 @@ 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.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
@@ -27,77 +27,77 @@ public class BizDeviceUnregisteredFlowController {
     private BizDeviceUnregisteredFlowService bizDeviceUnregisteredFlowService;
 
     @PostMapping("/remove")
-    public Result remove(@RequestParam Map<String, Object> paramsMap){
+    public Result remove(@RequestBody Map<String, Object> paramsMap){
         String farmCode = "";
         if (paramsMap.get("farmCode") != null) {
-            farmCode = paramsMap.get("farmCode").toString();
+            farmCode = paramsMap.get("farmCode")+"";
         }
         String chipId = "";
         if (paramsMap.get("chipId") != null) {
-            chipId = paramsMap.get("chipId").toString();
+            chipId = paramsMap.get("chipId")+"";
         }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
-            startDate = paramsMap.get("startDate").toString();
+            startDate = paramsMap.get("startDate")+"";
         }
         String endDate = "";
         if (paramsMap.get("endDate") != null) {
-            endDate = paramsMap.get("endDate").toString();
+            endDate = paramsMap.get("endDate")+"";
         }
         return bizDeviceUnregisteredFlowService.removeByChipIdAndLastTime(farmCode,chipId,startDate,endDate);
     }
 
     @PostMapping("/removeById")
-    public Result removeById(@RequestParam String ids){
+    public Result removeById(@RequestBody String ids){
         return bizDeviceUnregisteredFlowService.removeById(ids);
     }
 
     @PostMapping("/listByFarmCode")
-    public Result listByFarmCode(@RequestParam Map<String, Object> paramsMap){
-        String pageNo = paramsMap.get("pageNo").toString();
+    public Result listByFarmCode(@RequestBody Map<String, Object> paramsMap){
+        String pageNo = paramsMap.get("pageNo")+"";
         if (pageNo == null) {
             pageNo = "1";
         }
-        String pageSize = paramsMap.get("pageSize").toString();
+        String pageSize = paramsMap.get("pageSize")+"";
         if (pageSize == null) {
             pageSize = "10";
         }
         String chipId = "";
         if (paramsMap.get("chipId") != null) {
-            chipId = paramsMap.get("chipId").toString();
+            chipId = paramsMap.get("chipId")+"";
         }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
-            startDate = paramsMap.get("startDate").toString();
+            startDate = paramsMap.get("startDate")+"";
         }
         String endDate = "";
         if (paramsMap.get("endDate") != null) {
-            endDate = paramsMap.get("endDate").toString();
+            endDate = paramsMap.get("endDate")+"";
         }
         return bizDeviceUnregisteredFlowService.listByFarmCode(Integer.parseInt(pageNo), Integer.parseInt(pageSize), chipId, startDate, endDate);
     }
 
     @PostMapping("/listByChipId")
-    public Result listByChipId(@RequestParam Map<String, Object> paramsMap){
-        String pageNo = paramsMap.get("pageNo").toString();
+    public Result listByChipId(@RequestBody Map<String, Object> paramsMap){
+        String pageNo = paramsMap.get("pageNo")+"";
         if (pageNo == null) {
             pageNo = "1";
         }
-        String pageSize = paramsMap.get("pageSize").toString();
+        String pageSize = paramsMap.get("pageSize")+"";
         if (pageSize == null) {
             pageSize = "10";
         }
         String chipId = "";
         if (paramsMap.get("chipId") != null) {
-            chipId = paramsMap.get("chipId").toString();
+            chipId = paramsMap.get("chipId")+"";
         }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
-            startDate = paramsMap.get("startDate").toString();
+            startDate = paramsMap.get("startDate")+"";
         }
         String endDate = "";
         if (paramsMap.get("endDate") != null) {
-            endDate = paramsMap.get("endDate").toString();
+            endDate = paramsMap.get("endDate")+"";
         }
         return bizDeviceUnregisteredFlowService.listChipId(Integer.parseInt(pageNo), Integer.parseInt(pageSize), chipId, startDate, endDate);
     }

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

@@ -24,56 +24,57 @@ public class BizFarmController {
     private BizFarmService bizFarmService;
 
     @RequestMapping(value = "/addFarm",method = RequestMethod.POST)
-    public Result add(@RequestParam Map<String,Object> paramsMap) throws ParseException {
-        String farmName = paramsMap.get("farmName").toString();
-        String farmCode = paramsMap.get("farmCode").toString();
-        String linkman = paramsMap.get("linkman").toString();
-        String phone = paramsMap.get("phone").toString();
-        String remark = paramsMap.get("remark").toString();
+    public Result add(@RequestBody Map<String,Object> paramsMap) throws ParseException {
+        String farmName = paramsMap.get("farmName")+"";
+        String farmCode = paramsMap.get("farmCode")+"";
+        String linkman = paramsMap.get("linkman")+"";
+        String phone = paramsMap.get("phone")+"";
+        String remark = paramsMap.get("remark")+"";
+        System.out.println("remark="+remark);
         return bizFarmService.save(farmName,farmCode,linkman,phone,remark);
     }
 
     @PostMapping("/editFarm")
-    public Result edit(@RequestParam Map<String,Object> paramsMap) throws ParseException {
-        String id = paramsMap.get("id").toString();
-        String farmName = paramsMap.get("farmName").toString();
-        String farmCode = paramsMap.get("farmCode").toString();
-        String linkman = paramsMap.get("linkman").toString();
-        String phone = paramsMap.get("phone").toString();
-        String remark = paramsMap.get("remark").toString();
+    public Result edit(@RequestBody Map<String,Object> paramsMap) throws ParseException {
+        String id = paramsMap.get("id")+"";
+        String farmName = paramsMap.get("farmName")+"";
+        String farmCode = paramsMap.get("farmCode")+"";
+        String linkman = paramsMap.get("linkman")+"";
+        String phone = paramsMap.get("phone")+"";
+        String remark = paramsMap.get("remark")+"";
         return bizFarmService.edit(Integer.parseInt(id),farmName,farmCode,linkman,phone,remark);
     }
 
     @PostMapping("/removeFarm")
-    public Result remove(@RequestParam String ids){
+    public Result remove(@RequestBody String ids){
         return bizFarmService.remove(ids);
     }
 
     @PostMapping("/listFarm")
-    public Result list(@RequestParam Map<String,Object> paramsMap) {
-        String pageNo = paramsMap.get("pageNo").toString();
+    public Result list(@RequestBody Map<String,Object> paramsMap) {
+        String pageNo = paramsMap.get("pageNo")+"";
         if(pageNo == null){
             pageNo ="1";
         }
-        String pageSize = paramsMap.get("pageSize").toString();
+        String pageSize = paramsMap.get("pageSize")+"";
         if(pageSize == null){
             pageSize = "10";
         }
         String farmName = "";
         if(paramsMap.get("farmName") != null){
-            farmName = paramsMap.get("farmName").toString();
+            farmName = paramsMap.get("farmName")+"";
         }
         String farmCode = "";
         if(paramsMap.get("farmCode") != null){
-            farmCode = paramsMap.get("farmCode").toString();
+            farmCode = paramsMap.get("farmCode")+"";
         }
         String startDate = "";
         if(paramsMap.get("startDate") != null) {
-            startDate = paramsMap.get("startDate").toString();
+            startDate = paramsMap.get("startDate")+"";
         }
         String endDate = "";
         if(paramsMap.get("endDate") !=null) {
-            endDate = paramsMap.get("endDate").toString();
+            endDate = paramsMap.get("endDate")+"";
         }
         return bizFarmService.list(Integer.parseInt(pageNo),Integer.parseInt(pageSize),farmName,farmCode,startDate,endDate);
     }

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

@@ -8,7 +8,7 @@ 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.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
@@ -29,32 +29,32 @@ public class BizRawDataController {
     private BizRawDataService bizRawDataService;
 
     @PostMapping("/list")
-    public Result list(@RequestParam Map<String, Object> paramsMap){
-        String pageNo = paramsMap.get("pageNo").toString();
+    public Result list(@RequestBody Map<String, Object> paramsMap){
+        String pageNo = paramsMap.get("pageNo")+"";
         if (pageNo == null) {
             pageNo = "1";
         }
-        String pageSize = paramsMap.get("pageSize").toString();
+        String pageSize = paramsMap.get("pageSize")+"";
         if (pageSize == null) {
             pageSize = "10";
         }
         String chipId = "";
         if (paramsMap.get("chipId") != null) {
-            chipId = paramsMap.get("chipId").toString();
+            chipId = paramsMap.get("chipId")+"";
         }
         String startDate = "";
         if (paramsMap.get("startDate") != null) {
-            startDate = paramsMap.get("startDate").toString();
+            startDate = paramsMap.get("startDate")+"";
         }
         String endDate = "";
         if (paramsMap.get("endDate") != null) {
-            endDate = paramsMap.get("endDate").toString();
+            endDate = paramsMap.get("endDate")+"";
         }
         return bizRawDataService.listRawData(Integer.parseInt(pageNo), Integer.parseInt(pageSize),  chipId, startDate, endDate);
     }
 
     @PostMapping("/remove")
-    public Result remove(@RequestParam String ids){
+    public Result remove(@RequestBody String ids){
         return bizRawDataService.remove(ids);
     }
 }

registration-center/src/main/java/com/huimv/center/server/RegisterServer.java

@@ -24,9 +24,8 @@ public class RegisterServer {
     @Autowired
     private RegisterServerHandler serverHandler;
     //监听端口
-//    private int port = 8012;
     private int port = 10023;
-    private int port2 = 8013;
+    private int port2 = 10021;
 
     //创建构造方法
     public RegisterServer(){

registration-center/src/main/java/com/huimv/center/server/RegisterServerHandler.java

@@ -124,8 +124,6 @@ public class RegisterServerHandler extends ChannelInboundHandlerAdapter {
         //芯片id/设备编码
         String idCode = dataArray[1];
         String cmd = dataArray[2];
-//        Map map = new HashMap();
-//        map.put("askText", askText);
         // 保存请求命令
         producer.sendAskCmdRawData(askText);
         if (cmdHeader.trim().equalsIgnoreCase("hm")) {
@@ -149,79 +147,10 @@ public class RegisterServerHandler extends ChannelInboundHandlerAdapter {
                     // 发送设备未注册消息
                     producer.sendDeviceUnregistered(idCode,askText);
                 }
-//            } else if (cmd.trim().equalsIgnoreCase("1")) {
-//                System.out.println("==>命令1请求 askText>>" + askText.trim());
-//                //处理获取设备编码命令
-//                //{读取设备编码}
-//                String deviceCode = dataService.getDeviceCodeByChipId(idCode);
-//                log.info("获取设备编码结果,芯片id>>" + idCode + " ,deviceCode>>" + deviceCode);
-//                if (deviceCode != null) {
-//                    String answer = "hm+1+0+" + deviceCode + "+123+8+end";
-//                    log.info(">>命令1设备编码-应答数据>>" + answer);
-//                    ctx.writeAndFlush(Unpooled.copiedBuffer(answer.getBytes()));
-//                } else {
-//                    log.error("检测到未注册的采集器设备,已舍弃请求.");
-//                }
-//            } else if (cmd.trim().equalsIgnoreCase("2")) {
-//                System.out.println("==>命令2请求 askText>>" + askText);
-//                if (dataService.isEffectiveDevice(idCode)) {
-//                    //处理服务器时间命令
-//                    String answer = "hm+2+" + dateUtil.getNowText() + "+4+end";
-//                    log.info(">>命令2服务器时间-应答数据>>" + answer);
-//                    ctx.writeAndFlush(Unpooled.copiedBuffer(answer.getBytes()));
-//                }else {
-//                    System.out.println("##获取服务器时间-无效设备编码 idCode=" + idCode);
-//                }
-//            } else if (cmd.trim().equalsIgnoreCase("3")) {
-//                System.out.println("==>命令3请求 askText>>" + askText);
-//                //处理心跳包命令
-//                //{设备心跳应答}
-//                if (dataService.isEffectiveDevice(idCode)) {
-//                    String answer = "hm+3+6+end";
-//                    log.info(">>命令3心跳包-应答数据>>" + answer);
-//                    ctx.writeAndFlush(Unpooled.copiedBuffer(answer.getBytes()));
-//
-//                    //{发送到设备处理消息队列}
-//                    dataService.sendDeviceMQ(map);
-//                    log.info(">>发送设备心跳数据消息到MQ."+map);
-//                } else {
-//                    System.out.println("##心跳包-无效设备编码(" + idCode+")，请求拒绝。");
-//                }
-//            } else if (cmd.trim().equalsIgnoreCase("4")) {
-//                System.out.println("==>命令4请求 askText>>" + askText);
-//                //处理设备环境温度命令
-//                //{设备环境温度应答}
-//                if (dataService.isEffectiveDevice(idCode)) {
-//                    String answer = "hm+4+7+end";
-//                    log.info(">>命令4环境温度-应答数据>>" + answer);
-//                    ctx.writeAndFlush(Unpooled.copiedBuffer(answer.getBytes()));
-//
-//                    //{发送到设备处理消息队列}
-//                    dataService.sendDeviceMQ(map);
-//                    log.info(">>发送设备环境温度数据消息到MQ."+map);
-//                } else {
-//                    System.out.println("##环境温度-无效设备编码(" + idCode+")，请求拒绝。");
-//                }
             } else {
                 System.out.println("==>非法命令");
                 log.error(">>当前数据为非法数据>>" + askText);
             }
-//        } else if (cmdHeader.trim().equalsIgnoreCase("zj")) {
-//            System.out.println("==>耳标命令请求 askText>>"+askText);
-//            //耳标应答数据（不需要应答）
-//            if (checkValidEarmark(cmd)) {
-//                log.error(">>舍弃掉未配置耳标号的耳标，" + askText + "");
-//            } else {
-//                //{检查设备是否在处于工作状态或待机状态}
-////                if (dataService.isWorkStatusDevice(idCode)) {
-//                if (dataService.isEffectiveDevice(idCode)) {
-//                    //{发送到耳标处理消息队列}
-//                    dataService.sendEartagMQ(map);
-//                    log.info(">>发送耳标数据消息到MQ."+map);
-//                }else{
-//                    System.out.println("无效设备编码 idCode="+idCode);
-//                }
-//            }
         } else {
             System.out.println("==>非法命令");
             log.error("##当前请求数据为非法数据>>" + askText);

registration-center/src/main/java/com/huimv/center/utils/IDUtil.java

@@ -1,5 +1,6 @@
 package com.huimv.center.utils;
 
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -16,7 +17,19 @@ import java.util.List;
 @Component
 public class IDUtil {
 
-    public List<Integer> convert(String ids){
+    /**
+     * @Method      : convertToList
+     * @Description : 
+     * @Params      : [idSet]
+     * @Return      : java.util.List<java.lang.Integer>
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/28       
+     * @Time        : 11:21
+     */
+    public List<Integer> convert(String idSet){
+        JSONObject idsJo = JSONObject.parseObject(idSet);
+        String ids = idsJo.getString("ids");
         List<Integer> idList = new ArrayList<>();
         String[] idsArray = ids.split(",");
         for(String id:idsArray){

registration-center/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=pool1
+spring.profiles.active=pool2
 
 #¿ªÆô½¡¿µ¼à¿Ø
 management.endpoints.web.exposure.include=*

registration-center/target/classes/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=pool1
+spring.profiles.active=pool2
 
 #¿ªÆô½¡¿µ¼à¿Ø
 management.endpoints.web.exposure.include=*

registration-center/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,5 +1,6 @@
 com\huimv\center\listener\DeviceListener.class
 com\huimv\center\HuimvRegistrationCenterApplication.class
+com\huimv\center\server\RegisterServerHandler2.class
 com\huimv\center\service\impl\BizDeviceUnregisteredServiceImpl.class
 com\huimv\center\controller\BizRawDataController.class
 com\huimv\center\service\impl\BizDeviceAnswerFlowServiceImpl.class
@@ -27,6 +28,7 @@ com\huimv\center\mapper\BizTransferHistoryMapper.class
 com\huimv\center\controller\BizDeviceUnregisteredController.class
 com\huimv\center\service\BizDeviceUnregisteredService.class
 com\huimv\center\mapper\BizDeviceRegisterMapper.class
+com\huimv\center\server\RegisterServer2$1.class
 com\huimv\center\mapper\BizDeviceUnregisteredFlowMapper.class
 com\huimv\center\utils\Constant$ScheduleStatus.class
 com\huimv\center\service\impl\BizFarmServiceImpl.class
@@ -46,6 +48,7 @@ com\huimv\center\utils\SQLFilter.class
 com\huimv\center\controller\BizFarmController.class
 com\huimv\center\mapper\BizFarmMapper.class
 com\huimv\center\utils\Query.class
+com\huimv\center\server\RegisterServer2.class
 com\huimv\center\controller\BizDeviceRegisterController.class
 com\huimv\center\utils\Const.class
 com\huimv\center\utils\IDUtil.class

registration-center/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,6 +1,7 @@
 D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\config\TopicRabbitMQConfig.java
 D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\impl\BizDeviceAnswerFlowServiceImpl.java
 D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\utils\Query.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\server\RegisterServerHandler2.java
 D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\config\MybatisPlusConfig.java
 D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\mapper\BizDeviceUnregisteredMapper.java
 D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\BizDeviceUnregisteredFlowService.java
@@ -12,6 +13,7 @@ D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\
 D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\impl\BizDeviceUnregisteredFlowServiceImpl.java
 D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\utils\Constant.java
 D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\controller\BizTransferHistoryController.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\server\RegisterServer2.java
 D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\BizDeviceRegisteredFlowService.java
 D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\mapper\BizRawDataMapper.java
 D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\pojo\BizTransferHistory.java