修改bug，大屏部分接口

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/entity/LampTemp.java

@@ -5,6 +5,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -38,6 +40,7 @@ public class LampTemp implements Serializable {
     /**
      * 添加时间
      */
+    @JsonFormat(pattern = "dd HH:mm",timezone = "GMT+8")
     private Date addTime;
 
     private String farmCode;

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/LampTempController.java

@@ -1,10 +1,23 @@
 package com.huimv.env.manage.controller;
 
 
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.env.common.entity.LampTemp;
+import com.huimv.env.common.mapper.LampTempMapper;
+import com.huimv.env.manage.utils.Result;
+import com.huimv.env.manage.utils.ResultUtil;
+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.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -14,8 +27,17 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-10-27
  */
 @RestController
-@RequestMapping("/lamp-temp")
+@RequestMapping("/lampTemp")
 public class LampTempController {
+    @Autowired
+    private LampTempMapper lampTempMapper;
+
+    @PostMapping("/getList")
+    public Result getList(@RequestBody Map<String,String> paramMap){
+        String lampId = paramMap.get("lampId");
+        List<LampTemp> deviceId = lampTempMapper.selectList(new QueryWrapper<LampTemp>().eq("device_id", lampId).ge("add_time", DateUtil.beginOfDay(new Date())).orderByDesc("add_time"));
 
+        return ResultUtil.isNull(deviceId);
+    }
 }
 

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/service/impl/LampConfigServiceImpl.java

@@ -45,9 +45,8 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
     private LampConfigMapper lampConfigMapper;
     @Autowired
     private LampConfigAllMapper lampConfigAllMapper;
-
     @Autowired
-    BasePigpenMapper basePigpenMapper;
+    private BasePigpenMapper basePigpenMapper;
 
     @Override
     public Result savelampConfig( LampConfig lampConfig, HttpServletRequest request) {
@@ -264,7 +263,7 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
         if (ObjectUtil.isEmpty(lampConfig)){
             return new Result(10001,"设备不存在",false);
         }
-
+        BasePigpen basePigpen = basePigpenMapper.selectById(lampConfig.getUnitId());
         Map endMap =new HashMap();
         endMap.put("initDayage",lampConfig.getInitAge());
         endMap.put("listDayage",lampConfig.getAgeList().split(";"));
@@ -280,6 +279,7 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
         endMap.put("unitId",lampConfig.getUnitId());
         endMap.put("farmCode",lampConfig.getFarmCode());
         endMap.put("binding",lampConfig.getBinding());
+        endMap.put("pigpenName",basePigpen.getPigpenName());
         return new Result(ResultCode.SUCCESS,endMap);
     }
 }

huimv-env-platform/huimv-env-manage/src/main/resources/com/huimv/env/manage/mapper/LampConfigMapper.xml

@@ -18,7 +18,7 @@
         <result column="upload_start" property="uploadStart" />
     </resultMap>
     <select id="getOpenCloseStatus" resultType="java.lang.Integer" parameterType="java.lang.String">
-        SELECT open_start FROM `lamp_config` WHERE farm_code = #{farmCode}
+        SELECT upload_start FROM `lamp_config` WHERE farm_code = #{farmCode}
     </select>
 
 </mapper>