定时修改异常状态

smart.eartag.data.platform/huimv-smart-eartag-data-manager/pom.xml

@@ -11,10 +11,7 @@
 
     <artifactId>huimv-smart-eartag-data-manager</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/controller/EartagDataController.java

@@ -91,7 +91,7 @@ public class EartagDataController {
     }
 
     /**
-     * 查询每小时的上传量
+     * 查询每天的上传量
      */
     @RequestMapping("/countByDay")
     public R countByDay(@RequestParam Map<String, Object> params){
@@ -103,8 +103,8 @@ public class EartagDataController {
     /*
     * 获取每日数据统计
     */
-    @Scheduled(cron = "0 0/10 * * * ?")
-//    @RequestMapping("/test")
+//    @Scheduled(cron = "0 0/10 * * * ?")
+    @RequestMapping("/test")
     private void updateDailyData(){
         eartagDataService.updateDailyData();
     }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/controller/FarmStockController.java

@@ -58,8 +58,8 @@ public class FarmStockController {
      /*
      * 定时更新regionStockDay表
      */
-     @Scheduled(cron = "0 0/10 * * * ?")
-//     @RequestMapping("/test")
+//     @Scheduled(cron = "0 0/10 * * * ?")
+     @RequestMapping("/test")
     public void updateRegionStockDay(){
          farmStockService.updateRegionStockDay();
 

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/impl/BasePigpenServiceImpl.java

@@ -301,7 +301,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenDao, BasePigpen
                     nf.setMaximumFractionDigits(2);
                     double temp = Double.parseDouble(nf.format(tempValue / count));
                     System.out.println(temp);
-                    basePigpenEntity.setPigpenTemp(  temp);
+                    basePigpenEntity.setPigpenTemp(temp);
                     if (temp > 35.0||temp<10.0){
                         basePigpenEntity.setTempAnomaly(0);
                     }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/impl/EartagDataServiceImpl.java

@@ -352,7 +352,7 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
 
         String startTime = (String) params.get("startTime");
         String endTime = (String) params.get("endTime");
-        String deviceCode = (String) params.get("countByDay");
+        String deviceCode = (String) params.get("deviceCode");
 
 
         QueryWrapper<EartagDataEntity> wrapper = new QueryWrapper<>();

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/impl/FarmStockServiceImpl.java

@@ -82,260 +82,7 @@ public class FarmStockServiceImpl extends ServiceImpl<FarmStockDao, FarmStockEnt
 
     @Autowired
     private BaseRegionDao baseRegionDao;
-   /* @Override
-    public List countAll(Map<String, Object> params) {
-        QueryWrapper<BaseRegionEntity> baseRegionwrapper = new QueryWrapper<>();
-        List<BaseRegionEntity> baseRegionEntities = baseRegionDao.selectList(baseRegionwrapper);
-
-
-        String countyCode =(String) params.get("countyCode");
-        for (BaseRegionEntity baseRegionEntity : baseRegionEntities) {
-            if (baseRegionEntity.getRegionCode().equals(countyCode)){
-                if (baseRegionEntity.getParentCode() == null){
-                    countyCode =null;
-                }
-            }
-        }
-
-        String farmName = (String) params.get("farmName");
-        String minStockTotal =(String) params.get("minStockTotal");
-        String maxStockTotal =(String) params.get("maxStockTotal");
-        String minStockNew =(String) params.get("minStockNew");
-        String maxStockNew =(String) params.get("maxStockNew");
-        String minOfflineNo =(String) params.get("minOfflineNo");
-        String maxOfflineNo =(String) params.get("maxOfflineNo");
-        String minSowStock =(String) params.get("minSowStock");
-        String maxSowStock =(String) params.get("maxSowStock");
-
-        QueryWrapper<FarmStockEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(countyCode),"county_code",countyCode).or().eq(StringUtils.isNotBlank(countyCode),"city_code",countyCode);
-
-        wrapper.like(StringUtils.isNotBlank(farmName),"farm_name",farmName);
-
-        wrapper.ge(StringUtils.isNotBlank(minStockTotal),"stock_total",minStockTotal);
-        wrapper.le(StringUtils.isNotBlank(maxStockTotal),"stock_total",maxStockTotal);
-
-        wrapper.ge(StringUtils.isNotBlank(minStockNew),"stock_new",minStockNew);
-        wrapper.le(StringUtils.isNotBlank(maxStockNew),"stock_new",maxStockNew);
-
-        wrapper.ge(StringUtils.isNotBlank(minOfflineNo),"offline_no",minOfflineNo);
-        wrapper.le(StringUtils.isNotBlank(maxOfflineNo),"offline_no",maxOfflineNo);
-
-        wrapper.ge(StringUtils.isNotBlank(minOfflineNo),"sow_stock",minSowStock);
-        wrapper.le(StringUtils.isNotBlank(maxOfflineNo),"sow_stock",maxSowStock);
-        wrapper.apply("id IN( SELECT MAX(id) FROM `farm_stock` GROUP BY farm_code)");
-
-
-        List<FarmStockEntity> farmStockEntities = baseMapper.selectList(wrapper);
-        List<Map> list = new ArrayList();
-
-        for (BaseRegionEntity baseRegionEntity : baseRegionEntities) {
-            if (baseRegionEntity.getParentCode() ==null){
-                for (BaseRegionEntity regionEntity : baseRegionEntities) {
-                    if(baseRegionEntity.getRegionCode().equals(regionEntity.getParentCode())){
-                        Integer sowTotalStock = 0,eartagNew = 0,eartagOffone =0,sowStock =0,stock1=0,stock2=0,stock3=0,stock4=0,stock5=0;
-
-                        Map map =new HashMap();
-                        for (FarmStockEntity farmStockEntity : farmStockEntities) {
-                            if (farmStockEntity.getCityCode().equals(regionEntity.getRegionCode())){
-                                sowTotalStock += farmStockEntity.getSowTotalStock();
-                                eartagNew += farmStockEntity.getEartagNew();
-                                eartagOffone += farmStockEntity.getEartagOffone();
-                                sowStock += farmStockEntity.getSowStock();
-                                stock1 += farmStockEntity.getStock1();
-                                stock2 += farmStockEntity.getStock2();
-                                stock3 += farmStockEntity.getStock3();
-                                stock4 += farmStockEntity.getStock4();
-                                stock5 += farmStockEntity.getStock5();
-                            }
-                        }
-                        map.put("sowTotalStock",sowTotalStock);
-                        map.put("eartagNew",eartagNew);
-                        map.put("sowStock",sowStock);
-                        map.put("eartagOffone",eartagOffone);
-                        map.put("stock1",stock1);
-                        map.put("stock2",stock2);
-                        map.put("stock3",stock3);
-                        map.put("stock4",stock4);
-                        map.put("stock5",stock5);
-                        map.put("name",regionEntity.getRegionName());
-                        map.put("code",regionEntity.getRegionCode());
-                        map.put("children",getChildren(regionEntity.getRegionCode(),farmStockEntities,baseRegionEntities));
-                        map.put("type",1);
-
-                        RegionStockDayEntity regionStockDayEntity = new RegionStockDayEntity();
-//                        regionStockDayEntity.set
-
-                        list.add(map);
-                    }
-
-                }
-            }
-        }
-
-
-        return list;
-    }
-
-    //县级
-    private List getChildren(String cityCode, List<FarmStockEntity> farmStockEntities,List<BaseRegionEntity> baseRegionEntities) {
-
-
-        List endList = new ArrayList();
-        for (BaseRegionEntity baseRegionEntity : baseRegionEntities) {
-            if (cityCode.equals(baseRegionEntity.getParentCode())){
-                String countyCode = baseRegionEntity.getRegionCode();
-
-                Integer sowTotalStock = 0,eartagNew = 0,sowStock =0,eartagOffone =0,stock1=0,stock2=0,stock3=0,stock4=0,stock5=0;
-                Map map =new HashMap();
-                for (FarmStockEntity farmStockEntity : farmStockEntities) {
-                    if (countyCode.equals(farmStockEntity.getCountyCode())){
-                        sowTotalStock += farmStockEntity.getSowTotalStock();
-                        eartagNew += farmStockEntity.getEartagNew();
-                        eartagOffone += farmStockEntity.getEartagOffone();
-                        sowStock += farmStockEntity.getSowStock();
-                        stock1 += farmStockEntity.getStock1();
-                        stock2 += farmStockEntity.getStock2();
-                        stock3 += farmStockEntity.getStock3();
-                        stock4 += farmStockEntity.getStock4();
-                        stock5 += farmStockEntity.getStock5();
-                    }
-                }
-                map.put("sowTotalStock",sowTotalStock);
-                map.put("eartagNew",eartagNew);
-                map.put("eartagOffone",eartagOffone);
-                map.put("sowStock",sowStock);
-                map.put("stock1",stock1);
-                map.put("stock2",stock2);
-                map.put("stock3",stock3);
-                map.put("stock4",stock4);
-                map.put("stock5",stock5);
-                map.put("name",baseRegionEntity.getRegionName());
-                map.put("code",baseRegionEntity.getRegionCode());
-                map.put("children",null);
-                map.put("type",2);
-                endList.add(map);
-            }
-        }
-
-        return  endList;
-    }
-
-    @Override
-    public List cityCountAll(Map<String, Object> params) {
 
-        QueryWrapper<BaseRegionEntity> baseRegionwrapper = new QueryWrapper<>();
-        List<BaseRegionEntity> baseRegionEntities = baseRegionDao.selectList(baseRegionwrapper);
-
-        String countyCode =(String) params.get("countyCode");
-
-        String farmName = (String) params.get("farmName");
-        String minStockTotal =(String) params.get("minStockTotal");
-        String maxStockTotal =(String) params.get("maxStockTotal");
-        String minStockNew =(String) params.get("minStockNew");
-        String maxStockNew =(String) params.get("maxStockNew");
-        String minOfflineNo =(String) params.get("minOfflineNo");
-        String maxOfflineNo =(String) params.get("maxOfflineNo");
-        String minSowStock =(String) params.get("minSowStock");
-        String maxSowStock =(String) params.get("maxSowStock");
-
-        QueryWrapper<FarmStockEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(countyCode),"county_code",countyCode).or().eq(StringUtils.isNotBlank(countyCode),"city_code",countyCode);
-
-        wrapper.like(StringUtils.isNotBlank(farmName),"farm_name",farmName);
-
-        wrapper.ge(StringUtils.isNotBlank(minStockTotal),"stock_total",minStockTotal);
-        wrapper.le(StringUtils.isNotBlank(maxStockTotal),"stock_total",maxStockTotal);
-
-        wrapper.ge(StringUtils.isNotBlank(minStockNew),"stock_new",minStockNew);
-        wrapper.le(StringUtils.isNotBlank(maxStockNew),"stock_new",maxStockNew);
-
-        wrapper.ge(StringUtils.isNotBlank(minOfflineNo),"offline_no",minOfflineNo);
-        wrapper.le(StringUtils.isNotBlank(maxOfflineNo),"offline_no",maxOfflineNo);
-
-        wrapper.ge(StringUtils.isNotBlank(minOfflineNo),"sow_stock",minSowStock);
-        wrapper.le(StringUtils.isNotBlank(maxOfflineNo),"sow_stock",maxSowStock);
-        wrapper.apply("id IN( SELECT MAX(id) FROM `farm_stock` GROUP BY farm_code)");
-
-
-        List<FarmStockEntity> farmStockEntities = baseMapper.selectList(wrapper);
-        List list = new ArrayList();
-
-        for (BaseRegionEntity baseRegionEntity : baseRegionEntities) {
-            if (baseRegionEntity.getParentCode() ==null){
-                for (BaseRegionEntity regionEntity : baseRegionEntities) {
-                    if(baseRegionEntity.getRegionCode().equals(regionEntity.getParentCode())) {
-                        for (BaseRegionEntity regionEntity1 : baseRegionEntities) {
-                            if (regionEntity.getRegionCode().equals(regionEntity1.getParentCode())) {
-                                Integer sowTotalStock = 0, eartagNew = 0, eartagOffone = 0, sowStock = 0, stock1 = 0, stock2 = 0, stock3 = 0, stock4 = 0, stock5 = 0;
-                                Map map = new HashMap();
-                                for (FarmStockEntity farmStockEntity : farmStockEntities) {
-                                    if (farmStockEntity.getCityCode().equals(regionEntity1.getRegionCode())) {
-                                        sowTotalStock += farmStockEntity.getSowTotalStock();
-                                        eartagNew += farmStockEntity.getEartagNew();
-                                        eartagOffone += farmStockEntity.getEartagOffone();
-                                        sowStock += farmStockEntity.getSowStock();
-                                        stock1 += farmStockEntity.getStock1();
-                                        stock2 += farmStockEntity.getStock2();
-                                        stock3 += farmStockEntity.getStock3();
-                                        stock4 += farmStockEntity.getStock4();
-                                        stock5 += farmStockEntity.getStock5();
-                                    }
-                                }
-                                map.put("sowTotalStock", sowTotalStock);
-                                map.put("eartagNew", eartagNew);
-                                map.put("sowStock", sowStock);
-                                map.put("eartagOffone", eartagOffone);
-                                map.put("stock1", stock1);
-                                map.put("stock2", stock2);
-                                map.put("stock3", stock3);
-                                map.put("stock4", stock4);
-                                map.put("stock5", stock5);
-                                map.put("name", regionEntity1.getRegionName());
-                                map.put("code", regionEntity1.getRegionCode());
-                                map.put("children", getChildren1(regionEntity1, farmStockEntities));
-                                map.put("type",2);
-                                list.add(map);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-
-        return list;
-    }
-
-    private List getChildren1(BaseRegionEntity regionCode, List<FarmStockEntity> farmStockEntities) {
-        List endList = new ArrayList();
-        for (FarmStockEntity farmStockEntity : farmStockEntities) {
-            Map map = new HashMap();
-            if (regionCode.getRegionCode().equals(farmStockEntity.getCountyCode())){
-                map.put("id", farmStockEntity.getId());
-                map.put("farmCode", farmStockEntity.getFarmCode());
-//                map.put("farmName", farmStockEntity.getFarmName());
-                map.put("month", farmStockEntity.getMonth());
-                map.put("year", farmStockEntity.getYear());
-
-                map.put("sowTotalStock", farmStockEntity.getSowTotalStock());
-                map.put("eartagNew", farmStockEntity.getEartagNew());
-                map.put("sowStock", farmStockEntity.getSowStock());
-                map.put("eartagOffone", farmStockEntity.getEartagOffone());
-                map.put("stock1", farmStockEntity.getStock1());
-                map.put("stock2", farmStockEntity.getStock1());
-                map.put("stock3", farmStockEntity.getStock1());
-                map.put("stock4", farmStockEntity.getStock1());
-                map.put("stock5", farmStockEntity.getStock1());
-                map.put("name", farmStockEntity.getFarmName());
-                map.put("code", regionCode.getRegionCode());
-                map.put("children",null);
-                map.put("type",4);
-                endList.add(map);
-            }
-        }
-        return endList;
-    }*/
    @Autowired
    private RegionStockDayDao regionStockDayDao;
    @Override
@@ -476,7 +223,7 @@ public class FarmStockServiceImpl extends ServiceImpl<FarmStockDao, FarmStockEnt
     }
 
 
-    public List countAll11(Map<String, Object> params) {
+    /*public List countAll11(Map<String, Object> params) {
 
         String countyCode =(String) params.get("countyCode");
 
@@ -530,7 +277,7 @@ public class FarmStockServiceImpl extends ServiceImpl<FarmStockDao, FarmStockEnt
 
 
         return null;
-    }
+    }*/
 
     @Override
     public List countAll(Map<String, Object> params) {

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/application-dev.yml

@@ -4,6 +4,7 @@ server:
 spring:
   datasource:
     url: jdbc:mysql://115.238.57.190:3306/smart_eartag_data_platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&&failOverReadOnly=false&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://122.112.224.199:3306/cloud-platform-pub?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&&failOverReadOnly=false&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver