diff --git a/smartwell-demos.iml b/smartwell-demos.iml index d14ea3f..22d1be6 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -53,8 +53,8 @@ - - + + @@ -90,16 +90,35 @@ - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/smartwell-demos.iml b/smartwell-demos.iml index d14ea3f..22d1be6 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -53,8 +53,8 @@ - - + + @@ -90,16 +90,35 @@ - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/controller/AlarmPushController.java b/src/main/java/com/casic/controller/AlarmPushController.java index 89b6d27..1642f9b 100644 --- a/src/main/java/com/casic/controller/AlarmPushController.java +++ b/src/main/java/com/casic/controller/AlarmPushController.java @@ -7,6 +7,7 @@ @RestController @AllArgsConstructor +@RequestMapping("/alarm") public class AlarmPushController { private AlarmPushService alarmPushService; @@ -18,8 +19,8 @@ } @RequestMapping("/push/query") - public Object alarmPushQuery(@RequestParam(value = "secene", required = true) String secene) { - return alarmPushService.getAlarmPush(secene); + public Object alarmPushQuery(@RequestParam(value = "scene", required = true) String scene) { + return alarmPushService.getAlarmPush(scene); } } diff --git a/smartwell-demos.iml b/smartwell-demos.iml index d14ea3f..22d1be6 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -53,8 +53,8 @@ - - + + @@ -90,16 +90,35 @@ - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/controller/AlarmPushController.java b/src/main/java/com/casic/controller/AlarmPushController.java index 89b6d27..1642f9b 100644 --- a/src/main/java/com/casic/controller/AlarmPushController.java +++ b/src/main/java/com/casic/controller/AlarmPushController.java @@ -7,6 +7,7 @@ @RestController @AllArgsConstructor +@RequestMapping("/alarm") public class AlarmPushController { private AlarmPushService alarmPushService; @@ -18,8 +19,8 @@ } @RequestMapping("/push/query") - public Object alarmPushQuery(@RequestParam(value = "secene", required = true) String secene) { - return alarmPushService.getAlarmPush(secene); + public Object alarmPushQuery(@RequestParam(value = "scene", required = true) String scene) { + return alarmPushService.getAlarmPush(scene); } } diff --git a/src/main/java/com/casic/service/AlarmPushService.java b/src/main/java/com/casic/service/AlarmPushService.java index 20cd2e7..d180eb2 100644 --- a/src/main/java/com/casic/service/AlarmPushService.java +++ b/src/main/java/com/casic/service/AlarmPushService.java @@ -6,7 +6,7 @@ Object alarmPushConfig(AlarmPushConfig alarmSwitchConfig); - Object getAlarmPush(String secene); + Object getAlarmPush(String scene); } diff --git a/smartwell-demos.iml b/smartwell-demos.iml index d14ea3f..22d1be6 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -53,8 +53,8 @@ - - + + @@ -90,16 +90,35 @@ - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/controller/AlarmPushController.java b/src/main/java/com/casic/controller/AlarmPushController.java index 89b6d27..1642f9b 100644 --- a/src/main/java/com/casic/controller/AlarmPushController.java +++ b/src/main/java/com/casic/controller/AlarmPushController.java @@ -7,6 +7,7 @@ @RestController @AllArgsConstructor +@RequestMapping("/alarm") public class AlarmPushController { private AlarmPushService alarmPushService; @@ -18,8 +19,8 @@ } @RequestMapping("/push/query") - public Object alarmPushQuery(@RequestParam(value = "secene", required = true) String secene) { - return alarmPushService.getAlarmPush(secene); + public Object alarmPushQuery(@RequestParam(value = "scene", required = true) String scene) { + return alarmPushService.getAlarmPush(scene); } } diff --git a/src/main/java/com/casic/service/AlarmPushService.java b/src/main/java/com/casic/service/AlarmPushService.java index 20cd2e7..d180eb2 100644 --- a/src/main/java/com/casic/service/AlarmPushService.java +++ b/src/main/java/com/casic/service/AlarmPushService.java @@ -6,7 +6,7 @@ Object alarmPushConfig(AlarmPushConfig alarmSwitchConfig); - Object getAlarmPush(String secene); + Object getAlarmPush(String scene); } diff --git a/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java b/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java index d71c8c3..d193905 100644 --- a/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java +++ b/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java @@ -36,18 +36,18 @@ } @Override - public Object getAlarmPush(String secene) { + public Object getAlarmPush(String scene) { ResponseData responseData = new ResponseData(); try { QueryWrapper queryWrapper = new QueryWrapper() - .eq("scene", secene); + .eq("scene", scene); List alarmPushConfigList = this.baseMapper.selectList(queryWrapper); Optional alarmPushConfigOptional = alarmPushConfigList.stream().findFirst(); responseData.setData(alarmPushConfigOptional.isPresent() ? alarmPushConfigOptional.get() : new Object()); responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); } catch (DataAccessException dae) { - log.error("报警推送配置查询异常,场景{},异常信息{}", secene, dae.getMessage()); + log.error("报警推送配置查询异常,场景{},异常信息{}", scene, dae.getMessage()); responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); } diff --git a/smartwell-demos.iml b/smartwell-demos.iml index d14ea3f..22d1be6 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -53,8 +53,8 @@ - - + + @@ -90,16 +90,35 @@ - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/controller/AlarmPushController.java b/src/main/java/com/casic/controller/AlarmPushController.java index 89b6d27..1642f9b 100644 --- a/src/main/java/com/casic/controller/AlarmPushController.java +++ b/src/main/java/com/casic/controller/AlarmPushController.java @@ -7,6 +7,7 @@ @RestController @AllArgsConstructor +@RequestMapping("/alarm") public class AlarmPushController { private AlarmPushService alarmPushService; @@ -18,8 +19,8 @@ } @RequestMapping("/push/query") - public Object alarmPushQuery(@RequestParam(value = "secene", required = true) String secene) { - return alarmPushService.getAlarmPush(secene); + public Object alarmPushQuery(@RequestParam(value = "scene", required = true) String scene) { + return alarmPushService.getAlarmPush(scene); } } diff --git a/src/main/java/com/casic/service/AlarmPushService.java b/src/main/java/com/casic/service/AlarmPushService.java index 20cd2e7..d180eb2 100644 --- a/src/main/java/com/casic/service/AlarmPushService.java +++ b/src/main/java/com/casic/service/AlarmPushService.java @@ -6,7 +6,7 @@ Object alarmPushConfig(AlarmPushConfig alarmSwitchConfig); - Object getAlarmPush(String secene); + Object getAlarmPush(String scene); } diff --git a/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java b/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java index d71c8c3..d193905 100644 --- a/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java +++ b/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java @@ -36,18 +36,18 @@ } @Override - public Object getAlarmPush(String secene) { + public Object getAlarmPush(String scene) { ResponseData responseData = new ResponseData(); try { QueryWrapper queryWrapper = new QueryWrapper() - .eq("scene", secene); + .eq("scene", scene); List alarmPushConfigList = this.baseMapper.selectList(queryWrapper); Optional alarmPushConfigOptional = alarmPushConfigList.stream().findFirst(); responseData.setData(alarmPushConfigOptional.isPresent() ? alarmPushConfigOptional.get() : new Object()); responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); } catch (DataAccessException dae) { - log.error("报警推送配置查询异常,场景{},异常信息{}", secene, dae.getMessage()); + log.error("报警推送配置查询异常,场景{},异常信息{}", scene, dae.getMessage()); responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); } diff --git a/src/main/java/com/casic/service/impl/MessagePusherImpl.java b/src/main/java/com/casic/service/impl/MessagePusherImpl.java index 850f939..93a435c 100644 --- a/src/main/java/com/casic/service/impl/MessagePusherImpl.java +++ b/src/main/java/com/casic/service/impl/MessagePusherImpl.java @@ -20,7 +20,7 @@ @Override public void updateSinkJob(String id, String msg) { if (!(StringUtils.isEmpty(msg))) { - sendAlarm(msg);//推送告警至app和pc端 + sendAlarm(msg);//推送告警至pc端 } } diff --git a/smartwell-demos.iml b/smartwell-demos.iml index d14ea3f..22d1be6 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -53,8 +53,8 @@ - - + + @@ -90,16 +90,35 @@ - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/controller/AlarmPushController.java b/src/main/java/com/casic/controller/AlarmPushController.java index 89b6d27..1642f9b 100644 --- a/src/main/java/com/casic/controller/AlarmPushController.java +++ b/src/main/java/com/casic/controller/AlarmPushController.java @@ -7,6 +7,7 @@ @RestController @AllArgsConstructor +@RequestMapping("/alarm") public class AlarmPushController { private AlarmPushService alarmPushService; @@ -18,8 +19,8 @@ } @RequestMapping("/push/query") - public Object alarmPushQuery(@RequestParam(value = "secene", required = true) String secene) { - return alarmPushService.getAlarmPush(secene); + public Object alarmPushQuery(@RequestParam(value = "scene", required = true) String scene) { + return alarmPushService.getAlarmPush(scene); } } diff --git a/src/main/java/com/casic/service/AlarmPushService.java b/src/main/java/com/casic/service/AlarmPushService.java index 20cd2e7..d180eb2 100644 --- a/src/main/java/com/casic/service/AlarmPushService.java +++ b/src/main/java/com/casic/service/AlarmPushService.java @@ -6,7 +6,7 @@ Object alarmPushConfig(AlarmPushConfig alarmSwitchConfig); - Object getAlarmPush(String secene); + Object getAlarmPush(String scene); } diff --git a/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java b/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java index d71c8c3..d193905 100644 --- a/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java +++ b/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java @@ -36,18 +36,18 @@ } @Override - public Object getAlarmPush(String secene) { + public Object getAlarmPush(String scene) { ResponseData responseData = new ResponseData(); try { QueryWrapper queryWrapper = new QueryWrapper() - .eq("scene", secene); + .eq("scene", scene); List alarmPushConfigList = this.baseMapper.selectList(queryWrapper); Optional alarmPushConfigOptional = alarmPushConfigList.stream().findFirst(); responseData.setData(alarmPushConfigOptional.isPresent() ? alarmPushConfigOptional.get() : new Object()); responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); } catch (DataAccessException dae) { - log.error("报警推送配置查询异常,场景{},异常信息{}", secene, dae.getMessage()); + log.error("报警推送配置查询异常,场景{},异常信息{}", scene, dae.getMessage()); responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); } diff --git a/src/main/java/com/casic/service/impl/MessagePusherImpl.java b/src/main/java/com/casic/service/impl/MessagePusherImpl.java index 850f939..93a435c 100644 --- a/src/main/java/com/casic/service/impl/MessagePusherImpl.java +++ b/src/main/java/com/casic/service/impl/MessagePusherImpl.java @@ -20,7 +20,7 @@ @Override public void updateSinkJob(String id, String msg) { if (!(StringUtils.isEmpty(msg))) { - sendAlarm(msg);//推送告警至app和pc端 + sendAlarm(msg);//推送告警至pc端 } } diff --git a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java index b9437af..7ac6bc1 100644 --- a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java @@ -149,7 +149,6 @@ phoneList.add(phone); aliSignNameList.add(aliSignName); } - phoneJson = JSONObject.toJSONString(phoneList); } sendBatchSmsUtil.sendMsg(phoneJson, JSON.toJSONString(msgMap),JSONObject.toJSONString(aliSignNameList)); diff --git a/smartwell-demos.iml b/smartwell-demos.iml index d14ea3f..22d1be6 100644 --- a/smartwell-demos.iml +++ b/smartwell-demos.iml @@ -53,8 +53,8 @@ - - + + @@ -90,16 +90,35 @@ - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/casic/controller/AlarmPushController.java b/src/main/java/com/casic/controller/AlarmPushController.java index 89b6d27..1642f9b 100644 --- a/src/main/java/com/casic/controller/AlarmPushController.java +++ b/src/main/java/com/casic/controller/AlarmPushController.java @@ -7,6 +7,7 @@ @RestController @AllArgsConstructor +@RequestMapping("/alarm") public class AlarmPushController { private AlarmPushService alarmPushService; @@ -18,8 +19,8 @@ } @RequestMapping("/push/query") - public Object alarmPushQuery(@RequestParam(value = "secene", required = true) String secene) { - return alarmPushService.getAlarmPush(secene); + public Object alarmPushQuery(@RequestParam(value = "scene", required = true) String scene) { + return alarmPushService.getAlarmPush(scene); } } diff --git a/src/main/java/com/casic/service/AlarmPushService.java b/src/main/java/com/casic/service/AlarmPushService.java index 20cd2e7..d180eb2 100644 --- a/src/main/java/com/casic/service/AlarmPushService.java +++ b/src/main/java/com/casic/service/AlarmPushService.java @@ -6,7 +6,7 @@ Object alarmPushConfig(AlarmPushConfig alarmSwitchConfig); - Object getAlarmPush(String secene); + Object getAlarmPush(String scene); } diff --git a/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java b/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java index d71c8c3..d193905 100644 --- a/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java +++ b/src/main/java/com/casic/service/impl/AlarmPushServiceImpl.java @@ -36,18 +36,18 @@ } @Override - public Object getAlarmPush(String secene) { + public Object getAlarmPush(String scene) { ResponseData responseData = new ResponseData(); try { QueryWrapper queryWrapper = new QueryWrapper() - .eq("scene", secene); + .eq("scene", scene); List alarmPushConfigList = this.baseMapper.selectList(queryWrapper); Optional alarmPushConfigOptional = alarmPushConfigList.stream().findFirst(); responseData.setData(alarmPushConfigOptional.isPresent() ? alarmPushConfigOptional.get() : new Object()); responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); } catch (DataAccessException dae) { - log.error("报警推送配置查询异常,场景{},异常信息{}", secene, dae.getMessage()); + log.error("报警推送配置查询异常,场景{},异常信息{}", scene, dae.getMessage()); responseData.setMessage(ResponseData.DEFAULT_ERROR_MESSAGE); responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); } diff --git a/src/main/java/com/casic/service/impl/MessagePusherImpl.java b/src/main/java/com/casic/service/impl/MessagePusherImpl.java index 850f939..93a435c 100644 --- a/src/main/java/com/casic/service/impl/MessagePusherImpl.java +++ b/src/main/java/com/casic/service/impl/MessagePusherImpl.java @@ -20,7 +20,7 @@ @Override public void updateSinkJob(String id, String msg) { if (!(StringUtils.isEmpty(msg))) { - sendAlarm(msg);//推送告警至app和pc端 + sendAlarm(msg);//推送告警至pc端 } } diff --git a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java index b9437af..7ac6bc1 100644 --- a/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java +++ b/src/main/java/com/casic/service/impl/ThirdDataServiceImpl.java @@ -149,7 +149,6 @@ phoneList.add(phone); aliSignNameList.add(aliSignName); } - phoneJson = JSONObject.toJSONString(phoneList); } sendBatchSmsUtil.sendMsg(phoneJson, JSON.toJSONString(msgMap),JSONObject.toJSONString(aliSignNameList)); diff --git a/src/main/resources/mapper/AlarmMapper.xml b/src/main/resources/mapper/AlarmMapper.xml index 2a1c28d..f0ffc72 100644 --- a/src/main/resources/mapper/AlarmMapper.xml +++ b/src/main/resources/mapper/AlarmMapper.xml @@ -3,7 +3,7 @@