Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade

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

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

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

@@ -85,28 +85,36 @@ public class AccidentTypeServiceImpl implements IAccidentTypeService {
 		{
 			String userId = String.valueOf(map.get("createBy"));
 			String deptId = String.valueOf(map.get("deptId"));
-			if(userId!=null)
+			if(userId!=null&&!userIdList.contains(userId))
 			{
 				userIdList.add(userId);
 			}
-			if(deptId!=null)
+			if(deptId!=null&&!deptIdList.contains(deptId))
 			{
 				deptIdList.add(deptId);
 			}
 		}
-		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
 		Map<String, String> userMap =  new HashMap<String,String>();
-        for (int i = 0; i < users.size(); i++) {
-        	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
-		}
-	    List<LinkedHashMap> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIdList));
-	    Map<String, String> deptMap =  new HashMap<String,String>();
-        for (int i = 0; i < depts.size(); i++) {
-        	deptMap.put(depts.get(i).get("sequenceNbr").toString(), depts.get(i).get("departmentName").toString());
-		}
+		Map<String, String> deptMap =  new HashMap<String,String>();
+		
+        if(userIdList.size()>0)
+        {
+    		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
+            for (int i = 0; i < users.size(); i++) {
+            	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
+    		}
+        }		
+        if(deptIdList.size()>0)
+        {
+    	    List<LinkedHashMap> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIdList));
+    		  
+            for (int i = 0; i < depts.size(); i++) {
+            	deptMap.put(depts.get(i).get("sequenceNbr").toString(), depts.get(i).get("departmentName").toString());
+    		}
+        }
         content.forEach(e -> {
-            e.put("userName",userMap.get(e.get("createBy")));
-            e.put("deptName",deptMap.get(e.get("deptId")));
+            e.put("userName",userMap.get(String.valueOf(e.get("createBy"))));
+            e.put("deptName",deptMap.get(String.valueOf(e.get("deptId"))));
         });
 		Page<HashMap<String, Object>> result = new PageImpl<>(content, param, total);
 		return result;

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

@@ -12,7 +12,6 @@ import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.core.util.StringUtil;
-import com.yeejoin.amos.fas.dao.entity.FireCar;
 import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -52,28 +52,37 @@ public class RiskFactorServiceImpl implements IRiskFactorService {
 		{
 			String userId = String.valueOf(map.get("createBy"));
 			String deptId = String.valueOf(map.get("deptId"));
-			if(userId!=null)
+			if(userId!=null&&!userIdList.contains(userId))
 			{
 				userIdList.add(userId);
 			}
-			if(deptId!=null)
+			if(deptId!=null&&!deptIdList.contains(deptId))
 			{
 				deptIdList.add(deptId);
 			}
 		}
-		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
 		Map<String, String> userMap =  new HashMap<String,String>();
-        for (int i = 0; i < users.size(); i++) {
-        	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
-		}
-	    List<LinkedHashMap> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIdList));
-	    Map<String, String> deptMap =  new HashMap<String,String>();
-        for (int i = 0; i < depts.size(); i++) {
-        	deptMap.put(depts.get(i).get("sequenceNbr").toString(), depts.get(i).get("departmentName").toString());
-		}
+		Map<String, String> deptMap =  new HashMap<String,String>();
+		
+        if(userIdList.size()>0)
+        {
+    		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
+            for (int i = 0; i < users.size(); i++) {
+            	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
+    		}
+        }		
+        if(deptIdList.size()>0)
+        {
+    	    List<LinkedHashMap> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIdList));
+    		  
+            for (int i = 0; i < depts.size(); i++) {
+            	deptMap.put(depts.get(i).get("sequenceNbr").toString(), depts.get(i).get("departmentName").toString());
+    		}
+        }
+
         content.forEach(e -> {
-            e.put("userName",userMap.get(e.get("createBy")));
-            e.put("deptName",deptMap.get(e.get("deptId")));
+            e.put("userName",userMap.get(String.valueOf(e.get("createBy"))));
+            e.put("deptName",deptMap.get(String.valueOf(e.get("deptId"))));
         });
         Page<HashMap<String, Object>> result = new PageImpl<>(content, param, total);
         return result;

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

