修改巡检代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/InputItemMapper.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Repository;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @Repository
 @Mapper
@@ -61,7 +62,7 @@ public interface InputItemMapper extends BaseMapper<InputItem> {
 
     public List<PointInputItemVo> queryCustomInputItem( HashMap<String, Object> param );
 
-    List<PointInputItemVo> queryCustomInputItemByCodes(@Param("inputItemNos") List<String> inputItemNos);
+    List<PointInputItemVo> queryCustomInputItemByCodes(@Param("inputItemNos") Set<String> inputItemNos);
 
     public List<InputItemVo> getInputItemListByitemNos(@Param("itemNos") String[] itemNos);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -47,6 +47,7 @@ import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -282,60 +283,67 @@ public class PointServiceImpl implements IPointService {
             ids.add(point.getId());
 
             if (StringUtil.isNotEmpty(param.getEquipInputInfo())) {
-                String[] infos = param.getEquipInputInfo().split("\\|");
-                for (int i = 0; i < infos.length; i++) {
-                    String[] split = infos[i].split(":");
-                    String equipCode = split[0];
-                    List<String> inputItemCodes = Arrays.asList(split[1].split(","));
-                    List<RoutePoint> routePointList = iRoutePointDao.queryByPointId(point.getId());
-                    HashMap<String, String> equipByCode = routePointItemMapper.getEquipByCode(equipCode);
-                    if (ObjectUtils.isEmpty(equipByCode)) {
-                        throw new BadRequest("装备编码不存在");
-                    }
-                    PointClassify newPointClassify = new PointClassify();
-                    newPointClassify.setEquipmentId(equipByCode.get("equipmentId"));
-                    newPointClassify.setName(equipByCode.get("name"));
+                String[] info = param.getEquipInputInfo().split("\\|");
+                Set<String> infos=new HashSet<>();
+                Collections.addAll(infos,info);
+                for (String e : infos) {
+                        String[] split = e.split(":");
+                        String equipCode = split[0];
+                         Set<String> inputItemCodes = new HashSet<>(Arrays.asList(split[1].split(",")));
+                   //     List<String> inputItemCodes = Arrays.asList(split[1].split(","));
+                        List<RoutePoint> routePointList = iRoutePointDao.queryByPointId(point.getId());
+                        HashMap<String, String> equipByCode = routePointItemMapper.getEquipByCode(equipCode);
+                        if (ObjectUtils.isEmpty(equipByCode)) {
+                            throw new BadRequest("装备编码不存在");
+                        }
+                        PointClassify newPointClassify = new PointClassify();
+                        newPointClassify.setEquipmentId(equipByCode.get("equipmentId"));
+                        newPointClassify.setName(equipByCode.get("name"));
 //                        newPointClassify.setInspectionSpecName();
-                    newPointClassify.setCreatorId(userId);
-                    newPointClassify.setPointId(point.getId());
-                    newPointClassify.setOrderNo(0);
-                    newPointClassify.setDataSourceCode("1");
-                    newPointClassify.setDataSourceName("消防装备");
-                    newPointClassify.setAddress(equipByCode.get("address"));
-                    newPointClassify.setBuildingId(String.valueOf(equipByCode.get("sourceId")));
-                    String uuid = UUID.randomUUID().toString().replace("-", "");
-                    newPointClassify.setOriginalId(uuid.substring(0, 16));
-                    newPointClassify.setCategoryCode(equipByCode.get("categoryCode"));
-                    newPointClassify.setCategoryName(equipByCode.get("categoryName"));
-                    newPointClassify.setCode(equipByCode.get("code"));
-                    newPointClassify.setBuildingName(equipByCode.get("fullName"));
-                    List<PointClassify> pointClassifies = iPointClassifyDao.queryByPointIdAndEquipmentId(point.getId(), equipByCode.get("equipmentId"));
-                    if (!CollectionUtils.isEmpty(pointClassifies)) {
-                        newPointClassify.setId(pointClassifies.get(0).getId());
-                    }
-                    this.addPointClassifyByPointId(newPointClassify);
-                    List<PointInputItemVo> customInputList = inputItemMapper.queryCustomInputItemByCodes(inputItemCodes);
-                    for (PointInputItemVo pItemVo : customInputList) {
-                        PointInputItem pointInputItem = new PointInputItem();
-                        pointInputItem.setPointId(newPointClassify.getPointId());
-                        pointInputItem.setInputItemId(pItemVo.getId());
-                        pointInputItem.setClassifyIds(Long.valueOf(newPointClassify.getId()).toString());
-                        pointInputItem.setId(0);
-                        pointInputItem.setOrderNo(pItemVo.getpOrderNo());
-                        PointInputItem pointInputItemResult = iPointInputItemDao.saveAndFlush(pointInputItem);
-                        //更新巡检路线
-                        if (routePointList.size() > 0) {
-                            Long classifyId = newPointClassify.getId();
-                            for (RoutePoint routePoint : routePointList) {
-                                RoutePointItem routePointItem = new RoutePointItem();
-                                routePointItem.setPointClassifyId(classifyId);
-                                routePointItem.setPointInputItemId(pointInputItemResult.getId());
-                                routePointItem.setRoutePointId(routePoint.getId());
-                                iRoutePointItemDao.save(routePointItem);
+                        newPointClassify.setCreatorId(userId);
+                        newPointClassify.setPointId(point.getId());
+                        newPointClassify.setOrderNo(0);
+                        newPointClassify.setDataSourceCode("1");
+                        newPointClassify.setDataSourceName("消防装备");
+                        newPointClassify.setAddress(equipByCode.get("address"));
+                        newPointClassify.setBuildingId(String.valueOf(equipByCode.get("sourceId")));
+                        String uuid = UUID.randomUUID().toString().replace("-", "");
+                        newPointClassify.setOriginalId(uuid.substring(0, 16));
+                        newPointClassify.setCategoryCode(equipByCode.get("categoryCode"));
+                        newPointClassify.setCategoryName(equipByCode.get("categoryName"));
+                        newPointClassify.setCode(equipByCode.get("code"));
+                        newPointClassify.setBuildingName(equipByCode.get("fullName"));
+                        List<PointClassify> pointClassifies = iPointClassifyDao.queryByPointIdAndEquipmentId(point.getId(), equipByCode.get("equipmentId"));
+                        if (!CollectionUtils.isEmpty(pointClassifies)) {
+                            newPointClassify.setId(pointClassifies.get(0).getId());
+                        }
+                        this.addPointClassifyByPointId(newPointClassify);
+                        List<PointInputItemVo> customInputList = inputItemMapper.queryCustomInputItemByCodes(inputItemCodes);
+                        if (ValidationUtil.isEmpty(customInputList) || customInputList.size() < inputItemCodes.size()) {
+                            throw new BadRequest(split[1]+"中存在不正确的检查项编号");
+                        }
+                        for (PointInputItemVo pItemVo : customInputList) {
+                            PointInputItem pointInputItem = new PointInputItem();
+                            pointInputItem.setPointId(newPointClassify.getPointId());
+                            pointInputItem.setInputItemId(pItemVo.getId());
+                            pointInputItem.setClassifyIds(Long.valueOf(newPointClassify.getId()).toString());
+                            pointInputItem.setId(0);
+                            pointInputItem.setOrderNo(pItemVo.getpOrderNo());
+                            PointInputItem pointInputItemResult = iPointInputItemDao.saveAndFlush(pointInputItem);
+                            //更新巡检路线
+                            if (routePointList.size() > 0) {
+                                Long classifyId = newPointClassify.getId();
+                                for (RoutePoint routePoint : routePointList) {
+                                    RoutePointItem routePointItem = new RoutePointItem();
+                                    routePointItem.setPointClassifyId(classifyId);
+                                    routePointItem.setPointInputItemId(pointInputItemResult.getId());
+                                    routePointItem.setRoutePointId(routePoint.getId());
+                                    iRoutePointItemDao.save(routePointItem);
+                                }
                             }
                         }
-                    }
                 }
+
             }
 
             String inputItems = param.getInputItems();