Procházet zdrojové kódy

保养项完成(设备类型可单选可多选);保养项目、保养计划、保养工单新建的包

sl před 1 rokem
rodič
revize
1b7f7f8d4d
28 změnil soubory, kde provedl 1569 přidání a 0 odebrání
  1. 25 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/TestBySlJob.java
  2. 10 0
      jeecg_module_ems/pom.xml
  3. 177 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/controller/CmmsUpkeepController.java
  4. 119 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/entity/CmmsUpkeep.java
  5. 17 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/CmmsUpkeepMapper.java
  6. 5 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/xml/CmmsUpkeepMapper.xml
  7. 14 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/service/ICmmsUpkeepService.java
  8. 19 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/service/impl/CmmsUpkeepServiceImpl.java
  9. 188 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/controller/CmmsUpkeepItemController.java
  10. 75 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/entity/CmmsUpkeepItem.java
  11. 19 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/entity/CmmsUpkeepItemDto.java
  12. 26 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/mapper/CmmsUpkeepItemMapper.java
  13. 32 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/mapper/xml/CmmsUpkeepItemMapper.xml
  14. 35 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/service/ICmmsUpkeepItemService.java
  15. 92 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/service/impl/CmmsUpkeepItemServiceImpl.java
  16. 177 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/controller/CmmsUpkeepPlanController.java
  17. 145 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/entity/CmmsUpkeepPlan.java
  18. 17 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/mapper/CmmsUpkeepPlanMapper.java
  19. 5 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/mapper/xml/CmmsUpkeepPlanMapper.xml
  20. 14 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/service/ICmmsUpkeepPlanService.java
  21. 19 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/service/impl/CmmsUpkeepPlanServiceImpl.java
  22. 177 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepProject/controller/CmmsUpkeepProjectController.java
  23. 91 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepProject/entity/CmmsUpkeepProject.java
  24. 19 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepProject/mapper/CmmsUpkeepProjectMapper.java
  25. 6 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepProject/mapper/xml/CmmsUpkeepProjectMapper.xml
  26. 18 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepProject/service/ICmmsUpkeepProjectService.java
  27. 24 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepProject/service/impl/CmmsUpkeepProjectServiceImpl.java
  28. 4 0
      jeecg_module_ems/src/main/java/org/jeecg/modules/util/UserConstants.java

+ 25 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/TestBySlJob.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.quartz.job;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.DateUtils;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+/**
+ * ClassName: TestBySlJob
+ * Package: org.jeecg.modules.quartz.job
+ * Description:
+ *
+ * @Author sl
+ * @Create 2024/1/11 11:13
+ * @Version 1.0
+ */
+@Slf4j
+public class TestBySlJob implements Job {
+
+    @Override
+    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        log.info(String.format(" sl测试 Jeecg-Boot 普通定时任务 SampleJob !  时间:" + DateUtils.getTimestamp()));
+    }
+}

+ 10 - 0
jeecg_module_ems/pom.xml

@@ -19,6 +19,12 @@
 
         <!--  mapstruct      -->
         <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok-mapstruct-binding</artifactId>
+            <version>0.2.0</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct</artifactId>
             <version>${mapstruct.version}</version>
