From 7e8d0345fa4afce3a0c25f0445c43a80657fd04e Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 25 八月 2025 11:02:12 +0800
Subject: [PATCH] 设备管理首页列表接口
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | 53 +++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml | 23 +++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderService.java | 8 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 65 ++++++++++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java | 8 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamHomeController.java | 40 ++++++++++
6 files changed, 186 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
index 66ac3ee..c142bf7 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
@@ -74,4 +74,12 @@
* @return
*/
List<EchartsDto> reportRepairList();
+
+ /**
+ * 璁惧绠＄悊棣栭〉-璁惧鎶ヤ慨鏁呴殰鎯呭喌鍒楄〃
+ * @param code
+ * @param page
+ * @return
+ */
+ IPage<EamReportRepairDto> reportRepairList(String code, Page<EamReportRepairDto> page);
}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
index a3e0161..c4cb2a2 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
@@ -359,6 +359,7 @@
return entity;
}
+ @Override
public List<EchartsDto> reportRepairList() {
List<EchartsDto> echartsDtoList = new ArrayList<>();
@@ -457,4 +458,56 @@
dto.setPercentage(percentage);
return dto;
}
+
+ /**
+ * 璁惧绠＄悊棣栭〉-璁惧鎶ヤ慨鏁呴殰鎯呭喌鍒楄〃
+ * @param code
+ * @param page
+ * @return
+ */
+ @Override
+ public IPage<EamReportRepairDto> reportRepairList(String code, Page<EamReportRepairDto> page){
+ // 鐢ㄦ埛鏁版嵁鏉冮檺妫�鏌�
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return null;
+ }
+
+ QueryWrapper<EamReportRepairDto> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("wmo.del_flag", CommonConstant.DEL_FLAG_0);
+
+ // 璁惧杩囨护閫昏緫
+ if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService
+ .list(new LambdaQueryWrapper<BaseFactoryUser>()
+ .eq(BaseFactoryUser::getUserId, sysUser.getId()));
+
+ if (CollectionUtils.isEmpty(baseFactoryUserList)) {
+ return null;
+ }
+
+ Set<String> factoryIds = baseFactoryUserList.stream()
+ .map(BaseFactoryUser::getFactoryId)
+ .collect(Collectors.toSet());
+
+ Set<String> factoryCodes = baseFactoryService.listByIds(factoryIds)
+ .stream()
+ .map(BaseFactory::getOrgCode)
+ .collect(Collectors.toSet());
+
+ queryWrapper.in("e.factory_org_code", factoryCodes);
+ }
+ queryWrapper.orderByDesc("wmo.create_time");
+ switch (code){
+ case "bx":
+ return baseMapper.queryPageList(page,queryWrapper);
+ case "stop":
+ return baseMapper.queryPageList(page,queryWrapper.eq("breakdown_flag", "1"));
+ default:
+ return baseMapper.queryPageList(page,queryWrapper.eq("breakdown_flag", "0"));
+ }
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamHomeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamHomeController.java
index bf90445..1d10c34 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamHomeController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamHomeController.java
@@ -1,11 +1,16 @@
package org.jeecg.modules.eam.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.eam.dto.EamReportRepairDto;
import org.jeecg.modules.eam.dto.EchartsDto;
+import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamFactorySecondMaintPlan;
+import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamFactorySecondMaintPlanService;
import org.jeecg.modules.eam.service.IEamReportRepairService;
@@ -13,6 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
@@ -83,4 +89,38 @@
List<EamFactorySecondMaintPlan> echartsDtoList = iEamFactorySecondMaintPlanService.list();
return Result.ok(echartsDtoList);
}
+
+ /**
+ * 璁惧绠＄悊棣栭〉-璁惧鎶ヤ慨鏁呴殰鍒楄〃
+ * @param code
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @ApiOperation(value = "璁惧绠＄悊棣栭〉-璁惧鎶ヤ慨鏁呴殰鍒楄〃", notes = "璁惧绠＄悊棣栭〉-璁惧鎶ヤ慨鏁呴殰鍒楄〃")
+ @GetMapping(value = "/repairList")
+ public Result<?> repair(@RequestParam(name = "code", required = false) String code,
+ @RequestParam(name = "pageNo", required = false, defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+ Page<EamReportRepairDto> page = new Page<>(pageNo, pageSize);
+ IPage<EamReportRepairDto> iPage = iEamReportRepairService.reportRepairList(code,page);
+ return Result.ok(iPage);
+ }
+
+ /**
+ * 璁惧绠＄悊棣栭〉-涓夌骇淇濆吇鍒楄〃
+ * @param code
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @ApiOperation(value = "璁惧绠＄悊棣栭〉-涓夌骇淇濆吇鍒楄〃", notes = "璁惧绠＄悊棣栭〉-涓夌骇淇濆吇鍒楄〃")
+ @GetMapping(value = "/maintenanceList")
+ public Result<?> maintenanceList(@RequestParam(name = "code", required = false) String code,
+ @RequestParam(name = "pageNo", required = false, defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+ Page<EamThirdMaintenanceOrder> page = new Page<>(pageNo, pageSize);
+ IPage<EamThirdMaintenanceOrder> iPage = iEamThirdMaintenanceOrderService.maintenanceList(code, page);
+ return Result.ok(iPage);
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
index 498f3ef..e7d4de6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
@@ -14,6 +14,18 @@
${ew.customSqlSegment}
</select>
+ <select id="queryAsList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder">
+ select wmo.*, e.equipment_code, e.equipment_name, e.equipment_model,f.process_instance_id as 'procInstId',
+ f.process_definition_key,
+ f.process_definition_id,
+ f.process_instance_id
+ from eam_third_maintenance_order wmo
+ inner join eam_equipment e
+ on wmo.equipment_id = e.id
+ left join flow_my_business f on f.data_id=wmo.id
+ ${ew.customSqlSegment}
+ </select>
+
<select id="findThirdMaintenanceBaseInfo" resultType="org.jeecg.modules.eam.request.EamThirdMaintenanceBaseResponse">
SELECT
t1.hf_code_a,
@@ -47,17 +59,6 @@
inner join eam_equipment e
on wmo.equipment_id = e.id
LEFT JOIN eam_base_factory f ON f.org_code = SUBSTRING ( e.factory_org_code , 1, 6 )
- ${ew.customSqlSegment}
- </select>
- <select id="queryAsList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder">
- select wmo.*, e.equipment_code, e.equipment_name, e.equipment_model,f.process_instance_id as 'procInstId',
- f.process_definition_key,
- f.process_definition_id,
- f.process_instance_id
- from eam_third_maintenance_order wmo
- inner join eam_equipment e
- on wmo.equipment_id = e.id
- left join flow_my_business f on f.data_id=wmo.id
${ew.customSqlSegment}
</select>
</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderService.java
index ba1132b..ed14085 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderService.java
@@ -109,4 +109,12 @@
* @return
*/
List<EchartsDto> selectList();
+
+ /**
+ * 璁惧绠＄悊棣栭〉-涓変繚璁″垝鍒楄〃
+ * @param code
+ * @param page
+ * @return
+ */
+ IPage<EamThirdMaintenanceOrder> maintenanceList(String code, Page<EamThirdMaintenanceOrder> page);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index 49c94db..abd8ec3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -807,6 +807,71 @@
}
/**
+ * 璁惧绠＄悊棣栭〉-涓変繚璁″垝鍒楄〃
+ * @param code
+ * @param page
+ * @return
+ */
+ @Override
+ public IPage<EamThirdMaintenanceOrder> maintenanceList(String code, Page<EamThirdMaintenanceOrder> page){
+ // 鐢ㄦ埛鏁版嵁鏉冮檺妫�鏌�
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return null;
+ }
+
+ QueryWrapper<EamThirdMaintenanceOrder> queryWrapper = new QueryWrapper<>();
+
+ // 璁惧杩囨护閫昏緫
+ if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService
+ .list(new LambdaQueryWrapper<BaseFactoryUser>()
+ .eq(BaseFactoryUser::getUserId, sysUser.getId()));
+
+ if (CollectionUtils.isEmpty(baseFactoryUserList)) {
+ return null;
+ }
+
+ Set<String> factoryIds = baseFactoryUserList.stream()
+ .map(BaseFactoryUser::getFactoryId)
+ .collect(Collectors.toSet());
+
+ Set<String> factoryCodes = baseFactoryService.listByIds(factoryIds)
+ .stream()
+ .map(BaseFactory::getOrgCode)
+ .collect(Collectors.toSet());
+
+ queryWrapper.in("e.factory_org_code", factoryCodes);
+ }
+ queryWrapper.orderByDesc("wmo.create_time");
+ // 鑾峰彇褰撳墠骞存湀鍜屼笅涓や釜鏈堢殑骞存湀瀛楃涓�
+ String currentYearMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
+ switch (code){
+ case "bysbzs":
+ // 鏈湀涓変繚璁″垝鎬绘暟
+ return this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", currentYearMonth));
+ case "bwc":
+ // 鏈湀瀹屾垚
+ return this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", currentYearMonth)
+ .eq("maintenance_status", ThirdMaintenanceStatusEnum.COMPLETE.name()));
+ case "xysb":
+ // 涓嬫湀涓変繚璁″垝
+ String nextMonth = LocalDate.now().plusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
+ return this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", nextMonth));
+ case "xxysb":
+ // 涓嬩笅鏈堜笁淇濊鍒�
+ String nextNextMonth = LocalDate.now().plusMonths(2).format(DateTimeFormatter.ofPattern("yyyy-MM"));
+ return this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", nextNextMonth));
+ default:
+ break;
+ }
+ return null;
+ }
+
+ /**
* 鏇存柊宸ュ崟鐘舵��
*/
private void updateOrderStatus(Result result, EamThirdMaintenanceRequest request, EamThirdMaintenanceOrder order, LoginUser user) {
--
Gitblit v1.9.3