修改巡检路线添加点异常

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/EquipFeign.java

@@ -40,7 +40,7 @@ public interface EquipFeign {
 
 
     @RequestMapping(value = "${equip.fegin.prefix}"+"/warehouse-structure/gettree/{id}", method = RequestMethod.GET ,consumes="application/json")
-    LinkedHashMap<String,Object> gettreeWarehouse(@PathVariable Long id, @RequestParam(value = "bizOrgCode", required = true) String bizOrgCode, @RequestParam(value = "buildingId", required = false) String buildingId);
+    LinkedHashMap<String,Object> gettreeWarehouse(@PathVariable(value = "id") Long id, @RequestParam(value = "bizOrgCode", required = true) String bizOrgCode, @RequestParam(value = "buildingId", required = false) String buildingId);
 
 
     @RequestMapping(value = "${equip.fegin.prefix}"+"/building/getOne", method = RequestMethod.GET ,consumes="application/json")

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/IdxFeign.java

@@ -28,6 +28,6 @@ public interface IdxFeign {
      * @Date 2023/04/22 17:46
      */
     @PostMapping(value = "/defect/check/list")
-    FeignClientResult queryDefectByCodes(@RequestBody List<String> codes, @RequestParam String checkId);
+    FeignClientResult queryDefectByCodes(@RequestBody List<String> codes, @RequestParam (value="checkId") String checkId);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/JcsFeignClient.java

@@ -21,7 +21,7 @@ public interface JcsFeignClient {
      * @return AgencyUserModel 平台人员信息列表
      **/
     @RequestMapping(value = "/org-usr/amos/list/{orgUserId}", method = RequestMethod.GET)
-    ResponseModel<List<AgencyUserModel>> getAmosUserByUserId(@PathVariable String orgUserId);
+    ResponseModel<List<AgencyUserModel>> getAmosUserByUserId(@PathVariable(value="orgUserId") String orgUserId);
 
     /**
      * 根据机场单位id获取单位下人员列表
@@ -30,23 +30,23 @@ public interface JcsFeignClient {
      * @return Object 单位下人员列表
      **/
     @RequestMapping(value = "/org-usr/{companyId}/person/list", method = RequestMethod.GET)
-    ResponseModel<List<Map<String, Object>>> getPersonListByCompanyId(@PathVariable String companyId);
+    ResponseModel<List<Map<String, Object>>> getPersonListByCompanyId(@PathVariable(value="companyId") String companyId);
 
 
     /**
      * 查询本单位下及下级部门下的人员
      */
     @GetMapping(value = "/org-person/list")
-    ResponseModel<Page<Map<String, Object>>> listPage(@RequestParam Map<String, Object> requestBody);
+    ResponseModel<Page<Map<String, Object>>> listPage(@RequestParam(value="requestBody") Map<String, Object> requestBody);
 
     /**
      * 根据bizOrgCode查询公司部门
      */
     @GetMapping(value = "/org-usr/find/getByOrgCode")
-    ResponseModel<Object> getByOrgCode(@RequestParam String bizOrgCode);
+    ResponseModel<Object> getByOrgCode(@RequestParam(value="bizOrgCode") String bizOrgCode);
 
     @GetMapping(value = "/org-usr/company/bizOrgCode/list")
-    ResponseModel<Object> getCompanyByBizOrgCodeList(@RequestParam String bizOrgCode);
+    ResponseModel<Object> getCompanyByBizOrgCodeList(@RequestParam(value="bizOrgCode") String bizOrgCode);
 
     /**
      * 查询用户单位信息
@@ -54,7 +54,7 @@ public interface JcsFeignClient {
      * @return ResponseModel<ReginParams.PersonIdentity>
      */
     @GetMapping(value = "/org-person/getUser/{id}")
-    FeignClientResult selectById(@PathVariable String id);
+    FeignClientResult selectById(@PathVariable(value="id") String id);
 
     @PostMapping (value = "/org-person/getUserList")
     FeignClientResult<List<Map<String, Object>>> selectByIdList(@RequestBody List<String> id);
@@ -73,6 +73,6 @@ public interface JcsFeignClient {
     FeignClientResult<List<Map<String, Object>>> getDetByCompanyId();
 
     @GetMapping(value = "/org-person/listCompany/{bizOrgCode}")
-     Object listCompany(@PathVariable String bizOrgCode) ;
+     Object listCompany(@PathVariable(value="bizOrgCode") String bizOrgCode) ;
 }
 

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

 package com.yeejoin.amos.patrol.business.service.impl;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.InputItemMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.PointMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.RouteMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.RoutePointItemMapper;
-import com.yeejoin.amos.patrol.business.dao.repository.*;
+import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IPlanDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IPointClassifyDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IPointDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IPointInputItemDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IRouteDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointItemDao;
 import com.yeejoin.amos.patrol.business.param.RoutePageParam;
 import com.yeejoin.amos.patrol.business.service.intfc.IPlanService;
 import com.yeejoin.amos.patrol.business.service.intfc.IPlanTaskService;
@@ -18,17 +45,15 @@ import com.yeejoin.amos.patrol.core.common.request.RoutePointInputItemRequest;
 import com.yeejoin.amos.patrol.core.common.response.RoutePointRespone;
 import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
 import com.yeejoin.amos.patrol.core.util.query.BaseQuerySpecification;
-import com.yeejoin.amos.patrol.dao.entity.*;
+import com.yeejoin.amos.patrol.dao.entity.InputItem;
+import com.yeejoin.amos.patrol.dao.entity.Plan;
+import com.yeejoin.amos.patrol.dao.entity.Point;
+import com.yeejoin.amos.patrol.dao.entity.PointClassify;
+import com.yeejoin.amos.patrol.dao.entity.PointInputItem;
+import com.yeejoin.amos.patrol.dao.entity.Route;
+import com.yeejoin.amos.patrol.dao.entity.RoutePoint;
+import com.yeejoin.amos.patrol.dao.entity.RoutePointItem;
 import com.yeejoin.amos.patrol.exception.YeeException;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.*;
 
 @Service("routeService")
 public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implements IRouteService {
@@ -73,6 +98,7 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
 
     @Autowired
     private IRoutePointItemDao iRoutePointItemDao;
+    
 
 
     @Override
@@ -253,7 +279,10 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
                 points.add(rp);
                 pointIds.add(rp.getPointId());
             });
-            List<RoutePoint> savedPoints = iRoutePointDao.saveAll(points);
+            List<RoutePoint> savedPoints = new ArrayList<>();
+            for (RoutePoint routePoint: points) {
+            	savedPoints.add(iRoutePointDao.saveAndFlush(routePoint));
+               }
             List<Map<String, Object>> pointRefItem = pointMapper.getPointRefItem(pointIds);
             if (!savedPoints.isEmpty()) {
                 savedPoints.forEach(rp -> {
@@ -276,7 +305,7 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
                                 RoutePointItem item = new RoutePointItem();
                                 item.setPointInputItemId((Long) ref.get("id"));
                                 item.setRoutePointId(rp.getId());
-                                item.setPointClassifyId(ref.containsKey("classifyId")?Long.valueOf(ref.get("classifyId").toString()):null);
+                                item.setPointClassifyId(ref.containsKey("classifyId")&&StringUtils.isNotEmpty(ref.get("classifyId").toString())?Long.valueOf(ref.get("classifyId").toString()):null);
                                 item.setOrderNo(orderNum[0]++);
                                 item.setPointId(pointId);
                                 item.setIsDelete(false);
@@ -286,8 +315,7 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
                     });
                 });
                 if(!items.isEmpty()) {
-                    for (RoutePointItem routePointItem: items
-                         ) {
+                    for (RoutePointItem routePointItem: items) {
                         iRoutePointItemDao.saveAndFlush(routePointItem);
                     }
                 }