@@ -28,6 +34,10 @@
             <artifactId>mapstruct-processor</artifactId>
             <version>${mapstruct.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-system-biz</artifactId>
+        </dependency>
     </dependencies>
 
     <properties>

+ 177 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/controller/CmmsUpkeepController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.cmmsUpkeep.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
+import org.jeecg.modules.cmmsUpkeep.service.ICmmsUpkeepService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 保养工单
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+@Api(tags="保养工单")
+@RestController
+@RequestMapping("/cmmsUpkeep/cmmsUpkeep")
+@Slf4j
+public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkeepService> {
+	@Autowired
+	private ICmmsUpkeepService cmmsUpkeepService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cmmsUpkeep
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "保养工单-分页列表查询")
+	@ApiOperation(value="保养工单-分页列表查询", notes="保养工单-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CmmsUpkeep>> queryPageList(CmmsUpkeep cmmsUpkeep,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CmmsUpkeep> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeep, req.getParameterMap());
+		Page<CmmsUpkeep> page = new Page<CmmsUpkeep>(pageNo, pageSize);
+		IPage<CmmsUpkeep> pageList = cmmsUpkeepService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cmmsUpkeep
+	 * @return
+	 */
+	@AutoLog(value = "保养工单-添加")
+	@ApiOperation(value="保养工单-添加", notes="保养工单-添加")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CmmsUpkeep cmmsUpkeep) {
+		cmmsUpkeepService.save(cmmsUpkeep);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cmmsUpkeep
+	 * @return
+	 */
+	@AutoLog(value = "保养工单-编辑")
+	@ApiOperation(value="保养工单-编辑", notes="保养工单-编辑")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CmmsUpkeep cmmsUpkeep) {
+		cmmsUpkeepService.updateById(cmmsUpkeep);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "保养工单-通过id删除")
+	@ApiOperation(value="保养工单-通过id删除", notes="保养工单-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cmmsUpkeepService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "保养工单-批量删除")
+	@ApiOperation(value="保养工单-批量删除", notes="保养工单-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cmmsUpkeepService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "保养工单-通过id查询")
+	@ApiOperation(value="保养工单-通过id查询", notes="保养工单-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CmmsUpkeep> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsUpkeep cmmsUpkeep = cmmsUpkeepService.getById(id);
+		if(cmmsUpkeep==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cmmsUpkeep);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cmmsUpkeep
+    */
+    //@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CmmsUpkeep cmmsUpkeep) {
+        return super.exportXls(request, cmmsUpkeep, CmmsUpkeep.class, "保养工单");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("ems_cmms_upkeep:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CmmsUpkeep.class);
+    }
+
+}

+ 119 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/entity/CmmsUpkeep.java

@@ -0,0 +1,119 @@
+package org.jeecg.modules.cmmsUpkeep.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 保养工单
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("ems_cmms_upkeep")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ems_cmms_upkeep对象", description="保养工单")
+public class CmmsUpkeep implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**保养工单ID*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "保养工单ID")
+    private java.lang.String id;
+	/**创建者*/
+    @ApiModelProperty(value = "创建者")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新者*/
+    @ApiModelProperty(value = "更新者")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+	/**保养工单编号*/
+	@Excel(name = "保养工单编号", width = 15)
+    @ApiModelProperty(value = "保养工单编号")
+    private java.lang.String upkeepcode;
+	/**保养名称(标题)*/
+	@Excel(name = "保养名称(标题)", width = 15)
+    @ApiModelProperty(value = "保养名称(标题)")
+    private java.lang.String upkeepname;
+	/**保养计划ID*/
+	@Excel(name = "保养计划ID", width = 15)
+    @ApiModelProperty(value = "保养计划ID")
+    private java.lang.String upkeepplanid;
+	/**保养工作项目ID*/
+	@Excel(name = "保养工作项目ID", width = 15)
+    @ApiModelProperty(value = "保养工作项目ID")
+    private java.lang.String upkeepprojid;
+	/**工作项目名称*/
+	@Excel(name = "工作项目名称", width = 15)
+    @ApiModelProperty(value = "工作项目名称")
+    private java.lang.String projectname;
+	/**计划名称*/
+	@Excel(name = "计划名称", width = 15)
+    @ApiModelProperty(value = "计划名称")
+    private java.lang.String planname;
+	/**地点*/
+	@Excel(name = "地点", width = 15)
+    @ApiModelProperty(value = "地点")
+    private java.lang.String address;
+	/**厂商名称*/
+	@Excel(name = "厂商名称", width = 15)
+    @ApiModelProperty(value = "厂商名称")
+    private java.lang.String supplier;
+	/**厂商电话*/
+	@Excel(name = "厂商电话", width = 15)
+    @ApiModelProperty(value = "厂商电话")
+    private java.lang.String suppliertel;
+	/**联系人*/
+	@Excel(name = "联系人", width = 15)
+    @ApiModelProperty(value = "联系人")
+    private java.lang.String linker;
+	/**联系人电话*/
+	@Excel(name = "联系人电话", width = 15)
+    @ApiModelProperty(value = "联系人电话")
+    private java.lang.String linkertel;
+	/**负责人*/
+	@Excel(name = "负责人", width = 15)
+    @ApiModelProperty(value = "负责人")
+    private java.lang.String chargeruser;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private java.lang.String upkeepdesc;
+	/**状态:0待处理、1已通知、2未执行、3未完成、4已完成*/
+	@Excel(name = "状态:0待处理、1已通知、2未执行、3未完成、4已完成", width = 15)
+    @ApiModelProperty(value = "状态:0待处理、1已通知、2未执行、3未完成、4已完成")
+    private java.lang.String status;
+	/**处理意见*/
+	@Excel(name = "处理意见", width = 15)
+    @ApiModelProperty(value = "处理意见")
+    private java.lang.String opinion;
+}

+ 17 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/CmmsUpkeepMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cmmsUpkeep.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 保养工单
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+public interface CmmsUpkeepMapper extends BaseMapper<CmmsUpkeep> {
+
+}

+ 5 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/xml/CmmsUpkeepMapper.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="org.jeecg.modules.cmmsUpkeep.mapper.CmmsUpkeepMapper">
+
+</mapper>

+ 14 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/service/ICmmsUpkeepService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cmmsUpkeep.service;
+
+import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 保养工单
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+public interface ICmmsUpkeepService extends IService<CmmsUpkeep> {
+
+}

+ 19 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeep/service/impl/CmmsUpkeepServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cmmsUpkeep.service.impl;
+
+import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
+import org.jeecg.modules.cmmsUpkeep.mapper.CmmsUpkeepMapper;
+import org.jeecg.modules.cmmsUpkeep.service.ICmmsUpkeepService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 保养工单
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+@Service
+public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpkeep> implements ICmmsUpkeepService {
+
+}

+ 188 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/controller/CmmsUpkeepItemController.java

@@ -0,0 +1,188 @@
+package org.jeecg.modules.cmmsUpkeepItem.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItemVo;
+import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItem;
+import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItemDto;
+import org.jeecg.modules.cmmsUpkeepItem.service.ICmmsUpkeepItemService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 保养项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-15
+ * @Version: V1.0
+ */
+@Api(tags="保养项")
+@RestController
+@RequestMapping("/cmmsUpkeepItem/cmmsUpkeepItem")
+@Slf4j
+public class CmmsUpkeepItemController extends JeecgController<CmmsUpkeepItem, ICmmsUpkeepItemService> {
+	@Autowired
+	private ICmmsUpkeepItemService cmmsUpkeepItemService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cmmsUpkeepItem
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "保养项-分页列表查询")
+	@ApiOperation(value="保养项-分页列表查询", notes="保养项-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CmmsUpkeepItemDto>> queryPageList(CmmsUpkeepItem cmmsUpkeepItem,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+//		QueryWrapper<CmmsUpkeepItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepItem, req.getParameterMap());
+		Page<CmmsUpkeepItemDto> page = new Page<CmmsUpkeepItemDto>(pageNo, pageSize);
+//		IPage<CmmsUpkeepItem> pageList = cmmsUpkeepItemService.page(page, queryWrapper);
+		List<CmmsUpkeepItemDto> pageList = cmmsUpkeepItemService.getAllCmmsUpkeepItem(page, cmmsUpkeepItem);
+		page.setRecords(pageList);
+		return Result.OK(page);
+	}
+
+
+	/**
+	 *   添加
+	 *
+	 * @param cmmsUpkeepItem
+	 * @return
+	 */
+	@AutoLog(value = "保养项-添加")
+	@ApiOperation(value="保养项-添加", notes="保养项-添加")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_item:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CmmsUpkeepItem cmmsUpkeepItem) {
+//		cmmsUpkeepItemService.save(cmmsUpkeepItem);
+		boolean isOk = cmmsUpkeepItemService.insertCmmsUpkeepItem(cmmsUpkeepItem);
+		if(isOk){
+			return Result.OK("添加成功!");
+		}else{
+			return Result.OK("添加失败!");
+		}
+
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param cmmsUpkeepItem
+	 * @return
+	 */
+	@AutoLog(value = "保养项-编辑")
+	@ApiOperation(value="保养项-编辑", notes="保养项-编辑")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_item:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CmmsUpkeepItem cmmsUpkeepItem) {
+		cmmsUpkeepItemService.updateById(cmmsUpkeepItem);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "保养项-通过id删除")
+	@ApiOperation(value="保养项-通过id删除", notes="保养项-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_item:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cmmsUpkeepItemService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "保养项-批量删除")
+	@ApiOperation(value="保养项-批量删除", notes="保养项-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_item:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cmmsUpkeepItemService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "保养项-通过id查询")
+	@ApiOperation(value="保养项-通过id查询", notes="保养项-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CmmsUpkeepItem> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsUpkeepItem cmmsUpkeepItem = cmmsUpkeepItemService.getById(id);
+		if(cmmsUpkeepItem==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cmmsUpkeepItem);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cmmsUpkeepItem
+    */
+    //@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_item:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CmmsUpkeepItem cmmsUpkeepItem) {
+        return super.exportXls(request, cmmsUpkeepItem, CmmsUpkeepItem.class, "保养项");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("ems_cmms_upkeep_item:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CmmsUpkeepItem.class);
+    }
+
+}

+ 75 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/entity/CmmsUpkeepItem.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.cmmsUpkeepItem.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 保养项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-15
+ * @Version: V1.0
+ */
+@Data
+@TableName("ems_cmms_upkeep_item")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ems_cmms_upkeep_item对象", description="保养项")
+public class CmmsUpkeepItem implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**保养编号*/
+	@Excel(name = "保养编号", width = 15)
+    @ApiModelProperty(value = "保养编号")
+    private java.lang.String itemcode;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private java.lang.String itemname;
+	/**设备类型ID(设备定义,可单选可多选,多选设备类型用逗号连接)*/
+	@Excel(name = "设备类型ID(设备定义,可单选可多选,多选设备类型用逗号连接)", width = 15)
+    @ApiModelProperty(value = "设备类型ID(设备定义,可单选可多选,多选设备类型用逗号连接)")
+    private java.lang.String equipdefid;
+	/**保养描述*/
+	@Excel(name = "保养描述", width = 15)
+    @ApiModelProperty(value = "保养描述")
+    private java.lang.String itemcontent;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+}

+ 19 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/entity/CmmsUpkeepItemDto.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cmmsUpkeepItem.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * ClassName: CmmsUpkeepItemDto
+ * Package: org.jeecg.modules.cmmsUpkeepItem.entity
+ * Description: 分列页表查询以及根据某项内容查询时,设备类型id转换成设备类型名称
+ *
+ * @Author sl
+ * @Create 2024/1/15 17:02
+ * @Version 1.0
+ */
+@Data
+public class CmmsUpkeepItemDto extends CmmsUpkeepItem {
+    private String equiptypeName;
+}

+ 26 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/mapper/CmmsUpkeepItemMapper.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.cmmsUpkeepItem.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItemDto;
+
+/**
+ * @Description: 保养项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-15
+ * @Version: V1.0
+ */
+public interface CmmsUpkeepItemMapper extends BaseMapper<CmmsUpkeepItem> {
+
+    /**
+     * 分列页表查询
+     * 根据设备类型id查找设备类型名称并进行两表字段拼接
+     *
+     */
+    public List<CmmsUpkeepItemDto> getAllCmmsUpkeepItem(Page<CmmsUpkeepItemDto> page, CmmsUpkeepItem cmmsUpkeepItem);
+
+}

+ 32 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/mapper/xml/CmmsUpkeepItemMapper.xml

@@ -0,0 +1,32 @@
+<?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="org.jeecg.modules.cmmsUpkeepItem.mapper.CmmsUpkeepItemMapper">
+
+    <resultMap type="org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItemDto" id="CmmsUpkeepItemResult">
+        <result property="id"    column="id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="itemcode"    column="itemcode"    />
+        <result property="itemname"    column="itemname"    />
+        <result property="equipdefid"    column="equipdefid"    />
+        <result property="equiptypeName"    column="equiptypeName"    />
+        <result property="itemcontent"    column="itemcontent"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <select id="getAllCmmsUpkeepItem" parameterType="org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItem" resultMap="CmmsUpkeepItemResult">
+        select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.itemcode, c.itemname, c.equipdefid, c.itemcontent, c.remark, t.name as equiptypeName
+        from ems_cmms_upkeep_item as c left join ems_tpm_equipment_tree as t on c.equipdefid = t.id
+        <where>
+            <if test="cmmsUpkeepItem.itemcode != null  and cmmsUpkeepItem.itemcode != ''"> and (c.itemcode like concat('%', #{cmmsUpkeepItem.itemcode}, '%') or c.itemname like concat('%', #{cmmsUpkeepItem.itemcode}, '%'))</if>
+            <if test="cmmsUpkeepItem.equipdefid != null  and cmmsUpkeepItem.equipdefid != ''"> and c.equipdefid = #{cmmsUpkeepItem.equipdefid}</if>
+            <if test="cmmsUpkeepItem.itemname != null and cmmsUpkeepItem.itemname != ''"> and c.itemname = #{cmmsUpkeepItem.itemname}</if>
+        </where>
+    </select>
+
+
+
+
+</mapper>

+ 35 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/service/ICmmsUpkeepItemService.java

@@ -0,0 +1,35 @@
+package org.jeecg.modules.cmmsUpkeepItem.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItemDto;
+
+import java.util.List;
+
+/**
+ * @Description: 保养项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-15
+ * @Version: V1.0
+ */
+public interface ICmmsUpkeepItemService extends IService<CmmsUpkeepItem> {
+
+    /**
+     * 分列页表查询
+     * 根据设备类型id查找设备类型名称并进行两表字段拼接
+     *
+     */
+    public List<CmmsUpkeepItemDto> getAllCmmsUpkeepItem(Page<CmmsUpkeepItemDto> page, CmmsUpkeepItem cmmsUpkeepItem);
+
+    /**
+     * 新增保养项
+     *
+     * @param cmmsUpkeepItem 保养项
+     * @return 结果
+     */
+    public boolean insertCmmsUpkeepItem(CmmsUpkeepItem cmmsUpkeepItem);
+
+
+
+}

+ 92 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepItem/service/impl/CmmsUpkeepItemServiceImpl.java

@@ -0,0 +1,92 @@
+package org.jeecg.modules.cmmsUpkeepItem.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItem;
+import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItemDto;
+import org.jeecg.modules.cmmsUpkeepItem.mapper.CmmsUpkeepItemMapper;
+import org.jeecg.modules.cmmsUpkeepItem.service.ICmmsUpkeepItemService;
+//import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.util.AutoCodeUtil;
+import org.jeecg.modules.util.UserConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Description: 保养项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-15
+ * @Version: V1.0
+ */
+@Service
+public class CmmsUpkeepItemServiceImpl extends ServiceImpl<CmmsUpkeepItemMapper, CmmsUpkeepItem> implements ICmmsUpkeepItemService {
+
+
+    @Autowired
+    @SuppressWarnings("all")
+    private CmmsUpkeepItemMapper cmmsUpkeepItemMapper;
+
+    @Autowired
+    @SuppressWarnings("all")
+    private AutoCodeUtil autoCodeUtil;
+    /**
+     * 保养编号编码规则   UPKEEP000001
+     */
+//    int upkeepitemcodeNum = 0;
+
+    /**
+     * 分列页表查询
+     * 根据设备类型id查找设备类型名称并进行两表字段拼接
+     *
+     */
+    public List<CmmsUpkeepItemDto> getAllCmmsUpkeepItem(Page<CmmsUpkeepItemDto> page, CmmsUpkeepItem cmmsUpkeepItem){
+        return cmmsUpkeepItemMapper.getAllCmmsUpkeepItem(page, cmmsUpkeepItem);
+    }
+
+    /**
+     * 新增保养项
+     * 单选设备类型  多选设备类型ID
+     *
+     * @param cmmsUpkeepItem 保养项
+     * @return 结果
+     */
+    @Override
+    public boolean insertCmmsUpkeepItem(CmmsUpkeepItem cmmsUpkeepItem)
+    {
+        //1.创建一个列表用来存放添加的所有保养项
+        ArrayList<CmmsUpkeepItem> cmmsUpkeepItemArrayList = new ArrayList<>();
+
+//        //2.获取登录人用户信息 V2.0版本:   用来填充
+////        SysUser user= (SysUser)SecurityUtils.getSubject().getPrincipal();
+//        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        cmmsUpkeepItem.setCreateBy(user.getUsername());
+//        cmmsUpkeepItem.setCreateTime(DateUtils.getDate());
+
+        //2.将设备类型切分,此处用逗号切分
+        String equipdefid = cmmsUpkeepItem.getEquipdefid();
+        String[] equipdefids = equipdefid.split(",");
+        List<String> equipdefidList = Arrays.asList(equipdefids);
+        for(String equipdefidNew:equipdefidList){
+            CmmsUpkeepItem cmmsUpkeepItemNew = new CmmsUpkeepItem();
+            cmmsUpkeepItemNew.setEquipdefid(equipdefidNew);//保养项设备分类
+            //保养项编号
+            if(cmmsUpkeepItem.getItemcode() == null || "".equals(cmmsUpkeepItem.getItemcode())) cmmsUpkeepItemNew.setItemcode(autoCodeUtil.genSerialCode(UserConstants.CMMSUPKEEPITEM_CODE, null));
+            if(cmmsUpkeepItem.getItemname() != null) cmmsUpkeepItemNew.setItemname(cmmsUpkeepItem.getItemname());//保养项名称
+            if(cmmsUpkeepItem.getItemcontent() != null) cmmsUpkeepItemNew.setItemcontent(cmmsUpkeepItem.getItemcontent());//保养项描述
+            if(cmmsUpkeepItem.getRemark() != null) cmmsUpkeepItemNew.setRemark(cmmsUpkeepItem.getRemark());//保养项备注
+            cmmsUpkeepItemArrayList.add(cmmsUpkeepItemNew);
+        }
+        return this.saveBatch(cmmsUpkeepItemArrayList);
+    }
+
+
+}

+ 177 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/controller/CmmsUpkeepPlanController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.cmmsUpkeepPlan.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan;
+import org.jeecg.modules.cmmsUpkeepPlan.service.ICmmsUpkeepPlanService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 保养计划
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+@Api(tags="保养计划")
+@RestController
+@RequestMapping("/cmmsUpkeepPlan/cmmsUpkeepPlan")
+@Slf4j
+public class CmmsUpkeepPlanController extends JeecgController<CmmsUpkeepPlan, ICmmsUpkeepPlanService> {
+	@Autowired
+	private ICmmsUpkeepPlanService cmmsUpkeepPlanService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cmmsUpkeepPlan
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "保养计划-分页列表查询")
+	@ApiOperation(value="保养计划-分页列表查询", notes="保养计划-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CmmsUpkeepPlan>> queryPageList(CmmsUpkeepPlan cmmsUpkeepPlan,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CmmsUpkeepPlan> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepPlan, req.getParameterMap());
+		Page<CmmsUpkeepPlan> page = new Page<CmmsUpkeepPlan>(pageNo, pageSize);
+		IPage<CmmsUpkeepPlan> pageList = cmmsUpkeepPlanService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cmmsUpkeepPlan
+	 * @return
+	 */
+	@AutoLog(value = "保养计划-添加")
+	@ApiOperation(value="保养计划-添加", notes="保养计划-添加")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_plan:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CmmsUpkeepPlan cmmsUpkeepPlan) {
+		cmmsUpkeepPlanService.save(cmmsUpkeepPlan);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cmmsUpkeepPlan
+	 * @return
+	 */
+	@AutoLog(value = "保养计划-编辑")
+	@ApiOperation(value="保养计划-编辑", notes="保养计划-编辑")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_plan:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CmmsUpkeepPlan cmmsUpkeepPlan) {
+		cmmsUpkeepPlanService.updateById(cmmsUpkeepPlan);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "保养计划-通过id删除")
+	@ApiOperation(value="保养计划-通过id删除", notes="保养计划-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_plan:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cmmsUpkeepPlanService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "保养计划-批量删除")
+	@ApiOperation(value="保养计划-批量删除", notes="保养计划-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_plan:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cmmsUpkeepPlanService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "保养计划-通过id查询")
+	@ApiOperation(value="保养计划-通过id查询", notes="保养计划-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CmmsUpkeepPlan> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsUpkeepPlan cmmsUpkeepPlan = cmmsUpkeepPlanService.getById(id);
+		if(cmmsUpkeepPlan==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cmmsUpkeepPlan);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cmmsUpkeepPlan
+    */
+    //@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_plan:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CmmsUpkeepPlan cmmsUpkeepPlan) {
+        return super.exportXls(request, cmmsUpkeepPlan, CmmsUpkeepPlan.class, "保养计划");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("ems_cmms_upkeep_plan:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CmmsUpkeepPlan.class);
+    }
+
+}

+ 145 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/entity/CmmsUpkeepPlan.java

@@ -0,0 +1,145 @@
+package org.jeecg.modules.cmmsUpkeepPlan.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 保养计划
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("ems_cmms_upkeep_plan")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ems_cmms_upkeep_plan对象", description="保养计划")
+public class CmmsUpkeepPlan implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**保养计划ID*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "保养计划ID")
+    private java.lang.String id;
+	/**创建者*/
+    @ApiModelProperty(value = "创建者")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新者*/
+    @ApiModelProperty(value = "更新者")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+	/**保养计划编号*/
+	@Excel(name = "保养计划编号", width = 15)
+    @ApiModelProperty(value = "保养计划编号")
+    private java.lang.String plancode;
+	/**保养计划名称*/
+	@Excel(name = "保养计划名称", width = 15)
+    @ApiModelProperty(value = "保养计划名称")
+    private java.lang.String planname;
+	/**保养工作项目ID*/
+	@Excel(name = "保养工作项目ID", width = 15)
+    @ApiModelProperty(value = "保养工作项目ID")
+    private java.lang.String upkeepprojid;
+	/**工作项目名称*/
+	@Excel(name = "工作项目名称", width = 15)
+    @ApiModelProperty(value = "工作项目名称")
+    private java.lang.String projectname;
+	/**地点*/
+	@Excel(name = "地点", width = 15)
+    @ApiModelProperty(value = "地点")
+    private java.lang.String address;
+	/**厂商名称*/
+	@Excel(name = "厂商名称", width = 15)
+    @ApiModelProperty(value = "厂商名称")
+    private java.lang.String supplier;
+	/**厂商电话*/
+	@Excel(name = "厂商电话", width = 15)
+    @ApiModelProperty(value = "厂商电话")
+    private java.lang.String suppliertel;
+	/**联系人*/
+	@Excel(name = "联系人", width = 15)
+    @ApiModelProperty(value = "联系人")
+    private java.lang.String linker;
+	/**联系人电话*/
+	@Excel(name = "联系人电话", width = 15)
+    @ApiModelProperty(value = "联系人电话")
+    private java.lang.String linkertel;
+	/**负责人*/
+	@Excel(name = "负责人", width = 15)
+    @ApiModelProperty(value = "负责人")
+    private java.lang.String chargeruser;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private java.lang.String plandesc;
+	/**开始时间*/
+	@Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "开始时间")
+    private java.util.Date begintime;
+	/**重复*/
+	@Excel(name = "重复", width = 15)
+    @ApiModelProperty(value = "重复")
+    private java.lang.Integer repeatnum;
+	/**重复类型:年、月、周、日、时、分*/
+	@Excel(name = "重复类型:年、月、周、日、时、分", width = 15)
+    @ApiModelProperty(value = "重复类型:年、月、周、日、时、分")
+    private java.lang.String repeattype;
+	/**提前通知时间*/
+	@Excel(name = "提前通知时间", width = 15)
+    @ApiModelProperty(value = "提前通知时间")
+    private java.lang.Integer noticenum;
+	/**提前通知类型:天、时、分*/
+	@Excel(name = "提前通知类型:天、时、分", width = 15)
+    @ApiModelProperty(value = "提前通知类型:天、时、分")
+    private java.lang.String noticetype;
+	/**状态(0启用 1停用)*/
+	@Excel(name = "状态(0启用 1停用)", width = 15)
+    @ApiModelProperty(value = "状态(0启用 1停用)")
+    private java.lang.String status;
+	/**下次执行时间*/
+	@Excel(name = "下次执行时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "下次执行时间")
+    private java.util.Date nexttime;
+	/**下次通知时间*/
+	@Excel(name = "下次通知时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "下次通知时间")
+    private java.util.Date noticetime;
+	/**是否已通知:是/否*/
+	@Excel(name = "是否已通知:是/否", width = 15)
+    @ApiModelProperty(value = "是否已通知:是/否")
+    private java.lang.String ifnotice;
+}

+ 17 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/mapper/CmmsUpkeepPlanMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cmmsUpkeepPlan.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 保养计划
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+public interface CmmsUpkeepPlanMapper extends BaseMapper<CmmsUpkeepPlan> {
+
+}

+ 5 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/mapper/xml/CmmsUpkeepPlanMapper.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="org.jeecg.modules.cmmsUpkeepPlan.mapper.CmmsUpkeepPlanMapper">
+
+</mapper>

+ 14 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/service/ICmmsUpkeepPlanService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cmmsUpkeepPlan.service;
+
+import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 保养计划
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+public interface ICmmsUpkeepPlanService extends IService<CmmsUpkeepPlan> {
+
+}

+ 19 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/service/impl/CmmsUpkeepPlanServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cmmsUpkeepPlan.service.impl;
+
+import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan;
+import org.jeecg.modules.cmmsUpkeepPlan.mapper.CmmsUpkeepPlanMapper;
+import org.jeecg.modules.cmmsUpkeepPlan.service.ICmmsUpkeepPlanService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 保养计划
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+@Service
+public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper, CmmsUpkeepPlan> implements ICmmsUpkeepPlanService {
+
+}

+ 177 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepProject/controller/CmmsUpkeepProjectController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.cmmsUpkeepProject.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.cmmsUpkeepProject.entity.CmmsUpkeepProject;
+import org.jeecg.modules.cmmsUpkeepProject.service.ICmmsUpkeepProjectService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 保养工作项目
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+@Api(tags="保养工作项目")
+@RestController
+@RequestMapping("/cmmsUpkeepProject/cmmsUpkeepProject")
+@Slf4j
+public class CmmsUpkeepProjectController extends JeecgController<CmmsUpkeepProject, ICmmsUpkeepProjectService> {
+	@Autowired
+	private ICmmsUpkeepProjectService cmmsUpkeepProjectService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cmmsUpkeepProject
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "保养工作项目-分页列表查询")
+	@ApiOperation(value="保养工作项目-分页列表查询", notes="保养工作项目-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CmmsUpkeepProject>> queryPageList(CmmsUpkeepProject cmmsUpkeepProject,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CmmsUpkeepProject> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeepProject, req.getParameterMap());
+		Page<CmmsUpkeepProject> page = new Page<CmmsUpkeepProject>(pageNo, pageSize);
+		IPage<CmmsUpkeepProject> pageList = cmmsUpkeepProjectService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cmmsUpkeepProject
+	 * @return
+	 */
+	@AutoLog(value = "保养工作项目-添加")
+	@ApiOperation(value="保养工作项目-添加", notes="保养工作项目-添加")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_project:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CmmsUpkeepProject cmmsUpkeepProject) {
+		cmmsUpkeepProjectService.save(cmmsUpkeepProject);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cmmsUpkeepProject
+	 * @return
+	 */
+	@AutoLog(value = "保养工作项目-编辑")
+	@ApiOperation(value="保养工作项目-编辑", notes="保养工作项目-编辑")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_project:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CmmsUpkeepProject cmmsUpkeepProject) {
+		cmmsUpkeepProjectService.updateById(cmmsUpkeepProject);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "保养工作项目-通过id删除")
+	@ApiOperation(value="保养工作项目-通过id删除", notes="保养工作项目-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_project:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cmmsUpkeepProjectService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "保养工作项目-批量删除")
+	@ApiOperation(value="保养工作项目-批量删除", notes="保养工作项目-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_project:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cmmsUpkeepProjectService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "保养工作项目-通过id查询")
+	@ApiOperation(value="保养工作项目-通过id查询", notes="保养工作项目-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CmmsUpkeepProject> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsUpkeepProject cmmsUpkeepProject = cmmsUpkeepProjectService.getById(id);
+		if(cmmsUpkeepProject==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cmmsUpkeepProject);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cmmsUpkeepProject
+    */
+    //@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep_project:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CmmsUpkeepProject cmmsUpkeepProject) {
+        return super.exportXls(request, cmmsUpkeepProject, CmmsUpkeepProject.class, "保养工作项目");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("ems_cmms_upkeep_project:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CmmsUpkeepProject.class);
+    }
+
+}

+ 91 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepProject/entity/CmmsUpkeepProject.java

@@ -0,0 +1,91 @@
+package org.jeecg.modules.cmmsUpkeepProject.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 保养工作项目
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+@Data
+@TableName("ems_cmms_upkeep_project")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ems_cmms_upkeep_project对象", description="保养工作项目")
+public class CmmsUpkeepProject implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**保养工作项目ID*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "保养工作项目ID")
+    private java.lang.String id;
+	/**创建者*/
+    @ApiModelProperty(value = "创建者")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新者*/
+    @ApiModelProperty(value = "更新者")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+	/**工作项目名称*/
+	@Excel(name = "工作项目名称", width = 15)
+    @ApiModelProperty(value = "工作项目名称")
+    private java.lang.String projectname;
+	/**地点*/
+	@Excel(name = "地点", width = 15)
+    @ApiModelProperty(value = "地点")
+    private java.lang.String address;
+	/**厂商名称*/
+	@Excel(name = "厂商名称", width = 15)
+    @ApiModelProperty(value = "厂商名称")
+    private java.lang.String supplier;
+	/**厂商电话*/
+	@Excel(name = "厂商电话", width = 15)
+    @ApiModelProperty(value = "厂商电话")
+    private java.lang.String suppliertel;
+	/**联系人*/
+	@Excel(name = "联系人", width = 15)
+    @ApiModelProperty(value = "联系人")
+    private java.lang.String linker;
+	/**联系人电话*/
+	@Excel(name = "联系人电话", width = 15)
+    @ApiModelProperty(value = "联系人电话")
+    private java.lang.String linkertel;
+	/**负责人*/
+	@Excel(name = "负责人", width = 15)
+    @ApiModelProperty(value = "负责人")
+    private java.lang.String chargeruser;
+	/**负责人电话*/
+	@Excel(name = "负责人电话", width = 15)
+    @ApiModelProperty(value = "负责人电话")
+    private java.lang.String chargertel;
+}

+ 19 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepProject/mapper/CmmsUpkeepProjectMapper.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cmmsUpkeepProject.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsUpkeepProject.entity.CmmsUpkeepProject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 保养工作项目
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+public interface CmmsUpkeepProjectMapper extends BaseMapper<CmmsUpkeepProject> {
+
+
+
+}

+ 6 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepProject/mapper/xml/CmmsUpkeepProjectMapper.xml

@@ -0,0 +1,6 @@
+<?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="org.jeecg.modules.cmmsUpkeepProject.mapper.CmmsUpkeepProjectMapper">
+
+
+</mapper>

+ 18 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepProject/service/ICmmsUpkeepProjectService.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.cmmsUpkeepProject.service;
+
+import org.jeecg.modules.cmmsUpkeepProject.entity.CmmsUpkeepProject;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Description: 保养工作项目
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+public interface ICmmsUpkeepProjectService extends IService<CmmsUpkeepProject> {
+
+
+
+}

+ 24 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsUpkeepProject/service/impl/CmmsUpkeepProjectServiceImpl.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.cmmsUpkeepProject.service.impl;
+
+import org.jeecg.modules.cmmsUpkeepProject.entity.CmmsUpkeepProject;
+import org.jeecg.modules.cmmsUpkeepProject.mapper.CmmsUpkeepProjectMapper;
+import org.jeecg.modules.cmmsUpkeepProject.service.ICmmsUpkeepProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
+/**
+ * @Description: 保养工作项目
+ * @Author: jeecg-boot
+ * @Date:   2024-01-10
+ * @Version: V1.0
+ */
+@Service
+public class CmmsUpkeepProjectServiceImpl extends ServiceImpl<CmmsUpkeepProjectMapper, CmmsUpkeepProject> implements ICmmsUpkeepProjectService {
+
+
+
+}

+ 4 - 0
jeecg_module_ems/src/main/java/org/jeecg/modules/util/UserConstants.java

@@ -85,6 +85,10 @@ public class UserConstants
     public static final String EMSENERGYQUOTA_CODE="EMSENERGYQUOTA_CODE";
     // 维修工单编码规则
     public static final String CMMSREPAIR_CODE="CMMSREPAIR_CODE";
+
+    //保养项编码规则
+    public static final String CMMSUPKEEPITEM_CODE="CMMSUPKEEPITEM_CODE";
+
     // 保养计划编码规则
     public static final String CMMSUPKEEPPLAN_CODE="CMMSUPKEEPPLAN_CODE";
     // 保养工单编码规则