@@ -3,17 +3,22 @@ package com.yeejoin.amos.fas.business.service.impl;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 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 com.google.common.base.Joiner;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.dao.mapper.RiskLevelMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
+import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskLevelService;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
@@ -29,31 +34,29 @@ public class RiskLevelServiceImpl implements IRiskLevelService {
 	IRiskLevelDao  iRiskLevelDao;
 	@Autowired
 	IRiskSourceDao iRiskSourceDao;
+	@Autowired
+	private RemoteSecurityService remoteSecurityService;
 	
 	@Override
-	public Page<HashMap<String, Object>> queryRiskLevelPage(CommonPageInfoParam param) {
+	public Page<HashMap<String, Object>> queryRiskLevelPage(String toke,String product,String appKey,CommonPageInfoParam param) {
 		long total = riskLevelMapper.countPageData(param);
 		List<HashMap<String, Object>> content = riskLevelMapper.queryRiskLevelPage(param);
-		StringBuffer sb = new StringBuffer();
+		Set<String> userIdList = new HashSet<String>();
 		for(HashMap<String, Object> map : content)
 		{
-			sb.append(map.get("createBy"));
-			sb.append(map.get(","));
+			userIdList.add(String.valueOf(map.get("createBy")));
 		}
-		sb.deleteCharAt(sb.length()-1);
-		FeignClientResult<List<AgencyUserModel>> resultSec = Privilege.agencyUserClient.queryByIds(sb.toString());
-		for(HashMap<String, Object> map : content)
+		Map<String, String> userMap =  new HashMap<String,String>();
+		if(userIdList.size()>0)
 		{
-			String userId =String.valueOf(map.get("createBy")) ;
-			for(AgencyUserModel user : resultSec.getResult())
-			{
-				if(userId!=null&& userId.equals(user.getUserId()))
-				{
-					map.put("userName", user.getRealName());
-					break;
-				}
-			}
+    		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
+            for (int i = 0; i < users.size(); i++) {
+            	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
+    		}
 		}
+        content.forEach(e -> {
+            e.put("userName",userMap.get(String.valueOf(e.get("createBy"))));
+        });
 		Page<HashMap<String, Object>> result = new PageImpl<>(content, param, total);
 		return result;
 	}

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

@@ -587,30 +587,37 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 		{
 			String userId = String.valueOf(map.get("userId"));
 			String deptId = String.valueOf(map.get("deptId"));
-			if(userId!=null)
+			if(userId!=null&&!userIdList.contains(userId))
 			{
 				userIdList.add(userId);
 			}
-			if(deptId!=null)
+			if(deptId!=null&&!deptIdList.contains(deptId))
 			{
 				deptIdList.add(deptId);
 			}
 		}
-		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
 		Map<String, String> userMap =  new HashMap<String,String>();
-        for (int i = 0; i < users.size(); i++) {
-        	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
-        	userMap.put(users.get(i).getUserId()+"tel", users.get(i).getMobile());
-		}
-	    List<LinkedHashMap> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIdList));
-	    Map<String, String> deptMap =  new HashMap<String,String>();
-        for (int i = 0; i < depts.size(); i++) {
-        	deptMap.put(depts.get(i).get("sequenceNbr").toString(), depts.get(i).get("departmentName").toString());
-		}
+		Map<String, String> deptMap =  new HashMap<String,String>();
+		
+        if(userIdList.size()>0)
+        {
+    		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
+            for (int i = 0; i < users.size(); i++) {
+            	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
+    		}
+        }		
+        if(deptIdList.size()>0)
+        {
+    	    List<LinkedHashMap> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIdList));
+    		  
+            for (int i = 0; i < depts.size(); i++) {
+            	deptMap.put(depts.get(i).get("sequenceNbr").toString(), depts.get(i).get("departmentName").toString());
+    		}
+        }
         content.forEach(e -> {
-            e.put("username",userMap.get(e.get("userId")));
-            e.put("depName",deptMap.get(e.get("deptId")));
-            e.put("tel",userMap.get(e.get("deptId")+"tel"));
+            e.put("username",userMap.get(String.valueOf(e.get("userId"))));
+            e.put("depName",deptMap.get(String.valueOf(e.get("deptId"))));
+            e.put("tel",userMap.get(String.valueOf(e.get("deptId")+"tel")));
         });
         return new PageImpl<>(content, null, total);
     }

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

