Merge remote-tracking branch 'origin/master'

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheck/controller/CmmsSpotcheckController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.cmmsSpotcheck.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,9 +11,15 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.cmmsSpotcheck.convert.CmmsSpotcheckConvert;
+import org.jeecg.modules.cmmsSpotcheck.dto.CmmsSpotcheckAddDTO;
 import org.jeecg.modules.cmmsSpotcheck.entity.CmmsSpotcheck;
 import org.jeecg.modules.cmmsSpotcheck.service.ICmmsSpotcheckService;
 import org.jeecg.modules.cmmsSpotcheck.vo.CmmsSpotcheckQueryVO;
+import org.jeecg.modules.cmmsSpotcheckTitem.entity.CmmsSpotcheckTitem;
+import org.jeecg.modules.cmmsSpotcheckTitem.service.ICmmsSpotcheckTitemService;
+import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
+import org.jeecg.modules.sysUploadFile.service.ISysUploadFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -20,6 +27,8 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 设备点检
@@ -34,6 +43,10 @@ import java.util.Arrays;
 public class CmmsSpotcheckController extends JeecgController<CmmsSpotcheck, ICmmsSpotcheckService> {
 	@Autowired
 	private ICmmsSpotcheckService cmmsSpotcheckService;
+	@Autowired
+	private ICmmsSpotcheckTitemService titemService;
+	@Autowired
+	private ISysUploadFileService sysUploadFileService;
 
 	 /**
 	  * 获取设备点检详细信息（修改设备点检时）
@@ -80,29 +93,60 @@ public class CmmsSpotcheckController extends JeecgController<CmmsSpotcheck, ICmm
 	/**
 	 *   添加
 	 *
-	 * @param cmmsSpotcheck
+	 * @param dto
 	 * @return
 	 */
 	@AutoLog(value = "设备点检-添加")
 	@ApiOperation(value="设备点检-添加", notes="设备点检-添加")
 	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CmmsSpotcheck cmmsSpotcheck) {
+	public Result<String> add(@RequestBody CmmsSpotcheckAddDTO dto) {
+		CmmsSpotcheck cmmsSpotcheck = CmmsSpotcheckConvert.INSTANCE.convert(dto);
 		cmmsSpotcheckService.save(cmmsSpotcheck);
+
+		/** 设备点检-点检项信息 */
+		if(dto.getCmmsSpotcheckTitemList()!=null && dto.getCmmsSpotcheckTitemList().size()>0){
+			List<CmmsSpotcheckTitem> titemList1 = dto.getCmmsSpotcheckTitemList().parallelStream().map(i->i.setSpotcheckid(cmmsSpotcheck.getId())).collect(Collectors.toList());
+			titemService.saveBatch(titemList1);
+		}
+		/** 图片 */
+		if(dto.getFiles()!=null && dto.getFiles().size()>0){
+			List<SysUploadFile> files1 = dto.getFiles().stream().map(i->i.setRelid(cmmsSpotcheck.getId())).collect(Collectors.toList());
+			sysUploadFileService.saveBatch(files1);
+		}
+
 		return Result.OK("添加成功！");
 	}
 
 	/**
 	 *  编辑
 	 *
-	 * @param cmmsSpotcheck
+	 * @param dto
 	 * @return
 	 */
 	@AutoLog(value = "设备点检-编辑")
 	@ApiOperation(value="设备点检-编辑", notes="设备点检-编辑")
 	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CmmsSpotcheck cmmsSpotcheck) {
+	public Result<String> edit(@RequestBody CmmsSpotcheckAddDTO dto) {
+		CmmsSpotcheck cmmsSpotcheck = CmmsSpotcheckConvert.INSTANCE.convert(dto);
+
+		LambdaQueryWrapper<CmmsSpotcheckTitem> titemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		titemLambdaQueryWrapper.eq(CmmsSpotcheckTitem::getSpotcheckid,dto.getId());
+		titemService.remove(titemLambdaQueryWrapper);
+		LambdaQueryWrapper<SysUploadFile> uploadFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		uploadFileLambdaQueryWrapper.eq(SysUploadFile::getRelid,dto.getId());
+		sysUploadFileService.remove(uploadFileLambdaQueryWrapper);
+
+		if(dto.getCmmsSpotcheckTitemList()!=null && dto.getCmmsSpotcheckTitemList().size()>0){
+			List<CmmsSpotcheckTitem> titemList1 = dto.getCmmsSpotcheckTitemList().parallelStream().map(i->i.setSpotcheckid(cmmsSpotcheck.getId())).collect(Collectors.toList());
+			titemService.saveBatch(titemList1);
+		}
+		if(dto.getFiles()!=null && dto.getFiles().size()>0){
+			List<SysUploadFile> files1 = dto.getFiles().stream().map(i->i.setRelid(cmmsSpotcheck.getId())).collect(Collectors.toList());
+			sysUploadFileService.saveBatch(files1);
+		}
+
 		cmmsSpotcheckService.updateById(cmmsSpotcheck);
 		return Result.OK("编辑成功!");
 	}
@@ -118,6 +162,16 @@ public class CmmsSpotcheckController extends JeecgController<CmmsSpotcheck, ICmm
 	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+
+		/**删设备点检-点检项表数据*/
+		LambdaQueryWrapper<CmmsSpotcheckTitem> titemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		titemLambdaQueryWrapper.eq(CmmsSpotcheckTitem::getSpotcheckid,id);
+		titemService.remove(titemLambdaQueryWrapper);
+		/**删附件上传记录表表数据*/
+		LambdaQueryWrapper<SysUploadFile> uploadFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		uploadFileLambdaQueryWrapper.eq(SysUploadFile::getRelid,id);
+		sysUploadFileService.remove(uploadFileLambdaQueryWrapper);
+
 		cmmsSpotcheckService.removeById(id);
 		return Result.OK("删除成功!");
 	}
