设备之系统——保养检修 V2.0

修改保养标准逻辑 维度改为设备

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/EquMaintenanceStandardService.java

@@ -1,7 +1,6 @@
 package com.rongwei.bscommon.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwei.bsentity.domain.EquMaintenanceScheduleDo;
 import com.rongwei.bsentity.domain.EquMaintenanceStandardDo;
 
 import java.util.List;
@@ -14,16 +13,16 @@ import java.util.List;
  */
 public interface EquMaintenanceStandardService extends IService<EquMaintenanceStandardDo> {
     /**
-     * 根据对象分类查询标准库数组
+     * 根据设备ID查询标准库数组
      *
-     * @param planType
+     * @param equipmentId 设备Id
      * @return {@link List< EquMaintenanceStandardDo>}
      * @date 2023/11/29 14:30
      * @author shangmi
      *
      */
 
-    List<EquMaintenanceStandardDo> getPlanTypeByList(String planType);
+    List<EquMaintenanceStandardDo> getPlanTypeByList(String equipmentId);
 
     /**
      * 获得唯一性校验值（所有数据）

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquMaintenanceStandardServiceImpl.java

@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.dao.EquMaintenanceStandardDao;
 import com.rongwei.bscommon.sys.service.EquMaintenanceStandardService;
-import com.rongwei.bsentity.domain.EquMaintenanceScheduleDo;
 import com.rongwei.bsentity.domain.EquMaintenanceStandardDo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -24,9 +24,9 @@ public class EquMaintenanceStandardServiceImpl extends ServiceImpl<EquMaintenanc
     private EquMaintenanceStandardDao maintenanceStandardDao;
 
     @Override
-    public List<EquMaintenanceStandardDo> getPlanTypeByList(String planType) {
+    public List<EquMaintenanceStandardDo> getPlanTypeByList(String equipmentId) {
         LambdaQueryWrapper<EquMaintenanceStandardDo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(EquMaintenanceStandardDo::getEquipmenttype,planType)
+        queryWrapper.in(EquMaintenanceStandardDo::getEquipmentId, Arrays.asList(equipmentId.split(",")))
                 .eq(EquMaintenanceStandardDo::getDeleted,0);
 
         return maintenanceStandardDao.selectList(queryWrapper);

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquipmentSendNotifyServiceImpl.java

@@ -1,11 +1,8 @@
 package com.rongwei.bscommon.sys.service.impl;
 
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONUtil;
 import com.rongwei.bscommon.sys.service.EquLubricationTaskManagementService;
 import com.rongwei.bscommon.sys.service.EquMaintenanceTaskService;
 import com.rongwei.bscommon.sys.service.EquipmentSendNotifyService;
-import com.rongwei.bscommon.sys.utils.StringUtil;
 import com.rongwei.bsentity.domain.EquLubricationTaskManagementDo;
 import com.rongwei.bsentity.domain.EquMaintenanceTaskDo;
 import com.rongwei.rwadmincommon.system.domain.SysDictDo;
@@ -18,7 +15,11 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.*;
@@ -87,17 +88,10 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
         String context = String.format(MAINTAIN_SYSTEM_CONTENT, maintenanceTaskDo.getPlanyear() + "-" + maintenanceTaskDo.getMonth(),
                 maintenanceTaskDo.getWorkshop(), maintenanceTaskDo.getEquipmentname(), maintenanceTaskDo.getEquipmentnumber(),
                 maintenanceTaskDo.getMaintenancesite(), maintenanceTaskDo.getPrincipal(), maintenanceTaskDo.getOtherengineers());
+        //删除提醒
+        CXCommonUtils.deleteSendNotify("maintain",id);
 
-        JSONArray data = JSONUtil.parseArray(commonFeginClient.list(new HashMap<String, Object>() {{
-            this.put("NOTIFYTYPE", "maintain");
-            this.put("ROPTION", id);
-        }}).getData());
-
-        if (!data.isEmpty()) {
-            List<String> ids = data.stream().map(info -> JSONUtil.parseObj(info).get("id").toString()).collect(Collectors.toList());
-            commonFeginClient.delete(ids);
-        }
-
+        //发送提醒
         CXCommonUtils.sendNotify(title, context, null, userId.stream().distinct().collect(Collectors.toList()),
                 maintenanceTaskDo.getId(), MAINTAIN, false);
         return R.ok();
@@ -125,25 +119,17 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
             log.info("id为{}的任务无提醒人", id);
             return R.ok();
         }
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         // 发送内容
-        String title = ACCEPTANCE_SYSTEM_TITLE;
-        // 发送标题
         String context = String.format(ACCEPTANCE_SYSTEM_CONTENT, maintenanceTaskDo.getPlanyear() + "-" + maintenanceTaskDo.getMonth(),
                 maintenanceTaskDo.getWorkshop(), maintenanceTaskDo.getEquipmentname(), maintenanceTaskDo.getEquipmentnumber(),
-                maintenanceTaskDo.getMaintenancesite(), maintenanceTaskDo.getTaskendtime(), maintenanceTaskDo.getPrincipal(),
+                maintenanceTaskDo.getMaintenancesite(), simpleDateFormat.format(maintenanceTaskDo.getTaskendtime()), maintenanceTaskDo.getPrincipal(),
                 maintenanceTaskDo.getOtherengineers());
 
-        JSONArray data = JSONUtil.parseArray(commonFeginClient.list(new HashMap<String, Object>() {{
-            this.put("NOTIFYTYPE", "maintain");
-            this.put("ROPTION", id);
-        }}).getData());
+        //删除提醒
+        CXCommonUtils.deleteSendNotify("maintain",id);
 
-        if (!data.isEmpty()) {
-            List<String> ids = data.stream().map(info -> JSONUtil.parseObj(info).get("id").toString()).collect(Collectors.toList());
-            commonFeginClient.delete(ids);
-        }
-
-        CXCommonUtils.sendNotify(title, context, null, userId.stream().distinct().collect(Collectors.toList()),
+        CXCommonUtils.sendNotify(ACCEPTANCE_SYSTEM_TITLE, context, null, userId.stream().distinct().collect(Collectors.toList()),
                 maintenanceTaskDo.getId(), ACCEPTMAINTAINTASK, false);
         return R.ok();
     }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaintenanceServiceImpl.java

@@ -124,9 +124,9 @@ public class MaintenanceServiceImpl implements MaintenanceService {
     @Transactional
     public R batchSavePlans(BatchCreateDTO batchCreate) {
         //该设备分类下的所以部位保养标准
-        List<EquMaintenanceStandardDo> partsSetoutStandardList = maintenanceStandardService.getPlanTypeByList(batchCreate.getPlanType());
+        List<EquMaintenanceStandardDo> partsSetoutStandardList = maintenanceStandardService.getPlanTypeByList(batchCreate.getEquipmentId());
         if(partsSetoutStandardList.size()==0){
-            return R.error(EquipmentTypeEnum.typeOf(Integer.parseInt(batchCreate.getPlanType()))+"没有储存标准！");
+            return R.error("选中的设备没有保养标准！");
         }
         //明细表数组
         List<EquMaintenancePartDo> equMaintenancePartList = new ArrayList<>();
@@ -400,17 +400,17 @@ public class MaintenanceServiceImpl implements MaintenanceService {
 
     private Collection<? extends EquMaintenancePartDo> dataShiftSpareStandToPlan(List<EquMaintenanceStandardDo> partsSetoutStandardList, String id) {
         Date newDate = new Date();
-        SysUserVo currentUser = CommonUtils.getCurrentUser();
+        // SysUserVo currentUser = CommonUtils.getCurrentUser();
         return partsSetoutStandardList.stream().map(info ->{
             EquMaintenancePartDo maintenancePart = new EquMaintenancePartDo();
             BeanUtils.copyProperties(info,maintenancePart);
             maintenancePart.setId(SecurityUtil.getUUID())
                     .setCreatedate(newDate)
-                    .setCreateusername(currentUser.getName())
-                    .setCreateuserid(currentUser.getId())
-                    .setModifyuserid(currentUser.getId())
+                    // .setCreateusername(currentUser.getName())
+                    // .setCreateuserid(currentUser.getId())
+                    // .setModifyuserid(currentUser.getId())
                     .setModifydate(newDate)
-                    .setModifyusername(currentUser.getName())
+                    // .setModifyusername(currentUser.getName())
                     .setStandardrequest(info.getEquipmentsupport())
                     .setMaintenancestand(info.getStandardid())
                     .setMaintenancestandid(info.getId())
@@ -540,7 +540,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
     public EquMaintenanceScheduleDo dataShiftFacilityToPlan(AspCheckItems aspCheckItem,Integer year){
         EquMaintenanceScheduleDo maintenanceSchedule = new EquMaintenanceScheduleDo();
         Date newDate = new Date();
-        SysUserVo currentUser = CommonUtils.getCurrentUser();
+        // SysUserVo currentUser = CommonUtils.getCurrentUser();
         maintenanceSchedule.setEquipmenttype(aspCheckItem.getCheckitemtype())
                 .setPlanyear(year)
                 .setEquipmentname(aspCheckItem.getCheckitemname())
@@ -555,11 +555,11 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                 .setPlannedstatus("unlocked")
                 .setId(SecurityUtil.getUUID())
                 .setCreatedate(newDate)
-                .setCreateuserid(currentUser.getId())
-                .setCreateusername(currentUser.getName())
+                // .setCreateuserid(currentUser.getId())
+                // .setCreateusername(currentUser.getName())
                 .setModifydate(newDate)
-                .setModifyuserid(currentUser.getId())
-                .setModifyusername(currentUser.getName())
+                // .setModifyuserid(currentUser.getId())
+                // .setModifyusername(currentUser.getName())
                 .setTenantid(aspCheckItem.getTenantid());
         return maintenanceSchedule;
     }

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquMaintenanceStandardDo.java

@@ -267,4 +267,27 @@ public class EquMaintenanceStandardDo implements Serializable {
 	 */
 	private String planMonth;
 
+	/**
+	 * 车间ID
+	 */
+	private String workshopId;
+
+	/**
+	 * 车间
+	 */
+	private String workshop;
+
+	/**
+	 * 设备名称
+	 */
+	private String equipmentName;
+	/**
+	 * 设备Id
+	 */
+	private String equipmentId;
+	/**
+	 * 设备编号
+	 */
+	private String equipmentNumber;
+
 }

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/enums/PlantEnum.java

@@ -1,6 +1,7 @@
 package com.rongwei.bsentity.enums;
 
-import java.util.Arrays;
+import lombok.Getter;
+
 import java.util.stream.Stream;
 
 /**
@@ -9,6 +10,7 @@ import java.util.stream.Stream;
  * @date 2023/12/8 16:26
  * @description 工厂枚举
  */
+@Getter
 public enum PlantEnum {
     CXLB("0001651000000015EFDD","山东创新箔材科技有限公司","CXLB"),
     CXJL("0001651000000017DRZ1","山东创新精铝金属制造有限公司","CXJL"),