浏览代码

Merge remote-tracking branch 'origin/master'

xiahan 1 年之前
父节点
当前提交
f4bd5d2c01
共有 22 个文件被更改,包括 328 次插入71 次删除
  1. 6 2
      bs-common/src/main/java/com/rongwei/safecommon/config/BsMetaObjectHandler.java
  2. 13 4
      bs-common/src/main/java/com/rongwei/safecommon/fegin/CXCommonFeginClient.java
  3. 15 1
      bs-common/src/main/java/com/rongwei/safecommon/fegin/CXHysitx.java
  4. 14 0
      bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java
  5. 11 0
      cx-equipment/cx-equipment-common/pom.xml
  6. 0 7
      cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/PagePartDao.java
  7. 1 1
      cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/SlaveOracleDao.java
  8. 22 0
      cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/EquipmentSendNotifyService.java
  9. 0 10
      cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/PagePartService.java
  10. 2 2
      cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/SlaveSourceService.java
  11. 25 2
      cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquOverhaulInventoryServiceImpl.java
  12. 5 1
      cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquWarrantyProviderServiceImpl.java
  13. 105 0
      cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquipmentSendNotifyServiceImpl.java
  14. 0 16
      cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/PagePartServiceImpl.java
  15. 2 2
      cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SlaveSourceServiceImpl.java
  16. 1 1
      cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/utils/BusinessExcelUtil.java
  17. 5 1
      cx-equipment/cx-equipment-entity/pom.xml
  18. 6 0
      cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquLubricationTaskDetailDo.java
  19. 6 0
      cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquOverhaulInventoryDo.java
  20. 36 20
      cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/VInventoryVo.java
  21. 1 1
      cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/controller/EquipmentArchivesController.java
  22. 52 0
      cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/controller/EquipmentSendNotifyController.java

+ 6 - 2
bs-common/src/main/java/com/rongwei/safecommon/config/BsMetaObjectHandler.java

