巡检模块代码物理合并1

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentManageVo.java

@@ -127,4 +127,6 @@ public class EquipmentManageVo  implements Serializable {
     private String address;
 
     private String fullName;
+
+    private String categoryCode;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -457,6 +457,9 @@ public class OrgPersonController extends BaseController {
     @RequestMapping(value = "/listCompany/{bizOrgCode}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "查询当前单位或部门自己的人员列表 非父子级", notes = "根据bizOrgCode查询")
     public List<OrgUsr>  listCompany(@PathVariable String bizOrgCode) {
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            return null;
+        }
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(BaseEntity::getIsDelete,false);
         wrapper.likeRight(OrgUsr::getBizOrgCode,bizOrgCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -10,6 +10,11 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +55,8 @@ import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
+import javax.annotation.Resource;
+
 /**
  * 重点部位服务实现类
  *
@@ -83,6 +90,10 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	@Autowired
 	private RedisUtils redisUtils;
 
+
+	@Resource
+	DataDictionaryMapper dataDictionaryMapper;
+
 	/**
 	 * 分页查询
 	 */
@@ -279,6 +290,19 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		return keySiteMapper.getSequenceNbr(sequenceNbr);
 	}
 
+
+	private String[] getDataDictionary(String type) {
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.orderByAsc("sort_num");
+		List<DataDictionary> list = dataDictionaryMapper.selectList(queryWrapper);
+		List<String> names = list.stream().map(dataDictionary -> {
+			return dataDictionary.getName() + "@" + dataDictionary.getCode();
+		}).collect(Collectors.toList());
+		String[] str = names.toArray(new String[names.size()]);
+		return str;
+	}
+
 	@Override
 	public boolean saveExcel(List<KeySiteExcleDto> excelDtoList) {
 		Map<String, String> maps = getAllBuildingIdForParentBuilingIds(excelDtoList);
@@ -291,6 +315,11 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		List<OrgUsr> comDeptList = orgUsrMapper.companyTreeByUserAndType(param);
 		Map<Long, OrgUsr> comDeptMap = comDeptList.stream()
 				.collect(Collectors.toMap(BaseEntity::getSequenceNbr, Function.identity()));
+		//耐火等级
+		String[] nhdjs = getDataDictionary("NHDJ");
+		//使用性质
+		String[] jzwsyxzs = getDataDictionary("JZWSYXZ");
+
 		for (KeySiteExcleDto keySiteExcleDto : excelDtoList) {
 			KeySite keySiteDto = new KeySite();
 			Bean.copyExistPropertis(keySiteExcleDto, keySiteDto);
@@ -315,6 +344,9 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 			}
 			if (StringUtils.isNotBlank(keySiteExcleDto.getFireEnduranceRate())
 					&& keySiteExcleDto.getFireEnduranceRate().contains("@")) {
+				if (!ArrayUtils.contains(nhdjs, keySiteExcleDto.getFireEnduranceRate())) {
+					throw new BadRequest("请检查耐火等级选择是否正确");
+				}
 				String[] fireEnduranceRateArray = keySiteExcleDto.getFireEnduranceRate().split("@");
 				if (fireEnduranceRateArray.length > 1) {
 					keySiteDto.setFireEnduranceRate(fireEnduranceRateArray[1]);
@@ -323,6 +355,9 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 			}
 			if (StringUtils.isNotBlank(keySiteExcleDto.getUseNature())
 					&& keySiteExcleDto.getUseNature().contains("@")) {
+				if (!ArrayUtils.contains(jzwsyxzs, keySiteExcleDto.getUseNature())) {
+					throw new BadRequest("请检查使用性质选择是否正确");
+				}
 				String[] useNatureArray = keySiteExcleDto.getUseNature().split("@");
 				if (useNatureArray.length > 1) {
 					keySiteDto.setUseNature(useNatureArray[1]);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2856,7 +2856,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		Map<String, Object> param = new HashMap<>();
 		// 权限处理
 		PermissionInterceptorContext.setDataAuthRule(authKey);
-		param.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());
+		param.put("bizOrgCode", reginParams.getPersonIdentity().getCompanyBizOrgCode());
 		List<OrgUsr> list = orgUsrMapper.companyDeptListWithPersonCount(param);
 		return buildTreeParallel(list);
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1584,7 +1584,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         //如果传递的为部门bizOrgCode 取其上级单位下的建筑
          ResponseModel<OrgUsrDto> companyByBizOrgCodeList = jcsFeign.getCompanyByBizOrgCodeList(bizOrgCode);
           String companyCode = companyByBizOrgCodeList.getResult().getBizOrgCode();
-        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true, bizOrgCode);
+        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true, companyCode);
         List<BuildingTreeVo> orgBuildingTreeVos = buildingTreeVos.stream().filter(b-> b.getBizOrgCode() != null && b.getBizOrgCode().startsWith(companyCode)).collect(Collectors.toList());
 
 
@@ -1599,7 +1599,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         //如果传递的为部门bizOrgCode 取其上级单位下的建筑
         ResponseModel<OrgUsrDto> companyByBizOrgCodeList = jcsFeign.getCompanyByBizOrgCodeList(bizOrgCode);
         String companyCode = companyByBizOrgCodeList.getResult().getBizOrgCode();
-        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true, bizOrgCode);
+        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true, companyCode);
         List<BuildingTreeVo> orgBuildingTreeVos = buildingTreeVos.stream().filter(b-> b.getBizOrgCode() != null && b.getBizOrgCode().startsWith(companyCode)).collect(Collectors.toList());
         return orgBuildingTreeVos;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/WarehouseStructureServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.google.common.base.Joiner;
 import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
@@ -96,11 +92,11 @@ public class WarehouseStructureServiceImpl extends ServiceImpl<WarehouseStructur
                         one.eq("id",ids);
                     }
                 }