@@ -133,6 +187,18 @@ public class CmmsSpotcheckController extends JeecgController<CmmsSpotcheck, ICmm
 	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+
+		for (String id : Arrays.asList(ids.split(","))){
+			/**删设备点检-点检项表数据*/
+			LambdaQueryWrapper<CmmsSpotcheckTitem> titemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			titemLambdaQueryWrapper.eq(CmmsSpotcheckTitem::getSpotcheckid,id);
+			titemService.remove(titemLambdaQueryWrapper);
+			/**删附件上传记录表表数据*/
+			LambdaQueryWrapper<SysUploadFile> uploadFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			uploadFileLambdaQueryWrapper.eq(SysUploadFile::getRelid,id);
+			sysUploadFileService.remove(uploadFileLambdaQueryWrapper);
+		}
+
 		this.cmmsSpotcheckService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheck/convert/CmmsSpotcheckConvert.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.cmmsSpotcheck.convert;
+
+import org.jeecg.modules.cmmsSpotcheck.dto.CmmsSpotcheckAddDTO;
+import org.jeecg.modules.cmmsSpotcheck.entity.CmmsSpotcheck;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface CmmsSpotcheckConvert {
+
+    CmmsSpotcheckConvert INSTANCE = Mappers.getMapper(CmmsSpotcheckConvert.class);
+
+    CmmsSpotcheck convert(CmmsSpotcheckAddDTO dto);
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheck/dto/CmmsSpotcheckAddDTO.java

@@ -0,0 +1,65 @@
+package org.jeecg.modules.cmmsSpotcheck.dto;
+
+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.jeecg.modules.cmmsSpotcheckTitem.entity.CmmsSpotcheckTitem;
+import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class CmmsSpotcheckAddDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    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, dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @Dict(dictTable = "ems_tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @ApiModelProperty(value = "设备ID")
+    private java.lang.String equipmentid;
+    /**所属点检内容ID*/
+    @Excel(name = "所属点检内容ID", width = 15, dictTable = "ems_cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
+    @Dict(dictTable = "ems_cmms_spotcheck_content", dicText = "contentname", dicCode = "id")
+    @ApiModelProperty(value = "所属点检内容ID")
+    private java.lang.String spotcheckcontid;
+    /**点检时间*/
+    @Excel(name = "点检时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @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 spotcheckdate;
+    /**点检结果*/
+    @Excel(name = "点检结果", width = 15, dicCode = "spotcheck_result")
+    @Dict(dicCode = "spotcheck_result")
+    @ApiModelProperty(value = "点检结果")
+    private java.lang.String result;
+    /**点检描述*/
+    @Excel(name = "点检描述", width = 15)
+    @ApiModelProperty(value = "点检描述")
+    private java.lang.String description;
+
+    /** 设备点检-点检项信息 */
+    private List<CmmsSpotcheckTitem> cmmsSpotcheckTitemList;
+
+    /** 图片 */
+    private List<SysUploadFile> files;
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheck/service/impl/CmmsSpotcheckServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.cmmsSpotcheck.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.modules.cmmsSpotcheck.entity.CmmsSpotcheck;
 import org.jeecg.modules.cmmsSpotcheck.mapper.CmmsSpotcheckMapper;
 import org.jeecg.modules.cmmsSpotcheck.service.ICmmsSpotcheckService;
@@ -60,9 +61,9 @@ public class CmmsSpotcheckServiceImpl extends ServiceImpl<CmmsSpotcheckMapper, C
         CmmsSpotcheck cmmsSpotcheck = cmmsSpotcheckMapper.selectCmmsSpotcheckBySpotcheckid(spotcheckid);
 
         if (cmmsSpotcheck != null) {
-            Map<String, Object> titemMap = new HashMap<>();
-            titemMap.put("spotcheckid",spotcheckid);
-            titemList = titemMapper.selectByMap(titemMap);
+            LambdaQueryWrapper<CmmsSpotcheckTitem> titemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            titemLambdaQueryWrapper.eq(CmmsSpotcheckTitem::getSpotcheckid,spotcheckid);
+            titemList = titemMapper.selectList(titemLambdaQueryWrapper);
 
             /** 该点检内容id对应的图片集合 */
             SysUploadFile sysUploadFile = new SysUploadFile();
@@ -76,7 +77,7 @@ public class CmmsSpotcheckServiceImpl extends ServiceImpl<CmmsSpotcheckMapper, C
 
 
     /**
-     * 依据设备ID获取点击内容
+     * 依据设备ID获取点击内容(（新增设备点检时）)
      *
      * @param equipmentid 设备ID
      * @return 点检内容
@@ -92,16 +93,16 @@ public class CmmsSpotcheckServiceImpl extends ServiceImpl<CmmsSpotcheckMapper, C
 
         if (content != null) {
             /** 该点检内容id对应的 点检内容-点检项 集合 */
-            Map<String, Object> contentItemMap = new HashMap<>();
-            contentItemMap.put("spotcheckcontid",content.getId());
-            List<CmmsSpotcheckContentItem> contentItemList = contentItemMapper.selectByMap(contentItemMap);
+            LambdaQueryWrapper<CmmsSpotcheckContentItem> contentItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            contentItemLambdaQueryWrapper.eq(CmmsSpotcheckContentItem::getSpotcheckcontid,content.getId());
+            List<CmmsSpotcheckContentItem> contentItemList = contentItemMapper.selectList(contentItemLambdaQueryWrapper);
 
             /**组设备点检-点检项集合*/
             if(contentItemList!=null && contentItemList.size()>0){
                 for(CmmsSpotcheckContentItem contentItem: contentItemList){
-                    Map<String, Object> itemMap = new HashMap<>();
-                    itemMap.put("id",contentItem.getSpotcheckitemid());
-                    List<CmmsSpotcheckItem> itemList = itemMapper.selectByMap(itemMap);
+                    LambdaQueryWrapper<CmmsSpotcheckItem> itemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                    itemLambdaQueryWrapper.eq(CmmsSpotcheckItem::getId,contentItem.getSpotcheckitemid());
+                    List<CmmsSpotcheckItem> itemList = itemMapper.selectList(itemLambdaQueryWrapper);
                     CmmsSpotcheckItem item = new CmmsSpotcheckItem();
                     if(itemList!=null && itemList.size()>0) item = itemList.get(0);
                     CmmsSpotcheckTitem titem = CmmsSpotcheckTitemConvert.INSTANCE.convert(item,contentItem,content);