From d10ee39ef95eb2442902e36dd36b1683cbd10af6 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 06 三月 2025 15:10:03 +0800
Subject: [PATCH] art: 项目性维修-详情页面-附件，设备状态，技术状态不展示问题修改, 设备选择过滤，只能选择用户范围内的设备信息
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 270 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 9b570d0..7d881d7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -24,6 +25,7 @@
import org.jeecg.modules.base.service.IFactoryModelService;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.model.DepartVo;
+import org.jeecg.modules.eam.model.MaintenanceCycleVo;
import org.jeecg.modules.eam.service.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -34,7 +36,9 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.system.service.ISysUserService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
@@ -116,7 +120,14 @@
@Autowired
private IAreaService areaService;
+ @Autowired
+ private IDailyInspectionStandardService dailyInspectionStandardService;
+ @Autowired
+ private IMaintenanceStandardService maintenanceStandardService;
+
+ @Autowired
+ private ISysUserService sysUserService;
/**
@@ -151,6 +162,13 @@
}
if(StringUtils.isNotBlank(equipment.getEquipmentCategoryId())){
queryWrapper.eq("equipment_category_id",equipment.getEquipmentCategoryId());
+ }
+ List<String> userWorkCenterIds = getUserWorkCenterIds();
+ if(CollectionUtils.isNotEmpty(userWorkCenterIds)) {
+ queryWrapper.in("work_center_id",userWorkCenterIds);
+ }
+ if(StringUtils.isNotBlank(equipment.getWorkCenterId())){
+ queryWrapper.eq("work_center_id",equipment.getWorkCenterId());
}
queryWrapper.isNull("line_id");
queryWrapper.eq("status","1");
@@ -195,6 +213,78 @@
return Result.OK(pageList);
}
+ @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/showEquipmentList")
+ public Result<IPage<Equipment>> showEquipmentList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(equipment.getNum())){
+ queryWrapper.like("num",equipment.getNum());
+ }
+ if(StringUtils.isNotBlank(equipment.getName())){
+ queryWrapper.like("name",equipment.getName());
+ }
+// queryWrapper.eq("equipment_status","1");
+ queryWrapper.in("technology_status","qualified","limitedUse");
+ queryWrapper.eq("status","1");
+ queryWrapper.eq("del_flag",0);
+ queryWrapper.orderByDesc("create_time");
+
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/findEquipmentList")
+ public Result<IPage<Equipment>> findEquipmentList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(equipment.getNum())){
+ queryWrapper.like("num",equipment.getNum());
+ }
+ if(StringUtils.isNotBlank(equipment.getName())){
+ queryWrapper.like("name",equipment.getName());
+ }
+// queryWrapper.eq("equipment_status","1");
+ queryWrapper.in("technology_status","qualified","limitedUse");
+ queryWrapper.in("equipment_importance_id","A","B","C");
+ queryWrapper.eq("status","1");
+ queryWrapper.eq("del_flag",0);
+ queryWrapper.orderByDesc("create_time");
+
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+
+ @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/queryEquipmentList")
+ public Result<IPage<Equipment>> queryEquipmentList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(equipment.getNum())){
+ queryWrapper.like("num",equipment.getNum());
+ }
+ if(StringUtils.isNotBlank(equipment.getName())){
+ queryWrapper.like("name",equipment.getName());
+ }
+ queryWrapper.eq("use_id",equipment.getUseId());
+ queryWrapper.eq("del_flag",0);
+ queryWrapper.orderByDesc("create_time");
+
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
/**
* 璁惧淇濅慨 鑾峰彇璁惧鍒楄〃缁勪欢
@@ -210,6 +300,54 @@
QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
IPage<Equipment> pageList = equipmentService.getEquipmentList(page, equipment);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 璁惧淇濅慨 鑾峰彇璁惧鍒楄〃缁勪欢
+ * qsw 2023-7-14
+ */
+ @GetMapping(value = "/getEquipmentTZList")
+ @PermissionData
+ public Result<IPage<Equipment>> getEquipmentTZList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ //QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.getEquipmentTZList(page, equipment);
+ List<Equipment> list = pageList.getRecords();
+ list.forEach(equip -> {
+ String id = equip.getId();
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getEquipmentId, id)
+ .eq(DailyInspectionStandard::getVersionStatus, "2")
+ .list();
+ if (dailyInspectionStandards.size() > 0) {
+ equip.setYseNoInspectionStandard("0");
+ } else {
+ equip.setYseNoInspectionStandard("1");
+ }
+ List<MaintenanceStandard> maintenance2Standards = maintenanceStandardService.lambdaQuery()
+ .eq(MaintenanceStandard::getEquipmentId, id)
+ .eq(MaintenanceStandard::getMaintenanceType, "2")
+ .eq(MaintenanceStandard::getVersionStatus, "2").list();
+ if (maintenance2Standards.size() > 0) {
+ equip.setYseNoMaintenance2Standard("0");
+ } else {
+ equip.setYseNoMaintenance2Standard("1");
+ }
+
+ List<MaintenanceStandard> maintenance3Standards = maintenanceStandardService.lambdaQuery()
+ .eq(MaintenanceStandard::getEquipmentId, id)
+ .eq(MaintenanceStandard::getMaintenanceType, "3")
+ .eq(MaintenanceStandard::getVersionStatus, "2").list();
+ if (maintenance3Standards.size() > 0) {
+ equip.setYseNoMaintenance3Standard("0");
+ } else {
+ equip.setYseNoMaintenance3Standard("1");
+ }
+ });
return Result.OK(pageList);
}
@@ -569,13 +707,17 @@
EquipmentImportVo equipmentImportVo = list.get(i);
String equipmentCategoryName = equipmentImportVo.getEquipmentCategoryName();
String useId = equipmentImportVo.getUseId();
- String areaId = equipmentImportVo.getFactoryModelId();
+ String workCenterId = equipmentImportVo.getWorkCenterId();//涓績
+ String areaId = equipmentImportVo.getFactoryModelId();//宸ュ尯
+ String productionId = equipmentImportVo.getAreaId();//宸ユ
String manageId = equipmentImportVo.getManageId();
String constructorId = equipmentImportVo.getConstructorId();
String teamId = equipmentImportVo.getTeamId();
String propertyStatus = equipmentImportVo.getPropertyStatus();
String abc = equipmentImportVo.getEquipmentImportanceId();
- if(StringUtils.isBlank(equipmentImportVo.getNum())){
+ Date thirdMaintenanceTime = equipmentImportVo.getThirdMaintenanceTime();
+ Date technologyStatusQualificationTime = equipmentImportVo.getTechnologyStatusQualificationTime();
+ if(StringUtils.isBlank(equipmentImportVo.getNum())){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁熶竴缂栫爜缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
continue;
@@ -600,13 +742,18 @@
exceptionNum++;
continue;
}
- else if(StringUtils.isBlank(equipmentImportVo.getModel())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍨嬪彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// else if(StringUtils.isBlank(equipmentImportVo.getModel())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍨嬪彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// continue;
+// }
+ else if(StringUtils.isBlank(useId)){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浣跨敤閮ㄩ棬缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
continue;
}
- else if(StringUtils.isBlank(useId)){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浣跨敤閮ㄩ棬缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ else if(StringUtils.isBlank(workCenterId)){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓績缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
continue;
}
@@ -692,6 +839,18 @@
exceptionNum++;
continue;
}
+ //涓績
+ Area workCenterArea = areaService.getOne(new QueryWrapper<Area>().eq("name",workCenterId.trim()).eq("del_flag",0));
+ if(ObjectUtils.isNotNull(workCenterArea)){
+ equipment.setWorkCenterId(workCenterArea.getId());
+// }else if(ObjectUtils.isNotNull(area1)) {
+// equipment.setFactoryModelId(area1.getId());
+ }else {
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ涓績,璇风淮鎶や腑蹇冩暟鎹悗鍐嶅鍏�;";
+ exceptionNum++;
+ continue;
+ }
+ //宸ュ尯
Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()).eq("del_flag",0));
Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()).eq("del_flag",0));
if(ObjectUtils.isNotNull(area)){
@@ -703,6 +862,13 @@
exceptionNum++;
continue;
}
+
+ //宸ユ
+ Area productionArea = areaService.getOne(new QueryWrapper<Area>().eq("name",productionId.trim()).eq("del_flag",0));
+ if(ObjectUtils.isNotNull(productionArea)){
+ equipment.setAreaId(productionArea.getId());
+ }
+
SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()).eq("del_flag",0));
if(ObjectUtils.isNotNull(manage)){
equipment.setManageId(manage.getId());
@@ -785,10 +951,14 @@
.setSourceCountry(equipmentImportVo.getSourceCountry())
.setModel(equipmentImportVo.getModel())
.setSpecification(equipmentImportVo.getSpecification())
- .setPropertyStatus(equipmentImportVo.getPropertyStatus())
+ .setPropertyStatus("normal")
.setWarrantyStart(equipmentImportVo.getWarrantyStart())
.setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
+ .setIsLineEquip("no")
+ .setIsLine("no")
.setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
+ .setThirdMaintenanceTime(equipmentImportVo.getThirdMaintenanceTime())
+ .setTechnologyStatusQualificationTime(equipmentImportVo.getTechnologyStatusQualificationTime())
.setGpo(equipmentImportVo.getGpo());
if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){
equipment.setCheckPeriod(365*3+"");
@@ -860,6 +1030,7 @@
@Transactional(rollbackFor = {Exception.class})
public Result<?> addLine(@RequestBody Equipment equipment){
equipment.setIsLineEquip("no");
+ equipment.setIsLine("yes");
equipmentService.save(equipment);
List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
for(Equipment equipment1:equipmentList){
@@ -874,7 +1045,11 @@
@Transactional(rollbackFor = {Exception.class})
public Result<?> editLine(@RequestBody Equipment equipment){
equipmentService.updateById(equipment);
- equipmentService.update(new UpdateWrapper<Equipment>().eq("line_id",equipment.getId()).set("line_id",null).set("is_meta",null));
+ equipmentService.update(new UpdateWrapper<Equipment>()
+ .eq("line_id",equipment.getId())
+ .set("line_id",null)
+ .set("is_meta",null)
+ .set("is_line_equip","no"));
List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
for(Equipment equipment1:equipmentList){
equipment1.setLineId(equipment.getId());
@@ -887,6 +1062,93 @@
equipmentService.updateBatchById(equipmentList);
return Result.OK("缂栬緫鎴愬姛");
}
+ @PostMapping("/updateKeyEquipment")
+ public Result<?>updateKeyEquipment(@RequestBody Equipment equipment){
+ equipmentService.update(new UpdateWrapper<Equipment>().eq("specific_equipment","0").set("specific_equipment",null));
+ List<Equipment> keyEquipmentUpdateList = equipment.getKeyEquipmentUpdateList();
+ for(Equipment updateEquipment:keyEquipmentUpdateList){
+ updateEquipment.setId(updateEquipment.getEquipmentId());
+ equipmentService.updateById(updateEquipment);
+ }
+ return Result.OK("淇敼鎴愬姛");
+ }
+ /**
+ *璁惧鍙扮珯-淇濆吇鏍囧噯
+ */
+ @GetMapping("getEquipmentListAllStandard")
+ public Result<?> getEquipmentListAllStandard(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> equipmentListAllStandards = equipmentService.getEquipmentListAllStandard(pageNo, pageSize, params);
+ List<Map<String, Object>> records = equipmentListAllStandards.getRecords();
+ for (Map<String, Object> record : records) {
+ String id = (String) record.get("id");
+ String precisionParameters = (String)record.get("precisionParameters");
+ if("1".equals(precisionParameters)){
+ record.put("yseNoPrecisionParameters","0");
+ }else{
+ record.put("yseNoPrecisionParameters","1");
+ }
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getEquipmentId, id)
+ .eq(DailyInspectionStandard::getVersionStatus, "2")
+ .list();
+ if(dailyInspectionStandards.size()>0){
+ record.put("yseNoInspectionStandard","0");
+ }else{
+ record.put("yseNoInspectionStandard","1");
+ }
+ List<MaintenanceStandard> maintenance2Standards = maintenanceStandardService.lambdaQuery()
+ .eq(MaintenanceStandard::getEquipmentId, id)
+ .eq(MaintenanceStandard::getMaintenanceType, "2")
+ .eq(MaintenanceStandard::getVersionStatus, "2").list();
+ if(maintenance2Standards.size()>0){
+ record.put("yseNoMaintenance2Standard","0");
+ }else{
+ record.put("yseNoMaintenance2Standard","1");
+ }
+
+ List<MaintenanceStandard> maintenance3Standards = maintenanceStandardService.lambdaQuery()
+ .eq(MaintenanceStandard::getEquipmentId, id)
+ .eq(MaintenanceStandard::getMaintenanceType, "3")
+ .eq(MaintenanceStandard::getVersionStatus, "2").list();
+ if(maintenance3Standards.size()>0){
+ record.put("yseNoMaintenance3Standard","0");
+ }else{
+ record.put("yseNoMaintenance3Standard","1");
+ }
+
+ }
+ return Result.ok(equipmentListAllStandards);
+ }
+ @GetMapping(value = "/planEquipmentList")
+ @PermissionData
+ public Result<IPage<Equipment>> planEquipmentList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
+ //鏍规嵁涓嬫涓変繚鏃堕棿鎺掑簭
+ queryWrapper.orderByAsc("next_third_maintenance_time");
+ //濡傛灉startTime鍜宔ndTime涓嶄负绌猴紝鍒欐煡璇笅娆′笁淇濇椂闂村湪杩欎釜鏃堕棿娈靛唴鐨勮澶�
+ if(equipment.getStartTime()!=null && equipment.getEndTime()!=null){
+ queryWrapper.between("next_third_maintenance_time",equipment.getStartTime(),equipment.getEndTime());
+ }
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ private List<String> getUserWorkCenterIds(){
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ SysUser sysUser = sysUserService.getById(user.getId());
+ String areaId = sysUser.getAreaId();
+ List<String> workCenterIds = null;
+ if(StringUtils.isNotBlank(areaId)){
+// strings = new ArrayList<>();
+ String[] split = areaId.split(",");
+ workCenterIds = Arrays.asList(split);
+ }
+ return workCenterIds;
+ }
}
--
Gitblit v1.9.3