Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,190 @@
+package org.jeecg.modules.cmmsInspectItem.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 cn.hutool.core.util.ObjectUtil;
+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.CmmsInspectItem;
+import org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItemVo;
+import org.jeecg.modules.cmmsInspectItem.service.ICmmsInspectItemService;
+
+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.util.AutoCodeUtil;
+import org.jeecg.modules.util.UserConstants;
+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-11
+ * @Version: V1.0
+ */
+@Api(tags="巡检项")
+@RestController
+@RequestMapping("/cmmsInspectItem/cmmsInspectItem")
+@Slf4j
+public class CmmsInspectItemController extends JeecgController<CmmsInspectItem, ICmmsInspectItemService> {
+	@Autowired
+	private ICmmsInspectItemService cmmsInspectItemService;
+	@Autowired
+	@SuppressWarnings("all")
+	private AutoCodeUtil autoCodeUtil;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cmmsInspectItem
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "巡检项-分页列表查询")
+	@ApiOperation(value="巡检项-分页列表查询", notes="巡检项-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CmmsInspectItemVo>> queryPageList(CmmsInspectItem cmmsInspectItem,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		//QueryWrapper<CmmsInspectItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectItem, req.getParameterMap());
+		Page<CmmsInspectItemVo> page = new Page<CmmsInspectItemVo>(pageNo, pageSize);
+		//IPage<CmmsInspectItem> pageList = cmmsInspectItemService.page(page, queryWrapper);
+		List<CmmsInspectItemVo> list = cmmsInspectItemService.getCmmsInspectItems(page, cmmsInspectItem);
+		page.setRecords(list);
+		return Result.OK(page);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cmmsInspectItem
+	 * @return
+	 */
+	@AutoLog(value = "巡检项-添加")
+	@ApiOperation(value="巡检项-添加", notes="巡检项-添加")
+	//@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));
+		}
+		cmmsInspectItemService.save(cmmsInspectItem);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cmmsInspectItem
+	 * @return
+	 */
+	@AutoLog(value = "巡检项-编辑")
+	@ApiOperation(value="巡检项-编辑", notes="巡检项-编辑")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_item:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CmmsInspectItem cmmsInspectItem) {
+		cmmsInspectItemService.updateById(cmmsInspectItem);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "巡检项-通过id删除")
+	@ApiOperation(value="巡检项-通过id删除", notes="巡检项-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_item:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cmmsInspectItemService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "巡检项-批量删除")
+	@ApiOperation(value="巡检项-批量删除", notes="巡检项-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_item:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cmmsInspectItemService.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<CmmsInspectItem> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsInspectItem cmmsInspectItem = cmmsInspectItemService.getById(id);
+		if(cmmsInspectItem==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cmmsInspectItem);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cmmsInspectItem
+    */
+    //@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_item:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CmmsInspectItem cmmsInspectItem) {
+        return super.exportXls(request, cmmsInspectItem, CmmsInspectItem.class, "巡检项");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("ems_cmms_inspect_item:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CmmsInspectItem.class);
+    }
+
+}

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

@@ -0,0 +1,86 @@
+package org.jeecg.modules.cmmsInspectItem.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-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("ems_cmms_inspect_item")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ems_cmms_inspect_item对象", description="巡检项")
+public class CmmsInspectItem 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 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;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

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

@@ -0,0 +1,16 @@
+package org.jeecg.modules.cmmsInspectItem.entity;
+
+import lombok.Data;
+
+/**
+ * @author dzc
+ * @date 2024/1/11 16:16
+ * @package org.jeecg.modules.cmmsInspectItem.entity
+ * @project EMS_server
+ * @des
+ */
+@Data
+public class CmmsInspectItemVo extends CmmsInspectItem{
+
+    private String equipdefname;
+}

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

@@ -0,0 +1,20 @@
+package org.jeecg.modules.cmmsInspectItem.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItemVo;
+
+/**
+ * @Description: 巡检项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-11
+ * @Version: V1.0
+ */
+public interface CmmsInspectItemMapper extends BaseMapper<CmmsInspectItem> {
+
+    List<CmmsInspectItemVo> getCmmsInspectItems(Page<CmmsInspectItemVo> page, @Param("cmmsInspectItem") CmmsInspectItem cmmsInspectItem);
+}

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

@@ -0,0 +1,39 @@
+<?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.cmmsInspectItem.mapper.CmmsInspectItemMapper">
+
+    <resultMap type="org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItemVo" id="CmmsInspectItemResult">
+        <result property="id"    column="inspectitemid"    />
+        <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="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="sysOrgCode"    />
+        <result property="equipdefname"    column="equipdefname"    />
+    </resultMap>
+
+    <sql id="selectCmmsInspectItemVo">
+        select id, create_by, create_time, update_by, update_time, remark,
+               itemcode, itemname, equipdefid, conditions, refervalue, tag
+        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
+        from ems_cmms_inspect_item as c
+        left join ems_tpm_equipment_tree as t
+        on c.equipdefid = t.id
+        <where>
+            <if test="cmmsInspectItem.itemcode != null  and cmmsInspectItem.itemcode != ''"> and (c.itemcode like concat('%', #{cmmsInspectItem.itemcode}, '%') or c.itemname like concat('%', #{cmmsInspectItem.itemcode}, '%'))</if>
+            <if test="cmmsInspectItem.equipdefid != null "> and c.equipdefid = #{cmmsInspectItem.equipdefid}</if>
+        </where>
+    </select>
+</mapper>

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cmmsInspectItem.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItemVo;
+
+import java.util.List;
+
+/**
+ * @Description: 巡检项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-11
+ * @Version: V1.0
+ */
+public interface ICmmsInspectItemService extends IService<CmmsInspectItem> {
+
+    List<CmmsInspectItemVo> getCmmsInspectItems(Page<CmmsInspectItemVo> page, CmmsInspectItem cmmsInspectItem);
+}

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

@@ -0,0 +1,32 @@
+package org.jeecg.modules.cmmsInspectItem.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.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-11
+ * @Version: V1.0
+ */
+@Service
+public class CmmsInspectItemServiceImpl extends ServiceImpl<CmmsInspectItemMapper, CmmsInspectItem> implements ICmmsInspectItemService {
+
+    @Autowired
+    @SuppressWarnings("all")
+    private CmmsInspectItemMapper inspectItemMapper;
+
+    @Override
+    public List<CmmsInspectItemVo> getCmmsInspectItems(Page<CmmsInspectItemVo> page, CmmsInspectItem cmmsInspectItem) {
+        return inspectItemMapper.getCmmsInspectItems(page, cmmsInspectItem);
+    }
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsOrderNode/entity/CmmsOrderNode.java

@@ -74,4 +74,7 @@ public class CmmsOrderNode implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "处理时间")
     private java.util.Date handledate;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsRepair/entity/CmmsRepair.java

@@ -127,5 +127,7 @@ public class CmmsRepair implements Serializable {
     @ApiModelProperty(value = "维修工单状态: 0正常、1冻结、2拒绝")
     @Dict(dicCode = "repair_order_status")
     private java.lang.String repairstatus;
-
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
 }