【feat】 添加对外服务 api

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

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

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/entity/EartagHourActEntity.java

@@ -35,4 +35,7 @@ public class EartagHourActEntity implements Serializable {
     @Column(name = "farm_code")
     private String farmCode;
 
+    @Column(name = "is_show")
+    private Integer isShow;
+
 }

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/repo/EartagHourActEntityRepo.java

@@ -12,4 +12,7 @@ public interface EartagHourActEntityRepo extends JpaRepository<EartagHourActEnti
 
     @Query(nativeQuery = true,value = "SELECT * FROM eartag_hour_act WHERE farm_code=?1 AND  earmark=?2 AND hour=?3 AND add_date=?4")
     Optional<EartagHourActEntity> findByFarmIdAndEarmarkAndHourAndDate(String farmId, String earmark, int nowHour, Date todayDate);
+
+    @Query(nativeQuery = true,value = "SELECT * FROM eartag_hour_act WHERE   earmark=?1 AND  add_date=?2 ORDER BY id DESC LIMIT 1")
+    Optional<EartagHourActEntity> findByEarmarkOrderById(String earmark, Date todayDate);
 }

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

@@ -728,9 +728,18 @@ public class EartagServiceImpl implements IEartagService {
     // {保存耳标小时运动量}
     private void saveEartagHourAct(String farmId, String earmark, long act1, int nowHour, java.sql.Date todayDate) {
         Optional<EartagHourActEntity> optionalHourAct = eartagHourActEntityRepo.findByFarmIdAndEarmarkAndHourAndDate(farmId, earmark, nowHour, todayDate);
+        Optional<EartagHourActEntity> optionalHourAct2 = eartagHourActEntityRepo.findByEarmarkOrderById( earmark,todayDate);
 //        long act = 0;
         if (!optionalHourAct.isPresent()) {
             EartagHourActEntity newEartagHourActEntity = new EartagHourActEntity();
+            if (optionalHourAct2.isPresent()){
+                EartagHourActEntity eartagHourActEntity = optionalHourAct2.get();
+                Integer hour = eartagHourActEntity.getHour();
+                act1 = act1 /(nowHour - hour +1 );
+            }else {
+                newEartagHourActEntity.setIsShow(1);
+            }
+
             newEartagHourActEntity.setFarmCode(farmId);
             newEartagHourActEntity.setEarmark(earmark);
             newEartagHourActEntity.setAddDate(todayDate);

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

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

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

@@ -1,8 +1,8 @@
 #spring.profiles.active=test
 #spring.profiles.active=local
 #spring.profiles.active=dev
-#spring.profiles.active=prod2
-spring.profiles.active=prod3
+spring.profiles.active=prod2
+#spring.profiles.active=prod3
 #spring.profiles.active=test2
 
 device.register.prefix=device_register_

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

@@ -35,6 +35,7 @@ public class EartagHourActServiceImpl extends ServiceImpl<EartagHourActMapper, E
     public Result getHourAct(String farmCode, String startDate,String endDate, String earmark) throws ParseException {
         QueryWrapper<EartagHourAct> queryWrapper= new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
+        queryWrapper.eq("is_show",0);
         queryWrapper.between("add_date",startDate,endDate);
         queryWrapper.eq(StringUtils.isNotBlank(earmark),"earmark",earmark);
         List orderByAscList = new ArrayList();
@@ -51,11 +52,11 @@ public class EartagHourActServiceImpl extends ServiceImpl<EartagHourActMapper, E
             resultList.add(map);
             map.put("addDate",du.formatDateText(eartagHourAct.getAddDate()));
             map.put("hour",eartagHourAct.getHour());
-            if (act >1000){
-                map.put("act",0);
-            }else {
+//            if (act >1000){
+//                map.put("act",0);
+//            }else {
                 map.put("act",act);
-            }
+//            }
         }
         return new Result(ResultCode.SUCCESS,resultList);
     }