From bf530e253d86f84a0b83c300ec9bccbe543864f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Fri, 24 Apr 2026 18:01:44 +0800 Subject: [PATCH] =?UTF-8?q?PDA=20=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/EpciuPatrolInspectionMapper.xml | 4 +- .../mapper/SafePatrolInspectionMapper.xml | 4 +- .../entity/BsEpciuPatrolInspectionEntity.java | 25 +++++++++- .../entity/BsSafePatrolInspectionEntity.java | 10 ++-- .../BsEpciuPatrolInspectionServiceImpl.java | 47 ++++++++++++++++--- .../desk/produce/service/IPdaSaveService.java | 2 +- .../service/impl/PdaSaveServiceImpl.java | 7 ++- 7 files changed, 81 insertions(+), 18 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml index 7dc4a9e2..769901dc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml @@ -3,13 +3,13 @@ - + - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafePatrolInspectionMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafePatrolInspectionMapper.xml index 4bdb4274..57fcbc30 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafePatrolInspectionMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafePatrolInspectionMapper.xml @@ -3,13 +3,13 @@ - + - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEpciuPatrolInspectionEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEpciuPatrolInspectionEntity.java index fa5cc950..94607f38 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEpciuPatrolInspectionEntity.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEpciuPatrolInspectionEntity.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.energy.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -32,6 +33,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tool.utils.DateUtil; +import org.springblade.desk.energy.util.DateTime; +import org.springblade.desk.energy.util.TimeSpan; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; @@ -80,7 +83,8 @@ public class BsEpciuPatrolInspectionEntity extends BaseEntity { @Schema(description = "等待周期") @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) - private Date waitCycle; + @TableField(exist = false) + private String waitCycle; /** * 巡检点备注 */ @@ -139,5 +143,22 @@ public class BsEpciuPatrolInspectionEntity extends BaseEntity { taskStatusMap.put(PREPARE_TEXT, "待检"); taskStatusMap.put(NO_CHECK, "未检"); } - + public String getWaitCycle() { + if(this.taskStatus.equals(CHECKED)) { + return ""; + } + TimeSpan ts = DateTime.dateDiff(this.launchTime, new Date()); + int days = ts.getDays(); + int hours = ts.getHours(); + int minutes = ts.getMinutes(); + String rtnV = ts.getSeconds() + "秒"; + if (days > 0) { + rtnV = days + "天" + hours + "时" + minutes + "分"; + } else if (hours > 0) { + rtnV = hours + "时" + minutes + "分"; + } else if (minutes > 0) { + rtnV = minutes + "分"; + } + return rtnV; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java index 23eedec8..bad655c8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.energy.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -79,10 +80,11 @@ public class BsSafePatrolInspectionEntity extends BaseEntity { /** * 等待周期 */ - @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) - @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) - @Schema(description = "等待周期") - private Date waitCycle; + //@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + //@JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + //@Schema(description = "等待周期") + @TableField(exist = false) + private String waitCycle; /** * 巡检点备注 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java index 63a2a7ac..ebc1fbb2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java @@ -26,13 +26,16 @@ package org.springblade.desk.energy.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.utils.Func; import org.springblade.desk.energy.excel.BsEpciuPatrolInspectionExcel; import org.springblade.desk.energy.mapper.BsEpciuPatrolInspectionMapper; import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity; @@ -44,13 +47,12 @@ import org.springblade.desk.energy.service.IBsEpciuInspectionPointService; import org.springblade.desk.energy.service.IBsEpciuPatrolInspectionService; import org.springblade.desk.energy.service.IBsSafeInspectionPointService; import org.springblade.desk.energy.service.IBsSafePatrolInspectionService; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.User; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -65,6 +67,8 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl selectBsEpciuPatrolInspectionPage(IPage page, BsEpciuPatrolInspectionVO bsEpciuPatrolInspection) { if(bsEpciuPatrolInspection.getQueryLaunchTime()!=null){ @@ -74,7 +78,31 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl bsEpciuPatrolInspectionVOIPage = + page.setRecords(baseMapper.selectBsEpciuPatrolInspectionPage(page, bsEpciuPatrolInspection)); + + Set manIds = + bsEpciuPatrolInspectionVOIPage.getRecords().stream().map(BsEpciuPatrolInspectionVO::getInsMan).collect(Collectors.toSet()); + if (CollUtil.isNotEmpty(manIds)) { + String userId = Func.toStr(manIds); + List users = new ArrayList<>(); + try { + users = userClient.userUNListByIds(userId); + } catch (Exception e) { + e.printStackTrace(); + return bsEpciuPatrolInspectionVOIPage; + } + + if (CollUtil.isEmpty( users)){ + return bsEpciuPatrolInspectionVOIPage; + } + + Map userMap = users.stream().collect(Collectors.toMap(s -> s.getId().toString(), User::getName)); + bsEpciuPatrolInspectionVOIPage.getRecords().forEach(bsEpciuPatrolInspectionVO -> { + bsEpciuPatrolInspectionVO.setInsMan(userMap.getOrDefault(bsEpciuPatrolInspectionVO.getInsMan(),bsEpciuPatrolInspectionVO.getInsMan())); + }); + } + return bsEpciuPatrolInspectionVOIPage; } @@ -201,10 +229,14 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl safeInspectionPointList = bsEpciuInspectionPointService.listByCode(bsEpciuPatrolInspection.getInsNum()); @@ -213,6 +245,9 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl point.setLastInsCycle(date)); + bsEpciuInspectionPointService.updateBatchById(safeInspectionPointList); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java index d4258225..c10eabf8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java @@ -66,7 +66,7 @@ public interface IPdaSaveService extends BaseService { boolean receiveNoProcessOrder(); - void saveSafetyInspection(String code, String man, String memo); + void saveSafetyInspection(String code, String memo,String pathStr); void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java index 19facb44..53f6645e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java @@ -878,6 +878,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl spiList = inspectionService.getByCode(code); @@ -893,7 +894,10 @@ public class PdaSaveServiceImpl extends BaseServiceImpl