Browse Source

fix:注解

黄渊昊 3 months ago
parent
commit
1356496a5f

+ 4 - 0
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/hmi/controller/HmiController.java

@@ -2,7 +2,9 @@ package vip.xiaonuo.coldchain.modular.hmi.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.coldchain.modular.hmi.entity.RoomMonitor;
 import vip.xiaonuo.coldchain.modular.hmi.service.HmiService;
 import vip.xiaonuo.coldchain.modular.targetroom.service.TargetRoomService;
@@ -10,6 +12,8 @@ import vip.xiaonuo.common.pojo.CommonResult;
 
 import java.util.List;
 
+@RestController
+@Validated
 public class HmiController {
     @Resource
     private HmiService hmiService;

+ 7 - 0
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/hmi/entity/RoomMonitor.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.coldchain.modular.hmi.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
@@ -24,9 +25,11 @@ public class RoomMonitor {
     private String monitorName;
     /** 探头编号 */
     @Schema(description = "探头编号")
+    @JsonIgnore
     private String sensorCode;
     /** 探头路由 */
     @Schema(description = "探头路由")
+    @JsonIgnore
     private Integer sensorRoute;
     /** 温度 */
     @Schema(description = "温度")
@@ -39,15 +42,19 @@ public class RoomMonitor {
     private Integer status;
     /** 最低报警温度 */
     @Schema(description = "最低报警温度")
+    @JsonIgnore
     private Float td;
     /** 最高报警温度 */
     @Schema(description = "最高报警温度")
+    @JsonIgnore
     private Float tu;
     /** 最低报警湿度 */
     @Schema(description = "最低报警湿度")
+    @JsonIgnore
     private Float hd;
     /** 最高报警湿度 */
     @Schema(description = "最高报警湿度")
+    @JsonIgnore
     private Float hu;
     /** 异常报警 0:正常 1:温湿度异常 */
     @Schema(description = "异常报警")

+ 6 - 0
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/hmi/service/impl/HmiServiceImpl.java

@@ -1,6 +1,9 @@
 package vip.xiaonuo.coldchain.modular.hmi.service.impl;
 
 import jakarta.annotation.Resource;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
 import vip.xiaonuo.coldchain.core.bean.influxdb.SensorData;
 import vip.xiaonuo.coldchain.modular.hmi.entity.RoomMonitor;
 import vip.xiaonuo.coldchain.modular.hmi.service.HmiService;
@@ -9,6 +12,9 @@ import vip.xiaonuo.coldchain.modular.targetroom.mapper.TargetRoomMapper;
 
 import java.util.List;
 
+@Service
+@RequiredArgsConstructor
+@Slf4j
 public class HmiServiceImpl implements HmiService {
     @Resource
     private TargetRoomMapper targetRoomMapper;

+ 1 - 1
snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java

@@ -149,7 +149,7 @@ public class GlobalConfigure implements WebMvcConfigurer {
 
             /* 全值匹配组织名 */
             "/coldchain/alarmuser/getOrgByName",
-            "/coldchain/targetroom/roomMonitor"
+            "/coldchain/hmi/roomMonitor"
     };
 
     /**