修改升级bug

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FireCar.java

@@ -36,7 +36,7 @@ public class FireCar extends BasicEntity  {
 	private String orgCode;
 
 	@Column(name="dept_id")
-	private int deptId;
+	private String deptId;
 
 	@Lob
 	@Column(name="performance_index")
@@ -167,11 +167,11 @@ public class FireCar extends BasicEntity  {
 		this.type = type;
 	}
 	
-	public int getDeptId() {
+	public String getDeptId() {
 		return deptId;
 	}
 
-	public void setDeptId(int deptId) {
+	public void setDeptId(String deptId) {
 		this.deptId = deptId;
 	}
 	

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FireSourceController.java

@@ -77,7 +77,7 @@ public class FireSourceController extends BaseController {
 			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
 			@ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
 		CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
-		Page<HashMap<String, Object>> carList = fireCarService.queryFireCar(param);
+		Page<HashMap<String, Object>> carList = fireCarService.queryFireCar(getToken(),getProduct(),getAppKey(), param);
 		return CommonResponseUtil.success(carList);
 	}
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireCarServiceImpl.java

@@ -2,11 +2,19 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.assertj.core.util.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
@@ -15,15 +23,20 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.FireCarMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.Node3dVoMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IFireCarDao;
+import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.service.intfc.IFireCarService;
 import com.yeejoin.amos.fas.business.vo.FireCarDetailVo;
 import com.yeejoin.amos.fas.dao.entity.FireCar;
 import com.yeejoin.amos.fas.exception.YeeException;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 
 @Service("fireCarService")
 public class FireCarServiceImpl implements IFireCarService {
@@ -41,7 +54,8 @@ public class FireCarServiceImpl implements IFireCarService {
 
 	@Autowired
 	Node3dVoMapper node3dVoMapper;
-
+	@Autowired
+	private RemoteSecurityService remoteSecurityService;
 
 	public FireCar save(FireCar fireCar)
 	{
@@ -94,9 +108,45 @@ public class FireCarServiceImpl implements IFireCarService {
 
 
 	@Override
-	public Page<HashMap<String, Object>> queryFireCar(CommonPageInfoParam param) {
+	public Page<HashMap<String, Object>> queryFireCar(String toke,String product,String appKey,CommonPageInfoParam param) {
 		long total = fireCarMapper.countPageData(param);
 		List<HashMap<String, Object>> content = fireCarMapper.getFireCarPage(param);	
+		
+		
+		
+		
+        if (!CollectionUtils.isEmpty(content)) {
+
+            Set<String> deptIds =  Sets.newHashSet(Lists.transform(content, Map->Map.get("dept_id")+""));
+            deptIds.remove("");
+            deptIds.remove(null);
+            Map<String, String> deptMap =  new HashMap<String,String>();
+            if(!CollectionUtils.isEmpty(deptIds)){
+                List<LinkedHashMap> deptList = remoteSecurityService.listDepartmentByDeptIds( toke, product, appKey,Joiner.on(",").join(deptIds));
+
+                for (int i = 0; i < deptList.size(); i++) {
+                	deptMap.put(deptList.get(i).get("sequenceNbr").toString(), deptList.get(i).get("departmentName").toString());
+    			}
+                
+            
+            }
+            Map<String, String> deptMapNew= deptMap;
+
+            content.forEach(e -> {
+                            
+                e.put("departmentName",deptMapNew.get(e.get("dept_id")));
+            });
+        }
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
 		Page<HashMap<String, Object>> result = new PageImpl<HashMap<String, Object>>(content, param, total);
 		return result;
 	}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IFireCarService.java

@@ -11,7 +11,7 @@ import com.yeejoin.amos.fas.business.vo.FireCarDetailVo;
 
 public interface IFireCarService {
 
-	Page<HashMap<String, Object>> queryFireCar(CommonPageInfoParam param);
+	Page<HashMap<String, Object>> queryFireCar(String toke,String product,String appKey,CommonPageInfoParam param);
 
 	FireCarDetailVo findFireCarById(Long id);