增加对第三方平台对接接口

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

@@ -21,6 +21,12 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/**/my/*","/**/pig/*","/**/eartagData/api/eartagData/*","/**/eartagData/api/qingshan/*","**/eartagRegister/listFarmUnitEartagData");
+                excludePathPatterns("/**/my/*",
+                        "/**/pig/*",
+                        "/**/eartagData/api/eartagData/*",
+                        "/**/eartagData/api/qingshan/*",
+                        "**/eartagRegister/listFarmUnitEartagData",
+                        "/eartagRegister/listFarmUnitEartagData2/**",
+                        "/eartagData/api/getEnvByTime/**");
     }
 }

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

@@ -28,12 +28,12 @@ public class JWTInterceptor implements HandlerInterceptor {
         if (!(handler instanceof HandlerMethod)) {
             return true;
         }
+        System.out.println("------------------------------------> ");
 
         response.setContentType("application/json;charset=utf-8");
         // 获取token
         String token=request.getHeader("accessToken");
 
-
         if (null==token){
             Map<String,Object> map=new HashMap<>();
             map.put("data","token is null");

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagData2Controller.java

@@ -32,10 +32,14 @@ public class EartagData2Controller {
     public Result getEnvByTime(@RequestBody Map<String,String> map, HttpServletRequest request){
         Integer userId = TokenSign.getMemberIdByJwtToken(request);
         map.put("userId",userId+"");
-
         return eartagDataService.getEnvByTime(map);
     }
 
+    @PostMapping("/api/getEnvByTime")
+    public Result getEnvByTime2(@RequestBody Map<String,String> map, HttpServletRequest request){
+        return eartagDataService.getEnvByTime2(map);
+    }
+
     /**
      * @Method      : getEartagDataByEarmark
      * @Description : earmark,startDate,endDate

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagRegisterController.java

@@ -31,6 +31,7 @@ public class EartagRegisterController {
     public Result listFarmUnitEartagData(@RequestBody Map<String, String> params){
         return eartagRegisterService.listFarmUnitEartagData(params);
     }*/
+
     @RequestMapping("/listFarmUnitEartagData")
     public Result listFarmUnitEartagData(@RequestBody Map<String, String> params, HttpServletRequest req){
         Integer userId = TokenSign.getMemberIdByJwtToken(req);
@@ -38,6 +39,13 @@ public class EartagRegisterController {
         return eartagRegisterService.listFarmUnitEartagData(params);
     }
 
+    @RequestMapping("/listFarmUnitEartagData2")
+    public Result listFarmUnitEartagData2(@RequestBody Map<String, String> params, HttpServletRequest req){
+        Integer userId = TokenSign.getMemberIdByJwtToken(req);
+        params.put("userId",userId+"");
+        return eartagRegisterService.listFarmUnitEartagData2(params);
+    }
+
     @RequestMapping("/listFarmUnitEartagDataByFarmer")
     public Result listFarmUnitEartagDataByFarmer(@RequestBody Map<String, String> params){
         return eartagRegisterService.listFarmUnitEartagDataByFarmer(params);

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

@@ -22,6 +22,8 @@ public interface IEartagData2Service extends IService<EartagData2> {
 
     Result getEnvByTime(Map<String, String> map);
 
+    Result getEnvByTime2(Map<String, String> map);
+
     Result getEartagDataByEarmark(Map<String, String> map);
 
     Result getTemp(Map<String, String> map);

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

@@ -18,5 +18,7 @@ public interface IEartagEartagRegister2Service extends IService<EartagEartagRegi
 
     Result listFarmUnitEartagData(Map<String, String> params);
 
+    Result listFarmUnitEartagData2(Map<String, String> params);
+
     Result listFarmUnitEartagDataByFarmer(Map<String, String> params);
 }

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

@@ -115,6 +115,43 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
     }
 
     @Override
+    public Result getEnvByTime2(Map<String, String> map) {
+        String earmark = map.get("earmark");
+        String startDate = map.get("startDate");
+        String endDate = map.get("endDate");
+//        String userId = map.get("userId");
+        Date now = new Date();
+//        SysAccountMultilevel user = sysAccountMultilevelMapper.selectById(userId);
+        if (StringUtils.isBlank(earmark)) {
+            return new Result(10001, "请选择耳标", false);
+        }
+        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        wrapper.eq("earmark", earmark);
+        if (StringUtils.isBlank(startDate)) {
+            wrapper.ge("add_time", DateUtil.beginOfDay(now));
+        } else {
+            wrapper.between("add_time", startDate, endDate);
+        }
+        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);
+//                }
+//
+//            }
+//        }
+        return new Result(ResultCode.SUCCESS, list);
+    }
+
+    @Override
     public Result getEartagDataByEarmark(Map<String, String> map) {
         String earmark = map.get("earmark");
 //        String recordCount = map.get("recordCount");

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

@@ -46,16 +46,12 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         String liveStatus = params.get("liveStatus");
         String userId = params.get("userId");
         SysAccountMultilevel user = sysAccountMultilevelMapper.selectById(userId);
-
-
         if (StringUtils.isBlank(pageNo)){
             pageNo="1";
         }
         if (StringUtils.isBlank(pageSize)){
             pageSize="20";
         }
-
-
         Float maxEarTemp = 0F;
         Float minEarTemp = 100F;
         QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
@@ -65,9 +61,6 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
             wrapper.le("act",10000);
             wrapper.eq("live_status", 1);
         }*/
-
-
-
         //设备
         wrapper.like(StringUtils.isNotBlank(deviceCode),"last_device",deviceCode);
         wrapper.eq("farm_id",farmId);
@@ -75,20 +68,15 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         wrapper.like(StringUtils.isNotBlank(earmark),"earmark",earmark);
         wrapper.eq(StringUtils.isNotBlank(liveStatus),"live_status",liveStatus);
         wrapper.orderByDesc("ask_time");
-
         //大堰河牧场过滤
         if ("330112004".equals(farmId)){
             wrapper.eq("live_status", 1).and( i->i.likeRight("earmark","1332022109003").or().likeRight("earmark","1332022109004"));
         }
-
-
-
         Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
         if (user.getIsUser() == 0){
          for (EartagEartagRegister2 record : page.getRecords()) {
             Float earTemp1 = record.getEarTemp1();
             Long act = record.getAct();
-
                 if (earTemp1 >40){
                     record.setEarTemp1(40F);
                 }
@@ -102,12 +90,9 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
                     record.setAct(0L);
                 }
             }
-
         }
-
         Map map = new HashMap();
         long allCount = this.count(wrapper);
-
         //在线
         if (!"330112004".equals(farmId)){
             wrapper.eq("live_status", 1);
@@ -118,8 +103,6 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
             minEarTemp = 0F;
         }
         for (EartagEartagRegister2 record : list) {
-
-
             Float earTemp1 = record.getEarTemp1();
             Long act = record.getAct();
             //客户数据
@@ -131,24 +114,109 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
                     earTemp1 = 30F;
                 }
             }
-
-
             maxEarTemp = Math.max(earTemp1,maxEarTemp);
-
             minEarTemp = Math.min(earTemp1,minEarTemp);
         }
