From 7826743973810b4a7033f61df4bb5f3eb82adb41 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Mon, 26 Feb 2024 14:17:11 +0800 Subject: [PATCH] =?UTF-8?q?#=E9=9C=8D=E5=B1=B1bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims-middle/src/main/resources/db/4.0.0.sql | 1 + .../main/service/impl/HydropowerServiceImpl.java | 6 +- .../main/service/impl/WindHomeServiceImpl.java | 10 +++ .../operational/src/main/resources/db/4.0.0 .sql | 94 ++++++++++++++++++++++ .../ticket/src/main/resources/db/4.0.0.sql | 41 ++++++++++ 5 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 hzims-service/hzims-middle/src/main/resources/db/4.0.0.sql create mode 100644 hzims-service/operational/src/main/resources/db/4.0.0 .sql create mode 100644 hzims-service/ticket/src/main/resources/db/4.0.0.sql diff --git a/hzims-service/hzims-middle/src/main/resources/db/4.0.0.sql b/hzims-service/hzims-middle/src/main/resources/db/4.0.0.sql new file mode 100644 index 0000000..472f298 --- /dev/null +++ b/hzims-service/hzims-middle/src/main/resources/db/4.0.0.sql @@ -0,0 +1 @@ +INSERT INTO `PROCESS_DICT` (`DICT_CODE`, `DICT_SORT`, `DICT_KEY`, `DICT_VALUE`, `DICT_LABEL`, `DICT_TYPE`, `IS_DEFAULT`, `STATUS`, `CREATE_DEPT`, `CREATE_TIME`, `UPDATE_TIME`, `REMARK`) VALUES (9, 9, 'WORK_TASK', 'WORK_TASK', '工作任务单V4', '工作任务单', 'Y', 0, NULL, '2023-07-25 18:35:01', '2024-01-09 14:48:18', '工作任务单流程'); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java index 85f83fc..796f347 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java @@ -26,7 +26,6 @@ import com.hnac.hzims.operational.main.constant.HomePageConstant; import com.hnac.hzims.operational.main.entity.UserDeptEntity; import com.hnac.hzims.operational.main.service.*; import com.hnac.hzims.operational.main.vo.*; -import com.hnac.hzims.operational.maintenance.constants.MaintenanceConstant; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; import com.hnac.hzims.operational.maintenance.service.IOperMaintenanceTaskService; import com.hnac.hzims.operational.station.entity.StationEntity; @@ -40,7 +39,6 @@ import com.hnac.hzinfo.datasearch.soe.domian.SoeData; import com.hnac.hzinfo.inspect.task.feign.IInspectTaskReportClient; import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO; import com.hnac.hzinfo.sdk.core.response.Result; -import com.sun.org.apache.xpath.internal.operations.NotEquals; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; @@ -1762,7 +1760,7 @@ public class HydropowerServiceImpl implements HydropowerService { * @param end * @param deptList */ - private void getMaintenanceTask(AppAreaDutyVo item, String start, String end, List deptList) { + private void getMaintenanceTask(AppAreaDutyVo item, String start, String end, List deptList) { item.setMaintenanceTaskCount(0); item.setMaintenanceTaskFinishCount(0); item.setNotMaintenanceTaskCount(0); @@ -1774,7 +1772,7 @@ public class HydropowerServiceImpl implements HydropowerService { // 总数 item.setMaintenanceTaskCount(list.size()); // 完成数 - int maintenanceTaskFinishCount = (int) list.stream().filter(o-> MaintenanceConstant.TASK_STATUS_5 == o.getStatus()).count(); + int maintenanceTaskFinishCount = (int) list.stream().filter(o-> "结束".equals(o.getFlowTaskName())).count(); item.setMaintenanceTaskFinishCount(maintenanceTaskFinishCount); // 未完成数 int notMaintenanceTaskCount = list.size() - maintenanceTaskFinishCount; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java index 79c667d..fd8bab1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java @@ -861,10 +861,20 @@ public class WindHomeServiceImpl implements WindHomeService { if(MapUtils.isEmpty(week) || !week.containsKey(code)){ return "21"; } + if(ObjectUtil.isEmpty(week.get(code))){ + return "21"; + } + if(ObjectUtil.isEmpty(week.get(code).getDaily())){ + return "21"; + } + if(ObjectUtil.isEmpty(week.get(code).getDaily().get(0))){ + return "21"; + } if(flag){ return week.get(code).getDaily().get(0).getTempMax(); } return week.get(code).getDaily().get(0).getTempMin(); + } /** diff --git a/hzims-service/operational/src/main/resources/db/4.0.0 .sql b/hzims-service/operational/src/main/resources/db/4.0.0 .sql new file mode 100644 index 0000000..6eb45b3 --- /dev/null +++ b/hzims-service/operational/src/main/resources/db/4.0.0 .sql @@ -0,0 +1,94 @@ +-- ---------------------------- +-- TABLE STRUCTURE FOR HZIMS_OPER_CONSTRUCTION +-- ---------------------------- +DROP TABLE IF EXISTS `HZIMS_OPER_CONSTRUCTION`; +CREATE TABLE `HZIMS_OPER_CONSTRUCTION` ( + `ID` BIGINT(20) NOT NULL COMMENT '主键ID', + `CODE` VARCHAR(255) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_GENERAL_CI NULL DEFAULT NULL COMMENT '施工编号', + `CONSTRUCTION_TIME` DATETIME NULL DEFAULT NULL COMMENT '施工时间', + `OVERHAUL_NAME` VARCHAR(255) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_GENERAL_CI NULL DEFAULT NULL COMMENT '检修名称', + `CONSTRUCTION_LOCATION` VARCHAR(1024) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_GENERAL_CI NULL DEFAULT NULL COMMENT '施工地点', + `OVERHAUL_HEAD` BIGINT(20) NULL DEFAULT NULL COMMENT '检修负责人', + `OVERHAUL_HEAD_NAME` VARCHAR(255) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_GENERAL_CI NULL DEFAULT NULL COMMENT '检修负责人名称', + `OVERHAUL_PERSONNEL` VARCHAR(255) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_GENERAL_CI NULL DEFAULT NULL COMMENT '检修人员: 根据“，”分割', + `OVERHAUL_PERSONNEL_NAME` VARCHAR(255) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_GENERAL_CI NULL DEFAULT NULL COMMENT '检修人员名称: 根据“，”分割', + `OVERHAUL_TIME` DATETIME NULL DEFAULT NULL COMMENT '检修时间', + `COMPLETE_WORK_DESC` VARCHAR(2048) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_GENERAL_CI NOT NULL COMMENT '今日完成任务描述', + `PLAN_WORK_DESC` VARCHAR(2048) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_GENERAL_CI NULL DEFAULT NULL COMMENT '明日工作计划描述', + `CONSTRUCTION_IMG` VARCHAR(512) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_GENERAL_CI NULL DEFAULT NULL COMMENT '施工图片: 根据“，”分割', + `CONSTRUCTION_ATTACHMENT` VARCHAR(512) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_GENERAL_CI NULL DEFAULT NULL COMMENT '施工附件', + `RECORDER` BIGINT(20) NULL DEFAULT NULL COMMENT '记录人', + `RECORDER_NAME` VARCHAR(255) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_GENERAL_CI NULL DEFAULT NULL COMMENT '记录人名称', + `REVIEWER` BIGINT(20) NULL DEFAULT NULL COMMENT '审核人', + `REVIEWER_NAME` VARCHAR(255) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_GENERAL_CI NULL DEFAULT NULL COMMENT '审核人名称', + `TENANT_ID` VARCHAR(12) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '租户ID', + `STATUS` TINYINT(4) NULL DEFAULT 0 COMMENT '业务状态', + `CREATE_DEPT` BIGINT(20) NULL DEFAULT NULL COMMENT '创建单位', + `IS_DELETED` TINYINT(4) NOT NULL DEFAULT 0 COMMENT '是否删除', + `CREATE_USER` BIGINT(20) NULL DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` DATETIME NOT NULL COMMENT '创建时间', + `UPDATE_USER` BIGINT(20) NULL DEFAULT NULL COMMENT '修改人', + `UPDATE_TIME` DATETIME NULL DEFAULT NULL COMMENT '修改时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = INNODB CHARACTER SET = UTF8MB4 COLLATE = UTF8MB4_GENERAL_CI ROW_FORMAT = DYNAMIC; + + +ALTER TABLE `HZIMS_OPER_ACCESS_CONTENT` DROP COLUMN `STATION_CODE`; + +ALTER TABLE `HZIMS_OPER_ACCESS_CONTENT` DROP COLUMN `STATION_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_CONTENT` DROP COLUMN `EM_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_LIBRARY` MODIFY COLUMN `EM_CODE` VARCHAR(64) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NOT NULL COMMENT '设备编码' AFTER `ID`; + +ALTER TABLE `HZIMS_OPER_ACCESS_LIBRARY` MODIFY COLUMN `PERIOD` INT(11) NOT NULL COMMENT '检修间隔' AFTER `GRADE_CODE`; + +ALTER TABLE `HZIMS_OPER_ACCESS_LIBRARY` MODIFY COLUMN `WORK_STANDARDS` VARCHAR(500) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NOT NULL DEFAULT '' COMMENT '操作规范' AFTER `PERIOD`; + +ALTER TABLE `HZIMS_OPER_ACCESS_LIBRARY` MODIFY COLUMN `SAFE_INFOS` VARCHAR(500) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NOT NULL DEFAULT '' COMMENT '安全警告' AFTER `WORK_STANDARDS`; + +ALTER TABLE `HZIMS_OPER_ACCESS_LIBRARY` MODIFY COLUMN `STOP_HOURS` INT(11) NOT NULL COMMENT '停用时间' AFTER `SAFE_INFOS`; + +ALTER TABLE `HZIMS_OPER_ACCESS_LIBRARY` MODIFY COLUMN `DESCRIPITON` VARCHAR(500) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NOT NULL DEFAULT '' COMMENT '描述' AFTER `LAST_SERVICE_TIME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_LIBRARY` DROP COLUMN `EM_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_PLAN` DROP COLUMN `UPDATE_USER_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_PLAN` DROP COLUMN `CREATE_USER_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_PLAN` DROP COLUMN `MANAGER_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_PLAN` DROP COLUMN `TECH_LEAD_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_STATISTICS` DROP COLUMN `EM_CODE`; + +ALTER TABLE `HZIMS_OPER_ACCESS_STATISTICS` DROP COLUMN `PLAN_HOURS`; + +ALTER TABLE `HZIMS_OPER_ACCESS_STATISTICS` DROP COLUMN `UPDATE_USER_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_STATISTICS` DROP COLUMN `CREATE_USER_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_STATISTICS` DROP COLUMN `MANAGER_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_STATISTICS` DROP COLUMN `EM_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_TASK` DROP COLUMN `STATION_CODE`; + +ALTER TABLE `HZIMS_OPER_ACCESS_TASK` DROP COLUMN `STATION_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_TASK` DROP COLUMN `EM_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_TASK` DROP COLUMN `PLAN_HOURS`; + +ALTER TABLE `HZIMS_OPER_ACCESS_TASK` DROP COLUMN `CONSTRUCTION_ID`; + +ALTER TABLE `HZIMS_OPER_ACCESS_TASK` DROP COLUMN `UPDATE_USER_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_TASK` DROP COLUMN `CREATE_USER_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_TASK` DROP COLUMN `HANDLER_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_TASK_DETAIL` DROP COLUMN `UPDATE_USER_NAME`; + +ALTER TABLE `HZIMS_OPER_ACCESS_TASK_DETAIL` DROP COLUMN `CREATE_USER_NAME`; \ No newline at end of file diff --git a/hzims-service/ticket/src/main/resources/db/4.0.0.sql b/hzims-service/ticket/src/main/resources/db/4.0.0.sql new file mode 100644 index 0000000..2e47e9e --- /dev/null +++ b/hzims-service/ticket/src/main/resources/db/4.0.0.sql @@ -0,0 +1,41 @@ +-- ---------------------------- +-- TABLE STRUCTURE FOR HZIMS_WORK_TASK +-- ---------------------------- +DROP TABLE IF EXISTS `HZIMS_WORK_TASK`; +CREATE TABLE `HZIMS_WORK_TASK` ( + `ID` BIGINT(20) NOT NULL COMMENT '主键', + `CODE` VARCHAR(255) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '工作任务单编号', + `HEAD` BIGINT(20) NULL DEFAULT NULL COMMENT '工作负责人', + `HEAD_NAME` VARCHAR(64) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '工作负责人名称', + `HEAD_HANDLE_TIME` DATETIME NULL DEFAULT NULL COMMENT '工作负责人处理时间', + `GROUP_ID` BIGINT(20) NULL DEFAULT NULL COMMENT '班组ID', + `GROUP_NAME` VARCHAR(255) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '班组名称', + `MEMBER` VARCHAR(512) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '班组成员ID : 按 “，”分割', + `MEMBER_NAME` VARCHAR(1024) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '班组成员名称 : 按 “，”分割', + `PLAN_START_TIME` DATETIME NULL DEFAULT NULL COMMENT '工作计划开始时间', + `PLAN_END_TIME` DATETIME NULL DEFAULT NULL COMMENT '工作计划结束时间', + `WORK_TICKET_ID` BIGINT(20) NULL DEFAULT NULL COMMENT '工作票ID', + `WORK_TASK` VARCHAR(2048) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '工作任务', + `SECURITY_MEASURES` VARCHAR(2048) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '现场安全措施', + `RISK_PRE_CONTROL` VARCHAR(2048) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '安全风险及预控措施', + `LICENSOR` BIGINT(20) NULL DEFAULT NULL COMMENT '许可人', + `LICENSOR_NAME` VARCHAR(64) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '许可人名称', + `LICENSOR_TIME` DATETIME NULL DEFAULT NULL COMMENT '许可时间', + `TERMINATOR` BIGINT(20) NULL DEFAULT NULL COMMENT '工作结束人', + `TERMINATOR_NAME` VARCHAR(64) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '工作结束人名称', + `WORK_END_TIME` DATETIME NULL DEFAULT NULL COMMENT '工作结束时间', + `MEMO` VARCHAR(2048) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '备注', + `PROCESS_INSTANCE_ID` VARCHAR(64) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '流程实例ID', + `TASK_NAME` VARCHAR(255) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '流程环节名称', + `NEXT_STEP_OPERATOR` VARCHAR(512) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '流程环节处理人', + `DEPT_NAME` VARCHAR(255) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '创建机构名称', + `TENANT_ID` VARCHAR(12) CHARACTER SET UTF8 COLLATE UTF8_GENERAL_CI NULL DEFAULT NULL COMMENT '租户ID', + `CREATE_TIME` DATETIME NOT NULL COMMENT '创建时间', + `UPDATE_TIME` DATETIME NULL DEFAULT NULL COMMENT '更新时间', + `CREATE_USER` BIGINT(20) NOT NULL COMMENT '创建人', + `UPDATE_USER` BIGINT(20) NULL DEFAULT NULL COMMENT '更新人', + `IS_DELETED` TINYINT(4) NOT NULL COMMENT '是否删除', + `STATUS` TINYINT(4) NULL DEFAULT NULL COMMENT '状态 ', + `CREATE_DEPT` BIGINT(20) NULL DEFAULT NULL COMMENT '创建部门', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = INNODB CHARACTER SET = UTF8 COLLATE = UTF8_GENERAL_CI ROW_FORMAT = DYNAMIC;