-                one.eq("warehouse_id", warehouseId);
+                one.eq("warehouse_id", 0);
                 list = warehouseStructureMapper.selectList(one);
             }
             QueryWrapper<WarehouseStructure> one1 = new QueryWrapper<>();
-            one1.eq("warehouse_id", warehouseId);
+            one1.eq("warehouse_id", 0);
             one1.eq("id", buildingId);
             list.addAll( warehouseStructureMapper.selectList(one1));
         }else {
@@ -110,7 +106,7 @@ public class WarehouseStructureServiceImpl extends ServiceImpl<WarehouseStructur
              list = warehouseStructureMapper.selectList(one);
 
         }
-        list = buildByRecursive(list, warehouseId);
+        list = buildByRecursiveTwo(list, warehouseId);
             return list;
     }
 
@@ -171,6 +167,30 @@ public class WarehouseStructureServiceImpl extends ServiceImpl<WarehouseStructur
     }
 
     /**
+     * 使用递归方法建树
+     *
+     * @param treeNodes
+     * @return
+     */
+    private List<WarehouseStructure> buildByRecursiveTwo(List<WarehouseStructure> treeNodes,Long id) {
+        List<WarehouseStructure> trees = new ArrayList<WarehouseStructure>();
+        if (!Objects.isNull(id) && id != 0) {
+            for (WarehouseStructure treeNode : treeNodes) {
+                if (treeNode.getId().equals(id)) {
+                    trees.add(findChildren(treeNode, treeNodes));
+                }
+            }
+        } else {
+            for (WarehouseStructure treeNode : treeNodes) {
+                if (null == treeNode.getParentId() || id.equals(treeNode.getParentId())) {
+                    trees.add(findChildren(treeNode, treeNodes));
+                }
+            }
+        }
+        return trees;
+    }
+
+    /**
      * 递归查找子节点
      * 
      * @param treeNodes

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

@@ -173,8 +173,7 @@ public class PlanController extends AbstractBaseController {
                 }
             }
             map.put("param", param);
-            planService.addPlan(map);
-            return CommonResponseUtil.success();
+            return CommonResponseUtil.success(planService.addPlan(map));
         } 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/PointController.java

@@ -340,6 +340,10 @@ public class PointController extends AbstractBaseController {
 				if(pointClassify.getId()!=null){
 					newPointClassify.setId(pointClassify.getId());
 				}
+				List<PointClassify> pointClassifies = iPointClassifyDao.queryByPointIdAndEquipmentId(pointClassify.getPointId(), pointClassify.getEquipmentId());
+				if (pointClassifies.size() > 0) {
+					return CommonResponseUtil.failure("该巡查对象已存在，不可再添加！");
+				}
 				iPointService.addPointClassifyByPointId(newPointClassify);
 
 				List<PointInputItemVo> customInputList = pointClassify.getEquipIputDetailData();//巡检项
@@ -441,8 +445,9 @@ public class PointController extends AbstractBaseController {
 				map = pointMapper.getPointById(Long.valueOf(pointId));
 			}
 			ReginParams reginParams = getSelectedOrgInfo();
-			return CommonResponseUtil.success(equipFeign.gettreeWarehouse(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("查询巡检点失败");
@@ -881,29 +886,36 @@ public class PointController extends AbstractBaseController {
 			downData.add(new String[0]);
 		}
 		//责任人
-		Object o = jcsFeignClient.listCompany(reginParams.getPersonIdentity().getBizOrgCode());
-		List<Map<String,String>> personlist = (List<Map<String,String>>)o;
-		String[] person = new String[personlist.size()];
-		if (CollectionUtils.isNotEmpty(personlist)){
-			for (int i = 0; i < personlist.size(); i++) {
-				person[i] = personlist.get(i).get("bizOrgName")+"@"+personlist.get(i).get("sequenceNbr")+"@"+personlist.get(i).get("parentName");
+		if (!StringUtils.isEmpty(reginParams.getPersonIdentity().getBizOrgCode())) {
+			Object o = jcsFeignClient.listCompany(reginParams.getPersonIdentity().getBizOrgCode());
+			List<Map<String,String>> personlist = (List<Map<String,String>>)o;
+			String[] person = new String[personlist.size()];
+			if (CollectionUtils.isNotEmpty(personlist)){
+				for (int i = 0; i < personlist.size(); i++) {
+					person[i] = personlist.get(i).get("bizOrgName")+"@"+personlist.get(i).get("sequenceNbr")+"@"+personlist.get(i).get("parentName");
+				}
+				downData.add(person);
+			} else {
+				downData.add(new String[0]);
 			}
-			downData.add(person);
-		}else {
+		} else {
 			downData.add(new String[0]);
 		}
-
-		//所在建筑
-		FeignClientResult result = equipFeign.myTreeList();
-		Object obj = result.getResult();
-		List<Map<String,Object>> treeMap = (List<Map<String,Object>>)obj;
-		String[] build = new String[treeMap.size()];
-		if (CollectionUtils.isNotEmpty(treeMap)){
-			for (int i = 0; i < treeMap.size(); i++) {
-				build[i] = treeMap.get(i).get("instanceName")+"@"+treeMap.get(i).get("instanceId");
+		if (!StringUtils.isEmpty(reginParams.getPersonIdentity().getBizOrgCode())) {
+			//所在建筑
+			FeignClientResult result = equipFeign.myTreeList();
+			Object obj = result.getResult();
+			List<Map<String, Object>> treeMap = (List<Map<String, Object>>) obj;
+			String[] build = new String[treeMap.size()];
+			if (CollectionUtils.isNotEmpty(treeMap)) {
+				for (int i = 0; i < treeMap.size(); i++) {
+					build[i] = treeMap.get(i).get("instanceName") + "@" + treeMap.get(i).get("instanceId");
+				}
 			}
+			downData.add(build);
+		} else {
+			downData.add(new String[0]);
 		}
-		downData.add(build);
 		String [] downRows = {"2","3","4", "8","11","12","13","14"}; //下拉的列序号数组(序号从0开始)
 
 		try {
@@ -1559,7 +1571,7 @@ public class PointController extends AbstractBaseController {
 	@ApiOperation(value = "查询巡检点信息", notes = "查询巡检点信息")
 	@PostMapping(value = "/listNew", produces = "application/json;charset=UTF-8")
 	public CommonResponse listPointNew(
-			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false)  Point point,
+			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false)  PointQueryVo point,
 			@RequestParam(value = "pageNumber", defaultValue = "1") int current,
 			@RequestParam(value = "pageSize", defaultValue = "10") int size) {
 		ReginParams reginParams = getSelectedOrgInfo();

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;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.patrol.business.dao.mapper.RoutePointItemMapper;
 import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IRouteDao;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
 import com.yeejoin.amos.patrol.business.service.impl.RouteServiceImpl;
 import org.apache.commons.lang3.StringUtils;
@@ -86,6 +81,10 @@ public class RouteController extends AbstractBaseController {
 	private IRoutePointDao iRoutePointDao;
 	@Autowired
 	private RouteServiceImpl routeServiceImpl;
+
+
+	@Autowired
+	private IRouteDao iRouteDao;
 	/**
 	 *
 	 * 新增接口
@@ -99,15 +98,16 @@ public class RouteController extends AbstractBaseController {
 			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) RoutePageParam queryRequests,
 			@ApiParam(value = "分页参数", required = true, defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable) {
 		try {
-			ReginParams reginParams = getSelectedOrgInfo();
-			//获取所在公司code
-			String bizOrgCode=reginParams.getPersonIdentity().getBizOrgCode();
-			queryRequests.setBizOrgCode(bizOrgCode);
-			if(commonPageable !=null){
-				queryRequests.setPageNumber(commonPageable.getPageNumber()-1);
+			if (org.springframework.util.StringUtils.isEmpty(queryRequests.getBizOrgCode())) {
+				ReginParams reginParams = getSelectedOrgInfo();
+				//获取所在公司code
+				String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+				queryRequests.setBizOrgCode(bizOrgCode);
+			}
+			if (commonPageable != null) {
+				queryRequests.setPageNumber(commonPageable.getPageNumber() - 1);
 				queryRequests.setPageSize(commonPageable.getPageSize());
 			}
-
 			Page<HashMap<String, Object>> routeList = routeService.getRouteInfo(null,null,null,queryRequests);
 
 			return CommonResponseUtil.success(routeList);
@@ -145,7 +145,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();
@@ -153,7 +153,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("查询巡检路线信息失败");
@@ -175,9 +175,7 @@ public class RouteController extends AbstractBaseController {
 
 
 			if(!StringUtils.isEmpty(route.getName())){
-				LambdaQueryWrapper<Route> wrapper = new LambdaQueryWrapper<>();
-				wrapper.eq(Route::getName,route.getName());
-				List<Route> list = routeServiceImpl.list(wrapper);
+				List<Route> list = iRouteDao.getListByName(route.getName());
 				if (!ObjectUtils.isEmpty(list) || list.size()>0){
 					throw new BadRequest("该名称路线已存在");
 				}

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

@@ -6,7 +6,7 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemNewVo;
+import com.yeejoin.amos.patrol.business.vo.*;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.dao.entity.Point;
 import org.apache.ibatis.annotations.Param;
@@ -14,9 +14,6 @@ import org.apache.ibatis.annotations.Param;
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckPtListBo;
 import com.yeejoin.amos.patrol.business.param.CheckPtListPageParam;
 import com.yeejoin.amos.patrol.business.param.PointImportQueryParam;
-import com.yeejoin.amos.patrol.business.vo.LeavelMovePointVo;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
-import com.yeejoin.amos.patrol.business.vo.PointVo;
 import com.yeejoin.amos.patrol.core.common.response.PointResponse;
 import com.yeejoin.amos.patrol.dao.entity.PointConfig;
 import com.yeejoin.amos.patrol.dao.entity.PointPhoto;
@@ -53,9 +50,9 @@ public interface PointMapper extends BaseMapper {
 	List<PointInputItemVo> getPointClassInputItemById(@Param(value = "pointId") Long pointId);
 
 
-	List<Point> listByParams(Point pointParams, Page page);
+	List<Point> listByParams(PointQueryVo pointParams, Page page);
 
-	int listByParamsCount(Point pointParams);
+	int listByParamsCount(PointQueryVo pointParams);
 
 	/**
 	 * 根据点ID获取点图片信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IRouteDao.java

@@ -22,4 +22,7 @@ public interface IRouteDao extends BaseDao<Route, Long> {
 
     @Query(value = "select * from p_route where original_id in ?1 and is_delete =0", nativeQuery = true)
     List<Route> listByOriginalIds(List<String> originalIds);
+
+    @Query(value = "select * from p_route where `name` = ?1 and is_delete =0", nativeQuery = true)
+    List<Route> getListByName(String name);
 }

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

@@ -2,10 +2,7 @@ package com.yeejoin.amos.patrol.business.feign;
 
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -44,8 +41,8 @@ public interface EquipFeign {
     LinkedHashMap<String,Object> getRegionTress();
 
 
-    @RequestMapping(value = "${equip.fegin.prefix}"+"/warehouse-structure/gettree/0", method = RequestMethod.GET ,consumes="application/json")
-    LinkedHashMap<String,Object> gettreeWarehouse(@RequestParam(value = "bizOrgCode", required = true) String bizOrgCode,@RequestParam(value = "buildingId", required = false) String buildingId);
+    @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);
 
 
     @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/param/PlanTaskPageParam.java

@@ -54,6 +54,16 @@ public class PlanTaskPageParam extends CommonPageable {
 	 * */
 	private String bizOrgCode;
 
