新建查询设备温度流水功能

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/repo/EartagEnvRepo.java

@@ -3,7 +3,12 @@ package com.huimv.eartag2.common.dao.repo;
 import com.huimv.eartag2.common.dao.entity.EartagEnvEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
 
 public interface EartagEnvRepo extends JpaRepository<EartagEnvEntity, Integer>, JpaSpecificationExecutor<EartagEnvEntity> {
 
+    @Query(nativeQuery = true,value = "SELECT * FROM eartag_env WHERE device_code=?1 AND DATE_FORMAT(add_time,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') limit 1")
+    List<EartagEnvEntity> getDeviceEnvtempByDeviceCode(String deviceCode, String todayDateText);
 }

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/utils/BizConst.java

@@ -53,4 +53,7 @@ public class BizConst {
 
     public final static Integer CODE_EARTAG_ONLINE_NO_EXIST = 10006;
     public final static String MSG_EARTAG_ONLINE_NO_EXIST = "该耳标暂无在线统计信息.";
+
+    public final static Integer CODE_ENVTEMP_FLOW_NO_EXIST = 10007;
+    public final static String MSG_ENVTEMP_FLOW_NO_EXIST = "该耳标暂无在线统计信息.";
 }

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/controller/DeviceController.java

@@ -196,4 +196,21 @@ public class DeviceController {
         return deviceService.listDeviceEartagOnlineCountByDeviceCode(deviceCode);
     }
 
+    /**
+     * @Method      : listDeviceEnvtempByDeviceCode
+     * @Description : 显示设备温度流水
+     * @Params      : [deviceCode]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/8       
+     * @Time        : 21:11
+     */
+    @RequestMapping(value = "/listDeviceEnvtempByDeviceCode",method = RequestMethod.GET)
+    public Result listDeviceEnvtempByDeviceCode(@RequestParam(value = "deviceCode",required = true) String deviceCode) throws ParseException {
+        log.info("<listDeviceEnvtempByDeviceCode>输入参数 deviceCode>>"+deviceCode);
+        //查询设备环境温度
+        return deviceService.listDeviceEnvtempByDeviceCode(deviceCode);
+    }
+
 }

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/IDeviceService.java

@@ -28,4 +28,7 @@ public interface IDeviceService {
 
     //查询在线设备
     Result listOnlineDevice(String farmId, String deviceCode, String alias, String addDate, Integer pageNo, Integer pageSize) throws ParseException;
+
+    //查询设备环境温度
+    Result listDeviceEnvtempByDeviceCode(String deviceCode) throws ParseException;
 }

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/impl/DeviceServiceImpl.java

@@ -6,10 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.huimv.eartag2.common.dao.entity.*;
 import com.huimv.eartag2.common.dao.repo.*;
 //import com.huimv.eartag2.common.service.IDevice;
-import com.huimv.eartag2.common.utils.BizConst;
-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.common.utils.*;
 import com.huimv.eartag2.manage.service.ICacheService;
 import com.huimv.eartag2.manage.service.IDeviceService;
 import lombok.extern.slf4j.Slf4j;
@@ -58,8 +55,48 @@ public class DeviceServiceImpl implements IDeviceService {
     private EartagEartagOnlineRepo eartagOnlineRepo;
     @Autowired
     private EartagDeviceEartagCountRepo deviceEartagCountRepo;
+    @Autowired
+    private EartagEnvRepo eartagEnvRepo;
 
+    /**
+     * @Method      : listDeviceEnvtempByDeviceCode
+     * @Description : 
+     * @Params      : [deviceCode]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/8       
+     * @Time        : 20:55
+     */
+    @Override
+    public Result listDeviceEnvtempByDeviceCode(String deviceCode) throws ParseException {
+        DateUtil du = new DateUtil();
+        String todayDateText = du.getTodayDateText();
+        //
+        List<EartagEnvEntity> eartagEnvEntityList = eartagEnvRepo.getDeviceEnvtempByDeviceCode(deviceCode,todayDateText);
+        if(eartagEnvEntityList.size()==0){
+            return new Result(BizConst.CODE_ENVTEMP_FLOW_NO_EXIST,BizConst.MSG_ENVTEMP_FLOW_NO_EXIST,false);
+        }else{
+            JSONArray dataJa = new JSONArray();
+            for(EartagEnvEntity eartagEnvEntity:eartagEnvEntityList){
+                JSONObject eartagEnvJo = JSONUtil.convertEntityToJSONObject(eartagEnvEntity);
+                eartagEnvJo.put("addTime",du.formatDatetimeText(eartagEnvJo.getDate("addTime")));
+                dataJa.add(eartagEnvJo);
+            }
+            return new Result(ResultCode.SUCCESS,dataJa);
+        }
+    }
 
+    /**
+     * @Method      : listOnlineDevice
+     * @Description : 
+     * @Params      : [farmId, deviceCode, alias, addDate, pageNo, pageSize]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/3/8       
+     * @Time        : 20:55
+     */
     @Override
     public Result listOnlineDevice(String farmId, String deviceCode, String alias, String addDate, Integer pageNo, Integer pageSize) throws ParseException {
         DateUtil dateUtil = new DateUtil();