diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java index ac82f93..427b162 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java @@ -54,7 +54,7 @@ AlarmJob alarmJob = alarmJobMapper.selectById(Long.valueOf(id)); if (!ObjectUtil.isEmpty(alarmJob)) { Map deptMap = this.baseMapper.getDeptIdsByDevcode(alarmJob.getDevcode()); - if (ObjectUtil.isEmpty(deptMap)){ + if (!ObjectUtil.isEmpty(deptMap)){ List userClientList = responDeptProvider(deptMap.get("ownerDeptId")); sendJob(id, alarmJob, userClientList);//推送工单至app和pc端 if (StrUtil.isNotBlank(msg)) { @@ -86,9 +86,9 @@ List userIds = new ArrayList<>(); String appMsg = "设备编号[" + devcode + "]发生" + msg; if (clientIdlist.size() > 0) { - IPushResult pushResult = PushList.pushToUser(clientIdlist, "告警提醒", appMsg); + IPushResult pushResult = PushList.pushToUser(clientIdlist, "新的工单任务", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { - log.info("告警消息app端推送成功:" + appMsg); + log.info("告警消息app端推送成功:" + appMsg+":推送人第一个人clienId"+clientIdlist.get(0)); } else { log.info("告警消息app端推送失败:" + appMsg); } @@ -113,28 +113,6 @@ private void sendJob(String id, AlarmJob alarmJob, List userClientList) { Calendar now = Calendar.getInstance(); -// if (isWeekend(now)) { -// now.add(Calendar.WEEK_OF_YEAR, 1); -// now.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); -// now.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班 -// now.set(Calendar.MINUTE, 0); -// now.set(Calendar.SECOND, 0); -// } else { -// try { -// if (isTimeRange()) { -// now.add(Calendar.HOUR_OF_DAY, 2); -// } else { -// now.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班 -// now.set(Calendar.MINUTE, 0); -// now.set(Calendar.SECOND, 0); -// if (!compareNoon()) { -// now.add(Calendar.DAY_OF_MONTH, +1); -// } -// } -// } catch (ParseException e) { -// e.printStackTrace(); -// } -// } Date shouldHandleTime = now.getTime(); if (useOverTime.equals("true")) { System.out.println(shouldHandleTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java index ac82f93..427b162 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java @@ -54,7 +54,7 @@ AlarmJob alarmJob = alarmJobMapper.selectById(Long.valueOf(id)); if (!ObjectUtil.isEmpty(alarmJob)) { Map deptMap = this.baseMapper.getDeptIdsByDevcode(alarmJob.getDevcode()); - if (ObjectUtil.isEmpty(deptMap)){ + if (!ObjectUtil.isEmpty(deptMap)){ List userClientList = responDeptProvider(deptMap.get("ownerDeptId")); sendJob(id, alarmJob, userClientList);//推送工单至app和pc端 if (StrUtil.isNotBlank(msg)) { @@ -86,9 +86,9 @@ List userIds = new ArrayList<>(); String appMsg = "设备编号[" + devcode + "]发生" + msg; if (clientIdlist.size() > 0) { - IPushResult pushResult = PushList.pushToUser(clientIdlist, "告警提醒", appMsg); + IPushResult pushResult = PushList.pushToUser(clientIdlist, "新的工单任务", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { - log.info("告警消息app端推送成功:" + appMsg); + log.info("告警消息app端推送成功:" + appMsg+":推送人第一个人clienId"+clientIdlist.get(0)); } else { log.info("告警消息app端推送失败:" + appMsg); } @@ -113,28 +113,6 @@ private void sendJob(String id, AlarmJob alarmJob, List userClientList) { Calendar now = Calendar.getInstance(); -// if (isWeekend(now)) { -// now.add(Calendar.WEEK_OF_YEAR, 1); -// now.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); -// now.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班 -// now.set(Calendar.MINUTE, 0); -// now.set(Calendar.SECOND, 0); -// } else { -// try { -// if (isTimeRange()) { -// now.add(Calendar.HOUR_OF_DAY, 2); -// } else { -// now.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班 -// now.set(Calendar.MINUTE, 0); -// now.set(Calendar.SECOND, 0); -// if (!compareNoon()) { -// now.add(Calendar.DAY_OF_MONTH, +1); -// } -// } -// } catch (ParseException e) { -// e.printStackTrace(); -// } -// } Date shouldHandleTime = now.getTime(); if (useOverTime.equals("true")) { System.out.println(shouldHandleTime); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 88ab771..3eaebd9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -94,6 +94,11 @@ */ @TableField("VERSION") private Long modelId; + + @ExcelProperty("安装高度") + @TableField("INSTALL_HEIGHT") + private Double installHeight; + @ExcelProperty("设备型号") @TableField(exist = false) private String modelName; @@ -116,9 +121,6 @@ @TableField(exist = false) private String installDateFmt; - @TableField("INSTALL_HEIGHT") - private Double installHeight; - @Override public String toString() { return "Device{" + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java index ac82f93..427b162 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java @@ -54,7 +54,7 @@ AlarmJob alarmJob = alarmJobMapper.selectById(Long.valueOf(id)); if (!ObjectUtil.isEmpty(alarmJob)) { Map deptMap = this.baseMapper.getDeptIdsByDevcode(alarmJob.getDevcode()); - if (ObjectUtil.isEmpty(deptMap)){ + if (!ObjectUtil.isEmpty(deptMap)){ List userClientList = responDeptProvider(deptMap.get("ownerDeptId")); sendJob(id, alarmJob, userClientList);//推送工单至app和pc端 if (StrUtil.isNotBlank(msg)) { @@ -86,9 +86,9 @@ List userIds = new ArrayList<>(); String appMsg = "设备编号[" + devcode + "]发生" + msg; if (clientIdlist.size() > 0) { - IPushResult pushResult = PushList.pushToUser(clientIdlist, "告警提醒", appMsg); + IPushResult pushResult = PushList.pushToUser(clientIdlist, "新的工单任务", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { - log.info("告警消息app端推送成功:" + appMsg); + log.info("告警消息app端推送成功:" + appMsg+":推送人第一个人clienId"+clientIdlist.get(0)); } else { log.info("告警消息app端推送失败:" + appMsg); } @@ -113,28 +113,6 @@ private void sendJob(String id, AlarmJob alarmJob, List userClientList) { Calendar now = Calendar.getInstance(); -// if (isWeekend(now)) { -// now.add(Calendar.WEEK_OF_YEAR, 1); -// now.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); -// now.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班 -// now.set(Calendar.MINUTE, 0); -// now.set(Calendar.SECOND, 0); -// } else { -// try { -// if (isTimeRange()) { -// now.add(Calendar.HOUR_OF_DAY, 2); -// } else { -// now.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班 -// now.set(Calendar.MINUTE, 0); -// now.set(Calendar.SECOND, 0); -// if (!compareNoon()) { -// now.add(Calendar.DAY_OF_MONTH, +1); -// } -// } -// } catch (ParseException e) { -// e.printStackTrace(); -// } -// } Date shouldHandleTime = now.getTime(); if (useOverTime.equals("true")) { System.out.println(shouldHandleTime); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 88ab771..3eaebd9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -94,6 +94,11 @@ */ @TableField("VERSION") private Long modelId; + + @ExcelProperty("安装高度") + @TableField("INSTALL_HEIGHT") + private Double installHeight; + @ExcelProperty("设备型号") @TableField(exist = false) private String modelName; @@ -116,9 +121,6 @@ @TableField(exist = false) private String installDateFmt; - @TableField("INSTALL_HEIGHT") - private Double installHeight; - @Override public String toString() { return "Device{" + diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 2327845..31348f7 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -71,11 +71,11 @@ ${pro.version} - - org.postgresql - chgjdbc - 6.0.3-SNAPSHOT - + + + + + com.casic diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java index ac82f93..427b162 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java @@ -54,7 +54,7 @@ AlarmJob alarmJob = alarmJobMapper.selectById(Long.valueOf(id)); if (!ObjectUtil.isEmpty(alarmJob)) { Map deptMap = this.baseMapper.getDeptIdsByDevcode(alarmJob.getDevcode()); - if (ObjectUtil.isEmpty(deptMap)){ + if (!ObjectUtil.isEmpty(deptMap)){ List userClientList = responDeptProvider(deptMap.get("ownerDeptId")); sendJob(id, alarmJob, userClientList);//推送工单至app和pc端 if (StrUtil.isNotBlank(msg)) { @@ -86,9 +86,9 @@ List userIds = new ArrayList<>(); String appMsg = "设备编号[" + devcode + "]发生" + msg; if (clientIdlist.size() > 0) { - IPushResult pushResult = PushList.pushToUser(clientIdlist, "告警提醒", appMsg); + IPushResult pushResult = PushList.pushToUser(clientIdlist, "新的工单任务", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { - log.info("告警消息app端推送成功:" + appMsg); + log.info("告警消息app端推送成功:" + appMsg+":推送人第一个人clienId"+clientIdlist.get(0)); } else { log.info("告警消息app端推送失败:" + appMsg); } @@ -113,28 +113,6 @@ private void sendJob(String id, AlarmJob alarmJob, List userClientList) { Calendar now = Calendar.getInstance(); -// if (isWeekend(now)) { -// now.add(Calendar.WEEK_OF_YEAR, 1); -// now.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); -// now.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班 -// now.set(Calendar.MINUTE, 0); -// now.set(Calendar.SECOND, 0); -// } else { -// try { -// if (isTimeRange()) { -// now.add(Calendar.HOUR_OF_DAY, 2); -// } else { -// now.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班 -// now.set(Calendar.MINUTE, 0); -// now.set(Calendar.SECOND, 0); -// if (!compareNoon()) { -// now.add(Calendar.DAY_OF_MONTH, +1); -// } -// } -// } catch (ParseException e) { -// e.printStackTrace(); -// } -// } Date shouldHandleTime = now.getTime(); if (useOverTime.equals("true")) { System.out.println(shouldHandleTime); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 88ab771..3eaebd9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -94,6 +94,11 @@ */ @TableField("VERSION") private Long modelId; + + @ExcelProperty("安装高度") + @TableField("INSTALL_HEIGHT") + private Double installHeight; + @ExcelProperty("设备型号") @TableField(exist = false) private String modelName; @@ -116,9 +121,6 @@ @TableField(exist = false) private String installDateFmt; - @TableField("INSTALL_HEIGHT") - private Double installHeight; - @Override public String toString() { return "Device{" + diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 2327845..31348f7 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -71,11 +71,11 @@ ${pro.version} - - org.postgresql - chgjdbc - 6.0.3-SNAPSHOT - + + + + + com.casic diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 873a77e..fdabbf2 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,10 +1,10 @@ server: - port: 11309 + port: 11308 ################### spring配置 ################### spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/smartwell_gz?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://111.198.10.15:11336/smartwell_demo?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root password: Casic203 redis: diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java index ac82f93..427b162 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/MessagePusherImpl.java @@ -54,7 +54,7 @@ AlarmJob alarmJob = alarmJobMapper.selectById(Long.valueOf(id)); if (!ObjectUtil.isEmpty(alarmJob)) { Map deptMap = this.baseMapper.getDeptIdsByDevcode(alarmJob.getDevcode()); - if (ObjectUtil.isEmpty(deptMap)){ + if (!ObjectUtil.isEmpty(deptMap)){ List userClientList = responDeptProvider(deptMap.get("ownerDeptId")); sendJob(id, alarmJob, userClientList);//推送工单至app和pc端 if (StrUtil.isNotBlank(msg)) { @@ -86,9 +86,9 @@ List userIds = new ArrayList<>(); String appMsg = "设备编号[" + devcode + "]发生" + msg; if (clientIdlist.size() > 0) { - IPushResult pushResult = PushList.pushToUser(clientIdlist, "告警提醒", appMsg); + IPushResult pushResult = PushList.pushToUser(clientIdlist, "新的工单任务", appMsg); if ("ok".equals(pushResult.getResponse().get("result").toString())) { - log.info("告警消息app端推送成功:" + appMsg); + log.info("告警消息app端推送成功:" + appMsg+":推送人第一个人clienId"+clientIdlist.get(0)); } else { log.info("告警消息app端推送失败:" + appMsg); } @@ -113,28 +113,6 @@ private void sendJob(String id, AlarmJob alarmJob, List userClientList) { Calendar now = Calendar.getInstance(); -// if (isWeekend(now)) { -// now.add(Calendar.WEEK_OF_YEAR, 1); -// now.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); -// now.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班 -// now.set(Calendar.MINUTE, 0); -// now.set(Calendar.SECOND, 0); -// } else { -// try { -// if (isTimeRange()) { -// now.add(Calendar.HOUR_OF_DAY, 2); -// } else { -// now.set(Calendar.HOUR_OF_DAY, 10);//默认8点上班 -// now.set(Calendar.MINUTE, 0); -// now.set(Calendar.SECOND, 0); -// if (!compareNoon()) { -// now.add(Calendar.DAY_OF_MONTH, +1); -// } -// } -// } catch (ParseException e) { -// e.printStackTrace(); -// } -// } Date shouldHandleTime = now.getTime(); if (useOverTime.equals("true")) { System.out.println(shouldHandleTime); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 88ab771..3eaebd9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -94,6 +94,11 @@ */ @TableField("VERSION") private Long modelId; + + @ExcelProperty("安装高度") + @TableField("INSTALL_HEIGHT") + private Double installHeight; + @ExcelProperty("设备型号") @TableField(exist = false) private String modelName; @@ -116,9 +121,6 @@ @TableField(exist = false) private String installDateFmt; - @TableField("INSTALL_HEIGHT") - private Double installHeight; - @Override public String toString() { return "Device{" + diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 2327845..31348f7 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -71,11 +71,11 @@ ${pro.version} - - org.postgresql - chgjdbc - 6.0.3-SNAPSHOT - + + + + + com.casic diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 873a77e..fdabbf2 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,10 +1,10 @@ server: - port: 11309 + port: 11308 ################### spring配置 ################### spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://111.198.10.15:11336/smartwell_gz?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://111.198.10.15:11336/smartwell_demo?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root password: Casic203 redis: diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index dfecddd..85adf91 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: postgre + active: dev servlet: multipart: max-file-size: 50MB