运维管理--巡检管理--巡检内容+巡检项多选添加

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContent/controller/CmmsInspectContentController.java

@@ -0,0 +1,227 @@
+package org.jeecg.modules.cmmsInspectContent.controller;
+
+import java.util.Arrays;
+import java.util.HashMap;
+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.cmmsInspectContent.entity.CmmsInspectContent;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
+import org.jeecg.modules.cmmsInspectContent.service.ICmmsInspectContentService;
+
+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.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItem;
+import org.jeecg.modules.cmmsInspectContentItem.service.ICmmsInspectContentItemService;
+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("/cmmsInspectContent/cmmsInspectContent")
+@Slf4j
+public class CmmsInspectContentController extends JeecgController<CmmsInspectContent, ICmmsInspectContentService> {
+	@Autowired
+	@SuppressWarnings("all")
+	private ICmmsInspectContentService cmmsInspectContentService;
+	 @Autowired
+	 @SuppressWarnings("all")
+	 private ICmmsInspectContentItemService iCmmsInspectContentItemService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cmmsInspectContent
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "巡检内容-分页列表查询")
+	@ApiOperation(value="巡检内容-分页列表查询", notes="巡检内容-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CmmsInspectContentVo>> queryPageList(CmmsInspectContent cmmsInspectContent,
+															 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															 HttpServletRequest req) {
+		//QueryWrapper<CmmsInspectContent> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectContent, req.getParameterMap());
+		Page<CmmsInspectContentVo> page = new Page<>(pageNo, pageSize);
+		//IPage<CmmsInspectContent> pageList = cmmsInspectContentService.page(page, queryWrapper);
+		List<CmmsInspectContentVo> list = cmmsInspectContentService.getCmmsInspectContent(page, cmmsInspectContent);
+		page.setRecords(list);
+		return Result.OK(page);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cmmsInspectContent
+	 * @return
+	 */
+	@AutoLog(value = "巡检内容-添加")
+	@ApiOperation(value="巡检内容-添加", notes="巡检内容-添加")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_content:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CmmsInspectContentVo cmmsInspectContent) {
+		boolean b = cmmsInspectContentService.addCmmsInspectContent(cmmsInspectContent);
+		if (b) {
+			return Result.OK("添加成功！");
+		}
+		return Result.error("添加失败！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cmmsInspectContent
+	 * @return
+	 */
+	@AutoLog(value = "巡检内容-编辑")
+	@ApiOperation(value="巡检内容-编辑", notes="巡检内容-编辑")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_content:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CmmsInspectContentVo cmmsInspectContent) {
+		//cmmsInspectContentService.updateById(cmmsInspectContent);
+		boolean b = cmmsInspectContentService.updateCmmsInspectContent(cmmsInspectContent);
+		if (b) {
+			return Result.OK("编辑成功!");
+		}
+		return Result.error("编辑失败!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "巡检内容-通过id删除")
+	@ApiOperation(value="巡检内容-通过id删除", notes="巡检内容-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_content:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		QueryWrapper<CmmsInspectContentItem> quer = new QueryWrapper<>();
+		quer.eq("inspectcheckcontid",id);
+		iCmmsInspectContentItemService.remove(quer);
+		boolean b = cmmsInspectContentService.removeById(id);
+		if (b) {
+			return Result.OK("删除成功!");
+		}
+		return Result.error("删除失败!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "巡检内容-批量删除")
+	@ApiOperation(value="巡检内容-批量删除", notes="巡检内容-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_content:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		QueryWrapper<CmmsInspectContentItem> quer = new QueryWrapper<>();
+		quer.in("inspectcheckcontid",Arrays.asList(ids.split(",")));
+		iCmmsInspectContentItemService.remove(quer);
+		boolean b = this.cmmsInspectContentService.removeByIds(Arrays.asList(ids.split(",")));
+		if (b) {
+			return Result.OK("批量删除成功!");
+		}
+		return Result.error("批量删除失败!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "巡检内容-通过id查询")
+	@ApiOperation(value="巡检内容-通过id查询", notes="巡检内容-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CmmsInspectContent> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsInspectContentVo cmmsInspectContent = cmmsInspectContentService.getCmmsInspectContentById(id);
+		if(cmmsInspectContent==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cmmsInspectContent);
+	}
+
+
+	/**
+	*   author: dzc
+	*   version: 1.0
+	*   des: 修改状态
+	*   date: 2024/1/16
+	*/
+	@ApiOperation(value="巡检内容-修改状态", notes="巡检内容-修改状态")
+	@PostMapping("/updatestatus")
+	public Result<String> updateStatus(@RequestBody CmmsInspectContentVo cmmsInspectContent){
+		//QueryWrapper<CmmsInspectContent> quer = new QueryWrapper<>();
+		////quer.and(i -> i.eq("id",cmmsInspectContent.getId()).eq("status",cmmsInspectContent.getStatus()));
+		//quer.eq("id",cmmsInspectContent.getId());
+		boolean b = cmmsInspectContentService.updateStatua(cmmsInspectContent.getId(),cmmsInspectContent.getStatus());
+		if (b) {
+			return Result.OK("操作成功!");
+		}
+		return Result.error("操作失败!");
+	}
+
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cmmsInspectContent
+    */
+    //@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_content:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CmmsInspectContent cmmsInspectContent) {
+        return super.exportXls(request, cmmsInspectContent, CmmsInspectContent.class, "巡检内容");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("ems_cmms_inspect_content:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CmmsInspectContent.class);
+    }
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContent/entity/CmmsInspectContent.java

@@ -0,0 +1,77 @@
+package org.jeecg.modules.cmmsInspectContent.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_inspect_content")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ems_cmms_inspect_content对象", description="巡检内容")
+public class CmmsInspectContent implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**巡检内容编号*/
+	@Excel(name = "巡检内容编号", width = 15)
+    @ApiModelProperty(value = "巡检内容编号")
+    private java.lang.String contentcode;
+	/**巡检内容名称*/
+	@Excel(name = "巡检内容名称", width = 15)
+    @ApiModelProperty(value = "巡检内容名称")
+    private java.lang.String contentname;
+	/**设备id*/
+	@Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String equipmentid;
+	/**状态：启用：0、禁用:1*/
+	@Excel(name = "状态：启用：0、禁用:1", width = 15)
+    @ApiModelProperty(value = "状态：启用：0、禁用:1")
+    private java.lang.String status;
+	/**创建人*/
+    @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;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**备注*/
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContent/entity/CmmsInspectContentVo.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.cmmsInspectContent.entity;
+
+import lombok.Data;
+import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItem;
+import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItemVo;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.List;
+
+/**
+ * @author dzc
+ * @date 2024/1/15 16:53
+ * @package org.jeecg.modules.cmmsInspectContent.entity
+ * @project EMS_server
+ * @des
+ */
+@Data
+public class CmmsInspectContentVo extends CmmsInspectContent{
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String equipmentname;
+
+    /** 巡检内容-巡检项信息 */
+    private List<CmmsInspectContentItemVo> cmmsInspectContentItemList;
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContent/mapper/CmmsInspectContentMapper.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.cmmsInspectContent.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
+
+/**
+ * @Description: 巡检内容
+ * @Author: jeecg-boot
+ * @Date:   2024-01-15
+ * @Version: V1.0
+ */
+public interface CmmsInspectContentMapper extends BaseMapper<CmmsInspectContent> {
+
+    List<CmmsInspectContentVo> getCmmsInspectContent(@Param("page") Page<CmmsInspectContentVo> page,@Param("cmmsInspectContent") CmmsInspectContent cmmsInspectContent);
+
+    CmmsInspectContentVo getCmmsInspectContentById(@Param("id") String id);
+
+    boolean updateStatua(@Param("id") String id,@Param("status") String status);
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContent/mapper/xml/CmmsInspectContentMapper.xml

@@ -0,0 +1,53 @@
+<?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.cmmsInspectContent.mapper.CmmsInspectContentMapper">
+
+
+    <resultMap type="org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo" id="CmmsSpotcheckContentResult">
+        <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="remark"    column="remark"    />
+        <result property="contentcode"    column="contentcode"    />
+        <result property="contentname"    column="contentname"    />
+        <result property="equipmentid"    column="equipmentid"    />
+        <result property="status"    column="status"    />
+        <result property="equipmentname"    column="equipmentname"    />
+        <result property="sysOrgCode"    column="sys_org_code"    />
+    </resultMap>
+
+    <sql id="selectCmmsSpotcheckContentVo">
+        select id, create_by, create_time, update_by, update_time, remark,
+               contentcode, contentname, equipmentid, status,sys_org_code
+        from ems_cmms_inspect_content
+    </sql>
+
+    <select id="getCmmsInspectContent" parameterType="org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent" resultMap="CmmsSpotcheckContentResult">
+        select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark,
+        c.contentcode, c.contentname, c.equipmentid, c.status, c.sys_org_code, e.equipmentname
+        from ems_cmms_inspect_content as c
+        left join ems_tpm_equipment as e on c.equipmentid = e.id
+        <where>
+            <if test="cmmsInspectContent.contentname != null  and cmmsInspectContent.contentname != ''"> and (c.contentcode like concat('%', #{cmmsInspectContent.contentname}, '%') or c.contentname like concat('%', #{cmmsInspectContent.contentname}, '%'))</if>
+            <if test="cmmsInspectContent.equipmentid != null "> and c.equipmentid = #{cmmsInspectContent.equipmentid}</if>
+        </where>
+    </select>
+
+
+    <select id="getCmmsInspectContentById" parameterType="String" resultMap="CmmsSpotcheckContentResult">
+        select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
+               a.contentcode, a.contentname, a.equipmentid, a.status, a.sys_org_code, e.equipmentname
+        from ems_cmms_inspect_content a
+        left join ems_tpm_equipment as e on a.equipmentid = e.id
+        where a.id = #{id}
+    </select>
+
+    <!--修改状态-->
+    <update id="updateStatua">
+        update ems_cmms_inspect_content
+        set status = #{status}
+        where id = #{id}
+    </update>
+</mapper>

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContent/service/ICmmsInspectContentService.java

@@ -0,0 +1,28 @@
+package org.jeecg.modules.cmmsInspectContent.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
+
+import java.util.List;
+
+/**
+ * @Description: 巡检内容
+ * @Author: jeecg-boot
+ * @Date:   2024-01-15
+ * @Version: V1.0
+ */
+public interface ICmmsInspectContentService extends IService<CmmsInspectContent> {
+
+    List<CmmsInspectContentVo> getCmmsInspectContent(Page<CmmsInspectContentVo> page, CmmsInspectContent cmmsInspectContent);
+
+    boolean addCmmsInspectContent(CmmsInspectContentVo cmmsInspectContent);
+
+    boolean updateCmmsInspectContent(CmmsInspectContentVo cmmsInspectContent);
+
+    CmmsInspectContentVo getCmmsInspectContentById(String id);
+
+    boolean updateStatua(String id,String status);
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContent/service/impl/CmmsInspectContentServiceImpl.java

@@ -0,0 +1,125 @@
+package org.jeecg.modules.cmmsInspectContent.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
+import org.jeecg.modules.cmmsInspectContent.mapper.CmmsInspectContentMapper;
+import org.jeecg.modules.cmmsInspectContent.service.ICmmsInspectContentService;
+import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItem;
+import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItemVo;
+import org.jeecg.modules.cmmsInspectContentItem.service.ICmmsInspectContentItemService;
+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.List;
+
+/**
+ * @Description: 巡检内容
+ * @Author: jeecg-boot
+ * @Date:   2024-01-15
+ * @Version: V1.0
+ */
+@Service
+public class CmmsInspectContentServiceImpl extends ServiceImpl<CmmsInspectContentMapper, CmmsInspectContent> implements ICmmsInspectContentService {
+
+    @Autowired
+    @SuppressWarnings("all")
+    private CmmsInspectContentMapper inspectContentMapper;
+    @Autowired
+    @SuppressWarnings("all")
+    private AutoCodeUtil autoCodeUtil;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectContentItemService iCmmsInspectContentItemService;
+
+    @Override
+    public List<CmmsInspectContentVo> getCmmsInspectContent(Page<CmmsInspectContentVo> page, CmmsInspectContent cmmsInspectContent) {
+        List<CmmsInspectContentVo> list = inspectContentMapper.getCmmsInspectContent(page, cmmsInspectContent);
+
+
+
+        return list;
+    }
+
+    @Override
+    public boolean addCmmsInspectContent(CmmsInspectContentVo cmmsInspectContent) {
+        if (cmmsInspectContent.getContentcode() == null || "".equals(cmmsInspectContent.getContentcode())) {
+            cmmsInspectContent.setContentcode(autoCodeUtil.genSerialCode(UserConstants.CMMSSPOTCHECKCONTENT_CODE, null));
+        }
+        boolean b = this.save(cmmsInspectContent);
+
+        if (cmmsInspectContent.getCmmsInspectContentItemList() != null && cmmsInspectContent.getCmmsInspectContentItemList().size() > 0){
+            for (int i = 0; i < cmmsInspectContent.getCmmsInspectContentItemList().size(); i++) {
+                cmmsInspectContent.getCmmsInspectContentItemList().get(i).setInspectcheckcontid(cmmsInspectContent.getId());
+
+            }
+        }
+
+        // 新增 巡检内容下的巡检项
+        insertCmmsInspectcheckContentItem(cmmsInspectContent);
+        
+        return b;
+    }
+
+
+    @Override
+    public boolean updateCmmsInspectContent(CmmsInspectContentVo cmmsInspectContent) {
+        // 先根据巡检内容id删除掉 巡检内容-巡检项
+        QueryWrapper<CmmsInspectContentItem> quer = new QueryWrapper<>();
+        quer.eq("inspectcheckcontid",cmmsInspectContent.getId());
+        iCmmsInspectContentItemService.remove(quer);
+
+        if (cmmsInspectContent.getCmmsInspectContentItemList() != null && cmmsInspectContent.getCmmsInspectContentItemList().size() > 0){
+            for (int i = 0; i < cmmsInspectContent.getCmmsInspectContentItemList().size(); i++) {
+                cmmsInspectContent.getCmmsInspectContentItemList().get(i).setInspectcheckcontid(cmmsInspectContent.getId());
+            }
+        }
+        // 更新 巡检内容下的巡检项
+        insertCmmsInspectcheckContentItem(cmmsInspectContent);
+        boolean b = this.updateById(cmmsInspectContent);
+        return b;
+    }
+
+
+    @Override
+    public CmmsInspectContentVo getCmmsInspectContentById(String id) {
+        CmmsInspectContentVo cmmsInspectContent = inspectContentMapper.getCmmsInspectContentById(id);
+        if (ObjectUtil.isNotNull(cmmsInspectContent)){
+            List<CmmsInspectContentItemVo> list = iCmmsInspectContentItemService.getCmmsInspectContentItemListByCountId(cmmsInspectContent.getId());
+            cmmsInspectContent.setCmmsInspectContentItemList(list);
+        }
+        return cmmsInspectContent;
+    }
+
+    @Override
+    public boolean updateStatua(String id,String status) {
+        return inspectContentMapper.updateStatua(id,status);
+    }
+
+    private void insertCmmsInspectcheckContentItem(CmmsInspectContentVo cmmsInspectContent) {
+        // 巡检内容巡检项
+        List<CmmsInspectContentItemVo> contentList = cmmsInspectContent.getCmmsInspectContentItemList();
+        // 巡检内容id
+        String contentId = cmmsInspectContent.getId();
+        if (ObjectUtil.isNotNull(contentList)){
+            ArrayList<CmmsInspectContentItem> list = new ArrayList<>();
+            for (CmmsInspectContentItemVo inspectContent:contentList) {
+                CmmsInspectContentItem cmmsInspectContentItem = new CmmsInspectContentItem();
+                cmmsInspectContentItem.setInspectcheckitemid(inspectContent.getInspectcheckitemid());
+                cmmsInspectContentItem.setInspectcheckcontid(contentId);
+                list.add(cmmsInspectContentItem);
+            }
+            if (list.size() > 0){
+                iCmmsInspectContentItemService.saveBatch(list);
+            }
+        }
+
+    }
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContentItem/controller/CmmsInspectContentItemController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.cmmsInspectContentItem.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.cmmsInspectContentItem.entity.CmmsInspectContentItem;
+import org.jeecg.modules.cmmsInspectContentItem.service.ICmmsInspectContentItemService;
+
+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("/cmmsInspectContentItem/cmmsInspectContentItem")
+@Slf4j
+public class CmmsInspectContentItemController extends JeecgController<CmmsInspectContentItem, ICmmsInspectContentItemService> {
+	@Autowired
+	private ICmmsInspectContentItemService cmmsInspectContentItemService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cmmsInspectContentItem
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "巡检内容-巡检项-分页列表查询")
+	@ApiOperation(value="巡检内容-巡检项-分页列表查询", notes="巡检内容-巡检项-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CmmsInspectContentItem>> queryPageList(CmmsInspectContentItem cmmsInspectContentItem,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CmmsInspectContentItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectContentItem, req.getParameterMap());
+		Page<CmmsInspectContentItem> page = new Page<CmmsInspectContentItem>(pageNo, pageSize);
+		IPage<CmmsInspectContentItem> pageList = cmmsInspectContentItemService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cmmsInspectContentItem
+	 * @return
+	 */
+	@AutoLog(value = "巡检内容-巡检项-添加")
+	@ApiOperation(value="巡检内容-巡检项-添加", notes="巡检内容-巡检项-添加")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_content_item:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CmmsInspectContentItem cmmsInspectContentItem) {
+		cmmsInspectContentItemService.save(cmmsInspectContentItem);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cmmsInspectContentItem
+	 * @return
+	 */
+	@AutoLog(value = "巡检内容-巡检项-编辑")
+	@ApiOperation(value="巡检内容-巡检项-编辑", notes="巡检内容-巡检项-编辑")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_content_item:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CmmsInspectContentItem cmmsInspectContentItem) {
+		cmmsInspectContentItemService.updateById(cmmsInspectContentItem);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "巡检内容-巡检项-通过id删除")
+	@ApiOperation(value="巡检内容-巡检项-通过id删除", notes="巡检内容-巡检项-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_content_item:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cmmsInspectContentItemService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "巡检内容-巡检项-批量删除")
+	@ApiOperation(value="巡检内容-巡检项-批量删除", notes="巡检内容-巡检项-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_content_item:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cmmsInspectContentItemService.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<CmmsInspectContentItem> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsInspectContentItem cmmsInspectContentItem = cmmsInspectContentItemService.getById(id);
+		if(cmmsInspectContentItem==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cmmsInspectContentItem);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cmmsInspectContentItem
+    */
+    //@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_content_item:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CmmsInspectContentItem cmmsInspectContentItem) {
+        return super.exportXls(request, cmmsInspectContentItem, CmmsInspectContentItem.class, "巡检内容-巡检项");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("ems_cmms_inspect_content_item:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CmmsInspectContentItem.class);
+    }
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContentItem/entity/CmmsInspectContentItem.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.cmmsInspectContentItem.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_inspect_content_item")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ems_cmms_inspect_content_item对象", description="巡检内容-巡检项")
+public class CmmsInspectContentItem implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**巡检内容id*/
+	@Excel(name = "巡检内容id", width = 15)
+    @ApiModelProperty(value = "巡检内容id")
+    private java.lang.String inspectcheckcontid;
+	/**巡检项id*/
+	@Excel(name = "巡检项id", width = 15)
+    @ApiModelProperty(value = "巡检项id")
+    private java.lang.String inspectcheckitemid;
+	/**创建人*/
+    @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;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContentItem/entity/CmmsInspectContentItemVo.java

@@ -0,0 +1,64 @@
+package org.jeecg.modules.cmmsInspectContentItem.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @author dzc
+ * @date 2024/1/15 17:24
+ * @package org.jeecg.modules.cmmsInspectContentItem.entity
+ * @project EMS_server
+ * @des
+ */
+@Data
+public class CmmsInspectContentItemVo extends CmmsInspectContentItem{
+
+    private String equipdefname;
+
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+    /**巡检项编号*/
+    @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 conditions;
+    /**参考值*/
+    @Excel(name = "参考值", width = 15)
+    @ApiModelProperty(value = "参考值")
+    private java.lang.String refervalue;
+    /**标签(多个用逗号隔开)*/
+    @Excel(name = "标签(多个用逗号隔开)", width = 15)
+    @ApiModelProperty(value = "标签(多个用逗号隔开)")
+    private java.lang.String tag;
+
+    /** 巡检标准 */
+    @Excel(name = "巡检标准", width = 15)
+    @ApiModelProperty(value = "巡检标准")
+    private java.lang.String inspectionstandards;
+
+    /** 分类 */
+    @Excel(name = "分类", width = 15)
+    @ApiModelProperty(value = "分类")
+    @Dict(dicCode = "item_type")
+    private java.lang.String classification;
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContentItem/mapper/CmmsInspectContentItemMapper.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cmmsInspectContentItem.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItemVo;
+
+/**
+ * @Description: 巡检内容-巡检项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-15
+ * @Version: V1.0
+ */
+public interface CmmsInspectContentItemMapper extends BaseMapper<CmmsInspectContentItem> {
+
+    List<CmmsInspectContentItemVo> getCmmsInspectContentItemListByCountId(@Param("inspectcheckcontid") String inspectcheckcontid);
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContentItem/mapper/xml/CmmsInspectContentItemMapper.xml

@@ -0,0 +1,30 @@
+<?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.cmmsInspectContentItem.mapper.CmmsInspectContentItemMapper">
+    <resultMap type="org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItemVo" id="CmmsSpotcheckContentItemResult">
+        <result property="id"    column="id"    />
+        <result property="inspectcheckcontid"    column="inspectcheckcontid"    />
+        <result property="inspectcheckitemid"    column="inspectcheckitemid"    />
+        <result property="itemcode"    column="itemcode"    />
+        <result property="itemname"    column="itemname"    />
+        <result property="equipdefid"    column="equipdefid"    />
+        <result property="conditions"    column="conditions"    />
+        <result property="refervalue"    column="refervalue"    />
+        <result property="tag"    column="tag"    />
+        <result property="sysOrgCode"    column="sys_org_code"    />
+        <result property="inspectionstandards"    column="inspectionstandards"    />
+        <result property="classification"    column="classification"    />
+        <result property="equipdefname"    column="equipdefname"    />
+    </resultMap>
+
+    <select id="getCmmsInspectContentItemListByCountId" parameterType="String" resultMap="CmmsSpotcheckContentItemResult">
+        select b.id, b.inspectcheckcontid, b.inspectcheckitemid, i.itemcode, i.itemname,
+        i.equipdefid, i.conditions, i.refervalue, i.tag, i.sys_org_code, i.inspectionstandards, i.classification, t.name as equipdefname
+        from ems_cmms_inspect_content_item as b
+        left join ems_cmms_inspect_item as i on b.inspectcheckitemid = i.id
+        left join ems_tpm_equipment_tree as t on i.equipdefid = t.id
+        <where>
+            <if test="inspectcheckcontid != null "> and b.inspectcheckcontid = #{inspectcheckcontid}</if>
+        </where>
+    </select>
+</mapper>

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContentItem/service/ICmmsInspectContentItemService.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.cmmsInspectContentItem.service;
+
+import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItemVo;
+
+import java.util.List;
+
+/**
+ * @Description: 巡检内容-巡检项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-15
+ * @Version: V1.0
+ */
+public interface ICmmsInspectContentItemService extends IService<CmmsInspectContentItem> {
+
+    List<CmmsInspectContentItemVo> getCmmsInspectContentItemListByCountId(String inspectcheckcontid);
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectContentItem/service/impl/CmmsInspectContentItemServiceImpl.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.cmmsInspectContentItem.service.impl;
+
+import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItem;
+import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItemVo;
+import org.jeecg.modules.cmmsInspectContentItem.mapper.CmmsInspectContentItemMapper;
+import org.jeecg.modules.cmmsInspectContentItem.service.ICmmsInspectContentItemService;
+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-15
+ * @Version: V1.0
+ */
+@Service
+public class CmmsInspectContentItemServiceImpl extends ServiceImpl<CmmsInspectContentItemMapper, CmmsInspectContentItem> implements ICmmsInspectContentItemService {
+
+    @Autowired
+    @SuppressWarnings("all")
+    private CmmsInspectContentItemMapper inspectContentItemMapper;
+
+    @Override
+    public List<CmmsInspectContentItemVo> getCmmsInspectContentItemListByCountId(String inspectcheckcontid) {
+        return inspectContentItemMapper.getCmmsInspectContentItemListByCountId(inspectcheckcontid);
+    }
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectItem/controller/CmmsInspectItemController.java

@@ -93,11 +93,11 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
 	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_item:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody CmmsInspectItem cmmsInspectItem) {
-		if (cmmsInspectItem.getItemcode() == null || "".equals(cmmsInspectItem.getItemcode())){
-			cmmsInspectItem.setItemcode(autoCodeUtil.genSerialCode(UserConstants.CMMSINSPECTITEM_CODE, null));
+		boolean b = cmmsInspectItemService.addInspectItem(cmmsInspectItem);
+		if (b){
+			return Result.OK("添加成功！");
 		}
-		cmmsInspectItemService.save(cmmsInspectItem);
-		return Result.OK("添加成功！");
+		return Result.OK("添加失败！");
 	}
 	
 	/**

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectItem/entity/CmmsInspectItem.java

@@ -83,4 +83,17 @@ public class CmmsInspectItem implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
+
+    /** 巡检标准 */
+    @Excel(name = "巡检标准", width = 15)
+    @ApiModelProperty(value = "巡检标准")
+    private java.lang.String inspectionstandards;
+
+    /** 分类 */
+    @Excel(name = "分类", width = 15)
+    @ApiModelProperty(value = "分类")
+    @Dict(dicCode = "item_type")
+    private java.lang.String classification;
+
+
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectItem/mapper/xml/CmmsInspectItemMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.cmmsInspectItem.mapper.CmmsInspectItemMapper">
 
     <resultMap type="org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItemVo" id="CmmsInspectItemResult">
-        <result property="id"    column="inspectitemid"    />
+        <result property="id"    column="id"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -17,17 +17,19 @@
         <result property="tag"    column="tag"    />
         <result property="sysOrgCode"    column="sysOrgCode"    />
         <result property="equipdefname"    column="equipdefname"    />
+        <result property="inspectionstandards"    column="inspectionstandards"    />
+        <result property="classification"    column="classification"    />
     </resultMap>
 
     <sql id="selectCmmsInspectItemVo">
         select id, create_by, create_time, update_by, update_time, remark,
-               itemcode, itemname, equipdefid, conditions, refervalue, tag
+               itemcode, itemname, equipdefid, conditions, refervalue, tag, sys_org_code, inspectionstandards, classification
         from ems_cmms_inspect_item
     </sql>
 
     <select id="getCmmsInspectItems" parameterType="org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItem" resultMap="CmmsInspectItemResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark,
-        c.itemcode, c.itemname, c.equipdefid, c.conditions, c.refervalue, c.tag,c.sys_org_code, t.name as equipdefname
+        c.itemcode, c.itemname, c.equipdefid, c.conditions, c.refervalue, c.tag,c.sys_org_code, c.inspectionstandards, c.classification, t.name as equipdefname
         from ems_cmms_inspect_item as c
         left join ems_tpm_equipment_tree as t
         on c.equipdefid = t.id

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectItem/service/ICmmsInspectItemService.java

@@ -16,4 +16,6 @@ import java.util.List;
 public interface ICmmsInspectItemService extends IService<CmmsInspectItem> {
 
     List<CmmsInspectItemVo> getCmmsInspectItems(Page<CmmsInspectItemVo> page, CmmsInspectItem cmmsInspectItem);
+
+    boolean addInspectItem(CmmsInspectItem cmmsInspectItem);
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectItem/service/impl/CmmsInspectItemServiceImpl.java

@@ -5,11 +5,15 @@ import org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItem;
 import org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItemVo;
 import org.jeecg.modules.cmmsInspectItem.mapper.CmmsInspectItemMapper;
 import org.jeecg.modules.cmmsInspectItem.service.ICmmsInspectItemService;
+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;
 
 /**
@@ -25,8 +29,56 @@ public class CmmsInspectItemServiceImpl extends ServiceImpl<CmmsInspectItemMappe
     @SuppressWarnings("all")
     private CmmsInspectItemMapper inspectItemMapper;
 
+    @Autowired
+    @SuppressWarnings("all")
+    private AutoCodeUtil autoCodeUtil;
+
     @Override
     public List<CmmsInspectItemVo> getCmmsInspectItems(Page<CmmsInspectItemVo> page, CmmsInspectItem cmmsInspectItem) {
         return inspectItemMapper.getCmmsInspectItems(page, cmmsInspectItem);
     }
+
+    @Override
+    public boolean addInspectItem(CmmsInspectItem cmmsInspectItem) {
+
+        ArrayList<CmmsInspectItem> list = new ArrayList<>();
+
+        String equipdefid = cmmsInspectItem.getEquipdefid();
+
+        String[] equipdefids = equipdefid.split(",");
+        List<String> strings = Arrays.asList(equipdefids);
+        for (String str:strings) {
+            CmmsInspectItem item = new CmmsInspectItem();
+            item.setEquipdefid(str);
+            if (cmmsInspectItem.getItemcode() == null || "".equals(cmmsInspectItem.getItemcode())){
+                item.setItemcode(autoCodeUtil.genSerialCode(UserConstants.CMMSINSPECTITEM_CODE, null));
+            }else {
+                item.setItemcode(cmmsInspectItem.getItemcode());
+            }
+            if (cmmsInspectItem.getClassification() != null){
+                item.setClassification(cmmsInspectItem.getClassification());
+            }
+            if (cmmsInspectItem.getConditions() != null){
+                item.setConditions(cmmsInspectItem.getConditions());
+            }
+            if (cmmsInspectItem.getItemname() != null){
+                item.setItemname(cmmsInspectItem.getItemname());
+            }
+            if (cmmsInspectItem.getInspectionstandards() != null){
+                item.setInspectionstandards(cmmsInspectItem.getInspectionstandards());
+            }
+            if (cmmsInspectItem.getTag() != null){
+                item.setTag(cmmsInspectItem.getTag());
+            }
+            if (cmmsInspectItem.getRemark() != null){
+                item.setRemark(cmmsInspectItem.getRemark());
+            }
+            list.add(item);
+        }
+        //if (cmmsInspectItem.getItemcode() == null || "".equals(cmmsInspectItem.getItemcode())){
+        //    cmmsInspectItem.setItemcode(autoCodeUtil.genSerialCode(UserConstants.CMMSINSPECTITEM_CODE, null));
+        //}
+        //this.save(cmmsInspectItem);
+        return this.saveBatch(list);
+    }
 }