巡检bug1104

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -445,7 +445,9 @@ public class PointController extends AbstractBaseController {
 				map = pointMapper.getPointById(Long.valueOf(pointId));
 			}
 			ReginParams reginParams = getSelectedOrgInfo();
-			return CommonResponseUtil.success(equipFeign.gettreeWarehouse(Long.valueOf(String.valueOf(map.get("buildingId"))), reginParams.getPersonIdentity().getCompanyBizOrgCode(),map.get("buildingId").toString()));
+			//顶节点ID
+			Long parentId = StringUtils.isEmpty(String.valueOf(map.get("buildingId"))) ? 0 : Long.parseLong(String.valueOf(map.get("buildingId")));
+			return CommonResponseUtil.success(equipFeign.gettreeWarehouse(parentId, reginParams.getPersonIdentity().getCompanyBizOrgCode(),map.get("buildingId").toString()));
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return CommonResponseUtil.failure("查询巡检点失败");

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/RouteController.java

 package com.yeejoin.amos.patrol.business.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -155,7 +149,7 @@ public class RouteController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "查询当前登录公司的的所有巡检路线", notes = "查询当前登录公司的的所有巡检路线")
 	@GetMapping(value = "/AllNew", produces = "application/json;charset=UTF-8")
-	public CommonResponse queryAllRouteNew() {
+	public CommonResponse queryAllRouteNew(@ApiParam(value = "是否是迁移巡查点页面 （1-是  0或空-不是）") @RequestParam(required = false) Integer isRemove) {
 		try {
 
 			ReginParams reginParams = getSelectedOrgInfo();
@@ -163,7 +157,7 @@ public class RouteController extends AbstractBaseController {
 			//2.查询
 			List<Route> routeList = routeService.queryRouteListNew(orgCode);
 			List<Route> list = routeList.stream().filter(e -> e.getIsExist().equals("true")).collect(Collectors.toList());
-			return CommonResponseUtil.success(list);
+			return CommonResponseUtil.success(!Objects.isNull(isRemove) && 1 == isRemove ? routeList : list);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return CommonResponseUtil.failure("查询巡检路线信息失败");

amos-boot-system-patrol/src/main/resources/db/mapper/routeMapper.xml

@@ -107,7 +107,8 @@
 		            r.tel,
 		            r.remark,
 		            r.dept_name deptName,
-		            r.boss_name bossName
+		            r.boss_name bossName,
+					ifnull(r.biz_org_code, "") as bizOrgCode
 		        FROM
 		            `p_route` r	
 		        WHERE