提交代码、

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -12,7 +15,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,12 +25,14 @@ import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrTreeDto;
 import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
 import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import com.yeejoin.amos.boot.module.common.api.mapper.KeySiteMapper;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
+import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
 
 /**
  * 重点部位服务实现类
@@ -45,6 +52,9 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	@Autowired
 	OrgUsrMapper orgUsrMapper;
 
+	@Autowired
+	EquipFeignClient equipFeignClient;
+
 	/**
 	 * 分页查询
 	 */
@@ -53,6 +63,14 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 				keySite.getFireEnduranceRate(), keySite.getUseNature(), keySite.getFireFacilitiesInfo());
 	}
 
+	public List<Object> getBuildTree() {
+		ResponseModel<Object> response = equipFeignClient.getBuildingTree();
+		if (200 == response.getStatus() && ObjectUtils.isNotEmpty(response.getResult())) {
+			return JSONArray.parseArray(JSON.toJSONString(response.getResult()));
+		}
+		return null;
+	}
+
 	/**
 	 * 列表查询 示例
 	 */
@@ -62,7 +80,21 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 
 	public List<KeySiteExcleDto> exportToExcel() {
 		List<KeySiteDto> list = this.queryForKeySiteList();
-		return JSONArray.parseArray(JSONArray.toJSONString(list), KeySiteExcleDto.class);
+		List<KeySiteExcleDto> excleList = new ArrayList<>();
+		list.stream().forEach(i->{
+			KeySiteExcleDto keySiteExcleDto =new KeySiteExcleDto();
+			Bean.copyExistPropertis(i, keySiteExcleDto);
+			if(i.getFirePreventionFlag()) {
+				keySiteExcleDto.setFirePreventionFlagName("有");
+			}else {
+				keySiteExcleDto.setFirePreventionFlagName("无");
+			}
+			keySiteExcleDto.setUseNature(i.getUseNatureName());
+			keySiteExcleDto.setBelongName(i.getBelongName());
+			keySiteExcleDto.setFireEnduranceRate(i.getFireEnduranceRateName());
+			excleList.add(keySiteExcleDto);
+		});
+		return excleList;
 	}
 
 	@Override
@@ -116,9 +148,16 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		return sourceFiles;
 	}
 
-	public boolean update(KeySite keySite) {
-		keySite.setIsDelete(false);
-		int num = keySiteMapper.updateById(keySite);
+	@Transactional(rollbackFor = Exception.class)
+	public boolean update(KeySiteDto keySite) {
+		KeySite entity = new KeySite();
+		Bean.copyExistPropertis(keySite, entity);
+		entity.setIsDelete(false);
+		int num = keySiteMapper.updateById(entity);
+		Map<String, List<AttachmentDto>> map = keySite.getAttachments();
+		if (ObjectUtils.isNotEmpty(map)) {
+			this.saveAttachments(keySite);
+		}
 		if (num > 0) {
 			return true;
 		}
@@ -126,8 +165,39 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	}
 
 	@Override
-	public List<OrgUsrTreeDto> getOrguserTree() {
-		return orgUsrMapper.getCompanyAndCountDepartment();
+	public List<OrgMenuDto> getOrguserTree() {
+		return	buildTreeParallel(orgUsrMapper.getCompanyAndCountDepartment());
+	}
+	public static List<OrgMenuDto> buildTreeParallel(List<OrgUsrTreeDto> list) {
+
+		List<OrgMenuDto> menuList = list.stream().map(o -> {
+			OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
+					ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.valueOf(o.getParentId()), o.getBizOrgType(), false,
+					o.getBizOrgCode(),o.getNum());
+			return menu;
+		}).collect(Collectors.toList());
+
+		List<OrgMenuDto> result = new ArrayList<>();
+		Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size());
+		menuList.forEach(e -> map.put(e.getKey(), e));
+		Set<? extends Map.Entry<Long, ? extends OrgMenuDto>> entries = map.entrySet();
+		entries.parallelStream().forEach(entry -> {
+			OrgMenuDto value = entry.getValue();
+			if (value != null) {
+				OrgMenuDto treeDto = map.get(value.getParentId());
+				if (treeDto != null) {
+					List<OrgMenuDto> children = treeDto.getChildren();
+					if (children == null) {
+						children = new ArrayList<>();
+						treeDto.setChildren(children);
+					}
+					children.add(value);
+				} else {
+					result.add(value);
+				}
+			}
+		});
+		return result;
 	}
 
 	@Override
@@ -142,6 +212,15 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 			KeySite keySiteDto = new KeySite();
 			Bean.copyExistPropertis(keySiteExcleDto, keySiteDto);
 			keySiteDto.setIsDelete(false);
+			if (StringUtils.isNotBlank(keySiteExcleDto.getBelongName())
+					 && keySiteExcleDto.getBelongName().contains("@")){
+				keySiteDto.setBelongId(Long.parseLong(keySiteExcleDto.getBelongName().split("@")[1]));
+			}
+			if (StringUtils.isNotBlank(keySiteExcleDto.getBuildingName()) && keySiteExcleDto.getBuildingName().contains("@")){
+				String[] fireEnduranceRateArray = keySiteExcleDto.getBuildingName().split("@");
+				keySiteDto.setBuildingId(Long.parseLong(fireEnduranceRateArray[1]));
+				keySiteDto.setBuildingName(fireEnduranceRateArray[0]);
+			}
 			if (StringUtils.isNotBlank(keySiteExcleDto.getFireEnduranceRate())
 					&& keySiteExcleDto.getFireEnduranceRate().contains("@")) {
 				String[] fireEnduranceRateArray = keySiteExcleDto.getFireEnduranceRate().split("@");
@@ -153,8 +232,13 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 					&& keySiteExcleDto.getUseNature().contains("@")) {
 				String[] useNatureArray = keySiteExcleDto.getUseNature().split("@");
 				if (useNatureArray.length > 1) {
-					keySiteDto.setFireEnduranceRate(useNatureArray[1]);
+					keySiteDto.setUseNature(useNatureArray[1]);
+				}
 			}
+			if(keySiteExcleDto.getFirePreventionFlagName().equals("有")) {
+				keySiteDto.setFirePreventionFlag(true);
+			}else {
+				keySiteDto.setFirePreventionFlag(false);
 			}
 			excelList.add(keySiteDto);
 		}