Merge remote-tracking branch 'origin/master'

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

@@ -50,5 +50,15 @@ public class EartagAbnormalAlarmController {
         return farmerAssetService.getAssetStatistics(paramsMap);
     }
 
+    @PostMapping("/countAll")
+    public Result countAll(@RequestBody Map<String, Object> paramsMap)   {
+        return eartagAbnormalAlarmService.countAll(paramsMap);
+    }
+
+    @PostMapping("/pigMonitor")
+    public Result pigMonitor(@RequestBody Map<String, Object> paramsMap)  {
+        return eartagAbnormalAlarmService.pigMonitor(paramsMap);
+    }
+
 }
 

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

@@ -121,7 +121,7 @@ public class EartagTask {
         System.out.println("测试数据");
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(cron = "0 0 0/6 * * ? ")
     private void countAssetInEveryMonth() throws ParseException {
         //--读取所有农户和采集器
         List<BaseFarmer> baseFarmerList = baseFarmerMapper.getFarmer();

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

@@ -22,4 +22,8 @@ public interface EartagAbnormalAlarmService extends IService<EartagAbnormalAlarm
     Result getNewPig(Map<String, String> paramsMap);
 
     Result listFarmer();
+
+    Result countAll(Map<String, Object> paramsMap);
+
+    Result pigMonitor(Map<String, Object> paramsMap);
 }

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

@@ -21,4 +21,5 @@ public interface FarmerAssetService extends IService<FarmerAsset> {
     List<FarmerAsset> getLastManyMonthAssets(String farmCode, String manyMonth);
 
     Result getAssetStatistics(Map<String, Object> paramsMap) throws ParseException;
+
 }

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

@@ -8,14 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
-import com.huimv.eartag2.manage2.mapper.BaseFarmMapper;
-import com.huimv.eartag2.manage2.mapper.BaseFarmerMapper;
-import com.huimv.eartag2.manage2.mapper.EartagEartagRegister2Mapper;
-import com.huimv.eartag2.manage2.pojo.BaseFarm;
-import com.huimv.eartag2.manage2.pojo.BaseFarmer;
-import com.huimv.eartag2.manage2.pojo.EartagAbnormalAlarm;
-import com.huimv.eartag2.manage2.mapper.EartagAbnormalAlarmMapper;
-import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
+import com.huimv.eartag2.manage2.mapper.*;
+import com.huimv.eartag2.manage2.pojo.*;
 import com.huimv.eartag2.manage2.service.EartagAbnormalAlarmService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,9 +33,12 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
     @Autowired
     private EartagEartagRegister2Mapper eartagEartagRegister2Mapper;
     @Autowired
+    private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
+    @Autowired
     private BaseFarmerMapper baseFarmerMapper;
     @Autowired
     private BaseFarmMapper baseFarmMapper;
+
     @Override
     public Result getEarTemWarning(Map<String, Object> paramsMap) throws ParseException {
         DateUtil dateUtil = new DateUtil();
@@ -130,5 +127,34 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
         return new Result(ResultCode.SUCCESS,endList);
     }
 
+    @Override
+    public Result countAll(Map<String, Object> paramsMap) {
+        String farmCode = (String)paramsMap.get("farmCode");
+        Map endMap = new HashMap();
+        Long countFarmer = baseFarmerMapper.selectCount(new QueryWrapper<BaseFarmer>().eq("farm_code", farmCode));;
+        Long countPig = eartagEartagRegister2Mapper.selectCount(new QueryWrapper<EartagEartagRegister2>().eq("farm_id", farmCode));
+        Long countDevice = eartagDeviceRegisterMapper.selectCount(new QueryWrapper<EartagDeviceRegister>().eq("farm_id", farmCode));
+        java.sql.Date todayDate = new java.sql.Date(new java.util.Date().getTime());
+        Long countWarning = eartagAbnormalAlarmMapper.selectCount(new QueryWrapper<EartagAbnormalAlarm>().eq("farm_code",farmCode).eq("alarm_type","2").eq("add_date",todayDate));
+
+
+        endMap.put("countFarmer",countFarmer);
+        endMap.put("countPig",countPig);
+        endMap.put("countDevice",countDevice);
+        endMap.put("countWarning",countWarning);
+        return new Result(ResultCode.SUCCESS,endMap);
+    }
+
+    @Override
+    public Result pigMonitor(Map<String, Object> paramsMap) {
+        String farmCode = (String)paramsMap.get("farmCode");
+
+        List<EartagEartagRegister2> eartagEartagRegister2s = eartagEartagRegister2Mapper.selectList(new QueryWrapper<EartagEartagRegister2>().eq("farm_id", farmCode).orderByDesc("last_time").last("limit 10"));
+
+
+
+        return new Result(ResultCode.SUCCESS,eartagEartagRegister2s);
+    }
+
 
 }

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

