diff --git a/pom.xml b/pom.xml index c45d3ad..a29f566 100644 --- a/pom.xml +++ b/pom.xml @@ -147,24 +147,9 @@ - com.gexin.platform - gexin-rp-fastjson - 1.0.0.3 - - - com.gexin.platform - gexin-rp-sdk-base - 4.0.0.30 - - - com.gexin.platform - gexin-rp-sdk-http - 4.1.0.5 - - - com.gexin.platform - gexin-rp-sdk-template - 4.0.0.24 + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 diff --git a/pom.xml b/pom.xml index c45d3ad..a29f566 100644 --- a/pom.xml +++ b/pom.xml @@ -147,24 +147,9 @@ - com.gexin.platform - gexin-rp-fastjson - 1.0.0.3 - - - com.gexin.platform - gexin-rp-sdk-base - 4.0.0.30 - - - com.gexin.platform - gexin-rp-sdk-http - 4.1.0.5 - - - com.gexin.platform - gexin-rp-sdk-template - 4.0.0.24 + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 diff --git a/smartwell-demos.iml b/smartwell-demos.iml index 47b2113..d14ea3f 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -82,5 +82,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index c45d3ad..a29f566 100644 --- a/pom.xml +++ b/pom.xml @@ -147,24 +147,9 @@ - com.gexin.platform - gexin-rp-fastjson - 1.0.0.3 - - - com.gexin.platform - gexin-rp-sdk-base - 4.0.0.30 - - - com.gexin.platform - gexin-rp-sdk-http - 4.1.0.5 - - - com.gexin.platform - gexin-rp-sdk-template - 4.0.0.24 + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 diff --git a/smartwell-demos.iml b/smartwell-demos.iml index 47b2113..d14ea3f 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -82,5 +82,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/WebSocketConfig.java b/src/main/java/com/casic/config/WebSocketConfig.java new file mode 100644 index 0000000..195e2ad --- /dev/null +++ b/src/main/java/com/casic/config/WebSocketConfig.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; + +// tomcat启动无需配置 +@Configuration +public class WebSocketConfig { + /** + * 注入ServerEndpointExporter， + * 这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint + */ + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } +} diff --git a/pom.xml b/pom.xml index c45d3ad..a29f566 100644 --- a/pom.xml +++ b/pom.xml @@ -147,24 +147,9 @@ - com.gexin.platform - gexin-rp-fastjson - 1.0.0.3 - - - com.gexin.platform - gexin-rp-sdk-base - 4.0.0.30 - - - com.gexin.platform - gexin-rp-sdk-http - 4.1.0.5 - - - com.gexin.platform - gexin-rp-sdk-template - 4.0.0.24 + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 diff --git a/smartwell-demos.iml b/smartwell-demos.iml index 47b2113..d14ea3f 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -82,5 +82,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/WebSocketConfig.java b/src/main/java/com/casic/config/WebSocketConfig.java new file mode 100644 index 0000000..195e2ad --- /dev/null +++ b/src/main/java/com/casic/config/WebSocketConfig.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; + +// tomcat启动无需配置 +@Configuration +public class WebSocketConfig { + /** + * 注入ServerEndpointExporter， + * 这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint + */ + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } +} diff --git a/src/main/java/com/casic/controller/AlarmPushController.java b/src/main/java/com/casic/controller/AlarmPushController.java index ac0e58e..89b6d27 100644 --- a/src/main/java/com/casic/controller/AlarmPushController.java +++ b/src/main/java/com/casic/controller/AlarmPushController.java @@ -3,10 +3,7 @@ import com.casic.model.AlarmPushConfig; import com.casic.service.AlarmPushService; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @AllArgsConstructor @@ -15,7 +12,8 @@ private AlarmPushService alarmPushService; @RequestMapping("/push/config") - public Object alarmPushConfig(@RequestBody AlarmPushConfig alarmSwitchConfig) { + @ResponseBody + public Object alarmPushConfig(AlarmPushConfig alarmSwitchConfig) { return alarmPushService.alarmPushConfig(alarmSwitchConfig); } diff --git a/pom.xml b/pom.xml index c45d3ad..a29f566 100644 --- a/pom.xml +++ b/pom.xml @@ -147,24 +147,9 @@ - com.gexin.platform - gexin-rp-fastjson - 1.0.0.3 - - - com.gexin.platform - gexin-rp-sdk-base - 4.0.0.30 - - - com.gexin.platform - gexin-rp-sdk-http - 4.1.0.5 - - - com.gexin.platform - gexin-rp-sdk-template - 4.0.0.24 + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 diff --git a/smartwell-demos.iml b/smartwell-demos.iml index 47b2113..d14ea3f 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -82,5 +82,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/WebSocketConfig.java b/src/main/java/com/casic/config/WebSocketConfig.java new file mode 100644 index 0000000..195e2ad --- /dev/null +++ b/src/main/java/com/casic/config/WebSocketConfig.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; + +// tomcat启动无需配置 +@Configuration +public class WebSocketConfig { + /** + * 注入ServerEndpointExporter， + * 这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint + */ + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } +} diff --git a/src/main/java/com/casic/controller/AlarmPushController.java b/src/main/java/com/casic/controller/AlarmPushController.java index ac0e58e..89b6d27 100644 --- a/src/main/java/com/casic/controller/AlarmPushController.java +++ b/src/main/java/com/casic/controller/AlarmPushController.java @@ -3,10 +3,7 @@ import com.casic.model.AlarmPushConfig; import com.casic.service.AlarmPushService; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @AllArgsConstructor @@ -15,7 +12,8 @@ private AlarmPushService alarmPushService; @RequestMapping("/push/config") - public Object alarmPushConfig(@RequestBody AlarmPushConfig alarmSwitchConfig) { + @ResponseBody + public Object alarmPushConfig(AlarmPushConfig alarmSwitchConfig) { return alarmPushService.alarmPushConfig(alarmSwitchConfig); } diff --git a/src/main/java/com/casic/dao/AlarmPushMapper.java b/src/main/java/com/casic/dao/AlarmPushMapper.java index 346e9f0..9d7484b 100644 --- a/src/main/java/com/casic/dao/AlarmPushMapper.java +++ b/src/main/java/com/casic/dao/AlarmPushMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.model.AlarmPushConfig; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface AlarmPushMapper extends BaseMapper { } diff --git a/pom.xml b/pom.xml index c45d3ad..a29f566 100644 --- a/pom.xml +++ b/pom.xml @@ -147,24 +147,9 @@ - com.gexin.platform - gexin-rp-fastjson - 1.0.0.3 - - - com.gexin.platform - gexin-rp-sdk-base - 4.0.0.30 - - - com.gexin.platform - gexin-rp-sdk-http - 4.1.0.5 - - - com.gexin.platform - gexin-rp-sdk-template - 4.0.0.24 + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 diff --git a/smartwell-demos.iml b/smartwell-demos.iml index 47b2113..d14ea3f 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -82,5 +82,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/WebSocketConfig.java b/src/main/java/com/casic/config/WebSocketConfig.java new file mode 100644 index 0000000..195e2ad --- /dev/null +++ b/src/main/java/com/casic/config/WebSocketConfig.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; + +// tomcat启动无需配置 +@Configuration +public class WebSocketConfig { + /** + * 注入ServerEndpointExporter， + * 这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint + */ + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } +} diff --git a/src/main/java/com/casic/controller/AlarmPushController.java b/src/main/java/com/casic/controller/AlarmPushController.java index ac0e58e..89b6d27 100644 --- a/src/main/java/com/casic/controller/AlarmPushController.java +++ b/src/main/java/com/casic/controller/AlarmPushController.java @@ -3,10 +3,7 @@ import com.casic.model.AlarmPushConfig; import com.casic.service.AlarmPushService; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @AllArgsConstructor @@ -15,7 +12,8 @@ private AlarmPushService alarmPushService; @RequestMapping("/push/config") - public Object alarmPushConfig(@RequestBody AlarmPushConfig alarmSwitchConfig) { + @ResponseBody + public Object alarmPushConfig(AlarmPushConfig alarmSwitchConfig) { return alarmPushService.alarmPushConfig(alarmSwitchConfig); } diff --git a/src/main/java/com/casic/dao/AlarmPushMapper.java b/src/main/java/com/casic/dao/AlarmPushMapper.java index 346e9f0..9d7484b 100644 --- a/src/main/java/com/casic/dao/AlarmPushMapper.java +++ b/src/main/java/com/casic/dao/AlarmPushMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.model.AlarmPushConfig; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface AlarmPushMapper extends BaseMapper { } diff --git a/src/main/java/com/casic/model/AlarmPushConfig.java b/src/main/java/com/casic/model/AlarmPushConfig.java index 60d548c..b68fb44 100644 --- a/src/main/java/com/casic/model/AlarmPushConfig.java +++ b/src/main/java/com/casic/model/AlarmPushConfig.java @@ -6,14 +6,14 @@ import lombok.Data; @Data -@TableName("alarm_switch_config") +@TableName("alarm_push_config") public class AlarmPushConfig { @TableId(value = "ID", type = IdType.ASSIGN_ID) private Long id; private Integer websocketAlarm; private Integer shortMessageAlarm; - private String secene; + private String scene; private Integer enable; private String phoneArray; } diff --git a/pom.xml b/pom.xml index c45d3ad..a29f566 100644 --- a/pom.xml +++ b/pom.xml @@ -147,24 +147,9 @@ - com.gexin.platform - gexin-rp-fastjson - 1.0.0.3 - - - com.gexin.platform - gexin-rp-sdk-base - 4.0.0.30 - - - com.gexin.platform - gexin-rp-sdk-http - 4.1.0.5 - - - com.gexin.platform - gexin-rp-sdk-template - 4.0.0.24 + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 diff --git a/smartwell-demos.iml b/smartwell-demos.iml index 47b2113..d14ea3f 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -82,5 +82,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/WebSocketConfig.java b/src/main/java/com/casic/config/WebSocketConfig.java new file mode 100644 index 0000000..195e2ad --- /dev/null +++ b/src/main/java/com/casic/config/WebSocketConfig.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; + +// tomcat启动无需配置 +@Configuration +public class WebSocketConfig { + /** + * 注入ServerEndpointExporter， + * 这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint + */ + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } +} diff --git a/src/main/java/com/casic/controller/AlarmPushController.java b/src/main/java/com/casic/controller/AlarmPushController.java index ac0e58e..89b6d27 100644 --- a/src/main/java/com/casic/controller/AlarmPushController.java +++ b/src/main/java/com/casic/controller/AlarmPushController.java @@ -3,10 +3,7 @@ import com.casic.model.AlarmPushConfig; import com.casic.service.AlarmPushService; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @AllArgsConstructor @@ -15,7 +12,8 @@ private AlarmPushService alarmPushService; @RequestMapping("/push/config") - public Object alarmPushConfig(@RequestBody AlarmPushConfig alarmSwitchConfig) { + @ResponseBody + public Object alarmPushConfig(AlarmPushConfig alarmSwitchConfig) { return alarmPushService.alarmPushConfig(alarmSwitchConfig); } diff --git a/src/main/java/com/casic/dao/AlarmPushMapper.java b/src/main/java/com/casic/dao/AlarmPushMapper.java index 346e9f0..9d7484b 100644 --- a/src/main/java/com/casic/dao/AlarmPushMapper.java +++ b/src/main/java/com/casic/dao/AlarmPushMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.model.AlarmPushConfig; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface AlarmPushMapper extends BaseMapper { } diff --git a/src/main/java/com/casic/model/AlarmPushConfig.java b/src/main/java/com/casic/model/AlarmPushConfig.java index 60d548c..b68fb44 100644 --- a/src/main/java/com/casic/model/AlarmPushConfig.java +++ b/src/main/java/com/casic/model/AlarmPushConfig.java @@ -6,14 +6,14 @@ import lombok.Data; @Data -@TableName("alarm_switch_config") +@TableName("alarm_push_config") public class AlarmPushConfig { @TableId(value = "ID", type = IdType.ASSIGN_ID) private Long id; private Integer websocketAlarm; private Integer shortMessageAlarm; - private String secene; + private String scene; private Integer enable; private String phoneArray; } diff --git a/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java b/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java index e453316..d71c8c3 100644 --- a/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java +++ b/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java @@ -22,13 +22,13 @@ ResponseData responseData = new ResponseData(); try { QueryWrapper queryWrapper = new QueryWrapper() - .eq("sence", alarmSwitchConfig.getSecene()); + .eq("scene", alarmSwitchConfig.getScene()); // this.baseMapper.delete(deleteWrapper); this.baseMapper.update(alarmSwitchConfig, queryWrapper); responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); } catch (DataAccessException dae) { - log.error("报警推送配置新增异常,场景{},异常信息{}", alarmSwitchConfig.getSecene(), dae.getMessage()); + log.error("报警推送配置新增异常,场景{},异常信息{}", alarmSwitchConfig.getScene(), dae.getMessage()); responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); } @@ -40,7 +40,7 @@ ResponseData responseData = new ResponseData(); try { QueryWrapper queryWrapper = new QueryWrapper() - .eq("sence", secene); + .eq("scene", secene); List alarmPushConfigList = this.baseMapper.selectList(queryWrapper); Optional alarmPushConfigOptional = alarmPushConfigList.stream().findFirst(); responseData.setData(alarmPushConfigOptional.isPresent() ? alarmPushConfigOptional.get() : new Object()); diff --git a/pom.xml b/pom.xml index c45d3ad..a29f566 100644 --- a/pom.xml +++ b/pom.xml @@ -147,24 +147,9 @@ - com.gexin.platform - gexin-rp-fastjson - 1.0.0.3 - - - com.gexin.platform - gexin-rp-sdk-base - 4.0.0.30 - - - com.gexin.platform - gexin-rp-sdk-http - 4.1.0.5 - - - com.gexin.platform - gexin-rp-sdk-template - 4.0.0.24 + org.springframework.boot + spring-boot-starter-websocket + 2.4.5 diff --git a/smartwell-demos.iml b/smartwell-demos.iml index 47b2113..d14ea3f 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -82,5 +82,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/config/WebSocketConfig.java b/src/main/java/com/casic/config/WebSocketConfig.java new file mode 100644 index 0000000..195e2ad --- /dev/null +++ b/src/main/java/com/casic/config/WebSocketConfig.java @@ -0,0 +1,18 @@ +package com.casic.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; + +// tomcat启动无需配置 +@Configuration +public class WebSocketConfig { + /** + * 注入ServerEndpointExporter， + * 这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint + */ + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } +} diff --git a/src/main/java/com/casic/controller/AlarmPushController.java b/src/main/java/com/casic/controller/AlarmPushController.java index ac0e58e..89b6d27 100644 --- a/src/main/java/com/casic/controller/AlarmPushController.java +++ b/src/main/java/com/casic/controller/AlarmPushController.java @@ -3,10 +3,7 @@ import com.casic.model.AlarmPushConfig; import com.casic.service.AlarmPushService; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @AllArgsConstructor @@ -15,7 +12,8 @@ private AlarmPushService alarmPushService; @RequestMapping("/push/config") - public Object alarmPushConfig(@RequestBody AlarmPushConfig alarmSwitchConfig) { + @ResponseBody + public Object alarmPushConfig(AlarmPushConfig alarmSwitchConfig) { return alarmPushService.alarmPushConfig(alarmSwitchConfig); } diff --git a/src/main/java/com/casic/dao/AlarmPushMapper.java b/src/main/java/com/casic/dao/AlarmPushMapper.java index 346e9f0..9d7484b 100644 --- a/src/main/java/com/casic/dao/AlarmPushMapper.java +++ b/src/main/java/com/casic/dao/AlarmPushMapper.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.model.AlarmPushConfig; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface AlarmPushMapper extends BaseMapper { } diff --git a/src/main/java/com/casic/model/AlarmPushConfig.java b/src/main/java/com/casic/model/AlarmPushConfig.java index 60d548c..b68fb44 100644 --- a/src/main/java/com/casic/model/AlarmPushConfig.java +++ b/src/main/java/com/casic/model/AlarmPushConfig.java @@ -6,14 +6,14 @@ import lombok.Data; @Data -@TableName("alarm_switch_config") +@TableName("alarm_push_config") public class AlarmPushConfig { @TableId(value = "ID", type = IdType.ASSIGN_ID) private Long id; private Integer websocketAlarm; private Integer shortMessageAlarm; - private String secene; + private String scene; private Integer enable; private String phoneArray; } diff --git a/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java b/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java index e453316..d71c8c3 100644 --- a/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java +++ b/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java @@ -22,13 +22,13 @@ ResponseData responseData = new ResponseData(); try { QueryWrapper queryWrapper = new QueryWrapper() - .eq("sence", alarmSwitchConfig.getSecene()); + .eq("scene", alarmSwitchConfig.getScene()); // this.baseMapper.delete(deleteWrapper); this.baseMapper.update(alarmSwitchConfig, queryWrapper); responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); } catch (DataAccessException dae) { - log.error("报警推送配置新增异常,场景{},异常信息{}", alarmSwitchConfig.getSecene(), dae.getMessage()); + log.error("报警推送配置新增异常,场景{},异常信息{}", alarmSwitchConfig.getScene(), dae.getMessage()); responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); } @@ -40,7 +40,7 @@ ResponseData responseData = new ResponseData(); try { QueryWrapper queryWrapper = new QueryWrapper() - .eq("sence", secene); + .eq("scene", secene); List alarmPushConfigList = this.baseMapper.selectList(queryWrapper); Optional alarmPushConfigOptional = alarmPushConfigList.stream().findFirst(); responseData.setData(alarmPushConfigOptional.isPresent() ? alarmPushConfigOptional.get() : new Object()); diff --git a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java index 21ad102..04eced2 100644 --- a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java @@ -118,7 +118,7 @@ AlarmPushConfig alarmPushConfig = (AlarmPushConfig) responseData.getData(); if (alarmPushConfig.getEnable().equals(1)) { if (alarmPushConfig.getWebsocketAlarm().equals(1)) { - String msg = "在" + new SimpleDateFormat("yyyyMMdd HH:mm:ss").format(new Date()) + "," + String msg = "在" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "," + "设备" + devcode + "发生了压力超标，压力值为" + presss; try { messagePusherService.updateSinkJob("", URLDecoder.decode(msg, "UTF-8"));