设备之系统——设备处置申请 V1.0

审批通过后的更新处理逻辑提交

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquFrockListDao.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.EquFrockListDo;
+
+/**
+ * @author shangmi
+ * @title EquFrockListDao
+ * @date 2024/1/16 15:32
+ * @description 工装清单Mapping
+ */
+public interface EquFrockListDao extends BaseMapper<EquFrockListDo> {
+}

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

@@ -3,7 +3,7 @@ package com.rongwei.bscommon.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.AspCheckItems;
-import com.rongwei.bsentity.dto.EquBomCopyDto;
+import com.rongwei.bsentity.dto.EquipmentDisposeDTO;
 
 /**
  * <p>
@@ -14,4 +14,17 @@ import com.rongwei.bsentity.dto.EquBomCopyDto;
  * @since 2023-11-24
  */
 public interface AspCheckItemsService extends IService<AspCheckItems> {
+
+    /**
+     * 根据ID修改地址信息
+     *
+     * @param equipmentDisposeDTO
+     * @return
+     * @date 2024/1/16 16:28
+     * @author shangmi
+     *
+     */
+    void updateSiteById(EquipmentDisposeDTO equipmentDisposeDTO);
+
+    void updateStateById(String equipmentId);
 }

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

@@ -0,0 +1,17 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.EquFrockListDo;
+import com.rongwei.bsentity.dto.EquipmentDisposeDTO;
+
+/**
+ * @author shangmi
+ * @title EquFrockListService
+ * @date 2024/1/16 15:41
+ * @description 工装清单服务层
+ */
+public interface EquFrockListService extends IService<EquFrockListDo> {
+    void updateSiteById(EquipmentDisposeDTO equipmentDisposeDTO);
+
+    void updateStateById(String equipmentId);
+}

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

@@ -22,4 +22,15 @@ public interface EquLubricationPlanService extends IService<EquLubricationPlanDo
      * @param response
      */
     void wordExportLubrication(Map<String, Object> parameter, HttpServletResponse response);
+
+    /**
+     * 根据设备ID修改润滑标准状态
+     *
+     * @param equipmentId
+     * @return
+     * @date 2024/1/16 17:36
+     * @author shangmi
+     *
+     */
+    void updateStateByEquId(String equipmentId);
 }

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

@@ -100,4 +100,16 @@ public interface EquMaintenanceScheduleService extends IService<EquMaintenanceSc
      */
 
     List<EquMaintenanceScheduleDo> getYearByList(int year);
+
+    /**
+     * 修改指定设备的保养检修任务
+     *
+     * @param equipmentId
+     * @return
+     * @date 2024/1/16 17:40
+     * @author shangmi
+     *
+     */
+
+    void updateStateByEquId(String equipmentId);
 }

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

@@ -0,0 +1,24 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.dto.EquipmentDisposeDTO;
+import com.rongwei.rwcommon.base.R;
+
+/**
+ * @author shangmi
+ * @title EquipmentArchivesService
+ * @date 2024/1/16 14:18
+ * @description 设备档案
+ */
+public interface EquipmentArchivesService {
+    /**
+     * 更新设备库
+     *
+     * @param equipmentDisposeDTO
+     * @return {@link R}
+     * @date 2024/1/16 14:26
+     * @author shangmi
+     *
+     */
+
+    R updateEquipmentData(EquipmentDisposeDTO equipmentDisposeDTO);
+}

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

@@ -1,11 +1,15 @@
 package com.rongwei.bscommon.sys.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.dao.AspCheckItemsDao;
 import com.rongwei.bscommon.sys.service.AspCheckItemsService;
 import com.rongwei.bsentity.domain.AspCheckItems;
+import com.rongwei.bsentity.dto.EquipmentDisposeDTO;
+import com.rongwei.bsentity.enums.PlantEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -21,5 +25,35 @@ public class AspCheckItemsServiceImpl extends ServiceImpl<AspCheckItemsDao, AspC
 
     private static final Logger logger = LoggerFactory.getLogger(AspCheckItemsServiceImpl.class);
 
+    @Autowired
+    private AspCheckItemsDao aspCheckItemsDao;
 
+    /**
+     * 根据ID修改地址信息
+     *
+     * @param equipmentDisposeDTO
+     * @return
+     * @date 2024/1/16 16:28
+     * @author shangmi
+     *
+     */
+    @Override
+    public void updateSiteById(EquipmentDisposeDTO equipmentDisposeDTO) {
+        LambdaUpdateWrapper<AspCheckItems> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(AspCheckItems::getId,equipmentDisposeDTO.getEquipmentId())
+                .set(AspCheckItems::getTenantid,equipmentDisposeDTO.getRollInPlantId())
+                .set(AspCheckItems::getUsedeptid,equipmentDisposeDTO.getRollInDeptId())
+                .set(AspCheckItems::getUsedeptname,equipmentDisposeDTO.getRollInDept())
+                .set(AspCheckItems::getOwnedfactory, PlantEnum.nameOf(equipmentDisposeDTO.getRollInPlantId()))
+                .set(AspCheckItems::getDeviceaddress,equipmentDisposeDTO.getRollInLocation());
+        aspCheckItemsDao.update(null,updateWrapper);
+    }
+
+    @Override
+    public void updateStateById(String equipmentId) {
+        LambdaUpdateWrapper<AspCheckItems> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(AspCheckItems::getId,equipmentId)
+                .set(AspCheckItems::getEnabled,"报废");
+        aspCheckItemsDao.update(null,updateWrapper);
+    }
 }

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