@@ -11,15 +11,19 @@ import org.apache.ibatis.reflection.MetaObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @Component
+@Primary
 public class BsMetaObjectHandler implements MetaObjectHandler {
 
     private static final Logger logger = LoggerFactory.getLogger(BsMetaObjectHandler.class);

+ 13 - 4
bs-common/src/main/java/com/rongwei/safecommon/fegin/CXCommonFeginClient.java

@@ -3,12 +3,15 @@ package com.rongwei.safecommon.fegin;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.vo.MailDo;
 import com.rongwei.rwcommonentity.commonservers.vo.SysNotifyAnnounceVo;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
+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.RequestParam;
+
+import java.util.List;
+import java.util.Map;
 
 @FeignClient(value = "rw-common-server",fallback = CXHysitx.class,contextId = "commonFeign")
 public interface CXCommonFeginClient {
@@ -21,4 +24,10 @@ public interface CXCommonFeginClient {
 
     @PostMapping("ws/socket/push/app")
     R pushToWeb(@RequestParam String cid, @RequestParam(required = false) String message);
+
+    @RequestMapping("sys/sysnotifyannounce/list")
+    R list(@RequestParam Map<String, Object> params);
+
+    @PostMapping("sys/sysnotifyannounce/delete")
+    R delete(@RequestBody List<String> ids);
 }

+ 15 - 1
bs-common/src/main/java/com/rongwei/safecommon/fegin/CXHysitx.java

@@ -6,7 +6,9 @@ import com.rongwei.rwcommonentity.commonservers.vo.SysNotifyAnnounceVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * Hysitx class
@@ -34,4 +36,16 @@ public class CXHysitx implements CXCommonFeginClient {
         log.error("发送websocket通知失败!通知内容为:{}", message);
         return R.error();
     }
+
+    @Override
+    public R list(Map<String, Object> params) {
+        log.error("查询提醒失败,数据为{}",params);
+        return R.error();
+    }
+
+    @Override
+    public R delete(List<String> ids) {
+        log.error("删除提醒失败,数据为{}",ids);
+        return R.error();
+    }
 }

+ 14 - 0
bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -124,6 +124,11 @@ public class SaveConstans {
          * 点巡检
          */
         public static final String INSPECTION = "inspection";
+
+        /**
+         * 保养检修
+         */
+        public static final String MAINTAIN = "maintain";
     }
 
     public static class NotifyTitle {
@@ -179,6 +184,11 @@ public class SaveConstans {
          * 隐患跟踪任务确认提醒标题
          */
         public static final String AFFIRM_MAIL_TITLE = "隐患跟踪任务确认提醒";
+        /**
+         * 保养检修工单提醒标题
+         */
+        public static final String MAINTAIN_SYSTEM_TITLE = "保养任务";
+
 
     }
 
@@ -233,5 +243,9 @@ public class SaveConstans {
          * 点巡检任务提醒
          */
         public static final String INSPECTION_CONTENT = "%s的%s任务请及时完成";
+        /**
+         * 保养检修工单提醒内容
+         */
+        public static final String MAINTAIN_SYSTEM_CONTENT = "请及时执行%s的%s的%s( %s )-%s的保养任务并登记保养结果,负责人:%s,其他保养工程师:%s";
     }
 }

+ 11 - 0
cx-equipment/cx-equipment-common/pom.xml

@@ -78,5 +78,16 @@
             <artifactId>easypoi-annotation</artifactId>
             <version>4.3.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.rongwei</groupId>
+            <artifactId>bs-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>11.2.0.3</version>
+        </dependency>
     </dependencies>
 </project>

+ 0 - 7
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/PagePartDao.java

@@ -1,7 +0,0 @@
-package com.rongwei.bscommon.sys.dao;
-
-import com.rongwei.rwadmincommon.system.domain.PagePartDo;
-import com.rongwei.rwcommon.base.BaseDao;
-
-public interface PagePartDao extends BaseDao<PagePartDo> {
-}

+ 1 - 1
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/SlaveOracleDao.java

@@ -16,6 +16,6 @@ public interface SlaveOracleDao {
      * 获取创新数据库的库存信息
      * @return
      */
-    @Select("select * from V_BC_DEPT")
+    @Select("select * from V_BC_ONHANDNUM")
     List<VInventoryVo> getAllOracleInventory();
 }

+ 22 - 0
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/EquipmentSendNotifyService.java

@@ -0,0 +1,22 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.rwcommon.base.R;
+
+/**
+ * @author shangmi
+ * @title EquipmentSendNotifyService
+ * @date 2024/1/18 17:19
+ * @description 消息提醒业务类
+ */
+public interface EquipmentSendNotifyService {
+    /**
+     * 根据任务ID发送 提醒
+     *
+     * @param id 保养任务ID
+     * @return {@link R}
+     * @date 2024/1/18 17:16
+     * @author shangmi
+     *
+     */
+    R maintainCreateTaskNotify(String id);
+}

+ 0 - 10
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/PagePartService.java

@@ -1,10 +0,0 @@
-package com.rongwei.bscommon.sys.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.rongwei.rwadmincommon.system.domain.PagePartDo;
-
-/**
- * @author zdz
- */
-public interface PagePartService extends IService<PagePartDo> {
-}

+ 2 - 2
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/SlaveSourceService.java

@@ -1,7 +1,7 @@
 package com.rongwei.bscommon.sys.service;
 
 
-//import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.rongwei.bsentity.domain.VInventoryVo;
 
 import java.util.List;
@@ -11,6 +11,6 @@ import java.util.List;
  */
 public interface SlaveSourceService {
 
-//    @DS("slave")
+    @DS("slave")
     List<VInventoryVo> getAllOracleInventory();
 }

+ 25 - 2
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquOverhaulInventoryServiceImpl.java

@@ -3,20 +3,27 @@ package com.rongwei.bscommon.sys.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.CommonDao;
 import com.rongwei.bscommon.sys.dao.EquOverhaulInventoryMapperDao;
 import com.rongwei.bscommon.sys.service.EquOverhaulInventoryService;
 import com.rongwei.bscommon.sys.service.SlaveSourceService;
+import com.rongwei.bscommon.sys.utils.CommonUtils;
+import com.rongwei.bscommon.sys.utils.StringUtil;
 import com.rongwei.bsentity.domain.EquOverhaulInventoryDo;
 import com.rongwei.bsentity.domain.VInventoryVo;
 import com.rongwei.rwadmincommon.system.domain.SysOrganizationDo;
+import com.rongwei.rwadmincommon.system.vo.SysOrganizationVo;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -40,6 +47,9 @@ public class EquOverhaulInventoryServiceImpl extends ServiceImpl<EquOverhaulInve
     @Autowired
     private SlaveSourceService slaveSourceService;
 
+    @Autowired
+    private CommonDao commonDao;
+
     @Override
     public void updateInventoryReminderStatus() {
         equOverhaulInventoryMapperDao.updateInventoryReminderStatus();
@@ -51,14 +61,27 @@ public class EquOverhaulInventoryServiceImpl extends ServiceImpl<EquOverhaulInve
         List<EquOverhaulInventoryDo> equOverhaulInventoryDos = new ArrayList<>();
         // 获取创新所有库存
         List<VInventoryVo> allOracleInventory = slaveSourceService.getAllOracleInventory();
+        // 查询所有工厂数据
+        List<SysOrganizationVo> factoryList = commonDao.getAllFactoryNameAndId();
         // 查询库存表已有数据列表
         List<EquOverhaulInventoryDo> queryInventoryDos = equOverhaulInventoryService.list(new LambdaQueryWrapper<EquOverhaulInventoryDo>().eq(EquOverhaulInventoryDo::getDeleted, 0));
         for (VInventoryVo inventoryVo : allOracleInventory) {
             EquOverhaulInventoryDo equOverhaulInventoryDo = new EquOverhaulInventoryDo();
-            if (queryInventoryDos.stream().noneMatch(a->a.getAccessorycode().equals(inventoryVo.getCode()))){
+            if (queryInventoryDos.stream().noneMatch(a->a.getAccessorycode().equals(inventoryVo.getItem_num()))){
                 String uuid = SecurityUtil.getUUID();
                 equOverhaulInventoryDo.setId(uuid);
-                equOverhaulInventoryDo.setAccessorycode(inventoryVo.getCode());
+                equOverhaulInventoryDo.setAccessory(inventoryVo.getProduct_name());
+                equOverhaulInventoryDo.setBelongfactory(inventoryVo.getOrg_name());
+                equOverhaulInventoryDo.setAccessorycode(inventoryVo.getItem_num());
+                equOverhaulInventoryDo.setSpecifications(inventoryVo.getSpec());
+                equOverhaulInventoryDo.setUnit(inventoryVo.getUnit());
+                equOverhaulInventoryDo.setSource(inventoryVo.getCangku());
+                equOverhaulInventoryDo.setBatch(inventoryVo.getBatch_num());
+                List<SysOrganizationVo> resultList = factoryList.stream().filter(p -> p.getFullname().equals(inventoryVo.getOrg_name())).collect(Collectors.toList());
+                equOverhaulInventoryDo.setTenantid(resultList.get(0).getId());
+                if (inventoryVo.getQuantity()!= null){
+                    equOverhaulInventoryDo.setInventorynumber(BigDecimal.valueOf(inventoryVo.getQuantity()));
+                }
                 equOverhaulInventoryDos.add(equOverhaulInventoryDo);
             }
         }

+ 5 - 1
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquWarrantyProviderServiceImpl.java

@@ -27,6 +27,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -48,6 +49,8 @@ public class EquWarrantyProviderServiceImpl extends ServiceImpl<EquWarrantyProvi
     @Override
     public R importEquWarrantyProvider(MultipartFile file) {
         try {
+            // 查询所有工厂数据
+            List<SysOrganizationVo> factoryList = commonDao.getAllFactoryNameAndId();
             StringBuilder allStrBuilder = new StringBuilder();
             Sheet sheet = new XSSFWorkbook(file.getInputStream()).getSheetAt(0);
             int lastRowNum = sheet.getLastRowNum();
@@ -120,7 +123,8 @@ public class EquWarrantyProviderServiceImpl extends ServiceImpl<EquWarrantyProvi
                     isPrivately = sysDictDo.getValue();
                 }
                 if (StringUtils.isNotBlank(factory)){
-                    factoryId = commonDao.getIdByFactoryName(factory);
+                    List<SysOrganizationVo> resultList = factoryList.stream().filter(p -> p.getFullname().equals(factory)).collect(Collectors.toList());
+                    factoryId = resultList.get(0).getId();
                     if (StringUtil.isBlank(factoryId)){
                         stringBuilder.append("所属工厂填写有误");
                     }

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

@@ -0,0 +1,105 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
+import com.rongwei.bscommon.sys.service.EquMaintenanceTaskService;
+import com.rongwei.bscommon.sys.service.EquipmentSendNotifyService;
+import com.rongwei.bsentity.domain.EquMaintenanceTaskDo;
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.safecommon.fegin.CXCommonFeginClient;
+import com.rongwei.safecommon.utils.CXCommonUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.MAINTAIN_SYSTEM_CONTENT;
+import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.MAINTAIN_SYSTEM_TITLE;
+import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.MAINTAIN;
+
+/**
+ * @author shangmi
+ * @title EquipmentSendNotifyServiceImpl
+ * @date 2024/1/18 17:20
+ * @description 设备消息提醒业务实现类
+ */
+@Service
+@Slf4j
+public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyService {
+
+    @Autowired
+    private EquMaintenanceTaskService maintenanceTaskService;
+
+    @Autowired
+    private CXCommonFeginClient commonFeginClient;
+
+    /**
+     * 根据任务ID发送 提醒
+     *
+     * @param id 保养任务ID
+     * @return {@link R}
+     * @date 2024/1/18 17:16
+     * @author shangmi
+     */
+    @Override
+    public R maintainCreateTaskNotify(String id) {
+        if (StringUtils.isBlank(id)) {
+            log.info("任务ID为空");
+            return R.ok();
+        }
+        EquMaintenanceTaskDo maintenanceTaskDo = maintenanceTaskService.getById(id);
+
+        if (null == maintenanceTaskDo) {
+            log.info("无法通过id:{}获取到任务列表", id);
+            return R.ok();
+        }
+
+        // 发送人
+        List<String> userId = new ArrayList<>();
+        // 发送内容
+        String context = null;
+        // 发送标题
+        String title = null;
+        if (maintenanceTaskDo.getPrincipalid() != null){
+            userId.addAll(Arrays.asList(maintenanceTaskDo.getPrincipalid().split(",")));
+        }
+        if (maintenanceTaskDo.getOtherengineersid() != null){
+            userId.addAll(Arrays.asList(maintenanceTaskDo.getOtherengineersid().split(",")));
+        }
+
+        if (userId.isEmpty()){
+            log.info("id为{}的任务无提醒人",id);
+            return R.ok();
+        }
+        title = MAINTAIN_SYSTEM_TITLE;
+        context = String.format(MAINTAIN_SYSTEM_CONTENT,
+                maintenanceTaskDo.getPlanyear()+"-"+maintenanceTaskDo.getMonth(),
+                maintenanceTaskDo.getWorkshop(),
+                maintenanceTaskDo.getEquipmentname(),
+                maintenanceTaskDo.getEquipmentnumber(),
+                maintenanceTaskDo.getMaintenancesite(),
+                maintenanceTaskDo.getPrincipal(),
+                maintenanceTaskDo.getOtherengineers()
+                );
+
+        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);
+        return R.ok();
+    }
+}
+

+ 0 - 16
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/PagePartServiceImpl.java

@@ -1,16 +0,0 @@
-package com.rongwei.bscommon.sys.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.rongwei.bscommon.sys.dao.PagePartDao;
-import com.rongwei.bscommon.sys.service.PagePartService;
-import com.rongwei.rwadmincommon.system.domain.PagePartDo;
-import org.springframework.stereotype.Service;
-
-/**
- * @author zhou
- */
-@Service("pagePartService")
-public class PagePartServiceImpl extends ServiceImpl<PagePartDao, PagePartDo> implements PagePartService {
-}

+ 2 - 2
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SlaveSourceServiceImpl.java

@@ -1,6 +1,6 @@
 package com.rongwei.bscommon.sys.service.impl;
 
-//import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.rongwei.bscommon.sys.dao.SlaveOracleDao;
 import com.rongwei.bscommon.sys.service.SlaveSourceService;
 import com.rongwei.bsentity.domain.VInventoryVo;
@@ -19,7 +19,7 @@ public class SlaveSourceServiceImpl implements SlaveSourceService {
     private SlaveOracleDao slaveOracleDao;
 
     @Override
-//    @DS("slave")
+    @DS("slave")
     public List<VInventoryVo> getAllOracleInventory() {
         return slaveOracleDao.getAllOracleInventory();
     }

+ 1 - 1
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/utils/BusinessExcelUtil.java

@@ -4,8 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.rongwei.bscommon.sys.dao.CommonDao;
-import com.rongwei.bscommon.sys.service.PagePartService;
 import com.rongwei.rwadmincommon.system.domain.PagePartDo;
+import com.rongwei.rwadmincommon.system.service.PagePartService;
 import lombok.SneakyThrows;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;

+ 5 - 1
cx-equipment/cx-equipment-entity/pom.xml

@@ -23,7 +23,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.5.0</version>
+        </dependency>
         <dependency>
             <groupId>com.rongwei</groupId>
             <artifactId>rw-common-utils</artifactId>

+ 6 - 0
cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquLubricationTaskDetailDo.java

@@ -111,4 +111,10 @@ public class EquLubricationTaskDetailDo extends BaseDo implements Serializable {
     @TableField("DESCRIPTION")
     private String description;
 
+    /**
+     * 润滑标准编号
+     */
+    @TableField("STANDARDNUMBER")
+    private String standardnumber;
+
 }

+ 6 - 0
cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquOverhaulInventoryDo.java

@@ -142,5 +142,11 @@ public class EquOverhaulInventoryDo extends BaseDo implements Serializable {
     @TableField("REMINDERSTATUS")
     private String reminderstatus;
 
+    /**
+     * 提醒状态
+     */
+    @TableField("SOURCE")
+    private String source;
+
 
 }

+ 36 - 20
cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/VInventoryVo.java

@@ -7,24 +7,40 @@ import lombok.Data;
  */
 @Data
 public class VInventoryVo {
-
-    private String pk_dept;
-
-    private String pk_fatherorg;
-
-    private String code;
-
-    private String name;
-
-    private String shortname;
-
-    private Integer enablestate;
-
-    private String principal;
-
-    private String memo;
-
-    private String creationtime;
-
-    private String ts;
+    /**
+     * 组织机构编码
+     */
+    private String org_num;
+    /**
+     * 工厂名称
+     */
+    private String org_name;
+    /**
+     * 库存编码
+     */
+    private String item_num;
+    /**
+     * 名称
+     */
+    private String product_name;
+    /**
+     * 规格
+     */
+    private String spec;
+    /**
+     * 批号
+     */
+    private String batch_num;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 来源
+     */
+    private String cangku;
+    /**
+     * 数量
+     */
+    private Integer quantity;
 }

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

@@ -26,7 +26,7 @@ public class EquipmentArchivesController {
     private EquipmentArchivesService archivesService;
 
     /**
-     * 更新设备库
+     * 处置申请后更新设备库
      *
      * @param equipmentDisposeDTO
      * @return {@link R}

+ 52 - 0
cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/controller/EquipmentSendNotifyController.java

@@ -0,0 +1,52 @@
+package com.rongwei.bsserver.sys.controller;
+
+import com.rongwei.bscommon.sys.service.EquipmentSendNotifyService;
+import com.rongwei.bscommon.sys.utils.ExceptionUtils;
+import com.rongwei.bsentity.dto.IdGeneralDTO;
+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 EquipmentSendNotifyController
+ * @date 2024/1/18 16:03
+ * @description 设备提醒
+ */
+@RestController
+@RequestMapping("/send-notify")
+@Slf4j
+public class EquipmentSendNotifyController {
+
+    @Autowired
+    private EquipmentSendNotifyService sendNotifyService;
+
+
+    /**
+     * 根据任务ID发送 提醒
+     *
+     * @param idGeneralDTO 保养任务ID
+     * @return {@link R}
+     * @date 2024/1/18 17:16
+     * @author shangmi
+     *
+     */
+
+    @PostMapping("/maintainCreateTaskNotify")
+    public R maintainCreateTaskNotify(@RequestBody IdGeneralDTO idGeneralDTO){
+        try {
+            log.info("进入接口:/send-notify/maintainCreateTaskNotify;入参为:{}",idGeneralDTO);
+            return sendNotifyService.maintainCreateTaskNotify(idGeneralDTO.getId());
+        }catch (Exception e){
+            ExceptionUtils.printExceptionDetail(e,"发送消息提醒失败,异常为:");
+            log.info(e.getMessage());
+            return R.error(e.getMessage());
+        }
+
+    };
+
+}