1、新增耳标复位统计功能；

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

@@ -46,10 +46,10 @@ public class EartagData2Entity implements Serializable {
     private Float envTemp1;
 
     @Column(name = "act")
-    private Integer act;
+    private Long act;
 
     @Column(name = "act1")
-    private Integer act1;
+    private Long act1;
 
     @Column(name = "signal1")
     private Integer signal1;

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

@@ -103,7 +103,7 @@ public class EartagEartagRegister2Entity implements Serializable {
     private Float envTemp1;
 
     @Column(name = "act")
-    private Integer act;
+    private Long act;
 
     @Column(name = "signal1")
     private Integer signal1;

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

@@ -27,7 +27,7 @@ public class EartagHourActEntity implements Serializable {
     private Integer hour;
 
     @Column(name = "act")
-    private Integer act;
+    private Long act;
 
     @Column(name = "add_date")
     private Date addDate;

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

@@ -32,4 +32,14 @@ public class EartagResetEntity implements Serializable {
 
     @Column(name = "farm_code")
     private String farmCode;
+
+    @Column(name = "last_id")
+    private Integer lastId;
+
+    @Column(name = "last_act")
+    private Long lastAct;
+
+    @Column(name = "act")
+    private Long act;
+
 }

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

@@ -106,9 +106,6 @@ public class EartagServiceImpl implements IEartagService {
             //{更新设备注册信息}
             updateDeviceRegister(deviceCode, nowTimestamp, todayDate, farmId);
 
-            //{计算小时运动量}
-//            countHourAct(dataJo,nowTimestamp, todayDate, farmId);
-
             //{更新耳标注册信息}
 //            updateEartagRegister(earmark, deviceCode, bat, nowTimestamp, todayDate, farmId);
 
@@ -144,7 +141,6 @@ public class EartagServiceImpl implements IEartagService {
     private void countHourAct(JSONObject eartagJo, Timestamp nowTimestamp, java.sql.Date todayDate, String farmId) {
         DateUtil du = new DateUtil();
         int nowHour = du.getNowHour();
-
         int eartagOffLineTime = 24;
         Optional<SysBaseConfigEntity> optionalConfig = sysBaseConfigEntityRepo.getConfigValue("dropDataEartagOffLineTime");
         if (optionalConfig.isPresent()) {
@@ -153,10 +149,8 @@ public class EartagServiceImpl implements IEartagService {
         } else {
             log.error("耳标离线过程丢弃数据时长属性未配置.");
         }
-
-
         String earmark = eartagJo.getString("earmark");
-        int act = Integer.parseInt(eartagJo.getString("act"));
+        Long act = Long.parseLong(eartagJo.getString("act"));
         System.out.println("本次运动量="+act);
         //
         Optional<EartagData2Entity> optionEartagData = eartagData2Repo.getLastByEarmark(earmark,farmId);
@@ -164,12 +158,13 @@ public class EartagServiceImpl implements IEartagService {
             log.info("该耳标号无相关数据.["+earmark+"]");
         }
         EartagData2Entity eartagData2Entity = optionEartagData.get();
-        Integer lastAct = eartagData2Entity.getAct();
+        int lastId = eartagData2Entity.getId();
+        Long lastAct = eartagData2Entity.getAct();
         System.out.println("上次运动量="+lastAct);
         Timestamp lastAddTime = eartagData2Entity.getAddTime();
         long timeDiff = nowTimestamp.getTime() - lastAddTime.getTime();
         if(timeDiff/(1000*60*60) < eartagOffLineTime){
-            int act1 = 0;
+            long act1 = 0;
             boolean resetStatus = false;
             if(act < lastAct){
                 act1 = act;
@@ -181,12 +176,12 @@ public class EartagServiceImpl implements IEartagService {
             //{保存耳标小时运动量}
             saveEartagHourAct(farmId,earmark,act1,nowHour,todayDate);
             //{保存耳标复位记录}
-            saveEartagReset(resetStatus,farmId,earmark,nowTimestamp,todayDate);
+            saveEartagReset(resetStatus,farmId,earmark,nowTimestamp,todayDate,lastId,lastAct,act);
         }
     }
 
     //{保存耳标复位记录}
-    private void saveEartagReset(boolean resetStatus, String farmId, String earmark, Timestamp nowTimestamp, java.sql.Date todayDate) {
+    private void saveEartagReset(boolean resetStatus, String farmId, String earmark, Timestamp nowTimestamp, java.sql.Date todayDate, int lastId,Long lastAct,Long act) {
         if(resetStatus){
             // 保存复位记录
             EartagResetEntity eartagResetEntity = new EartagResetEntity();
@@ -194,6 +189,9 @@ public class EartagServiceImpl implements IEartagService {
             eartagResetEntity.setAddDate(todayDate);
             eartagResetEntity.setResetTime(nowTimestamp);
             eartagResetEntity.setFarmCode(farmId);
+            eartagResetEntity.setLastId(lastId);
+            eartagResetEntity.setLastAct(lastAct);
+            eartagResetEntity.setAct(act);
             eartagResetEntityRepo.save(eartagResetEntity);
 
             // 泊村复位统计次数
@@ -215,7 +213,7 @@ public class EartagServiceImpl implements IEartagService {
     }
 
     // {保存耳标小时运动量}
-    private void saveEartagHourAct(String farmId, String earmark, int act1, int nowHour, java.sql.Date todayDate) {
+    private void saveEartagHourAct(String farmId, String earmark, long act1, int nowHour, java.sql.Date todayDate) {
         Optional<EartagHourActEntity> optionalHourAct = eartagHourActEntityRepo.findByFarmIdAndEarmarkAndHourAndDate(farmId,earmark,nowHour,todayDate);
         if(!optionalHourAct.isPresent()){
             EartagHourActEntity newEartagHourActEntity = new EartagHourActEntity();
@@ -304,7 +302,7 @@ public class EartagServiceImpl implements IEartagService {
         } else {
             EartagData2Entity eartagData2Entity = optionEartagData.get();
             Timestamp addTime = eartagData2Entity.getAddTime();
-            Integer act = eartagData2Entity.getAct();
+            long act = eartagData2Entity.getAct();
             long timeDifference = nowTimestamp.getTime() - addTime.getTime();
             int setTimeDiff = 5;
             Optional<SysBaseConfigEntity> optionConfig = sysBaseConfigEntityRepo.getConfigValue("timeDifference");
@@ -908,7 +906,7 @@ public class EartagServiceImpl implements IEartagService {
 
         newEartagRegisterEntity.setEarTemp1(eartagJo.getFloat("earTemp1"));
         newEartagRegisterEntity.setEnvTemp1(eartagJo.getFloat("envTemp1"));
-        newEartagRegisterEntity.setAct(Integer.parseInt(eartagJo.getString("act1")));
+        newEartagRegisterEntity.setAct(Long.parseLong(eartagJo.getString("act1")));
         newEartagRegisterEntity.setSignal1(Integer.parseInt(eartagJo.getString("signal")));
         newEartagRegisterEntity.setAskTime(getAskTime(eartagJo.getString("askTime")));
         newEartagRegisterEntity.setOther(eartagJo.getString("other"));
@@ -1044,15 +1042,15 @@ public class EartagServiceImpl implements IEartagService {
         Boolean countTimes = Boolean.parseBoolean(countMap.get("countTimes").toString());
         //true:设定过滤时间内无耳标数据上传入库；false:有数据入库；
         if (countTimes) {
-            Integer act = 0;
-            Integer act1 = 0;
+            long act = 0;
+            long act1 = 0;
             if (Boolean.parseBoolean(countMap.get("fisrtStatus").toString())) {
                 act = Integer.parseInt(eartagJo.getString("act"));
                 System.out.println("1 act="+act);
             } else {
                 act = Integer.parseInt(eartagJo.getString("act"));
                 System.out.println("2 act="+act);
-                Integer lastAct = Integer.parseInt(countMap.get("act").toString());
+                long lastAct = Long.parseLong(countMap.get("act").toString());
                 System.out.println("3 lastAct="+lastAct);
                 if (act > lastAct) {
                     act1 = act - lastAct;

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

@@ -30,20 +30,23 @@ public class EartagHourActController {
 
     @RequestMapping(value = "/getAct",method = RequestMethod.POST)
     public Result list(@RequestBody Map<String, Object> paramsMap) throws ParseException {
-        System.out.println("paramsMap>>"+paramsMap.toString());
         String farmCode = "";
         if (paramsMap.get("farmId") != null) {
             farmCode = paramsMap.get("farmId")+"";
         }
-        String addDate = "";
-        if (paramsMap.get("addDate") != null) {
-            addDate = paramsMap.get("addDate")+"";
+        String startDate = "";
+        if (paramsMap.get("startDate") != null) {
+            startDate = paramsMap.get("startDate")+"";
+        }
+        String endDate = "";
+        if (paramsMap.get("endDate") != null) {
+            endDate = paramsMap.get("endDate")+"";
         }
         String earmark = "";
         if (paramsMap.get("earmark") != null) {
             earmark = paramsMap.get("earmark")+"";
         }
-        return eartagHourActService.getHourAct(farmCode,addDate,earmark);
+        return eartagHourActService.getHourAct(farmCode,startDate,endDate,earmark);
     }
 
 }

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

@@ -1,10 +1,19 @@
 package com.huimv.eartag2.manage2.controller;
 
 
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.service.EartagResetCountService;
+import com.huimv.eartag2.manage2.service.impl.EartagResetServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.ParseException;
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -16,6 +25,36 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/eartag-reset")
 public class EartagResetController {
+    @Autowired
+    private EartagResetServiceImpl eartagResetServiceImpl;
 
+    @RequestMapping(value = "/getEartagResetDetails",method = RequestMethod.POST)
+    public Result getEartagResetDetails(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        String farmCode = "";
+        if (paramsMap.get("farmId") != null) {
+            farmCode = paramsMap.get("farmId")+"";
+        }
+        String startDate = "";
+        if (paramsMap.get("startDate") != null) {
+            startDate = paramsMap.get("startDate")+"";
+        }
+        String endDate = "";
+        if (paramsMap.get("endDate") != null) {
+            endDate = paramsMap.get("endDate")+"";
+        }
+        String earmark = "";
+        if (paramsMap.get("earmark") != null) {
+            earmark = paramsMap.get("earmark")+"";
+        }
+        int pageNo = 1;
+        if (paramsMap.get("pageNo") != null) {
+            pageNo = Integer.parseInt(paramsMap.get("pageNo")+"");
+        }
+        int pageSize = 0;
+        if (paramsMap.get("pageSize") != null) {
+            pageSize = Integer.parseInt(paramsMap.get("pageSize")+"");
+        }
+        return eartagResetServiceImpl.getEartagResetDetails(farmCode,startDate,endDate,earmark,pageNo,pageSize);
+    }
 }
 

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

@@ -1,10 +1,18 @@
 package com.huimv.eartag2.manage2.controller;
 
 
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.service.EartagResetCountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.ParseException;
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -16,6 +24,28 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/eartag-reset-count")
 public class EartagResetCountController {
+    @Autowired
+    private EartagResetCountService eartagResetCountService;
 
+    @RequestMapping(value = "/getEartagResetCount",method = RequestMethod.POST)
+    public Result getResetCount(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        String farmCode = "";
+        if (paramsMap.get("farmId") != null) {
+            farmCode = paramsMap.get("farmId")+"";
+        }
+        String startDate = "";
+        if (paramsMap.get("startDate") != null) {
+            startDate = paramsMap.get("startDate")+"";
+        }
+        String endDate = "";
+        if (paramsMap.get("endDate") != null) {
+            endDate = paramsMap.get("endDate")+"";
+        }
+        String earmark = "";
+        if (paramsMap.get("earmark") != null) {
+            earmark = paramsMap.get("earmark")+"";
+        }
+        return eartagResetCountService.getEartagResetCount(farmCode,startDate,endDate,earmark);
+    }
 }
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagData2.java

@@ -51,9 +51,9 @@ public class EartagData2 implements Serializable {
 
     private Float envTemp1;
 
-    private Integer act;
+    private Long act;
 
-    private Integer act1;
+    private Long act1;
 
     private Integer signal1;
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagEartagRegister2.java

@@ -90,7 +90,7 @@ public class EartagEartagRegister2 implements Serializable {
 
     private Float envTemp1;
 
-    private Integer act;
+    private Long act;
 
     private Integer signal1;
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagReset.java

@@ -22,7 +22,7 @@ public class EartagReset implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     private String earmark;
@@ -33,5 +33,10 @@ public class EartagReset implements Serializable {
 
     private String farmCode;
 
+    private Integer lastId;
+
+    private Long lastAct;
+
+    private Long act;
 
 }

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

@@ -16,5 +16,5 @@ import java.text.ParseException;
  */
 public interface EartagHourActService extends IService<EartagHourAct> {
 
-    Result getHourAct(String farmCode, String addDate, String earmark) throws ParseException;
+    Result getHourAct(String farmCode, String startDate,String endDate, String earmark) throws ParseException;
 }

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

@@ -1,8 +1,11 @@
 package com.huimv.eartag2.manage2.service;
 
+import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.pojo.EartagResetCount;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.text.ParseException;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface EartagResetCountService extends IService<EartagResetCount> {
 
+    Result getEartagResetCount(String farmCode, String startDate, String endDate, String earmark) throws ParseException;
 }

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

@@ -1,8 +1,11 @@
 package com.huimv.eartag2.manage2.service;
 
+import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.pojo.EartagReset;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.text.ParseException;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface EartagResetService extends IService<EartagReset> {
 
+    Result getEartagResetDetails(String farmCode, String startDate, String endDate, String earmark, int pageNo, int pageSize) throws ParseException;
 }

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

@@ -32,13 +32,11 @@ public class EartagHourActServiceImpl extends ServiceImpl<EartagHourActMapper, E
     private EartagHourActMapper eartagHourActMapper;
 
     @Override
-    public Result getHourAct(String farmCode, String addDate, String earmark) throws ParseException {
+    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(StringUtils.isNotBlank(addDate),"add_date",addDate);
+        queryWrapper.between("add_date",startDate,endDate);
         queryWrapper.eq(StringUtils.isNotBlank(earmark),"earmark",earmark);
-//        queryWrapper.orderByAsc("add_date");
-//        queryWrapper.orderByAsc("hour");
         List orderByAscList = new ArrayList();
         orderByAscList.add("add_date");
         orderByAscList.add("hour");

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

@@ -1,11 +1,24 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+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.pojo.EartagHourAct;
 import com.huimv.eartag2.manage2.pojo.EartagResetCount;
 import com.huimv.eartag2.manage2.mapper.EartagResetCountMapper;
 import com.huimv.eartag2.manage2.service.EartagResetCountService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +30,25 @@ import org.springframework.stereotype.Service;
 @Service
 public class EartagResetCountServiceImpl extends ServiceImpl<EartagResetCountMapper, EartagResetCount> implements EartagResetCountService {
 
+    @Autowired
+    private EartagResetCountMapper eartagResetCountMapper;
+
+    @Override
+    public Result getEartagResetCount(String farmCode, String startDate, String endDate, String earmark) throws ParseException {
+        QueryWrapper<EartagResetCount> queryWrapper= new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
+        queryWrapper.between("add_date",startDate,endDate);
+        queryWrapper.eq(StringUtils.isNotBlank(earmark),"earmark",earmark);
+        queryWrapper.orderByAsc("add_date");
+        List<EartagResetCount> eartagResetCountList = eartagResetCountMapper.selectList(queryWrapper);
+        List resultList = new ArrayList();
+        DateUtil du = new DateUtil();
+        for(EartagResetCount artagResetCount:eartagResetCountList){
+            Map map = new HashMap<>();
+            resultList.add(map);
+            map.put("addDate",du.formatDateText(artagResetCount.getAddDate()));
+            map.put("times",artagResetCount.getTimes());
+        }
+        return new Result(ResultCode.SUCCESS,resultList);
+    }
 }

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

@@ -1,11 +1,25 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.pojo.BizBaseStage;
 import com.huimv.eartag2.manage2.pojo.EartagReset;
 import com.huimv.eartag2.manage2.mapper.EartagResetMapper;
 import com.huimv.eartag2.manage2.service.EartagResetService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +30,30 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class EartagResetServiceImpl extends ServiceImpl<EartagResetMapper, EartagReset> implements EartagResetService {
-
+    @Autowired
+    private EartagResetMapper eartagResetMapper;
+    @Override
+    public Result getEartagResetDetails(String farmCode, String startDate, String endDate, String earmark, int pageNo, int pageSize) throws ParseException {
+        QueryWrapper<EartagReset> queryWrapper= new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
+        queryWrapper.between("add_date",startDate,endDate);
+        queryWrapper.eq(StringUtils.isNotBlank(earmark),"earmark",earmark);
+        queryWrapper.orderByAsc("reset_time");
+        Page<EartagReset> page = new Page<>(Integer.valueOf(pageNo), Integer.valueOf(pageSize));
+        Page<EartagReset> pageEartagReset = eartagResetMapper.selectPage(page,queryWrapper);
+        List resultList = new ArrayList();
+        DateUtil du = new DateUtil();
+        List<EartagReset> eartagResetList = pageEartagReset.getRecords();
+        for(EartagReset eartagReset:eartagResetList){
+            Map map = new HashMap<>();
+            resultList.add(map);
+            map.put("addDate",du.formatDateText(eartagReset.getAddDate()));
+            map.put("earmark",eartagReset.getEarmark());
+            map.put("resetTime",du.formatDatetimeText(eartagReset.getResetTime()));
+            map.put("lastId",eartagReset.getLastId());
+            map.put("lastAct",eartagReset.getLastAct());
+            map.put("act",eartagReset.getAct());
+        }
+        return new Result(ResultCode.SUCCESS,pageEartagReset.setRecords(resultList));
+    }
 }