@@ -0,0 +1,54 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.EquFrockListDao;
+import com.rongwei.bscommon.sys.service.EquFrockListService;
+import com.rongwei.bsentity.domain.EquFrockListDo;
+import com.rongwei.bsentity.dto.EquipmentDisposeDTO;
+import com.rongwei.bsentity.enums.PlantEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author shangmi
+ * @title EquFrockListServiceImpl
+ * @date 2024/1/16 15:46
+ * @description 工装清单服务实现层
+ */
+@Service
+public class EquFrockListServiceImpl extends ServiceImpl<EquFrockListDao,EquFrockListDo> implements EquFrockListService {
+
+    @Autowired
+    private EquFrockListDao equFrockListDao;
+
+    /**
+     * 根据ID修改地址信息
+     *
+     * @param equipmentDisposeDTO
+     * @return
+     * @date 2024/1/16 16:28
+     * @author shangmi
+     *
+     */
+
+    @Override
+    public void updateSiteById(EquipmentDisposeDTO equipmentDisposeDTO) {
+        LambdaUpdateWrapper<EquFrockListDo> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(EquFrockListDo::getId,equipmentDisposeDTO.getEquipmentId())
+                .set(EquFrockListDo::getTenantid,equipmentDisposeDTO.getRollInPlantId())
+                .set(EquFrockListDo::getUsedeptid,equipmentDisposeDTO.getRollInDeptId())
+                .set(EquFrockListDo::getOwnedfactory, PlantEnum.nameOf(equipmentDisposeDTO.getRollInPlantId()))
+                .set(EquFrockListDo::getUsedeptname,equipmentDisposeDTO.getRollInDept());
+        equFrockListDao.update(null,updateWrapper);
+
+    }
+
+    @Override
+    public void updateStateById(String equipmentId) {
+        LambdaUpdateWrapper<EquFrockListDo> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(EquFrockListDo::getId,equipmentId)
+                .set(EquFrockListDo::getUsestate,"报废");
+        equFrockListDao.update(null,updateWrapper);
+    }
+}

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

@@ -3,27 +3,27 @@ package com.rongwei.bscommon.sys.service.impl;
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.dao.CommonDao;
 import com.rongwei.bscommon.sys.dao.EquLubricationPlanMapperDao;
 import com.rongwei.bscommon.sys.service.EquLubricationPlanDetailService;
 import com.rongwei.bscommon.sys.service.EquLubricationPlanService;
 import com.rongwei.bscommon.sys.utils.ExceptionUtils;
-import com.rongwei.bsentity.domain.EquLubricationPlanDetailDo;
 import com.rongwei.bsentity.domain.EquLubricationPlanDetailVo;
 import com.rongwei.bsentity.domain.EquLubricationPlanDo;
 import com.rongwei.rwadmincommon.system.domain.SysDictDo;
-import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
-import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -47,6 +47,9 @@ public class EquLubricationPlanServiceImpl extends ServiceImpl<EquLubricationPla
     @Autowired
     private EquLubricationPlanDetailService equLubricationPlanDetailService;
 
+    @Autowired
+    private EquLubricationPlanMapperDao lubricationPlanMapperDao;
+
     @Override
     public void wordExportLubrication(Map<String, Object> parameter, HttpServletResponse response) {
         log.info("开始导出润滑明细");
@@ -76,4 +79,22 @@ public class EquLubricationPlanServiceImpl extends ServiceImpl<EquLubricationPla
             ExceptionUtils.printExceptionDetail(e,"润滑明细导出异常");
         }
     }
+
+    /**
+     * 根据设备ID修改润滑标准状态
+     *
+     * @param equipmentId
+     * @return
+     * @date 2024/1/16 17:36
+     * @author shangmi
+     *
+     */
+
+    @Override
+    public void updateStateByEquId(String equipmentId) {
+        LambdaUpdateWrapper<EquLubricationPlanDo> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(EquLubricationPlanDo::getEquipmentid,equipmentId)
+                .set(EquLubricationPlanDo::getEnablestatus,"20");
+        lubricationPlanMapperDao.update(null,updateWrapper);
+    }
 }

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

@@ -140,4 +140,12 @@ public class EquMaintenanceScheduleServiceImpl extends ServiceImpl<EquMaintenanc
                 .eq(EquMaintenanceScheduleDo::getDeleted,0);
         return maintenanceScheduleDao.selectList(queryWrapper);
     }
