修改token

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/config/InterceptorConfig.java

@@ -21,6 +21,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/my/*","/lampConfig/listByUnit/","/envDeviceEquipment/update/");
+                excludePathPatterns("/my/*","/lampConfig/listByUnit","/envDeviceEquipment/update","/envDeviceEquipment/listByUnit");
     }
 }

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

@@ -6,11 +6,7 @@ import com.huimv.env.manage.saas.service.IEnvDeviceEquipmentService;
 import com.huimv.env.manage.service.IEnvDeviceRegisterService;
 import com.huimv.env.manage.utils.Result;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
@@ -25,6 +21,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/envDeviceEquipment")
+@CrossOrigin
 public class EnvDeviceEquipmentController {
 
     @Autowired

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

@@ -6,11 +6,7 @@ import com.huimv.env.manage.saas.service.ILampConfigService;
 import com.huimv.env.manage.utils.Result;
 import com.huimv.env.manage.utils.ResultCode;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
@@ -24,6 +20,7 @@ import java.util.Map;
  * @since 2022-10-18
  */
 @RestController
+@CrossOrigin
 @RequestMapping("/lampConfig")
 public class LampConfigController {
 

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

@@ -7,6 +7,8 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.env.common.entity.LampTemp;
+import com.huimv.env.common.mapper.LampTempMapper;
 import com.huimv.env.manage.entity.EnvDeviceRegister;
 import com.huimv.env.manage.mapper.BasePigpenMapper;
 import com.huimv.env.manage.mapper.LampConfigAllMapper;
@@ -47,6 +49,8 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
     private LampConfigAllMapper lampConfigAllMapper;
     @Autowired
     private BasePigpenMapper basePigpenMapper;
+    @Autowired
+    private LampTempMapper lampTempMapper;
 
     @Override
     public Result savelampConfig( LampConfig lampConfig, HttpServletRequest request) {
@@ -199,6 +203,15 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
         QueryWrapper<LampConfig> wrapper = new QueryWrapper<>();
         wrapper.eq("unit_id",unitId);
         List<LampConfig> lampConfigs = lampConfigMapper.selectList(wrapper);
+        for (LampConfig lampConfig : lampConfigs) {
+            String deviceId = lampConfig.getDeviceId();
+            LampTemp lampTemp = lampTempMapper.selectOne(new QueryWrapper<LampTemp>().eq("device_id", deviceId).orderByDesc("add_time").last("limit 1"));
+            if (ObjectUtil.isEmpty(lampTemp)){
+                lampConfig.setRemark("0");
+            }else {
+                lampConfig.setRemark(lampTemp.getTemp());
+            }
+        }
         return ResultUtil.isNull(lampConfigs);
     }