From ab8aa79143f7337c4d33d8c4eaa52b59c569412a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Wed, 2 Aug 2023 11:42:26 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E8=B7=9F=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/config/vo/PointDataVo.java | 2 ++ .../ticket/src/main/resources/db/2.0.0.sql | 28 ++++++++++++++++++++++ .../ticket/src/main/resources/db/2.0.1.sql | 3 --- .../ticket/src/main/resources/db/2.0.2.sql | 1 - .../ticket/src/main/resources/db/2.0.3.sql | 18 -------------- .../ticket/src/main/resources/db/2.0.4.sql | 2 -- 6 files changed, 30 insertions(+), 24 deletions(-) delete mode 100644 hzims-service/ticket/src/main/resources/db/2.0.1.sql delete mode 100644 hzims-service/ticket/src/main/resources/db/2.0.2.sql delete mode 100644 hzims-service/ticket/src/main/resources/db/2.0.3.sql delete mode 100644 hzims-service/ticket/src/main/resources/db/2.0.4.sql diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/PointDataVo.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/PointDataVo.java index 444da82..8a6388c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/PointDataVo.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/PointDataVo.java @@ -42,4 +42,6 @@ public class PointDataVo { @JsonInclude(JsonInclude.Include.NON_EMPTY) private String signage; + private String name; + } diff --git a/hzims-service/ticket/src/main/resources/db/2.0.0.sql b/hzims-service/ticket/src/main/resources/db/2.0.0.sql index cc3d285..48a3b58 100644 --- a/hzims-service/ticket/src/main/resources/db/2.0.0.sql +++ b/hzims-service/ticket/src/main/resources/db/2.0.0.sql @@ -22,3 +22,31 @@ create table hzims_ticket_count ) comment '两票统计分析' row_format = DYNAMIC; +insert into hzims_work_ticket_finish(ticket_id, ground_num, brake_number) +select ticket_id, ground_switch_count,ground_wire_code +from hzims_work_ticket_flow; + + +alter table hzims_ticket_count add invalidated_ticket_num int null comment '废票数量'; + +# 工作票更新 +update hzims_work_ticket_info set flow_task_name = '签发' where status = 1; +update hzims_work_ticket_info set flow_task_name = '收到工作票' where status = 2; +update hzims_work_ticket_info set flow_task_name = '许可人许可' where status = 3; +update hzims_work_ticket_info set flow_task_name = '确认条件具备' where status = 4; +update hzims_work_ticket_info set flow_task_name = '工作负责人确认工作' where status = 5; +update hzims_work_ticket_info set flow_task_name = '许可人确认工作结束' where status = 6; +update hzims_work_ticket_info set flow_task_name = '工作票终结' where status = 7; +update hzims_work_ticket_info set flow_task_name = '许可人延期确认' where status = 9; +update hzims_work_ticket_info set flow_task_name = '负责人延期确认' where status = 10; +update hzims_work_ticket_info set flow_task_name = '作废' where status = 11; +update hzims_work_ticket_info set flow_task_name = '逾期' where status = 12; +# 操作票更新 +update hzims_standard_ticket_info set flow_task_name = '待监护人确认' where status = 1; +update hzims_standard_ticket_info set flow_task_name = '待值班负责人确认' where status = 2; +update hzims_standard_ticket_info set flow_task_name = '结束' where status = 3; +update hzims_standard_ticket_info set flow_task_name = '终止' where status = 4; + + +alter table hzims_ticket_count add wrong_ticket_num int null comment '错票数量'; +alter table hzims_ticket_count add percent_pass_ticket varchar(50) null comment '合格率'; diff --git a/hzims-service/ticket/src/main/resources/db/2.0.1.sql b/hzims-service/ticket/src/main/resources/db/2.0.1.sql deleted file mode 100644 index b4ff7d9..0000000 --- a/hzims-service/ticket/src/main/resources/db/2.0.1.sql +++ /dev/null @@ -1,3 +0,0 @@ -insert into hzims_work_ticket_finish(ticket_id, ground_num, brake_number) -select ticket_id, ground_switch_count,ground_wire_code -from hzims_work_ticket_flow; \ No newline at end of file diff --git a/hzims-service/ticket/src/main/resources/db/2.0.2.sql b/hzims-service/ticket/src/main/resources/db/2.0.2.sql deleted file mode 100644 index 85fa2b4..0000000 --- a/hzims-service/ticket/src/main/resources/db/2.0.2.sql +++ /dev/null @@ -1 +0,0 @@ -alter table hzims_ticket_count add invalidated_ticket_num int null comment '废票数量'; diff --git a/hzims-service/ticket/src/main/resources/db/2.0.3.sql b/hzims-service/ticket/src/main/resources/db/2.0.3.sql deleted file mode 100644 index 8f9af75..0000000 --- a/hzims-service/ticket/src/main/resources/db/2.0.3.sql +++ /dev/null @@ -1,18 +0,0 @@ -# 工作票更新 -update hzims_work_ticket_info set flow_task_name = '签发' where status = 1; -update hzims_work_ticket_info set flow_task_name = '收到工作票' where status = 2; -update hzims_work_ticket_info set flow_task_name = '许可人许可' where status = 3; -update hzims_work_ticket_info set flow_task_name = '确认条件具备' where status = 4; -update hzims_work_ticket_info set flow_task_name = '工作负责人确认工作' where status = 5; -update hzims_work_ticket_info set flow_task_name = '许可人确认工作结束' where status = 6; -update hzims_work_ticket_info set flow_task_name = '工作票终结' where status = 7; -update hzims_work_ticket_info set flow_task_name = '许可人延期确认' where status = 9; -update hzims_work_ticket_info set flow_task_name = '负责人延期确认' where status = 10; -update hzims_work_ticket_info set flow_task_name = '作废' where status = 11; -update hzims_work_ticket_info set flow_task_name = '逾期' where status = 12; -# 操作票更新 -update hzims_standard_ticket_info set flow_task_name = '待监护人确认' where status = 1; -update hzims_standard_ticket_info set flow_task_name = '待值班负责人确认' where status = 2; -update hzims_standard_ticket_info set flow_task_name = '结束' where status = 3; -update hzims_standard_ticket_info set flow_task_name = '终止' where status = 4; - diff --git a/hzims-service/ticket/src/main/resources/db/2.0.4.sql b/hzims-service/ticket/src/main/resources/db/2.0.4.sql deleted file mode 100644 index 58fafc0..0000000 --- a/hzims-service/ticket/src/main/resources/db/2.0.4.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table hzims_ticket_count add wrong_ticket_num int null comment '错票数量'; -alter table hzims_ticket_count add percent_pass_ticket varchar(50) null comment '合格率'; \ No newline at end of file From 1039dfb9ceab9e416712d831bc84038ae721501f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Wed, 2 Aug 2023 11:44:58 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims-middle/src/main/resources/db/1.0.1.sql | 50 +++++++++++++++++++++- .../hzims-middle/src/main/resources/db/1.0.2.sql | 1 - .../hzims-middle/src/main/resources/db/1.0.3.sql | 44 ------------------- 3 files changed, 49 insertions(+), 46 deletions(-) delete mode 100644 hzims-service/hzims-middle/src/main/resources/db/1.0.2.sql delete mode 100644 hzims-service/hzims-middle/src/main/resources/db/1.0.3.sql diff --git a/hzims-service/hzims-middle/src/main/resources/db/1.0.1.sql b/hzims-service/hzims-middle/src/main/resources/db/1.0.1.sql index a3478ce..32c5df5 100644 --- a/hzims-service/hzims-middle/src/main/resources/db/1.0.1.sql +++ b/hzims-service/hzims-middle/src/main/resources/db/1.0.1.sql @@ -1 +1,49 @@ -alter table hzims_workflow_operation_log add is_operation_log tinyint(1) comment '1 正常日志 0 错误日志'; \ No newline at end of file +alter table hzims_workflow_operation_log add is_operation_log tinyint(1) comment '1 正常日志 0 错误日志'; + +alter table hzims_statistics add sort int comment '排序'; + + +create table log_options_module_name +( + id bigint primary key auto_increment, + module_name varchar(50) null comment '功能模块', + sort int comment '排序', + create_time datetime default CURRENT_TIMESTAMP null comment '创建时间', + update_time datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间', + is_deleted tinyint default 0 null comment '逻辑删除 （0 可用 1 删除）' +); + +insert into log_options_module_name(module_name, sort) +values ('集中监控', 1), + ('综合调度', 2), + ('视频集中监控', 3), + ('实时监控', 4), + ('视频监控', 5), + ('演示大屏', 6), + ('生态监控', 7), + ('数据分析', 9), + ('数据查询', 10), + ('通讯告警统计', 11), + ('气象监测', 12), + ('我的事务', 13), + ('值班管理', 14), + ('缺陷管理', 15), + ('两票管理', 16), + ('巡检管理', 17), + ('日常维护', 18), + ('检修管理', 19), + ('数据填报', 20), + ('安全管理', 21), + ('设备管理', 22), + ('资产管理', 23), + ('智能诊断', 24), + ('生产月报', 25), + ('告警配置', 26), + ('电站安全标准', 27), + ('站点管理', 28), + ('实时画面', 29), + ('资源配置', 30), + ('消息管理', 31), + ('移动端配置', 32), + ('水电站设置', 33), + ('告警配置', 34); diff --git a/hzims-service/hzims-middle/src/main/resources/db/1.0.2.sql b/hzims-service/hzims-middle/src/main/resources/db/1.0.2.sql deleted file mode 100644 index 9771348..0000000 --- a/hzims-service/hzims-middle/src/main/resources/db/1.0.2.sql +++ /dev/null @@ -1 +0,0 @@ -alter table hzims_statistics add sort int comment '排序'; diff --git a/hzims-service/hzims-middle/src/main/resources/db/1.0.3.sql b/hzims-service/hzims-middle/src/main/resources/db/1.0.3.sql deleted file mode 100644 index 2e351c5..0000000 --- a/hzims-service/hzims-middle/src/main/resources/db/1.0.3.sql +++ /dev/null @@ -1,44 +0,0 @@ -create table log_options_module_name -( - id bigint primary key auto_increment, - module_name varchar(50) null comment '功能模块', - sort int comment '排序', - create_time datetime default CURRENT_TIMESTAMP null comment '创建时间', - update_time datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间', - is_deleted tinyint default 0 null comment '逻辑删除 （0 可用 1 删除）' -); - -insert into log_options_module_name(module_name, sort) -values ('集中监控', 1), - ('综合调度', 2), - ('视频集中监控', 3), - ('实时监控', 4), - ('视频监控', 5), - ('演示大屏', 6), - ('生态监控', 7), - ('数据分析', 9), - ('数据查询', 10), - ('通讯告警统计', 11), - ('气象监测', 12), - ('我的事务', 13), - ('值班管理', 14), - ('缺陷管理', 15), - ('两票管理', 16), - ('巡检管理', 17), - ('日常维护', 18), - ('检修管理', 19), - ('数据填报', 20), - ('安全管理', 21), - ('设备管理', 22), - ('资产管理', 23), - ('智能诊断', 24), - ('生产月报', 25), - ('告警配置', 26), - ('电站安全标准', 27), - ('站点管理', 28), - ('实时画面', 29), - ('资源配置', 30), - ('消息管理', 31), - ('移动端配置', 32), - ('水电站设置', 33), - ('告警配置', 34); From 22023006be541c112159d764af72b3ddbb670a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Wed, 2 Aug 2023 12:00:04 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service/operational/src/main/resources/db/1.0.2.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 hzims-service/operational/src/main/resources/db/1.0.2.sql diff --git a/hzims-service/operational/src/main/resources/db/1.0.2.sql b/hzims-service/operational/src/main/resources/db/1.0.2.sql new file mode 100644 index 0000000..86f166e --- /dev/null +++ b/hzims-service/operational/src/main/resources/db/1.0.2.sql @@ -0,0 +1,5 @@ +update hzims_oper_maintenance_task set flow_task_name = '待领用' where STATUS =1; +update hzims_oper_maintenance_task set flow_task_name = '待执行' where STATUS =2; +update hzims_oper_maintenance_task set flow_task_name = '待确认' where STATUS =3; +update hzims_oper_maintenance_task set flow_task_name = '待归档' where STATUS =4; +update hzims_oper_maintenance_task set flow_task_name = '结束' where STATUS =5; \ No newline at end of file From fa018e299e4421a3e9cda63bbf2d6235eec3a116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Wed, 2 Aug 2023 14:37:55 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hnac/hzims/middle/systemlog/config/SysLogConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/config/SysLogConfig.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/config/SysLogConfig.java index b9f6fdc..948106a 100644 --- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/config/SysLogConfig.java +++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/config/SysLogConfig.java @@ -29,7 +29,7 @@ public class SysLogConfig { SyslogTimerTask myTimeTask = new SyslogTimerTask(statisticsService); //3.通过timer定时定频率调用SyslogTimerTask的业务逻辑 // 即 第一次执行是在当前时间的两秒之后，之后每隔60分钟执行一次 - timer.schedule(myTimeTask, 2000L, (60L * 1000L)); + timer.schedule(myTimeTask, 2000L, 3600000L); } } From 8848537254218c166fcffc44c140ae38f07e357c Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Wed, 2 Aug 2023 16:47:58 +0800 Subject: [PATCH 5/7] =?UTF-8?q?#=20=E8=AE=BE=E5=A4=87=E6=A0=91=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/equipment/service/impl/EmInfoServiceImpl.java | 14 ++++++++++++-- .../com/hnac/hzinfo/inspect/obj/feign/ProjectClient.java | 15 +++++++++++++-- .../inspect/obj/services/impl/ObjectServiceImpl.java | 7 ++++++- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java index 12726bd..e2477b1 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java @@ -599,6 +599,17 @@ public class EmInfoServiceImpl extends BaseServiceImpl Arrays.stream(path.split("/"))).distinct().collect(Collectors.toList()); emCodes.addAll(childrenEmCode); } + return this.getEmInfoTree(deptId,parentCode,emCodes); + } + + /** + * 获取设备树（巡检对象选择专用） + * @param deptId 机构ID + * @param parentCode 父设备编号 + * @param emCodes 巡检项目设备编号集合 + * @return 获取设备树 + */ + private List getEmInfoTree(Long deptId, String parentCode,List emCodes) { EmInfoEntity emInfo = this.getOne(Wrappers.lambdaQuery().eq(EmInfoEntity::getNumber, parentCode)); // 获取parentCode下的子设备集合 LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery() @@ -608,13 +619,12 @@ public class EmInfoServiceImpl extends BaseServiceImpl result = emInfoList.stream().map(emInfoEntity -> { JSONObject object = JSONObject.parseObject(JSON.toJSONString(emInfoEntity)); object.put("disabled", emCodes.contains(emInfoEntity.getNumber()) ? false : true); + object.put("children",this.getEmInfoTree(deptId,emInfoEntity.getNumber(),emCodes)); return object; }).collect(Collectors.toList()); return result; } - - /** * 设备信息缓存(ct、pt、installedCapacity、监测点位) */ diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ProjectClient.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ProjectClient.java index bbaf72f..2577317 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ProjectClient.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/feign/ProjectClient.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzinfo.inspect.obj.dto.ContentDTO; import com.hnac.hzinfo.inspect.obj.dto.ProjectDTO; +import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity; import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; import com.hnac.hzinfo.inspect.obj.request.ProjectContentRequest; +import com.hnac.hzinfo.inspect.obj.services.ProjectContentService; import com.hnac.hzinfo.inspect.obj.services.ProjectService; import com.hnac.hzinfo.inspect.obj.vo.ProjectVO; import io.swagger.annotations.ApiOperation; @@ -16,11 +18,14 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.List; +import java.util.stream.Collectors; /** * @ClassName ProjectClient @@ -35,6 +40,7 @@ import java.util.List; public class ProjectClient extends BladeController implements IProjectClient { private final ProjectService projectService; + private final ProjectContentService projectContentService; @Override @PostMapping(ADD_PROJECT_AND_CONTENT) @@ -55,8 +61,13 @@ public class ProjectClient extends BladeController implements IProjectClient { @GetMapping(GET_EM_CODES_BY_DEPT_ID) public R> getEmCodesByDeptId(@RequestParam Long deptId) { QueryWrapper queryWrapper = Wrappers.query().eq("create_dept", deptId); - queryWrapper.select("distinct em_code emCode"); queryWrapper.ne("em_code","").isNotNull("em_code"); - return R.data(projectService.listObjs(queryWrapper, String::valueOf)); + List projects = projectService.list(queryWrapper); + if(CollectionUtil.isNotEmpty(projects)) { + QueryWrapper in = Wrappers.query().select("distinct project_id").in("project_id", projects.stream().map(ProjectEntity::getId).collect(Collectors.toList())); + List projectIds = projectContentService.listObjs(in, Func::toLong); + return R.data(projects.stream().filter(project -> projectIds.contains(project.getId())).map(ProjectEntity::getEmCode).collect(Collectors.toList())); + } + return R.data(projects.stream().map(ProjectEntity::getEmCode).collect(Collectors.toList())); } } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectServiceImpl.java index 0614870..153cb48 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectServiceImpl.java @@ -276,10 +276,15 @@ public class ObjectServiceImpl extends BaseServiceImpl projectContentWrapper = Wrappers.lambdaQuery().eq(ProjectContentEntity::getProjectId, one.getId()); + if(CollectionUtil.isEmpty(projectContentService.list(projectContentWrapper))) { + return null; + } return TemplateProjectEntity.builder().templateId(template.getId()).projectId(one.getId()).build(); }; List templateProjectList = Stream.iterate(0,n -> n + 1).limit(emCodeList.size()) - .flatMap(index -> emInfoClient.getChildrenByEmCode(emCodeList.get(index)).getData().stream()).map(getTemplateProjectByEmCode).collect(Collectors.toList()); + .flatMap(index -> emInfoClient.getChildrenByEmCode(emCodeList.get(index)).getData().stream()).map(getTemplateProjectByEmCode).filter(ObjectUtil::isNotEmpty).collect(Collectors.toList()); templateProjectService.saveBatch(templateProjectList); } } From d13de88d25c9cb8f02dce1b293bbb76f7759cbb5 Mon Sep 17 00:00:00 2001 From: tyty Date: Wed, 2 Aug 2023 17:00:17 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=9B=86=E4=B8=AD=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E6=99=BA=E8=83=BD=E8=AF=8A=E6=96=AD=E4=BB=A3=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java index 2073ff6..94946e3 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java @@ -445,7 +445,7 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl Date: Wed, 2 Aug 2023 17:07:44 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../middle/systemlog/service/impl/StatisticsServiceImpl.java | 6 ++++++ .../com/hnac/hzims/middle/systemlog/vo/SysLogStatisticsVo.java | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/StatisticsServiceImpl.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/StatisticsServiceImpl.java index 94c7d4e..581533f 100644 --- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/StatisticsServiceImpl.java +++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/StatisticsServiceImpl.java @@ -21,6 +21,7 @@ import org.apache.xmlbeans.StringEnumAbstractBase; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -64,16 +65,21 @@ public class StatisticsServiceImpl extends ServiceImpl