diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 079fde2..586d046 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -36,7 +36,6 @@ import com.casic.missiles.util.*; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -955,10 +954,10 @@ //加入监控日志 //toDo:需添加离线分析记录 } - iMonitorLogService.saveMonitorLog("offline", "1", "离线任务判断", "1"); + iMonitorLogService.saveMonitorLog("offline", "1", "离线判断任务", "1"); } catch (Exception e) { //添加监控异常日志 - iMonitorLogService.saveMonitorLog("offline", "0", "离线任务判断", "1"); + iMonitorLogService.saveMonitorLog("offline", "0", "离线判断任务", "1"); e.printStackTrace(); } } @@ -1002,6 +1001,9 @@ alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus()); alarmRecords.setProcessStatus(approvalLog.getFlowStatus()); this.baseMapper.updateById(alarmRecords); + //特殊处理位移报警 + if ("DisplacementAlarm".equals(alarmRecords.getAlarmMsg()) && DictEnum.DEVICE_EXCEPTION.equals(alarmRecords.getExceptionType())) + cancelDeviceAlarm(alarmRecords.getDevcode(), "DisplacementAlarm"); } } return true; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 079fde2..586d046 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -36,7 +36,6 @@ import com.casic.missiles.util.*; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -955,10 +954,10 @@ //加入监控日志 //toDo:需添加离线分析记录 } - iMonitorLogService.saveMonitorLog("offline", "1", "离线任务判断", "1"); + iMonitorLogService.saveMonitorLog("offline", "1", "离线判断任务", "1"); } catch (Exception e) { //添加监控异常日志 - iMonitorLogService.saveMonitorLog("offline", "0", "离线任务判断", "1"); + iMonitorLogService.saveMonitorLog("offline", "0", "离线判断任务", "1"); e.printStackTrace(); } } @@ -1002,6 +1001,9 @@ alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus()); alarmRecords.setProcessStatus(approvalLog.getFlowStatus()); this.baseMapper.updateById(alarmRecords); + //特殊处理位移报警 + if ("DisplacementAlarm".equals(alarmRecords.getAlarmMsg()) && DictEnum.DEVICE_EXCEPTION.equals(alarmRecords.getExceptionType())) + cancelDeviceAlarm(alarmRecords.getDevcode(), "DisplacementAlarm"); } } return true; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml index 0690e1e..6106d14 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml @@ -46,6 +46,7 @@ bv.DEPTID, bv.place, bv.type, + bv.propertyOwner, bv.MONITOR_STATE, bd.ONLINE_STATE, bd.LOGTIME, diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 079fde2..586d046 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -36,7 +36,6 @@ import com.casic.missiles.util.*; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -955,10 +954,10 @@ //加入监控日志 //toDo:需添加离线分析记录 } - iMonitorLogService.saveMonitorLog("offline", "1", "离线任务判断", "1"); + iMonitorLogService.saveMonitorLog("offline", "1", "离线判断任务", "1"); } catch (Exception e) { //添加监控异常日志 - iMonitorLogService.saveMonitorLog("offline", "0", "离线任务判断", "1"); + iMonitorLogService.saveMonitorLog("offline", "0", "离线判断任务", "1"); e.printStackTrace(); } } @@ -1002,6 +1001,9 @@ alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus()); alarmRecords.setProcessStatus(approvalLog.getFlowStatus()); this.baseMapper.updateById(alarmRecords); + //特殊处理位移报警 + if ("DisplacementAlarm".equals(alarmRecords.getAlarmMsg()) && DictEnum.DEVICE_EXCEPTION.equals(alarmRecords.getExceptionType())) + cancelDeviceAlarm(alarmRecords.getDevcode(), "DisplacementAlarm"); } } return true; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml index 0690e1e..6106d14 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml @@ -46,6 +46,7 @@ bv.DEPTID, bv.place, bv.type, + bv.propertyOwner, bv.MONITOR_STATE, bd.ONLINE_STATE, bd.LOGTIME, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml index 01d5913..aeb78ad 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml @@ -95,6 +95,9 @@ SELECT blp.*, bd.DEVCODE, + bd.MONITOR_VALUE as lastValue, + bd.LOGTIME as logTime, + bd.CELL, bd.ONLINE_STATE, bt.TYPE_NAME, bp.CONSTRUCT_ERA, diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 079fde2..586d046 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -36,7 +36,6 @@ import com.casic.missiles.util.*; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -955,10 +954,10 @@ //加入监控日志 //toDo:需添加离线分析记录 } - iMonitorLogService.saveMonitorLog("offline", "1", "离线任务判断", "1"); + iMonitorLogService.saveMonitorLog("offline", "1", "离线判断任务", "1"); } catch (Exception e) { //添加监控异常日志 - iMonitorLogService.saveMonitorLog("offline", "0", "离线任务判断", "1"); + iMonitorLogService.saveMonitorLog("offline", "0", "离线判断任务", "1"); e.printStackTrace(); } } @@ -1002,6 +1001,9 @@ alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus()); alarmRecords.setProcessStatus(approvalLog.getFlowStatus()); this.baseMapper.updateById(alarmRecords); + //特殊处理位移报警 + if ("DisplacementAlarm".equals(alarmRecords.getAlarmMsg()) && DictEnum.DEVICE_EXCEPTION.equals(alarmRecords.getExceptionType())) + cancelDeviceAlarm(alarmRecords.getDevcode(), "DisplacementAlarm"); } } return true; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml index 0690e1e..6106d14 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml @@ -46,6 +46,7 @@ bv.DEPTID, bv.place, bv.type, + bv.propertyOwner, bv.MONITOR_STATE, bd.ONLINE_STATE, bd.LOGTIME, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml index 01d5913..aeb78ad 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml @@ -95,6 +95,9 @@ SELECT blp.*, bd.DEVCODE, + bd.MONITOR_VALUE as lastValue, + bd.LOGTIME as logTime, + bd.CELL, bd.ONLINE_STATE, bt.TYPE_NAME, bp.CONSTRUCT_ERA, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java index 3e59f75..5cdf120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java @@ -145,7 +145,15 @@ @ApiModelProperty("设备状态") @TableField(exist = false) private String onlineState; - + @ApiModelProperty("电量") + @TableField(exist = false) + private String cell; + @ApiModelProperty("最新上传时间") + @TableField(exist = false) + private String logTime; + @ApiModelProperty("最新值") + @TableField(exist = false) + private String lastValue; public BusLedgerPipe() { } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 079fde2..586d046 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -36,7 +36,6 @@ import com.casic.missiles.util.*; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -955,10 +954,10 @@ //加入监控日志 //toDo:需添加离线分析记录 } - iMonitorLogService.saveMonitorLog("offline", "1", "离线任务判断", "1"); + iMonitorLogService.saveMonitorLog("offline", "1", "离线判断任务", "1"); } catch (Exception e) { //添加监控异常日志 - iMonitorLogService.saveMonitorLog("offline", "0", "离线任务判断", "1"); + iMonitorLogService.saveMonitorLog("offline", "0", "离线判断任务", "1"); e.printStackTrace(); } } @@ -1002,6 +1001,9 @@ alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus()); alarmRecords.setProcessStatus(approvalLog.getFlowStatus()); this.baseMapper.updateById(alarmRecords); + //特殊处理位移报警 + if ("DisplacementAlarm".equals(alarmRecords.getAlarmMsg()) && DictEnum.DEVICE_EXCEPTION.equals(alarmRecords.getExceptionType())) + cancelDeviceAlarm(alarmRecords.getDevcode(), "DisplacementAlarm"); } } return true; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml index 0690e1e..6106d14 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml @@ -46,6 +46,7 @@ bv.DEPTID, bv.place, bv.type, + bv.propertyOwner, bv.MONITOR_STATE, bd.ONLINE_STATE, bd.LOGTIME, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml index 01d5913..aeb78ad 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml @@ -95,6 +95,9 @@ SELECT blp.*, bd.DEVCODE, + bd.MONITOR_VALUE as lastValue, + bd.LOGTIME as logTime, + bd.CELL, bd.ONLINE_STATE, bt.TYPE_NAME, bp.CONSTRUCT_ERA, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java index 3e59f75..5cdf120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java @@ -145,7 +145,15 @@ @ApiModelProperty("设备状态") @TableField(exist = false) private String onlineState; - + @ApiModelProperty("电量") + @TableField(exist = false) + private String cell; + @ApiModelProperty("最新上传时间") + @TableField(exist = false) + private String logTime; + @ApiModelProperty("最新值") + @TableField(exist = false) + private String lastValue; public BusLedgerPipe() { } diff --git a/casic-job/src/main/java/com/casic/missiles/job/handler/CheckingJob.java b/casic-job/src/main/java/com/casic/missiles/job/handler/CheckingJob.java index e505038..863b091 100644 --- a/casic-job/src/main/java/com/casic/missiles/job/handler/CheckingJob.java +++ b/casic-job/src/main/java/com/casic/missiles/job/handler/CheckingJob.java @@ -87,30 +87,30 @@ } -// @Scheduled(cron = "0 0 23 * * ?") -// public void executeSyncData() { -// logger.info("开始执行全量同步数据任务"); -// if (!enabled) { -// return; -// } -// try { -// //先同步部门 -// iBusLedgerService.synAllDept(); -// //同步台账 -// iBusLedgerService.synAllLedger(); -// //同步用户 -// iCtUserService.synAllUsers(); -// //同步网格 -// iBusGridService.synAllGrids(); -// -// //同步任务监控日志 -// iMonitorLogService.saveMonitorLog("synchronous","1","部门、台账、用户同步任务","1"); -// } catch (Exception ex) { -// //同步任务异常监控日志 -// iMonitorLogService.saveMonitorLog("synchronous","0","部门、台账、用户同步任务","1"); -// logger.error(ex.getMessage(), ex); -// } -// } + @Scheduled(cron = "0 0 23 * * ?") + public void executeSyncData() { + logger.info("开始执行全量同步数据任务"); + if (!enabled) { + return; + } + try { + //先同步部门 + iBusLedgerService.synAllDept(); + //同步台账 + iBusLedgerService.synAllLedger(); + //同步用户 + iCtUserService.synAllUsers(); + //同步网格 + iBusGridService.synAllGrids(); + + //同步任务监控日志 + iMonitorLogService.saveMonitorLog("synchronous","1","部门、台账、用户同步任务","1"); + } catch (Exception ex) { + //同步任务异常监控日志 + iMonitorLogService.saveMonitorLog("synchronous","0","部门、台账、用户同步任务","1"); + logger.error(ex.getMessage(), ex); + } + } @Scheduled(cron = "0 0 2 * * ?") public void checkServer() { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 079fde2..586d046 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -36,7 +36,6 @@ import com.casic.missiles.util.*; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -955,10 +954,10 @@ //加入监控日志 //toDo:需添加离线分析记录 } - iMonitorLogService.saveMonitorLog("offline", "1", "离线任务判断", "1"); + iMonitorLogService.saveMonitorLog("offline", "1", "离线判断任务", "1"); } catch (Exception e) { //添加监控异常日志 - iMonitorLogService.saveMonitorLog("offline", "0", "离线任务判断", "1"); + iMonitorLogService.saveMonitorLog("offline", "0", "离线判断任务", "1"); e.printStackTrace(); } } @@ -1002,6 +1001,9 @@ alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus()); alarmRecords.setProcessStatus(approvalLog.getFlowStatus()); this.baseMapper.updateById(alarmRecords); + //特殊处理位移报警 + if ("DisplacementAlarm".equals(alarmRecords.getAlarmMsg()) && DictEnum.DEVICE_EXCEPTION.equals(alarmRecords.getExceptionType())) + cancelDeviceAlarm(alarmRecords.getDevcode(), "DisplacementAlarm"); } } return true; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml index 0690e1e..6106d14 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLeakMonitorMapper.xml @@ -46,6 +46,7 @@ bv.DEPTID, bv.place, bv.type, + bv.propertyOwner, bv.MONITOR_STATE, bd.ONLINE_STATE, bd.LOGTIME, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml index 01d5913..aeb78ad 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml @@ -95,6 +95,9 @@ SELECT blp.*, bd.DEVCODE, + bd.MONITOR_VALUE as lastValue, + bd.LOGTIME as logTime, + bd.CELL, bd.ONLINE_STATE, bt.TYPE_NAME, bp.CONSTRUCT_ERA, diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java index 3e59f75..5cdf120 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusLedgerPipe.java @@ -145,7 +145,15 @@ @ApiModelProperty("设备状态") @TableField(exist = false) private String onlineState; - + @ApiModelProperty("电量") + @TableField(exist = false) + private String cell; + @ApiModelProperty("最新上传时间") + @TableField(exist = false) + private String logTime; + @ApiModelProperty("最新值") + @TableField(exist = false) + private String lastValue; public BusLedgerPipe() { } diff --git a/casic-job/src/main/java/com/casic/missiles/job/handler/CheckingJob.java b/casic-job/src/main/java/com/casic/missiles/job/handler/CheckingJob.java index e505038..863b091 100644 --- a/casic-job/src/main/java/com/casic/missiles/job/handler/CheckingJob.java +++ b/casic-job/src/main/java/com/casic/missiles/job/handler/CheckingJob.java @@ -87,30 +87,30 @@ } -// @Scheduled(cron = "0 0 23 * * ?") -// public void executeSyncData() { -// logger.info("开始执行全量同步数据任务"); -// if (!enabled) { -// return; -// } -// try { -// //先同步部门 -// iBusLedgerService.synAllDept(); -// //同步台账 -// iBusLedgerService.synAllLedger(); -// //同步用户 -// iCtUserService.synAllUsers(); -// //同步网格 -// iBusGridService.synAllGrids(); -// -// //同步任务监控日志 -// iMonitorLogService.saveMonitorLog("synchronous","1","部门、台账、用户同步任务","1"); -// } catch (Exception ex) { -// //同步任务异常监控日志 -// iMonitorLogService.saveMonitorLog("synchronous","0","部门、台账、用户同步任务","1"); -// logger.error(ex.getMessage(), ex); -// } -// } + @Scheduled(cron = "0 0 23 * * ?") + public void executeSyncData() { + logger.info("开始执行全量同步数据任务"); + if (!enabled) { + return; + } + try { + //先同步部门 + iBusLedgerService.synAllDept(); + //同步台账 + iBusLedgerService.synAllLedger(); + //同步用户 + iCtUserService.synAllUsers(); + //同步网格 + iBusGridService.synAllGrids(); + + //同步任务监控日志 + iMonitorLogService.saveMonitorLog("synchronous","1","部门、台账、用户同步任务","1"); + } catch (Exception ex) { + //同步任务异常监控日志 + iMonitorLogService.saveMonitorLog("synchronous","0","部门、台账、用户同步任务","1"); + logger.error(ex.getMessage(), ex); + } + } @Scheduled(cron = "0 0 2 * * ?") public void checkServer() { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index f1b95ae..02db5ea 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -22,6 +22,7 @@ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: #kaptcha-open: false #是否开启登录时验证码 (true/false) +# no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/device/receiveData,/getMap,/sync/token no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources,/webjars/**,/device/receiveData,/alarmReturn,/getMap,/system/busGrid/synAllGrids,/system/busLedger/synAllLedger,/system/busLedger/synAllDept,/system/ctUser/synAllUsers,/sync/token,/ptz/acceptGasData,/ptz/acceptAlarmData # no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/device/receiveData,/alarmReturn,/getMap,/system/busGrid/synAllGrids,/system/busLedger/synAllLedger,/system/busLedger/synAllDept,/system/ctUser/synAllUsers,/sync/token,/ptz/acceptGasData,/ptz/acceptAlarmData,/ptz/* #flowable数据源和多数据源配置