Merge remote-tracking branch 'origin/master'

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

@@ -1,13 +1,18 @@
 package com.huimv.eartag2.manage2.controller;
 
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.service.BasePigpenService;
+import net.bytebuddy.utility.RandomString;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
+import java.util.concurrent.ThreadLocalRandom;
+
+import static java.util.concurrent.ThreadLocalRandom.*;
 
 /**
  * <p>
@@ -62,14 +67,15 @@ public class BasePigpenController {
         String buildingName = paramsMap.get("buildingName")+"";
 
         // 栋编码
-        String buildingCode = paramsMap.get("buildingCode")+"";
+//        String buildingCode = paramsMap.get("buildingCode")+"";
+        String buildingCode = System.currentTimeMillis()+"" ;
         // 阶段
         String stageCode = paramsMap.get("stageCode")+"";
         // 排序
         String sort = paramsMap.get("sort")+"";
-//        if(sort == null){
-//            sort = "1";
-//        }
+        if(StringUtils.isBlank(sort)){
+            sort = "1";
+        }
         // 类型
         Integer type = 1;
         //
@@ -83,18 +89,18 @@ public class BasePigpenController {
         // 栋名称
         String buildingName = paramsMap.get("buildingName")+"";
         // 栋编码
-        String buildingCode = paramsMap.get("buildingCode")+"";
+//        String buildingCode = paramsMap.get("buildingCode")+"";
         // 阶段
         String stageCode = paramsMap.get("stageCode")+"";
         // 排序
         String sort = paramsMap.get("sort")+"";
-        if(sort == null){
+        if(StringUtils.isBlank(sort)){
             sort = "1";
         }
         // 类型
         Integer type = 1;
         //
-        return basePigpenService.editBuilding(id,buildingName,buildingCode,stageCode,Integer.parseInt(sort),type);
+        return basePigpenService.editBuilding(id,buildingName,stageCode,Integer.parseInt(sort),type);
     }
 
     // 删除栋舍
@@ -112,14 +118,15 @@ public class BasePigpenController {
         // 栋
         String parentId = paramsMap.get("parentId")+"";
         // 单元
-        String unitCode = paramsMap.get("unitCode")+"";
+//        String unitCode = paramsMap.get("unitCode")+"";
+        String unitCode = System.currentTimeMillis()+"" ;
         // 单元
         String unitName = paramsMap.get("unitName")+"";
         // 阶段
         String stageCode = paramsMap.get("stageCode")+"";
         // 排序
         String sort = paramsMap.get("sort")+"";
-        if(sort == null){
+        if(StringUtils.isBlank(sort)){
             sort = "1";
         }
         // 类型
@@ -135,20 +142,20 @@ public class BasePigpenController {
         // 栋
         String parentId = paramsMap.get("parentId")+"";
         // 单元
-        String unitCode = paramsMap.get("unitCode")+"";
+//        String unitCode = paramsMap.get("unitCode")+"";
         // 单元
         String unitName = paramsMap.get("unitName")+"";
         // 阶段
         String stageCode = paramsMap.get("stageCode")+"";
         // 排序
         String sort = paramsMap.get("sort")+"";
-        if(sort == null){
+        if(StringUtils.isBlank(sort)){
             sort = "1";
         }
         // 类型
         Integer type = 2;
         //
-        return basePigpenService.editUnit(id,parentId,unitName,unitCode,stageCode,Integer.parseInt(sort),type);
+        return basePigpenService.editUnit(id,parentId,unitName,stageCode,Integer.parseInt(sort),type);
     }
 
 

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

@@ -1,10 +1,17 @@
 package com.huimv.eartag2.manage2.controller;
 
 
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.service.IEartagData2Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -14,7 +21,13 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-07-29
  */
 @RestController
-@RequestMapping("/eartag-data2")
+@RequestMapping("/eartagData")
 public class EartagData2Controller {
+    @Autowired
+    private IEartagData2Service eartagDataService;
 
+    @PostMapping("getEnvByTime")
+    public Result getEnvByTime(@RequestBody Map<String,String> map){
+        return eartagDataService.getEnvByTime(map);
+    }
 }

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

@@ -22,7 +22,7 @@ import java.util.Map;
  * @since 2022-07-18
  */
 @RestController
