环控111112

src/main/java/com/huimv/admin/config/InterceptorConfig.java

@@ -23,6 +23,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
         registry.addInterceptor(jwtInterceptor()).
                 excludePathPatterns("/*/my/*").
                 excludePathPatterns(("/env-electricity/testList")).
-                excludePathPatterns("/env-water/testList");
+                excludePathPatterns("/env-water/testList").
+                excludePathPatterns("/envDevice/getList");
     }
 }

src/main/java/com/huimv/admin/controller/EnvDeviceController.java

@@ -1,6 +1,10 @@
 package com.huimv.admin.controller;
 
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.EnvDevice;
 import com.huimv.admin.service.IEnvDeviceService;
@@ -8,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,66 +32,97 @@ public class EnvDeviceController {
 
     @RequestMapping("/DeviceCount")
     public Result getDevice(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return envDeviceService.count(httpServletRequest,paramsMap);
+        return envDeviceService.count(httpServletRequest, paramsMap);
     }
 
     @RequestMapping("/DeviceList")
     public Result getDeviceList(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return envDeviceService.list(httpServletRequest,paramsMap);
+        return envDeviceService.list(httpServletRequest, paramsMap);
     }
 
     @RequestMapping("/DeviceAdd")
     public Result getDeviceAdd(HttpServletRequest httpServletRequest, @RequestBody EnvDevice envDevice) {
-        return envDeviceService.add(httpServletRequest,envDevice);
+        return envDeviceService.add(httpServletRequest, envDevice);
     }
 
     @RequestMapping("/DeviceEdit")
     public Result getDeviceEdit(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return envDeviceService.edit(httpServletRequest,paramsMap);
+        return envDeviceService.edit(httpServletRequest, paramsMap);
     }
 
     @RequestMapping("/DeviceDelete")
     public Result getDeviceDelete(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return envDeviceService.delete(httpServletRequest,paramsMap);
+        return envDeviceService.delete(httpServletRequest, paramsMap);
     }
 
     @RequestMapping("/listPigpen")
     public Result listPigpen(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return envDeviceService.listPigpen(httpServletRequest,paramsMap);
+        return envDeviceService.listPigpen(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/listPigpenAll")
     public Result listPigpenAll(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return envDeviceService.listPigpenAll(httpServletRequest,paramsMap);
+        return envDeviceService.listPigpenAll(httpServletRequest, paramsMap);
     }
 
     @RequestMapping("/listEnv")
     public Result listEnv(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return envDeviceService.listEnv(httpServletRequest,paramsMap);
+        return envDeviceService.listEnv(httpServletRequest, paramsMap);
     }
 
     @RequestMapping("/listDeviceCount")
     public Result listDeviceCount(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return envDeviceService.listDeviceCount(httpServletRequest,paramsMap);
+        return envDeviceService.listDeviceCount(httpServletRequest, paramsMap);
     }
+
     @RequestMapping("/bandingUnitId")
     public Result bandingUnitId(HttpServletRequest httpServletRequest, @RequestBody EnvDevice envDevice) {
-        return envDeviceService.bandingUnitId(httpServletRequest,envDevice);
+        return envDeviceService.bandingUnitId(httpServletRequest, envDevice);
     }
+
     @RequestMapping("/unBandingUnitId")
     public Result unBandingUnitId(HttpServletRequest httpServletRequest, @RequestBody EnvDevice envDevice) {
         envDevice.setUnitId(0);
         envDevice.setUnitName("");
         envDeviceService.updateById(envDevice);
-        return new Result(10000,"解绑成功",true);
+        return new Result(10000, "解绑成功", true);
     }
 
     @RequestMapping("/selectList")
     public Result selectList(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        return envDeviceService.selectList(httpServletRequest,paramsMap);
+        return envDeviceService.selectList(httpServletRequest, paramsMap);
     }
+
     @PostMapping("/listDetail")
-    public Result listDetail(@RequestBody Map<String, String> paramsMap){
+    public Result listDetail(@RequestBody Map<String, String> paramsMap) {
         return envDeviceService.listDetail(paramsMap);
     }
 
+    //给安卓集控的同步设备
+    @PostMapping("/getList")
+    public JSONObject getList() {
+        QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", 28).orderByAsc("id");
+        List<EnvDevice> list = envDeviceService.list(queryWrapper);
+        JSONObject jsonObject = new JSONObject();
+        JSONArray jsonArray = new JSONArray();
+        for (EnvDevice envDevice : list) {
+            JSONObject object = new JSONObject();
+            object.put("deviceCode", envDevice.getDeviceCode());
+            object.put("deviceName", envDevice.getDeviceSortCode());
+            object.put("buildLocation", envDevice.getBuildLocation());
+            object.put("unitId", envDevice.getUnitId());
+            object.put("age", envDevice.getDayAge());
+            object.put("fengNum", envDevice.getFengJiNum());
+            object.put("fengBianNum", envDevice.getFengJiBianNum());
+            object.put("shilian", envDevice.getShiLianNum());
+            object.put("jiare", envDevice.getJiaReQiNum());
+            object.put("penwu", envDevice.getPenWuNum());
+            object.put("chuchou", envDevice.getChuChouNum());
+            object.put("zhaoming", envDevice.getZhaoMingDengNum());
+            jsonArray.add(object);
+        }
+        jsonObject.put("list", jsonArray);
+        return jsonObject;
+    }
 }

src/main/java/com/huimv/admin/service/impl/EnvDeviceServiceImpl.java

@@ -160,17 +160,17 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             EnvDevice device = envDeviceMapper.selectOne(queryWrapper);//名字和编码不能重复
             if (ObjectUtil.isEmpty(device)) {
                 QueryWrapper<EnvDevice> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.eq("farm_id", envDevice.getFarmId());
-                Integer integer = envDeviceMapper.selectCount(queryWrapper1);
-                if (integer == 0) {
+//                queryWrapper1.eq("farm_id", envDevice.getFarmId());
+//                Integer integer = envDeviceMapper.selectCount(queryWrapper1);
+              /*  if (integer == 0) {
                     envDevice.setDeviceSortCode("100" + "01");
                     addAll(envDevice);
-                } else {
+                } else {*/
                     queryWrapper1.orderByDesc("id").last(" limit 1");
                     EnvDevice envDevice2 = envDeviceMapper.selectOne(queryWrapper1);
                     envDevice.setDeviceSortCode(String.valueOf(Integer.parseInt(envDevice2.getDeviceSortCode()) + 1));
                     addAll(envDevice);
-                }
+//                }
                 envDeviceMapper.insert(envDevice);
                 return new Result(10000, "添加成功",true);
             } else {

src/main/resources/application-prod.yml

@@ -1,9 +1,9 @@
 server:
   port: 8096
   ssl:
-    key-store: classpath:15519580_newenv.ifarmcloud.com.jks
+    key-store: classpath:17242291_newenv.ifarmcloud.com.jks
     key-store-type: jks
-    key-store-password: eee7get9
+    key-store-password: 4ybrkfg3
 
 spring:
   application: