设备子系统———润滑相关业务代码以及库存查询创新数据库接口代码提交

cx-equipment/cx-equipment-common/pom.xml

@@ -63,6 +63,20 @@
             <artifactId>easyexcel</artifactId>
             <version>3.3.2</version>
         </dependency>
-
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-base</artifactId>
+            <version>4.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-web</artifactId>
+            <version>4.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-annotation</artifactId>
+            <version>4.3.0</version>
+        </dependency>
     </dependencies>
 </project>

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

@@ -2,6 +2,7 @@ package com.rongwei.bscommon.sys.dao;
 
 import com.rongwei.rwadmincommon.system.domain.SysDictDo;
 import com.rongwei.rwadmincommon.system.vo.SysOrganizationVo;
+import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -39,6 +40,15 @@ public interface CommonDao {
     @Select("select * from sys_dict where NAME = #{name} and DELETED = '0' and DICTTYPE = #{dictType} limit 1")
     SysDictDo getDictValueByNameAndType(@Param("name") String name,@Param("dictType") String dictType);
 
+    /**
+     * 获取字典名称
+     * @param value
+     * @param dictType
+     * @return
+     */
+    @Select("select * from sys_dict where VALUE = #{value} and DELETED = '0' and DICTTYPE = #{dictType} limit 1")
+    SysDictDo getDictNameByValueAndType(@Param("value") String value,@Param("dictType") String dictType);
+
     /**
      * 获取字典数
      * @param name
@@ -76,4 +86,12 @@ public interface CommonDao {
      * @return
      */
     List<SysOrganizationVo> getAllFactoryNameAndId();
+
+    /**
+     * 查询附件表数据
+     * @param id
+     * @return
+     */
+    @Select("select * from sys_file_item where ID = #{id}")
+    SysFileItemDo getFileItemByID(@Param("id") String id);
 }

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

@@ -0,0 +1,24 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.EquLubricationPlanDetailDo;
+import com.rongwei.bsentity.domain.EquLubricationPlanDetailVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备子系统——润滑计划标准子表 Mapper 接口
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+public interface EquLubricationPlanDetailMapperDao extends BaseMapper<EquLubricationPlanDetailDo> {
+
+    /**
+     * 查询所有润滑明细
+     * @return
+     */
+    List<EquLubricationPlanDetailVo> queryAllDetailList();
+}

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.EquLubricationPlanDo;
+
+/**
+ * <p>
+ * 设备子系统——润滑计划标准 Mapper 接口
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+public interface EquLubricationPlanMapperDao extends BaseMapper<EquLubricationPlanDo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.EquLubricationTaskDetailDo;
+
+/**
+ * <p>
+ * 设备子系统——润滑明细 Mapper 接口
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+public interface EquLubricationTaskDetailMapperDao extends BaseMapper<EquLubricationTaskDetailDo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.EquLubricationTaskManagementDo;
+
+/**
+ * <p>
+ * 设备子系统——润滑任务管理 Mapper 接口
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+public interface EquLubricationTaskManagementMapperDao extends BaseMapper<EquLubricationTaskManagementDo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.EquOverhaulPlanningTasksDo;
+
+/**
+ * <p>
+ * 设备子系统——大修计划任务 Mapper 接口
+ * </p>
+ *
+ * @author fpy
+ * @since 2023-12-20
+ */
+public interface EquOverhaulPlanningTasksMapperDao extends BaseMapper<EquOverhaulPlanningTasksDo> {
+
+}

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

@@ -0,0 +1,21 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.VInventoryVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author zhou
+ */
+@Mapper
+public interface SlaveOracleDao {
+
+    /**
+     * 获取创新数据库的库存信息
+     * @return
+     */
+    @Select("select * from V_BC_DEPT")
+    List<VInventoryVo> getAllOracleInventory();
+}

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

@@ -0,0 +1,25 @@
+package com.rongwei.bscommon.sys.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.EquLubricationPlanDetailDo;
+import com.rongwei.bsentity.domain.EquLubricationPlanDetailVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备子系统——润滑计划标准子表 服务类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+public interface EquLubricationPlanDetailService extends IService<EquLubricationPlanDetailDo> {
+
+    /**
+     * 查询所有润滑计划标准明细
+     * @return
+     */
+    List<EquLubricationPlanDetailVo> queryAllDetailList();
+}

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

@@ -0,0 +1,25 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.EquLubricationPlanDo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * <p>
+ * 设备子系统——润滑计划标准 服务类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+public interface EquLubricationPlanService extends IService<EquLubricationPlanDo> {
+
+    /**
+     * 导出润滑明细
+     * @param parameter
+     * @param response
+     */
+    void wordExportLubrication(Map<String, Object> parameter, HttpServletResponse response);
+}

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.EquLubricationTaskDetailDo;
+
+/**
+ * <p>
+ * 设备子系统——润滑明细 服务类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+public interface EquLubricationTaskDetailService extends IService<EquLubricationTaskDetailDo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.EquLubricationTaskManagementDo;
+
+/**
+ * <p>
+ * 设备子系统——润滑任务管理 服务类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+public interface EquLubricationTaskManagementService extends IService<EquLubricationTaskManagementDo> {
+
+}

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

@@ -18,4 +18,9 @@ public interface EquOverhaulInventoryService extends IService<EquOverhaulInvento
      * 系统自动根据安全库存信息、过期信息自动更新提醒状态
      */
     void updateInventoryReminderStatus();
+
+    /**
+     * 系统每个小时更新一次库存数据
+     */
+    void initializeInventory();
 }

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

@@ -0,0 +1,24 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.EquOverhaulPlanningTasksDo;
+import com.rongwei.rwcommon.base.R;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * <p>
+ * 设备子系统——大修计划任务 服务类
+ * </p>
+ *
+ * @author fpy
+ * @since 2023-12-20
+ */
+public interface EquOverhaulPlanningTasksService extends IService<EquOverhaulPlanningTasksDo> {
+
+    /**
+     * 导入大修计划任务
+     * @param file
+     * @return
+     */
+    R importEquOverhaulPlanningTasks(MultipartFile file);
+}

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

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

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

@@ -0,0 +1,31 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.EquLubricationPlanDetailMapperDao;
+import com.rongwei.bscommon.sys.service.EquLubricationPlanDetailService;
+import com.rongwei.bsentity.domain.EquLubricationPlanDetailDo;
+import com.rongwei.bsentity.domain.EquLubricationPlanDetailVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备子系统——润滑计划标准子表 服务实现类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+@Service
+public class EquLubricationPlanDetailServiceImpl extends ServiceImpl<EquLubricationPlanDetailMapperDao, EquLubricationPlanDetailDo> implements EquLubricationPlanDetailService {
+
+    @Autowired
+    private EquLubricationPlanDetailMapperDao equLubricationPlanDetailMapperDao;
+
+    @Override
+    public List<EquLubricationPlanDetailVo> queryAllDetailList() {
+        return equLubricationPlanDetailMapperDao.queryAllDetailList();
+    }
+}

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

@@ -0,0 +1,79 @@
+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.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.*;
+
+/**
+ * <p>
+ * 设备子系统——润滑计划标准 服务实现类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+@Service
+public class EquLubricationPlanServiceImpl extends ServiceImpl<EquLubricationPlanMapperDao, EquLubricationPlanDo> implements EquLubricationPlanService {
+
+    private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Autowired
+    private EquLubricationPlanService equLubricationPlanService;
+
+    @Autowired
+    private CommonDao commonDao;
+
+    @Autowired
+    private EquLubricationPlanDetailService equLubricationPlanDetailService;
+
+    @Override
+    public void wordExportLubrication(Map<String, Object> parameter, HttpServletResponse response) {
+        log.info("开始导出润滑明细");
+        List<EquLubricationPlanDetailVo> planDetailList = equLubricationPlanDetailService.queryAllDetailList();
+        try {
+            response.setContentType("application/octet-stream");
+            // 读取模板文件
+            TemplateExportParams params = new TemplateExportParams("template/润滑明细模板.xls",0);
+            Map<String, Object> dataMap = new HashMap<>(16);
+            List<Map<String,Object>> dataList = new ArrayList<>();
+            for (EquLubricationPlanDetailVo equLubricationPlanDetailVo : planDetailList) {
+                SysDictDo sysDictDo = commonDao.getDictNameByValueAndType(equLubricationPlanDetailVo.getEnablestatus(),"lubricationIsEnable");
+                if (sysDictDo!= null){
+                    equLubricationPlanDetailVo.setEnablestatus(sysDictDo.getName());
+                }
+                SysDictDo dictDo = commonDao.getDictNameByValueAndType(equLubricationPlanDetailVo.getFrequency(),"lubricationFrequency");
+                if (dictDo!= null){
+                    equLubricationPlanDetailVo.setFrequency(dictDo.getName());
+                }
+                dataList.add(JSONObject.parseObject(JSONObject.toJSONString(equLubricationPlanDetailVo), Map.class));
+            }
+            dataMap.put("list",dataList);
+            Workbook workbook = ExcelExportUtil.exportExcel(params,dataMap);
+            workbook.write(response.getOutputStream());
+            workbook.close();
+        }catch (Exception e){
+            ExceptionUtils.printExceptionDetail(e,"润滑明细导出异常");
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.EquLubricationTaskDetailMapperDao;
+import com.rongwei.bscommon.sys.service.EquLubricationTaskDetailService;
+import com.rongwei.bsentity.domain.EquLubricationTaskDetailDo;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备子系统——润滑明细 服务实现类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+@Service
+public class EquLubricationTaskDetailServiceImpl extends ServiceImpl<EquLubricationTaskDetailMapperDao, EquLubricationTaskDetailDo> implements EquLubricationTaskDetailService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.EquLubricationTaskManagementMapperDao;
+import com.rongwei.bscommon.sys.service.EquLubricationTaskManagementService;
+import com.rongwei.bsentity.domain.EquLubricationTaskManagementDo;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备子系统——润滑任务管理 服务实现类
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+@Service
+public class EquLubricationTaskManagementServiceImpl extends ServiceImpl<EquLubricationTaskManagementMapperDao, EquLubricationTaskManagementDo> implements EquLubricationTaskManagementService {
+
+}

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

@@ -1,15 +1,21 @@
 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.EquOverhaulInventoryMapperDao;
 import com.rongwei.bscommon.sys.service.EquOverhaulInventoryService;
+import com.rongwei.bscommon.sys.service.SlaveSourceService;
 import com.rongwei.bsentity.domain.EquOverhaulInventoryDo;
+import com.rongwei.bsentity.domain.VInventoryVo;
+import com.rongwei.rwadmincommon.system.domain.SysOrganizationDo;
+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.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,8 +34,35 @@ public class EquOverhaulInventoryServiceImpl extends ServiceImpl<EquOverhaulInve
     @Autowired
     private EquOverhaulInventoryMapperDao equOverhaulInventoryMapperDao;
 
+    @Autowired
+    private EquOverhaulInventoryService equOverhaulInventoryService;
+
+    @Autowired
+    private SlaveSourceService slaveSourceService;
+
     @Override
     public void updateInventoryReminderStatus() {
         equOverhaulInventoryMapperDao.updateInventoryReminderStatus();
     }
+
+    @Override
+    public void initializeInventory() {
+        // 用于存储新增的库存数据
+        List<EquOverhaulInventoryDo> equOverhaulInventoryDos = new ArrayList<>();
+        // 获取创新所有库存
+        List<VInventoryVo> allOracleInventory = slaveSourceService.getAllOracleInventory();
+        // 查询库存表已有数据列表
+        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()))){
+                String uuid = SecurityUtil.getUUID();
+                equOverhaulInventoryDo.setId(uuid);
+                equOverhaulInventoryDo.setAccessorycode(inventoryVo.getCode());
+                equOverhaulInventoryDos.add(equOverhaulInventoryDo);
+            }
+        }
+        // 数据保存到库存表中
+        equOverhaulInventoryService.saveBatch(equOverhaulInventoryDos);
+    }
 }

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

@@ -0,0 +1,120 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.EquOverhaulPlanningTasksMapperDao;
+import com.rongwei.bscommon.sys.service.EquOverhaulPlanningTasksService;
+import com.rongwei.bscommon.sys.utils.DateUtils;
+import com.rongwei.bscommon.sys.utils.ExcelUtils;
+import com.rongwei.bscommon.sys.utils.ExceptionUtils;
+import com.rongwei.bscommon.sys.utils.StringUtil;
+import com.rongwei.bsentity.domain.EquOverhaulPlanningTasksDo;
+import com.rongwei.bsentity.domain.EquWarrantyProviderDo;
+import com.rongwei.rwadmincommon.system.domain.SysDictDo;
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.utils.SecurityUtil;
+import com.rongwei.rwcommon.utils.StringUtils;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 设备子系统——大修计划任务 服务实现类
+ * </p>
+ *
+ * @author fpy
+ * @since 2023-12-20
+ */
+@Service
+public class EquOverhaulPlanningTasksServiceImpl extends ServiceImpl<EquOverhaulPlanningTasksMapperDao, EquOverhaulPlanningTasksDo> implements EquOverhaulPlanningTasksService {
+
+    @Autowired
+    private EquOverhaulPlanningTasksService equOverhaulPlanningTasksService;
+
+    @Override
+    public R importEquOverhaulPlanningTasks(MultipartFile file) {
+        try {
+            StringBuilder allStrBuilder = new StringBuilder();
+            Sheet sheet = new XSSFWorkbook(file.getInputStream()).getSheetAt(0);
+            int lastRowNum = sheet.getLastRowNum();
+            List<EquOverhaulPlanningTasksDo> equOverhaulPlanningTasksDos = new ArrayList<>();
+            for (int i = 1; i <= lastRowNum; i++) {
+                StringBuilder stringBuilder = new StringBuilder();
+                EquOverhaulPlanningTasksDo equOverhaulPlanningTasksDo = new EquOverhaulPlanningTasksDo();
+                Row row = sheet.getRow(i);
+                if (ExcelUtils.isRowEmpty(row)){
+                    continue;
+                }
+                String year = row.getCell(0) == null ? "" : row.getCell(0).toString().trim();
+                String taskNumber = row.getCell(1) == null ? "" : row.getCell(1).toString().trim();
+                String factory = row.getCell(2) == null ? "" : row.getCell(2).toString().trim();
+                String dept = row.getCell(3) == null ? "" : row.getCell(3).toString().trim();
+                String equName = row.getCell(4) == null ? "" : row.getCell(4).toString().trim();
+                String equNumber = row.getCell(5) == null ? "" : row.getCell(5).toString().trim();
+                String repairReason = row.getCell(6) == null ? "" : row.getCell(6).toString().trim();
+                Date planStartDate = row.getCell(7) == null ? null : DateUtils.importExcelFormatExcel((XSSFCell) row.getCell(7));
+                Date planEndDate = row.getCell(8) == null ? null : DateUtils.importExcelFormatExcel((XSSFCell) row.getCell(8));
+                String repairProgramme = row.getCell(9) == null ? "" : row.getCell(9).toString().trim();
+                String isDangerous = row.getCell(10) == null ? "" : row.getCell(10).toString().trim();
+                String isOutsourcing = row.getCell(11) == null ? "" : row.getCell(11).toString().trim();
+                String header = row.getCell(12) == null ? "" : row.getCell(12).toString().trim();
+                String others = row.getCell(13) == null ? "" : row.getCell(13).toString().trim();
+                if (StringUtils.isBlank(year)){
+                    stringBuilder.append("年度必填");
+                }else {
+                    year = StringUtil.formatDecimal(year);
+                }
+                if (StringUtils.isBlank(taskNumber)){
+                    stringBuilder.append("任务号必填");
+                }
+                if (StringUtils.isBlank(equName)){
+                    stringBuilder.append("设备名称必填");
+                }
+                if (StringUtils.isBlank(equNumber)){
+                    stringBuilder.append("设备编号必填");
+                }
+                if (StringUtil.isNotBlank(stringBuilder)) {
+                    allStrBuilder.append("第").append(i + 1).append("行").append(stringBuilder).append("<br>");
+                }else {
+                    equOverhaulPlanningTasksDo.setId(SecurityUtil.getUUID())
+                            .setYear(year)
+                            .setTasknumber(taskNumber)
+                            .setBelongfactory(factory)
+                            .setEquipmentworkshop(dept)
+                            .setEquipment(equName)
+                            .setEquipmentnumber(equNumber)
+                            .setRepairpreason(repairReason)
+                            .setPlanstarttime(planStartDate)
+                            .setPlanendtime(planEndDate)
+                            .setIsdangerousoperations(isDangerous)
+                            .setIsoutsourcing(isOutsourcing)
+                            .setRepairhead(header)
+                            .setOtherrepairengineer(others);
+                    equOverhaulPlanningTasksDos.add(equOverhaulPlanningTasksDo);
+                }
+            }
+            String errMsg = allStrBuilder.toString();
+            if (StringUtils.isNotBlank(errMsg)){
+                return R.error(errMsg);
+            }else {
+                if (equOverhaulPlanningTasksDos.size()>0){
+                    equOverhaulPlanningTasksService.saveOrUpdateBatch(equOverhaulPlanningTasksDos);
+                }
+            }
+        } catch (IOException e) {
+            ExceptionUtils.printExceptionDetail(e,"大修计划任务导入异常");
+        }
+        return R.ok();
+    }
+}

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

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.dao.EquPartsSetoutStandardDao;
 import com.rongwei.bscommon.sys.service.EquPartsSetoutStandardService;
-import com.rongwei.bsentity.domain.EquMaintenanceStandardDo;
 import com.rongwei.bsentity.domain.EquPartsSetoutStandardDo;
-import com.rongwei.bsentity.domain.EquPartsSetoutTaskDo;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -0,0 +1,24 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+//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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class SlaveSourceServiceImpl implements SlaveSourceService {
+
+    @Autowired
+    private SlaveOracleDao slaveOracleDao;
+
+    @Override
+//    @DS("slave")
+    public List<VInventoryVo> getAllOracleInventory() {
+        return slaveOracleDao.getAllOracleInventory();
+    }
+
+}

cx-equipment/cx-equipment-common/src/main/resources/mybatis/business/EquLubricationPlanDetailDao.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.EquLubricationPlanDetailMapperDao">
+
+    <select id="queryAllDetailList" resultType="com.rongwei.bsentity.domain.EquLubricationPlanDetailVo">
+        SELECT
+            a.*,
+            b.EQUIPMENT,
+            b.EQUIPMENTNUMBER,
+            b.BELONGFACTORY
+        FROM equ_lubrication_plan_detail a
+        LEFT JOIN equ_lubrication_plan b ON a.MASTERID = b.id and b.DELETED = 0
+        where a.DELETED = 0
+    </select>
+
+</mapper>

cx-equipment/cx-equipment-common/src/main/resources/mybatis/business/EquOverhaulPlanningTasksMapperDao.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.EquOverhaulPlanningTasksMapperDao">
+
+</mapper>

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

@@ -0,0 +1,114 @@
+package com.rongwei.bsentity.domain;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 设备子系统——润滑计划标准子表
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("equ_lubrication_plan_detail")
+public class EquLubricationPlanDetailDo extends BaseDo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId("ID")
+    private String id;
+
+    @TableField("TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+
+    /**
+     * 主表ID
+     */
+    @TableField("MASTERID")
+    private String masterid;
+
+    /**
+     * 润滑标准编号
+     */
+    @TableField("STANDARDNUMBER")
+    private String standardnumber;
+
+    /**
+     * 润滑油品
+     */
+    @TableField("LUBRICANTS")
+    private String lubricants;
+
+    /**
+     * 润滑量
+     */
+    @TableField("LUBRICATIONAMOUNT")
+    private BigDecimal lubricationamount;
+
+    /**
+     * 频率
+     */
+    @TableField("FREQUENCY")
+    private String frequency;
+
+    /**
+     * 润滑频次设置
+     */
+    @TableField("LUBRICATIONFREQUENCYSETTING")
+    private String lubricationfrequencysetting;
+
+    /**
+     * 次数
+     */
+    @TableField("NUMBER")
+    private Integer number;
+
+    /**
+     * 润滑人id
+     */
+    @TableField("LUBRICATORID")
+    private String lubricatorid;
+
+    /**
+     * 润滑人
+     */
+    @TableField("LUBRICATOR")
+    private String lubricator;
+
+    /**
+     * 设备润滑启用状态
+     */
+    @TableField("ENABLESTATUS")
+    private String enablestatus;
+
+    /**
+     * 润滑部位
+     */
+    @TableField("LUBRICATIONPOSITION")
+    private String lubricationposition;
+
+
+}

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

@@ -0,0 +1,46 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 设备子系统——润滑计划标准子表
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class EquLubricationPlanDetailVo extends EquLubricationPlanDetailDo implements Serializable {
+
+    /**
+     * 所属工厂
+     */
+    @TableField("BELONGFACTORY")
+    private String belongfactory;
+
+    /**
+     * 设备名称
+     */
+    @TableField("EQUIPMENT")
+    private String equipment;
+
+    /**
+     * 设备编号
+     */
+    @TableField("EQUIPMENTNUMBER")
+    private String equipmentnumber;
+
+
+}

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

@@ -0,0 +1,95 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 设备子系统——润滑计划标准
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("equ_lubrication_plan")
+public class EquLubricationPlanDo extends BaseDo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId("ID")
+    private String id;
+
+    @TableField("TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+
+    /**
+     * 设备ID
+     */
+    @TableField("EQUIPMENTID")
+    private String equipmentid;
+
+    /**
+     * 设备名称
+     */
+    @TableField("EQUIPMENT")
+    private String equipment;
+
+    /**
+     * 设备编号
+     */
+    @TableField("EQUIPMENTNUMBER")
+    private String equipmentnumber;
+
+    /**
+     * 设备使用车间ID
+     */
+    @TableField("EQUIPMENTWORKSHOPID")
+    private String equipmentworkshopid;
+
+    /**
+     * 设备使用车间名称
+     */
+    @TableField("EQUIPMENTWORKSHOP")
+    private String equipmentworkshop;
+
+    /**
+     * 设备润滑启用状态
+     */
+    @TableField("ENABLESTATUS")
+    private String enablestatus;
+
+    /**
+     * 润滑部位数量
+     */
+    @TableField("POSITIONMOUNT")
+    private String positionmount;
+
+    /**
+     * 所属工厂
+     */
+    @TableField("BELONGFACTORY")
+    private String belongfactory;
+
+
+}

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

@@ -0,0 +1,114 @@
+package com.rongwei.bsentity.domain;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 设备子系统——润滑明细
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("equ_lubrication_task_detail")
+public class EquLubricationTaskDetailDo extends BaseDo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId("ID")
+    private String id;
+
+    @TableField("TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+
+    /**
+     * 主表ID
+     */
+    @TableField("MASTERID")
+    private String masterid;
+
+    /**
+     * 润滑部位
+     */
+    @TableField("LUBRICATIONPOSITION")
+    private String lubricationposition;
+
+    /**
+     * 润滑油品
+     */
+    @TableField("LUBRICANTS")
+    private String lubricants;
+
+    /**
+     * 润滑量
+     */
+    @TableField("LUBRICATIONAMOUNT")
+    private BigDecimal lubricationamount;
+
+    /**
+     * 频率
+     */
+    @TableField("FREQUENCY")
+    private String frequency;
+
+    /**
+     * 润滑人id
+     */
+    @TableField("LUBRICATORID")
+    private String lubricatorid;
+
+    /**
+     * 润滑人
+     */
+    @TableField("LUBRICATOR")
+    private String lubricator;
+
+    /**
+     * 润滑时间
+     */
+    @TableField("LUBRICATIONDATE")
+    private LocalDateTime lubricationdate;
+
+    /**
+     * 设备润滑启用状态
+     */
+    @TableField("ENABLESTATUS")
+    private String enablestatus;
+
+    /**
+     * 是否润滑完成
+     */
+    @TableField("ISLUBRICATIONCOMPLETED")
+    private String islubricationcompleted;
+
+    /**
+     * 所属工厂
+     */
+    @TableField("BELONGFACTORY")
+    private String belongfactory;
+
+
+}

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

@@ -0,0 +1,107 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 设备子系统——润滑任务管理
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("equ_lubrication_task_management")
+public class EquLubricationTaskManagementDo extends BaseDo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId("ID")
+    private String id;
+
+    @TableField("TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField("ROPTION")
+    private String roption;
+
+    /**
+     * 润滑任务编号
+     */
+    @TableField("TASKNUMBER")
+    private String tasknumber;
+
+    /**
+     * 年份
+     */
+    @TableField("YEAR")
+    private Integer year;
+
+    /**
+     * 月份
+     */
+    @TableField("MONTH")
+    private Integer month;
+
+    /**
+     * 所属工厂
+     */
+    @TableField("BELONGFACTORY")
+    private String belongfactory;
+
+    /**
+     * 设备名称
+     */
+    @TableField("EQUIPMENT")
+    private String equipment;
+
+    /**
+     * 设备编号
+     */
+    @TableField("EQUIPMENTNUMBER")
+    private String equipmentnumber;
+
+    /**
+     * 润滑人
+     */
+    @TableField("LUBRICATOR")
+    private String lubricator;
+
+    /**
+     * 润滑完成时间
+     */
+    @TableField("COMPLETEDATE")
+    private LocalDateTime completedate;
+
+    /**
+     * 任务状态
+     */
+    @TableField("TASKSTATUS")
+    private String taskstatus;
+
+    /**
+     * 润滑人id
+     */
+    @TableField("LUBRICATORID")
+    private String lubricatorid;
+
+
+}

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

@@ -1,6 +1,9 @@
 package com.rongwei.bsentity.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
 import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -18,324 +21,351 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Accessors(chain = true)
-@TableName("equ_overhaul_planning_task")
-public class EquOverhaulPlanningTasksDo implements Serializable {
+@TableName("equ_overhaul_planning_tasks")
+public class EquOverhaulPlanningTasksDo extends BaseDo implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * table name:ID
-	 * table type:varchar(36)
-	 * table comment:主键
+	 * 主键
 	 */
+	@TableId("ID")
 	private String id;
 
 	/**
-	 * table name:TENANTID
-	 * table type:varchar(36)
-	 * table comment:租户ID
+	 * 租户ID
 	 */
+	@TableField("TENANTID")
 	private String tenantid;
 
 	/**
-	 * table name:ROPTION
-	 * table type:longtext
-	 * table comment:扩展json格式配置
+	 * 扩展json格式配置
 	 */
+	@TableField("ROPTION")
 	private String roption;
 
 	/**
-	 * table name:DELETED
-	 * table type:char(1)
-	 * table comment:是否删除
+	 * 任务号
 	 */
-	private String deleted;
+	@TableField("TASKNUMBER")
+	private String tasknumber;
 
 	/**
-	 * table name:REMARK
-	 * table type:text
-	 * table comment:备注
+	 * 大修分类
 	 */
-	private String remark;
+	@TableField("REPAIRSCLASSIFICATION")
+	private String repairsclassification;
 
 	/**
-	 * table name:CREATEDATE
-	 * table type:datetime
-	 * table comment:创建时间
+	 * 对象分类
 	 */
-	private Date createdate;
+	@TableField("OBJECTCLASSIFICATION")
+	private String objectclassification;
 
 	/**
-	 * table name:CREATEUSERID
-	 * table type:varchar(36)
-	 * table comment:创建用户ID
+	 * 设备ID
 	 */
-	private String createuserid;
+	@TableField("EQUIPMENTID")
+	private String equipmentid;
 
 	/**
-	 * table name:MODIFYDATE
-	 * table type:datetime
-	 * table comment:修改日期
+	 * 设备名称
 	 */
-	private Date modifydate;
+	@TableField("EQUIPMENT")
+	private String equipment;
 
 	/**
-	 * table name:MODIFYUSERID
-	 * table type:varchar(36)
-	 * table comment:修改用户ID
+	 * 规格型号
 	 */
-	private String modifyuserid;
+	@TableField("SPECIFICATION")
+	private String specification;
 
 	/**
-	 * table name:CREATEUSERNAME
-	 * table type:varchar(50)
-	 * table comment:创建人名称
+	 * 设备编号
 	 */
-	private String createusername;
+	@TableField("EQUIPMENTNUMBER")
+	private String equipmentnumber;
 
 	/**
-	 * table name:MODIFYUSERNAME
-	 * table type:varchar(50)
-	 * table comment:修改人名称
+	 * 设备类型
 	 */
-	private String modifyusername;
+	@TableField("EQUIPMENTTYPE")
+	private String equipmenttype;
 
 	/**
-	 * table name:TASKID
-	 * table type:varchar(50)
-	 * table comment:任务号
+	 * 安装区域
 	 */
-	private String taskid;
+	@TableField("INSTALLATIONAREA")
+	private String installationarea;
 
 	/**
-	 * table name:PLANTYPE
-	 * table type:varchar(20)
-	 * table comment:计划分类
+	 * 是否停机大修
 	 */
-	private String plantype;
+	@TableField("ISHALTREPAIR")
+	private String ishaltrepair;
 
 	/**
-	 * table name:MAINTENANCETYPE
-	 * table type:varchar(20)
-	 * table comment:保养检修分类
+	 * 所属工厂
 	 */
-	private String maintenancetype;
+	@TableField("BELONGFACTORY")
+	private String belongfactory;
 
 	/**
-	 * table name:OBJECTTYPE
-	 * table type:varchar(20)
-	 * table comment:对象分类
+	 * 设备使用车间ID
 	 */
-	private String objecttype;
+	@TableField("EQUIPMENTWORKSHOPID")
+	private String equipmentworkshopid;
 
 	/**
-	 * table name:EQUIPMENTNAME
-	 * table type:varchar(50)
-	 * table comment:设备名称
+	 * 设备使用车间名称
 	 */
-	private String equipmentname;
+	@TableField("EQUIPMENTWORKSHOP")
+	private String equipmentworkshop;
 
 	/**
-	 * table name:EQUIPMENTID
-	 * table type:varchar(36)
-	 * table comment:设备ID
+	 * 计划年份
 	 */
-	private String equipmentid;
+	@TableField("PLANYEAR")
+	private String planyear;
 
 	/**
-	 * table name:EQUIPMENTNUMBER
-	 * table type:varchar(50)
-	 * table comment:设备编号
+	 * 计划开始时间
 	 */
-	private String equipmentnumber;
+	@TableField("PLANSTARTTIME")
+	private Date planstarttime;
 
 	/**
-	 * table name:SPECIFICATION
-	 * table type:varchar(50)
-	 * table comment:规格型号
+	 * 计划结束时间
 	 */
-	private String specification;
+	@TableField("PLANENDTIME")
+	private Date planendtime;
 
 	/**
-	 * table name:EQUIPMENTTYPE
-	 * table type:varchar(20)
-	 * table comment:设备分类
+	 * 是否委外
 	 */
-	private String equipmenttype;
+	@TableField("ISOUTSOURCING")
+	private String isoutsourcing;
+
+	/**
+	 * 大修项目
+	 */
+	@TableField("REPAIRPROJECT")
+	private String repairproject;
+
+	/**
+	 * 大修原因
+	 */
+	@TableField("REPAIRPREASON")
+	private String repairpreason;
+
+	/**
+	 * 预计实施后效果
+	 */
+	@TableField("EXPECTRESULT")
+	private String expectresult;
+
+	/**
+	 * 大修负责人ID
+	 */
+	@TableField("REPAIRHEADID")
+	private String repairheadid;
+
+	/**
+	 * 大修负责人
+	 */
+	@TableField("REPAIRHEAD")
+	private String repairhead;
+
+	/**
+	 * 其他维修工程师ID
+	 */
+	@TableField("OTHERREPAIRENGINEERID")
+	private String otherrepairengineerid;
+
+	/**
+	 * 其他维修工程师
+	 */
+	@TableField("OTHERREPAIRENGINEER")
+	private String otherrepairengineer;
+
+	/**
+	 * 申请部门ID
+	 */
+	@TableField("APPLICATIONDEPARTMENTID")
+	private String applicationdepartmentid;
+
+	/**
+	 * 申请部门
+	 */
+	@TableField("APPLICATIONDEPARTMENT")
+	private String applicationdepartment;
+
+	/**
+	 * 方案申请人
+	 */
+	@TableField("PROPOSALAPPLICANT")
+	private String proposalapplicant;
 
 	/**
-	 * table name:ISOUTSOURCE
-	 * table type:varchar(10)
-	 * table comment:是否委外
+	 * 方案申请时间
 	 */
-	private String isoutsource;
+	@TableField("APPLICANTDATE")
+	private Date applicantdate;
 
 	/**
-	 * table name:AREA
-	 * table type:text
-	 * table comment:区域
+	 * 大修方案说明
 	 */
-	private String area;
+	@TableField("REPAIRILLUSTRATE")
+	private String repairillustrate;
 
 	/**
-	 * table name:PLANYEAR
-	 * table type:int
-	 * table comment:计划年份
+	 * 预计费用明细
 	 */
-	private Integer planyear;
+	@TableField("REPAIREXPECTCOSTDETAILS")
+	private String repairexpectcostdetails;
 
 	/**
-	 * table name:TASKSTART
-	 * table type:datetime
-	 * table comment:计划开始时间
+	 * 是否危险作业
 	 */
-	private Date taskstart;
+	@TableField("ISDANGEROUSOPERATIONS")
+	private String isdangerousoperations;
 
 	/**
-	 * table name:TASKEND
-	 * table type:datetime
-	 * table comment:计划结束时间
+	 * 作业证相关资料
 	 */
-	private Date taskend;
+	@TableField("WORKPERMITDATA")
+	private String workpermitdata;
 
 	/**
-	 * table name:MAINTENANCESITE
-	 * table type:text
-	 * table comment:维修部位
+	 * 安全措施项
 	 */
-	private String maintenancesite;
+	@TableField("SECURITYMEASURES")
+	private String securitymeasures;
 
 	/**
-	 * table name:MAINTENANCECONTENT
-	 * table type:text
-	 * table comment:计划大修内容
+	 * 安全措施落实情况
 	 */
-	private String maintenancecontent;
+	@TableField("SECURITYIMPLEMENTATIONSTATUS")
+	private String securityimplementationstatus;
 
 	/**
-	 * table name:PLANT
-	 * table type:varchar(35)
-	 * table comment:所属工厂
+	 * 实际开始时间
 	 */
-	private String plant;
+	@TableField("REALITYSTARTTIME")
+	private Date realitystarttime;
 
 	/**
-	 * table name:WORKSHOPID
-	 * table type:varchar(36)
-	 * table comment:使用车间ID
+	 * 实际结束时间
 	 */
-	private String workshopid;
+	@TableField("REALITYNDTIME")
+	private Date realityndtime;
 
 	/**
-	 * table name:WORKSHOP
-	 * table type:varchar(50)
-	 * table comment:使用车间
+	 * 设备大修过程
 	 */
-	private String workshop;
+	@TableField("EQUIPMENTREPAIRPROCESS")
+	private String equipmentrepairprocess;
 
 	/**
-	 * table name:USERID
-	 * table type:text
-	 * table comment:使用人ID
+	 * 大修开机情况
 	 */
-	private String userid;
+	@TableField("REPAIRPPOWERONSITUATION")
+	private String repairppoweronsituation;
 
 	/**
-	 * table name:USER
-	 * table type:text
-	 * table comment:使用人
+	 * 跟踪人
 	 */
-	private String user;
+	@TableField("ONWTRACKER")
+	private String onwtracker;
 
 	/**
-	 * table name:PRINCIPALID
-	 * table type:text
-	 * table comment:责任人ID
+	 * 跟踪人日期
 	 */
-	private String principalid;
+	@TableField("ONWTRACKERTIME")
+	private Date onwtrackertime;
 
 	/**
-	 * table name:PRINCIPAL
-	 * table type:text
-	 * table comment:大修责任人
+	 * 跟踪人
 	 */
-	private String principal;
+	@TableField("TWOTRACKER")
+	private String twotracker;
 
 	/**
-	 * table name:OTHERENGINEERS
-	 * table type:text
-	 * table comment:其他工程师
+	 * 跟踪人日期
 	 */
-	private String otherengineers;
+	@TableField("TWOTRACKERTIME")
+	private Date twotrackertime;
 
 	/**
-	 * table name:APPLYTYPE
-	 * table type:varchar(20)
-	 * table comment:申请类型
+	 * 跟踪人
 	 */
-	private String applytype;
+	@TableField("THREETRACKER")
+	private String threetracker;
 
 	/**
-	 * table name:EQUIPMENTFAULT
-	 * table type:text
-	 * table comment:设备故障图
+	 * 跟踪人日期
 	 */
-	private String equipmentfault;
+	@TableField("THREETRACKERTIME")
+	private Date threetrackertime;
 
 	/**
-	 * table name:ISHAZARDOUSOPERATION
-	 * table type:varchar(10)
-	 * table comment:是否危险作业
+	 * 大修结论
 	 */
-	private String ishazardousoperation;
+	@TableField("REPAIRCONCLUSION")
+	private String repairconclusion;
 
 	/**
-	 * table name:OPERATIONALDATA
-	 * table type:text
-	 * table comment:作业相关资料
+	 * 验收人
 	 */
-	private String operationaldata;
+	@TableField("ACCEPTANCEPERSON")
+	private String acceptanceperson;
 
 	/**
-	 * table name:SAFETYMEASUREITEM
-	 * table type:text
-	 * table comment:安全措施项
+	 * 验收日期
 	 */
-	private String safetymeasureitem;
+	@TableField("ACCEPTANCETIME")
+	private Date acceptancetime;
 
 	/**
-	 * table name:IMPLEMENTATION
-	 * table type:text
-	 * table comment:安全措施落实情况
+	 * 车间确认人
 	 */
-	private String implementation;
+	@TableField("WORKSHOPCONFIRMPEOPLE")
+	private String workshopconfirmpeople;
 
 	/**
-	 * table name:APPLICATIONDEPTID
-	 * table type:varchar(36)
-	 * table comment:申请部门ID
+	 * 设备部验收人
 	 */
-	private String applicationdeptid;
+	@TableField("EQUIPMENTACCEPTANCEPERSON")
+	private String equipmentacceptanceperson;
 
 	/**
-	 * table name:APPLICATIONDEPT
-	 * table type:varchar(50)
-	 * table comment:申请部门
+	 * 大修效果验收情况
 	 */
-	private String applicationdept;
+	@TableField("REPAIRACCEPTANCESITUATION")
+	private String repairacceptancesituation;
 
 	/**
-	 * table name:OTHERENGINEERSID
-	 * table type:text
-	 * table comment:其他工程师ID
+	 * 年度
 	 */
-	private String otherengineersid;
+	@TableField("YEAR")
+	private String year;
 
 	/**
-	 * table name:TASKSTATUS
-	 * table type:varchar(20)
-	 * table comment:任务状态
+	 * 申请编号
 	 */
+	@TableField("APPLYNUMBER")
+	private String applynumber;
+
+	/**
+	 * 任务状态
+	 */
+	@TableField("TASKSTATUS")
 	private String taskstatus;
 
+	/**
+	 * 设备待大修图
+	 */
+	@TableField("EQUIPMENTREPAIRIMAGE")
+	private String equipmentrepairimage;
+
 }

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

@@ -0,0 +1,30 @@
+package com.rongwei.bsentity.domain;
+
+import lombok.Data;
+
+/**
+ * @author zhou
+ */
+@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;
+}

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

@@ -0,0 +1,40 @@
+package com.rongwei.bsserver.sys.controller;
+
+
+import com.rongwei.bscommon.sys.service.EquLubricationPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * <p>
+ * 设备子系统——润滑计划标准 前端控制器
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+@RestController
+@RequestMapping("/equLubricationPlan")
+public class EquLubricationPlanController {
+
+    @Autowired
+    private EquLubricationPlanService equLubricationPlanService;
+
+    /**
+     * 导出润滑计划标准
+     * */
+    @RequestMapping("/wordExportLubrication")
+    @ResponseBody
+    public void wordExportLubrication(@RequestBody Map<String, Object> parameter, HttpServletResponse response){
+        equLubricationPlanService.wordExportLubrication(parameter,response);
+    }
+}
+

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

@@ -0,0 +1,21 @@
+package com.rongwei.bsserver.sys.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 设备子系统——润滑任务管理 前端控制器
+ * </p>
+ *
+ * @author fpy
+ * @since 2024-01-12
+ */
+@Controller
+@RequestMapping("/equLubricationTaskManagement")
+public class EquLubricationTaskManagementController {
+
+}
+

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