-
-
         map.put("countOff",allCount-onCount);
         map.put("countOn",onCount);
         map.put("countAll",allCount);
         map.put("maxEarTemp",maxEarTemp);
         map.put("minEarTemp",minEarTemp);
         map.put("page",page);
-
         return new Result(ResultCode.SUCCESS,map);
+    }
 
+    @Override
+    public Result listFarmUnitEartagData2(Map<String, String> params) {
+        String pageSize = params.get("pageSize");
+        String pageNo = params.get("pageNo");
+        String unitId = params.get("unitId");
+        String deviceCode = params.get("deviceCode");
+        String farmId = params.get("farmId");
+        String earmark = params.get("earmark");
+        String liveStatus = params.get("liveStatus");
+        String userId = params.get("userId");
+//        SysAccountMultilevel user = sysAccountMultilevelMapper.selectById(userId);
+        if (StringUtils.isBlank(pageNo)){
+            pageNo="1";
+        }
+        if (StringUtils.isBlank(pageSize)){
+            pageSize="20";
+        }
+        Float maxEarTemp = 0F;
+        Float minEarTemp = 100F;
+        QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
+        //客户数据
+       /* if (user.getIsUser() == 0){
+            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);
+        wrapper.eq(StringUtils.isNotBlank(unitId),"unit_id",unitId);
+        wrapper.like(StringUtils.isNotBlank(earmark),"earmark",earmark);
+        wrapper.eq(StringUtils.isNotBlank(liveStatus),"live_status",liveStatus);
+        wrapper.orderByDesc("ask_time");
+        //大堰河牧场过滤
+        if ("330112004".equals(farmId)){
+            wrapper.eq("live_status", 1).and( i->i.likeRight("earmark","1332022109003").or().likeRight("earmark","1332022109004"));
+        }
+        Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
+//        if (user.getIsUser() == 0){
+            for (EartagEartagRegister2 record : page.getRecords()) {
+                Float earTemp1 = record.getEarTemp1();
+                Long act = record.getAct();
+                if (earTemp1 >40){
+                    record.setEarTemp1(40F);
+                }
+                if (earTemp1 <30){
+                    record.setEarTemp1(30F);
+                }
+                if (act >300){
+                    record.setAct(300L);
+                }
+                if (act<0){
+                    record.setAct(0L);
+                }
+            }
+//        }
+        Map map = new HashMap();
+        long allCount = this.count(wrapper);
+        //在线
+        if (!"330112004".equals(farmId)){
+            wrapper.eq("live_status", 1);
+        }
+        long onCount = this.count(wrapper);
+        List<EartagEartagRegister2> list = this.list(wrapper);
+        if (list.size() == 0){
+            minEarTemp = 0F;
+        }
+        for (EartagEartagRegister2 record : list) {
+            Float earTemp1 = record.getEarTemp1();
+            Long act = record.getAct();
+            //客户数据
+//            if (user.getIsUser() == 0){
+//                if (earTemp1 >40){
+//                    earTemp1 = 40F;
+//                }
+//                if (earTemp1 <30){
+//                    earTemp1 = 30F;
+//                }
+//            }
+            maxEarTemp = Math.max(earTemp1,maxEarTemp);
+            minEarTemp = Math.min(earTemp1,minEarTemp);
+        }
+        map.put("countOff",allCount-onCount);
+        map.put("countOn",onCount);
+        map.put("countAll",allCount);
+        map.put("maxEarTemp",maxEarTemp);
+        map.put("minEarTemp",minEarTemp);
+        map.put("page",page);
+        return new Result(ResultCode.SUCCESS,map);
     }
+
     @Autowired
     private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
 

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

@@ -2,7 +2,7 @@ server:
   port: 8099
 spring:
   application:
-    name: huimv-eartag2-manage
+    name: huimv-eartag2-manage2
 
   datasource:
     url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai

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

@@ -2,7 +2,7 @@ server:
   port: 8099
 spring:
   application:
-    name: huimv-eartag2-manage
+    name: huimv-eartag2-manage2
 
   datasource:
     url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai