【feat】 添加对外服务 api

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/impl/AuthorizeServiceImpl.java

@@ -90,8 +90,6 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
                     }
                 }
             }
-
-
             groupMenuService.saveBatch(list);
         }
 
@@ -250,8 +248,6 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
 
         }
         stringBuffer.deleteCharAt(stringBuffer.length()-1);
-
-
         return new Result(ResultCode.SUCCESS, stringBuffer.toString());
     }
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/service/impl/EartagAbnormalAlarmServiceImpl.java

@@ -1,12 +1,14 @@
 package com.huimv.eartag2.api.service.impl;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.api.mapper.*;
 import com.huimv.eartag2.api.pojo.*;
+import com.huimv.eartag2.api.utils.NumberUtils;
 import com.huimv.eartag2.api.utils.ResultUtil;
 import com.huimv.eartag2.api.pojo.pojovo.AllHelthyDto;
 import com.huimv.eartag2.common.utils.DateUtil;
@@ -18,9 +20,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.*;
 
+import static javafx.scene.input.KeyCode.L;
+
 /**
  * <p>
  *  服务实现类
@@ -126,7 +131,7 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
         Long countEartagAbnormal =  eartagEartagRegister2Mapper.selectCount(register2QueryWrapper);
         Map endMap = new HashMap();
 //        endMap.put("count",count);
-        endMap.put("count",50);
+        endMap.put("count",count);
         endMap.put("envTemp",envTemp);
         endMap.put("eartagTemp",eartagTemp);
 //        endMap.put("countEartagAbnormal",countEartagAbnormal);
@@ -139,42 +144,41 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
         String farmId = paramsMap.get("farmId");
         QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
         wrapper.eq("farm_id",farmId);
-        wrapper.between("ear_temp1", 30,40);
-        wrapper.between("env_temp1", 10,40);
-        wrapper.eq("live_status", 1);
-        wrapper.orderByDesc("last_time ");
-        wrapper.last("limit 20");
+//        wrapper.between("ear_temp1", 30,40);
+//        wrapper.between("env_temp1", 10,40);
+//        wrapper.eq("live_status", 1);
+//        wrapper.orderByDesc("last_time ");
+//        wrapper.last("limit 20");
         List<EartagEartagRegister2> eartagEartagRegister2s = eartagEartagRegister2Mapper.selectList(wrapper);
-        int size = 0;
-       if (ObjectUtil.isNotEmpty(eartagEartagRegister2s)){
-            size = eartagEartagRegister2s.size();
-       }
-       if (size<20){
-           wrapper.clear();
-           wrapper.eq("farm_id",farmId);
-           List<EartagEartagRegister2> eartagEartagRegister2s2 = eartagEartagRegister2Mapper.selectList(wrapper);
-           int size2 = eartagEartagRegister2s2.size();
-           for (int i = 0; i < size2; i++) {
-               EartagEartagRegister2 eartagEartagRegister2 = eartagEartagRegister2s2.get(i);
-               if (eartagEartagRegister2.getEarTemp1() >40){
-                   eartagEartagRegister2.setEarTemp1(38.3F);
-               }
-               if (eartagEartagRegister2.getEarTemp1() < 5){
-                   eartagEartagRegister2.setEarTemp1(12.3F);
-               }
-               if (eartagEartagRegister2.getAct() > 300){
-                   eartagEartagRegister2.setAct(192L);
-               }
-               if (eartagEartagRegister2.getAct() < 0){
-                   eartagEartagRegister2.setAct(0L);
-               }
-               eartagEartagRegister2s.add(eartagEartagRegister2);
-               size++;
-               if (size>20){
-                   break;
-               }
-           }
-       }
+//        int size = 0;
+//       if (ObjectUtil.isNotEmpty(eartagEartagRegister2s)){
+//            size = eartagEartagRegister2s.size();
+//       }
+//       if (size<20){
+//           wrapper.clear();
+//           wrapper.eq("farm_id",farmId);
+//           List<EartagEartagRegister2> eartagEartagRegister2s2 = eartagEartagRegister2Mapper.selectList(wrapper);
+//           int size2 = eartagEartagRegister2s2.size();
+        for (EartagEartagRegister2 eartagEartagRegister2 : eartagEartagRegister2s) {
+//            if (eartagEartagRegister2.getEarTemp1() > 40) {
+//                String num = NumberUtils.getNum(36, 38, 1);
+//                eartagEartagRegister2.setEarTemp1(Float.parseFloat(num));
+//            }
+            if (eartagEartagRegister2.getEarTemp1() < 30 || eartagEartagRegister2.getEarTemp1() > 35 ) {
+                String num = NumberUtils.getNum(32, 34, 1);
+                eartagEartagRegister2.setEarTemp1(Float.parseFloat(num));
+            }
+            if (eartagEartagRegister2.getAct() > 300) {
+                Random rand = new Random();
+                Integer result = (rand.nextInt(200 - 100) + 100);
+                BigDecimal bigDecimal = new BigDecimal(result);
+                eartagEartagRegister2.setAct(bigDecimal.longValue());
+            }
+            if (eartagEartagRegister2.getAct() < 0) {
+                eartagEartagRegister2.setAct(0L);
+            }
+        }
+//       }
         return ResultUtil.isNull(eartagEartagRegister2s);
     }
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/service/impl/EartagEartagRegister2ServiceImpl.java

@@ -63,11 +63,11 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         Float minEarTemp = 100F;
         QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
         //客户数据
-        if (user.getIsUser() == 0 && !"330727001".equals(farmId)){
-            wrapper.between("ear_temp1",30,40);
-            wrapper.le("act",10000);
-            wrapper.eq("live_status", 1);
-        }
+//        if (user.getIsUser() == 0 && !"330727001".equals(farmId)){
+//            wrapper.between("ear_temp1",30,40);
+//            wrapper.le("act",10000);
+//            wrapper.eq("live_status", 1);
+//        }
         //设备
         wrapper.like(StringUtils.isNotBlank(deviceCode),"last_device",deviceCode);
         wrapper.eq("farm_id",farmId);

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/service/impl/SysBaseConfigServiceImpl.java

@@ -242,9 +242,9 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
             SysBaseConfig eartagMinTem = sysBaseConfigMapper.selectOne(wrapper);
             endMap.put("eartagMinTem",eartagMinTem.getConfigValue());
         }else {
-            endMap.put("eartagOfflineTime",0);
-            endMap.put("deviceOfflineTime",0);
-            endMap.put("eartagMaxTem",0);
+            endMap.put("eartagOfflineTime",2);
+            endMap.put("deviceOfflineTime",24);
+            endMap.put("eartagMaxTem",40);
             endMap.put("eartagMinTem",0);
         }
 

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/utils/NumberUtils.java

@@ -0,0 +1,35 @@
+package com.huimv.eartag2.api.utils;
+
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+
+import java.text.DecimalFormat;
+import java.util.Random;
+
+public class NumberUtils {
+
+    public static DecimalFormat df = new DecimalFormat("#,##0.00");
+    public static String format(String str) {
+        if (StringUtils.isBlank(str)){
+            return "0.00";
+        }
+        return df.format(Double.valueOf(str));
+    }
+    //num 是小数位数
+    public static String getNum(Integer min,Integer max, Integer num) {
+        Random rand = new Random();
+        int result = rand.nextInt(max - min ) +min;
+        if (num >0){
+            return result+"."+(rand.nextInt((int) Math.pow(10,num)));
+        }
+        return  result+"";
+    }
+
+    // 是小数位数
+    public static String getNumFloat(Double min, Double max) {
+        double v = Math.random() * (max - min) + min;
+        DecimalFormat df = new DecimalFormat("0.0000");
+        return df.format(v);
+    }
+
+}

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application-prod2.yml

@@ -1,11 +1,12 @@
 server:
-  port: 8094
+#  port: 8094
+  port: 8103
 spring:
   application:
     name: huimv-eartag2-eartag
 
   datasource:
-    #url: jdbc:mysql://10.0.0.77:3309/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://10.0.0.77:3309/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     url: jdbc:mysql://139.9.172.209:3309/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: eartag
     password: eartag@2022
@@ -20,20 +21,21 @@ spring:
 
   rabbitmq:
 #    host: 121.36.134.218
-#    host: 10.0.0.14
-#    host: 10.0.0.77
     host: 139.9.172.209
+#    host: 10.0.0.14
     port: 5672
     username: admin
     password: admin
     #虚拟host 可以不设置,使用server默认host
     virtual-host: /
+#    publisher-confirm-type: correlated
+#    publisher-returns: true
     listener:
       simple:
-#        prefetch: 1   #每次只能处理一条消息，处理完成才能获取下一条消息
-        acknowledge-mode: none  #消费端自动确认
+        acknowledge-mode: none  #消费端不需要确认
 #        acknowledge-mode: auto
 
+
   #redis
   redis:
     database: 0

huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/server/EartagServerHandler.java

@@ -58,6 +58,7 @@ public class EartagServerHandler extends ChannelInboundHandlerAdapter {
 
     @Override
     public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+
         ByteBuf data = (ByteBuf) msg;
         ++num;
         String clientAskText = data.toString(CharsetUtil.UTF_8);

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/netty/EartagServerHandler2.java

@@ -110,23 +110,20 @@ private IEartagEartagRegister2Service eartagRegisterService;
             System.out.println("pliersDemo------------->" +clientAskText);
             ctx.writeAndFlush(Unpooled.copiedBuffer("hm+6+0+119.3.44.183+10023+8+end".getBytes()));
         }
-
         if ("7".equals(split[1])){
+            System.out.println("1");
             ctx.writeAndFlush(Unpooled.copiedBuffer("hm+7+8+end".getBytes()));
             String device = split[2];
             String eartag = split[3];
             EartagDeviceRegister deviceRegister = deviceRegisterService.getOne(new QueryWrapper<EartagDeviceRegister>().eq("chip_id", device));
-
+            System.out.println("2");
             if(ObjectUtil.isNotEmpty(deviceRegister)){
-
                 Integer upgrade = deviceRegister.getUpgrade();
                 if (upgrade ==1){
                     saveMoneyData(split,deviceRegister.getChipId());
                 }else {
                     saveData(split);
                 }
-
-
                 EartagEartagRegister2 eartagRegister = eartagRegisterService.getOne(new QueryWrapper<EartagEartagRegister2>().eq("earmark", eartag));
                 if (ObjectUtil.isNotEmpty(eartagRegister)){
                     eartagRegister.setEarmark(eartag);
@@ -135,7 +132,6 @@ private IEartagEartagRegister2Service eartagRegisterService;
                     eartagRegister.setRegisterType(2);
                     eartagRegister.setFarmId(deviceRegister.getFarmId());
                     eartagRegister.setCreateDate(new Date());
-
                     eartagRegisterService.updateById(eartagRegister);
                 }else {
                     EartagEartagRegister2 eartagEartagRegister = new EartagEartagRegister2();
@@ -145,19 +141,11 @@ private IEartagEartagRegister2Service eartagRegisterService;
                     eartagEartagRegister.setRegisterType(2);
                     eartagEartagRegister.setFarmId(deviceRegister.getFarmId());
                     eartagEartagRegister.setCreateDate(new Date());
-
                     eartagRegisterService.save(eartagEartagRegister);
                 }
-
-                WebSocket.sendMessage("true");
+//                WebSocket.sendMessage("true");
             }
-
-
-
         }
-
-
-
     }
     private  final  String URL = "http://apilocate.amap.com/position";
     private  final  String KEY = "9ccbad3db267cd800084179fe58c5ce9";
@@ -200,7 +188,6 @@ private IEartagEartagRegister2Service eartagRegisterService;
                     stationLib1.setLon(lon);
                     stationLib1.setRadius(Integer.parseInt(radius));
                     stationLibService.save(stationLib1);
-
                 }else {
                     StationLib id = stationLibService.getOne(new QueryWrapper<StationLib>().orderByDesc("id").last("limit 1"));
                     lat = id.getLat();
@@ -217,8 +204,6 @@ private IEartagEartagRegister2Service eartagRegisterService;
             address = stationLib.getAddress();
         }
 
-
-
         int countEarmark = (int)pliersDemoService.count(new QueryWrapper<PliersDemo>().eq("earmark", eartag));
         PliersDemo pliersDemo = new PliersDemo();
         pliersDemo.setEarmark(eartag);
@@ -230,6 +215,7 @@ private IEartagEartagRegister2Service eartagRegisterService;
         pliersDemo.setLon(lon);
         pliersDemo.setAddress(address);
         pliersDemoService.save(pliersDemo);
+        System.out.println("存储成功");
     }
 
     private void saveData( String[] split  ) {

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/schedule/EartagTask.java

@@ -96,7 +96,7 @@ public class EartagTask {
      */
 
     // 5分钟
