添加设备在线率统计

huimv-admin/src/main/java/com/huimv/admin/timer/CarmeraTimer.java

@@ -44,7 +44,7 @@ public class CarmeraTimer {
 
     @Autowired
     private ICameraBaseService cameraBaseService;
-
+        //数据库账号密码加密
     //更新摄像头状态
     @Scheduled(cron = "0 0/10 * * * ? ")
     private void updateCameraOnlin() throws Exception {
@@ -78,33 +78,15 @@ public class CarmeraTimer {
         System.out.println(" ====== getCameras请求参数：【" + params + "】");
         String data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, null, SECRET), params);
         System.out.println(" ====== getCameras请求返回结果：【{" + data + "}】");
-
         return data;
     }
 
-
-
     public static void main(String[] args) throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         String s = HttpClientSSLUtils.doPost("https://yzwlw.loongk.com/mobile/loginO?username=华统&password=21218cca77804d2ba1922c33e0151105",JSON.toJSONString(map));
         LoginDto loginDto = JSONUtil.toBean(s, LoginDto.class);
         DataToken token = loginDto.getData().getToken();
         String encode = Base64.encode(token.getUserId() + "_" + token.getToken());
-
-        //获取配置
-//        Map<String, Object> map2 = new HashMap<String, Object>();
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.add("Authorization",encode);
-//        HttpEntity<String> requestEntity = new HttpEntity<>(null, headers);
-//        RestTemplate restTemplate = new RestTemplate();
-//
-//        ResponseEntity<String> exchangePeizhi = restTemplate.exchange("https://yzwlw.loongk.com/mobile/loadShackConfig/"+"2c92083a83f8673701854cde3f6203bb", HttpMethod.GET, requestEntity, String.class);
-//        System.out.println("peizhi"+exchangePeizhi.getBody());
-//
-//        ResponseEntity<String> exchangeShishi = restTemplate.exchange("https://yzwlw.loongk.com/mobile/loadShackDatas/"+"2c92083a83f8673701854cde3f6203bb", HttpMethod.GET, requestEntity, String.class);
-//        System.out.println("shishi"+exchangeShishi.getBody());
-
-//        System.out.println(s);
     }
 
 

huimv-admin/src/main/java/com/huimv/admin/timer/ProtTimer.java

@@ -36,7 +36,6 @@ public class ProtTimer {
 
 
         for (int i = 1; i < 4; i++) {
-
             //假设已经拿到了数据
             String num = NumberUtils.getNumFloat(6.4, 8.6);//ph
 

huimv-admin/src/main/java/com/huimv/admin/timer/ShenChanTimer.java

@@ -3,6 +3,7 @@ package com.huimv.admin.timer;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
@@ -36,14 +37,16 @@ public class ShenChanTimer {
     private IProdStockService prodStockService;
 
 
-//    @Scheduled(cron = "0 0/11 * * * ? ")
-    @Scheduled(cron = "0 1 */1 * * ?")
+    @Scheduled(cron = "0 0 */1 * * ? ")
+//    @Scheduled(cron = "0 * * * * ?")
     private void getShenChan() throws Exception {
         Integer farmId = 21;
         String time = LocalDate.now().toString();
         String token = login();
         System.out.println("token"+token);
-        ProdStock prodStock = prodStockService.getOne(new QueryWrapper<ProdStock>().eq("farm_id", farmId).orderByDesc("creat_time").last("limit 1"));
+
+        DateTime dateTime = DateUtil.beginOfMonth(new Date());
+        ProdStock prodStock = prodStockService.getOne(new QueryWrapper<ProdStock>().ge("creat_time",dateTime).eq("farm_id", farmId).orderByDesc("creat_time").last("limit 1"));
 
         System.out.println(token);
 
@@ -67,11 +70,32 @@ public class ShenChanTimer {
         System.out.println(prodStockDto.toString());
         for (List stock : stockData) {
             if ("正康".equals(stock.get(0))){
-                prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
-                prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
-                prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
-                prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
-                prodStockService.updateById(prodStock);
+                if (ObjectUtil.isNotEmpty(prodStock)){
+                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
+                    prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
+                    prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
+                    prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+                    prodStockService.updateById(prodStock);
+                    prodStock.setCreatTime(new Date());
+                }else {
+                    prodStock = new ProdStock();
+                    prodStock.setZzcl(Integer.parseInt(stock.get(11).toString()));
+                    prodStock.setByzcl(Integer.parseInt(stock.get(13).toString()));
+                    prodStock.setYfzcl(Integer.parseInt(stock.get(14).toString()));
+                    prodStock.setZcl(Integer.parseInt(stock.get(15).toString()));
+                    prodStock.setMzcl(100);
+                    prodStock.setGzcl(200);
+                    prodStock.setBrzcl(452);
+                    prodStock.setHbzcl(100);
+                    prodStock.setRszcl(30);
+                    prodStock.setBrmzcl(20);
+                    prodStock.setKhzcl(212);
+                    prodStock.setSpzcl(1020);
+                    prodStock.setCreatTime(new Date());
+
+                    prodStockService.updateById(prodStock);
+                }
+
             }
         }