【feat】 添加对外服务 api

huimv-eartag2-platform/huimv-eartag2-common/pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>com.huimv</groupId>
     <artifactId>huimv-eartag2-common</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.3-SNAPSHOT</version>
 
 <!--    <distributionManagement>-->
 <!--        <repository>-->

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

@@ -30,7 +30,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         "/eartagRegister/listFarmUnitEartagData2/**",
                         "/eartagData/api/getEnvByTime/**",
                         "/manage2/eartagData/getEnvByTime",
-                        "/manage2/eartagData/getByTimeFilter",
+                        "/**/eartagData/getByTimeFilter",
                         "/**/eartagData/getEnvByTime",
                         "/**/eartag-hour-act/getAct",
                         "/manage2/eartag-hour-act/getAct");

huimv-eartag2-platform/huimv-eartag2-input/pom.xml

@@ -14,6 +14,7 @@
 
     <properties>
         <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
         <!-- eartag2-common -->

huimv-eartag2-platform/huimv-eartag2-manage2/pom.xml

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-eartag2-common</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>0.0.3-SNAPSHOT</version>
         </dependency>
         <!--rabbitmq-->
         <dependency>

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

@@ -79,7 +79,7 @@ public class EartagTask {
      */
 
     // 10分钟
-    @Scheduled(cron = "0 0/10 * * * ? ")
+//    @Scheduled(cron = "0 0 * * * ? ")
 //    @Scheduled(cron = "0 * * * * ? ")
     private void countEartagOnlineTimes() throws IOException, ParseException {
         Timestamp nowTimestamp = new Timestamp(new java.util.Date().getTime());

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

@@ -65,12 +65,6 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         Float maxEarTemp = 0F;
         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);
-//        }
         //设备
         wrapper.like(StringUtils.isNotBlank(deviceCode),"last_device",deviceCode);
         wrapper.eq("farm_id",farmId);
@@ -86,41 +80,7 @@ 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 (act<0){
-////                    record.setAct(0L);
-////                }
-//            }
-//        }
+
         Map map = new HashMap();
         long allCount = this.count(wrapper);
         //在线
@@ -135,14 +95,6 @@ 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;
-//                }
-//            }
             maxEarTemp = Math.max(earTemp1,maxEarTemp);
             minEarTemp = Math.min(earTemp1,minEarTemp);
         }