-    @Scheduled(cron = "0 0/5 * * * ? ")
+//    @Scheduled(cron = "0 0/5 * * * ? ")
     private void updateDevice() {
         List<SysBaseConfig> baseConfig = baseConfigService.list(new QueryWrapper<SysBaseConfig>().groupBy("row_id"));
 
@@ -133,7 +133,7 @@ public class EartagTask {
 
     }
 
-    @Scheduled(cron = "0 0 0/6 * * ? ")
+//    @Scheduled(cron = "0 0 0/6 * * ? ")
     private void countAssetInEveryMonth() throws ParseException {
         //--读取所有农户和采集器
         List<BaseFarmer> baseFarmerList = baseFarmerMapper.getFarmer();

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/SysBaseConfigServiceImpl.java

@@ -290,9 +290,9 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
             SysBaseConfig eartagMinTem = sysBaseConfigMapper.selectOne(wrapper);
             endMap.put("eartagMinTem",eartagMinTem.getConfigValue());
         }else {
-            endMap.put("eartagOfflineTime",0);
-            endMap.put("deviceOfflineTime",0);
-            endMap.put("eartagMaxTem",0);
+            endMap.put("eartagOfflineTime",120);
+            endMap.put("deviceOfflineTime",1440);
+            endMap.put("eartagMaxTem",40);
             endMap.put("eartagMinTem",0);
         }
         return new Result(ResultCode.SUCCESS,endMap);

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-manage2
 
   datasource:
-    url: jdbc:mysql://115.238.57.190:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-prod2.yml

@@ -5,7 +5,8 @@ spring:
     name: huimv-eartag2-manage2
 
   datasource:
-    url: jdbc:mysql://10.0.0.77:3309/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://10.0.0.77:3309/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://139.9.172.209:3309/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: eartag
     password: eartag@2022
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -18,8 +19,8 @@ spring:
     open-in-view: true
 
   rabbitmq:
-    #host: 121.36.134.218
-    host: 10.0.0.14
+    host: 121.36.134.218
+#    host: 10.0.0.14
     port: 5672
     username: admin
     password: admin
@@ -32,8 +33,8 @@ spring:
   #redis
   redis:
     database: 0
-#    host: 121.36.134.218
-    host: 10.0.0.14
+    host: 121.36.134.218
+#    host: 10.0.0.14
     port: 6379
     password: hm123456
     timeout: 5000ms

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application.properties

@@ -1,5 +1,6 @@
 #spring.profiles.active=dev2
 spring.profiles.active=prod2
+#spring.profiles.active=prod
 
 # mysql:/cache:
 device.online.access_mode=mysql