【feat】 添加对外服务 api

huimv-eartag2-platform/gateway/src/main/resources/application-dev.yml

@@ -16,7 +16,7 @@ spring:
             - StripPrefix=1
 
         - id: manage2
-          uri: http://127.0.0.1:8097
+          uri: http://127.0.0.1:8099
           predicates:
             - Path=/manage2/**
           filters:

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

@@ -1,7 +1,8 @@
 #±¾µØÊý¾Ý¿â
 #spring.profiles.active=dev
 #Ô¶³ÌÊý¾Ý¿â
-spring.profiles.active=prod2
+spring.profiles.active=prod
+#spring.profiles.active=prod2
 #spring.profiles.active=prod3
 
 device.register.prefix=device_register_

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/config/InterceptorConfig.java

@@ -25,11 +25,13 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         "/**/pig/*",
                         "/**/eartagData/api/eartagData/*",
                         "/**/eartagData/api/qingshan/*",
-                        "**/eartagRegister/listFarmUnitEartagData",
+                        "/**/eartagRegister/listFarmUnitEartagData",
+                        "/manage2/eartagRegister/listFarmUnitEartagData",
                         "/eartagRegister/listFarmUnitEartagData2/**",
                         "/eartagData/api/getEnvByTime/**",
-                        "/manage2/eartagRegister/listFarmUnitEartagData",
                         "/manage2/eartagData/getEnvByTime",
+                        "/**/eartagData/getEnvByTime",
+                        "/**/eartag-hour-act/getAct",
                         "/manage2/eartag-hour-act/getAct");
     }
 }

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/service/impl/EartagServiceImpl.java

@@ -732,6 +732,7 @@ public class EartagServiceImpl implements IEartagService {
 //        long act = 0;
         if (!optionalHourAct.isPresent()) {
             EartagHourActEntity newEartagHourActEntity = new EartagHourActEntity();
+            newEartagHourActEntity.setIsShow(0);
             if (optionalHourAct2.isPresent()){
                 EartagHourActEntity eartagHourActEntity = optionalHourAct2.get();
                 Integer hour = eartagHourActEntity.getHour();

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

@@ -1,6 +1,6 @@
 server:
 #  port: 8094
-  port: 8101
+  port: 8103
 spring:
   application:
     name: huimv-eartag2-eartag

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

@@ -88,17 +88,17 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         wrapper.orderByAsc("add_time");
         List<EartagData2> list = this.list(wrapper);
         //用户数据
-        if (user.getIsUser() == 0) {
-            for (EartagData2 eartagData2 : list) {
-                Float earTemp1 = eartagData2.getEarTemp1();
-                if (earTemp1 > 40) {
-                    eartagData2.setEarTemp1(40F);
-                }
-                if (earTemp1 < 30) {
-                    eartagData2.setEarTemp1(30F);
-                }
-            }
-        }
+//        if (user.getIsUser() == 0) {
+//            for (EartagData2 eartagData2 : list) {
+//                Float earTemp1 = eartagData2.getEarTemp1();
+//                if (earTemp1 > 40) {
+//                    eartagData2.setEarTemp1(40F);
+//                }
+//                if (earTemp1 < 30) {
+//                    eartagData2.setEarTemp1(30F);
+//                }
+//            }
+//        }
         return new Result(ResultCode.SUCCESS, list);
     }
 

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

@@ -55,7 +55,7 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         String earmark = params.get("earmark");
         String liveStatus = params.get("liveStatus");
         String userId = params.get("userId");
-        SysAccountMultilevel user = sysAccountMultilevelMapper.selectById(userId);
+//        SysAccountMultilevel user = sysAccountMultilevelMapper.selectById(userId);
         if (StringUtils.isBlank(pageNo)){
             pageNo="1";
         }
@@ -66,11 +66,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);
@@ -86,41 +86,41 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
             wrapper.eq("live_status", 1).like("earmark","31111112222");
         }
         Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
-        if (user.getIsUser() == 0){
-         for (EartagEartagRegister2 record : page.getRecords()) {
-             String earmark1 = record.getEarmark();
-//             EartagData2 eartagData2 = eartagData2Mapper.selectOne(new QueryWrapper<EartagData2>().eq("earmark",earmark1).orderByDesc("id").last("limit 1"));
-//             if (ObjectUtil.isNotEmpty(eartagData2)){
-//                 record.setAct(eartagData2.getAct());
-//             }
-            Float earTemp1 = record.getEarTemp1();
-
-                if (earTemp1 >40){
-                    record.setEarTemp1(40F);
-                }
-                if (earTemp1 <30){
-                    double a= new Random().nextInt(32) % (2) + 29;
-                    DecimalFormat df = new DecimalFormat( "0.00" );
-                    String str=df.format( a );
-
-                    record.setEarTemp1(Float.parseFloat(str));
-                }
-//             EartagHourAct eartagHourAct = this.eartagHourAct.selectOne(new QueryWrapper<EartagHourAct>().eq("earmark", earmark1).orderByDesc("id").last("limit 1"));
-//                Integer act = 0;
-//                if (ObjectUtil.isNotEmpty(eartagHourAct)){
-//                    act = eartagHourAct.getAct();
-//                    if (act<0)
-//                        act = 0;
-//                }
-//             record.setAct(act.longValue());
-//                if (act >300){
-//                    record.setAct(300L);
+//        if (user.getIsUser() == 0){
+//         for (EartagEartagRegister2 record : page.getRecords()) {
+//             String earmark1 = record.getEarmark();
+////             EartagData2 eartagData2 = eartagData2Mapper.selectOne(new QueryWrapper<EartagData2>().eq("earmark",earmark1).orderByDesc("id").last("limit 1"));
+////             if (ObjectUtil.isNotEmpty(eartagData2)){
+////                 record.setAct(eartagData2.getAct());
+////             }
+//            Float earTemp1 = record.getEarTemp1();
+//
+//                if (earTemp1 >40){
+//                    record.setEarTemp1(40F);
 //                }
-//                if (act<0){
-//                    record.setAct(0L);
+//                if (earTemp1 <30){
+//                    double a= new Random().nextInt(32) % (2) + 29;
+//                    DecimalFormat df = new DecimalFormat( "0.00" );
+//                    String str=df.format( a );
+//
+//                    record.setEarTemp1(Float.parseFloat(str));
 //                }
-            }
-        }
+////             EartagHourAct eartagHourAct = this.eartagHourAct.selectOne(new QueryWrapper<EartagHourAct>().eq("earmark", earmark1).orderByDesc("id").last("limit 1"));
+////                Integer act = 0;
+////                if (ObjectUtil.isNotEmpty(eartagHourAct)){
+////                    act = eartagHourAct.getAct();
+////                    if (act<0)
+////                        act = 0;
+////                }
+////             record.setAct(act.longValue());
+////                if (act >300){
+////                    record.setAct(300L);
+////                }
+////                if (act<0){
+////                    record.setAct(0L);
+////                }
+//            }
+//        }
         Map map = new HashMap();
         long allCount = this.count(wrapper);
         //在线
@@ -135,14 +135,14 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         for (EartagEartagRegister2 record : list) {
             Float earTemp1 = record.getEarTemp1();
             //客户数据
-            if (user.getIsUser() == 0){
-                if (earTemp1 >40){
-                    earTemp1 = 40F;
-                }
-                if (earTemp1 <30){
-                    earTemp1 = 30F;
-                }
-            }
+//            if (user.getIsUser() == 0){
+//                if (earTemp1 >40){
+//                    earTemp1 = 40F;
+//                }
+//                if (earTemp1 <30){
+//                    earTemp1 = 30F;
+//                }
+//            }
             maxEarTemp = Math.max(earTemp1,maxEarTemp);
             minEarTemp = Math.min(earTemp1,minEarTemp);
         }