@@ -6,11 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.mapper.BaseFarmerMapper;
 import com.huimv.eartag2.manage2.mapper.EartagDeviceRegisterMapper;
 import com.huimv.eartag2.manage2.mapper.EartagEartagRegister2Mapper;
-import com.huimv.eartag2.manage2.pojo.EartagAbnormalAlarm;
-import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
-import com.huimv.eartag2.manage2.pojo.FarmerAsset;
+import com.huimv.eartag2.manage2.pojo.*;
 import com.huimv.eartag2.manage2.mapper.FarmerAssetMapper;
 import com.huimv.eartag2.manage2.service.FarmerAssetService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,10 +21,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -41,11 +37,12 @@ public class FarmerAssetServiceImpl extends ServiceImpl<FarmerAssetMapper, Farme
     @Autowired
     private FarmerAssetMapper farmerAssetMapper;
     @Autowired
-    private IEartagEartagRegister2Service eartagEartagRegister2Service;
-    @Autowired
     private EartagEartagRegister2Mapper eartagEartagRegister2Mapper;
     @Autowired
     private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
+
+    @Autowired
+    private BaseFarmerMapper baseFarmerMapper;
     @Value("${farmer.pig.price}")
     private String pigPrice;
 
@@ -86,28 +83,8 @@ public class FarmerAssetServiceImpl extends ServiceImpl<FarmerAssetMapper, Farme
         }
 
     }
-    // for (int i = 0 ; i<6 ;i++){
-    //            DateTime beginOfMonth = cn.hutool.core.date.DateUtil.beginOfMonth(now);
-    //            wrapper.clear();
-    //            wrapper.eq("farm_id",areaId);
-    //
-    //            beginOfMonth = cn.hutool.core.date.DateUtil.offsetMonth(beginOfMonth,-i);
-    //            DateTime endOfMonth = cn.hutool.core.date.DateUtil.endOfMonth(beginOfMonth);
-    //            wrapper.between("first_time",beginOfMonth,endOfMonth);
-    //            Long release = eartagEartagRegister2Mapper.selectCount(wrapper);
-    //            wrapper.clear();
-    //            wrapper.eq("farm_id",areaId);
-    //            wrapper.between("first_time",cn.hutool.core.date.DateUtil.offsetMonth(beginOfMonth,-6),cn.hutool.core.date.DateUtil.offsetMonth(endOfMonth,-6));
-    //            Long slaughter = eartagEartagRegister2Mapper.selectCount(wrapper);
-    //
-    //            Map map  = new HashMap();
-    //            map.put("release",release);
-    //            map.put("slaughter",slaughter);
-    //            map.put("month",(cn.hutool.core.date.DateUtil.month(beginOfMonth) +1) +"月");
-    //            endList.add(map);
-    //
-    //
-    //        }
+
+
 
     //{读取最后一批猪信息}
     private JSONObject _getlastBatchAdoptPig(String deviceCode) throws ParseException {