点检内容——根据设备id查询该设备现在点检内容已启用数量

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheckItem/controller/CmmsSpotcheckItemController.java

@@ -21,8 +21,10 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 点检项
@@ -40,6 +42,16 @@ public class CmmsSpotcheckItemController extends JeecgController<CmmsSpotcheckIt
 	@Autowired
 	private AutoCodeUtil autoCodeUtil;
 
+	/**
+	 * 根据设备id查询该设备现在点检内容已启用数量
+	 * */
+	@ApiOperation("根据设备id查询该设备现在点检内容已启用数量")
+	@GetMapping(value = "/numByEquipmentid/{equipmentid}")
+	public Result<Integer> numByEquipmentid(@PathVariable("equipmentid") String equipmentid){
+		return Result.OK(cmmsSpotcheckItemService.numByEquipmentid(equipmentid));
+	}
+
+
 	 /**
 	  * 依据设备ID获取点检项信息
 	  */
@@ -65,7 +77,9 @@ public class CmmsSpotcheckItemController extends JeecgController<CmmsSpotcheckIt
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		CmmsSpotcheckItem cmmsSpotcheckItem1 = CmmsSpotcheckItemConvert.INSTANCE.convert(cmmsSpotcheckItem.getEquipmenttreeid(),cmmsSpotcheckItem.getItemtype());
+		CmmsSpotcheckItem cmmsSpotcheckItem1 = new CmmsSpotcheckItem();
+		cmmsSpotcheckItem1.setEquipmenttreeid(cmmsSpotcheckItem.getEquipmenttreeid());
+		cmmsSpotcheckItem1.setItemtype(cmmsSpotcheckItem.getItemtype());
 		QueryWrapper<CmmsSpotcheckItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsSpotcheckItem1, req.getParameterMap());
 		queryWrapper.like(cmmsSpotcheckItem.getItemcode()!=null && !"".equals(cmmsSpotcheckItem.getItemcode()),"itemcode",cmmsSpotcheckItem.getItemcode());
 		queryWrapper.like(cmmsSpotcheckItem.getItemname()!=null && !"".equals(cmmsSpotcheckItem.getItemname()),"itemname",cmmsSpotcheckItem.getItemname());
@@ -87,11 +101,16 @@ public class CmmsSpotcheckItemController extends JeecgController<CmmsSpotcheckIt
 	//@RequiresPermissions("org.jeecg.modules:ems_cmms_spotcheck_item:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody CmmsSpotcheckItem cmmsSpotcheckItem) {
-		//生成点检项编号
-		if (cmmsSpotcheckItem.getItemcode() == null || "".equals(cmmsSpotcheckItem.getItemcode())) {
-			cmmsSpotcheckItem.setItemcode(autoCodeUtil.genSerialCode(UserConstants.CMMSSPOTCHECKITEM_CODE, null));
+		List<CmmsSpotcheckItem> list = new ArrayList<>();
+		if(cmmsSpotcheckItem.getEquipmenttreeid()!=null && !"".equals(cmmsSpotcheckItem.getEquipmenttreeid())){
+			String[] strings = cmmsSpotcheckItem.getEquipmenttreeid().split(",");
+			for(String equipmenttreeid : strings){
+				String itemcode = autoCodeUtil.genSerialCode(UserConstants.CMMSSPOTCHECKITEM_CODE, null);
+				CmmsSpotcheckItem item = CmmsSpotcheckItemConvert.INSTANCE.convert(cmmsSpotcheckItem, itemcode, equipmenttreeid);
+				list.add(item);
+			}
 		}
-		cmmsSpotcheckItemService.save(cmmsSpotcheckItem);
+		cmmsSpotcheckItemService.saveBatch(list);
 		return Result.OK("添加成功！");
 	}
 

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheckItem/convert/CmmsSpotcheckItemConvert.java

@@ -16,7 +16,5 @@ public interface CmmsSpotcheckItemConvert {
 
 
     @Mapping(target ="equipmenttreeid",source ="equipmenttreeid")
-    @Mapping(target ="itemtype",source ="itemtype")
-//    @Mapping(target = "otherField1", ignore = true)
-    CmmsSpotcheckItem convert(String equipmenttreeid,String itemtype);
+    CmmsSpotcheckItem convert( CmmsSpotcheckItem cmmsSpotcheckItem,String itemcode,String equipmenttreeid);
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheckItem/mapper/CmmsSpotcheckItemMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.cmmsSpotcheckItem.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.cmmsSpotcheckItem.entity.CmmsSpotcheckItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,6 +15,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CmmsSpotcheckItemMapper extends BaseMapper<CmmsSpotcheckItem> {
 
+
+    /**
+     * 根据设备id查询该设备现在点检内容已启用数量
+     * */
+    @Select("select count(1) from ems_cmms_spotcheck_content " +
+            "where equipmentid=#{equipmentid} and status='0'")
+    public int numByEquipmentid(String equipmentid);
+
     /**
      * 查询点检项列表
      *

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheckItem/service/ICmmsSpotcheckItemService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.cmmsSpotcheckItem.service;
 
 import org.jeecg.modules.cmmsSpotcheckItem.entity.CmmsSpotcheckItem;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -14,6 +15,11 @@ import java.util.List;
 public interface ICmmsSpotcheckItemService extends IService<CmmsSpotcheckItem> {
 
     /**
+     * 根据设备id查询该设备现在点检内容已启用数量
+     * */
+    public int numByEquipmentid(String equipmentid);
+
+    /**
      * 查询点检项列表
      *
      * @param equipmentid 设备ID

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsSpotcheckItem/service/impl/CmmsSpotcheckItemServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,6 +29,13 @@ public class CmmsSpotcheckItemServiceImpl extends ServiceImpl<CmmsSpotcheckItemM
     private CmmsSpotcheckItemMapper spotcheckItemMapper;
 
     /**
+     * 根据设备id查询该设备现在点检内容已启用数量
+     * */
+    public int numByEquipmentid(String equipmentid){
+        return spotcheckItemMapper.numByEquipmentid(equipmentid);
+    }
+
+    /**
      * 查询点检项列表
      *
      * @param equipmentid 设备ID