From 97079abdef243c004ef2281bf574626d9f6e3706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Thu, 27 Nov 2025 18:56:33 +0800 Subject: [PATCH 01/16] =?UTF-8?q?11-27-=E4=BF=AE=E6=94=B9=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E5=AE=A1=E6=89=B9=E6=96=87=E4=BB=B6=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XzdProjectManagerApprovalServiceImpl.java | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectManagerApprovalServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectManagerApprovalServiceImpl.java index 444a17b8..228fb53b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectManagerApprovalServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectManagerApprovalServiceImpl.java @@ -23,7 +23,6 @@ import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.xzd.domain.XzdProjectManagerApproval; import org.dromara.xzd.domain.bo.XzdProjectManagerApprovalBo; import org.dromara.xzd.domain.vo.XzdProjectManagerApprovalVo; -import org.dromara.xzd.domain.vo.XzdProjectVo; import org.dromara.xzd.mapper.XzdProjectManagerApprovalMapper; import org.dromara.xzd.service.IXzdProjectManagerApprovalService; import org.springframework.beans.factory.annotation.Autowired; @@ -135,22 +134,22 @@ public class XzdProjectManagerApprovalServiceImpl extends ServiceImpl oldFileId = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); - List nowFileId = Arrays.stream(bo.getFileId().split(",")).map(Long::valueOf).toList(); - for (Long l : oldFileId) { - if (!nowFileId.contains(l)) { - sysOssService.deleteWithValidByIds(List.of(l), false); - } - } - } - }else { - if (old.getFileId()!= null && !old.getFileId().isEmpty()){ - List deleteIds = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); - sysOssService.deleteWithValidByIds(deleteIds, false); - } - } +// if (bo.getFileId() != null && !bo.getFileId().isEmpty()){ +// if (old.getFileId() != null && !old.getFileId().isEmpty()) { +// List oldFileId = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); +// List nowFileId = Arrays.stream(bo.getFileId().split(",")).map(Long::valueOf).toList(); +// for (Long l : oldFileId) { +// if (!nowFileId.contains(l)) { +// sysOssService.deleteWithValidByIds(List.of(l), false); +// } +// } +// } +// }else { +// if (old.getFileId()!= null && !old.getFileId().isEmpty()){ +// List deleteIds = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList(); +// sysOssService.deleteWithValidByIds(deleteIds, false); +// } +// } XzdProjectManagerApproval update = MapstructUtils.convert(bo, XzdProjectManagerApproval.class); validEntityBeforeSave(update); From ebd88a999c6135719ee36f695a16aabed5cb7a26 Mon Sep 17 00:00:00 2001 From: zt Date: Thu, 27 Nov 2025 19:17:15 +0800 Subject: [PATCH 02/16] bug --- .../service/impl/OutSettlementValueSubcontractServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutSettlementValueSubcontractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutSettlementValueSubcontractServiceImpl.java index 9a216f35..9208edc5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutSettlementValueSubcontractServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutSettlementValueSubcontractServiceImpl.java @@ -84,6 +84,7 @@ public class OutSettlementValueSubcontractServiceImpl extends ServiceImpl buildQueryWrapper(OutSettlementValueSubcontractBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(OutSettlementValueSubcontract::getId); lqw.eq(bo.getProjectId() != null, OutSettlementValueSubcontract::getProjectId, bo.getProjectId()); lqw.eq(StringUtils.isNotBlank(bo.getDocumentCode()), OutSettlementValueSubcontract::getDocumentCode, bo.getDocumentCode()); @@ -96,6 +97,8 @@ public class OutSettlementValueSubcontractServiceImpl extends ServiceImpl Date: Fri, 28 Nov 2025 17:49:24 +0800 Subject: [PATCH 03/16] =?UTF-8?q?gps=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=85=E7=BB=91=E5=AE=9A=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E6=97=B6=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GpsEquipmentController.java | 10 ++++++++ .../gps/mapper/GpsEquipmentMapper.java | 9 ++++++-- .../gps/mapper/GpsEquipmentSonMapper.java | 23 +++++++++++++++++++ .../gps/service/IGpsEquipmentService.java | 9 ++++++++ .../gps/service/IGpsEquipmentSonService.java | 8 +++++++ .../service/impl/GpsEquipmentServiceImpl.java | 20 +++++++++++++++- .../impl/GpsEquipmentSonServiceImpl.java | 20 ++++++++++++++++ 7 files changed, 96 insertions(+), 3 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java index 3447d4b0..0168715d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java @@ -1,5 +1,6 @@ package org.dromara.gps.controller; +import java.time.LocalDate; import java.util.List; import java.util.Map; @@ -17,6 +18,7 @@ import org.dromara.contractor.domain.dto.constructionuser.SubConstructionUserQue import org.dromara.contractor.domain.exportvo.BusConstructionUserExportVo; import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserVo; import org.dromara.contractor.service.ISubConstructionUserService; +import org.dromara.gps.domain.bo.GpsEquipmentSonBo; import org.dromara.gps.domain.vo.*; import org.dromara.project.service.IBusProjectService; import org.dromara.system.domain.SysUser; @@ -222,4 +224,12 @@ public class GpsEquipmentController extends BaseController { @PathVariable Long[] ids) { return toAjax(gpsEquipmentService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询GPS人员或设备定位日期信息列表 + */ + @GetMapping("/getDateList") + public R> getRlList(GpsEquipmentSonBo bo) { + return R.ok(gpsEquipmentService.getRlList(bo)); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentMapper.java index e1f2a8a3..a5af589b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentMapper.java @@ -19,13 +19,18 @@ public interface GpsEquipmentMapper extends BaseMapperPlus getUeClientList(@Param("startTime") LocalDateTime startOfDay, @Param("endTime") LocalDateTime now); + @Select("") + List getUserOrClientDate(@Param("bo") GpsEquipmentSonBo bo); @Select("WITH RankedData AS (\n" + " SELECT\n" + " *,\n" + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentService.java index 9d832426..bb8023fa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentService.java @@ -1,5 +1,6 @@ package org.dromara.gps.service; +import org.dromara.gps.domain.bo.GpsEquipmentSonBo; import org.dromara.gps.domain.vo.GpsEquipmentSonVo; import org.dromara.gps.domain.vo.GpsEquipmentVo; import org.dromara.gps.domain.bo.GpsEquipmentBo; @@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.gps.domain.vo.GpsProjectVo; import org.dromara.gps.domain.vo.GpsUserVo; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Collection; import java.util.List; @@ -108,4 +110,11 @@ public interface IGpsEquipmentService extends IService{ List getUeUserListByProjectId(LocalDateTime startOfDay, LocalDateTime now); List getListToVehicle(GpsEquipmentBo bo); + + /** + * 查询GPS人员或设备定位日期信息列表 + * @param bo + * @return + */ + List getRlList(GpsEquipmentSonBo bo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java index f7dc357c..8d6dd596 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java @@ -9,6 +9,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.gps.domain.vo.GpsStatusVo; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Collection; import java.util.List; @@ -88,4 +89,11 @@ public interface IGpsEquipmentSonService extends IService{ List getVehicleList(GpsEquipmentSonBo bo); List getNewVehicleList(GpsEquipmentSonBo bo); + + /** + * 查询GPS人员或设备定位日期信息列表 + * @param bo + * @return + */ + List getUserOrClientDate(GpsEquipmentSonBo bo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java index 0601fd4d..69ed9ccd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java @@ -53,6 +53,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.Duration; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; @@ -118,7 +119,13 @@ public class GpsEquipmentServiceImpl extends ServiceImpl getRlList(GpsEquipmentSonBo bo) { + return gpsEquipmentSonService.getUserOrClientDate(bo); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java index 282a1462..3bd39100 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java @@ -26,6 +26,7 @@ import org.dromara.gps.domain.GpsEquipmentSon; import org.dromara.gps.mapper.GpsEquipmentSonMapper; import org.dromara.gps.service.IGpsEquipmentSonService; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; @@ -247,4 +248,23 @@ public class GpsEquipmentSonServiceImpl extends ServiceImpl getUserOrClientDate(GpsEquipmentSonBo bo) { + if (bo.getProjectId() == null) { + throw new ServiceException("项目id不能为空！"); + } + if (bo.getClientId() == null && bo.getUserId() == null) { + throw new ServiceException("设备id或用户id不能为空！"); + } + if (bo.getStartTime() == null || bo.getEndTime() == null) { + throw new ServiceException("开始时间和结算时间不能为空！！！"); + } + return baseMapper.getUserOrClientDate(bo); + } } From 13d33e9d53b76eb4d9bb52081d946e03b4b929d4 Mon Sep 17 00:00:00 2001 From: zt Date: Fri, 28 Nov 2025 19:27:41 +0800 Subject: [PATCH 04/16] =?UTF-8?q?token=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xinnengyuan/ruoyi-admin/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index 9b5259f3..3ffff05f 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -109,7 +109,7 @@ sa-token: # token有效期，单位s 默认30天, -1代表永不过期 timeout: 2592000 # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒 - active-timeout: 86400 + active-timeout: 2592000 # 同一账号最大登录数量，-1代表不限 max-login-count: -1 From 07b921d6309ae5c40d2f4c6f6f1d77c21966d493 Mon Sep 17 00:00:00 2001 From: zt Date: Fri, 28 Nov 2025 19:51:41 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SubConstructionUserServiceImpl.java | 5 +++++ .../java/org/dromara/system/service/ISysRoleService.java | 2 ++ .../dromara/system/service/impl/SysRoleServiceImpl.java | 8 ++++++++ 3 files changed, 15 insertions(+) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java index 1ae52ec8..3cbcf475 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java @@ -662,6 +662,11 @@ public class SubConstructionUserServiceImpl extends ServiceImpl selectRoleIdsByName(String roleName); List selectUserIdsByRoleId(Long roleId); + + void deleteRoleByUserIdAndProjectId(Long userId,Long projectId); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java index c2d7b418..fce6fc34 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java @@ -665,4 +665,12 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { public List selectUserIdsByRoleId(Long roleId) { return userRoleMapper.selectUserIdsByRoleId(roleId); } + + @Override + public void deleteRoleByUserIdAndProjectId(Long userId, Long projectId) { + userRoleMapper.delete(Wrappers.lambdaQuery(SysUserRole.class) + .eq(SysUserRole::getUserId, userId) + .eq(SysUserRole::getProjectId, projectId) + ); + } } From 4b14ea5c7fc46064fc04b23340893e8dd72bd310 Mon Sep 17 00:00:00 2001 From: zt Date: Mon, 1 Dec 2025 17:09:58 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 + .../DeviceAccessRecordController.java | 107 ++++++++++ .../controller/DeviceInfoController.java | 134 ++++++++++++ .../controller/DeviceTypeController.java | 162 ++++++++++++++ .../device/domain/DeviceAccessRecord.java | 85 ++++++++ .../org/dromara/device/domain/DeviceInfo.java | 104 +++++++++ .../org/dromara/device/domain/DeviceType.java | 61 ++++++ .../domain/bo/DeviceAccessRecordBo.java | 82 ++++++++ .../device/domain/bo/DeviceInfoBo.java | 104 +++++++++ .../device/domain/bo/DeviceTypeBo.java | 53 +++++ .../domain/vo/DeviceAccessRecordVo.java | 99 +++++++++ .../device/domain/vo/DeviceInfoCountVo.java | 23 ++ .../device/domain/vo/DeviceInfoVo.java | 138 ++++++++++++ .../device/domain/vo/DeviceTypeVo.java | 78 +++++++ .../mapper/DeviceAccessRecordMapper.java | 15 ++ .../device/mapper/DeviceInfoMapper.java | 15 ++ .../device/mapper/DeviceTypeMapper.java | 15 ++ .../service/IDeviceAccessRecordService.java | 70 +++++++ .../device/service/IDeviceInfoService.java | 85 ++++++++ .../device/service/IDeviceTypeService.java | 70 +++++++ .../impl/DeviceAccessRecordServiceImpl.java | 140 +++++++++++++ .../service/impl/DeviceInfoServiceImpl.java | 197 ++++++++++++++++++ .../service/impl/DeviceTypeServiceImpl.java | 161 ++++++++++++++ .../device/DeviceAccessRecordMapper.xml | 7 + .../mapper/device/DeviceInfoMapper.xml | 7 + .../mapper/device/DeviceTypeMapper.xml | 7 + 26 files changed, 2021 insertions(+) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceInfoController.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceTypeController.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceAccessRecord.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceInfo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceType.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceAccessRecordBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceInfoBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceTypeBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceAccessRecordVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoCountVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceTypeVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceAccessRecordMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceInfoMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceTypeMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceAccessRecordService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceInfoService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceTypeService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceAccessRecordServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/device/DeviceAccessRecordMapper.xml create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/device/DeviceInfoMapper.xml create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/device/DeviceTypeMapper.xml diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index 3ffff05f..f7945fe0 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -305,6 +305,8 @@ springdoc: packages-to-scan: org.dromara.ai - group: 31.投标管理模块 packages-to-scan: org.dromara.bidding + - group: 32.设备模块 + packages-to-scan: org.dromara.device # knife4j的增强配置，不需要增强可以不配 knife4j: enable: true diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java new file mode 100644 index 00000000..5c646628 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java @@ -0,0 +1,107 @@ +package org.dromara.device.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.device.domain.vo.DeviceAccessRecordVo; +import org.dromara.device.domain.bo.DeviceAccessRecordBo; +import org.dromara.device.service.IDeviceAccessRecordService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 设备进出场记录 + * + * @author Lion Li + * @date 2025-12-01 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/device/accessRecord") +public class DeviceAccessRecordController extends BaseController { + + private final IDeviceAccessRecordService deviceAccessRecordService; + + /** + * 查询设备进出场记录列表 + */ + @SaCheckPermission("device:accessRecord:list") + @GetMapping("/list") + public TableDataInfo list(DeviceAccessRecordBo bo, PageQuery pageQuery) { + return deviceAccessRecordService.queryPageList(bo, pageQuery); + } + + + + /** + * 导出设备进出场记录列表 + */ + @SaCheckPermission("device:accessRecord:export") + @Log(title = "设备进出场记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DeviceAccessRecordBo bo, HttpServletResponse response) { + List list = deviceAccessRecordService.queryList(bo); + ExcelUtil.exportExcel(list, "设备进出场记录", DeviceAccessRecordVo.class, response); + } + + /** + * 获取设备进出场记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("device:accessRecord:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(deviceAccessRecordService.queryById(id)); + } + + /** + * 新增设备进出场记录 + */ + @SaCheckPermission("device:accessRecord:add") + @Log(title = "设备进出场记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DeviceAccessRecordBo bo) { + return toAjax(deviceAccessRecordService.insertByBo(bo)); + } + + /** + * 修改设备进出场记录 + */ + @SaCheckPermission("device:accessRecord:edit") + @Log(title = "设备进出场记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DeviceAccessRecordBo bo) { + return toAjax(deviceAccessRecordService.updateByBo(bo)); + } + + /** + * 删除设备进出场记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("device:accessRecord:remove") + @Log(title = "设备进出场记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(deviceAccessRecordService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceInfoController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceInfoController.java new file mode 100644 index 00000000..ad34b887 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceInfoController.java @@ -0,0 +1,134 @@ +package org.dromara.device.controller; + +import java.util.List; +import java.util.Map; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.device.domain.bo.DeviceAccessRecordBo; +import org.dromara.device.domain.vo.DeviceAccessRecordVo; +import org.dromara.device.domain.vo.DeviceInfoCountVo; +import org.dromara.device.service.IDeviceAccessRecordService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.device.domain.vo.DeviceInfoVo; +import org.dromara.device.domain.bo.DeviceInfoBo; +import org.dromara.device.service.IDeviceInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 设备信息 + * + * @author Lion Li + * @date 2025-12-01 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/device/info") +public class DeviceInfoController extends BaseController { + + private final IDeviceInfoService deviceInfoService; + + private final IDeviceAccessRecordService deviceAccessRecordService; + + /** + * 查询设备信息列表 + */ + @SaCheckPermission("device:info:list") + @GetMapping("/list") + public TableDataInfo list(DeviceInfoBo bo, PageQuery pageQuery) { + return deviceInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出设备信息列表 + */ + @SaCheckPermission("device:info:export") + @Log(title = "设备信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DeviceInfoBo bo, HttpServletResponse response) { + List list = deviceInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "设备信息", DeviceInfoVo.class, response); + } + + /** + * 获取设备信息详细信息 + * + * @param id 主键 + */ +// @SaCheckPermission("device:info:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(deviceInfoService.queryById(id)); + } + + /** + * 进出场纪录 + */ + @GetMapping("/recordList") + public R> recordList(DeviceAccessRecordBo bo) { + List list = deviceAccessRecordService.queryList(bo); + return R.ok(list); + } + + + @SaCheckPermission("device:info:list") + @GetMapping("/count/{projectId}") + public R count(@PathVariable Long projectId) { + return R.ok(deviceInfoService.count(projectId)); + } + + @SaCheckPermission("device:info:list") + @GetMapping("/typeCount/{projectId}") + public R> typeCount(@PathVariable Long projectId) { + return R.ok(deviceInfoService.typeCount(projectId)); + } + + /** + * 新增设备信息 + */ + @SaCheckPermission("device:info:add") + @Log(title = "设备信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DeviceInfoBo bo) { + return toAjax(deviceInfoService.insertByBo(bo)); + } + + /** + * 修改设备信息 + */ + @SaCheckPermission("device:info:edit") + @Log(title = "设备信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DeviceInfoBo bo) { + return toAjax(deviceInfoService.updateByBo(bo)); + } + + /** + * 删除设备信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("device:info:remove") + @Log(title = "设备信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(deviceInfoService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceTypeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceTypeController.java new file mode 100644 index 00000000..7cd8e4f3 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceTypeController.java @@ -0,0 +1,162 @@ +package org.dromara.device.controller; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.device.domain.vo.DeviceTypeVo; +import org.dromara.device.domain.bo.DeviceTypeBo; +import org.dromara.device.service.IDeviceTypeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 设备类型 + * + * @author Lion Li + * @date 2025-12-01 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/device/type") +public class DeviceTypeController extends BaseController { + + private final IDeviceTypeService deviceTypeService; + + /** + * 查询设备类型列表 + */ + @SaCheckPermission("device:type:list") + @GetMapping("/list") + public TableDataInfo list(DeviceTypeBo bo, PageQuery pageQuery) { + return deviceTypeService.queryPageList(bo, pageQuery); + } + + + /** + * 设备树状列表 + */ + @SaCheckPermission("device:type:list") + @GetMapping("/treeList") + public R> treeList(DeviceTypeBo bo) { + List list = deviceTypeService.queryList(bo); + buildTreeWithAutoRoot(list); + return R.ok(list); + } + + + public static List buildTreeWithAutoRoot(List list) { + // 1. 用 Map 缓存所有节点（key=节点ID，value=节点对象） + Map nodeMap = list.stream() + .collect(Collectors.toMap(DeviceTypeVo::getId, node -> node)); + + List rootNodes = new ArrayList<>(); // 存储自动识别的顶级节点 + List orphanNodes = new ArrayList<>(); // 存储孤儿节点（可选：单独处理） + + for (DeviceTypeVo node : list) { + Long parentId = node.getParentId(); + // 情况1：parent_id 为0或NULL → 直接视为顶级节点 + if (parentId == null || parentId == 0) { + rootNodes.add(node); + } else { + // 情况2：查找父节点 + DeviceTypeVo parentNode = nodeMap.get(parentId); + if (parentNode != null) { + // 父节点存在 → 挂载到子节点列表 + if (parentNode.getChildren() == null) { + parentNode.setChildren(new ArrayList<>()); + } + parentNode.getChildren().add(node); + } else { + // 父节点不存在 → 视为顶级节点（或加入孤儿节点列表） + rootNodes.add(node); + // 可选：记录孤儿节点，用于后续告警或修复 + orphanNodes.add(node); + } + } + } + + // 可选：打印孤儿节点日志（便于排查数据问题） +// if (!orphanNodes.isEmpty()) { +// System.out.println("警告：存在孤儿节点（父节点不存在），节点ID：" + +// orphanNodes.stream().map(DeviceType::getId).collect(Collectors.toList())); +// } + + return rootNodes; + } + + + /** + * 导出设备类型列表 + */ + @SaCheckPermission("device:type:export") + @Log(title = "设备类型", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DeviceTypeBo bo, HttpServletResponse response) { + List list = deviceTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "设备类型", DeviceTypeVo.class, response); + } + + /** + * 获取设备类型详细信息 + * + * @param id 主键 + */ +// @SaCheckPermission("device:type:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(deviceTypeService.queryById(id)); + } + + /** + * 新增设备类型 + */ + @SaCheckPermission("device:type:add") + @Log(title = "设备类型", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DeviceTypeBo bo) { + return toAjax(deviceTypeService.insertByBo(bo)); + } + + /** + * 修改设备类型 + */ + @SaCheckPermission("device:type:edit") + @Log(title = "设备类型", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DeviceTypeBo bo) { + return toAjax(deviceTypeService.updateByBo(bo)); + } + + /** + * 删除设备类型 + * + * @param ids 主键串 + */ + @SaCheckPermission("device:type:remove") + @Log(title = "设备类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(deviceTypeService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceAccessRecord.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceAccessRecord.java new file mode 100644 index 00000000..06e4fef0 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceAccessRecord.java @@ -0,0 +1,85 @@ +package org.dromara.device.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * 设备进出场记录对象 device_access_record + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("device_access_record") +public class DeviceAccessRecord extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 记录编号（唯一标识，如：RC-2024-0012） + */ + private String recordNo; + + /** + * 设备ID（关联设备表device的id） + */ + private Long deviceId; + + /** + * 设备名 + */ + private String deviceName; + + /** + * 状态（1-进场，2-出场，可扩展其他状态） + */ + private String status; + + /** + * 操作时间（记录发生的时间，如：2024-03-15 09:30:25） + */ + private LocalDateTime operateTime; + + /** + * 子项目名字 + */ + private String location; + + /** + * 操作人ID（关联用户表user的id） + */ + private Long operatorId; + + /** + * 操作人姓名（冗余存储，如：张三） + */ + private String operatorName; + + /** + * 原因（如：安装使用、设备调拨、入库存储） + */ + private String reason; + + /** + * 详细说明（查看详情时展示的补充信息，可选） + */ + private String details; + + /** + * 子项目ID + */ + private Long childProjectId; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceInfo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceInfo.java new file mode 100644 index 00000000..8919dc7e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceInfo.java @@ -0,0 +1,104 @@ +package org.dromara.device.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; + +import java.io.Serial; +import java.time.LocalDate; + +/** + * 设备信息对象 device_info + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("device_info") +public class DeviceInfo extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 项目Id + */ + private Long projectId; + + /** + * 设备编号 + */ + private String deviceCode; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 型号规格 + */ + private String modelSpec; + + /** + * 设备类型ID（关联设备类型表device_type的id） + */ + private Long typeId; + + /** + * 生产厂家 + */ + private String manufacturer; + + /** + * 出厂日期（yyyy-mm-dd） + */ + private LocalDate productionDate; + + /** + * 保修日期（yyyy-mm-dd） + */ + private LocalDate warrantyDate; + + /** + * 设备状态（0-闲置，1-使用中，2-维修中，3-报废） + */ + private String status; + + /** + * 负责人姓名 + */ + private String responsiblePerson; + + /** + * 联系电话（支持固定电话和手机号） + */ + private String contactPhone; + + /** + * 设备描述（详细说明） + */ + private String description; + + /** + * 图片 + */ + private String image; + + /** + * 附件 + */ + private String file; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceType.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceType.java new file mode 100644 index 00000000..52a490e8 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/DeviceType.java @@ -0,0 +1,61 @@ +package org.dromara.device.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 设备类型对象 device_type + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("device_type") +public class DeviceType extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 设备类型编码 + */ + private String typeCode; + + /** + * 设备类型名称 + */ + private String typeName; + + /** + * 父类型ID + */ + private Long parentId; + + /** + * 层级（1=顶级，2=二级，3=三级...，最大支持255级） + */ + private Integer level; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 设备类型描述 + */ + private String description; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceAccessRecordBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceAccessRecordBo.java new file mode 100644 index 00000000..c9369261 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceAccessRecordBo.java @@ -0,0 +1,82 @@ +package org.dromara.device.domain.bo; + +import org.dromara.device.domain.DeviceAccessRecord; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +import java.time.LocalDateTime; + +/** + * 设备进出场记录业务对象 device_access_record + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DeviceAccessRecord.class, reverseConvertGenerate = false) +public class DeviceAccessRecordBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 记录编号（唯一标识，如：RC-2024-0012） + */ + private String recordNo; + + /** + * 设备ID（关联设备表device的id） + */ + private Long deviceId; + + /** + * 设备名 + */ + private String deviceName; + + /** + * 状态（1-进场，2-出场，可扩展其他状态） + */ + private String status; + + /** + * 操作时间（记录发生的时间，如：2024-03-15 09:30:25） + */ + private LocalDateTime operateTime; + + /** + * 位置/目的地（如：A区-1号电站、B区仓库→A区电站） + */ + private String location; + + /** + * 操作人ID（关联用户表user的id） + */ + private Long operatorId; + + /** + * 操作人姓名（冗余存储，如：张三） + */ + private String operatorName; + + /** + * 原因（如：安装使用、设备调拨、入库存储） + */ + private String reason; + + /** + * 详细说明（查看详情时展示的补充信息，可选） + */ + private String details; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceInfoBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceInfoBo.java new file mode 100644 index 00000000..5c9cade1 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceInfoBo.java @@ -0,0 +1,104 @@ +package org.dromara.device.domain.bo; + +import org.dromara.device.domain.DeviceInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; + +import java.time.LocalDate; + +/** + * 设备信息业务对象 device_info + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DeviceInfo.class, reverseConvertGenerate = false) +public class DeviceInfoBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 项目Id + */ + private Long projectId; + + /** + * 设备编号 + */ + private String deviceCode; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 型号规格 + */ + private String modelSpec; + + /** + * 设备类型ID（关联设备类型表device_type的id） + */ + private Long typeId; + + /** + * 生产厂家 + */ + private String manufacturer; + + /** + * 出厂日期（yyyy-mm-dd） + */ + private LocalDate productionDate; + + /** + * 保修日期（yyyy-mm-dd） + */ + private LocalDate warrantyDate; + + /** + * 设备状态（0-闲置，1-使用中，2-维修中，3-报废） + */ + private String status; + + /** + * 负责人姓名 + */ + private String responsiblePerson; + + /** + * 联系电话（支持固定电话和手机号） + */ + private String contactPhone; + + /** + * 设备描述（详细说明） + */ + private String description; + + /** + * 图片 + */ + private String image; + + /** + * 附件 + */ + private String file; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceTypeBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceTypeBo.java new file mode 100644 index 00000000..a006f7fa --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceTypeBo.java @@ -0,0 +1,53 @@ +package org.dromara.device.domain.bo; + +import org.dromara.device.domain.DeviceType; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 设备类型业务对象 device_type + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DeviceType.class, reverseConvertGenerate = false) +public class DeviceTypeBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + private String typeCode; + + /** + * 设备类型名称 + */ + @NotBlank(message = "设备类型名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String typeName; + + /** + * 父类型ID + */ + private Long parentId; + + /** + * 层级（1=顶级，2=二级，3=三级...，最大支持255级） + */ + private Integer level; + + /** + * 设备类型描述 + */ + private String description; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceAccessRecordVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceAccessRecordVo.java new file mode 100644 index 00000000..b9639b15 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceAccessRecordVo.java @@ -0,0 +1,99 @@ +package org.dromara.device.domain.vo; + +import org.dromara.device.domain.DeviceAccessRecord; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Date; + + + +/** + * 设备进出场记录视图对象 device_access_record + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DeviceAccessRecord.class) +public class DeviceAccessRecordVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 记录编号（唯一标识，如：RC-2024-0012） + */ + @ExcelProperty(value = "记录编号", converter = ExcelDictConvert.class) + private String recordNo; + + /** + * 设备ID（关联设备表device的id） + */ + @ExcelProperty(value = "设备ID", converter = ExcelDictConvert.class) + private Long deviceId; + + /** + * 设备名 + */ + @ExcelProperty(value = "设备名") + private String deviceName; + + /** + * 状态（1-进场，2-出场，可扩展其他状态） + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + private String status; + + /** + * 操作时间（记录发生的时间，如：2024-03-15 09:30:25） + */ + @ExcelProperty(value = "操作时间", converter = ExcelDictConvert.class) + private LocalDateTime operateTime; + + /** + * 位置/目的地（如：A区-1号电站、B区仓库→A区电站） + */ + @ExcelProperty(value = "位置/目的地", converter = ExcelDictConvert.class) + private String location; + + /** + * 操作人ID（关联用户表user的id） + */ + @ExcelProperty(value = "操作人ID", converter = ExcelDictConvert.class) + private Long operatorId; + + /** + * 操作人姓名（冗余存储，如：张三） + */ + @ExcelProperty(value = "操作人姓名", converter = ExcelDictConvert.class) + private String operatorName; + + /** + * 原因（如：安装使用、设备调拨、入库存储） + */ + @ExcelProperty(value = "原因", converter = ExcelDictConvert.class) + private String reason; + + /** + * 详细说明（查看详情时展示的补充信息，可选） + */ + @ExcelProperty(value = "详细说明", converter = ExcelDictConvert.class) + private String details; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoCountVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoCountVo.java new file mode 100644 index 00000000..44a2840e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoCountVo.java @@ -0,0 +1,23 @@ +package org.dromara.device.domain.vo; + +import lombok.Data; + +@Data +public class DeviceInfoCountVo { + /** + * 总数 + */ + private Integer total; + /** + * 使用 + */ + private Integer use; + /** + * 维护 + */ + private Integer maintain; + /** + * 闲置 + */ + private Integer idle; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoVo.java new file mode 100644 index 00000000..6c4d9f08 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoVo.java @@ -0,0 +1,138 @@ +package org.dromara.device.domain.vo; + +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.device.domain.DeviceInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDate; +import java.util.Date; + + + +/** + * 设备信息视图对象 device_info + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DeviceInfo.class) +public class DeviceInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 项目Id + */ + @ExcelProperty(value = "项目Id") + private Long projectId; + + /** + * 设备编号 + */ + @ExcelProperty(value = "设备编号") + private String deviceCode; + + /** + * 设备名称 + */ + @ExcelProperty(value = "设备名称") + private String deviceName; + + /** + * 型号规格 + */ + @ExcelProperty(value = "型号规格") + private String modelSpec; + + /** + * 设备类型ID（关联设备类型表device_type的id） + */ + @ExcelProperty(value = "设备类型ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联设备类型表device_type的id") + private Long typeId; + + private String typeName; + + /** + * 生产厂家 + */ + @ExcelProperty(value = "生产厂家") + private String manufacturer; + + /** + * 出厂日期（yyyy-mm-dd） + */ + @ExcelProperty(value = "出厂日期", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "y=yyy-mm-dd") + private LocalDate productionDate; + + /** + * 保修日期（yyyy-mm-dd） + */ + @ExcelProperty(value = "保修日期", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "y=yyy-mm-dd") + private LocalDate warrantyDate; + + /** + * 设备状态（0-闲置，1-使用中，2-维修中，3-报废） + */ + @ExcelProperty(value = "设备状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=-闲置，1-使用中，2-维修中，3-报废") + private String status; + + /** + * 负责人姓名 + */ + @ExcelProperty(value = "负责人姓名") + private String responsiblePerson; + + /** + * 联系电话（支持固定电话和手机号） + */ + @ExcelProperty(value = "联系电话", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "支=持固定电话和手机号") + private String contactPhone; + + /** + * 设备描述（详细说明） + */ + @ExcelProperty(value = "设备描述", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "详=细说明") + private String description; + + /** + * 图片 + */ + @ExcelProperty(value = "图片") + private String image; + + /** + * 图片Url + */ + @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "image") + private String imageUrl; + /** + * 附件 + */ + @ExcelProperty(value = "附件") + private String file; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceTypeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceTypeVo.java new file mode 100644 index 00000000..b7c477ba --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceTypeVo.java @@ -0,0 +1,78 @@ +package org.dromara.device.domain.vo; + +import org.dromara.device.domain.DeviceType; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 设备类型视图对象 device_type + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DeviceType.class) +public class DeviceTypeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 设备类型编码 + */ + @ExcelProperty(value = "设备类型编码") + private String typeCode; + + /** + * 设备类型名称 + */ + @ExcelProperty(value = "设备类型名称") + private String typeName; + + /** + * 父类型ID + */ + @ExcelProperty(value = "父类型ID") + private Long parentId; + + /** + * 层级（1=顶级，2=二级，3=三级...，最大支持255级） + */ + @ExcelProperty(value = "层级", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1==顶级，2=二级，3=三级...，最大支持255级") + private Integer level; + + /** + * 祖级列表 + */ + @ExcelProperty(value = "祖级列表") + private String ancestors; + + /** + * 设备类型描述 + */ + @ExcelProperty(value = "设备类型描述") + private String description; + + + private List children; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceAccessRecordMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceAccessRecordMapper.java new file mode 100644 index 00000000..e8b8ccf2 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceAccessRecordMapper.java @@ -0,0 +1,15 @@ +package org.dromara.device.mapper; + +import org.dromara.device.domain.DeviceAccessRecord; +import org.dromara.device.domain.vo.DeviceAccessRecordVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备进出场记录Mapper接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface DeviceAccessRecordMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceInfoMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceInfoMapper.java new file mode 100644 index 00000000..bea69563 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.device.mapper; + +import org.dromara.device.domain.DeviceInfo; +import org.dromara.device.domain.vo.DeviceInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备信息Mapper接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface DeviceInfoMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceTypeMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceTypeMapper.java new file mode 100644 index 00000000..12791784 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/mapper/DeviceTypeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.device.mapper; + +import org.dromara.device.domain.DeviceType; +import org.dromara.device.domain.vo.DeviceTypeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 设备类型Mapper接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface DeviceTypeMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceAccessRecordService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceAccessRecordService.java new file mode 100644 index 00000000..fe3b8862 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceAccessRecordService.java @@ -0,0 +1,70 @@ +package org.dromara.device.service; + +import org.dromara.device.domain.vo.DeviceAccessRecordVo; +import org.dromara.device.domain.bo.DeviceAccessRecordBo; +import org.dromara.device.domain.DeviceAccessRecord; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 设备进出场记录Service接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface IDeviceAccessRecordService extends IService{ + + /** + * 查询设备进出场记录 + * + * @param id 主键 + * @return 设备进出场记录 + */ + DeviceAccessRecordVo queryById(Long id); + + /** + * 分页查询设备进出场记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备进出场记录分页列表 + */ + TableDataInfo queryPageList(DeviceAccessRecordBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备进出场记录列表 + * + * @param bo 查询条件 + * @return 设备进出场记录列表 + */ + List queryList(DeviceAccessRecordBo bo); + + /** + * 新增设备进出场记录 + * + * @param bo 设备进出场记录 + * @return 是否新增成功 + */ + Boolean insertByBo(DeviceAccessRecordBo bo); + + /** + * 修改设备进出场记录 + * + * @param bo 设备进出场记录 + * @return 是否修改成功 + */ + Boolean updateByBo(DeviceAccessRecordBo bo); + + /** + * 校验并批量删除设备进出场记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceInfoService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceInfoService.java new file mode 100644 index 00000000..4b694d23 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceInfoService.java @@ -0,0 +1,85 @@ +package org.dromara.device.service; + +import org.dromara.device.domain.vo.DeviceInfoCountVo; +import org.dromara.device.domain.vo.DeviceInfoVo; +import org.dromara.device.domain.bo.DeviceInfoBo; +import org.dromara.device.domain.DeviceInfo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 设备信息Service接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface IDeviceInfoService extends IService{ + + /** + * 查询设备信息 + * + * @param id 主键 + * @return 设备信息 + */ + DeviceInfoVo queryById(Long id); + + /** + * 分页查询设备信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备信息分页列表 + */ + TableDataInfo queryPageList(DeviceInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备信息列表 + * + * @param bo 查询条件 + * @return 设备信息列表 + */ + List queryList(DeviceInfoBo bo); + + /** + * 新增设备信息 + * + * @param bo 设备信息 + * @return 是否新增成功 + */ + Boolean insertByBo(DeviceInfoBo bo); + + /** + * 修改设备信息 + * + * @param bo 设备信息 + * @return 是否修改成功 + */ + Boolean updateByBo(DeviceInfoBo bo); + + /** + * 校验并批量删除设备信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 设备数量统计 + */ + DeviceInfoCountVo count(Long projectId); + + /** + * 设备类型统计 + */ + Map typeCount(Long projectId); + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceTypeService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceTypeService.java new file mode 100644 index 00000000..e5f805b4 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceTypeService.java @@ -0,0 +1,70 @@ +package org.dromara.device.service; + +import org.dromara.device.domain.vo.DeviceTypeVo; +import org.dromara.device.domain.bo.DeviceTypeBo; +import org.dromara.device.domain.DeviceType; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 设备类型Service接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface IDeviceTypeService extends IService{ + + /** + * 查询设备类型 + * + * @param id 主键 + * @return 设备类型 + */ + DeviceTypeVo queryById(Long id); + + /** + * 分页查询设备类型列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备类型分页列表 + */ + TableDataInfo queryPageList(DeviceTypeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的设备类型列表 + * + * @param bo 查询条件 + * @return 设备类型列表 + */ + List queryList(DeviceTypeBo bo); + + /** + * 新增设备类型 + * + * @param bo 设备类型 + * @return 是否新增成功 + */ + Boolean insertByBo(DeviceTypeBo bo); + + /** + * 修改设备类型 + * + * @param bo 设备类型 + * @return 是否修改成功 + */ + Boolean updateByBo(DeviceTypeBo bo); + + /** + * 校验并批量删除设备类型信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceAccessRecordServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceAccessRecordServiceImpl.java new file mode 100644 index 00000000..ee4297b5 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceAccessRecordServiceImpl.java @@ -0,0 +1,140 @@ +package org.dromara.device.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.device.domain.bo.DeviceAccessRecordBo; +import org.dromara.device.domain.vo.DeviceAccessRecordVo; +import org.dromara.device.domain.DeviceAccessRecord; +import org.dromara.device.mapper.DeviceAccessRecordMapper; +import org.dromara.device.service.IDeviceAccessRecordService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备进出场记录Service业务层处理 + * + * @author Lion Li + * @date 2025-12-01 + */ +@RequiredArgsConstructor +@Service +public class DeviceAccessRecordServiceImpl extends ServiceImpl implements IDeviceAccessRecordService { + + private final DeviceAccessRecordMapper baseMapper; + + /** + * 查询设备进出场记录 + * + * @param id 主键 + * @return 设备进出场记录 + */ + @Override + public DeviceAccessRecordVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询设备进出场记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备进出场记录分页列表 + */ + @Override + public TableDataInfo queryPageList(DeviceAccessRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设备进出场记录列表 + * + * @param bo 查询条件 + * @return 设备进出场记录列表 + */ + @Override + public List queryList(DeviceAccessRecordBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(DeviceAccessRecordBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(DeviceAccessRecord::getId); + lqw.eq(StringUtils.isNotBlank(bo.getRecordNo()), DeviceAccessRecord::getRecordNo, bo.getRecordNo()); + lqw.eq(bo.getDeviceId() != null, DeviceAccessRecord::getDeviceId, bo.getDeviceId()); + lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), DeviceAccessRecord::getDeviceName, bo.getDeviceName()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), DeviceAccessRecord::getStatus, bo.getStatus()); + lqw.eq(bo.getOperateTime() != null, DeviceAccessRecord::getOperateTime, bo.getOperateTime()); + lqw.eq(StringUtils.isNotBlank(bo.getLocation()), DeviceAccessRecord::getLocation, bo.getLocation()); + lqw.eq(bo.getOperatorId() != null, DeviceAccessRecord::getOperatorId, bo.getOperatorId()); + lqw.like(StringUtils.isNotBlank(bo.getOperatorName()), DeviceAccessRecord::getOperatorName, bo.getOperatorName()); + lqw.eq(StringUtils.isNotBlank(bo.getReason()), DeviceAccessRecord::getReason, bo.getReason()); + lqw.eq(StringUtils.isNotBlank(bo.getDetails()), DeviceAccessRecord::getDetails, bo.getDetails()); + return lqw; + } + + /** + * 新增设备进出场记录 + * + * @param bo 设备进出场记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DeviceAccessRecordBo bo) { + DeviceAccessRecord add = MapstructUtils.convert(bo, DeviceAccessRecord.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改设备进出场记录 + * + * @param bo 设备进出场记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DeviceAccessRecordBo bo) { + DeviceAccessRecord update = MapstructUtils.convert(bo, DeviceAccessRecord.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DeviceAccessRecord entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除设备进出场记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java new file mode 100644 index 00000000..f95725bd --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java @@ -0,0 +1,197 @@ +package org.dromara.device.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.device.domain.DeviceType; +import org.dromara.device.domain.vo.DeviceInfoCountVo; +import org.dromara.device.service.IDeviceTypeService; +import org.springframework.stereotype.Service; +import org.dromara.device.domain.bo.DeviceInfoBo; +import org.dromara.device.domain.vo.DeviceInfoVo; +import org.dromara.device.domain.DeviceInfo; +import org.dromara.device.mapper.DeviceInfoMapper; +import org.dromara.device.service.IDeviceInfoService; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * 设备信息Service业务层处理 + * + * @author Lion Li + * @date 2025-12-01 + */ +@RequiredArgsConstructor +@Service +public class DeviceInfoServiceImpl extends ServiceImpl implements IDeviceInfoService { + + private final DeviceInfoMapper baseMapper; + + private final IDeviceTypeService deviceTypeService; + + /** + * 查询设备信息 + * + * @param id 主键 + * @return 设备信息 + */ + @Override + public DeviceInfoVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询设备信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备信息分页列表 + */ + @Override + public TableDataInfo queryPageList(DeviceInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List records = result.getRecords(); + Set collect = records.stream().map(DeviceInfoVo::getTypeId).collect(Collectors.toSet()); + if(CollectionUtil.isEmpty(collect)){ + return TableDataInfo.build(result); + } + List deviceTypes = deviceTypeService.listByIds(collect); + Map deviceTypeMap = deviceTypes.stream().collect(Collectors.toMap(DeviceType::getId, DeviceType::getTypeName)); + result.getRecords().forEach(deviceInfoVo -> { + deviceInfoVo.setTypeName(deviceTypeMap.get(deviceInfoVo.getTypeId())); + }); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设备信息列表 + * + * @param bo 查询条件 + * @return 设备信息列表 + */ + @Override + public List queryList(DeviceInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(DeviceInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(DeviceInfo::getId); + lqw.eq(bo.getProjectId() != null, DeviceInfo::getProjectId, bo.getProjectId()); + lqw.eq(StringUtils.isNotBlank(bo.getDeviceCode()), DeviceInfo::getDeviceCode, bo.getDeviceCode()); + lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), DeviceInfo::getDeviceName, bo.getDeviceName()); + lqw.eq(StringUtils.isNotBlank(bo.getModelSpec()), DeviceInfo::getModelSpec, bo.getModelSpec()); + lqw.eq(bo.getTypeId() != null, DeviceInfo::getTypeId, bo.getTypeId()); + lqw.eq(StringUtils.isNotBlank(bo.getManufacturer()), DeviceInfo::getManufacturer, bo.getManufacturer()); + lqw.eq(bo.getProductionDate() != null, DeviceInfo::getProductionDate, bo.getProductionDate()); + lqw.eq(bo.getWarrantyDate() != null, DeviceInfo::getWarrantyDate, bo.getWarrantyDate()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), DeviceInfo::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getResponsiblePerson()), DeviceInfo::getResponsiblePerson, bo.getResponsiblePerson()); + lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), DeviceInfo::getContactPhone, bo.getContactPhone()); + lqw.eq(StringUtils.isNotBlank(bo.getDescription()), DeviceInfo::getDescription, bo.getDescription()); + lqw.eq(StringUtils.isNotBlank(bo.getImage()), DeviceInfo::getImage, bo.getImage()); + lqw.eq(StringUtils.isNotBlank(bo.getFile()), DeviceInfo::getFile, bo.getFile()); + return lqw; + } + + /** + * 新增设备信息 + * + * @param bo 设备信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DeviceInfoBo bo) { + DeviceInfo add = MapstructUtils.convert(bo, DeviceInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改设备信息 + * + * @param bo 设备信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DeviceInfoBo bo) { + DeviceInfo update = MapstructUtils.convert(bo, DeviceInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DeviceInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除设备信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + + @Override + public DeviceInfoCountVo count(Long projectId) { + List list = this.lambdaQuery().eq(DeviceInfo::getProjectId, projectId).list(); + DeviceInfoCountVo countVo = new DeviceInfoCountVo(); + countVo.setTotal(list.size()); + countVo.setUse((int)list.stream().filter(deviceInfo -> "1".equals(deviceInfo.getStatus())).count()); + countVo.setMaintain((int)list.stream().filter(deviceInfo -> "2".equals(deviceInfo.getStatus())).count()); + countVo.setIdle((int)list.stream().filter(deviceInfo -> "0".equals(deviceInfo.getStatus())).count()); + + return countVo; + } + + @Override + public Map typeCount(Long projectId) { + Map map = new LinkedHashMap<>(); + + List list = this.lambdaQuery().eq(DeviceInfo::getProjectId, projectId).list(); + Set collect = list.stream().map(DeviceInfo::getTypeId).collect(Collectors.toSet()); + List deviceTypes; + if(CollectionUtil.isEmpty(collect)){ + deviceTypes = new ArrayList<>(); + }else{ + deviceTypes = deviceTypeService.listByIds(collect); + } + List list1 = deviceTypeService.lambdaQuery().eq(DeviceType::getParentId, 0L).list(); + for (DeviceType deviceType : list1) { + Long id = deviceType.getId(); + long count = deviceTypes.stream() + .filter(vo -> vo.getAncestors().contains(StringUtils.SEPARATOR + id) ||vo.getId().equals(id)) + .count(); + map.put(deviceType.getTypeName(), (int)count); + } + + return map; + } + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java new file mode 100644 index 00000000..c30856a8 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java @@ -0,0 +1,161 @@ +package org.dromara.device.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.device.domain.DeviceInfo; +import org.dromara.device.service.IDeviceInfoService; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.dromara.device.domain.bo.DeviceTypeBo; +import org.dromara.device.domain.vo.DeviceTypeVo; +import org.dromara.device.domain.DeviceType; +import org.dromara.device.mapper.DeviceTypeMapper; +import org.dromara.device.service.IDeviceTypeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 设备类型Service业务层处理 + * + * @author Lion Li + * @date 2025-12-01 + */ +@RequiredArgsConstructor +@Service +public class DeviceTypeServiceImpl extends ServiceImpl implements IDeviceTypeService { + + private final DeviceTypeMapper baseMapper; + + @Resource + @Lazy + private IDeviceInfoService deviceInfoService; + + /** + * 查询设备类型 + * + * @param id 主键 + * @return 设备类型 + */ + @Override + public DeviceTypeVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询设备类型列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 设备类型分页列表 + */ + @Override + public TableDataInfo queryPageList(DeviceTypeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的设备类型列表 + * + * @param bo 查询条件 + * @return 设备类型列表 + */ + @Override + public List queryList(DeviceTypeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(DeviceTypeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(DeviceType::getId); + lqw.like(StringUtils.isNotBlank(bo.getTypeName()), DeviceType::getTypeName, bo.getTypeName()); + lqw.eq(bo.getParentId() != null, DeviceType::getParentId, bo.getParentId()); + lqw.eq(bo.getLevel() != null, DeviceType::getLevel, bo.getLevel()); + lqw.eq(StringUtils.isNotBlank(bo.getDescription()), DeviceType::getDescription, bo.getDescription()); + return lqw; + } + + /** + * 新增设备类型 + * + * @param bo 设备类型 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DeviceTypeBo bo) { + DeviceType add = MapstructUtils.convert(bo, DeviceType.class); + validEntityBeforeSave(add); + handleLevelAndAcestors(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改设备类型 + * + * @param bo 设备类型 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DeviceTypeBo bo) { + DeviceType update = MapstructUtils.convert(bo, DeviceType.class); + validEntityBeforeSave(update); + handleLevelAndAcestors(update); + return baseMapper.updateById(update) > 0; + } + + private void handleLevelAndAcestors(DeviceType deviceType) { + if(deviceType.getParentId() == 0L){ + deviceType.setAncestors("0"); + deviceType.setLevel(1); + }else { + DeviceType parent = baseMapper.selectById(deviceType.getParentId()); + deviceType.setAncestors(parent.getAncestors() + StringUtils.SEPARATOR + parent.getId()); + deviceType.setLevel(parent.getLevel() + 1); + } + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DeviceType entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除设备类型信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + List list = deviceInfoService.lambdaQuery().in(DeviceInfo::getTypeId, ids).list(); + if(CollectionUtil.isNotEmpty(list)){ + throw new ServiceException("请先删除该设备类型下的设备"); + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/device/DeviceAccessRecordMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/device/DeviceAccessRecordMapper.xml new file mode 100644 index 00000000..9e9926f4 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/device/DeviceAccessRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/device/DeviceInfoMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/device/DeviceInfoMapper.xml new file mode 100644 index 00000000..c9288975 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/device/DeviceInfoMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/device/DeviceTypeMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/device/DeviceTypeMapper.xml new file mode 100644 index 00000000..b80f47e9 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/device/DeviceTypeMapper.xml @@ -0,0 +1,7 @@ + + + + + From 40b51e5e9dff1d92c07fc734bd1dc969bb2d88d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Mon, 1 Dec 2025 19:28:10 +0800 Subject: [PATCH 07/16] =?UTF-8?q?12-01-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java index e342089c..a8567b7f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/spdj/service/impl/XzdSpykpSpdjServiceImpl.java @@ -118,6 +118,7 @@ public class XzdSpykpSpdjServiceImpl extends ServiceImpl Date: Mon, 1 Dec 2025 19:28:21 +0800 Subject: [PATCH 08/16] =?UTF-8?q?12-01-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/RydwWebSocketServer.java | 149 ++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/RydwWebSocketServer.java diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/RydwWebSocketServer.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/RydwWebSocketServer.java new file mode 100644 index 00000000..0bbbea60 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/RydwWebSocketServer.java @@ -0,0 +1,149 @@ +package org.dromara.websocket.websocket.service;// 路径：com.ruoyi.web.websocket.InitOnStartWebSocketServer + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import jakarta.websocket.*; +import jakarta.websocket.server.ServerEndpoint; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.service.impl.SubConstructionUserServiceImpl; +import org.dromara.gps.domain.GpsEquipmentSon; +import org.dromara.gps.service.impl.GpsEquipmentSonServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 项目启动即自动启动的 WebSocket 服务端 + * 端点路径：/websocket/init-on-start（可自定义） + */ +@Slf4j +@ServerEndpoint("/websocket/rydw") // 定义 WebSocket 端点路径 +@Component +public class RydwWebSocketServer { + + @Autowired + private SubConstructionUserServiceImpl subConstructionUserService; + @Autowired + private GpsEquipmentSonServiceImpl gpsEquipmentSonService; + + // 2. 静态会话存储（线程安全，项目启动时即初始化） + private static final Map ONLINE_SESSIONS = new ConcurrentHashMap<>(); + + + // 3. 静态代码块：项目启动时执行（初始化资源、打印启动日志） + static { + // 此处可添加启动时的初始化逻辑（如加载配置、连接外部资源等） + log.info("✅ WebSocket 服务端已随项目启动初始化！端点路径：/websocket/rydw"); + } + + /** + * 客户端连接时触发（无需手动启动，有客户端连接时自动调用） + */ + @OnOpen + public void onOpen(Session session) { + // 存储新会话 + ONLINE_SESSIONS.put(session.getId(), session); + log.info("📌 客户端连接成功！会话ID：{}，当前在线数：{}", session.getId(), ONLINE_SESSIONS.size()); + // 2. 异步获取并推送初始化数据（避免阻塞连接） + CompletableFuture.runAsync(() -> { + try { + //连接成功过后 获取当前项目下所有成员最新坐标 + Map> params = session.getRequestParameterMap(); + List subscriptionIds = params.get("projectId"); + if (subscriptionIds != null && !subscriptionIds.isEmpty()){ + //拿到所有人员 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SubConstructionUser::getProjectId, subscriptionIds.getFirst()); + List list = subConstructionUserService.list(queryWrapper); + //拿到所有人员最新坐标 + if (list != null && !list.isEmpty()){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + List gpsList = new ArrayList<>(); + for (SubConstructionUser constructionUser : list) { + lqw.clear(); + lqw.eq(GpsEquipmentSon::getUserId, constructionUser.getSysUserId()); + lqw.orderByDesc(GpsEquipmentSon::getCreateTime); + lqw.last("limit 1"); + GpsEquipmentSon one = gpsEquipmentSonService.getOne(lqw); + if (one != null){ + gpsList.add(one); + } + } + if (!gpsList.isEmpty()){ + WebSocketUtils.sendMessage(Long.valueOf(session.getId()), gpsList.toString()); + } + } + } + WebSocketUtils.sendMessage(Long.valueOf(session.getId()), "初始化数据为空"); + } catch (Exception e) { + log.error("会话[{}]初始化数据处理失败", session.getId(), e); + } + }); + } + + /** + * 接收客户端消息 + */ + @OnMessage + public void onMessage(String message, Session session) { + log.info("📥 收到会话[{}]消息：{}", session.getId(), message); + // 可选：回复客户端（示例） + try { + session.getBasicRemote().sendText("服务端已收到消息：" + message); + } catch (IOException e) { + log.error("📤 回复会话[{}]失败：{}", session.getId(), e.getMessage()); + } + } + + /** + * 客户端断开连接 + */ + @OnClose + public void onClose(Session session, CloseReason reason) { + ONLINE_SESSIONS.remove(session.getId()); + log.info("🔌 客户端断开连接！会话ID：{}，原因：{}，当前在线数：{}", + session.getId(), reason.getReasonPhrase(), ONLINE_SESSIONS.size()); + } + + /** + * 连接异常 + */ + @OnError + public void onError(Session session, Throwable error) { + log.error("⚠️ 会话[{}]异常：{}", session.getId(), error.getMessage(), error); + } + + // ------------------------------ 工具方法（可选，供其他服务调用） ------------------------------ + /** + * 向所有在线客户端发送消息（项目启动后，其他服务可直接调用） + */ + public static void sendToAll(String message) { + if (ONLINE_SESSIONS.isEmpty()) { + log.warn("⚠️ 无在线客户端，无需发送消息"); + return; + } + ONLINE_SESSIONS.values().forEach(session -> { + if (session.isOpen()) { + try { + session.getBasicRemote().sendText(message); + } catch (IOException e) { + log.error("📤 向会话[{}]发送消息失败：{}", session.getId(), e.getMessage()); + } + } + }); + } + + /** + * 获取当前在线数（供外部查询） + */ + public static int getOnlineCount() { + return ONLINE_SESSIONS.size(); + } +} From 6a06d8596d4f6c42aca6ce7d265ba11baacf9c3c Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Mon, 1 Dec 2025 19:49:40 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=84=8F=E8=A7=81=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../AppBusComplaintBoxController.java | 106 ++++++ .../domain/vo/AppDetailsOfTheOpinionVo.java | 16 + .../controller/BusComplaintBoxController.java | 109 ++++++ .../complaintBox/domain/BusComplaintBox.java | 91 +++++ .../domain/BusComplaintBoxDisposeLogging.java | 61 ++++ .../domain/BusComplaintBoxMessageLogging.java | 76 ++++ .../domain/bo/BusComplaintBoxBo.java | 90 +++++ .../bo/BusComplaintBoxDisposeLoggingBo.java | 60 ++++ .../bo/BusComplaintBoxMessageLoggingBo.java | 80 +++++ .../vo/BusComplaintBoxDisposeLoggingVo.java | 75 ++++ .../vo/BusComplaintBoxMessageLoggingVo.java | 99 ++++++ .../domain/vo/BusComplaintBoxVo.java | 125 +++++++ .../domain/vo/ComplaintBoxCountVo.java | 18 + .../domain/vo/DetailsOfTheOpinionVo.java | 14 + .../BusComplaintBoxDisposeLoggingMapper.java | 15 + .../mapper/BusComplaintBoxMapper.java | 26 ++ .../BusComplaintBoxMessageLoggingMapper.java | 15 + ...IBusComplaintBoxDisposeLoggingService.java | 70 ++++ ...IBusComplaintBoxMessageLoggingService.java | 84 +++++ .../service/IBusComplaintBoxService.java | 117 ++++++ ...ComplaintBoxDisposeLoggingServiceImpl.java | 136 +++++++ ...ComplaintBoxMessageLoggingServiceImpl.java | 217 ++++++++++++ .../impl/BusComplaintBoxServiceImpl.java | 333 ++++++++++++++++++ .../BusComplaintBoxDisposeLoggingMapper.xml | 7 + .../complaintBox/BusComplaintBoxMapper.xml | 82 +++++ .../BusComplaintBoxMessageLoggingMapper.xml | 7 + 27 files changed, 2130 insertions(+), 1 deletion(-) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/app/controller/AppBusComplaintBoxController.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/app/domain/vo/AppDetailsOfTheOpinionVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/controller/BusComplaintBoxController.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBox.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBoxDisposeLogging.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBoxMessageLogging.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxDisposeLoggingBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxMessageLoggingBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxDisposeLoggingVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxMessageLoggingVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/ComplaintBoxCountVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/DetailsOfTheOpinionVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxDisposeLoggingMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxMessageLoggingMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxDisposeLoggingService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxMessageLoggingService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxDisposeLoggingServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxMessageLoggingServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/complaintBox/BusComplaintBoxDisposeLoggingMapper.xml create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/complaintBox/BusComplaintBoxMapper.xml create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/complaintBox/BusComplaintBoxMessageLoggingMapper.xml diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml index 229ef4d1..8fd1f4c6 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml @@ -41,7 +41,7 @@ spring: api-key: sk-8d8df92fcbac4bd2922edba30b0bb8fa chat: options: - model: qwen-plus + model: qwen3-max datasource: type: com.zaxxer.hikari.HikariDataSource # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/app/controller/AppBusComplaintBoxController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/app/controller/AppBusComplaintBoxController.java new file mode 100644 index 00000000..de992609 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/app/controller/AppBusComplaintBoxController.java @@ -0,0 +1,106 @@ +package org.dromara.complaintBox.app.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.complaintBox.app.domain.vo.AppDetailsOfTheOpinionVo; +import org.dromara.complaintBox.domain.bo.BusComplaintBoxBo; +import org.dromara.complaintBox.domain.bo.BusComplaintBoxMessageLoggingBo; +import org.dromara.complaintBox.domain.vo.BusComplaintBoxVo; +import org.dromara.complaintBox.service.IBusComplaintBoxMessageLoggingService; +import org.dromara.complaintBox.service.IBusComplaintBoxService; +import org.springframework.context.annotation.Lazy; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** + * 意见箱 + * + * @author Lion Li + * @date 2025-11-29 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/app/complaintBox/complaintBox") +public class AppBusComplaintBoxController extends BaseController { + + @Lazy + private final IBusComplaintBoxService busComplaintBoxService; + @Lazy + private final IBusComplaintBoxMessageLoggingService busComplaintBoxMessageLoggingService; + + + /** + * 查询意见箱列表 + */ +// @SaCheckPermission("appComplaintBox:complaintBox:list") + @GetMapping("/list") + public TableDataInfo list(BusComplaintBoxBo bo, PageQuery pageQuery) { + LoginUser loginUser = LoginHelper.getLoginUser(); + if (loginUser != null) { + bo.setUserId(loginUser.getUserId()); + } + return busComplaintBoxService.appQueryPageList(bo, pageQuery); + } + + + + /** + * 获取意见箱详细信息 + * + * @param id 主键 + */ +// @SaCheckPermission("appComplaintBox:complaintBox:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(busComplaintBoxService.appQueryById(id)); + } + + /** + * 新增意见箱 + */ +// @SaCheckPermission("appComplaintBox:complaintBox:add") + @Log(title = "意见箱", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BusComplaintBoxBo bo) { + return toAjax(busComplaintBoxService.insertByBo(bo)); + } + + + /** + * 新增意见回复 + */ +// @SaCheckPermission("appComplaintBox:complaintBox:add") + @Log(title = "意见箱", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/postAReply") + public R postAReply(@Validated(AddGroup.class) @RequestBody BusComplaintBoxMessageLoggingBo bo) { + return toAjax(busComplaintBoxMessageLoggingService.insertAppByBo(bo)); + } + + /** + * 修改意见阅读状态 + */ +// @SaCheckPermission("appComplaintBox:complaintBox:edit") + @Log(title = "意见箱", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/editCheckStatus") + public R editCheckStatus(@Validated(EditGroup.class) @RequestBody BusComplaintBoxBo bo) { + return toAjax(busComplaintBoxService.editCheckStatus(bo)); + } + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/app/domain/vo/AppDetailsOfTheOpinionVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/app/domain/vo/AppDetailsOfTheOpinionVo.java new file mode 100644 index 00000000..72e47704 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/app/domain/vo/AppDetailsOfTheOpinionVo.java @@ -0,0 +1,16 @@ +package org.dromara.complaintBox.app.domain.vo; + +import lombok.Data; +import org.dromara.complaintBox.domain.vo.BusComplaintBoxMessageLoggingVo; +import org.dromara.complaintBox.domain.vo.BusComplaintBoxVo; + +import java.io.Serializable; +import java.util.List; + +@Data +public class AppDetailsOfTheOpinionVo implements Serializable { + + private BusComplaintBoxVo busComplaintBoxVo; + + private List messageLoggingVos; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/controller/BusComplaintBoxController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/controller/BusComplaintBoxController.java new file mode 100644 index 00000000..2fef047d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/controller/BusComplaintBoxController.java @@ -0,0 +1,109 @@ +package org.dromara.complaintBox.controller; + +import lombok.RequiredArgsConstructor; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.complaintBox.domain.bo.BusComplaintBoxMessageLoggingBo; +import org.dromara.complaintBox.domain.vo.ComplaintBoxCountVo; +import org.dromara.complaintBox.domain.vo.DetailsOfTheOpinionVo; +import org.dromara.complaintBox.service.IBusComplaintBoxMessageLoggingService; +import org.springframework.context.annotation.Lazy; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.complaintBox.domain.vo.BusComplaintBoxVo; +import org.dromara.complaintBox.domain.bo.BusComplaintBoxBo; +import org.dromara.complaintBox.service.IBusComplaintBoxService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +import java.util.List; + +/** + * 意见箱 + * + * @author Lion Li + * @date 2025-11-29 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/complaintBox/complaintBox") +public class BusComplaintBoxController extends BaseController { + + @Lazy + private final IBusComplaintBoxService busComplaintBoxService; + @Lazy + private final IBusComplaintBoxMessageLoggingService busComplaintBoxMessageLoggingService; + + + /** + * 查询意见箱列表 + */ +// @SaCheckPermission("complaintBox:complaintBox:list") + @GetMapping("/list") + public TableDataInfo list(BusComplaintBoxBo bo, PageQuery pageQuery) { + return busComplaintBoxService.queryPageList(bo, pageQuery); + } + /** + * web获取各个处理状态数量 + */ +// @SaCheckPermission("complaintBox:complaintBox:list") + @GetMapping("/getCount") + public R> getCount(BusComplaintBoxBo bo) { + return R.ok(busComplaintBoxService.getCount(bo)); + } + + /** + * 获取意见箱详细信息 + * + * @param id 主键 + */ +// @SaCheckPermission("complaintBox:complaintBox:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(busComplaintBoxService.getInfo(id)); + } + + /** + * 新增意见回复 + */ +// @SaCheckPermission("complaintBox:complaintBox:add") + @Log(title = "意见箱", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/postAReply") + public R postAReply(@Validated(AddGroup.class) @RequestBody BusComplaintBoxMessageLoggingBo bo) { + return toAjax(busComplaintBoxMessageLoggingService.insertWebByBo(bo)); + } + + + /** + * 修改意见阅读状态 + */ +// @SaCheckPermission("complaintBox:complaintBox:edit") + @Log(title = "意见箱", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/editCheckStatus") + public R editCheckStatus(@Validated(EditGroup.class) @RequestBody BusComplaintBoxBo bo) { + return toAjax(busComplaintBoxService.editCheckStatus(bo)); + } + + /** + * 修改意见阅读状态 + */ +// @SaCheckPermission("complaintBox:complaintBox:edit") + @Log(title = "意见箱", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/editStatus") + public R editStatus(@Validated(EditGroup.class) @RequestBody BusComplaintBoxBo bo) { + return toAjax(busComplaintBoxService.editStatus(bo)); + } + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBox.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBox.java new file mode 100644 index 00000000..e1f417c9 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBox.java @@ -0,0 +1,91 @@ +package org.dromara.complaintBox.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 意见箱对象 bus_complaint_box + * + * @author Lion Li + * @date 2025-11-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("bus_complaint_box") +public class BusComplaintBox extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 公司id（当前登录人的顶层下一级部门id） + */ + private Long companyId; + + /** + * 项目id + */ + private Long projectId; + + /** + * 用户id + */ + private Long userId; + + /** + * 用户名 + */ + private String userName; + + /** + * 头像地址 + */ + private Long avatar; + + /** + * 标题 + */ + private String title; + + /** + * 意见类型（1、功能建议，2、Bug反馈，3、体验问题，4其他意见） + */ + private String opinionType; + + /** + * 详细描述 + */ + private String detail; + + /** + * 上传图片（id，id之间使用','分割） + */ + private String fileId; + + /** + * 是否匿名提交（0、否，1、是） + */ + private String isCryptonym; + + /** + * 处理状态（0、待处理，5、处理中，9、已解决，10、退回，14、关闭） + */ + private String status; + + /** + * 当前处理人id + */ + private Long currentDisposeUserId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBoxDisposeLogging.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBoxDisposeLogging.java new file mode 100644 index 00000000..8a874e68 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBoxDisposeLogging.java @@ -0,0 +1,61 @@ +package org.dromara.complaintBox.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 意见箱-意见处理记录对象 bus_complaint_box_dispose_logging + * + * @author Lion Li + * @date 2025-11-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("bus_complaint_box_dispose_logging") +public class BusComplaintBoxDisposeLogging extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 意见id + */ + private Long complaintId; + + /** + * 用户id + */ + private Long userId; + + /** + * 用户名 + */ + private String userName; + + /** + * 头像地址 + */ + private Long avatar; + + /** + * 是否退回（0、否，1、是） + */ + private String isRefund; + + /** + * 退回原因 + */ + private String cause; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBoxMessageLogging.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBoxMessageLogging.java new file mode 100644 index 00000000..9ccaf50a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/BusComplaintBoxMessageLogging.java @@ -0,0 +1,76 @@ +package org.dromara.complaintBox.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 意见箱-意见沟通记录对象 bus_complaint_box_message_logging + * + * @author Lion Li + * @date 2025-11-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("bus_complaint_box_message_logging") +public class BusComplaintBoxMessageLogging extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 意见id + */ + private Long complaintId; + + /** + * 回复用户id + */ + private Long replyUserId; + + /** + * 回复用户名 + */ + private String replyUserName; + + /** + * 回复用户头像地址 + */ + private Long replyAvatar; + + /** + * 被回复用户id + */ + private Long repliedUserId; + + /** + * 被回复用户名 + */ + private String repliedUserName; + + /** + * 被回复用户头像地址 + */ + private Long repliedAvatar; + + /** + * 消息内容 + */ + private String details; + + /** + * 处理状态（0、未读，1、已读） + */ + private String status; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxBo.java new file mode 100644 index 00000000..2fc8c293 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxBo.java @@ -0,0 +1,90 @@ +package org.dromara.complaintBox.domain.bo; + +import org.dromara.complaintBox.domain.BusComplaintBox; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 意见箱业务对象 bus_complaint_box + * + * @author Lion Li + * @date 2025-11-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BusComplaintBox.class, reverseConvertGenerate = false) +public class BusComplaintBoxBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 公司id（当前登录人的顶层下一级部门id） + */ + private Long companyId; + + /** + * 项目id + */ + private Long projectId; + + /** + * 用户id + */ + @NotNull(message = "主键ID不能为空", groups = { AddGroup.class }) + private Long userId; + /** + * 当前处理人id + */ + private Long currentDisposeUserId; + + /** + * 用户名 + */ + private String userName; + + /** + * 头像地址 + */ + private Long avatar; + + /** + * 标题 + */ + private String title; + + /** + * 意见类型（1、功能建议，2、Bug反馈，3、体验问题，4其他意见） + */ + private String opinionType; + + /** + * 详细描述 + */ + private String detail; + + /** + * 上传图片（id，id之间使用','分割） + */ + private String fileId; + + /** + * 是否匿名提交（0、否，1、是） + */ + private String isCryptonym; + + /** + * 处理状态（0、待处理，5、处理中，9、已解决，14、关闭） + */ + private String status; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxDisposeLoggingBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxDisposeLoggingBo.java new file mode 100644 index 00000000..a8b74939 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxDisposeLoggingBo.java @@ -0,0 +1,60 @@ +package org.dromara.complaintBox.domain.bo; + +import org.dromara.complaintBox.domain.BusComplaintBoxDisposeLogging; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 意见箱-意见处理记录业务对象 bus_complaint_box_dispose_logging + * + * @author Lion Li + * @date 2025-11-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BusComplaintBoxDisposeLogging.class, reverseConvertGenerate = false) +public class BusComplaintBoxDisposeLoggingBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 意见id + */ + private Long complaintId; + + /** + * 用户id + */ + private Long userId; + + /** + * 用户名 + */ + private String userName; + + /** + * 头像地址 + */ + private Long avatar; + + /** + * 是否退回（0、否，1、是） + */ + private String isRefund; + + /** + * 退回原因 + */ + private String cause; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxMessageLoggingBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxMessageLoggingBo.java new file mode 100644 index 00000000..1da3700c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/bo/BusComplaintBoxMessageLoggingBo.java @@ -0,0 +1,80 @@ +package org.dromara.complaintBox.domain.bo; + +import org.dromara.complaintBox.domain.BusComplaintBoxMessageLogging; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 意见箱-意见沟通记录业务对象 bus_complaint_box_message_logging + * + * @author Lion Li + * @date 2025-11-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BusComplaintBoxMessageLogging.class, reverseConvertGenerate = false) +public class BusComplaintBoxMessageLoggingBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 意见id + */ + private Long complaintId; + + /** + * 回复用户id + */ + private Long replyUserId; + + /** + * 回复用户名 + */ + private String replyUserName; + + /** + * 回复用户头像地址 + */ + private Long replyAvatar; + + /** + * 被回复用户id + */ + private Long repliedUserId; + + /** + * 被回复用户名 + */ + private String repliedUserName; + + /** + * 被回复用户头像地址 + */ + private Long repliedAvatar; + + /** + * 消息内容 + */ + private String details; + + /** + * 处理状态（0、未读，1、已读） + */ + private String status; + + /** + * 上一条沟通记录id + */ + private Long oldId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxDisposeLoggingVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxDisposeLoggingVo.java new file mode 100644 index 00000000..fdb1e92c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxDisposeLoggingVo.java @@ -0,0 +1,75 @@ +package org.dromara.complaintBox.domain.vo; + +import org.dromara.complaintBox.domain.BusComplaintBoxDisposeLogging; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 意见箱-意见处理记录视图对象 bus_complaint_box_dispose_logging + * + * @author Lion Li + * @date 2025-11-29 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BusComplaintBoxDisposeLogging.class) +public class BusComplaintBoxDisposeLoggingVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 意见id + */ + @ExcelProperty(value = "意见id") + private Long complaintId; + + /** + * 用户id + */ + @ExcelProperty(value = "用户id") + private Long userId; + + /** + * 用户名 + */ + @ExcelProperty(value = "用户名") + private String userName; + + /** + * 头像地址 + */ + @ExcelProperty(value = "头像地址") + private Long avatar; + + /** + * 是否退回（0、否，1、是） + */ + @ExcelProperty(value = "是否退回", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=、否，1、是") + private String isRefund; + + /** + * 退回原因 + */ + @ExcelProperty(value = "退回原因") + private String cause; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxMessageLoggingVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxMessageLoggingVo.java new file mode 100644 index 00000000..d4fbea39 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxMessageLoggingVo.java @@ -0,0 +1,99 @@ +package org.dromara.complaintBox.domain.vo; + +import org.dromara.complaintBox.domain.BusComplaintBoxMessageLogging; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 意见箱-意见沟通记录视图对象 bus_complaint_box_message_logging + * + * @author Lion Li + * @date 2025-11-29 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BusComplaintBoxMessageLogging.class) +public class BusComplaintBoxMessageLoggingVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 意见id + */ + @ExcelProperty(value = "意见id") + private Long complaintId; + + /** + * 回复用户id + */ + private Long replyUserId; + + /** + * 回复用户名 + */ + private String replyUserName; + + /** + * 回复用户头像地址 + */ + private Long replyAvatar; + private String replyAvatarUrl; + + /** + * 被回复用户id + */ + private Long repliedUserId; + + /** + * 被回复用户名 + */ + private String repliedUserName; + + /** + * 被回复用户头像地址 + */ + private Long repliedAvatar; + private String repliedAvatarUrl; + + /** + * 消息内容 + */ + @ExcelProperty(value = "消息内容") + private String details; + + /** + * 处理状态（0、未读，1、已读） + */ + @ExcelProperty(value = "处理状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=、未读，1、已读") + private String status; + + /** + * 发起人类型（0、发起人，1、处理人） + */ + private Integer type; + + /** + * 创建时间 + */ + private Date createTime; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxVo.java new file mode 100644 index 00000000..a344d742 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/BusComplaintBoxVo.java @@ -0,0 +1,125 @@ +package org.dromara.complaintBox.domain.vo; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.complaintBox.domain.BusComplaintBox; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 意见箱视图对象 bus_complaint_box + * + * @author Lion Li + * @date 2025-11-29 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BusComplaintBox.class) +public class BusComplaintBoxVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 公司id（当前登录人的顶层下一级部门id） + */ + @ExcelProperty(value = "公司id", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "当=前登录人的顶层下一级部门id") + private Long companyId; + + /** + * 项目id + */ + @ExcelProperty(value = "项目id") + private Long projectId; + + /** + * 用户id + */ + @ExcelProperty(value = "用户id") + private Long userId; + + /** + * 用户名 + */ + @ExcelProperty(value = "用户名") + private String userName; + + /** + * 头像地址 + */ + @ExcelProperty(value = "头像地址") + private Long avatar; + private String avatarUrl; + + /** + * 标题 + */ + @ExcelProperty(value = "标题") + private String title; + + /** + * 意见类型（1、功能建议，2、Bug反馈，3、体验问题，4其他意见） + */ + @ExcelProperty(value = "意见类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=、功能建议，2、Bug反馈，3、体验问题，4其他意见") + private String opinionType; + + /** + * 详细描述 + */ + @ExcelProperty(value = "详细描述") + private String detail; + + /** + * 上传图片（id，id之间使用','分割） + */ + @ExcelProperty(value = "上传图片", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "i=d，id之间使用','分割") + private String fileId; + private List fileUrls; + + /** + * 是否匿名提交（0、否，1、是） + */ + @ExcelProperty(value = "是否匿名提交", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=、否，1、是") + private String isCryptonym; + + /** + * 处理状态（0、待处理，5、处理中，9、已解决，14、关闭） + */ + @ExcelProperty(value = "处理状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=、待处理，5、处理中，9、已解决，14、关闭") + private String status; + + /** + * 当前处理人id + */ + private Long currentDisposeUserId; + + private Integer count; + + /** + * 创建时间 + */ + private Date createTime; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/ComplaintBoxCountVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/ComplaintBoxCountVo.java new file mode 100644 index 00000000..646e0b70 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/ComplaintBoxCountVo.java @@ -0,0 +1,18 @@ +package org.dromara.complaintBox.domain.vo; + +import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; + +import java.io.Serializable; + +@Data +public class ComplaintBoxCountVo implements Serializable { + + private String type; + +// @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "type",other = "opinion_processing_status") + private String typeName; + + private Integer count; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/DetailsOfTheOpinionVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/DetailsOfTheOpinionVo.java new file mode 100644 index 00000000..d5e2bc22 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/domain/vo/DetailsOfTheOpinionVo.java @@ -0,0 +1,14 @@ +package org.dromara.complaintBox.domain.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class DetailsOfTheOpinionVo implements Serializable { + + private BusComplaintBoxVo busComplaintBoxVo; + + private List messageLoggingVos; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxDisposeLoggingMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxDisposeLoggingMapper.java new file mode 100644 index 00000000..833d26fb --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxDisposeLoggingMapper.java @@ -0,0 +1,15 @@ +package org.dromara.complaintBox.mapper; + +import org.dromara.complaintBox.domain.BusComplaintBoxDisposeLogging; +import org.dromara.complaintBox.domain.vo.BusComplaintBoxDisposeLoggingVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 意见箱-意见处理记录Mapper接口 + * + * @author Lion Li + * @date 2025-11-29 + */ +public interface BusComplaintBoxDisposeLoggingMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxMapper.java new file mode 100644 index 00000000..03ba0d72 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxMapper.java @@ -0,0 +1,26 @@ +package org.dromara.complaintBox.mapper; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.complaintBox.domain.BusComplaintBox; +import org.dromara.complaintBox.domain.bo.BusComplaintBoxBo; +import org.dromara.complaintBox.domain.vo.BusComplaintBoxVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.complaintBox.domain.vo.ComplaintBoxCountVo; + +import java.util.List; + +/** + * 意见箱Mapper接口 + * + * @author Lion Li + * @date 2025-11-29 + */ +public interface BusComplaintBoxMapper extends BaseMapperPlus { + + Page selectVoPageList(@Param("page") Page page, @Param("bo") BusComplaintBoxBo bo); + + Page selectVoPageWebList(@Param("page") Page page, @Param("bo") BusComplaintBoxBo bo); + + List getCount(@Param("bo") BusComplaintBoxBo bo); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxMessageLoggingMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxMessageLoggingMapper.java new file mode 100644 index 00000000..744f6045 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/mapper/BusComplaintBoxMessageLoggingMapper.java @@ -0,0 +1,15 @@ +package org.dromara.complaintBox.mapper; + +import org.dromara.complaintBox.domain.BusComplaintBoxMessageLogging; +import org.dromara.complaintBox.domain.vo.BusComplaintBoxMessageLoggingVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 意见箱-意见沟通记录Mapper接口 + * + * @author Lion Li + * @date 2025-11-29 + */ +public interface BusComplaintBoxMessageLoggingMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxDisposeLoggingService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxDisposeLoggingService.java new file mode 100644 index 00000000..dcfbfb32 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxDisposeLoggingService.java @@ -0,0 +1,70 @@ +package org.dromara.complaintBox.service; + +import org.dromara.complaintBox.domain.vo.BusComplaintBoxDisposeLoggingVo; +import org.dromara.complaintBox.domain.bo.BusComplaintBoxDisposeLoggingBo; +import org.dromara.complaintBox.domain.BusComplaintBoxDisposeLogging; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 意见箱-意见处理记录Service接口 + * + * @author Lion Li + * @date 2025-11-29 + */ +public interface IBusComplaintBoxDisposeLoggingService extends IService{ + + /** + * 查询意见箱-意见处理记录 + * + * @param id 主键 + * @return 意见箱-意见处理记录 + */ + BusComplaintBoxDisposeLoggingVo queryById(Long id); + + /** + * 分页查询意见箱-意见处理记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 意见箱-意见处理记录分页列表 + */ + TableDataInfo queryPageList(BusComplaintBoxDisposeLoggingBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的意见箱-意见处理记录列表 + * + * @param bo 查询条件 + * @return 意见箱-意见处理记录列表 + */ + List queryList(BusComplaintBoxDisposeLoggingBo bo); + + /** + * 新增意见箱-意见处理记录 + * + * @param bo 意见箱-意见处理记录 + * @return 是否新增成功 + */ + Boolean insertByBo(BusComplaintBoxDisposeLoggingBo bo); + + /** + * 修改意见箱-意见处理记录 + * + * @param bo 意见箱-意见处理记录 + * @return 是否修改成功 + */ + Boolean updateByBo(BusComplaintBoxDisposeLoggingBo bo); + + /** + * 校验并批量删除意见箱-意见处理记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxMessageLoggingService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxMessageLoggingService.java new file mode 100644 index 00000000..5bd0169a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxMessageLoggingService.java @@ -0,0 +1,84 @@ +package org.dromara.complaintBox.service; + +import org.dromara.complaintBox.domain.vo.BusComplaintBoxMessageLoggingVo; +import org.dromara.complaintBox.domain.bo.BusComplaintBoxMessageLoggingBo; +import org.dromara.complaintBox.domain.BusComplaintBoxMessageLogging; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 意见箱-意见沟通记录Service接口 + * + * @author Lion Li + * @date 2025-11-29 + */ +public interface IBusComplaintBoxMessageLoggingService extends IService{ + + /** + * 查询意见箱-意见沟通记录 + * + * @param id 主键 + * @return 意见箱-意见沟通记录 + */ + BusComplaintBoxMessageLoggingVo queryById(Long id); + + /** + * 分页查询意见箱-意见沟通记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 意见箱-意见沟通记录分页列表 + */ + TableDataInfo queryPageList(BusComplaintBoxMessageLoggingBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的意见箱-意见沟通记录列表 + * + * @param bo 查询条件 + * @return 意见箱-意见沟通记录列表 + */ + List queryList(BusComplaintBoxMessageLoggingBo bo); + + /** + * 新增意见箱-意见沟通记录 + * + * @param bo 意见箱-意见沟通记录 + * @return 是否新增成功 + */ + Boolean insertAppByBo(BusComplaintBoxMessageLoggingBo bo); + /** + * 新增意见箱-意见沟通记录 + * + * @param bo 意见箱-意见沟通记录 + * @return 是否新增成功 + */ + Boolean insertWebByBo(BusComplaintBoxMessageLoggingBo bo); + + /** + * 修改意见箱-意见沟通记录 + * + * @param bo 意见箱-意见沟通记录 + * @return 是否修改成功 + */ + Boolean updateByBo(BusComplaintBoxMessageLoggingBo bo); + + /** + * 校验并批量删除意见箱-意见沟通记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 通过意见id获取沟通记录 + * @param id + * @return + */ + List getMessageLogListByComplaintId(Long id); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxService.java new file mode 100644 index 00000000..8400a950 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/IBusComplaintBoxService.java @@ -0,0 +1,117 @@ +package org.dromara.complaintBox.service; + +import org.dromara.complaintBox.app.domain.vo.AppDetailsOfTheOpinionVo; +import org.dromara.complaintBox.domain.vo.BusComplaintBoxVo; +import org.dromara.complaintBox.domain.bo.BusComplaintBoxBo; +import org.dromara.complaintBox.domain.BusComplaintBox; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.dromara.complaintBox.domain.vo.ComplaintBoxCountVo; +import org.dromara.complaintBox.domain.vo.DetailsOfTheOpinionVo; + +import java.util.Collection; +import java.util.List; + +/** + * 意见箱Service接口 + * + * @author Lion Li + * @date 2025-11-29 + */ +public interface IBusComplaintBoxService extends IService{ + + /** + * 查询意见箱 + * + * @param id 主键 + * @return 意见箱 + */ + BusComplaintBoxVo queryById(Long id); + + /** + * 分页查询意见箱列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 意见箱分页列表 + */ + TableDataInfo queryPageList(BusComplaintBoxBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的意见箱列表 + * + * @param bo 查询条件 + * @return 意见箱列表 + */ + List queryList(BusComplaintBoxBo bo); + + /** + * 新增意见箱 + * + * @param bo 意见箱 + * @return 是否新增成功 + */ + Boolean insertByBo(BusComplaintBoxBo bo); + + /** + * 修改意见箱 + * + * @param bo 意见箱 + * @return 是否修改成功 + */ + Boolean updateByBo(BusComplaintBoxBo bo); + + /** + * 校验并批量删除意见箱信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * app获取当前用户提出意见列表 + * @param bo + * @param pageQuery + * @return + */ + TableDataInfo appQueryPageList(BusComplaintBoxBo bo, PageQuery pageQuery); + + /** + * APP获取当前意见详情 + * @param id + * @return + */ + AppDetailsOfTheOpinionVo appQueryById(Long id); + + /** + * 获取当前意见详情 + * @param id + * @return + */ + DetailsOfTheOpinionVo getInfo(Long id); + + /** + * 修改沟通记录阅读状态 + * @param bo + * @return + */ + int editCheckStatus(BusComplaintBoxBo bo); + + /** + * web获取各个处理状态数量 + * @param bo + * @return + */ + List getCount(BusComplaintBoxBo bo); + + /** + * 修改意见状态 + * @param bo + * @return + */ + int editStatus(BusComplaintBoxBo bo); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxDisposeLoggingServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxDisposeLoggingServiceImpl.java new file mode 100644 index 00000000..ddc8ccae --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxDisposeLoggingServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.complaintBox.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.complaintBox.domain.bo.BusComplaintBoxDisposeLoggingBo; +import org.dromara.complaintBox.domain.vo.BusComplaintBoxDisposeLoggingVo; +import org.dromara.complaintBox.domain.BusComplaintBoxDisposeLogging; +import org.dromara.complaintBox.mapper.BusComplaintBoxDisposeLoggingMapper; +import org.dromara.complaintBox.service.IBusComplaintBoxDisposeLoggingService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 意见箱-意见处理记录Service业务层处理 + * + * @author Lion Li + * @date 2025-11-29 + */ +@RequiredArgsConstructor +@Service +public class BusComplaintBoxDisposeLoggingServiceImpl extends ServiceImpl implements IBusComplaintBoxDisposeLoggingService { + + private final BusComplaintBoxDisposeLoggingMapper baseMapper; + + /** + * 查询意见箱-意见处理记录 + * + * @param id 主键 + * @return 意见箱-意见处理记录 + */ + @Override + public BusComplaintBoxDisposeLoggingVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询意见箱-意见处理记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 意见箱-意见处理记录分页列表 + */ + @Override + public TableDataInfo queryPageList(BusComplaintBoxDisposeLoggingBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的意见箱-意见处理记录列表 + * + * @param bo 查询条件 + * @return 意见箱-意见处理记录列表 + */ + @Override + public List queryList(BusComplaintBoxDisposeLoggingBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(BusComplaintBoxDisposeLoggingBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(BusComplaintBoxDisposeLogging::getId); + lqw.eq(bo.getComplaintId() != null, BusComplaintBoxDisposeLogging::getComplaintId, bo.getComplaintId()); + lqw.eq(bo.getUserId() != null, BusComplaintBoxDisposeLogging::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), BusComplaintBoxDisposeLogging::getUserName, bo.getUserName()); + lqw.eq(bo.getAvatar() != null, BusComplaintBoxDisposeLogging::getAvatar, bo.getAvatar()); + lqw.eq(StringUtils.isNotBlank(bo.getIsRefund()), BusComplaintBoxDisposeLogging::getIsRefund, bo.getIsRefund()); + lqw.eq(StringUtils.isNotBlank(bo.getCause()), BusComplaintBoxDisposeLogging::getCause, bo.getCause()); + return lqw; + } + + /** + * 新增意见箱-意见处理记录 + * + * @param bo 意见箱-意见处理记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BusComplaintBoxDisposeLoggingBo bo) { + BusComplaintBoxDisposeLogging add = MapstructUtils.convert(bo, BusComplaintBoxDisposeLogging.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改意见箱-意见处理记录 + * + * @param bo 意见箱-意见处理记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BusComplaintBoxDisposeLoggingBo bo) { + BusComplaintBoxDisposeLogging update = MapstructUtils.convert(bo, BusComplaintBoxDisposeLogging.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BusComplaintBoxDisposeLogging entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除意见箱-意见处理记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxMessageLoggingServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxMessageLoggingServiceImpl.java new file mode 100644 index 00000000..de1c18dc --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxMessageLoggingServiceImpl.java @@ -0,0 +1,217 @@ +package org.dromara.complaintBox.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.complaintBox.domain.BusComplaintBox; +import org.dromara.complaintBox.mapper.BusComplaintBoxMapper; +import org.dromara.complaintBox.service.IBusComplaintBoxService; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysUserService; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.dromara.complaintBox.domain.bo.BusComplaintBoxMessageLoggingBo; +import org.dromara.complaintBox.domain.vo.BusComplaintBoxMessageLoggingVo; +import org.dromara.complaintBox.domain.BusComplaintBoxMessageLogging; +import org.dromara.complaintBox.mapper.BusComplaintBoxMessageLoggingMapper; +import org.dromara.complaintBox.service.IBusComplaintBoxMessageLoggingService; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 意见箱-意见沟通记录Service业务层处理 + * + * @author Lion Li + * @date 2025-11-29 + */ +@RequiredArgsConstructor +@Service +public class BusComplaintBoxMessageLoggingServiceImpl extends ServiceImpl implements IBusComplaintBoxMessageLoggingService { + + private final BusComplaintBoxMessageLoggingMapper baseMapper; + @Lazy + private final ISysUserService sysUserService; +// @Lazy + private final BusComplaintBoxMapper busComplaintBoxMapper; + + /** + * 查询意见箱-意见沟通记录 + * + * @param id 主键 + * @return 意见箱-意见沟通记录 + */ + @Override + public BusComplaintBoxMessageLoggingVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询意见箱-意见沟通记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 意见箱-意见沟通记录分页列表 + */ + @Override + public TableDataInfo queryPageList(BusComplaintBoxMessageLoggingBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的意见箱-意见沟通记录列表 + * + * @param bo 查询条件 + * @return 意见箱-意见沟通记录列表 + */ + @Override + public List queryList(BusComplaintBoxMessageLoggingBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(BusComplaintBoxMessageLoggingBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(BusComplaintBoxMessageLogging::getId); + lqw.eq(bo.getComplaintId() != null, BusComplaintBoxMessageLogging::getComplaintId, bo.getComplaintId()); + lqw.eq(StringUtils.isNotBlank(bo.getDetails()), BusComplaintBoxMessageLogging::getDetails, bo.getDetails()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), BusComplaintBoxMessageLogging::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增意见箱-意见沟通记录 + * + * @param bo 意见箱-意见沟通记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertAppByBo(BusComplaintBoxMessageLoggingBo bo) { + LoginUser loginUser = LoginHelper.getLoginUser(); + if (loginUser == null) { + throw new ServiceException("登录信息出错，请重新登录！！！"); + } + BusComplaintBox busComplaintBox = busComplaintBoxMapper.selectById(bo.getComplaintId()); + if (busComplaintBox == null) { + throw new ServiceException("意见信息找不到！！！"); + } + if ("14".equals(busComplaintBox.getStatus())){ + throw new ServiceException("意见已关闭！！！"); + } + SysUserVo sysUserVo = sysUserService.selectUserById(loginUser.getUserId()); + bo.setReplyUserId(sysUserVo.getUserId()); + bo.setReplyUserName(sysUserVo.getNickName()); + bo.setReplyAvatar(sysUserVo.getAvatar()); + BusComplaintBoxMessageLogging add = MapstructUtils.convert(bo, BusComplaintBoxMessageLogging.class); + if (busComplaintBox.getCurrentDisposeUserId() != null) { + SysUserVo userVo = sysUserService.selectUserById(busComplaintBox.getCurrentDisposeUserId()); + if (userVo != null) { + add.setRepliedUserId(userVo.getUserId()); + add.setRepliedUserName(userVo.getUserName()); + add.setRepliedAvatar(userVo.getAvatar()); + } + } + + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertWebByBo(BusComplaintBoxMessageLoggingBo bo) { + LoginUser loginUser = LoginHelper.getLoginUser(); + if (loginUser == null) { + throw new ServiceException("登录信息出错，请重新登录！！！"); + } + BusComplaintBox busComplaintBox = busComplaintBoxMapper.selectById(bo.getComplaintId()); + if (busComplaintBox == null) { + throw new ServiceException("意见信息找不到！！！"); + } + if ("14".equals(busComplaintBox.getStatus())){ + throw new ServiceException("意见已关闭！！！"); + } + SysUserVo sysUserVo = sysUserService.selectUserById(loginUser.getUserId()); + bo.setReplyUserId(sysUserVo.getUserId()); + bo.setReplyUserName(sysUserVo.getNickName()); + bo.setReplyAvatar(sysUserVo.getAvatar()); + BusComplaintBoxMessageLogging add = MapstructUtils.convert(bo, BusComplaintBoxMessageLogging.class); + add.setRepliedUserId(busComplaintBox.getUserId()); + add.setRepliedUserName(busComplaintBox.getUserName()); + add.setRepliedAvatar(busComplaintBox.getAvatar()); + + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if ("0".equals(busComplaintBox.getStatus())){ + busComplaintBox.setStatus("5"); + busComplaintBox.setCurrentDisposeUserId(sysUserVo.getUserId()); + busComplaintBoxMapper.updateById(busComplaintBox); + } + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改意见箱-意见沟通记录 + * + * @param bo 意见箱-意见沟通记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BusComplaintBoxMessageLoggingBo bo) { + BusComplaintBoxMessageLogging update = MapstructUtils.convert(bo, BusComplaintBoxMessageLogging.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BusComplaintBoxMessageLogging entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除意见箱-意见沟通记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 根据意见id获取沟通记录 + * @param id + * @return + */ + @Override + public List getMessageLogListByComplaintId(Long id) { + return baseMapper.selectVoList(new LambdaQueryWrapper().eq(BusComplaintBoxMessageLogging::getComplaintId, id)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxServiceImpl.java new file mode 100644 index 00000000..c2beeb2a --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/complaintBox/service/impl/BusComplaintBoxServiceImpl.java @@ -0,0 +1,333 @@ +package org.dromara.complaintBox.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.complaintBox.app.domain.vo.AppDetailsOfTheOpinionVo; +import org.dromara.complaintBox.domain.BusComplaintBoxMessageLogging; +import org.dromara.complaintBox.domain.vo.BusComplaintBoxMessageLoggingVo; +import org.dromara.complaintBox.domain.vo.ComplaintBoxCountVo; +import org.dromara.complaintBox.domain.vo.DetailsOfTheOpinionVo; +import org.dromara.complaintBox.mapper.BusComplaintBoxMessageLoggingMapper; +import org.dromara.complaintBox.service.IBusComplaintBoxMessageLoggingService; +import org.dromara.system.domain.vo.SysDeptVo; +import org.dromara.system.domain.vo.SysOssVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysDeptService; +import org.dromara.system.service.ISysOssService; +import org.dromara.system.service.ISysUserService; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.dromara.complaintBox.domain.bo.BusComplaintBoxBo; +import org.dromara.complaintBox.domain.vo.BusComplaintBoxVo; +import org.dromara.complaintBox.domain.BusComplaintBox; +import org.dromara.complaintBox.mapper.BusComplaintBoxMapper; +import org.dromara.complaintBox.service.IBusComplaintBoxService; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * 意见箱Service业务层处理 + * + * @author Lion Li + * @date 2025-11-29 + */ +@RequiredArgsConstructor +@Service +public class BusComplaintBoxServiceImpl extends ServiceImpl implements IBusComplaintBoxService { + + private final BusComplaintBoxMapper baseMapper; +// @Lazy + private final BusComplaintBoxMessageLoggingMapper messageLoggingMapper; + @Lazy + private final ISysUserService sysUserService; + @Lazy + private final ISysDeptService sysDeptService; + @Lazy + private final ISysOssService sysOssService; + + /** + * 查询意见箱 + * + * @param id 主键 + * @return 意见箱 + */ + @Override + public BusComplaintBoxVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询意见箱列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 意见箱分页列表 + */ + @Override + public TableDataInfo queryPageList(BusComplaintBoxBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPageWebList(pageQuery.build(), bo); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的意见箱列表 + * + * @param bo 查询条件 + * @return 意见箱列表 + */ + @Override + public List queryList(BusComplaintBoxBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(BusComplaintBoxBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(BusComplaintBox::getId); + lqw.eq(bo.getCompanyId() != null, BusComplaintBox::getCompanyId, bo.getCompanyId()); + lqw.eq(bo.getProjectId() != null, BusComplaintBox::getProjectId, bo.getProjectId()); + lqw.eq(bo.getUserId() != null, BusComplaintBox::getUserId, bo.getUserId()); + lqw.eq(bo.getCurrentDisposeUserId() != null, + BusComplaintBox::getCurrentDisposeUserId, bo.getCurrentDisposeUserId()) + .or() + .isNull(BusComplaintBox::getCurrentDisposeUserId); + lqw.eq(StringUtils.isNotBlank(bo.getTitle()), BusComplaintBox::getTitle, bo.getTitle()); + lqw.eq(StringUtils.isNotBlank(bo.getOpinionType()), BusComplaintBox::getOpinionType, bo.getOpinionType()); + lqw.eq(StringUtils.isNotBlank(bo.getDetail()), BusComplaintBox::getDetail, bo.getDetail()); + lqw.eq(StringUtils.isNotBlank(bo.getFileId()), BusComplaintBox::getFileId, bo.getFileId()); + lqw.eq(StringUtils.isNotBlank(bo.getIsCryptonym()), BusComplaintBox::getIsCryptonym, bo.getIsCryptonym()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), BusComplaintBox::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增意见箱 + * + * @param bo 意见箱 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BusComplaintBoxBo bo) { + BusComplaintBox add = MapstructUtils.convert(bo, BusComplaintBox.class); + //获取用户信息进行填充 + SysUserVo sysUserVo = sysUserService.selectUserById(add.getUserId()); + add.setAvatar(sysUserVo.getAvatar()); + add.setUserName(sysUserVo.getNickName()); + //获取部门信息 + SysDeptVo sysDeptVo =sysDeptService.selectDeptById(sysUserVo.getDeptId()); + if (sysDeptVo != null) { + String[] split = sysDeptVo.getAncestors().split(","); + if (split.length > 0) { + //当祖级列表长度大于3时取第2个作为公司id + if (split.length > 1) { + add.setCompanyId(Long.parseLong(split[1])); + }else { + add.setCompanyId(Long.parseLong(split[0])); + } + } + } + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改意见箱 + * + * @param bo 意见箱 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BusComplaintBoxBo bo) { + BusComplaintBox update = MapstructUtils.convert(bo, BusComplaintBox.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BusComplaintBox entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除意见箱信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * app获取当前用户提出意见列表 + * @param bo + * @param pageQuery + * @return + */ + @Override + public TableDataInfo appQueryPageList(BusComplaintBoxBo bo, PageQuery pageQuery) { + Page result = baseMapper.selectVoPageList(pageQuery.build(), bo); + return TableDataInfo.build(result); + } + + /** + * app获取当前意见详情 + * @param id + * @return + */ + @Override + public AppDetailsOfTheOpinionVo appQueryById(Long id) { + AppDetailsOfTheOpinionVo vo = new AppDetailsOfTheOpinionVo(); + BusComplaintBoxVo busComplaintBoxVo = baseMapper.selectVoById(id); + if(busComplaintBoxVo == null){ + throw new ServiceException("找不到意见信息！！！"); + } + if (busComplaintBoxVo.getAvatar() != null){ + SysOssVo ossVo = sysOssService.getById(busComplaintBoxVo.getAvatar()); + if (ossVo != null){ + busComplaintBoxVo.setAvatarUrl(ossVo.getUrl()); + } + } + if (busComplaintBoxVo.getFileId() != null){ + String[] split = busComplaintBoxVo.getFileId().split(","); + List fileIds = Arrays.stream(split) + .filter(str -> str != null && !str.trim().isEmpty()) // 过滤空值和空白字符串 + .map(str -> { + try { + return Long.valueOf(str.trim()); + } catch (NumberFormatException e) { + // 转换失败时可返回null，后续再过滤 + return null; + } + }) + .filter(Objects::nonNull) // 过滤转换失败的null值 + .toList(); + List sysOssVos = sysOssService.listByIds(fileIds); + List urls = new ArrayList<>(); + sysOssVos.forEach(sysOssVo -> { + if (sysOssVo != null){ + urls.add(sysOssVo.getUrl()); + } + }); + busComplaintBoxVo.setFileUrls(urls); + } + vo.setBusComplaintBoxVo(busComplaintBoxVo); + List messageLoggingVos = messageLoggingMapper.selectVoList(new LambdaQueryWrapper().eq(BusComplaintBoxMessageLogging::getComplaintId, id)); + if(CollectionUtils.isNotEmpty(messageLoggingVos)){ + messageLoggingVos.forEach(mvo->{ + if (mvo.getReplyAvatar() != null){ + SysOssVo ossVo = sysOssService.getById(mvo.getReplyAvatar()); + if (ossVo != null){ + mvo.setReplyAvatarUrl(ossVo.getUrl()); + } + } + if (mvo.getRepliedAvatar() != null){ + SysOssVo ossVo = sysOssService.getById(mvo.getRepliedAvatar()); + if (ossVo != null){ + mvo.setRepliedAvatarUrl(ossVo.getUrl()); + } + } + }); + vo.setMessageLoggingVos(messageLoggingVos); + } + return vo; + } + + @Override + public DetailsOfTheOpinionVo getInfo(Long id) { + DetailsOfTheOpinionVo vo = new DetailsOfTheOpinionVo(); + BusComplaintBoxVo busComplaintBoxVo = baseMapper.selectVoById(id); + if(busComplaintBoxVo == null){ + throw new ServiceException("找不到意见信息！！！"); + } + vo.setBusComplaintBoxVo(busComplaintBoxVo); + List messageLoggingVos = messageLoggingMapper.selectVoList(new LambdaQueryWrapper().eq(BusComplaintBoxMessageLogging::getComplaintId, id)); + if(CollectionUtils.isNotEmpty(messageLoggingVos)){ + messageLoggingVos.forEach(messageLoggingVo->{ + messageLoggingVo.setType(messageLoggingVo.getReplyUserId().equals(busComplaintBoxVo.getUserId()) ? 0 : 1); + if (messageLoggingVo.getReplyAvatar() != null){ + SysOssVo ossVo = sysOssService.getById(messageLoggingVo.getReplyAvatar()); + if (ossVo != null){ + messageLoggingVo.setReplyAvatarUrl(ossVo.getUrl()); + } + } + if (messageLoggingVo.getRepliedAvatar() != null){ + SysOssVo ossVo = sysOssService.getById(messageLoggingVo.getRepliedAvatar()); + if (ossVo != null){ + messageLoggingVo.setRepliedAvatarUrl(ossVo.getUrl()); + } + } + }); + vo.setMessageLoggingVos(messageLoggingVos); + } + return vo; + + } + + + + /** + * app修改沟通记录阅读状态 + * @param bo + * @return + */ + @Override + public int editCheckStatus(BusComplaintBoxBo bo) { + if (bo.getId() == null || bo.getUserId() == null) { + return 1; + } + Long count = messageLoggingMapper.selectCount(new LambdaQueryWrapper() + .eq(BusComplaintBoxMessageLogging::getStatus,"0") + .eq(BusComplaintBoxMessageLogging::getComplaintId, bo.getId()) + .eq(BusComplaintBoxMessageLogging::getRepliedUserId, bo.getUserId())); + if (count == 0) { + return 1; + } + return messageLoggingMapper.update(new LambdaUpdateWrapper() + .set(BusComplaintBoxMessageLogging::getStatus,"1") + .eq(BusComplaintBoxMessageLogging::getComplaintId,bo.getId()) + .eq(BusComplaintBoxMessageLogging::getRepliedUserId,bo.getUserId())); + } + + @Override + public List getCount(BusComplaintBoxBo bo) { + + return baseMapper.getCount(bo); + } + + @Override + public int editStatus(BusComplaintBoxBo bo) { + BusComplaintBoxVo busComplaintBoxVo = baseMapper.selectVoById(bo.getId()); + if (busComplaintBoxVo == null){ + throw new ServiceException("找不到意见！！"); + } + if ("14".equals(busComplaintBoxVo.getStatus())){ + throw new ServiceException("该意见已经关闭，不允许再修改状态"); + } + return baseMapper.update(new LambdaUpdateWrapper().set(BusComplaintBox::getStatus,bo.getStatus()).eq(BusComplaintBox::getId, bo.getId())); + } + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/complaintBox/BusComplaintBoxDisposeLoggingMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/complaintBox/BusComplaintBoxDisposeLoggingMapper.xml new file mode 100644 index 00000000..d6a5ad8e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/complaintBox/BusComplaintBoxDisposeLoggingMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/complaintBox/BusComplaintBoxMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/complaintBox/BusComplaintBoxMapper.xml new file mode 100644 index 00000000..d6798ea1 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/complaintBox/BusComplaintBoxMapper.xml @@ -0,0 +1,82 @@ + + + + + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/complaintBox/BusComplaintBoxMessageLoggingMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/complaintBox/BusComplaintBoxMessageLoggingMapper.xml new file mode 100644 index 00000000..4fa66cef --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/complaintBox/BusComplaintBoxMessageLoggingMapper.xml @@ -0,0 +1,7 @@ + + + + + From 4aaf384ce8334e5268c8ae28bf477a7fab9e80b5 Mon Sep 17 00:00:00 2001 From: lg Date: Mon, 1 Dec 2025 20:00:39 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E6=9C=BA=E6=A2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 + .../jxgl/controller/JxGzwxController.java | 140 ++++++++++++ .../jxgl/controller/JxGzwxJlController.java | 118 +++++++++++ .../jxgl/controller/JxWhjhController.java | 138 ++++++++++++ .../jxgl/controller/JxWhjlController.java | 145 +++++++++++++ .../mechanical/jxgl/domain/JxGzwx.java | 91 ++++++++ .../mechanical/jxgl/domain/JxGzwxJl.java | 114 ++++++++++ .../mechanical/jxgl/domain/JxWhjh.java | 103 +++++++++ .../mechanical/jxgl/domain/JxWhjl.java | 96 +++++++++ .../mechanical/jxgl/domain/bo/JxGzwxBo.java | 95 +++++++++ .../mechanical/jxgl/domain/bo/JxGzwxJlBo.java | 111 ++++++++++ .../mechanical/jxgl/domain/bo/JxWhjhBo.java | 109 ++++++++++ .../mechanical/jxgl/domain/bo/JxWhjlBo.java | 97 +++++++++ .../jxgl/domain/vo/JxGzwxHeadVo.java | 21 ++ .../mechanical/jxgl/domain/vo/JxGzwxJlVo.java | 137 ++++++++++++ .../mechanical/jxgl/domain/vo/JxGzwxVo.java | 112 ++++++++++ .../jxgl/domain/vo/JxWhjhHeadVo.java | 23 ++ .../mechanical/jxgl/domain/vo/JxWhjhVo.java | 132 ++++++++++++ .../jxgl/domain/vo/JxWhjlHeadVo.java | 17 ++ .../mechanical/jxgl/domain/vo/JxWhjlVo.java | 122 +++++++++++ .../jxgl/mapper/JxGzwxJlMapper.java | 15 ++ .../mechanical/jxgl/mapper/JxGzwxMapper.java | 15 ++ .../mechanical/jxgl/mapper/JxWhjhMapper.java | 15 ++ .../mechanical/jxgl/mapper/JxWhjlMapper.java | 15 ++ .../jxgl/service/IJxGzwxJlService.java | 73 +++++++ .../jxgl/service/IJxGzwxService.java | 73 +++++++ .../jxgl/service/IJxWhjhService.java | 73 +++++++ .../jxgl/service/IJxWhjlService.java | 73 +++++++ .../service/impl/JxGzwxJlServiceImpl.java | 171 +++++++++++++++ .../jxgl/service/impl/JxGzwxServiceImpl.java | 178 ++++++++++++++++ .../jxgl/service/impl/JxWhjhServiceImpl.java | 177 ++++++++++++++++ .../jxgl/service/impl/JxWhjlServiceImpl.java | 200 ++++++++++++++++++ 32 files changed, 3001 insertions(+) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxGzwxController.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxGzwxJlController.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxWhjhController.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxWhjlController.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxGzwx.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxGzwxJl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxWhjh.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxWhjl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxGzwxBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxGzwxJlBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxWhjhBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxWhjlBo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxHeadVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxJlVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjhHeadVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjhVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjlHeadVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjlVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxGzwxJlMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxGzwxMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxWhjhMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxWhjlMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxGzwxJlService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxGzwxService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxWhjhService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxWhjlService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxGzwxJlServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxGzwxServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxWhjhServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxWhjlServiceImpl.java diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index f7945fe0..261ac1cb 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -305,6 +305,8 @@ springdoc: packages-to-scan: org.dromara.ai - group: 31.投标管理模块 packages-to-scan: org.dromara.bidding + - group: 33.机械模块 + packages-to-scan: org.dromara.mechanical.jxgl - group: 32.设备模块 packages-to-scan: org.dromara.device # knife4j的增强配置，不需要增强可以不配 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxGzwxController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxGzwxController.java new file mode 100644 index 00000000..1c57d717 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxGzwxController.java @@ -0,0 +1,140 @@ +package org.dromara.mechanical.jxgl.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.device.domain.bo.DeviceInfoBo; +import org.dromara.device.domain.vo.DeviceInfoVo; +import org.dromara.device.service.IDeviceInfoService; +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjlHeadVo; +import org.dromara.system.service.impl.SysOssServiceImpl; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxVo; +import org.dromara.mechanical.jxgl.domain.bo.JxGzwxBo; +import org.dromara.mechanical.jxgl.service.IJxGzwxService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 机械故障维修 + * + * @author Lion Li + * @date 2025-12-01 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/jxgl/gzwx") +public class JxGzwxController extends BaseController { + + private final IJxGzwxService jxGzwxService; + + + private final IDeviceInfoService deviceInfoService; + + + + + + /** + * 查询设备信息列表 + */ + @SaCheckPermission("jxgl:gzwx:list") + @GetMapping("/getlist") + public TableDataInfo list(DeviceInfoBo bo, PageQuery pageQuery) { + return deviceInfoService.queryPageList(bo, pageQuery); + } + + + /** + * 查询机械故障维修列表 + */ + @SaCheckPermission("jxgl:gzwx:list") + @GetMapping("/list") + public TableDataInfo list(JxGzwxBo bo, PageQuery pageQuery) { + return jxGzwxService.queryPageList(bo, pageQuery); + } + + /** + * 导出机械故障维修列表 + */ + @SaCheckPermission("jxgl:gzwx:export") + @Log(title = "机械故障维修", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(JxGzwxBo bo, HttpServletResponse response) { + List list = jxGzwxService.queryList(bo); + ExcelUtil.exportExcel(list, "机械故障维修", JxGzwxVo.class, response); + } + + /** + * 获取机械故障维修详细信息 + * + * @param faultId 主键 + */ + @SaCheckPermission("jxgl:gzwx:query") + @GetMapping("/{faultId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long faultId) { + return R.ok(jxGzwxService.queryById(faultId)); + } + + /** + * 新增机械故障维修 + */ + @SaCheckPermission("jxgl:gzwx:add") + @Log(title = "机械故障维修", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody JxGzwxBo bo) { + return toAjax(jxGzwxService.insertByBo(bo)); + } + + /** + * 修改机械故障维修 + */ + @SaCheckPermission("jxgl:gzwx:edit") + @Log(title = "机械故障维修", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody JxGzwxBo bo) { + return toAjax(jxGzwxService.updateByBo(bo)); + } + + /** + * 删除机械故障维修 + * + * @param faultIds 主键串 + */ + @SaCheckPermission("jxgl:gzwx:remove") + @Log(title = "机械故障维修", businessType = BusinessType.DELETE) + @DeleteMapping("/{faultIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] faultIds) { + return toAjax(jxGzwxService.deleteWithValidByIds(List.of(faultIds), true)); + } + + /** + * 机械故障头部数据返回 + * + * + */ + @SaCheckPermission("jxgl:gzwx:list") + @Log(title = "机械故障头部数据", businessType = BusinessType.DELETE) + @GetMapping("/jxgzwx") + public R jxgzwx() { + return R.ok(jxGzwxService.jxgzwx()); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxGzwxJlController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxGzwxJlController.java new file mode 100644 index 00000000..22e39efd --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxGzwxJlController.java @@ -0,0 +1,118 @@ +package org.dromara.mechanical.jxgl.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxJlVo; +import org.dromara.mechanical.jxgl.domain.bo.JxGzwxJlBo; +import org.dromara.mechanical.jxgl.service.IJxGzwxJlService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 机械故障维修记录 + * + * @author Lion Li + * @date 2025-12-01 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/jxgl/gzwxJl") +public class JxGzwxJlController extends BaseController { + + private final IJxGzwxJlService jxGzwxJlService; + + /** + * 查询机械故障维修记录列表 + */ + @SaCheckPermission("jxgl:gzwxJl:list") + @GetMapping("/list") + public TableDataInfo list(JxGzwxJlBo bo, PageQuery pageQuery) { + return jxGzwxJlService.queryPageList(bo, pageQuery); + } + + /** + * 导出机械故障维修记录列表 + */ + @SaCheckPermission("jxgl:gzwxJl:export") + @Log(title = "机械故障维修记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(JxGzwxJlBo bo, HttpServletResponse response) { + List list = jxGzwxJlService.queryList(bo); + ExcelUtil.exportExcel(list, "机械故障维修记录", JxGzwxJlVo.class, response); + } + + /** + * 获取机械故障维修记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("jxgl:gzwxJl:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(jxGzwxJlService.queryById(id)); + } + + /** + * 新增机械故障维修记录 + */ + @SaCheckPermission("jxgl:gzwxJl:add") + @Log(title = "机械故障维修记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody JxGzwxJlBo bo) { + return toAjax(jxGzwxJlService.insertByBo(bo)); + } + + /** + * 修改机械故障维修记录 + */ + @SaCheckPermission("jxgl:gzwxJl:edit") + @Log(title = "机械故障维修记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody JxGzwxJlBo bo) { + return toAjax(jxGzwxJlService.updateByBo(bo)); + } + + /** + * 删除机械故障维修记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("jxgl:gzwxJl:remove") + @Log(title = "机械故障维修记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(jxGzwxJlService.deleteWithValidByIds(List.of(ids), true)); + } + + /** + * 机械故障记录头部数据返回 + * + * + */ + @SaCheckPermission("jxgl:gzwxJl:list") + @Log(title = "机械故障记录头部数据", businessType = BusinessType.DELETE) + @GetMapping("/jxgzwx") + public R jxgzwx() { + return R.ok(jxGzwxJlService.jxgzwx()); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxWhjhController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxWhjhController.java new file mode 100644 index 00000000..06a067e9 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxWhjhController.java @@ -0,0 +1,138 @@ +package org.dromara.mechanical.jxgl.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.device.domain.bo.DeviceInfoBo; +import org.dromara.device.domain.vo.DeviceInfoVo; +import org.dromara.device.service.IDeviceInfoService; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjhHeadVo; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo; +import org.dromara.mechanical.jxgl.domain.bo.JxWhjhBo; +import org.dromara.mechanical.jxgl.service.IJxWhjhService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 机械维护计划 + * + * @author Lion Li + * @date 2025-12-01 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/jxgl/whjh") +public class JxWhjhController extends BaseController { + + private final IJxWhjhService jxWhjhService; + + private final IDeviceInfoService deviceInfoService; + + + + + + /** + * 查询设备信息列表 + */ + @SaCheckPermission("jxgl:whjh:list") + @GetMapping("/getlist") + public TableDataInfo list(DeviceInfoBo bo, PageQuery pageQuery) { + return deviceInfoService.queryPageList(bo, pageQuery); + } + + + /** + * 查询机械维护计划列表 + */ + @SaCheckPermission("jxgl:whjh:list") + @GetMapping("/list") + public TableDataInfo list(JxWhjhBo bo, PageQuery pageQuery) { + return jxWhjhService.queryPageList(bo, pageQuery); + } + + /** + * 导出机械维护计划列表 + */ + @SaCheckPermission("jxgl:whjh:export") + @Log(title = "机械维护计划", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(JxWhjhBo bo, HttpServletResponse response) { + List list = jxWhjhService.queryList(bo); + ExcelUtil.exportExcel(list, "机械维护计划", JxWhjhVo.class, response); + } + + /** + * 获取机械维护计划详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("jxgl:whjh:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(jxWhjhService.queryById(id)); + } + + /** + * 新增机械维护计划 + */ + @SaCheckPermission("jxgl:whjh:add") + @Log(title = "机械维护计划", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody JxWhjhBo bo) { + return toAjax(jxWhjhService.insertByBo(bo)); + } + + /** + * 修改机械维护计划 + */ + @SaCheckPermission("jxgl:whjh:edit") + @Log(title = "机械维护计划", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody JxWhjhBo bo) { + return toAjax(jxWhjhService.updateByBo(bo)); + } + + /** + * 删除机械维护计划 + * + * @param ids 主键串 + */ + @SaCheckPermission("jxgl:whjh:remove") + @Log(title = "机械维护计划", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(jxWhjhService.deleteWithValidByIds(List.of(ids), true)); + } + + + /** + * 机械维护计划头部数据返回 + * + * + */ + @SaCheckPermission("jxgl:whjh:list") + @Log(title = "机械维护计划", businessType = BusinessType.DELETE) + @GetMapping("/jxwh") + public R jxwhHead() { + return R.ok(jxWhjhService.jxwhHead()); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxWhjlController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxWhjlController.java new file mode 100644 index 00000000..353ec7da --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxWhjlController.java @@ -0,0 +1,145 @@ +package org.dromara.mechanical.jxgl.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.device.domain.bo.DeviceInfoBo; +import org.dromara.device.domain.vo.DeviceInfoVo; +import org.dromara.mechanical.jxgl.domain.bo.JxWhjhBo; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjhHeadVo; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjlHeadVo; +import org.dromara.mechanical.jxgl.service.IJxWhjhService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo; +import org.dromara.mechanical.jxgl.domain.bo.JxWhjlBo; +import org.dromara.mechanical.jxgl.service.IJxWhjlService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 机械维护记录 + * + * @author Lion Li + * @date 2025-12-01 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/jxgl/whjl") +public class JxWhjlController extends BaseController { + + private final IJxWhjlService jxWhjlService; + + private final IJxWhjhService jxWhjhService; + + + + + + + /** + * 查询机械维护计划列表 + */ + @SaCheckPermission("jxgl:whjl:list") + @GetMapping("/getlist") + public TableDataInfo list(JxWhjhBo bo, PageQuery pageQuery) { + return jxWhjhService.queryPageList(bo, pageQuery); + } + + /** + * 查询机械维护记录列表 + */ + @SaCheckPermission("jxgl:whjl:list") + @GetMapping("/list") + public TableDataInfo list(JxWhjlBo bo, PageQuery pageQuery) { + return jxWhjlService.queryPageList(bo, pageQuery); + } + + /** + * 导出机械维护记录列表 + */ + @SaCheckPermission("jxgl:whjl:export") + @Log(title = "机械维护记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(JxWhjlBo bo, HttpServletResponse response) { + List list = jxWhjlService.queryList(bo); + ExcelUtil.exportExcel(list, "机械维护记录", JxWhjlVo.class, response); + } + + /** + * 获取机械维护记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("jxgl:whjl:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(jxWhjlService.queryById(id)); + } + + /** + * 新增机械维护记录 + */ + @SaCheckPermission("jxgl:whjl:add") + @Log(title = "机械维护记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody JxWhjlBo bo) { + return toAjax(jxWhjlService.insertByBo(bo)); + } + + /** + * 修改机械维护记录 + */ + @SaCheckPermission("jxgl:whjl:edit") + @Log(title = "机械维护记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody JxWhjlBo bo) { + return toAjax(jxWhjlService.updateByBo(bo)); + } + + /** + * 删除机械维护记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("jxgl:whjl:remove") + @Log(title = "机械维护记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(jxWhjlService.deleteWithValidByIds(List.of(ids), true)); + } + /** + * 机械维护记录头部数据返回 + * + * + */ + @SaCheckPermission("jxgl:whjl:list") + @Log(title = "机械维护记录头部数据", businessType = BusinessType.DELETE) + @GetMapping("/jxwjjl") + public R jxwhHead() { + return R.ok(jxWhjlService.jxwhHead()); + } + + + + + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxGzwx.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxGzwx.java new file mode 100644 index 00000000..aa0cf93d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxGzwx.java @@ -0,0 +1,91 @@ +package org.dromara.mechanical.jxgl.domain; + +import jakarta.validation.constraints.NotBlank; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 机械故障维修对象 jx_gzwx + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("jx_gzwx") +public class JxGzwx extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 故障ID + */ + @TableId(value = "fault_id") + private Long faultId; + + /** + * 台账ID + */ + private Long equipmentId; + + /** + * 设备名称/型号（显示用） + */ + private String equipmentName; + + /** + * 故障发生时间 + */ + private LocalDateTime faultTime; + + /** + * 故障类型 （发动机/液压系统/电器系统/底盘/其他） + */ + private String faultType; + + /** + * 故障描述 + */ + private String faultDescription; + + /** + * 故障严重程度 （轻微/一般/严重/停机） + */ + private String severity; + + /** + * 维修预期完成日期 + */ + private LocalDate repairStartTime; + + /** + * 状态 维修中 已恢复 关闭 + */ + private String status; + + /** + * 故障照片、维修工单 + */ + private String attachments; + + /** + * 备注 + */ + private String remark; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxGzwxJl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxGzwxJl.java new file mode 100644 index 00000000..b06e8a2d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxGzwxJl.java @@ -0,0 +1,114 @@ +package org.dromara.mechanical.jxgl.domain; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * 机械故障维修记录对象 jx_gzwx_jl + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("jx_gzwx_jl") +public class JxGzwxJl extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 故障ID + */ + private Long faultId; + + + /** + * 台账ID + */ + private Long equipmentId; + + + /** + * 设备名称/型号（显示用） + */ + private String equipmentName; + + /** + * 维修开始时间 + */ + private LocalDateTime repairStartTime; + + /** + * 维修结束时间 + */ + private LocalDateTime repairEndTime; + + /** + * 维修人员 + */ + private Long repairPerson; + + /** + * 维修内容 + */ + private String repairContent; + + /** + * 更换配件 + */ + private String partsUsed; + + /** + * 维修费用（材料费 + 工时费） + */ + private BigDecimal repairCost; + + /** + * 原因分析 + */ + private String faultCause; + + /** + * 预防措施 + */ + private String preventiveActions; + + /** + * 状态 维修中 已恢复 关闭 + */ + private String status; + + /** + * 故障照片、维修工单 + */ + private String attachments; + + /** + * 备注 + */ + private String remark; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxWhjh.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxWhjh.java new file mode 100644 index 00000000..076488d6 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxWhjh.java @@ -0,0 +1,103 @@ +package org.dromara.mechanical.jxgl.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; +import java.time.LocalDate; + +/** + * 机械维护计划对象 jx_whjh + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("jx_whjh") +public class JxWhjh extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 计划ID（主键） + */ + @TableId(value = "id") + private Long id; + + /** + * 台账ID（关联设备台账） + */ + private Long equipmentId; + + /** + * 设备名称/型号（显示用） + */ + private String equipmentName; + + /** + * 计划类型 字典 + */ + private String planType; + + /** + * 保养级别 字典 + */ + private String maintenanceLevel; + + /** + * 保养内容 + */ + private String maintenanceItems; + + /** + * 周期类型 字典 + */ + private String cycleType; + + /** + * 周期值 + */ + private BigDecimal cycleValue; + + /** + * 计划开始日期 + */ + private LocalDate expectedStartDate; + + /** + * 计划截止日期 + */ + private LocalDate expectedEndDate; + + /** + * 负责人员 + */ + private Long responsiblePerson; + + /** + * 状态 （未开始/进行中/已完成/逾期） + */ + private String status; + + /** + * 提前几天提醒 + */ + private Long remindBeforeDays; + + /** + * 备注 + */ + private String remark; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxWhjl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxWhjl.java new file mode 100644 index 00000000..134cf973 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/JxWhjl.java @@ -0,0 +1,96 @@ +package org.dromara.mechanical.jxgl.domain; + +import jakarta.validation.constraints.NotBlank; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; +import java.time.LocalDate; + +/** + * 机械维护记录对象 jx_whjl + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("jx_whjl") +public class JxWhjl extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @TableId(value = "id") + private Long id; + + /** + * 所属计划ID（可空，因为有些是临时保养） + */ + private Long whjhId; + + /** + * 台账ID + */ + private Long equipmentId; + /** + * 设备名称/型号（显示用） + */ + private String equipmentName; + + + /** + * 实际保养日期 + */ + private LocalDate maintenanceDate; + + /** + * 当日/累计工时（用于判断周期） + */ + private BigDecimal maintenanceHours; + + /** + * 实际保养内容（JSON） + */ + private String maintenanceItems; + + /** + * 更换配件列表 + */ + private String partsReplaced; + + /** + * 使用耗材（润滑油、滤芯等） + */ + private String materialsUsed; + + /** + * 执行人 + */ + private Long maintainer; + + /** + * 保养结果（正常/异常/需复检） + */ + private String maintenanceResult; + + /** + * 备注 + */ + private String remark; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxGzwxBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxGzwxBo.java new file mode 100644 index 00000000..dcb583e1 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxGzwxBo.java @@ -0,0 +1,95 @@ +package org.dromara.mechanical.jxgl.domain.bo; + +import org.dromara.mechanical.jxgl.domain.JxGzwx; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 机械故障维修业务对象 jx_gzwx + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = JxGzwx.class, reverseConvertGenerate = false) +public class JxGzwxBo extends BaseEntity { + + /** + * 故障ID + */ + private Long faultId; + + /** + * 台账ID + */ + @NotNull(message = "台账ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long equipmentId; + + + /** + * 设备名称/型号（显示用） + */ + @NotBlank(message = "设备名称/型号（显示用）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String equipmentName; + + /** + * 故障发生时间 + */ + @NotNull(message = "故障发生时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private LocalDateTime faultTime; + + /** + * 故障类型 （发动机/液压系统/电器系统/底盘/其他） + */ + @NotBlank(message = "故障类型 （发动机/液压系统/电器系统/底盘/其他）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String faultType; + + /** + * 故障描述 + */ + @NotBlank(message = "故障描述不能为空", groups = { AddGroup.class, EditGroup.class }) + private String faultDescription; + + /** + * 故障严重程度 （轻微/一般/严重/停机） + */ + @NotBlank(message = "故障严重程度 （轻微/一般/严重/停机）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String severity; + + /** + * 维修预期完成日期 + */ + private LocalDate repairStartTime; + + /** + * 状态 维修中 已恢复 关闭 + */ + @NotBlank(message = "状态 维修中 已恢复 关闭不能为空", groups = { AddGroup.class, EditGroup.class }) + private String status; + + /** + * 故障照片、维修工单 + */ + private String attachments; + + /** + * 备注 + */ + private String remark; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxGzwxJlBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxGzwxJlBo.java new file mode 100644 index 00000000..65bdab3d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxGzwxJlBo.java @@ -0,0 +1,111 @@ +package org.dromara.mechanical.jxgl.domain.bo; + +import org.dromara.mechanical.jxgl.domain.JxGzwxJl; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 机械故障维修记录业务对象 jx_gzwx_jl + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = JxGzwxJl.class, reverseConvertGenerate = false) +public class JxGzwxJlBo extends BaseEntity { + + /** + * ID + */ + private Long id; + + /** + * 故障ID + */ + @NotNull(message = "故障ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long faultId; + + /** + * 台账ID + */ + @NotNull(message = "台账ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long equipmentId; + + + /** + * 设备名称/型号（显示用） + */ + @NotBlank(message = "设备名称/型号（显示用）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String equipmentName; + + /** + * 维修开始时间 + */ + private LocalDateTime repairStartTime; + + /** + * 维修结束时间 + */ + private LocalDateTime repairEndTime; + + /** + * 维修人员 + */ + private Long repairPerson; + + /** + * 维修内容 + */ + private String repairContent; + + /** + * 更换配件 + */ + private String partsUsed; + + /** + * 维修费用（材料费 + 工时费） + */ + private BigDecimal repairCost; + + /** + * 原因分析 + */ + private String faultCause; + + /** + * 预防措施 + */ + private String preventiveActions; + + /** + * 状态 维修中 已恢复 关闭 + */ + @NotBlank(message = "状态 维修中 已恢复 关闭不能为空", groups = { AddGroup.class, EditGroup.class }) + private String status; + + /** + * 故障照片、维修工单 + */ + private String attachments; + + /** + * 备注 + */ + private String remark; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxWhjhBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxWhjhBo.java new file mode 100644 index 00000000..b240229f --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxWhjhBo.java @@ -0,0 +1,109 @@ +package org.dromara.mechanical.jxgl.domain.bo; + +import org.dromara.mechanical.jxgl.domain.JxWhjh; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * 机械维护计划业务对象 jx_whjh + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = JxWhjh.class, reverseConvertGenerate = false) +public class JxWhjhBo extends BaseEntity { + + /** + * 计划ID（主键） + */ + private Long id; + + /** + * 台账ID（关联设备台账） + */ + @NotNull(message = "台账ID（关联设备台账）不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long equipmentId; + + /** + * 设备名称/型号（显示用） + */ + @NotBlank(message = "设备名称/型号（显示用）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String equipmentName; + + /** + * 计划类型 字典 + */ + @NotBlank(message = "计划类型 字典不能为空", groups = { AddGroup.class, EditGroup.class }) + private String planType; + + /** + * 保养级别 字典 + */ + @NotBlank(message = "保养级别 字典不能为空", groups = { AddGroup.class, EditGroup.class }) + private String maintenanceLevel; + + /** + * 保养内容 + */ + private String maintenanceItems; + + /** + * 周期类型 字典 + */ + private String cycleType; + + /** + * 周期值 + */ + private BigDecimal cycleValue; + + /** + * 计划开始日期 + */ + @NotNull(message = "计划开始日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private LocalDate expectedStartDate; + + /** + * 计划截止日期 + */ + @NotNull(message = "计划截止日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private LocalDate expectedEndDate; + + /** + * 负责人员 + */ + @NotNull(message = "负责人员不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long responsiblePerson; + + /** + * 状态 （未开始/进行中/已完成/逾期） + */ + @NotBlank(message = "状态 （未开始/进行中/已完成/逾期）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String status; + + /** + * 提前几天提醒 + */ + private Long remindBeforeDays; + + /** + * 备注 + */ + private String remark; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxWhjlBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxWhjlBo.java new file mode 100644 index 00000000..28808e00 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/bo/JxWhjlBo.java @@ -0,0 +1,97 @@ +package org.dromara.mechanical.jxgl.domain.bo; + +import org.dromara.mechanical.jxgl.domain.JxWhjl; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * 机械维护记录业务对象 jx_whjl + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = JxWhjl.class, reverseConvertGenerate = false) +public class JxWhjlBo extends BaseEntity { + + /** + * 记录ID + */ + private Long id; + + /** + * 所属计划ID（可空，因为有些是临时保养） + */ + private Long whjhId; + + /** + * 台账ID + */ + @NotNull(message = "台账ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long equipmentId; + /** + * 设备名称/型号（显示用） + */ + @NotBlank(message = "设备名称/型号（显示用）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String equipmentName; + + + /** + * 实际保养日期 + */ + @NotNull(message = "实际保养日期不能为空", groups = { AddGroup.class, EditGroup.class }) + private LocalDate maintenanceDate; + + /** + * 当日/累计工时（用于判断周期） + */ + @NotNull(message = "当日/累计工时（用于判断周期）不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal maintenanceHours; + + /** + * 实际保养内容（JSON） + */ + private String maintenanceItems; + + /** + * 更换配件列表 + */ + private String partsReplaced; + + /** + * 使用耗材（润滑油、滤芯等） + */ + private String materialsUsed; + + /** + * 执行人 + */ + @NotNull(message = "执行人不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long maintainer; + + /** + * 保养结果（正常/异常/需复检） + */ + @NotBlank(message = "保养结果（正常/异常/需复检）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String maintenanceResult; + + /** + * 备注 + */ + private String remark; + + /** + * 文件id （多个文件逗号分隔） + */ + private String fileId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxHeadVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxHeadVo.java new file mode 100644 index 00000000..287bcb5c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxHeadVo.java @@ -0,0 +1,21 @@ +package org.dromara.mechanical.jxgl.domain.vo; + + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class JxGzwxHeadVo implements Serializable { + + //总计划数 + private Long zs = 0L; + + //待处理 + private Long dcl = 0L; + + // 已完成 + private Long ywc = 0L; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxJlVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxJlVo.java new file mode 100644 index 00000000..22122ead --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxJlVo.java @@ -0,0 +1,137 @@ +package org.dromara.mechanical.jxgl.domain.vo; + +import java.math.BigDecimal; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mechanical.jxgl.domain.JxGzwxJl; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Date; + + + +/** + * 机械故障维修记录视图对象 jx_gzwx_jl + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = JxGzwxJl.class) +public class JxGzwxJlVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 台账ID + */ + private Long equipmentId; + + + /** + * 设备名称/型号（显示用） + */ + private String equipmentName; + + /** + * 故障ID + */ + @ExcelProperty(value = "故障ID") + private Long faultId; + + /** + * 维修开始时间 + */ + @ExcelProperty(value = "维修开始时间") + private LocalDateTime repairStartTime; + + /** + * 维修结束时间 + */ + @ExcelProperty(value = "维修结束时间") + private LocalDateTime repairEndTime; + + /** + * 维修人员 + */ + @ExcelProperty(value = "维修人员") + private Long repairPerson; + + /** + * 维修内容 + */ + @ExcelProperty(value = "维修内容") + private String repairContent; + + /** + * 更换配件 + */ + @ExcelProperty(value = "更换配件") + private String partsUsed; + + /** + * 维修费用（材料费 + 工时费） + */ + @ExcelProperty(value = "维修费用", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "材=料费,+=,工=时费") + private BigDecimal repairCost; + + /** + * 原因分析 + */ + @ExcelProperty(value = "原因分析 ") + private String faultCause; + + /** + * 预防措施 + */ + @ExcelProperty(value = "预防措施") + private String preventiveActions; + + /** + * 状态 维修中 已恢复 关闭 + */ + @ExcelProperty(value = "状态 维修中 已恢复 关闭", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "jx_gzwxzt") + private String status; + + /** + * 故障照片、维修工单 + */ + @ExcelProperty(value = "故障照片、维修工单") + private String attachments; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 文件id （多个文件逗号分隔） + */ + @ExcelProperty(value = "文件id ", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔") + private String fileId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxVo.java new file mode 100644 index 00000000..74f4b586 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxGzwxVo.java @@ -0,0 +1,112 @@ +package org.dromara.mechanical.jxgl.domain.vo; + +import jakarta.validation.constraints.NotBlank; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mechanical.jxgl.domain.JxGzwx; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Date; + + + +/** + * 机械故障维修视图对象 jx_gzwx + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = JxGzwx.class) +public class JxGzwxVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 故障ID + */ + @ExcelProperty(value = "故障ID") + private Long faultId; + + /** + * 台账ID + */ + @ExcelProperty(value = "台账ID") + private Long equipmentId; + + /** + * 设备名称/型号（显示用） + */ + private String equipmentName; + + /** + * 故障发生时间 + */ + @ExcelProperty(value = "故障发生时间") + private LocalDateTime faultTime; + + /** + * 故障类型 （发动机/液压系统/电器系统/底盘/其他） + */ + @ExcelProperty(value = "故障类型 ", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "jx_gzlx") + private String faultType; + + /** + * 故障描述 + */ + @ExcelProperty(value = "故障描述") + private String faultDescription; + + /** + * 故障严重程度 （轻微/一般/严重/停机） + */ + @ExcelProperty(value = "故障严重程度 ", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "jx_gzyzcd") + private String severity; + + /** + * 维修预期完成日期 + */ + @ExcelProperty(value = "维修预期完成日期") + private LocalDate repairStartTime; + + /** + * 状态 维修中 已恢复 关闭 + */ + @ExcelProperty(value = "状态 维修中 已恢复 关闭", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "jx_gzwxzt") + private String status; + + /** + * 故障照片、维修工单 + */ + @ExcelProperty(value = "故障照片、维修工单") + private String attachments; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 文件id （多个文件逗号分隔） + */ + @ExcelProperty(value = "文件id ", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔") + private String fileId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjhHeadVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjhHeadVo.java new file mode 100644 index 00000000..2ecb573b --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjhHeadVo.java @@ -0,0 +1,23 @@ +package org.dromara.mechanical.jxgl.domain.vo; + +import lombok.Data; + +import java.io.Serializable; + + +@Data +public class JxWhjhHeadVo implements Serializable { + //总计划数 + private Long zs = 0L; + + //未完成 + private Long wwc = 0L; + //已完成 + private Long ywc = 0L; + //逾期 + private Long yq = 0L; + + + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjhVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjhVo.java new file mode 100644 index 00000000..13c866eb --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjhVo.java @@ -0,0 +1,132 @@ +package org.dromara.mechanical.jxgl.domain.vo; + +import java.math.BigDecimal; +import org.dromara.mechanical.jxgl.domain.JxWhjh; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDate; +import java.util.Date; + + + +/** + * 机械维护计划视图对象 jx_whjh + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = JxWhjh.class) +public class JxWhjhVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 计划ID（主键） + */ + @ExcelProperty(value = "计划ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "主=键") + private Long id; + + /** + * 台账ID（关联设备台账） + */ + @ExcelProperty(value = "台账ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联设备台账") + private Long equipmentId; + + /** + * 设备名称/型号（显示用） + */ + @ExcelProperty(value = "设备名称/型号", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "显=示用") + private String equipmentName; + + /** + * 计划类型 字典 + */ + @ExcelProperty(value = "计划类型 字典", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "jx_jhlx") + private String planType; + + /** + * 保养级别 字典 + */ + @ExcelProperty(value = "保养级别 字典", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "jx_byjb") + private String maintenanceLevel; + + /** + * 保养内容 + */ + @ExcelProperty(value = "保养内容") + private String maintenanceItems; + + /** + * 周期类型 字典 + */ + @ExcelProperty(value = "周期类型 字典", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "jx_zqlx") + private String cycleType; + + /** + * 周期值 + */ + @ExcelProperty(value = "周期值") + private BigDecimal cycleValue; + + /** + * 计划开始日期 + */ + @ExcelProperty(value = "计划开始日期") + private LocalDate expectedStartDate; + + /** + * 计划截止日期 + */ + @ExcelProperty(value = "计划截止日期") + private LocalDate expectedEndDate; + + /** + * 负责人员 + */ + @ExcelProperty(value = "负责人员") + private Long responsiblePerson; + + /** + * 状态 （未开始/进行中/已完成/逾期） + */ + @ExcelProperty(value = "状态 ", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "jx_whjhzt") + private String status; + + /** + * 提前几天提醒 + */ + @ExcelProperty(value = "提前几天提醒") + private Long remindBeforeDays; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 文件id （多个文件逗号分隔） + */ + @ExcelProperty(value = "文件id ", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔") + private String fileId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjlHeadVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjlHeadVo.java new file mode 100644 index 00000000..24159744 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjlHeadVo.java @@ -0,0 +1,17 @@ +package org.dromara.mechanical.jxgl.domain.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class JxWhjlHeadVo implements Serializable { + //总数 + private Long zs = 0L; + //正常 + private Long zc = 0L; + //异常 + private Long yc = 0L; + //需复检 + private Long xfc = 0L; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjlVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjlVo.java new file mode 100644 index 00000000..805715b2 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/domain/vo/JxWhjlVo.java @@ -0,0 +1,122 @@ +package org.dromara.mechanical.jxgl.domain.vo; + +import java.math.BigDecimal; + +import jakarta.validation.constraints.NotBlank; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mechanical.jxgl.domain.JxWhjl; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDate; +import java.util.Date; + + + +/** + * 机械维护记录视图对象 jx_whjl + * + * @author Lion Li + * @date 2025-12-01 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = JxWhjl.class) +public class JxWhjlVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @ExcelProperty(value = "记录ID") + private Long id; + + /** + * 所属计划ID（可空，因为有些是临时保养） + */ + @ExcelProperty(value = "所属计划ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "可=空，因为有些是临时保养") + private Long whjhId; + + /** + * 台账ID + */ + @ExcelProperty(value = "台账ID") + private Long equipmentId; + + /** + * 设备名称/型号（显示用） + */ + private String equipmentName; + + + /** + * 实际保养日期 + */ + @ExcelProperty(value = "实际保养日期") + private LocalDate maintenanceDate; + + /** + * 当日/累计工时（用于判断周期） + */ + @ExcelProperty(value = "当日/累计工时", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "用=于判断周期") + private BigDecimal maintenanceHours; + + /** + * 实际保养内容（JSON） + */ + @ExcelProperty(value = "实际保养内容", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "J=SON") + private String maintenanceItems; + + /** + * 更换配件列表 + */ + @ExcelProperty(value = "更换配件列表") + private String partsReplaced; + + /** + * 使用耗材（润滑油、滤芯等） + */ + @ExcelProperty(value = "使用耗材", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "润=滑油、滤芯等") + private String materialsUsed; + + /** + * 执行人 + */ + @ExcelProperty(value = "执行人") + private Long maintainer; + + /** + * 保养结果（正常/异常/需复检） + */ + @ExcelProperty(value = "保养结果", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "正=常/异常/需复检") + private String maintenanceResult; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 文件id （多个文件逗号分隔） + */ + @ExcelProperty(value = "文件id ", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "多=个文件逗号分隔") + private String fileId; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxGzwxJlMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxGzwxJlMapper.java new file mode 100644 index 00000000..c31756f5 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxGzwxJlMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mechanical.jxgl.mapper; + +import org.dromara.mechanical.jxgl.domain.JxGzwxJl; +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxJlVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 机械故障维修记录Mapper接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface JxGzwxJlMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxGzwxMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxGzwxMapper.java new file mode 100644 index 00000000..51d42287 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxGzwxMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mechanical.jxgl.mapper; + +import org.dromara.mechanical.jxgl.domain.JxGzwx; +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 机械故障维修Mapper接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface JxGzwxMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxWhjhMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxWhjhMapper.java new file mode 100644 index 00000000..c4f3cf0e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxWhjhMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mechanical.jxgl.mapper; + +import org.dromara.mechanical.jxgl.domain.JxWhjh; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 机械维护计划Mapper接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface JxWhjhMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxWhjlMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxWhjlMapper.java new file mode 100644 index 00000000..d1b9570c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/mapper/JxWhjlMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mechanical.jxgl.mapper; + +import org.dromara.mechanical.jxgl.domain.JxWhjl; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 机械维护记录Mapper接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface JxWhjlMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxGzwxJlService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxGzwxJlService.java new file mode 100644 index 00000000..a4b2634d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxGzwxJlService.java @@ -0,0 +1,73 @@ +package org.dromara.mechanical.jxgl.service; + +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo; +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxJlVo; +import org.dromara.mechanical.jxgl.domain.bo.JxGzwxJlBo; +import org.dromara.mechanical.jxgl.domain.JxGzwxJl; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 机械故障维修记录Service接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface IJxGzwxJlService extends IService{ + + /** + * 查询机械故障维修记录 + * + * @param id 主键 + * @return 机械故障维修记录 + */ + JxGzwxJlVo queryById(Long id); + + /** + * 分页查询机械故障维修记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机械故障维修记录分页列表 + */ + TableDataInfo queryPageList(JxGzwxJlBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的机械故障维修记录列表 + * + * @param bo 查询条件 + * @return 机械故障维修记录列表 + */ + List queryList(JxGzwxJlBo bo); + + /** + * 新增机械故障维修记录 + * + * @param bo 机械故障维修记录 + * @return 是否新增成功 + */ + Boolean insertByBo(JxGzwxJlBo bo); + + /** + * 修改机械故障维修记录 + * + * @param bo 机械故障维修记录 + * @return 是否修改成功 + */ + Boolean updateByBo(JxGzwxJlBo bo); + + /** + * 校验并批量删除机械故障维修记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + JxGzwxHeadVo jxgzwx(); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxGzwxService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxGzwxService.java new file mode 100644 index 00000000..f040ddc5 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxGzwxService.java @@ -0,0 +1,73 @@ +package org.dromara.mechanical.jxgl.service; + +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo; +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxVo; +import org.dromara.mechanical.jxgl.domain.bo.JxGzwxBo; +import org.dromara.mechanical.jxgl.domain.JxGzwx; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 机械故障维修Service接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface IJxGzwxService extends IService{ + + /** + * 查询机械故障维修 + * + * @param faultId 主键 + * @return 机械故障维修 + */ + JxGzwxVo queryById(Long faultId); + + /** + * 分页查询机械故障维修列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机械故障维修分页列表 + */ + TableDataInfo queryPageList(JxGzwxBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的机械故障维修列表 + * + * @param bo 查询条件 + * @return 机械故障维修列表 + */ + List queryList(JxGzwxBo bo); + + /** + * 新增机械故障维修 + * + * @param bo 机械故障维修 + * @return 是否新增成功 + */ + Boolean insertByBo(JxGzwxBo bo); + + /** + * 修改机械故障维修 + * + * @param bo 机械故障维修 + * @return 是否修改成功 + */ + Boolean updateByBo(JxGzwxBo bo); + + /** + * 校验并批量删除机械故障维修信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + JxGzwxHeadVo jxgzwx(); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxWhjhService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxWhjhService.java new file mode 100644 index 00000000..3c4127d1 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxWhjhService.java @@ -0,0 +1,73 @@ +package org.dromara.mechanical.jxgl.service; + +import org.dromara.mechanical.jxgl.domain.vo.JxWhjhHeadVo; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo; +import org.dromara.mechanical.jxgl.domain.bo.JxWhjhBo; +import org.dromara.mechanical.jxgl.domain.JxWhjh; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 机械维护计划Service接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface IJxWhjhService extends IService{ + + /** + * 查询机械维护计划 + * + * @param id 主键 + * @return 机械维护计划 + */ + JxWhjhVo queryById(Long id); + + /** + * 分页查询机械维护计划列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机械维护计划分页列表 + */ + TableDataInfo queryPageList(JxWhjhBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的机械维护计划列表 + * + * @param bo 查询条件 + * @return 机械维护计划列表 + */ + List queryList(JxWhjhBo bo); + + /** + * 新增机械维护计划 + * + * @param bo 机械维护计划 + * @return 是否新增成功 + */ + Boolean insertByBo(JxWhjhBo bo); + + /** + * 修改机械维护计划 + * + * @param bo 机械维护计划 + * @return 是否修改成功 + */ + Boolean updateByBo(JxWhjhBo bo); + + /** + * 校验并批量删除机械维护计划信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + JxWhjhHeadVo jxwhHead(); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxWhjlService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxWhjlService.java new file mode 100644 index 00000000..6f2255da --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/IJxWhjlService.java @@ -0,0 +1,73 @@ +package org.dromara.mechanical.jxgl.service; + +import org.dromara.mechanical.jxgl.domain.vo.JxWhjlHeadVo; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo; +import org.dromara.mechanical.jxgl.domain.bo.JxWhjlBo; +import org.dromara.mechanical.jxgl.domain.JxWhjl; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Collection; +import java.util.List; + +/** + * 机械维护记录Service接口 + * + * @author Lion Li + * @date 2025-12-01 + */ +public interface IJxWhjlService extends IService{ + + /** + * 查询机械维护记录 + * + * @param id 主键 + * @return 机械维护记录 + */ + JxWhjlVo queryById(Long id); + + /** + * 分页查询机械维护记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机械维护记录分页列表 + */ + TableDataInfo queryPageList(JxWhjlBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的机械维护记录列表 + * + * @param bo 查询条件 + * @return 机械维护记录列表 + */ + List queryList(JxWhjlBo bo); + + /** + * 新增机械维护记录 + * + * @param bo 机械维护记录 + * @return 是否新增成功 + */ + Boolean insertByBo(JxWhjlBo bo); + + /** + * 修改机械维护记录 + * + * @param bo 机械维护记录 + * @return 是否修改成功 + */ + Boolean updateByBo(JxWhjlBo bo); + + /** + * 校验并批量删除机械维护记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + JxWhjlHeadVo jxwhHead(); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxGzwxJlServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxGzwxJlServiceImpl.java new file mode 100644 index 00000000..34ef2b9e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxGzwxJlServiceImpl.java @@ -0,0 +1,171 @@ +package org.dromara.mechanical.jxgl.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.mechanical.jxgl.domain.JxGzwx; +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo; +import org.dromara.mechanical.jxgl.service.IJxGzwxService; +import org.springframework.stereotype.Service; +import org.dromara.mechanical.jxgl.domain.bo.JxGzwxJlBo; +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxJlVo; +import org.dromara.mechanical.jxgl.domain.JxGzwxJl; +import org.dromara.mechanical.jxgl.mapper.JxGzwxJlMapper; +import org.dromara.mechanical.jxgl.service.IJxGzwxJlService; + +import java.time.LocalDate; +import java.time.temporal.TemporalAdjusters; +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 机械故障维修记录Service业务层处理 + * + * @author Lion Li + * @date 2025-12-01 + */ +@RequiredArgsConstructor +@Service +public class JxGzwxJlServiceImpl extends ServiceImpl implements IJxGzwxJlService { + + private final JxGzwxJlMapper baseMapper; + + private final IJxGzwxService jxGzwxService; + + /** + * 查询机械故障维修记录 + * + * @param id 主键 + * @return 机械故障维修记录 + */ + @Override + public JxGzwxJlVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询机械故障维修记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机械故障维修记录分页列表 + */ + @Override + public TableDataInfo queryPageList(JxGzwxJlBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的机械故障维修记录列表 + * + * @param bo 查询条件 + * @return 机械故障维修记录列表 + */ + @Override + public List queryList(JxGzwxJlBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(JxGzwxJlBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(JxGzwxJl::getId); + lqw.eq(bo.getFaultId() != null, JxGzwxJl::getFaultId, bo.getFaultId()); + lqw.eq(bo.getRepairStartTime() != null, JxGzwxJl::getRepairStartTime, bo.getRepairStartTime()); + lqw.eq(bo.getRepairEndTime() != null, JxGzwxJl::getRepairEndTime, bo.getRepairEndTime()); + lqw.eq(bo.getRepairPerson() != null, JxGzwxJl::getRepairPerson, bo.getRepairPerson()); + lqw.eq(StringUtils.isNotBlank(bo.getRepairContent()), JxGzwxJl::getRepairContent, bo.getRepairContent()); + lqw.eq(StringUtils.isNotBlank(bo.getPartsUsed()), JxGzwxJl::getPartsUsed, bo.getPartsUsed()); + lqw.eq(bo.getRepairCost() != null, JxGzwxJl::getRepairCost, bo.getRepairCost()); + lqw.eq(StringUtils.isNotBlank(bo.getFaultCause()), JxGzwxJl::getFaultCause, bo.getFaultCause()); + lqw.eq(StringUtils.isNotBlank(bo.getPreventiveActions()), JxGzwxJl::getPreventiveActions, bo.getPreventiveActions()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), JxGzwxJl::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getAttachments()), JxGzwxJl::getAttachments, bo.getAttachments()); + lqw.eq(StringUtils.isNotBlank(bo.getFileId()), JxGzwxJl::getFileId, bo.getFileId()); + return lqw; + } + + /** + * 新增机械故障维修记录 + * + * @param bo 机械故障维修记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(JxGzwxJlBo bo) { + JxGzwxJl add = MapstructUtils.convert(bo, JxGzwxJl.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (bo != null){ + jxGzwxService.getBaseMapper().update(new UpdateWrapper().eq("fault_id", bo.getFaultId()).set("status",bo.getStatus())); + } + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改机械故障维修记录 + * + * @param bo 机械故障维修记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(JxGzwxJlBo bo) { + JxGzwxJl update = MapstructUtils.convert(bo, JxGzwxJl.class); + validEntityBeforeSave(update); + if (bo != null){ + jxGzwxService.getBaseMapper().update(new UpdateWrapper().eq("fault_id", bo.getFaultId()).set("status",bo.getStatus())); + } + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(JxGzwxJl entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除机械故障维修记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public JxGzwxHeadVo jxgzwx() { + JxGzwxHeadVo jxGzwxHeadVo = new JxGzwxHeadVo(); + List jxGzwxes = this.baseMapper.selectList(new LambdaQueryWrapper().ge(JxGzwxJl::getCreateTime, LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()))); + if (jxGzwxes != null && jxGzwxes.size() > 0) { + long wxz = jxGzwxes.stream().filter(jxGzwx -> "1".equals(jxGzwx.getStatus())).count(); + long hf = jxGzwxes.stream().filter(jxGzwx -> "2".equals(jxGzwx.getStatus())).count(); + + jxGzwxHeadVo.setDcl(wxz); + jxGzwxHeadVo.setZs(Long.valueOf(jxGzwxes.size())); + jxGzwxHeadVo.setYwc(hf); + } + return jxGzwxHeadVo; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxGzwxServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxGzwxServiceImpl.java new file mode 100644 index 00000000..9f75c38d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxGzwxServiceImpl.java @@ -0,0 +1,178 @@ +package org.dromara.mechanical.jxgl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.mechanical.jxgl.domain.JxWhjh; +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxHeadVo; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo; +import org.dromara.system.service.impl.SysOssServiceImpl; +import org.springframework.stereotype.Service; +import org.dromara.mechanical.jxgl.domain.bo.JxGzwxBo; +import org.dromara.mechanical.jxgl.domain.vo.JxGzwxVo; +import org.dromara.mechanical.jxgl.domain.JxGzwx; +import org.dromara.mechanical.jxgl.mapper.JxGzwxMapper; +import org.dromara.mechanical.jxgl.service.IJxGzwxService; + +import java.time.LocalDate; +import java.time.temporal.TemporalAdjusters; +import java.util.*; + +/** + * 机械故障维修Service业务层处理 + * + * @author Lion Li + * @date 2025-12-01 + */ +@RequiredArgsConstructor +@Service +public class JxGzwxServiceImpl extends ServiceImpl implements IJxGzwxService { + + private final JxGzwxMapper baseMapper; + + private final SysOssServiceImpl sysOssService; + + /** + * 查询机械故障维修 + * + * @param faultId 主键 + * @return 机械故障维修 + */ + @Override + public JxGzwxVo queryById(Long faultId){ + return baseMapper.selectVoById(faultId); + } + + /** + * 分页查询机械故障维修列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机械故障维修分页列表 + */ + @Override + public TableDataInfo queryPageList(JxGzwxBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的机械故障维修列表 + * + * @param bo 查询条件 + * @return 机械故障维修列表 + */ + @Override + public List queryList(JxGzwxBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(JxGzwxBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(JxGzwx::getFaultId); + lqw.eq(bo.getEquipmentId() != null, JxGzwx::getEquipmentId, bo.getEquipmentId()); + lqw.eq(bo.getFaultTime() != null, JxGzwx::getFaultTime, bo.getFaultTime()); + lqw.eq(StringUtils.isNotBlank(bo.getFaultType()), JxGzwx::getFaultType, bo.getFaultType()); + lqw.eq(StringUtils.isNotBlank(bo.getFaultDescription()), JxGzwx::getFaultDescription, bo.getFaultDescription()); + lqw.eq(StringUtils.isNotBlank(bo.getSeverity()), JxGzwx::getSeverity, bo.getSeverity()); + lqw.eq(bo.getRepairStartTime() != null, JxGzwx::getRepairStartTime, bo.getRepairStartTime()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), JxGzwx::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getAttachments()), JxGzwx::getAttachments, bo.getAttachments()); + lqw.eq(StringUtils.isNotBlank(bo.getFileId()), JxGzwx::getFileId, bo.getFileId()); + return lqw; + } + + /** + * 新增机械故障维修 + * + * @param bo 机械故障维修 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(JxGzwxBo bo) { + JxGzwx add = MapstructUtils.convert(bo, JxGzwx.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setFaultId(add.getFaultId()); + } + return flag; + } + + /** + * 修改机械故障维修 + * + * @param bo 机械故障维修 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(JxGzwxBo bo) { + JxGzwx update = MapstructUtils.convert(bo, JxGzwx.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(JxGzwx entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除机械故障维修信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + + List deleteIds = new ArrayList<>(); + for (Long id : ids) { + JxGzwxVo vo = baseMapper.selectVoById(id); + if (vo != null){ + //删除附件 + if (vo.getFileId()!= null && !vo.getFileId().isEmpty()){ + List list = Arrays.stream(vo.getFileId().split(",")).map(Long::valueOf).toList(); + deleteIds.addAll(list); + } + } + } + if (!deleteIds.isEmpty()) { + sysOssService.deleteWithValidByIds(deleteIds, false); + } + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public JxGzwxHeadVo jxgzwx() { + + JxGzwxHeadVo jxGzwxHeadVo = new JxGzwxHeadVo(); + List jxGzwxes = this.baseMapper.selectList(new LambdaQueryWrapper().ge(JxGzwx::getCreateTime, LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()))); + if (jxGzwxes != null && jxGzwxes.size() > 0) { + long wxz = jxGzwxes.stream().filter(jxGzwx -> "1".equals(jxGzwx.getStatus())).count(); + long hf = jxGzwxes.stream().filter(jxGzwx -> "2".equals(jxGzwx.getStatus())).count(); + + jxGzwxHeadVo.setDcl(wxz); + jxGzwxHeadVo.setZs(Long.valueOf(jxGzwxes.size())); + jxGzwxHeadVo.setYwc(hf); + } + + + return jxGzwxHeadVo; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxWhjhServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxWhjhServiceImpl.java new file mode 100644 index 00000000..cfe4bf09 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxWhjhServiceImpl.java @@ -0,0 +1,177 @@ +package org.dromara.mechanical.jxgl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjhHeadVo; +import org.dromara.system.service.impl.SysOssServiceImpl; +import org.dromara.xzd.settlement.domain.vo.XzdJsSjJungonVo; +import org.springframework.stereotype.Service; +import org.dromara.mechanical.jxgl.domain.bo.JxWhjhBo; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo; +import org.dromara.mechanical.jxgl.domain.JxWhjh; +import org.dromara.mechanical.jxgl.mapper.JxWhjhMapper; +import org.dromara.mechanical.jxgl.service.IJxWhjhService; + +import java.time.LocalDate; +import java.time.temporal.TemporalAdjusters; +import java.util.*; + +/** + * 机械维护计划Service业务层处理 + * + * @author Lion Li + * @date 2025-12-01 + */ +@RequiredArgsConstructor +@Service +public class JxWhjhServiceImpl extends ServiceImpl implements IJxWhjhService { + + private final JxWhjhMapper baseMapper; + private final SysOssServiceImpl sysOssService; + + /** + * 查询机械维护计划 + * + * @param id 主键 + * @return 机械维护计划 + */ + @Override + public JxWhjhVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询机械维护计划列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机械维护计划分页列表 + */ + @Override + public TableDataInfo queryPageList(JxWhjhBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的机械维护计划列表 + * + * @param bo 查询条件 + * @return 机械维护计划列表 + */ + @Override + public List queryList(JxWhjhBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(JxWhjhBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(JxWhjh::getId); + lqw.eq(bo.getEquipmentId() != null, JxWhjh::getEquipmentId, bo.getEquipmentId()); + lqw.like(StringUtils.isNotBlank(bo.getEquipmentName()), JxWhjh::getEquipmentName, bo.getEquipmentName()); + lqw.eq(StringUtils.isNotBlank(bo.getPlanType()), JxWhjh::getPlanType, bo.getPlanType()); + lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceLevel()), JxWhjh::getMaintenanceLevel, bo.getMaintenanceLevel()); + lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceItems()), JxWhjh::getMaintenanceItems, bo.getMaintenanceItems()); + lqw.eq(StringUtils.isNotBlank(bo.getCycleType()), JxWhjh::getCycleType, bo.getCycleType()); + lqw.eq(bo.getCycleValue() != null, JxWhjh::getCycleValue, bo.getCycleValue()); + lqw.eq(bo.getExpectedStartDate() != null, JxWhjh::getExpectedStartDate, bo.getExpectedStartDate()); + lqw.eq(bo.getExpectedEndDate() != null, JxWhjh::getExpectedEndDate, bo.getExpectedEndDate()); + lqw.eq(bo.getResponsiblePerson() != null, JxWhjh::getResponsiblePerson, bo.getResponsiblePerson()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), JxWhjh::getStatus, bo.getStatus()); + lqw.eq(bo.getRemindBeforeDays() != null, JxWhjh::getRemindBeforeDays, bo.getRemindBeforeDays()); + lqw.eq(StringUtils.isNotBlank(bo.getFileId()), JxWhjh::getFileId, bo.getFileId()); + return lqw; + } + + /** + * 新增机械维护计划 + * + * @param bo 机械维护计划 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(JxWhjhBo bo) { + JxWhjh add = MapstructUtils.convert(bo, JxWhjh.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改机械维护计划 + * + * @param bo 机械维护计划 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(JxWhjhBo bo) { + JxWhjh update = MapstructUtils.convert(bo, JxWhjh.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(JxWhjh entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除机械维护计划信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + List deleteIds = new ArrayList<>(); + for (Long id : ids) { + JxWhjhVo vo = baseMapper.selectVoById(id); + if (vo != null){ + //删除附件 + if (vo.getFileId()!= null && !vo.getFileId().isEmpty()){ + List list = Arrays.stream(vo.getFileId().split(",")).map(Long::valueOf).toList(); + deleteIds.addAll(list); + } + } + } + if (!deleteIds.isEmpty()) { + sysOssService.deleteWithValidByIds(deleteIds, false); + } + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public JxWhjhHeadVo jxwhHead() { + JxWhjhHeadVo jxWhjhHeadVo = new JxWhjhHeadVo(); + List jxWhjhs = this.baseMapper.selectList(new LambdaQueryWrapper().ge(JxWhjh::getCreateTime, LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()))); + if (jxWhjhs != null && jxWhjhs.size() > 0) { + long countwwc = jxWhjhs.stream().filter(jxwhjh -> "1".equals(jxwhjh.getStatus()) || "2".equals(jxwhjh.getStatus())).count(); + long countywc = jxWhjhs.stream().filter(jxwhjh -> "3".equals(jxwhjh.getStatus())).count(); + long countyq = jxWhjhs.stream().filter(jxwhjh -> "4".equals(jxwhjh.getStatus())).count(); + jxWhjhHeadVo.setWwc(countwwc); + jxWhjhHeadVo.setYq(countyq); + jxWhjhHeadVo.setYwc(countywc); + jxWhjhHeadVo.setZs(Long.valueOf(jxWhjhs.size())); + } + return jxWhjhHeadVo; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxWhjlServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxWhjlServiceImpl.java new file mode 100644 index 00000000..2b9ccf12 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxWhjlServiceImpl.java @@ -0,0 +1,200 @@ +package org.dromara.mechanical.jxgl.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.mechanical.jxgl.domain.JxWhjh; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjlHeadVo; +import org.dromara.mechanical.jxgl.service.IJxWhjhService; +import org.dromara.system.service.impl.SysOssServiceImpl; +import org.springframework.stereotype.Service; +import org.dromara.mechanical.jxgl.domain.bo.JxWhjlBo; +import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo; +import org.dromara.mechanical.jxgl.domain.JxWhjl; +import org.dromara.mechanical.jxgl.mapper.JxWhjlMapper; +import org.dromara.mechanical.jxgl.service.IJxWhjlService; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.time.temporal.TemporalAdjusters; +import java.util.*; + +/** + * 机械维护记录Service业务层处理 + * + * @author Lion Li + * @date 2025-12-01 + */ +@RequiredArgsConstructor +@Service +public class JxWhjlServiceImpl extends ServiceImpl implements IJxWhjlService { + + private final JxWhjlMapper baseMapper; + + private final IJxWhjhService jxWhjhService; + + private final SysOssServiceImpl sysOssService; + + + /** + * 查询机械维护记录 + * + * @param id 主键 + * @return 机械维护记录 + */ + @Override + public JxWhjlVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询机械维护记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 机械维护记录分页列表 + */ + @Override + public TableDataInfo queryPageList(JxWhjlBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的机械维护记录列表 + * + * @param bo 查询条件 + * @return 机械维护记录列表 + */ + @Override + public List queryList(JxWhjlBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(JxWhjlBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByDesc(JxWhjl::getId); + lqw.eq(bo.getWhjhId() != null, JxWhjl::getWhjhId, bo.getWhjhId()); + lqw.eq(bo.getEquipmentId() != null, JxWhjl::getEquipmentId, bo.getEquipmentId()); + lqw.eq(bo.getMaintenanceDate() != null, JxWhjl::getMaintenanceDate, bo.getMaintenanceDate()); + lqw.eq(bo.getMaintenanceHours() != null, JxWhjl::getMaintenanceHours, bo.getMaintenanceHours()); + lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceItems()), JxWhjl::getMaintenanceItems, bo.getMaintenanceItems()); + lqw.eq(StringUtils.isNotBlank(bo.getPartsReplaced()), JxWhjl::getPartsReplaced, bo.getPartsReplaced()); + lqw.eq(StringUtils.isNotBlank(bo.getMaterialsUsed()), JxWhjl::getMaterialsUsed, bo.getMaterialsUsed()); + lqw.eq(bo.getMaintainer() != null, JxWhjl::getMaintainer, bo.getMaintainer()); + lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceResult()), JxWhjl::getMaintenanceResult, bo.getMaintenanceResult()); + lqw.eq(StringUtils.isNotBlank(bo.getFileId()), JxWhjl::getFileId, bo.getFileId()); + return lqw; + } + + /** + * 新增机械维护记录 + * + * @param bo 机械维护记录 + * @return 是否新增成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(JxWhjlBo bo) { + JxWhjl add = MapstructUtils.convert(bo, JxWhjl.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (bo != null){ + if ("1".equals(bo.getMaintenanceResult())){ + jxWhjhService.getBaseMapper().update(new UpdateWrapper().eq("id",bo.getWhjhId()).set("status","3")); + }else { + jxWhjhService.getBaseMapper().update(new UpdateWrapper().eq("id",bo.getWhjhId()).set("status","2")); + + } + } + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改机械维护记录 + * + * @param bo 机械维护记录 + * @return 是否修改成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(JxWhjlBo bo) { + JxWhjl update = MapstructUtils.convert(bo, JxWhjl.class); + validEntityBeforeSave(update); + if (update != null){ + if ("1".equals(update.getMaintenanceResult())){ + jxWhjhService.getBaseMapper().update(new UpdateWrapper().eq("id",bo.getWhjhId()).set("status","3")); + }else { + jxWhjhService.getBaseMapper().update(new UpdateWrapper().eq("id",bo.getWhjhId()).set("status","2")); + } + } + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(JxWhjl entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除机械维护记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + List deleteIds = new ArrayList<>(); + for (Long id : ids) { + JxWhjlVo vo = baseMapper.selectVoById(id); + if (vo != null){ + //删除附件 + if (vo.getFileId()!= null && !vo.getFileId().isEmpty()){ + List list = Arrays.stream(vo.getFileId().split(",")).map(Long::valueOf).toList(); + deleteIds.addAll(list); + } + } + } + if (!deleteIds.isEmpty()) { + sysOssService.deleteWithValidByIds(deleteIds, false); + } + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public JxWhjlHeadVo jxwhHead() { + + JxWhjlHeadVo jxWhjlHeadVo = new JxWhjlHeadVo(); + List jxWhjls = this.baseMapper.selectList(new LambdaQueryWrapper().ge(JxWhjl::getCreateTime, LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()))); + if (jxWhjls != null && jxWhjls.size() > 0) { + long zc = jxWhjls.stream().filter(jxwhjl -> "1".equals(jxwhjl.getMaintenanceResult())).count(); + long yc = jxWhjls.stream().filter(jxwhjl -> "2".equals(jxwhjl.getMaintenanceResult())).count(); + long fc = jxWhjls.stream().filter(jxwhjl -> "3".equals(jxwhjl.getMaintenanceResult())).count(); + jxWhjlHeadVo.setZs(Long.valueOf(jxWhjls.size())); + jxWhjlHeadVo.setZc(zc); + jxWhjlHeadVo.setYc(yc); + jxWhjlHeadVo.setXfc(fc); + } + return jxWhjlHeadVo; + } +} From 3e38cf9abb57fa515cfcbf7e67032d0cedc67197 Mon Sep 17 00:00:00 2001 From: lg Date: Tue, 2 Dec 2025 10:10:50 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=98=BE=E7=A4=BAbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/XzdSubcontractServiceImpl.java | 5 +++-- .../service/impl/XzdContractMachineryServiceImpl.java | 6 ++++-- .../impl/XzdPurchaseContractInformationServiceImpl.java | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java index fb038f18..2893fada 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java @@ -19,6 +19,7 @@ import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService; +import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.XzdPurchaseContractAlteration; import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.XzdSubcontractChange; import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.vo.XzdSubcontractChangeVo; import org.dromara.xzd.contractManagement.fenbaohetongbiangg.service.IXzdSubcontractChangeService; @@ -201,11 +202,11 @@ public class XzdSubcontractServiceImpl extends ServiceImpl().eq(XzdSubcontractChange::getContractCode, item.getId())); + Long l = xzdSubcontractChangeService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdSubcontractChange::getContractCode, item.getId()).eq(XzdSubcontractChange::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())); if (l > 0) { item.setJdzt(ZxdEnum.HETONGZTBG.getTypeValue()); } - Long l1 = xzdSubcontractTerminationService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdSubcontractTermination::getContractNumber, item.getId())); + Long l1 = xzdSubcontractTerminationService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdSubcontractTermination::getContractNumber, item.getId()).eq(XzdSubcontractTermination::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())); if (l1 > 0) { item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue()); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java index 2e430223..108f6b64 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java @@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; +import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.service.XzdContractMachineryService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; @@ -19,6 +20,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; +import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.XzdPurchaseContractAlteration; import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.XzdSubcontractChange; import org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.domain.XzdSubcontractTermination; import org.dromara.xzd.contractManagement.jixiehetongbiang.domain.XzdMachineryContractAlteration; @@ -168,11 +170,11 @@ public class XzdContractMachineryServiceImpl extends ServiceImpl().eq(XzdMachineryContractAlteration::getContractInformationId, item.getId())); + Long l = xzdMachineryContractAlterationService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdMachineryContractAlteration::getContractInformationId, item.getId()).eq(XzdMachineryContractAlteration::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())); if (l > 0) { item.setJdzt(ZxdEnum.HETONGZTBG.getTypeValue()); } - Long l1 = xzdMachineryContractSuspendService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdMachineryContractSuspend::getContractInformationId, item.getId())); + Long l1 = xzdMachineryContractSuspendService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdMachineryContractSuspend::getContractInformationId, item.getId()).eq(XzdMachineryContractSuspend::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())); if (l1 > 0) { item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue()); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java index 7171e7bb..a8116902 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java @@ -10,6 +10,7 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; +import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.service.XzdPurchaseContractInformationService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; @@ -539,11 +540,11 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl().eq(XzdPurchaseContractAlteration::getContractInformationId, item.getId())); + Long l = xzdPurchaseContractAlterationService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdPurchaseContractAlteration::getContractInformationId, item.getId()).eq(XzdPurchaseContractAlteration::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())); if (l > 0) { item.setJdzt(ZxdEnum.HETONGZTBG.getTypeValue()); } - Long l1 = xzdPurchaseContractSuspendService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdPurchaseContractSuspend::getContractInformationId, item.getId())); + Long l1 = xzdPurchaseContractSuspendService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdPurchaseContractSuspend::getContractInformationId, item.getId()).eq(XzdPurchaseContractSuspend::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())); if (l1 > 0) { item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue()); } From 37c95ab0bd60a4ea54941dbef2aaaac952b388af Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Tue, 2 Dec 2025 15:51:44 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E6=96=BD=E5=B7=A5=E4=BA=A7=E5=80=BC?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=A4=A7=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 4 +- .../org/dromara/ai/chat/DashScopeChat.java | 10 +- ...mpleChat.java => DashScopeSimpleChat.java} | 4 +- .../controller/PersonalHomeController.java | 4 +- .../OutConstructionValueController.java | 12 +- .../OutConstructionValueRangeController.java | 14 +- .../OutConstructionValueCategoryVo.java | 119 +++++ .../OutConstructionValueMatrixVo.java | 71 +++ .../OutConstructionValueProjectVo.java | 59 +++ .../OutConstructionValueSubProjectVo.java | 65 +++ .../OutConstructionValueVo.java | 2 +- .../OutConstructionValueRangeMatrixVo.java | 71 +++ .../OutConstructionValueRangeProjectVo.java | 59 +++ ...OutConstructionValueRangeSubProjectVo.java | 65 +++ .../OutConstructionValueRangeVo.java | 3 +- .../mapper/OutConstructionValueMapper.java | 2 +- .../OutConstructionValueRangeMapper.java | 2 +- .../IOutConstructionValueRangeService.java | 11 +- .../service/IOutConstructionValueService.java | 24 +- .../OutConstructionValueRangeServiceImpl.java | 386 +++++++++++++++- .../impl/OutConstructionValueServiceImpl.java | 413 +++++++++++++++++- .../PgsProgressCategoryImportTemp.java | 77 ++++ .../impl/PgsProgressCategoryServiceImpl.java | 23 +- .../PgsProgressPlanDetailServiceImpl.java | 7 +- .../service/impl/XzdBxBxsqServiceImpl.java | 6 +- .../service/impl/FlwTaskServiceImpl.java | 21 +- 26 files changed, 1489 insertions(+), 45 deletions(-) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/{SimpleChat.java => DashScopeSimpleChat.java} (88%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueCategoryVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueMatrixVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueProjectVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueSubProjectVo.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/{ => outconstructionvalue}/OutConstructionValueVo.java (98%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeMatrixVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeProjectVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeSubProjectVo.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/{ => outconstructionvaluerange}/OutConstructionValueRangeVo.java (93%) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryImportTemp.java diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml index 8fd1f4c6..be349c0a 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: port: 8899 --- # 监控中心配置 spring.boot.admin.client: - # 增加客户端开关 + # 增加客户端开关 enabled: false url: http://192.168.110.119:9090/admin instance: @@ -66,7 +66,7 @@ spring: # username: xinnengyuan # password: mEZPC5Sdf3r2HENi # 从库数据源 -# slave: + # slave: # lazy: true # type: ${spring.datasource.type} # driverClassName: com.mysql.cj.jdbc.Driver diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeChat.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeChat.java index b24f8d6d..91c9932f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeChat.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeChat.java @@ -25,7 +25,7 @@ import java.util.concurrent.CompletableFuture; public class DashScopeChat { @Resource - private SimpleChat simpleChat; + private DashScopeSimpleChat dashScopeSimpleChat; @Resource private IAIChatMemoryService chatMemoryService; @@ -66,10 +66,8 @@ public class DashScopeChat { .collectList() .flatMapMany(tokens -> { String aiResponse = String.join("", tokens); - if (isFirst) { - // 异步生成标题 - generateChatTitleAsync(chatId, message, aiResponse, userId); - } + // 异步生成标题 + generateChatTitleAsync(chatId, message, aiResponse, userId); // 返回完整的流结果 return Flux.fromIterable(tokens); }); @@ -100,7 +98,7 @@ public class DashScopeChat { 用户：%s AI：%s """, userMessage, aiResponse); - String title = simpleChat.doChat(prompt); + String title = dashScopeSimpleChat.doChat(prompt); log.info("用户：{} 生成标题成功：{} -> {}", userId, chatId, title); // 保存对话数据 AIChatMemory memory = new AIChatMemory(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/SimpleChat.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeSimpleChat.java similarity index 88% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/SimpleChat.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeSimpleChat.java index 4f2dbdff..eaa2e68d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/SimpleChat.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ai/chat/DashScopeSimpleChat.java @@ -9,11 +9,11 @@ import org.springframework.stereotype.Component; * @date 2025-11-04 15:26 */ @Component -public class SimpleChat { +public class DashScopeSimpleChat { private final ChatClient dashScopeChatClient; - public SimpleChat(ChatClient.Builder chatClientBuilder) { + public DashScopeSimpleChat(ChatClient.Builder chatClientBuilder) { this.dashScopeChatClient = chatClientBuilder // 设置 ChatClient 中 ChatModel 的 Options 参数 .defaultOptions( diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java index c481c94b..563b71b6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java @@ -41,7 +41,6 @@ import org.dromara.patch.service.IPdMasterService; import org.dromara.project.service.IBusProjectService; import org.dromara.system.domain.SysMenu; import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.mapper.SysRoleMapper; import org.dromara.system.service.impl.SysMenuServiceImpl; import org.dromara.system.service.impl.SysUserServiceImpl; import org.dromara.warm.flow.core.FlowEngine; @@ -97,8 +96,7 @@ public class PersonalHomeController extends BaseController { @Resource private IBusProjectService projectService; - private final SysRoleMapper roleMapper; - private final SysMenuServiceImpl sysMenuService; + private final SysMenuServiceImpl sysMenuService; // region AI 模块 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueController.java index e54ea5e7..fb7bf5be 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueController.java @@ -18,7 +18,7 @@ import org.dromara.common.web.core.BaseController; import org.dromara.out.domain.bo.OutConstructionValueBo; import org.dromara.out.domain.bo.OutConstructionValueFacilityReq; import org.dromara.out.domain.vo.OutConstructionAllValueVo; -import org.dromara.out.domain.vo.OutConstructionValueVo; +import org.dromara.out.domain.vo.outconstructionvalue.OutConstructionValueVo; import org.dromara.out.service.IOutConstructionValueService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -59,6 +59,16 @@ public class OutConstructionValueController extends BaseController { ExcelUtil.exportExcel(list, "施工产值", OutConstructionValueVo.class, response); } + /** + * 导出施工产值范围列表 + */ + @SaCheckPermission("out:constructionValue:export") + @Log(title = "施工产值", businessType = BusinessType.EXPORT) + @PostMapping("/exportByProject") + public void exportByProject(OutConstructionValueBo bo, HttpServletResponse response) { + outConstructionValueService.exportExcel(bo, response); + } + /** * 获取施工产值详细信息 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueRangeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueRangeController.java index bf246ab6..ef2f1717 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueRangeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutConstructionValueRangeController.java @@ -23,8 +23,8 @@ import org.dromara.out.domain.OutConstructionValue; import org.dromara.out.domain.OutConstructionValueRange; import org.dromara.out.domain.bo.OutConstructionValueRangeBo; import org.dromara.out.domain.vo.OutConstructionAllValueRangeVo; -import org.dromara.out.domain.vo.OutConstructionValueRangeVo; -import org.dromara.out.domain.vo.OutConstructionValueVo; +import org.dromara.out.domain.vo.outconstructionvalue.OutConstructionValueVo; +import org.dromara.out.domain.vo.outconstructionvaluerange.OutConstructionValueRangeVo; import org.dromara.out.service.IOutConstructionValueRangeService; import org.dromara.out.service.IOutConstructionValueService; import org.springframework.beans.BeanUtils; @@ -114,6 +114,16 @@ public class OutConstructionValueRangeController extends BaseController { } } + /** + * 导出施工产值范围列表 + */ + @SaCheckPermission("out:constructionValueRange:export") + @Log(title = "施工产值范围", businessType = BusinessType.EXPORT) + @PostMapping("/exportByProject") + public void exportByProject(OutConstructionValueRangeBo bo, HttpServletResponse response) { + outConstructionValueRangeService.exportExcel(bo, response); + } + /** * 获取施工产值范围详细信息 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueCategoryVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueCategoryVo.java new file mode 100644 index 00000000..98cec4b6 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueCategoryVo.java @@ -0,0 +1,119 @@ +package org.dromara.out.domain.vo.outconstructionvalue; + +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * @author lilemy + * @date 2025-12-01 15:46 + */ +@Data +public class OutConstructionValueCategoryVo { + + /** + * 主键ID + */ + private Long id; + + /** + * 范围ID + */ + private Long rangeId; + + /** + * 项目ID + */ + private Long projectId; + + /** + * 方阵id + */ + private Long matrixId; + + /** + * 分项工程id + */ + private Long progressCategoryId; + + /** + * 分项工程名称 + */ + private String progressCategoryName; + + /** + * 计划详情id + */ + private Long detailId; + + /** + * 人工填报数量 + */ + private Integer artificialNum; + + /** + * 无人机识别数量 + */ + private Integer uavNum; + + /** + * 确认数量 + */ + private Integer confirmNum; + + /** + * 计划数量 + */ + private Integer planNum; + + /** + * 対乙产值 + */ + private BigDecimal outValue; + + /** + * 上报日期 + */ + private LocalDate reportDate; + + /** + * 计划日期 + */ + private LocalDate planDate; + + /** + * 对甲产值 + */ + private BigDecimal ownerValue; + + /** + * 方阵名称 + */ + private String matrixName; + + /** + * 类别名称 + */ + private String name; + + /** + * 计量方式（0无 1数量 2百分比） + */ + private String unitType; + + /** + * 计量单位 + */ + private String unit; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 关联结构(1子项目 2方阵 3项目) + */ + private String relevancyStructure; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueMatrixVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueMatrixVo.java new file mode 100644 index 00000000..b4950efb --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueMatrixVo.java @@ -0,0 +1,71 @@ +package org.dromara.out.domain.vo.outconstructionvalue; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; + +import java.math.BigDecimal; + +/** + * @author lilemy + * @date 2025-12-01 10:09 + */ +@Data +public class OutConstructionValueMatrixVo { + + /** + * 项目名 + */ + @ExcelProperty(value = "项目") + private String projectName; + + /** + * 子项目名 + */ + @ExcelProperty(value = "子项") + private String subProjectName; + + /** + * 方阵名称 + */ + @ExcelProperty(value = "方阵") + private String matrixName; + + /** + * 分项工程名称 + */ + @ExcelProperty(value = "分部分项") + private String progressCategoryName; + + /** + * 计量方式（0无 1数量 2百分比） + */ + @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=无,1=数量,2=百分比") + private String unitType; + + /** + * 单位 + */ + @ExcelProperty(value = "单位") + private String unit; + + /** + * 数量 + */ + @ExcelProperty(value = "数量") + private BigDecimal number; + + /** + * 对甲产值 + */ + @ExcelProperty(value = "金额（对甲）") + private BigDecimal ownerValue; + + /** + * 产值 + */ + @ExcelProperty(value = "金额（对乙）") + private BigDecimal outValue; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueProjectVo.java new file mode 100644 index 00000000..28da0f08 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueProjectVo.java @@ -0,0 +1,59 @@ +package org.dromara.out.domain.vo.outconstructionvalue; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; + +import java.math.BigDecimal; + +/** + * @author lilemy + * @date 2025-12-01 10:08 + */ +@Data +public class OutConstructionValueProjectVo { + + /** + * 项目名 + */ + @ExcelProperty(value = "项目") + private String projectName; + + /** + * 分项工程名称 + */ + @ExcelProperty(value = "分部分项") + private String progressCategoryName; + + /** + * 计量方式（0无 1数量 2百分比） + */ + @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=无,1=数量,2=百分比") + private String unitType; + + /** + * 单位 + */ + @ExcelProperty(value = "单位") + private String unit; + + /** + * 数量 + */ + @ExcelProperty(value = "数量") + private BigDecimal number; + + /** + * 对甲产值 + */ + @ExcelProperty(value = "金额（对甲）") + private BigDecimal ownerValue; + + /** + * 产值 + */ + @ExcelProperty(value = "金额（对乙）") + private BigDecimal outValue; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueSubProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueSubProjectVo.java new file mode 100644 index 00000000..991ec8bf --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueSubProjectVo.java @@ -0,0 +1,65 @@ +package org.dromara.out.domain.vo.outconstructionvalue; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; + +import java.math.BigDecimal; + +/** + * @author lilemy + * @date 2025-12-01 10:08 + */ +@Data +public class OutConstructionValueSubProjectVo { + + /** + * 项目名 + */ + @ExcelProperty(value = "项目") + private String projectName; + + /** + * 子项目名 + */ + @ExcelProperty(value = "子项") + private String subProjectName; + + /** + * 分项工程名称 + */ + @ExcelProperty(value = "分部分项") + private String progressCategoryName; + + /** + * 计量方式（0无 1数量 2百分比） + */ + @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=无,1=数量,2=百分比") + private String unitType; + + /** + * 单位 + */ + @ExcelProperty(value = "单位") + private String unit; + + /** + * 数量 + */ + @ExcelProperty(value = "数量") + private BigDecimal number; + + /** + * 对甲产值 + */ + @ExcelProperty(value = "金额（对甲）") + private BigDecimal ownerValue; + + /** + * 产值 + */ + @ExcelProperty(value = "金额（对乙）") + private BigDecimal outValue; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutConstructionValueVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueVo.java similarity index 98% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutConstructionValueVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueVo.java index bd9c2392..d4d55877 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutConstructionValueVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvalue/OutConstructionValueVo.java @@ -1,4 +1,4 @@ -package org.dromara.out.domain.vo; +package org.dromara.out.domain.vo.outconstructionvalue; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeMatrixVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeMatrixVo.java new file mode 100644 index 00000000..6356a7eb --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeMatrixVo.java @@ -0,0 +1,71 @@ +package org.dromara.out.domain.vo.outconstructionvaluerange; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; + +import java.math.BigDecimal; + +/** + * @author lilemy + * @date 2025-12-01 11:31 + */ +@Data +public class OutConstructionValueRangeMatrixVo { + + /** + * 项目名 + */ + @ExcelProperty(value = "项目") + private String projectName; + + /** + * 子项目名 + */ + @ExcelProperty(value = "子项") + private String subProjectName; + + /** + * 方阵名称 + */ + @ExcelProperty(value = "方阵") + private String matrixName; + + /** + * 分项工程名称 + */ + @ExcelProperty(value = "分部分项") + private String progressCategoryName; + + /** + * 计量方式（0无 1数量 2百分比） + */ + @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=无,1=数量,2=百分比") + private String unitType; + + /** + * 单位 + */ + @ExcelProperty(value = "单位") + private String unit; + + /** + * 数量 + */ + @ExcelProperty(value = "数量") + private BigDecimal number; + + /** + * 对甲产值 + */ + @ExcelProperty(value = "金额（对甲）") + private BigDecimal ownerValue; + + /** + * 产值 + */ + @ExcelProperty(value = "金额（对乙）") + private BigDecimal outValue; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeProjectVo.java new file mode 100644 index 00000000..5e3d741f --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeProjectVo.java @@ -0,0 +1,59 @@ +package org.dromara.out.domain.vo.outconstructionvaluerange; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; + +import java.math.BigDecimal; + +/** + * @author lilemy + * @date 2025-12-01 11:30 + */ +@Data +public class OutConstructionValueRangeProjectVo { + + /** + * 项目名 + */ + @ExcelProperty(value = "项目") + private String projectName; + + /** + * 分项工程名称 + */ + @ExcelProperty(value = "分部分项") + private String progressCategoryName; + + /** + * 计量方式（0无 1数量 2百分比） + */ + @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=无,1=数量,2=百分比") + private String unitType; + + /** + * 单位 + */ + @ExcelProperty(value = "单位") + private String unit; + + /** + * 数量 + */ + @ExcelProperty(value = "数量") + private BigDecimal number; + + /** + * 对甲产值 + */ + @ExcelProperty(value = "金额（对甲）") + private BigDecimal ownerValue; + + /** + * 产值 + */ + @ExcelProperty(value = "金额（对乙）") + private BigDecimal outValue; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeSubProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeSubProjectVo.java new file mode 100644 index 00000000..d1d9cfa1 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeSubProjectVo.java @@ -0,0 +1,65 @@ +package org.dromara.out.domain.vo.outconstructionvaluerange; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; + +import java.math.BigDecimal; + +/** + * @author lilemy + * @date 2025-12-01 11:30 + */ +@Data +public class OutConstructionValueRangeSubProjectVo { + + /** + * 项目名 + */ + @ExcelProperty(value = "项目") + private String projectName; + + /** + * 子项目名 + */ + @ExcelProperty(value = "子项") + private String subProjectName; + + /** + * 分项工程名称 + */ + @ExcelProperty(value = "分部分项") + private String progressCategoryName; + + /** + * 计量方式（0无 1数量 2百分比） + */ + @ExcelProperty(value = "计量方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=无,1=数量,2=百分比") + private String unitType; + + /** + * 单位 + */ + @ExcelProperty(value = "单位") + private String unit; + + /** + * 数量 + */ + @ExcelProperty(value = "数量") + private BigDecimal number; + + /** + * 对甲产值 + */ + @ExcelProperty(value = "金额（对甲）") + private BigDecimal ownerValue; + + /** + * 产值 + */ + @ExcelProperty(value = "金额（对乙）") + private BigDecimal outValue; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutConstructionValueRangeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeVo.java similarity index 93% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutConstructionValueRangeVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeVo.java index a304b323..b9719c21 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutConstructionValueRangeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/outconstructionvaluerange/OutConstructionValueRangeVo.java @@ -1,4 +1,4 @@ -package org.dromara.out.domain.vo; +package org.dromara.out.domain.vo.outconstructionvaluerange; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -7,6 +7,7 @@ import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.out.domain.OutConstructionValueRange; +import org.dromara.out.domain.vo.outconstructionvalue.OutConstructionValueVo; import java.io.Serial; import java.io.Serializable; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/mapper/OutConstructionValueMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/mapper/OutConstructionValueMapper.java index b92f97a1..1ddbcf2d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/mapper/OutConstructionValueMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/mapper/OutConstructionValueMapper.java @@ -3,7 +3,7 @@ package org.dromara.out.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.dromara.out.domain.OutConstructionValue; -import org.dromara.out.domain.vo.OutConstructionValueVo; +import org.dromara.out.domain.vo.outconstructionvalue.OutConstructionValueVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import java.math.BigDecimal; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/mapper/OutConstructionValueRangeMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/mapper/OutConstructionValueRangeMapper.java index 12ad8a56..930246db 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/mapper/OutConstructionValueRangeMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/mapper/OutConstructionValueRangeMapper.java @@ -1,7 +1,7 @@ package org.dromara.out.mapper; import org.dromara.out.domain.OutConstructionValueRange; -import org.dromara.out.domain.vo.OutConstructionValueRangeVo; +import org.dromara.out.domain.vo.outconstructionvaluerange.OutConstructionValueRangeVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/IOutConstructionValueRangeService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/IOutConstructionValueRangeService.java index 721900d9..cfe97b2e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/IOutConstructionValueRangeService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/IOutConstructionValueRangeService.java @@ -1,12 +1,13 @@ package org.dromara.out.service; import com.baomidou.mybatisplus.extension.service.IService; +import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.out.domain.OutConstructionValueRange; import org.dromara.out.domain.bo.OutConstructionValueRangeBo; import org.dromara.out.domain.vo.OutConstructionAllValueRangeVo; -import org.dromara.out.domain.vo.OutConstructionValueRangeVo; +import org.dromara.out.domain.vo.outconstructionvaluerange.OutConstructionValueRangeVo; import java.util.Collection; import java.util.List; @@ -77,4 +78,12 @@ public interface IOutConstructionValueRangeService extends IService list); + + /** + * 导出数据 + * + * @param bo 查询条件 + * @param response 响应 + */ + void exportExcel(OutConstructionValueBo bo, HttpServletResponse response); + + /** + * 构建导出需要的数据 + * + * @param valueList 施工产值列表 + * @param valueCategoryList 进度类别列表 + * @param topList 顶层进度类别列表 + */ + void buildExportData(List valueList, + List valueCategoryList, + List topList); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueRangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueRangeServiceImpl.java index 31826829..3c43cdf3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueRangeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueRangeServiceImpl.java @@ -2,19 +2,27 @@ package org.dromara.out.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; import org.dromara.common.core.enums.BusinessStatusEnum; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.file.FileUtils; +import org.dromara.common.excel.convert.ExcelBigNumberConvert; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.out.domain.OutConstructionValue; @@ -22,24 +30,36 @@ import org.dromara.out.domain.OutConstructionValueRange; import org.dromara.out.domain.bo.OutConstructionValueBo; import org.dromara.out.domain.bo.OutConstructionValueRangeBo; import org.dromara.out.domain.vo.OutConstructionAllValueRangeVo; -import org.dromara.out.domain.vo.OutConstructionValueRangeVo; +import org.dromara.out.domain.vo.outconstructionvalue.OutConstructionValueCategoryVo; +import org.dromara.out.domain.vo.outconstructionvaluerange.OutConstructionValueRangeMatrixVo; +import org.dromara.out.domain.vo.outconstructionvaluerange.OutConstructionValueRangeProjectVo; +import org.dromara.out.domain.vo.outconstructionvaluerange.OutConstructionValueRangeSubProjectVo; +import org.dromara.out.domain.vo.outconstructionvaluerange.OutConstructionValueRangeVo; import org.dromara.out.mapper.OutConstructionValueRangeMapper; import org.dromara.out.service.IOutConstructionValueRangeService; import org.dromara.out.service.IOutConstructionValueService; +import org.dromara.progress.domain.PgsProgressCategory; import org.dromara.progress.domain.PgsProgressPlanDetail; +import org.dromara.progress.service.IPgsProgressCategoryService; import org.dromara.progress.service.IPgsProgressPlanDetailService; +import org.dromara.project.domain.BusProject; +import org.dromara.project.service.IBusProjectService; import org.springframework.context.annotation.Lazy; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; -import java.time.format.DateTimeFormatter; +import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.DayOfWeek; import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; import java.time.temporal.WeekFields; import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 施工产值范围Service业务层处理 @@ -61,6 +81,9 @@ public class OutConstructionValueRangeServiceImpl extends ServiceImpl params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(OutConstructionValueRange::getId); - lqw.eq(bo.getProjectId() != null, OutConstructionValueRange::getProjectId, bo.getProjectId()); + if (bo.getProjectId() != null) { + // 获取当前项目的子项目 + List projects = projectService.lambdaQuery() + .eq(BusProject::getPId, bo.getProjectId()) + .select(BusProject::getId) + .list(); + List list = new ArrayList<>(projects.stream().map(BusProject::getId).toList()); + list.add(bo.getProjectId()); + lqw.in(OutConstructionValueRange::getProjectId, list); + } // 日期范围过滤 if (bo.getStartDate() != null) { // 获取本周的星期一 @@ -219,6 +251,354 @@ public class OutConstructionValueRangeServiceImpl extends ServiceImpl projectList = projectService.lambdaQuery() + .eq(BusProject::getPId, projectId) + .list(); + projectList.add(project); + Map projectNameMap = projectList.stream() + .collect(Collectors.toMap(BusProject::getId, BusProject::getProjectName)); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List list = this.list(lqw); + if (CollUtil.isEmpty(list)) { + throw new ServiceException("无数据导出"); + } + // 根据周产值查询具体产值 + Set rangeIds = list.stream().map(OutConstructionValueRange::getId).collect(Collectors.toSet()); + List valueList = constructionValueService.lambdaQuery() + .in(OutConstructionValue::getRangeId, rangeIds) + .list(); + if (CollUtil.isEmpty(valueList)) { + throw new ServiceException("无数据导出"); + } + List valueCategoryList = new ArrayList<>(); + List topList = new ArrayList<>(); + constructionValueService.buildExportData(valueList, valueCategoryList, topList); + // 汇总数据 + List projectVoList = new ArrayList<>(); + List subProjectVoList = new ArrayList<>(); + List matrixVoList = new ArrayList<>(); + // 合计 + BigDecimal totalNumber = BigDecimal.ZERO; + BigDecimal totalOwnerValue = BigDecimal.ZERO; + BigDecimal totalOutValue = BigDecimal.ZERO; + + BigDecimal subTotalNumber = BigDecimal.ZERO; + BigDecimal subTotalOwnerValue = BigDecimal.ZERO; + BigDecimal subTotalOutValue = BigDecimal.ZERO; + + BigDecimal matrixTotalNumber = BigDecimal.ZERO; + BigDecimal matrixTotalOwnerValue = BigDecimal.ZERO; + BigDecimal matrixTotalOutValue = BigDecimal.ZERO; + // 根据名称+结构分类 + Map> topNameMap = + topList.stream().collect(Collectors.groupingBy(item -> item.getName() + "_" + item.getRelevancyStructure())); + for (Map.Entry> entry : topNameMap.entrySet()) { + String[] keys = entry.getKey().split("_"); + String name = keys[0]; + String structure = keys[1]; + List topNodes = entry.getValue(); + List topIds = topNodes.stream().map(PgsProgressCategory::getId).toList(); + // 找出全部子孙节点 + List children = findChildren(valueCategoryList, topIds); + // 子类按名称分组 + Map> childrenMap = + children.stream().collect(Collectors.groupingBy(OutConstructionValueCategoryVo::getName)); + for (Map.Entry> childrenEntry : childrenMap.entrySet()) { + String childName = childrenEntry.getKey(); + List childrenEntryValue = childrenEntry.getValue(); + // ======= 构建项目级数据 ======= + Summary summary = calculateSummary(childrenEntryValue); + OutConstructionValueRangeProjectVo projectVo = + buildProjectVo(project, name, childName, childrenEntryValue, summary); + projectVoList.add(projectVo); + totalNumber = totalNumber.add(summary.number); + totalOwnerValue = totalOwnerValue.add(summary.ownerValue); + totalOutValue = totalOutValue.add(summary.outValue); + // ======= 构建子项目级数据 ======= + if (structure.equals("1") || structure.equals("2")) { + Map> subMap = + childrenEntryValue.stream().collect(Collectors.groupingBy(OutConstructionValueCategoryVo::getProjectId)); + for (Map.Entry> subEntry : subMap.entrySet()) { + Summary subSummary = calculateSummary(subEntry.getValue()); + OutConstructionValueRangeSubProjectVo subVo = + buildSubProjectVo(project, name, childName, subEntry, projectNameMap, subSummary); + subProjectVoList.add(subVo); + subTotalNumber = subTotalNumber.add(subSummary.number); + subTotalOwnerValue = subTotalOwnerValue.add(subSummary.ownerValue); + subTotalOutValue = subTotalOutValue.add(subSummary.outValue); + } + } + // ======= 构建方阵级数据 ======= + if (structure.equals("2")) { + Map> matrixMap = + childrenEntryValue.stream().collect(Collectors.groupingBy(OutConstructionValueCategoryVo::getMatrixName)); + for (Map.Entry> matrixEntry : matrixMap.entrySet()) { + Summary matrixSummary = calculateSummary(matrixEntry.getValue()); + OutConstructionValueRangeMatrixVo matrixVo = + buildMatrixVo(project, name, childName, matrixEntry, projectNameMap, matrixSummary); + matrixVoList.add(matrixVo); + matrixTotalNumber = matrixTotalNumber.add(matrixSummary.number); + matrixTotalOwnerValue = matrixTotalOwnerValue.add(matrixSummary.ownerValue); + matrixTotalOutValue = matrixTotalOutValue.add(matrixSummary.outValue); + } + } + } + } + // 排序 + projectVoList.sort(Comparator.comparing(OutConstructionValueRangeProjectVo::getProgressCategoryName)); + subProjectVoList.sort(Comparator.comparing(OutConstructionValueRangeSubProjectVo::getSubProjectName) + .thenComparing(OutConstructionValueRangeSubProjectVo::getProgressCategoryName)); + matrixVoList.sort(Comparator.comparing(OutConstructionValueRangeMatrixVo::getSubProjectName) + .thenComparing(OutConstructionValueRangeMatrixVo::getMatrixName) + .thenComparing(OutConstructionValueRangeMatrixVo::getProgressCategoryName)); + // 填充合计 + OutConstructionValueRangeProjectVo rangeProjectVo = new OutConstructionValueRangeProjectVo(); + rangeProjectVo.setProjectName("合计"); + rangeProjectVo.setNumber(totalNumber); + rangeProjectVo.setOwnerValue(totalOwnerValue); + rangeProjectVo.setOutValue(totalOutValue); + projectVoList.add(rangeProjectVo); + OutConstructionValueRangeSubProjectVo rangeSubProjectVo = new OutConstructionValueRangeSubProjectVo(); + rangeSubProjectVo.setProjectName("合计"); + rangeSubProjectVo.setNumber(subTotalNumber); + rangeSubProjectVo.setOwnerValue(subTotalOwnerValue); + rangeSubProjectVo.setOutValue(subTotalOutValue); + subProjectVoList.add(rangeSubProjectVo); + OutConstructionValueRangeMatrixVo rangeMatrixVo = new OutConstructionValueRangeMatrixVo(); + rangeMatrixVo.setProjectName("合计"); + rangeMatrixVo.setNumber(matrixTotalNumber); + rangeMatrixVo.setOwnerValue(matrixTotalOwnerValue); + rangeMatrixVo.setOutValue(matrixTotalOutValue); + matrixVoList.add(rangeMatrixVo); + // 构建导出数据 + buildExportExcel(project.getProjectName(), response, projectVoList, subProjectVoList, matrixVoList); + } + + /** + * 查找子级 + * + * @param all 所有数据 + * @param topIds 顶级ID + * @return 子级 + */ + private List findChildren( + List all, + List topIds) { + return all.stream() + .filter(item -> { + String ancestors = item.getAncestors(); + if (ancestors == null) return false; + return topIds.stream().anyMatch(topId -> + ancestors.contains("," + topId + ",") || + ancestors.startsWith(topId + ",") || + ancestors.endsWith("," + topId) || + ancestors.equals(String.valueOf(topId)) + ); + }).toList(); + } + + /** + * 汇总静态类 + */ + static class Summary { + BigDecimal number; + BigDecimal ownerValue; + BigDecimal outValue; + } + + /** + * 计算汇总 + * + * @param list 数据 + * @return 汇总 + */ + private Summary calculateSummary(List list) { + Summary s = new Summary(); + s.number = BigDecimal.ZERO; + s.ownerValue = BigDecimal.ZERO; + s.outValue = BigDecimal.ZERO; + for (OutConstructionValueCategoryVo c : list) { + int num = (c.getConfirmNum() == null || c.getConfirmNum() == 0) + ? c.getArtificialNum() + c.getUavNum() + : c.getConfirmNum(); + + s.number = s.number.add(BigDecimal.valueOf(num)); + s.ownerValue = s.ownerValue.add(c.getOwnerValue()); + s.outValue = s.outValue.add(c.getOutValue()); + } + return s; + } + + /** + * 获取第一个非空的值 + * + * @param list 数据 + * @param getter 获取器 + * @return 值 + */ + private T getFirstNonNull(List list, + Function getter) { + return list.stream() + .map(getter) + .filter(Objects::nonNull) + .findFirst() + .orElse(null); + } + + /** + * 构建项目VO + * + * @param project 项目 + * @param name 名称 + * @param childName 子名称 + * @param list 数据 + * @param summary 合计 + * @return 项目VO + */ + private OutConstructionValueRangeProjectVo buildProjectVo( + BusProject project, + String name, + String childName, + List list, + Summary summary) { + OutConstructionValueRangeProjectVo vo = new OutConstructionValueRangeProjectVo(); + vo.setProjectName(project.getProjectName()); + vo.setProgressCategoryName(name + "/" + childName); + vo.setUnit(getFirstNonNull(list, OutConstructionValueCategoryVo::getUnit)); + vo.setUnitType(getFirstNonNull(list, OutConstructionValueCategoryVo::getUnitType)); + vo.setNumber(summary.number); + vo.setOwnerValue(summary.ownerValue); + vo.setOutValue(summary.outValue); + return vo; + } + + /** + * 构建子项VO + * + * @param project 项目 + * @param name 名称 + * @param childName 子名称 + * @param entry 数据 + * @param summary 合计 + * @return 子项VO + */ + private OutConstructionValueRangeSubProjectVo buildSubProjectVo( + BusProject project, + String name, + String childName, + Map.Entry> entry, + Map projectNameMap, + Summary summary) { + OutConstructionValueRangeSubProjectVo vo = new OutConstructionValueRangeSubProjectVo(); + vo.setProjectName(project.getProjectName()); + vo.setSubProjectName(projectNameMap.get(entry.getKey())); + vo.setProgressCategoryName(name + "/" + childName); + vo.setUnit(getFirstNonNull(entry.getValue(), OutConstructionValueCategoryVo::getUnit)); + vo.setUnitType(getFirstNonNull(entry.getValue(), OutConstructionValueCategoryVo::getUnitType)); + vo.setNumber(summary.number); + vo.setOwnerValue(summary.ownerValue); + vo.setOutValue(summary.outValue); + return vo; + } + + /** + * 构建方阵VO + * + * @param project 项目 + * @param name 名称 + * @param childName 子名称 + * @param entry 数据 + * @param projectNameMap 项目名称 + * @param summary 合计 + * @return 方阵VO + */ + private OutConstructionValueRangeMatrixVo buildMatrixVo( + BusProject project, + String name, + String childName, + Map.Entry> entry, + Map projectNameMap, + Summary summary) { + List list = entry.getValue(); + OutConstructionValueRangeMatrixVo vo = new OutConstructionValueRangeMatrixVo(); + vo.setProjectName(project.getProjectName()); + vo.setMatrixName(entry.getKey()); + vo.setProgressCategoryName(name + "/" + childName); + Long pid = list.stream() + .map(OutConstructionValueCategoryVo::getProjectId) + .filter(Objects::nonNull) + .findFirst().orElse(project.getId()); + vo.setSubProjectName(projectNameMap.getOrDefault(pid, project.getProjectName())); + vo.setUnit(getFirstNonNull(list, OutConstructionValueCategoryVo::getUnit)); + vo.setUnitType(getFirstNonNull(list, OutConstructionValueCategoryVo::getUnitType)); + vo.setNumber(summary.number); + vo.setOwnerValue(summary.ownerValue); + vo.setOutValue(summary.outValue); + return vo; + } + + /** + * 构建导出Excel + * + * @param projectName 项目名称 + * @param response 响应 + * @param projectVoList 项目VO + * @param subProjectVoList 子项VO + * @param matrixVoList 方阵VO + */ + private void buildExportExcel(String projectName, HttpServletResponse response, + List projectVoList, + List subProjectVoList, + List matrixVoList) { + String fileName = projectName + "-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + "-" + "施工产值.xlsx"; + FileUtils.setAttachmentResponseHeader(response, fileName); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8"); + // 构建 ExcelWriter + try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()) + .autoCloseStream(false) + // 自动适配 + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + // 大数值自动转换 防止失真 + .registerConverter(new ExcelBigNumberConvert()) + .build()) { + // === Sheet1 === + WriteSheet sheet1 = EasyExcel.writerSheet(0, "按项目汇总") + .head(OutConstructionValueRangeProjectVo.class) + .build(); + excelWriter.write(projectVoList, sheet1); + // === Sheet2 === + WriteSheet sheet2 = EasyExcel.writerSheet(1, "按子项汇总") + .head(OutConstructionValueRangeSubProjectVo.class) + .build(); + excelWriter.write(subProjectVoList, sheet2); + // === Sheet3 === + WriteSheet sheet3 = EasyExcel.writerSheet(2, "按方阵汇总") + .head(OutConstructionValueRangeMatrixVo.class) + .build(); + excelWriter.write(matrixVoList, sheet3); + } catch (IOException e) { + log.error("施工产值Excel导出失败", e); + throw new ServiceException("导出Excel失败"); + } + } + /** * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等) * 正常使用只需#processEvent.flowCode=='leave1' diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java index 81f29acc..b5c8c5f8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java @@ -1,16 +1,23 @@ package org.dromara.out.service.impl; import cn.hutool.core.collection.CollUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.HttpStatus; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.file.FileUtils; +import org.dromara.common.excel.convert.ExcelBigNumberConvert; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.facility.domain.FacMatrix; @@ -20,7 +27,7 @@ import org.dromara.out.domain.OutConstructionValueRange; import org.dromara.out.domain.bo.OutConstructionValueBo; import org.dromara.out.domain.bo.OutConstructionValueFacilityReq; import org.dromara.out.domain.vo.OutConstructionAllValueVo; -import org.dromara.out.domain.vo.OutConstructionValueVo; +import org.dromara.out.domain.vo.outconstructionvalue.*; import org.dromara.out.mapper.OutConstructionValueMapper; import org.dromara.out.service.IOutConstructionValueRangeService; import org.dromara.out.service.IOutConstructionValueService; @@ -35,11 +42,17 @@ import org.dromara.progress.service.IPgsProgressPlanDetailService; import org.dromara.project.domain.BusProject; import org.dromara.project.domain.vo.project.BusProjectVo; import org.dromara.project.service.IBusProjectService; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 施工产值Service业务层处理 @@ -65,6 +78,8 @@ public class OutConstructionValueServiceImpl extends ServiceImpl projectList = projectService.lambdaQuery() + .eq(BusProject::getPId, projectId) + .list(); + projectList.add(project); + Map projectNameMap = projectList.stream() + .collect(Collectors.toMap(BusProject::getId, BusProject::getProjectName)); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List valueList = this.list(lqw); + if (CollUtil.isEmpty(valueList)) { + throw new ServiceException("无数据导出"); + } + List valueCategoryList = new ArrayList<>(); + List topList = new ArrayList<>(); + this.buildExportData(valueList, valueCategoryList, topList); + // 汇总数据 + List projectVoList = new ArrayList<>(); + List subProjectVoList = new ArrayList<>(); + List matrixVoList = new ArrayList<>(); + // 合计 + BigDecimal totalNumber = BigDecimal.ZERO; + BigDecimal totalOwnerValue = BigDecimal.ZERO; + BigDecimal totalOutValue = BigDecimal.ZERO; + + BigDecimal subTotalNumber = BigDecimal.ZERO; + BigDecimal subTotalOwnerValue = BigDecimal.ZERO; + BigDecimal subTotalOutValue = BigDecimal.ZERO; + + BigDecimal matrixTotalNumber = BigDecimal.ZERO; + BigDecimal matrixTotalOwnerValue = BigDecimal.ZERO; + BigDecimal matrixTotalOutValue = BigDecimal.ZERO; + // 根据名称+结构分类 + Map> topNameMap = + topList.stream().collect(Collectors.groupingBy(item -> item.getName() + "_" + item.getRelevancyStructure())); + for (Map.Entry> entry : topNameMap.entrySet()) { + String[] keys = entry.getKey().split("_"); + String name = keys[0]; + String structure = keys[1]; + List topNodes = entry.getValue(); + List topIds = topNodes.stream().map(PgsProgressCategory::getId).toList(); + // 找出全部子孙节点 + List children = findChildren(valueCategoryList, topIds); + // 子类按名称分组 + Map> childrenMap = + children.stream().collect(Collectors.groupingBy(OutConstructionValueCategoryVo::getName)); + for (Map.Entry> childrenEntry : childrenMap.entrySet()) { + String childName = childrenEntry.getKey(); + List childrenEntryValue = childrenEntry.getValue(); + // ======= 构建项目级数据 ======= + Summary summary = calculateSummary(childrenEntryValue); + OutConstructionValueProjectVo projectVo = + buildProjectVo(project, name, childName, childrenEntryValue, summary); + projectVoList.add(projectVo); + totalNumber = totalNumber.add(summary.number); + totalOwnerValue = totalOwnerValue.add(summary.ownerValue); + totalOutValue = totalOutValue.add(summary.outValue); + // ======= 构建子项目级数据 ======= + if (structure.equals("1") || structure.equals("2")) { + Map> subMap = + childrenEntryValue.stream().collect(Collectors.groupingBy(OutConstructionValueCategoryVo::getProjectId)); + for (Map.Entry> subEntry : subMap.entrySet()) { + Summary subSummary = calculateSummary(subEntry.getValue()); + OutConstructionValueSubProjectVo subVo = + buildSubProjectVo(project, name, childName, subEntry, projectNameMap, subSummary); + subProjectVoList.add(subVo); + subTotalNumber = subTotalNumber.add(subSummary.number); + subTotalOwnerValue = subTotalOwnerValue.add(subSummary.ownerValue); + subTotalOutValue = subTotalOutValue.add(subSummary.outValue); + } + } + // ======= 构建方阵级数据 ======= + if (structure.equals("2")) { + Map> matrixMap = + childrenEntryValue.stream().collect(Collectors.groupingBy(OutConstructionValueCategoryVo::getMatrixName)); + for (Map.Entry> matrixEntry : matrixMap.entrySet()) { + Summary matrixSummary = calculateSummary(matrixEntry.getValue()); + OutConstructionValueMatrixVo matrixVo = + buildMatrixVo(project, name, childName, matrixEntry, projectNameMap, matrixSummary); + matrixVoList.add(matrixVo); + matrixTotalNumber = matrixTotalNumber.add(matrixSummary.number); + matrixTotalOwnerValue = matrixTotalOwnerValue.add(matrixSummary.ownerValue); + matrixTotalOutValue = matrixTotalOutValue.add(matrixSummary.outValue); + } + } + } + } + // 排序 + projectVoList.sort(Comparator.comparing(OutConstructionValueProjectVo::getProgressCategoryName)); + subProjectVoList.sort(Comparator.comparing(OutConstructionValueSubProjectVo::getSubProjectName) + .thenComparing(OutConstructionValueSubProjectVo::getProgressCategoryName)); + matrixVoList.sort(Comparator.comparing(OutConstructionValueMatrixVo::getSubProjectName) + .thenComparing(OutConstructionValueMatrixVo::getMatrixName) + .thenComparing(OutConstructionValueMatrixVo::getProgressCategoryName)); + // 填充合计 + OutConstructionValueProjectVo rangeProjectVo = new OutConstructionValueProjectVo(); + rangeProjectVo.setProjectName("合计"); + rangeProjectVo.setNumber(totalNumber); + rangeProjectVo.setOwnerValue(totalOwnerValue); + rangeProjectVo.setOutValue(totalOutValue); + projectVoList.add(rangeProjectVo); + OutConstructionValueSubProjectVo rangeSubProjectVo = new OutConstructionValueSubProjectVo(); + rangeSubProjectVo.setProjectName("合计"); + rangeSubProjectVo.setNumber(subTotalNumber); + rangeSubProjectVo.setOwnerValue(subTotalOwnerValue); + rangeSubProjectVo.setOutValue(subTotalOutValue); + subProjectVoList.add(rangeSubProjectVo); + OutConstructionValueMatrixVo rangeMatrixVo = new OutConstructionValueMatrixVo(); + rangeMatrixVo.setProjectName("合计"); + rangeMatrixVo.setNumber(matrixTotalNumber); + rangeMatrixVo.setOwnerValue(matrixTotalOwnerValue); + rangeMatrixVo.setOutValue(matrixTotalOutValue); + matrixVoList.add(rangeMatrixVo); + // 构建导出数据 + buildExportExcel(project.getProjectName(), response, projectVoList, subProjectVoList, matrixVoList); + } + + /** + * 构建导出需要的数据 + * + * @param valueList 施工产值列表 + * @param valueCategoryList 进度类别列表 + * @param topList 顶层进度类别列表 + */ + @Override + public void buildExportData(List valueList, + List valueCategoryList, + List topList) { + // 获取对应进度类别 + Set progressCategoryIds = valueList.stream() + .map(OutConstructionValue::getProgressCategoryId) + .collect(Collectors.toSet()); + List progressCategoryList = progressCategoryService.lambdaQuery() + .in(PgsProgressCategory::getId, progressCategoryIds) + .list(); + valueCategoryList.addAll( + valueList.stream().map(value -> { + OutConstructionValueCategoryVo vo = new OutConstructionValueCategoryVo(); + BeanUtils.copyProperties(value, vo); + PgsProgressCategory category = progressCategoryList.stream() + .filter(p -> p.getId().equals(value.getProgressCategoryId())) + .findFirst().orElse(null); + if (category != null) { + vo.setProjectId(category.getProjectId()); + vo.setMatrixName(category.getMatrixName()); + vo.setName(category.getName()); + vo.setUnitType(category.getUnitType()); + vo.setUnit(category.getUnit()); + vo.setAncestors(category.getAncestors()); + vo.setRelevancyStructure(category.getRelevancyStructure()); + } + return vo; + }).toList() + ); + // 顶级进度类别 + Set topProgressCategoryIds = progressCategoryList.stream() + .map(p -> { + String ancestors = p.getAncestors(); + if (StringUtils.isNotBlank(ancestors)) { + String[] split = ancestors.split(","); + return split.length > 1 ? split[1] : null; + } + return null; + }).filter(Objects::nonNull) + .map(Long::parseLong) + .collect(Collectors.toSet()); + List tops = progressCategoryService.listByIds(topProgressCategoryIds) + .stream() + .sorted(Comparator.comparing(PgsProgressCategory::getSort)) + .toList(); + topList.addAll(tops); + } + + /** + * 查找子级 + * + * @param all 所有数据 + * @param topIds 顶级ID + * @return 子级 + */ + private List findChildren( + List all, + List topIds) { + return all.stream() + .filter(item -> { + String ancestors = item.getAncestors(); + if (ancestors == null) return false; + return topIds.stream().anyMatch(topId -> + ancestors.contains("," + topId + ",") || + ancestors.startsWith(topId + ",") || + ancestors.endsWith("," + topId) || + ancestors.equals(String.valueOf(topId)) + ); + }).toList(); + } + + /** + * 汇总静态类 + */ + static class Summary { + BigDecimal number; + BigDecimal ownerValue; + BigDecimal outValue; + } + + /** + * 计算汇总 + * + * @param list 数据 + * @return 汇总 + */ + private Summary calculateSummary(List list) { + Summary s = new Summary(); + s.number = BigDecimal.ZERO; + s.ownerValue = BigDecimal.ZERO; + s.outValue = BigDecimal.ZERO; + for (OutConstructionValueCategoryVo c : list) { + int num = (c.getConfirmNum() == null || c.getConfirmNum() == 0) + ? c.getArtificialNum() + c.getUavNum() + : c.getConfirmNum(); + + s.number = s.number.add(BigDecimal.valueOf(num)); + s.ownerValue = s.ownerValue.add(c.getOwnerValue()); + s.outValue = s.outValue.add(c.getOutValue()); + } + return s; + } + + /** + * 获取第一个非空的值 + * + * @param list 数据 + * @param getter 获取器 + * @return 值 + */ + private T getFirstNonNull(List list, + Function getter) { + return list.stream() + .map(getter) + .filter(Objects::nonNull) + .findFirst() + .orElse(null); + } + + /** + * 构建项目VO + * + * @param project 项目 + * @param name 名称 + * @param childName 子名称 + * @param list 数据 + * @param summary 合计 + * @return 项目VO + */ + private OutConstructionValueProjectVo buildProjectVo( + BusProject project, + String name, + String childName, + List list, + Summary summary) { + OutConstructionValueProjectVo vo = new OutConstructionValueProjectVo(); + vo.setProjectName(project.getProjectName()); + vo.setProgressCategoryName(name + "/" + childName); + vo.setUnit(getFirstNonNull(list, OutConstructionValueCategoryVo::getUnit)); + vo.setUnitType(getFirstNonNull(list, OutConstructionValueCategoryVo::getUnitType)); + vo.setNumber(summary.number); + vo.setOwnerValue(summary.ownerValue); + vo.setOutValue(summary.outValue); + return vo; + } + + /** + * 构建子项VO + * + * @param project 项目 + * @param name 名称 + * @param childName 子名称 + * @param entry 数据 + * @param summary 合计 + * @return 子项VO + */ + private OutConstructionValueSubProjectVo buildSubProjectVo( + BusProject project, + String name, + String childName, + Map.Entry> entry, + Map projectNameMap, + Summary summary) { + OutConstructionValueSubProjectVo vo = new OutConstructionValueSubProjectVo(); + vo.setProjectName(project.getProjectName()); + vo.setSubProjectName(projectNameMap.get(entry.getKey())); + vo.setProgressCategoryName(name + "/" + childName); + vo.setUnit(getFirstNonNull(entry.getValue(), OutConstructionValueCategoryVo::getUnit)); + vo.setUnitType(getFirstNonNull(entry.getValue(), OutConstructionValueCategoryVo::getUnitType)); + vo.setNumber(summary.number); + vo.setOwnerValue(summary.ownerValue); + vo.setOutValue(summary.outValue); + return vo; + } + + /** + * 构建方阵VO + * + * @param project 项目 + * @param name 名称 + * @param childName 子名称 + * @param entry 数据 + * @param projectNameMap 项目名称 + * @param summary 合计 + * @return 方阵VO + */ + private OutConstructionValueMatrixVo buildMatrixVo( + BusProject project, + String name, + String childName, + Map.Entry> entry, + Map projectNameMap, + Summary summary) { + List list = entry.getValue(); + OutConstructionValueMatrixVo vo = new OutConstructionValueMatrixVo(); + vo.setProjectName(project.getProjectName()); + vo.setMatrixName(entry.getKey()); + vo.setProgressCategoryName(name + "/" + childName); + Long pid = list.stream() + .map(OutConstructionValueCategoryVo::getProjectId) + .filter(Objects::nonNull) + .findFirst().orElse(project.getId()); + vo.setSubProjectName(projectNameMap.getOrDefault(pid, project.getProjectName())); + vo.setUnit(getFirstNonNull(list, OutConstructionValueCategoryVo::getUnit)); + vo.setUnitType(getFirstNonNull(list, OutConstructionValueCategoryVo::getUnitType)); + vo.setNumber(summary.number); + vo.setOwnerValue(summary.ownerValue); + vo.setOutValue(summary.outValue); + return vo; + } + + /** + * 构建导出Excel + * + * @param projectName 项目名称 + * @param response 响应 + * @param projectVoList 项目VO + * @param subProjectVoList 子项VO + * @param matrixVoList 方阵VO + */ + private void buildExportExcel(String projectName, HttpServletResponse response, + List projectVoList, + List subProjectVoList, + List matrixVoList) { + String fileName = projectName + "-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + "-" + "施工产值.xlsx"; + FileUtils.setAttachmentResponseHeader(response, fileName); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8"); + // 构建 ExcelWriter + try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()) + .autoCloseStream(false) + // 自动适配 + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + // 大数值自动转换 防止失真 + .registerConverter(new ExcelBigNumberConvert()) + .build()) { + // === Sheet1 === + WriteSheet sheet1 = EasyExcel.writerSheet(0, "按项目汇总") + .head(OutConstructionValueProjectVo.class) + .build(); + excelWriter.write(projectVoList, sheet1); + // === Sheet2 === + WriteSheet sheet2 = EasyExcel.writerSheet(1, "按子项汇总") + .head(OutConstructionValueSubProjectVo.class) + .build(); + excelWriter.write(subProjectVoList, sheet2); + // === Sheet3 === + WriteSheet sheet3 = EasyExcel.writerSheet(2, "按方阵汇总") + .head(OutConstructionValueMatrixVo.class) + .build(); + excelWriter.write(matrixVoList, sheet3); + } catch (IOException e) { + log.error("施工产值Excel导出失败", e); + throw new ServiceException("导出Excel失败"); + } + } + public void getName(OutConstructionValueVo vo) { //查询分部工程以及分项工程 PgsProgressCategoryVo pgsProgressCategoryVo = pgsProgressCategoryService.queryById(vo.getProgressCategoryId()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryImportTemp.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryImportTemp.java new file mode 100644 index 00000000..a9948cbd --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryImportTemp.java @@ -0,0 +1,77 @@ +package org.dromara.progress.domain.dto.progresscategory; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @author lilemy + * @date 2025-11-28 14:24 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class PgsProgressCategoryImportTemp { + + /** + * 主键id + */ + private Long id; + + /** + * 项目id + */ + private Long projectId; + + /** + * 方阵id + */ + private Long matrixId; + + /** + * 方阵名称 + */ + private String matrixName; + + /** + * 类别名称 + */ + private String name; + + /** + * 计量方式（0无 1数量 2百分比） + */ + private String unitType; + + /** + * 总数量 + */ + private BigDecimal total; + + /** + * 已完成数量 + */ + private BigDecimal completed; + + /** + * 计划总数量 + */ + private BigDecimal planTotal; + + /** + * 完成状态（0未开始 1进行中 2已完成） + */ + private String status; + + /** + * 工作类型 + */ + private String workType; + + /** + * 新增完成数量 + */ + private BigDecimal newComplete; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java index 84df883b..af746ebd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java @@ -2850,6 +2850,9 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl ids = voList.stream().map(PgsProgressCategoryEnterTemplateVo::getId).toList(); + if (CollUtil.isEmpty(ids)) { + throw new ServiceException("数据错误，无法从当前表格中获取到有效数据"); + } List categoryList = this.listByIds(ids); if (CollUtil.isEmpty(categoryList)) { throw new ServiceException("数据错误，当前项目无此数据"); @@ -2862,18 +2865,22 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl allProjectIds = projects.stream().map(BusProject::getId).toList(); + List tempList = new ArrayList<>(); List list = voList.stream().map(vo -> { PgsProgressCategory update = new PgsProgressCategory(); + PgsProgressCategoryImportTemp temp = new PgsProgressCategoryImportTemp(); Long id = vo.getId(); update.setId(id); + temp.setId(id); if (progressCategoryMap.containsKey(id)) { PgsProgressCategory old = progressCategoryMap.get(id); // 如果不是当前项目，或当前项目的子项目，则返回 null if (!allProjectIds.contains(old.getProjectId())) { return null; } + BigDecimal oldCompleted = old.getCompleted(); // 当已完成数据等于总数，返回 null - if (old.getCompleted().compareTo(old.getTotal()) >= 0) { + if (old.getTotal().compareTo(BigDecimal.ZERO) == 0 || oldCompleted.compareTo(old.getTotal()) >= 0) { return null; } // 如果完成数量小于等于0，则返回 null @@ -2882,9 +2889,17 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl id：{}，name：{}", id, vo.getName()); @@ -2895,7 +2910,6 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl detailList = progressPlanDetailService.lambdaQuery() .in(PgsProgressPlanDetail::getProgressCategoryId, updateList) .list(); + if (CollUtil.isEmpty(detailList)) { + // 详情为空，直接创建新详情数据 + } return "导入成功，共更新" + list.size() + "条数据"; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java index 3af2de33..71d5f92d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java @@ -1146,12 +1146,12 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl queryPageList(XzdBxBxsqBo bo, PageQuery pageQuery) { //暂时定为只能看见自己的报销 - if (bo.getBxr() == null && !LoginHelper.isSuperAdmin()) { +/* if (bo.getBxr() == null && !LoginHelper.isSuperAdmin()) { bo.setBxr(LoginHelper.getUserId()); - } + }*/ LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page result = baseMapper.selectPage(pageQuery.build(), lqw); setValue(result.getRecords()); return TableDataInfo.build(result); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 22864fc2..6ade9119 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -276,10 +276,10 @@ public class FlwTaskServiceImpl implements IFlwTaskService { public TableDataInfo pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); List definitionIds = new ArrayList<>(); - if (!"0".equals(flowTaskBo.getProjectId())){ + if (!"0".equals(flowTaskBo.getProjectId())) { List flowDefinitions = flowDefinitionMapper.selectList(new LambdaQueryWrapper() .select(FlowDefinition::getId) - .like(FlowDefinition::getFlowCode, flowTaskBo.getProjectId())); + .like(StringUtils.isNotBlank(flowTaskBo.getProjectId()), FlowDefinition::getFlowCode, flowTaskBo.getProjectId())); if (flowDefinitions != null && !flowDefinitions.isEmpty()) { flowDefinitions.forEach(flowDefinition -> { definitionIds.add(flowDefinition.getId()); @@ -292,7 +292,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); queryWrapper.in("t.processed_by", LoginHelper.getUserIdStr()); queryWrapper.in("t.flow_status", BusinessStatusEnum.WAITING.getStatus()); - Page page = this.getFlowTaskDefinitionIdsVoPage(pageQuery,definitionIds, queryWrapper); + Page page = this.getFlowTaskDefinitionIdsVoPage(pageQuery, definitionIds, queryWrapper); return TableDataInfo.build(page); } @@ -306,7 +306,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { public TableDataInfo pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); List definitionIds = new ArrayList<>(); - if (!"0".equals(flowTaskBo.getProjectId())){ + if (!"0".equals(flowTaskBo.getProjectId())) { List flowDefinitions = flowDefinitionMapper.selectList(new LambdaQueryWrapper() .select(FlowDefinition::getId) .like(FlowDefinition::getFlowCode, flowTaskBo.getProjectId())); @@ -322,7 +322,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); queryWrapper.in("t.approver", LoginHelper.getUserIdStr()); queryWrapper.orderByDesc("t.create_time").orderByDesc("t.update_time"); - Page page = flwTaskMapper.getListFinishDefinitionIdsTask(pageQuery.build(),definitionIds, queryWrapper); + Page page = flwTaskMapper.getListFinishDefinitionIdsTask(pageQuery.build(), definitionIds, queryWrapper); return TableDataInfo.build(page); } @@ -356,8 +356,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { } return page; } + private Page getFlowTaskDefinitionIdsVoPage(PageQuery pageQuery, List definitionIds, QueryWrapper queryWrapper) { - Page page = flwTaskMapper.getListRunTaskDefinitionIds(pageQuery.build(),definitionIds, queryWrapper); + Page page = flwTaskMapper.getListRunTaskDefinitionIds(pageQuery.build(), definitionIds, queryWrapper); List records = page.getRecords(); if (CollUtil.isNotEmpty(records)) { List taskIds = StreamUtils.toList(records, FlowTaskVo::getId); @@ -396,7 +397,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { public TableDataInfo pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); List definitionIds = new ArrayList<>(); - if (!"0".equals(flowTaskBo.getProjectId())){ + if (!"0".equals(flowTaskBo.getProjectId())) { List flowDefinitions = flowDefinitionMapper.selectList(new LambdaQueryWrapper() .select(FlowDefinition::getId) .like(FlowDefinition::getFlowCode, flowTaskBo.getProjectId())); @@ -409,9 +410,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { return null; } } - queryWrapper.eq(StringUtils.isNotBlank(flowTaskBo.getIsRead()),"t.is_read", flowTaskBo.getIsRead()); + queryWrapper.eq(StringUtils.isNotBlank(flowTaskBo.getIsRead()), "t.is_read", flowTaskBo.getIsRead()); queryWrapper.in("t.processed_by", LoginHelper.getUserIdStr()); - Page page = flwTaskMapper.getTaskCopyDefinitionIdsByPage(pageQuery.build(),definitionIds, queryWrapper); + Page page = flwTaskMapper.getTaskCopyDefinitionIdsByPage(pageQuery.build(), definitionIds, queryWrapper); return TableDataInfo.build(page); } @@ -598,7 +599,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { for (FlowNode flowNode : nextFlowNodes) { buildNextTaskList.stream().filter(t -> t.getNodeCode().equals(flowNode.getNodeCode())).findFirst().ifPresent(t -> { if (CollUtil.isNotEmpty(t.getPermissionList())) { - List users = flwTaskAssigneeService.fetchUsersByStorageIds(String.join(StringUtils.SEPARATOR, t.getPermissionList()),null); + List users = flwTaskAssigneeService.fetchUsersByStorageIds(String.join(StringUtils.SEPARATOR, t.getPermissionList()), null); if (CollUtil.isNotEmpty(users)) { flowNode.setPermissionFlag(StreamUtils.join(users, e -> String.valueOf(e.getUserId()))); } From 7816fec7aa888bf80a793d237dda42ab5091be0b Mon Sep 17 00:00:00 2001 From: zt Date: Tue, 2 Dec 2025 15:57:39 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceAccessRecordController.java | 28 +++++++-- .../controller/DeviceInfoController.java | 8 ++- .../controller/DeviceTypeController.java | 62 +++++++++++++------ .../domain/bo/DeviceAccessRecordBo.java | 4 ++ .../device/domain/vo/DeviceInfoCountVo.java | 4 ++ .../device/domain/vo/DeviceInfoVo.java | 1 - .../device/service/IDeviceInfoService.java | 4 +- .../service/impl/DeviceInfoServiceImpl.java | 39 +++++++++--- .../service/impl/DeviceTypeServiceImpl.java | 26 ++++++-- 9 files changed, 131 insertions(+), 45 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java index 5c646628..26d7e647 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java @@ -6,6 +6,8 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.project.domain.BusProject; +import org.dromara.project.service.IBusProjectService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,17 +38,17 @@ public class DeviceAccessRecordController extends BaseController { private final IDeviceAccessRecordService deviceAccessRecordService; + private final IBusProjectService projectService; + /** * 查询设备进出场记录列表 */ - @SaCheckPermission("device:accessRecord:list") +// @SaCheckPermission("device:accessRecord:list") @GetMapping("/list") public TableDataInfo list(DeviceAccessRecordBo bo, PageQuery pageQuery) { return deviceAccessRecordService.queryPageList(bo, pageQuery); } - - /** * 导出设备进出场记录列表 */ @@ -63,17 +65,29 @@ public class DeviceAccessRecordController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("device:accessRecord:query") +// @SaCheckPermission("device:accessRecord:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(deviceAccessRecordService.queryById(id)); } + /** + * 子项目列表 + */ + @GetMapping("/childProjectList/{projectId}") + public R> childProjectId(@PathVariable Long projectId) { + List list = projectService.lambdaQuery() + .select(BusProject::getId, BusProject::getProjectName) + .eq(BusProject::getPId, projectId).list(); + return R.ok(list); + } + + /** * 新增设备进出场记录 */ - @SaCheckPermission("device:accessRecord:add") +// @SaCheckPermission("device:accessRecord:add") @Log(title = "设备进出场记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -81,10 +95,12 @@ public class DeviceAccessRecordController extends BaseController { return toAjax(deviceAccessRecordService.insertByBo(bo)); } + + /** * 修改设备进出场记录 */ - @SaCheckPermission("device:accessRecord:edit") +// @SaCheckPermission("device:accessRecord:edit") @Log(title = "设备进出场记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceInfoController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceInfoController.java index ad34b887..e108eb1e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceInfoController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceInfoController.java @@ -85,12 +85,18 @@ public class DeviceInfoController extends BaseController { } + /** + * 设备信息统计 + */ @SaCheckPermission("device:info:list") @GetMapping("/count/{projectId}") - public R count(@PathVariable Long projectId) { + public R> count(@PathVariable Long projectId) { return R.ok(deviceInfoService.count(projectId)); } + /** + * 设备类型统计 + */ @SaCheckPermission("device:info:list") @GetMapping("/typeCount/{projectId}") public R> typeCount(@PathVariable Long projectId) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceTypeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceTypeController.java index 7cd8e4f3..881ce274 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceTypeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceTypeController.java @@ -3,6 +3,7 @@ package org.dromara.device.controller; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; @@ -56,47 +57,72 @@ public class DeviceTypeController extends BaseController { @GetMapping("/treeList") public R> treeList(DeviceTypeBo bo) { List list = deviceTypeService.queryList(bo); - buildTreeWithAutoRoot(list); - return R.ok(list); + List deviceTypeVos = buildTreeWithAutoRoot(list); + return R.ok(deviceTypeVos); } public static List buildTreeWithAutoRoot(List list) { // 1. 用 Map 缓存所有节点（key=节点ID，value=节点对象） + // 防御性判断：空列表直接返回，避免空指针 + if (list == null || list.isEmpty()) { + return new ArrayList<>(); + } + + // 1. 提取所有有效节点ID（用于判断父ID是否存在） + Set validNodeIds = list.stream() + .map(DeviceTypeVo::getId) + .collect(Collectors.toSet()); + + // 2. 用Map缓存所有节点（key=节点ID，value=节点对象），O(1)查找 Map nodeMap = list.stream() .collect(Collectors.toMap(DeviceTypeVo::getId, node -> node)); - List rootNodes = new ArrayList<>(); // 存储自动识别的顶级节点 - List orphanNodes = new ArrayList<>(); // 存储孤儿节点（可选：单独处理） + List rootNodes = new ArrayList<>(); + List orphanNodes = new ArrayList<>(); for (DeviceTypeVo node : list) { Long parentId = node.getParentId(); - // 情况1：parent_id 为0或NULL → 直接视为顶级节点 + boolean isRoot = false; + + // 判定是否为顶级节点（满足以下任一条件） if (parentId == null || parentId == 0) { + // 条件1：parentId为0或NULL（设计约定的顶级节点） + isRoot = true; + } else if (!validNodeIds.contains(parentId)) { + // 条件2：parentId不在有效节点ID中（孤儿节点，视为顶级） + isRoot = true; + orphanNodes.add(node); + } + + if (isRoot) { + // 顶级节点直接加入根列表，无需挂载 rootNodes.add(node); } else { - // 情况2：查找父节点 + // 非顶级节点：挂载到父节点的children中 DeviceTypeVo parentNode = nodeMap.get(parentId); if (parentNode != null) { - // 父节点存在 → 挂载到子节点列表 if (parentNode.getChildren() == null) { parentNode.setChildren(new ArrayList<>()); } - parentNode.getChildren().add(node); - } else { - // 父节点不存在 → 视为顶级节点（或加入孤儿节点列表） - rootNodes.add(node); - // 可选：记录孤儿节点，用于后续告警或修复 - orphanNodes.add(node); + // 关键：避免重复挂载（判断子节点中是否已存在当前节点） + boolean isAlreadyMounted = parentNode.getChildren().stream() + .anyMatch(child -> child.getId().equals(node.getId())); + if (!isAlreadyMounted) { + parentNode.getChildren().add(node); + } } } } - // 可选：打印孤儿节点日志（便于排查数据问题） -// if (!orphanNodes.isEmpty()) { -// System.out.println("警告：存在孤儿节点（父节点不存在），节点ID：" + -// orphanNodes.stream().map(DeviceType::getId).collect(Collectors.toList())); -// } + // 打印孤儿节点日志（便于排查数据问题） + if (!orphanNodes.isEmpty()) { + String orphanIds = orphanNodes.stream() + .map(DeviceTypeVo::getId) + .map(String::valueOf) + .collect(Collectors.joining(",")); + System.out.println("警告：存在孤儿节点（父节点不存在），节点ID：" + orphanIds); + } return rootNodes; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceAccessRecordBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceAccessRecordBo.java index c9369261..472e47f0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceAccessRecordBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/bo/DeviceAccessRecordBo.java @@ -78,5 +78,9 @@ public class DeviceAccessRecordBo extends BaseEntity { */ private String details; + /** + * 子项目ID + */ + private Long childProjectId; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoCountVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoCountVo.java index 44a2840e..a47e7d92 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoCountVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoCountVo.java @@ -20,4 +20,8 @@ public class DeviceInfoCountVo { * 闲置 */ private Integer idle; + /** + * 报废 + */ + private Integer broken; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoVo.java index 6c4d9f08..3a5ed8ed 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/domain/vo/DeviceInfoVo.java @@ -65,7 +65,6 @@ public class DeviceInfoVo implements Serializable { * 设备类型ID（关联设备类型表device_type的id） */ @ExcelProperty(value = "设备类型ID", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "关=联设备类型表device_type的id") private Long typeId; private String typeName; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceInfoService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceInfoService.java index 4b694d23..85c2e7a9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceInfoService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/IDeviceInfoService.java @@ -1,6 +1,5 @@ package org.dromara.device.service; -import org.dromara.device.domain.vo.DeviceInfoCountVo; import org.dromara.device.domain.vo.DeviceInfoVo; import org.dromara.device.domain.bo.DeviceInfoBo; import org.dromara.device.domain.DeviceInfo; @@ -8,7 +7,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; -import org.springframework.web.bind.annotation.PathVariable; import java.util.Collection; import java.util.List; @@ -75,7 +73,7 @@ public interface IDeviceInfoService extends IService{ /** * 设备数量统计 */ - DeviceInfoCountVo count(Long projectId); + Map count(Long projectId); /** * 设备类型统计 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java index f95725bd..63f3793f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java @@ -2,6 +2,7 @@ package org.dromara.device.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -10,9 +11,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.device.domain.DeviceAccessRecord; import org.dromara.device.domain.DeviceType; import org.dromara.device.domain.vo.DeviceInfoCountVo; +import org.dromara.device.service.IDeviceAccessRecordService; import org.dromara.device.service.IDeviceTypeService; +import org.dromara.system.domain.vo.SysDictDataVo; +import org.dromara.system.service.ISysDictDataService; +import org.dromara.system.service.ISysDictTypeService; import org.springframework.stereotype.Service; import org.dromara.device.domain.bo.DeviceInfoBo; import org.dromara.device.domain.vo.DeviceInfoVo; @@ -37,6 +43,10 @@ public class DeviceInfoServiceImpl extends ServiceImpl ids, Boolean isValid) { if(isValid){ - //TODO 做一些业务上的校验,判断是否需要校验 + List list = deviceAccessRecordService.lambdaQuery().in(DeviceAccessRecord::getDeviceId, ids).list(); + if(CollectionUtil.isNotEmpty(list)){ + throw new ServiceException("设备存在进出场记录，不能删除"); + } } + return baseMapper.deleteByIds(ids) > 0; } @Override - public DeviceInfoCountVo count(Long projectId) { - List list = this.lambdaQuery().eq(DeviceInfo::getProjectId, projectId).list(); - DeviceInfoCountVo countVo = new DeviceInfoCountVo(); - countVo.setTotal(list.size()); - countVo.setUse((int)list.stream().filter(deviceInfo -> "1".equals(deviceInfo.getStatus())).count()); - countVo.setMaintain((int)list.stream().filter(deviceInfo -> "2".equals(deviceInfo.getStatus())).count()); - countVo.setIdle((int)list.stream().filter(deviceInfo -> "0".equals(deviceInfo.getStatus())).count()); + public Map count(Long projectId) { - return countVo; + Map map = new LinkedHashMap<>(); + List deviceStatus = dictTypeService.selectDictDataByType("device_status"); + + List list = this.lambdaQuery().eq(DeviceInfo::getProjectId, projectId).list(); + for (SysDictDataVo status : deviceStatus) { + map.put(status.getDictLabel(), (int)list.stream().filter(deviceInfo -> status.getDictValue().equals(deviceInfo.getStatus())).count()); + } + return map; } @Override diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java index c30856a8..6f6392fa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java @@ -22,6 +22,7 @@ import org.dromara.device.domain.DeviceType; import org.dromara.device.mapper.DeviceTypeMapper; import org.dromara.device.service.IDeviceTypeService; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Collection; @@ -83,6 +84,7 @@ public class DeviceTypeServiceImpl extends ServiceImpl params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(DeviceType::getId); + lqw.like(StringUtils.isNotBlank(bo.getTypeCode()), DeviceType::getTypeCode, bo.getTypeCode()); lqw.like(StringUtils.isNotBlank(bo.getTypeName()), DeviceType::getTypeName, bo.getTypeName()); lqw.eq(bo.getParentId() != null, DeviceType::getParentId, bo.getParentId()); lqw.eq(bo.getLevel() != null, DeviceType::getLevel, bo.getLevel()); @@ -149,13 +151,25 @@ public class DeviceTypeServiceImpl extends ServiceImpl ids, Boolean isValid) { + List checkIds = new ArrayList<>(); if(isValid){ - //TODO 做一些业务上的校验,判断是否需要校验 + for (Long id : ids) { + DeviceType deviceType = baseMapper.selectById(id); + if(deviceType == null){ + continue; + } + String prefix = deviceType.getAncestors() + "," + deviceType.getId(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .like(DeviceType::getAncestors, prefix) + .orderByAsc(DeviceType::getLevel, DeviceType::getId); + List list = baseMapper.selectList(queryWrapper); + checkIds.addAll(list.stream().map(DeviceType::getId).toList()); + } + List list = deviceInfoService.lambdaQuery().in(DeviceInfo::getTypeId, checkIds).list(); + if(CollectionUtil.isNotEmpty(list)){ + throw new ServiceException("当前类型或子级类型存在设备"); + } } - List list = deviceInfoService.lambdaQuery().in(DeviceInfo::getTypeId, ids).list(); - if(CollectionUtil.isNotEmpty(list)){ - throw new ServiceException("请先删除该设备类型下的设备"); - } - return baseMapper.deleteByIds(ids) > 0; + return baseMapper.deleteByIds(checkIds) > 0; } } From 40559d4d7316f9ddfd0dc5b89d9be38aa9490861 Mon Sep 17 00:00:00 2001 From: zt Date: Tue, 2 Dec 2025 15:59:06 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/device/service/impl/DeviceInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java index 63f3793f..36c36ba2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceInfoServiceImpl.java @@ -99,7 +99,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); lqw.orderByDesc(DeviceInfo::getId); lqw.eq(bo.getProjectId() != null, DeviceInfo::getProjectId, bo.getProjectId()); - lqw.eq(StringUtils.isNotBlank(bo.getDeviceCode()), DeviceInfo::getDeviceCode, bo.getDeviceCode()); + lqw.like(StringUtils.isNotBlank(bo.getDeviceCode()), DeviceInfo::getDeviceCode, bo.getDeviceCode()); lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), DeviceInfo::getDeviceName, bo.getDeviceName()); lqw.eq(StringUtils.isNotBlank(bo.getModelSpec()), DeviceInfo::getModelSpec, bo.getModelSpec()); lqw.eq(bo.getTypeId() != null, DeviceInfo::getTypeId, bo.getTypeId()); From 4e3faa7a23d88ed782625dd6603066c88d732f2c Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Tue, 2 Dec 2025 16:12:07 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PgsProgressPlanDetailServiceImpl.java | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java index 71d5f92d..0e03ffbf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java @@ -1220,7 +1220,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl recognizeAsync(Long bigPictureId, String fileUrl, String tifUrl, List projectIds) { // 调用识别算法 - RecognizeVo recognizeVo = null; + RecognizeVo recognizeVo; try { recognizeVo = recognizerManager.recognize(fileUrl); } catch (Exception e) { @@ -1278,18 +1278,20 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl Date: Tue, 2 Dec 2025 16:22:42 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/DeviceAccessRecordController.java | 2 +- .../dromara/device/service/impl/DeviceTypeServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java index 26d7e647..fcb25f86 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/controller/DeviceAccessRecordController.java @@ -87,7 +87,7 @@ public class DeviceAccessRecordController extends BaseController { /** * 新增设备进出场记录 */ -// @SaCheckPermission("device:accessRecord:add") + @SaCheckPermission("device:accessRecord:add") @Log(title = "设备进出场记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java index 6f6392fa..f06462f9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/device/service/impl/DeviceTypeServiceImpl.java @@ -102,7 +102,7 @@ public class DeviceTypeServiceImpl extends ServiceImpl 0; if (flag) { bo.setId(add.getId()); @@ -120,11 +120,11 @@ public class DeviceTypeServiceImpl extends ServiceImpl 0; } - private void handleLevelAndAcestors(DeviceType deviceType) { + private void handleLevelAndAncestors(DeviceType deviceType) { if(deviceType.getParentId() == 0L){ deviceType.setAncestors("0"); deviceType.setLevel(1);