@@ -31,6 +31,21 @@ public class EquOverhaulInventoryController {
     @Autowired
     private EquOverhaulInventoryService equOverhaulInventoryService;
 
+    /**
+     * 系统每个小时更新一次库存数据
+     * @return
+     */
+    @RequestMapping("/initializeInventory")
+    public R initializeInventory(){
+        try {
+            logger.info("系统自动根据创新的库存数据更新到平台库存数据表...");
+            equOverhaulInventoryService.initializeInventory();
+        } catch (Exception e) {
+            ExceptionUtils.printExceptionDetail(e,"系统每个小时更新一次库存数据异常:");
+        }
+        return R.ok();
+    }
+
     /**
      * 系统每个小时更新一次提醒状态
      * @param map
@@ -42,7 +57,7 @@ public class EquOverhaulInventoryController {
             logger.info("系统自动根据安全库存信息、过期信息自动更新提醒状态...");
             equOverhaulInventoryService.updateInventoryReminderStatus();
         } catch (Exception e) {
-            ExceptionUtils.printExceptionDetail(e,"系统每个小时更新一次提醒状态:");
+            ExceptionUtils.printExceptionDetail(e,"系统每个小时更新一次提醒状态异常:");
         }
         return R.ok();
     }

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

@@ -0,0 +1,54 @@
+package com.rongwei.bsserver.sys.controller;
+
+
+import com.rongwei.bscommon.sys.service.EquOverhaulPlanningTasksService;
+import com.rongwei.bscommon.sys.utils.FileCheckUtil;
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 设备子系统——大修计划任务 前端控制器
+ * </p>
+ *
+ * @author fpy
+ * @since 2023-12-20
+ */
+@RestController
+@RequestMapping("/equOverhaulPlanningTasks")
+public class EquOverhaulPlanningTasksController {
+
+    @Autowired
+    private EquOverhaulPlanningTasksService equOverhaulPlanningTasksService;
+
+    @Autowired
+    FileCheckUtil checkUtil;
+
+    /**
+     * 检验规则维护导入
+     * @return
+     */
+    @RequestMapping("/importEquOverhaulPlanningTasks")
+    @ResponseBody
+    public R importEquOverhaulPlanningTasks(@RequestParam MultipartFile file, HttpServletRequest request) throws Exception {
+        if (file == null){
+            return R.error("文件解析失败");
+        }
+//        String errorMsg = checkUtil.fileCheckDetail(file,"a02f48e0c8024df1980ee5661c72be10");
+//        if (StringUtils.isNotBlank(errorMsg)){
+//            return R.error(errorMsg);
+//        }
+        return equOverhaulPlanningTasksService.importEquOverhaulPlanningTasks(file);
+    }
+}
+