+
+    @Override
+    public void updateStateByEquId(String equipmentId) {
+        LambdaUpdateWrapper<EquMaintenanceScheduleDo> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(EquMaintenanceScheduleDo::getEquipmentid,equipmentId)
+                .set(EquMaintenanceScheduleDo::getPlannedstatus,"scrap");
+        maintenanceScheduleDao.update(null,updateWrapper);
+    }
 }

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

@@ -0,0 +1,69 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bscommon.sys.service.*;
+import com.rongwei.bsentity.dto.EquipmentDisposeDTO;
+import com.rongwei.rwcommon.base.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author shangmi
+ * @title EquipmentArchivesServiceImpl
+ * @date 2024/1/16 14:19
+ * @description 设备档案
+ */
+@Service
+public class EquipmentArchivesServiceImpl implements EquipmentArchivesService {
+
+    private final String[] HANDLING_TYPE = {"10","20"};
+
+    private final String[] OBJECT_TYPE = {"1","3"};
+
+    @Autowired
+    private AspCheckItemsService aspCheckItemsService;
+
+    @Autowired
+    private EquFrockListService equFrockListService;
+
+    @Autowired
+    private EquMaintenanceScheduleService maintenanceScheduleService;
+
+    @Autowired
+    private EquLubricationPlanService lubricationPlanService;
+
+    /**
+     * 更新设备库
+     *
+     * @param equipmentDisposeDTO
+     * @return {@link R}
+     * @date 2024/1/16 17:43
+     * @author shangmi
+     *
+     */
+
+    @Override
+    public R updateEquipmentData(EquipmentDisposeDTO equipmentDisposeDTO) {
+        boolean isState = HANDLING_TYPE[0].equals(equipmentDisposeDTO.getState());
+        boolean isObject = OBJECT_TYPE[0].equals(equipmentDisposeDTO.getObjectType());
+        if (isState){
+            //更新停用状态
+            String equipmentId = equipmentDisposeDTO.getEquipmentId();
+            if (isObject) {
+                aspCheckItemsService.updateStateById(equipmentId);
+                lubricationPlanService.updateStateByEquId(equipmentId);
+            } else {
+                equFrockListService.updateStateById(equipmentId);
+            }
+            maintenanceScheduleService.updateStateByEquId(equipmentId);
+
+        }else {
+            //修改组织结构
+            if (isObject) {
+                aspCheckItemsService.updateSiteById(equipmentDisposeDTO);
+            } else {
+                equFrockListService.updateSiteById(equipmentDisposeDTO);
+            }
+        }
+        return R.ok();
+    }
+}

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

@@ -1,8 +1,9 @@
 package com.rongwei.bsentity.domain;
 
-import lombok.NoArgsConstructor;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -15,6 +16,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@TableName("equ_frock_list")
 public class EquFrockListDo {
 
     /**

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/dto/EquipmentDisposeDTO.java

@@ -0,0 +1,56 @@
+package com.rongwei.bsentity.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author shangmi
+ * @title EquipmentDisposeDTO
+ * @date 2024/1/16 13:49
+ * @description 设备处置
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class EquipmentDisposeDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备/工装ID
+     */
+    private String equipmentId;
+
+    /**
+     * 类型
+     */
+    private String objectType;
+
+    /**
+     * 状态
+     */
+    private String state;
+
+    /**
+     * 工厂ID
+     */
+    private String rollInPlantId;
+
+    /**
+     * 部门
+     */
+    private String rollInDept;
+
+    /**
+     * 部门ID
+     */
+    private String rollInDeptId;
+
+    /**
+     *位置
+     */
+    private String rollInLocation;
+
+}

cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/controller/EquipmentArchivesController.java

@@ -0,0 +1,50 @@
+package com.rongwei.bsserver.sys.controller;
+
+import com.rongwei.bscommon.sys.service.EquipmentArchivesService;
+import com.rongwei.bscommon.sys.utils.ExceptionUtils;
+import com.rongwei.bsentity.dto.EquipmentDisposeDTO;
+import com.rongwei.rwcommon.base.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author shangmi
+ * @title WordDeriveController
+ * @date 2024/1/16 9:40
+ * @description 设备档案
+ */
+@RestController
+@RequestMapping("/Equipment-Archives")
+@Slf4j
+public class EquipmentArchivesController {
+
+    @Autowired
+    private EquipmentArchivesService archivesService;
+
+    /**
+     * 更新设备库
+     *
+     * @param equipmentDisposeDTO
+     * @return {@link R}
+     * @date 2024/1/16 14:26
+     * @author shangmi
+     *
+     */
+    @PostMapping("/updateEquipmentData")
+    public R updateEquipmentData(@RequestBody EquipmentDisposeDTO equipmentDisposeDTO){
+        try {
+            log.info("进入接口：/Equipment-Archives/updateEquipmentData，参数为：{}",equipmentDisposeDTO);
+            return archivesService.updateEquipmentData(equipmentDisposeDTO);
+        }catch (Exception e){
+            ExceptionUtils.printExceptionDetail(e,"更新设备库失败,异常为：");
+            log.info(e.getMessage());
+            return R.error(e.getMessage());
+        }
+
+    }
+
+}