From a3cb768d958e64625786857e0db69335875f5d8e Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 06 六月 2025 13:43:55 +0800
Subject: [PATCH] 消息类型更新
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
index 849cf67..36bb9ae 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
@@ -18,6 +18,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.web.servlet.ModelAndView;
+
+import java.util.ArrayList;
import java.util.Arrays;
import org.jeecg.common.util.oConvertUtils;
import io.swagger.annotations.Api;
@@ -97,6 +99,12 @@
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<EquipmentMaintenancePlan> queryWrapper = QueryGenerator.initQueryWrapper(equipmentMaintenancePlan, req.getParameterMap());
+ //鎸夊垱寤烘椂闂磋寖鍥存煡璇�,浠庡墠绔帴鏀朵袱涓弬鏁帮紝beginTime鍜宔ndTime
+ String beginTime = req.getParameter("beginTime");
+ String endTime = req.getParameter("endTime");
+ if(oConvertUtils.isNotEmpty(beginTime) && oConvertUtils.isNotEmpty(endTime)){
+ queryWrapper.between("create_time",beginTime,endTime);
+ }
Page<EquipmentMaintenancePlan> page = new Page<EquipmentMaintenancePlan>(pageNo, pageSize);
IPage<EquipmentMaintenancePlan> pageList = equipmentMaintenancePlanService.page(page, queryWrapper);
return Result.OK(pageList);
@@ -112,15 +120,44 @@
@PostMapping(value = "/add")
@Transactional(rollbackFor = {Exception.class})
public Result<String> add(@RequestBody EquipmentMaintenancePlan equipmentMaintenancePlan) {
- equipmentMaintenancePlan.setStatus("created");
- List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetails = equipmentMaintenancePlan.getEquipmentMaintenancePlanDetailList();
- equipmentMaintenancePlan.setEquipNo(equipmentMaintenancePlanDetails.size());
+ //鍒ゆ柇selectOption绫诲瀷
+ equipmentMaintenancePlan.setStatus("created");
equipmentMaintenancePlan.setDelFlag(CommonConstant.DEL_FLAG_0);
- equipmentMaintenancePlanService.save(equipmentMaintenancePlan);
- for(EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail:equipmentMaintenancePlanDetails){
- equipmentMaintenancePlanDetail.setPlanId(equipmentMaintenancePlan.getId());
+ if(equipmentMaintenancePlan.getSelectOption().equals("0")){
+ //鏌ヨ鎵�鏈夎澶囧苟灏嗗叾id灏佽鎴恑dList
+ List<Equipment> equipments = equipmentService.list();
+ List<String> idList = equipments.stream().map(Equipment::getId).collect(Collectors.toList());
+ //鏍规嵁idList鍜宼ype鏌ヨ鎵�鏈夎澶囩殑淇濆吇鏍囧噯
+ Map<String, Object> maintenanceStandards = equipmentMaintenancePlanService.getStandards(idList,equipmentMaintenancePlan.getType());
+ List<MaintenanceStandard> maintenanceStandardList = (List<MaintenanceStandard>) maintenanceStandards.get("records");
+ //寰幆maintenanceStandardList灏嗘暟鎹皝瑁呭埌equipmentMaintenancePlanDetailList
+ List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetailList = new ArrayList<>();
+ equipmentMaintenancePlan.setEquipNo(maintenanceStandardList.size());
+ equipmentMaintenancePlanService.save(equipmentMaintenancePlan);
+ for(MaintenanceStandard maintenanceStandard:maintenanceStandardList){
+ EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail = new EquipmentMaintenancePlanDetail();
+ equipmentMaintenancePlanDetail.setStandardNum(maintenanceStandard.getNum());
+ equipmentMaintenancePlanDetail.setEquipmentName(maintenanceStandard.getEquipmentName());
+ equipmentMaintenancePlanDetail.setEquipmentId(maintenanceStandard.getEquipmentId());
+ equipmentMaintenancePlanDetail.setEquipmentNum(maintenanceStandard.getEquipmentNum());
+ equipmentMaintenancePlanDetail.setModel(maintenanceStandard.getEquipmentModel());
+ equipmentMaintenancePlanDetail.setStandardId(maintenanceStandard.getId());
+ equipmentMaintenancePlanDetail.setPlanId(equipmentMaintenancePlan.getId());
+ equipmentMaintenancePlanDetail.setPlanStartTime(equipmentMaintenancePlan.getBeginTime());
+ equipmentMaintenancePlanDetail.setPlanEndTime(equipmentMaintenancePlan.getEndTime());
+ equipmentMaintenancePlanDetailList.add(equipmentMaintenancePlanDetail);
+ }
+ equipmentMaintenancePlanDetailService.saveBatch(equipmentMaintenancePlanDetailList);
}
- equipmentMaintenancePlanDetailService.saveBatch(equipmentMaintenancePlanDetails);
+ else{
+ List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetails = equipmentMaintenancePlan.getEquipmentMaintenancePlanDetailList();
+ equipmentMaintenancePlan.setEquipNo(equipmentMaintenancePlanDetails.size());
+ equipmentMaintenancePlanService.save(equipmentMaintenancePlan);
+ for(EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail:equipmentMaintenancePlanDetails){
+ equipmentMaintenancePlanDetail.setPlanId(equipmentMaintenancePlan.getId());
+ }
+ equipmentMaintenancePlanDetailService.saveBatch(equipmentMaintenancePlanDetails);
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -224,13 +261,13 @@
List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetails = equipmentMaintenancePlanDetailService.selectByMainId(equipmentMaintenancePlan.getId());
for(EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail:equipmentMaintenancePlanDetails){
MaintenanceStandard maintenanceStandard = maintenanceStandardService.getById(equipmentMaintenancePlanDetail.getStandardId());
- String num = sysIdentityService.getNumByTypeAndLength("DailyMaintenanceOrder",4);
+ String num = sysIdentityService.getNumByTypeAndLength("MaintenanceOrder",4);
DailyMaintenanceOrder dailyMaintenanceOrder = new DailyMaintenanceOrder();
dailyMaintenanceOrder.setNum(num);
dailyMaintenanceOrder.setEquipmentId(maintenanceStandard.getEquipmentId());
dailyMaintenanceOrder.setPlanStartTime(equipmentMaintenancePlanDetail.getPlanStartTime());
dailyMaintenanceOrder.setPlanEndTime(equipmentMaintenancePlanDetail.getPlanEndTime());
- dailyMaintenanceOrder.setStatus(CommonConstant.STATUS_1);
+ dailyMaintenanceOrder.setStatus("3");//3:鏈紑濮�
dailyMaintenanceOrder.setMaintenanceStandardId(maintenanceStandard.getId());
dailyMaintenanceOrder.setCreateType(CommonConstant.ANNOUNCEMENT_SEND_STATUS_2);
List<MaintenanceStandardDetail> maintenanceStandardDetailList = equipmentMaintenancePlanService.getCycle(maintenanceStandard.getId(),equipmentMaintenancePlan.getType());
@@ -259,7 +296,7 @@
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("鏈夋柊鐨勪繚鍏诲伐鍗�");
messageDTO.setContent(msg);
- messageDTO.setCategory("绯荤粺娑堟伅");
+ messageDTO.setCategory("淇濆吇宸ュ崟");
messageDTO.setFromUser(user.getUsername());
messageDTO.setToUser("admin");
if(equipmentMaintenancePlanDetails.size()!=0){
@@ -408,9 +445,14 @@
}
return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
}
-
+ @GetMapping("/getStandards")
+ public Result<?> getStandards(@RequestParam(name="ids",required=true) String ids,
+ @RequestParam(name="maintenanceType",required=true) String maintenanceType
+ ){
+ List<String> equipmentIds = Arrays.asList(ids.split(","));
+ return Result.OK(equipmentMaintenancePlanService.getStandards(equipmentIds,maintenanceType));
+ }
/*--------------------------------瀛愯〃澶勭悊-淇濆吇璁″垝鏄庣粏-end----------------------------------------------*/
-
--
Gitblit v1.9.3