+	private String searchDay;
+
+	public String getSearchDay() {
+		return searchDay;
+	}
+
+	public void setSearchDay(String searchDay) {
+		this.searchDay = searchDay;
+	}
+
 	public String getBizOrgCode() {
 		return bizOrgCode;
 	}

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

@@ -45,7 +45,7 @@ public class PlanServiceImpl implements IPlanService {
 	}
 
 	@Override
-	public void addPlan(HashMap<String, Object> map) {
+	public Plan addPlan(HashMap<String, Object> map) {
 		Plan param =  (Plan) map.get("param");
 
 		String userDept = param.getUserDept();
@@ -84,7 +84,7 @@ public class PlanServiceImpl implements IPlanService {
 			param.setDayBegin(DateUtil.formatStrToTime("00:00:00"));
 			param.setDayEnd(DateUtil.formatStrToTime("23:59:59"));
 		}
-		planDao.save(param);
+		return planDao.save(param);
 	}
 
 	@Override

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

@@ -841,12 +841,14 @@ public class PointServiceImpl implements IPointService {
         String excludeItems = list.get(0).getExcludeItems();
         if(excludeItems!=null){
             resList.forEach(e->{
-                if("WGJC".equals(e.get("input_classify").toString())){
-                    e.put("input_classify","外观检查");
-                }else if("GNCS".equals(e.get("input_classify").toString())){
-                    e.put("input_classify","功能测试");
-                }else if("HJJC".equals(e.get("input_classify").toString())){
-                    e.put("input_classify","环境检查");
+                if (e.containsKey("input_classify")) {
+                    if ("WGJC".equals(e.get("input_classify").toString())) {
+                        e.put("input_classify", "外观检查");
+                    } else if ("GNCS".equals(e.get("input_classify").toString())) {
+                        e.put("input_classify", "功能测试");
+                    } else if ("HJJC".equals(e.get("input_classify").toString())) {
+                        e.put("input_classify", "环境检查");
+                    }
                 }else{
                     e.put("input_classify","其他");
                 }
@@ -1951,7 +1953,7 @@ public class PointServiceImpl implements IPointService {
     }
 
 /*13迭代新增列表方法*/
-    public IPage<PointVo> queryPointInfoNew(Point pointParams, int current ,int size, String loginOrgCode) {
+    public IPage<PointVo> queryPointInfoNew(PointQueryVo pointParams, int current ,int size, String loginOrgCode) {
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<Object> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(current, size);
         List<Point> pointPage = pointMapper.listByParams(pointParams,page);
         int num = pointMapper.listByParamsCount(pointParams);

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

@@ -583,7 +583,7 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
            }else{
                RoutePoint.setExcludeItems(null);
            }
-            iRoutePointDao.save(RoutePoint);
+            iRoutePointDao.saveAndFlush(RoutePoint);
         }
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPlanService.java

@@ -21,7 +21,7 @@ public interface IPlanService {
 	 * 巡检计划新增及维护
 	 * @param map
 	 */
-	void addPlan(HashMap<String, Object> map);
+	Plan addPlan(HashMap<String, Object> map);
 	
 	/**
 	 * 巡检计划删除

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPointService.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckPtListBo;
 import com.yeejoin.amos.patrol.business.param.*;
 import com.yeejoin.amos.patrol.business.util.DaoCriteria;
-import com.yeejoin.amos.patrol.business.vo.LeavelMovePointVo;
-import com.yeejoin.amos.patrol.business.vo.PointClassifyVo;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
-import com.yeejoin.amos.patrol.business.vo.PointVo;
+import com.yeejoin.amos.patrol.business.vo.*;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.response.PointResponse;
 import com.yeejoin.amos.patrol.dao.entity.Point;
@@ -36,7 +33,7 @@ public interface IPointService {
  *
  */
 
-    IPage<PointVo> queryPointInfoNew(Point pointParams,int current,int size, String loginOrgCode);
+    IPage<PointVo> queryPointInfoNew(PointQueryVo pointParams, int current, int size, String loginOrgCode);
 
     /**
      * 添加巡检点

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/vo/PointQueryVo.java

+package com.yeejoin.amos.patrol.business.vo;
+
+
+import com.yeejoin.amos.patrol.dao.entity.BasicEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class PointQueryVo extends BasicEntity {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 参考地址
+     */
+    private String address;
+
+    /**
+     * 分类编号
+     */
+    private long catalogId;
+
+    /**
+     * 3维坐标(x,y,z)
+     */
+    private String coordinates;
+
+    /**
+     * 创建用户id
+     */
+    private String creatorId;
+
+    /**
+     * 有效巡检距离
+     */
+    private int distance;
+
+    /**
+     * 扩展字段
+     */
+    private String extendJson;
+
+    /**
+     * 定点拍照数
+     */
+    private int fixedShot;
+
+    /**
+     * 是否为固定点(1:固定点，0：移动点)
+     */
+    private String isFixed;
+
+    /**
+     * 无计划巡检是否评分(is_score = 1评分,0不评分)
+     */
+    private String isScore;
+
+    /**
+     * 最新更新时间
+     */
+    private Date lastUpdateTime;
+
+    /**
+     * 经度
+     */
+    private String latitude;
+
+    /**
+     * 风险等级(1:一级，2：二级，3：三级，4：四级，5：五级)
+     */
+    private String level;
+
+    /**
+     * 纬度
+     */
+    private String longitude;
+
+    /**
+     * 点名称
+     */
+    private String name;
+
+    /**
+     * 是否允许离线巡检
+     */
+    private Boolean offline;
+
+    /**
+     * 权限系统org code
+     */
+    private String orgCode;
+
+    /**
+     * 点编号
+     */
+    private String pointNo;
+
+    /**
+     * 备注说明
+     */
+    private String remark;
+
+    /**
+     * 路线id
+     */
+    private String routeId;
+
+    /**
+     * 路线名称
+     */
+    private String routeName;
+
+    /**
+     * 是否保存地理信(1:记录，0：不记录)
+     */
+    private String saveGps;
+
+    /**
+     * 最大拍照数
+     */
+    private int shotMaxNumber;
+
+    /**
+     * 最小拍照数
+     */
+    private int shotMinNumber;
+
+    /**
+     * 是否允许普通拍照(1：允许，0：不允许)
+     */
+    private String usuallyShot;
+
+    /**
+     * 是否删除：0表示未删除，1表示已删除
+     */
+    private boolean isDelete;
+
+    /**
+     * 归属区域/部门id
+     */
+    private String chargeDeptId ;
+
+    /**
+     * 负责人id
+     */
+    private String chargePersonId ;
+
+    /**
+     * 负责人id
+     */
+    private String chargePersonName ;
+
+
+    /**
+     * 状态：0 未纳入巡检，1 合格；2 不合格；3 漏检
+     */
+    private String status;
+
+    /**
+     * 3维模型楼层
+     */
+    private Integer floor;
+
+    /**
+     * 是否室内
+     */
+    private Boolean isIndoor;
+
+    /**
+     * 原始字段
+     */
+    private String originalId;
+
+    /**
+     * 风险源id
+     */
+    private String riskSourceId;
+
+    /**
+     * ue4位置
+     */
+
+    private String ue4Location;
+
+    /**
+     * ue4旋转
+     */
+
+    private String ue4Rotation;
+
+    private String bizOrgCode;
+
+    private String bizOrgName;
+
+    /**
+     * 物理区域id（数据来源于装备wl_area）
+     */
+    private Long areaId;
+    /**
+     * 物理区域名称（数据来源于装备wl_area）
+     */
+    private String areaName;
+}
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/AnalysisReportLogMapper.xml

@@ -31,7 +31,7 @@
 			 </if>
 		</where>
 		ORDER BY
-		report_date_desc DESC
+		create_date DESC
     </select>
     
      <select id="getStation" resultType="Map">

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -26,6 +26,10 @@
 			 <if test="testRequirement != null ">test_requirement=#{testRequirement},</if>
 			 <if test="inputClassify != null ">input_classify=#{inputClassify},</if>
 			 <if test="unit != null ">unit=#{unit},</if>
+			 <if test="facilitiesType != null ">facilities_type=#{facilitiesType},</if>
+			 <if test="1 == 1">key_parts_type=#{keyPartsType},</if>
+			 <if test="1 == 1">custom_type=#{customType},</if>
+			 <if test="equipmentType != null ">equipment_type=#{equipmentType},</if>
 			 <if test="companyId != null ">company_id=#{companyId},</if>
 			 <if test="companyName != null ">company_name=#{companyName}</if>
  		</trim>
@@ -181,14 +185,15 @@
 		ppi.order_no as pOrderNo,
 		ppi.id as pointItemId,
 		ppc.name as classifyNames,
-		ppc.id as classifyIds,
-		prpi.id  as routePointItemId
+		ppc.id as classifyIds
+<!--		,prpi.id  as routePointItemId-->
 		FROM
 		p_point_classify ppc
 		LEFT JOIN p_point_inputitem ppi ON ppi.classify_ids = ppc.id
 		LEFT JOIN p_input_item pii ON pii.id = ppi.input_item_id
-		lEFT JOIN p_route_point_item prpi ON prpi.point_input_item_id = pii.id
+<!--		lEFT JOIN p_route_point_item prpi ON prpi.point_input_item_id = pii.id-->
 		WHERE pii.is_delete = '0'
+		<if test="classifyId!=null and classifyId !='' "> AND ppc.id = #{classifyId}</if>
 		<if test="pointId!=null and pointId !='' "> AND ppc.point_id = #{pointId}</if>
 		<if test="equipmentId!=null and equipmentId !='' "> AND ppc.equipment_id = #{equipmentId}</if>
 	</select>

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

@@ -42,7 +42,9 @@
 		 and (a.org_Code like concat (#{orgCode},"-%")or a.org_Code= #{orgCode})
 		 </if>
 		<if test="bizOrgCode!=null"> and a.org_Code  like concat (#{bizOrgCode},"%")</if>
-
+		<if test="searchDay!=null and searchDay != '' searchDay == 1">
+		 and a.`check_date` = curdate()
+		</if>
 
 		</where>
 		order by b.id) t
@@ -123,6 +125,9 @@
 			<if test="orgCode!=null">
 				and (a.org_Code like concat (#{orgCode},"-%")or a.org_Code= #{orgCode})
 			</if>
+			<if test="searchDay!=null and searchDay != '' searchDay == 1">
+				and a.`check_date` = curdate()
+			</if>
 		</where>
 		order by b.id
 		<choose>

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