Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back

hzims-service/hzims-alarm/src/main/resources/db/1.0.0.sql

@@ -265,3 +265,18 @@ CREATE TABLE IF NOT EXISTS `hzims_interruption_alarm`  (
     `IS_DELETED` tinyint(4) NOT NULL COMMENT '是否删除',
     PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- 默认配置
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217346, 0, 2, 0, 1, 0, 1, 1, 1, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217349, 0, 3, 0, 0, 0, 1, 0, 0, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217350, 0, 5, 0, 1, 0, 1, 1, 1, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217351, 0, 13, 0, 0, 1, 0, 0, 0, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217356, 0, 14, 0, 0, 1, 0, 0, 0, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217357, 1, 21, 0, 0, 0, 1, 0, 0, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217359, 1, 22, 0, 1, 0, 1, 1, 0, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217360, 1, 23, 0, 1, 1, 1, 1, 0, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217361, 2, 40, 0, 0, 0, 0, 0, 0, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217362, 3, 30, 0, 1, 1, 1, 1, 0, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217363, 4, 0, 0, 1, 1, 1, 1, 1, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217365, 5, 50, 0, 1, 1, 1, 1, 1, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);
+INSERT INTO `hzims_alarm_defaul_config` (`ID`, `SOURCE`, `ALARM_CHILED_TYPE`, `IS_RIGHT_TABULATION`, `IS_SHOW_ALERT`, `IS_SMALL_BELL`, `IS_MASK`, `IS_BROADCAST`, `IS_PLATFORM_MESSAGE`, `IS_SHORT_MESSAGE`, `IS_WX_MESSAGE`, `TENANT_ID`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `CREATE_USER`, `UPDATE_USER`, `IS_DELETED`, `STATUS`) VALUES (1767798439068217366, 5, 51, 0, 1, 1, 1, 1, 1, 1, 1, '200000', 200001, NULL, NULL, NULL, NULL, 0, NULL);

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/controller/ScheduledController.java

@@ -1,35 +0,0 @@
-package com.hnac.hzims.scheduled.controller;
-
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.hnac.hzims.scheduled.service.operation.monitor.MonitorService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.core.log.annotation.ApiLog;
-import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author ysj
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/scheduled")
-@Api(value = "定时任务", tags = "定时任务")
-public class ScheduledController {
-
-    private final MonitorService service;
-
-    @ApiLog
-    @ApiOperation("集中监控数据加载")
-    @GetMapping("/loadMonitoring")
-    @ApiOperationSupport(order = 1)
-    public R duty(@ApiParam(value = "机构Id", required = true) @RequestParam Long deptId) {
-        service.loadMonitoring("2023-10-19");
-        return R.status(true);
-    }
-}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/AlarmScheduledTask.java

@@ -1,15 +1,12 @@
 package com.hnac.hzims.scheduled.scheduled;
 
-import com.hnac.hzims.scheduled.service.alarm.AlarmQueryService;
 import com.hnac.hzims.scheduled.service.alarm.AlarmService;
-import com.hnac.hzims.scheduled.service.alarm.InterruptionAlarmService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -49,6 +46,7 @@ public class AlarmScheduledTask {
      */
     @XxlJob(START_STOP_ALARM)
     //@Scheduled(cron = "0/40 * * * * ? ")
+
     public ReturnT<String> startStopAlarm(String param) {
         if (Func.isBlank(param)) {
             param = DateUtil.format(new Date(), "yyyy-MM");

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java

@@ -451,6 +451,7 @@ public class MonitorServiceImpl implements MonitorService {
      * @param item
      */
     private void stationParam(List<StationEntity> stationEntityList, RealStationVo item,List<Dept> deptAll) {
+        item.setSort(9999);
         if(CollectionUtil.isEmpty(stationEntityList)){
             return;
         }
@@ -466,7 +467,6 @@ public class MonitorServiceImpl implements MonitorService {
         item.setWaterLevelMax(Optional.ofNullable(station.getLimitWaterLevel()).orElse(0.0));
         item.setServerType(station.getServeType());
         item.setStationDeptId(station.getRefDept());
-        item.setSort(9999);
         // 排序
         List<Dept> list = deptAll.stream().filter(o-> station.getRefDept().equals(o.getId())).collect(Collectors.toList());
         if(CollectionUtil.isEmpty(list)){

hzims-service/message/src/main/java/com/hnac/hzims/message/controller/MessagePushRecordController.java

@@ -110,6 +110,7 @@ public class MessagePushRecordController extends BladeController {
     @GetMapping("/getPersonalUnreadMessage")
     @ApiOperation("获取当前登录人待办消息")
     @ApiOperationSupport(order = 8)
+    @Operate(label = "获取当前登录人待办消息",type = BusinessType.QUERY)
     public R<List<UnreadMessageVO>> getPersonalUnreadMessage() {
         List<UnreadMessageVO> personalUnreadMessage = messagePushRecordService.getPersonalUnreadMessage();
         return R.data(personalUnreadMessage);
@@ -118,7 +119,7 @@ public class MessagePushRecordController extends BladeController {
     @GetMapping("/getPersonalAppUnreadMessage")
     @ApiOperation("获取当前登录人APP待办消息")
     @ApiOperationSupport(order = 9)
-    @Operate(label = "获取当前登录人APP待办消息",type = BusinessType.QUERY,ignore = false)
+    @Operate(label = "获取当前登录人APP待办消息",type = BusinessType.QUERY)
     public R<List<UnreadMessageVO>> getPersonalAppUnreadMessage() {
         List<UnreadMessageVO> personalUnreadMessage = messagePushRecordService.getPersonalAppUnreadMessage();
         return R.data(personalUnreadMessage);

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/CensServiceImpl.java

@@ -395,9 +395,6 @@ public class CensServiceImpl implements CensService {
             // 操作票数量
             HSSFCell header_row_cell_3 = row.getCell(3);
             header_row_cell_3.setCellValue(cens.getOperateCount());
-            // 工作任务数量
-            HSSFCell header_row_cell_4 = row.getCell(4);
-            header_row_cell_4.setCellValue(cens.getWorkTaskCount());
         }
     }