-@RequestMapping("/eartagData")
+@RequestMapping("/eartagData2")
 public class EartagDataController {
     @Autowired
     private EartagDataService eartagDataService;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/netty/EartagServerHandler2.java

@@ -152,12 +152,16 @@ private IEartagEartagRegister2Service eartagRegisterService;
 
                 Boolean isNew =false;
 
-
+                JSONObject body= new JSONObject();
                 if (ObjectUtil.isEmpty(stationLib)){
                     try {
                         ResponseEntity<JSONObject>  forEntity = restTemplate.getForEntity("http://api.cellocation.com:82/cell/?mcc=460&mnc=1&lac="+lac+"&ci="+ci+"&output=json", JSONObject.class);
                         System.out.println("forEntity"+forEntity);
-                        JSONObject body = forEntity.getBody();
+                         body = forEntity.getBody();
+                    }catch (Exception e){
+                        System.out.println(e);
+                    }
+
                         lat = (String)body.get("lat");
                         lon =  (String)body.get("lon");
                         address = (String)body.get("address");
@@ -188,9 +192,7 @@ private IEartagEartagRegister2Service eartagRegisterService;
                         }
 
 
-                    }catch (Exception e){
-                        System.out.println(e);
-                    }
+
 
                 }else {
                     lat = stationLib.getLat();

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

@@ -11,6 +11,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -56,16 +57,20 @@ public class EartagData2 implements Serializable {
 
     private Integer signal1;
 
-    private Timestamp askTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date askTime;
 
     private String other;
 
-    private Timestamp addTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date addTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createDate;
 
     private String farmId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date askDate;
 
 

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

@@ -18,11 +18,11 @@ public interface BasePigpenService extends IService<BasePigpen> {
 
     Result addUnit(String farmCode, String buildingCode, String unitName, String unitCode, String stageCode, Integer sort, Integer type);
 
-    Result editBuilding(String id, String buildingName, String buildingCode, String stageCode, Integer sort, Integer type);
+    Result editBuilding(String id, String buildingName, String stageCode, Integer sort, Integer type);
 
     Result remove(String ids);
 
-    Result editUnit(String id, String parentId, String unitName, String unitCode, String stageCode, Integer sort, Integer type);
+    Result editUnit(String id, String parentId, String unitName, String stageCode, Integer sort, Integer type);
 
     Result list(String farmCode, String pigpenName, String stageCode);
 }

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

@@ -1,10 +1,12 @@
 package com.huimv.eartag2.manage2.service;
 
+import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.text.ParseException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +19,6 @@ import java.util.List;
 public interface IEartagData2Service extends IService<EartagData2> {
 
     List<EartagData2> getEartagData(String earmark) throws ParseException;
+
+    Result getEnvByTime(Map<String, String> map);
 }

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

@@ -65,7 +65,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     }
 
     @Override
-    public Result editBuilding(String id, String buildingName, String buildingCode, String stageCode, Integer sort, Integer type) {
+    public Result editBuilding(String id, String buildingName, String stageCode, Integer sort, Integer type) {
         BasePigpen basePigpen = basePigpenMapper.selectById(id);
         if(basePigpen == null){
             return new Result(ResultCode.FAIL,"该记录不存在.");
@@ -125,12 +125,11 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     }
 
     @Override
-    public Result editUnit(String id, String parentId, String unitName, String unitCode, String stageCode, Integer sort, Integer type) {
+    public Result editUnit(String id, String parentId, String unitName,  String stageCode, Integer sort, Integer type) {
         BasePigpen basePigpen = basePigpenMapper.selectById(id);
         if(basePigpen == null){
             return new Result(ResultCode.FAIL,"该记录不存在.");
         }else{
-            basePigpen.setPigpenCode(unitCode);
             basePigpen.setPigpenName(unitName);
             basePigpen.setParentId(Integer.parseInt(parentId));
             basePigpen.setSort(sort);

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

@@ -1,7 +1,12 @@
 package com.huimv.eartag2.manage2.service.impl;
 
 import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.mapper.EartagData2Mapper;
 import com.huimv.eartag2.manage2.service.IEartagData2Service;
@@ -11,10 +16,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -56,4 +58,28 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         }
         return eartagData2s1;
     }
+
+    @Override
+    public Result getEnvByTime(Map<String, String> map) {
+        String earmark = map.get("earmark");
+        String startDate = map.get("startDate");
+        String endDate = map.get("endDate");
+        Date now = new Date();
+
+        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);
+
+        return new Result(ResultCode.SUCCESS,list);
+    }
 }

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

@@ -52,6 +52,9 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         wrapper.eq(StringUtils.isNotBlank(liveStatus),"live_status",liveStatus);
         wrapper.orderByDesc("ask_time");
         Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
+        if (page.getRecords().size() == 0){
+            minEarTemp = 0F;
+        }
         for (EartagEartagRegister2 record : page.getRecords()) {
             Float earTemp1 = record.getEarTemp1();
             maxEarTemp = Math.max(earTemp1,maxEarTemp);
@@ -61,8 +64,6 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         Map map = new HashMap();
         long allCount = this.count(wrapper);
         //在线
-        wrapper.clear();
-
         wrapper.eq("live_status", 1);
         long onCount = this.count(wrapper);
         map.put("countOff",allCount-onCount);