From 7e0c83b72b517187b407dca56f7e848a700e8c1f Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 5 Mar 2024 09:04:44 +0800 Subject: [PATCH 01/11] =?UTF-8?q?#=E8=AE=BE=E5=A4=87=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/operational/census/service/impl/TargetServiceImpl.java | 3 ++- .../hzims/ticket/workTicket/controller/WorkTicketInfoController.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/TargetServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/TargetServiceImpl.java index 93e17d2..f1dc1f0 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/TargetServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/TargetServiceImpl.java @@ -443,6 +443,7 @@ public class TargetServiceImpl implements TargetService { completeTicketVo.setCompleteRate(doublePass.getDoublePassRate()); } completes.add(completeTicketVo); + countDownLatch.countDown(); } }else{ for (Dept dept: areas) { @@ -465,9 +466,9 @@ public class TargetServiceImpl implements TargetService { completeTicketVo.setCompleteRate(doublePass.getDoublePassRate()); } completes.add(completeTicketVo); + countDownLatch.countDown(); } } - countDownLatch.countDown(); }); // 等待所有线程执行完成 try { diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java index 31ac092..b0aade8 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java @@ -258,7 +258,7 @@ public class WorkTicketInfoController { } /** - * 获取工作票台账 + * 获取工作票台账、 */ @ApiLog @GetMapping("/getWorkTicketBill") From 8248a9ecee46ddad3f2d91415401bd4751581cdb Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 5 Mar 2024 09:30:21 +0800 Subject: [PATCH 02/11] =?UTF-8?q?#=E5=8F=91=E7=94=B5=E9=87=8F=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fill/service/impl/GenerateServiceImpl.java | 24 +++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java index 3463168..f83a10c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java @@ -284,20 +284,16 @@ public class GenerateServiceImpl extends BaseServiceImpl days(Date date) { List list = new ArrayList<>(); - // 结束日期 - Calendar endCal = Calendar.getInstance(); - endCal.setTime(new Date()); - endCal.add(Calendar.MONTH, -endCal.get(Calendar.MONTH) + 1); - endCal.add(Calendar.DATE, -endCal.get(Calendar.DATE) + 1); - - // 开始日期 - Calendar startCal = Calendar.getInstance(); - startCal.setTime(new Date()); - startCal.add(Calendar.DATE, -startCal.get(Calendar.DATE) + 1); - // 获取日期之间的月份 - while (endCal.after(startCal)) { - list.add(DateUtil.format(startCal.getTime(),DateUtil.PATTERN_DATE)); - startCal.add(Calendar.DAY_OF_MONTH, 1); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MONTH, 1); + calendar.add(Calendar.DAY_OF_MONTH, -calendar.get(Calendar.DAY_OF_MONTH) + 1); + Date end = calendar.getTime(); + calendar.add(Calendar.MONTH, -1); + Date start = calendar.getTime(); + while (start.compareTo(end) < 0){ + list.add(DateUtil.format(start,DateUtil.PATTERN_DATE)); + calendar.add(Calendar.DAY_OF_MONTH, 1); + start = calendar.getTime(); } return list; } From 0c20b04fca510a06a680415c442d97fcbf9cbfdb Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 5 Mar 2024 10:00:56 +0800 Subject: [PATCH 03/11] =?UTF-8?q?#=E5=85=B6=E5=AE=83=E5=A1=AB=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/operational/fill/entity/OtherEntity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java index 0e77a08..89b08a3 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java @@ -10,9 +10,13 @@ import org.springblade.core.tenant.mp.TenantEntity; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; +/** + * @author ysj + */ @Data @TableName("hzims_fill_other") @ApiModel(value="OverOtherEntity对象", description="其他填报") @@ -37,7 +41,7 @@ public class OtherEntity extends TenantEntity implements Serializable { private Date endDate; @ApiModelProperty("FA_投入条数") - private Integer faQuantity; + private BigDecimal faQuantity; @ApiModelProperty("设备在线率") private String onlineRate; From b849d01a8ef9dee48c9f50451ab58618a6f710d8 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 5 Mar 2024 10:01:41 +0800 Subject: [PATCH 04/11] =?UTF-8?q?#=E5=85=B6=E5=AE=83=E5=A1=AB=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java index 89b08a3..0d591f0 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; import org.springframework.format.annotation.DateTimeFormat; @@ -17,6 +18,7 @@ import java.util.Date; /** * @author ysj */ +@EqualsAndHashCode(callSuper = true) @Data @TableName("hzims_fill_other") @ApiModel(value="OverOtherEntity对象", description="其他填报") From 9211e431893abc9693656e016b0200e26368c31f Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 5 Mar 2024 10:20:26 +0800 Subject: [PATCH 05/11] =?UTF-8?q?#=E5=85=B6=E5=AE=83=E5=A1=AB=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java index 0d591f0..2c80179 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/OtherEntity.java @@ -43,7 +43,7 @@ public class OtherEntity extends TenantEntity implements Serializable { private Date endDate; @ApiModelProperty("FA_投入条数") - private BigDecimal faQuantity; + private Long faQuantity; @ApiModelProperty("设备在线率") private String onlineRate; From e7911025810439a0d39277d9090e006a992defb2 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 5 Mar 2024 14:11:22 +0800 Subject: [PATCH 06/11] =?UTF-8?q?#=20=E6=9C=BA=E6=9E=84-=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B-=E7=8F=AD=E6=AC=A1=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=A0=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operational/duty/vo/DutyClassTypeTree.java | 29 ++++++++++++++++++++++ .../duty/controller/ImsDutyClassController.java | 10 +++++++- .../duty/mapper/ImsDutyClassMapper.java | 8 ++++++ .../duty/service/IImsDutyClassService.java | 4 ++- .../duty/service/impl/ImsDutyClassServiceImpl.java | 17 ++++++++++++- 5 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/vo/DutyClassTypeTree.java diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/vo/DutyClassTypeTree.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/vo/DutyClassTypeTree.java new file mode 100644 index 0000000..ce95232 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/vo/DutyClassTypeTree.java @@ -0,0 +1,29 @@ +package com.hnac.hzims.operational.duty.vo; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.hnac.hzims.common.pojo.Tree; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@ApiModel(value = "机构-值班班次类型-班次树",description = "机构-值班班次类型-班次树") +public class DutyClassTypeTree implements Tree { + @ApiModelProperty("树ID") + private Long id; + + @ApiModelProperty("父节点树ID") + @JsonIgnore + private Long parentId; + + @ApiModelProperty("节点名称") + private String name; + + @ApiModelProperty("子节点") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List children; + +} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java index e0f3b55..c4fc34f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyClassController.java @@ -6,12 +6,15 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.common.logs.annotation.OperationAnnotation; import com.hnac.hzims.common.logs.enums.BusinessType; import com.hnac.hzims.common.logs.enums.OperatorType; +import com.hnac.hzims.common.pojo.Tree; import com.hnac.hzims.operational.duty.entity.ImsDutyClassEntity; import com.hnac.hzims.operational.duty.service.IImsDutyClassService; +import com.hnac.hzims.operational.duty.vo.DutyClassTypeTree; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; +import lombok.Value; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -139,7 +142,12 @@ public class ImsDutyClassController extends BladeController { return imsDutyClassService.typeRemove(classTypeId); } - + @GetMapping("/getDutyClassTree") + @ApiOperationSupport(order = 10) + @ApiOperation(value = "获取机构-班次类型-班次树") + public R> getDutyClassTree(@RequestParam(required = false) @ApiParam(value = "机构id") Long deptId) { + return R.data(imsDutyClassService.getDutyClassTree(deptId)); + } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.java index 5a5771a..fc302a5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.java @@ -1,5 +1,7 @@ package com.hnac.hzims.operational.duty.mapper; +import com.hnac.hzims.common.pojo.Tree; +import com.hnac.hzims.operational.duty.vo.DutyClassTypeTree; import org.apache.ibatis.annotations.Param; import org.springblade.core.datascope.annotation.UserDataAuth; import com.hnac.hzims.operational.duty.entity.ImsDutyClassEntity; @@ -32,4 +34,10 @@ public interface ImsDutyClassMapper extends UserDataScopeBaseMapper getDutyClassTree(@Param("deptId")Long deptId); + + List getDutyClassByType(@Param("class_type_id") Long classTypeId); + + List getDutyClassTypeByDept(@Param("create_dept") Long deptId); + } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyClassService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyClassService.java index 76c7d53..9a502aa 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyClassService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyClassService.java @@ -1,6 +1,8 @@ package com.hnac.hzims.operational.duty.service; +import com.hnac.hzims.common.pojo.Tree; import com.hnac.hzims.operational.duty.entity.ImsDutyClassEntity; +import com.hnac.hzims.operational.duty.vo.DutyClassTypeTree; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; @@ -32,6 +34,6 @@ public interface IImsDutyClassService extends BaseService { R typeRemove(Long classTypeId); - + List getDutyClassTree(Long deptId); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassServiceImpl.java index cb31c38..a923cc2 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassServiceImpl.java @@ -1,19 +1,23 @@ package com.hnac.hzims.operational.duty.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.common.pojo.Tree; import com.hnac.hzims.operational.duty.entity.ImsDutyClassEntity; import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; import com.hnac.hzims.operational.duty.mapper.ImsDutyClassMapper; import com.hnac.hzims.operational.duty.mapper.ImsDutyMainMapper; import com.hnac.hzims.operational.duty.service.IImsDutyClassService; +import com.hnac.hzims.operational.duty.vo.DutyClassTypeTree; import org.apache.commons.lang3.StringUtils; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.system.feign.ISysClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -25,7 +29,9 @@ import java.util.stream.Collectors; public class ImsDutyClassServiceImpl extends BaseServiceImpl implements IImsDutyClassService { @Autowired - private ImsDutyMainMapper imsDutyMainMapper; + private ImsDutyMainMapper imsDutyMainMapper; + @Autowired + private ISysClient sysClient; @Override public R saveOrUpdateImsDutyClass(ImsDutyClassEntity imsDutyClass) { if (null == imsDutyClass.getClassTypeId()) { @@ -104,4 +110,13 @@ public class ImsDutyClassServiceImpl extends BaseServiceImpl getDutyClassTree(Long deptId) { + List dutyClassTrees = this.baseMapper.getDutyClassTree(deptId); + dutyClassTrees.forEach(node -> { + node.setName(Optional.ofNullable(sysClient.getDeptName(node.getId())).map(R::getData).orElse(null)); + }); + return dutyClassTrees; + } + } From 50eb0d5c663c37b6a4f4ff8a0d87ee5dc64f580b Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 5 Mar 2024 14:12:06 +0800 Subject: [PATCH 07/11] =?UTF-8?q?#=20=E4=BD=93=E7=B3=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8bug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/safeproduct/entity/SystemFileEntity.java | 3 +++ .../service/impl/SystemFileServiceImpl.java | 3 +++ .../resources/file/体系文件审批.bpmn20.xml | 21 ++++++++++++--------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java index f88a16e..757a635 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java @@ -50,4 +50,7 @@ public class SystemFileEntity extends TenantEntity { @ApiModelProperty(value = "工作流ID") private String flowId; + @ApiModelProperty("创建人") + private Long createUser; + } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java index 5dc22c6..6245f4a 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SystemFileServiceImpl.java @@ -73,6 +73,9 @@ public class SystemFileServiceImpl extends BaseServiceImpl - + + + + + @@ -38,16 +41,16 @@ - - + + - - + + - - + + @@ -55,4 +58,4 @@ - + \ No newline at end of file From 929441462cfd629692f15f0657a2e5c8e29007b4 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 5 Mar 2024 14:13:43 +0800 Subject: [PATCH 08/11] =?UTF-8?q?#=20=E6=97=A5=E5=B8=B8=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenance/service/impl/OperMaintenanceTaskServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java index 55fd3cb..25fb744 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java @@ -144,10 +144,10 @@ public class OperMaintenanceTaskServiceImpl extends BaseServiceImpl Date: Tue, 5 Mar 2024 14:18:19 +0800 Subject: [PATCH 09/11] =?UTF-8?q?#=20=E6=9C=BA=E6=9E=84-=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B-=E7=8F=AD=E6=AC=A1=E6=A0=91=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operational/duty/mapper/ImsDutyClassMapper.xml | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.xml index a264c2a..8a6e138 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.xml +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.xml @@ -17,6 +17,23 @@ + + + + + + + + + + + + + + + + + ID, TENANT_ID,CLASS_TYPE_ID,CLASS_NAME, START_TIME, END_TIME, CREATE_TIME, UPDATE_TIME, CREATE_USER, UPDATE_USER, IS_DELETED,STATUS,CREATE_DEPT @@ -75,4 +92,29 @@ and CLASS_TYPE_ID <> #{classTypeId} + + + + + + From 28d8d3ddd941de180b76b5a17d0a039fac2ed321 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 5 Mar 2024 16:32:42 +0800 Subject: [PATCH 10/11] =?UTF-8?q?#=E6=95=B0=E6=8D=AE=E4=B8=AD=E6=96=AD?= =?UTF-8?q?=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java index dbcd506..a11c587 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmQueryServiceImpl.java @@ -186,6 +186,6 @@ public class AlarmQueryServiceImpl extends BaseServiceImpl Date: Tue, 5 Mar 2024 17:32:43 +0800 Subject: [PATCH 11/11] =?UTF-8?q?#=20=E6=9C=BA=E6=9E=84=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E6=A0=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenance/entity/OperMaintenanceLibraryEntity.java | 2 ++ .../java/com/hnac/hzims/operational/config/Swagger2Config.java | 4 ++-- .../config/controller/CentralMonitorController.java | 2 ++ .../operational/config/controller/StAlamRecordController.java | 2 +- .../config/controller/StFocusPropertiesController.java | 2 +- .../operational/duty/service/impl/ImsDutyClassServiceImpl.java | 10 ++++++---- .../maintenance/controller/MaintenanceController.java | 2 ++ hzims-service/operational/src/main/resources/db/4.0.0 .sql.1 | 4 +++- 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceLibraryEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceLibraryEntity.java index 71054f0..fdd0378 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceLibraryEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceLibraryEntity.java @@ -132,4 +132,6 @@ public class OperMaintenanceLibraryEntity extends TenantEntity { @QueryField(condition = SqlCondition.LIKE) private Long createDept; + @ApiModelProperty("班次树，机构-班次类型-班次") + private String dutyClassTree; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/Swagger2Config.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/Swagger2Config.java index 18d9559..971515b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/Swagger2Config.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/Swagger2Config.java @@ -20,8 +20,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; * @Serial 1.0 * @Date 2023/4/13 13:40 */ -@Configuration -@EnableSwagger2 +//@Configuration +//@EnableSwagger2 public class Swagger2Config implements WebMvcConfigurer { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/CentralMonitorController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/CentralMonitorController.java index afea65f..90a1dc8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/CentralMonitorController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/CentralMonitorController.java @@ -48,6 +48,8 @@ public class CentralMonitorController extends BladeController { * @return */ @GetMapping("/selectCommunication/{page}/{size}") + @ApiOperation("查询通讯告警的最后一小时的运行数据") + @ApiOperationSupport(order = 2) public R selectCommunication(@PathVariable Integer page, @PathVariable Integer size, String roleId, diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StAlamRecordController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StAlamRecordController.java index 545f561..48d89e4 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StAlamRecordController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StAlamRecordController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; -@Api(tags = "告警记录") +@Api(value = "告警记录",tags = "告警记录") @RestController @RequestMapping("/stAlamRecord") public class StAlamRecordController { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StFocusPropertiesController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StFocusPropertiesController.java index d4324cd..5f4e853 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StFocusPropertiesController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StFocusPropertiesController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "重点关注属性") +@Api(value = "重点关注属性",tags = "重点关注属性") @RestController @RequestMapping("/stFocusProperties") public class StFocusPropertiesController { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassServiceImpl.java index a923cc2..4f6e03f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyClassServiceImpl.java @@ -12,10 +12,12 @@ import org.apache.commons.lang3.StringUtils; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.Func; import org.springblade.system.feign.ISysClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -113,10 +115,10 @@ public class ImsDutyClassServiceImpl extends BaseServiceImpl getDutyClassTree(Long deptId) { List dutyClassTrees = this.baseMapper.getDutyClassTree(deptId); - dutyClassTrees.forEach(node -> { - node.setName(Optional.ofNullable(sysClient.getDeptName(node.getId())).map(R::getData).orElse(null)); - }); - return dutyClassTrees; + List result = dutyClassTrees.stream().peek(node -> node.setName(Optional.ofNullable(sysClient.getDeptName(node.getId())).map(R::getData).orElse(null))) + .filter(t -> Func.isNotEmpty(t.getName())) + .sorted(Comparator.comparing(DutyClassTypeTree::getName)).collect(Collectors.toList()); + return result; } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java index d845d0f..8bc2c87 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java @@ -3,6 +3,7 @@ package com.hnac.hzims.operational.maintenance.controller; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse; import com.hnac.hzims.operational.maintenance.service.MaintenanceService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; @@ -25,6 +26,7 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/maintenance") +@Api(value = "日常维护管理",tags = "日常维护管理") public class MaintenanceController { diff --git a/hzims-service/operational/src/main/resources/db/4.0.0 .sql.1 b/hzims-service/operational/src/main/resources/db/4.0.0 .sql.1 index 94cf96e..5ad9b92 100644 --- a/hzims-service/operational/src/main/resources/db/4.0.0 .sql.1 +++ b/hzims-service/operational/src/main/resources/db/4.0.0 .sql.1 @@ -30,4 +30,6 @@ CREATE TABLE `HZIMS_OPER_CONSTRUCTION` ( `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; \ No newline at end of file +) ENGINE = INNODB CHARACTER SET = UTF8MB4 COLLATE = UTF8MB4_GENERAL_CI ROW_FORMAT = DYNAMIC; + +alter table `hzims_oper_maintenance_library` add column `duty_class_tree` VARCHAR(100) NULL COMMENT '班次树，机构/班次类型/班次'; \ No newline at end of file