@@ -10,7 +10,7 @@ import com.yeejoin.amos.fas.dao.entity.RiskLevel;
 
 public interface IRiskLevelService {
 
-	Page<HashMap<String, Object>> queryRiskLevelPage(CommonPageInfoParam param);
+	Page<HashMap<String, Object>> queryRiskLevelPage(String toke,String product,String appKey,CommonPageInfoParam param);
 
 	void editRiskLevel(HashMap<String, Object> map);
 

YeeAmosFireAutoSysStart/src/main/resources/application.properties

-spring.application.name = AMOS-FIREAUTOSYS-SUHG
- 
-server.port = 8083
-
-spring.profiles.active=dev
-
-#spring.freemarker.cache=false 
-
-spring.devtools.restart.enabled=true
-spring.devtools.restart.additional-paths=src/main/java
-spring.devtools.restart.exclude=WEB-INF/**
-
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-
-#JPA Configuration:
-# Show or not log for each sql query
-spring.jpa.show-sql = true
-# Hibernate ddl auto (create, create-drop, update): with "update" the database
-# schema will be automatically updated accordingly to java entities found in
-# the project
-spring.jpa.hibernate.ddl-auto = none
-# Naming strategy
-#spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
-# Allows Hibernate to generate SQL optimized for a particular DBMS
-spring.jpa.database-platform = org.hibernate.dialect.MySQLDialect
-spring.jpa.open-in-view = true
-
-#mybatis mapper file
-mybatis.mapper-locations = classpath:db/mapper/*.xml
-# mybatis entity package
-mybatis.type-aliases-package = com.yeejoin.amos.fas.business.entity.mybatis
-mybatis.configuration.mapUnderscoreToCamelCase=true
-logging.level.com.yeejoin.amos.fas.business.dao.mapper=debug
-
-#liquibase
-spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
-spring.liquibase.enabled= false
-param.system.online.date = 2020-02-12
-
-visual.fegin.name=maas-visual
-spring.http.multipart.maxFileSize = 10480000
-spring.http.multipart.MaxRequestSize = 50480000
-windows.img.path = D:\\
-linux.img.path = /
-
-dutyMode.fegin.name=AMOSDUTYMODE
-param.safetyIndexChange.cron = 0 0 2 * * ?
-
-
+spring.application.name = AMOS-AUTOSYS-XKQ1
+ 
+server.port = 8083
+
+spring.profiles.active=dev
+
+#spring.freemarker.cache=false 
+
+spring.devtools.restart.enabled=true
+spring.devtools.restart.additional-paths=src/main/java
+spring.devtools.restart.exclude=WEB-INF/**
+
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+
+#JPA Configuration:
+# Show or not log for each sql query
+spring.jpa.show-sql = true
+# Hibernate ddl auto (create, create-drop, update): with "update" the database
+# schema will be automatically updated accordingly to java entities found in
+# the project
+spring.jpa.hibernate.ddl-auto = none
+# Naming strategy
+#spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
+# Allows Hibernate to generate SQL optimized for a particular DBMS
+spring.jpa.database-platform = org.hibernate.dialect.MySQLDialect
+spring.jpa.open-in-view = true
+
+#mybatis mapper file
+mybatis.mapper-locations = classpath:db/mapper/*.xml
+# mybatis entity package
+mybatis.type-aliases-package = com.yeejoin.amos.fas.business.entity.mybatis
+mybatis.configuration.mapUnderscoreToCamelCase=true
+logging.level.com.yeejoin.amos.fas.business.dao.mapper=debug
+
+#liquibase
+spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
+spring.liquibase.enabled= false
+param.system.online.date = 2020-02-12
+
+visual.fegin.name=maas-visual
+spring.http.multipart.maxFileSize = 10480000
+spring.http.multipart.MaxRequestSize = 50480000
+windows.img.path = D:\\
+linux.img.path = /
+
+
+Push.fegin.name=PPMESSAGEPUSHSERVICE15
+dutyMode.fegin.name=AMOSDUTYMODE
+param.safetyIndexChange.cron = 0 0 2 * * ?
+
+

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_risk_factor.xml

@@ -20,7 +20,7 @@
 			a.accident_type_id as accidentTypeId,
 			d.name as accidentName,
 			a.type,
-			a.dept_id as deptId,,
+			a.dept_id as deptId,
 			a.create_by as createBy,
 			a.create_date as createDate,
 			a.remark