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

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/RemoteSecurityService.java

@@ -166,14 +166,15 @@ public class RemoteSecurityService {
         return oked;
     }
 
-/*    public List<UserModel> listUserByRoleIds(String roleIds) {
-        CommonResponse commonResponse = iAmosSecurityServer.listUserByRoleIds(roleIds);
-        return handleArray(commonResponse, UserModel.class);
-    }*/
-    //用户id批量获取用户信息
+	/**
+	 * 用户id批量获取用户信息
+	 * @param toke
+	 * @param product
+	 * @param appKey
+	 * @param userIds
+	 * @return
+	 */
     public List<AgencyUserModel> listUserByUserIds(String toke,String product,String appKey,String userIds) {
-       // CommonResponse commonResponse = iAmosSecurityServer.listUserByUserIds(userIds);
-        //return handleArray(commonResponse, UserModel.class);
     	RequestContext.setToken(toke);
     	RequestContext.setProduct(product);
     	RequestContext.setAppKey(appKey);
@@ -347,18 +348,16 @@ public class RemoteSecurityService {
 			e.printStackTrace();
 		}
         return agencyUserModel;
-        
-        
-        
-       // CommonResponse commonResponse = iAmosSecurityServer.listUserByDepartmentId(departmentId);
-       // return handleArray(commonResponse, UserModel.class);
     }
     
-/*    public UserModel getUserByToken() {
-        CommonResponse commonResponse = iAmosSecurityServer.getUserByToken();
-        return handleObj(commonResponse, UserModel.class);
-    }*/
-    //* 获取子公司信息树结构
+    /**
+     * 获取子公司信息树结构
+     * @param toke
+     * @param product
+     * @param appKey
+     * @param companyId
+     * @return
+     */
     public List<CompanyModel> getCompanyTreeByCompanyId(String toke,String product,String appKey,String companyId) {
         if (companyId == null || companyId.equals("")) {
             return null;
@@ -376,14 +375,15 @@ public class RemoteSecurityService {
 			e.printStackTrace();
 		}
         return companyModel;
-        
-        
-        
-        
-        //CommonResponse commonResponse = iAmosSecurityServer.getCompanyTreeByCompanyId(companyId);
-        //return handleArray(commonResponse, CompanyBo.class);
     }
-   //查询指定公司的部门树
+    /**
+     * 查询指定公司的部门树
+     * @param toke
+     * @param product
+     * @param appKey
+     * @param companyId
+     * @return
+     */
     public List<DepartmentModel> getDepartmentTreeByCompanyId(String toke,String product,String appKey,String companyId) {
         if (companyId == null || companyId.equals("")) {
             return null;
@@ -447,12 +447,6 @@ public class RemoteSecurityService {
      * 基础平台全部菜单权限树,用于平台登录前端初始化路由
      */
     public CommonResponse searchPermissionTree(String toke,String product,String appKey,String appType) {
-       // CommonResponse commonResponse = iAmosSecurityServer.listPermissionTree(appType);
-       // return commonResponse;
-    	
-    	
-    	
-    	
     	RequestContext.setToken(toke);
     	RequestContext.setProduct(product);
     	RequestContext.setAppKey(appKey);
@@ -466,22 +460,17 @@ public class RemoteSecurityService {
 			e.printStackTrace();
 		}
 		CommonResponse commonResponse =new  CommonResponse("SUCCESS",dictionarieModel); 
-    	
-		
-    	
     	return commonResponse ;
-    	
-    	
-    	
     }
-  //根据Code查询指定的字典信息.
+    /**
+     * 根据Code查询指定的字典信息.
+     * @param toke
+     * @param product
+     * @param appKey
+     * @param dictCode
+     * @return
+     */
     public JSONArray listDictionaryByDictCode(String toke,String product,String appKey,String dictCode) {
-       /* CommonResponse commonResponse = iAmosSecurityServer.listDictionaryByDictCode(dictCode);
-        if (commonResponse != null && commonResponse.isSuccess()) {
-            String jsonStr = JSON.toJSONString(commonResponse.getDataList());
-            return JSONArray.parseArray(jsonStr);
-        }*/
-    	
     	RequestContext.setToken(toke);
     	RequestContext.setProduct(product);
     	RequestContext.setAppKey(appKey);
@@ -498,25 +487,24 @@ public class RemoteSecurityService {
             String jsonStr = JSON.toJSONString(dictionarieModel);
             return JSONArray.parseArray(jsonStr);
         }
-    	
-    	
-    	
         return null;
     }
     
     /**
      * 查询指定公司信息与其部门用户树
+     * @param toke
+     * @param product
+     * @param appKey
+     * @param companyId
+     * @return
      */
     public CompanyModel listUserByCompanyId1(String toke,String product,String appKey,String companyId) {
         if (companyId == null || companyId.equals("")) {
             return null;
         }
-        //CommonResponse commonResponse = iAmosSecurityServer.getuserTreeByCompanyId(companyId);
-       // String jsonStr = JSON.toJSONString(commonResponse);
         RequestContext.setToken(toke);
     	RequestContext.setProduct(product);
     	RequestContext.setAppKey(appKey);
-    	//List<CompanyModel> companyModel=null;
 		CompanyModel companyModel=null;
     	FeignClientResult feignClientResult;
 		try {
@@ -527,21 +515,12 @@ public class RemoteSecurityService {
 			e.printStackTrace();
 		}
         return companyModel;
-        
-      //  return JSONObject.parseObject(jsonStr);
-        
     }
     
 
  
 
     public boolean loginOutFromApp(String toke,String product,String appKey) {
-//        CommonResponse commonResponse = iAmosSecurityServer.loginOutFromApp();
-//        if (commonResponse != null && commonResponse.isSuccess()) {
-//            return true;
-//        }
-    	
-    	
     	RequestContext.setToken(toke);
     	RequestContext.setProduct(product);
     	RequestContext.setAppKey(appKey);
@@ -558,7 +537,6 @@ public class RemoteSecurityService {
     }
 
     public JSONArray listDepartmentUserTree(String toke,String product,String appKey,String companyId) {
-       
     	RequestContext.setToken(toke);
     	RequestContext.setProduct(product);
     	RequestContext.setAppKey(appKey);
@@ -580,24 +558,9 @@ public class RemoteSecurityService {
             return JSONArray.parseArray(jsonStr);
         }
         return null;
-    	
-    	
-    	/*CommonResponse commonResponse = iAmosSecurityServer.listDepartmentUserTree(companyId);
-        if (commonResponse != null && commonResponse.isSuccess()) {
-            String jsonStr = JSON.toJSONString(commonResponse.getDataList());
-            return JSONArray.parseArray(jsonStr);
-        }
-        return null;*/
     }
 
     public boolean editPassword(String toke,String product,String appKey,String userId, String oldPassword, String newPassword) {
-//        JSONObject request = new JSONObject();
-//        
-//        
-//        request.put("originalPassword", oldPassword);
-//        request.put("userId", userId);
-//        request.put("password", newPassword);
-//        request.put("rePassword", newPassword);
     	boolean flag=false;
     	RequestContext.setToken(toke);
     	RequestContext.setProduct(product);
@@ -620,11 +583,6 @@ public class RemoteSecurityService {
        if(agencyUserModel2!=null){
     	   flag=true;
        }
-        
-//        CommonResponse commonResponse = iAmosSecurityServer.editPassword(userId, request);
-//        if (commonResponse != null && commonResponse.isSuccess()) {
-//            return true;
-//        }
         return false;
     }
 }

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

@@ -43,6 +43,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -573,14 +574,19 @@ public class View3dServiceImpl implements IView3dService {
 		CommonPageable pageable = new CommonPageable( current,  pageSize);
 		Long count = view3dMapper.retrieveAllCount(type,inputText,orgCode,dataLevel,protectObjName);
 		List<HashMap<String, Object>> retrieveAll = view3dMapper.retrieveAll(type, inputText,pageable.getOffset(),pageable.getPageSize(),orgCode,dataLevel,protectObjName);
+		Set<Object> userIds = new HashSet<>();
+		retrieveAll.forEach(action->{
+			if(!ObjectUtils.isEmpty(action.get("person"))){
+				userIds.add(action.get("person").toString());
+			}
+		});
+		Map<String,String> userMap = remoteSecurityService.getUserRealName(token, product, appKey, userIds);
 		retrieveAll.stream().forEach(e->{
-			String person = (String)e.get("person");
 			String positionDTO = (String)e.get("positionDTO");
 			JSONArray ue4Location = this.getInitJSONArray(String.valueOf(e.get("ue4Location")));
 			JSONArray ue4Rotation = this.getInitJSONArray(String.valueOf(e.get("ue4Rotation")));
-			if(person != null && !person.equals("")) {
-				AgencyUserModel user = remoteSecurityService.getUserById(token, product, appKey, person);
-				e.put("person", user != null ? user.getRealName() : "");
+			if(!ObjectUtils.isEmpty(e.get("person"))){
+				e.put("person", userMap.get(e.get("person").toString()));
 			}
 			CoordDTO position = null;
 			if(positionDTO != null && !positionDTO.equals("")) {

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -63,3 +63,6 @@ rule.definition.load=true
 rule.definition.model-package=com.yeejoin.amos.fas.business.service.model
 
 amos.feign.gennerator.use-gateway=true
+
+#�ļ�����
+file.downLoad.url=http://172.16.10.175:8888/

YeeAmosFireAutoSysStart/src/main/resources/application-docker.properties

@@ -61,3 +61,6 @@ DutyMode.dutyUrl=http://172.16.11.36:10005/
 ##\u89C4\u5219\u5BF9\u8C61\u81EA\u52A8\u626B\u63CF
 rule.definition.load=true
 rule.definition.model-package=com.yeejoin.amos.fas.business.service.model
+
+#\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
+file.downLoad.url=http://172.16.10.175:8888/

YeeAmosFireAutoSysStart/src/main/resources/application-test.properties

@@ -61,3 +61,6 @@ DutyMode.dutyUrl=http://172.16.11.36:10005/
 ##\u89C4\u5219\u5BF9\u8C61\u81EA\u52A8\u626B\u63CF
 rule.definition.load=true
 rule.definition.model-package=com.yeejoin.amos.fas.business.service.model
+
+#\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
+file.downLoad.url=http://172.16.10.175:8888/

YeeAmosFireAutoSysStart/src/main/resources/application.properties

@@ -32,6 +32,8 @@ 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
+mybatis.configuration.call-setters-on-nulls = true
+
 logging.level.com.yeejoin.amos.fas.business.dao.mapper=debug
 
 #liquibase
@@ -56,7 +58,4 @@ param.safetyIndexChange.cron = 0 0 2 * * ?
 param.weather.url = http://wthrcdn.etouch.cn/weather_mini?citykey=
 
 
-#ļ
-file.downLoad.url=http://172.16.10.175:8888/
-
 

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-sql-task.xml

@@ -110,4 +110,61 @@
 			END#
         </sql>
     </changeSet>
+    <changeSet author="shanqiyun" id="1597831211780-1" runOnChange="true">
+        <comment>create view toip_biz_message</comment>
+        <sql>
+            DROP VIEW IF EXISTS toip_biz_message;
+            CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `toip_biz_message` AS SELECT
+				`m`.`id` AS `id`,
+				`m`.`id` AS `originId`,
+				`m`.`time` AS `time`,
+				`m`.`content` AS `content`,
+				`m`.`title` AS `title`,
+				`m`.`type` AS `type`,
+				`m`.`sender` AS `sender`,
+				`m`.`receiver` AS `receiver`,
+				`m`.`reader` AS `reader`,
+				`m`.`biz_id` AS `biz_id`,
+				`m`.`bizclass_name` AS `bizclass_name`,
+				`n`.`org_code` AS `org_code` 
+				FROM
+					( `toip_sys_message` `m` JOIN `f_equipment` `n` ) 
+				WHERE
+					( ( `n`.`id` = `m`.`biz_id` ) AND ( `m`.`bizclass_name` = 'class com.yeejoin.amos.fas.business.service.model.FireEquimentDataRo' ) ) UNION ALL
+				SELECT
+					`m`.`id` AS `id`,
+					`m`.`id` AS `originId`,
+					`m`.`time` AS `time`,
+					`m`.`content` AS `content`,
+					`m`.`title` AS `title`,
+					`m`.`type` AS `type`,
+					`m`.`sender` AS `sender`,
+					`m`.`receiver` AS `receiver`,
+					`m`.`reader` AS `reader`,
+					`m`.`biz_id` AS `biz_id`,
+					`m`.`bizclass_name` AS `bizclass_name`,
+					`n`.`org_code` AS `org_code` 
+				FROM
+					( `toip_sys_message` `m` JOIN `p_point` `n` ) 
+				WHERE
+					( ( `n`.`id` = `m`.`biz_id` ) AND ( `m`.`bizclass_name` = 'class com.yeejoin.amos.fas.business.service.model.ProtalDataRo' ) ) UNION ALL
+				SELECT
+					`m`.`id` AS `id`,
+					`m`.`id` AS `originId`,
+					`m`.`time` AS `time`,
+					`m`.`content` AS `content`,
+					`m`.`title` AS `title`,
+					`m`.`type` AS `type`,
+					`m`.`sender` AS `sender`,
+					`m`.`receiver` AS `receiver`,
+					`m`.`reader` AS `reader`,
+					`m`.`biz_id` AS `biz_id`,
+					`m`.`bizclass_name` AS `bizclass_name`,
+					`n`.`org_code` AS `org_code` 
+				FROM
+					( `toip_sys_message` `m` JOIN `f_risk_source` `n` ) 
+				WHERE
+					( ( `n`.`id` = `m`.`biz_id` ) AND ( `m`.`bizclass_name` = 'class com.yeejoin.amos.fas.business.service.model.RiskSourceRuleRo' ) );
+       </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -1256,7 +1256,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				r.name as label,
-				'' as protectObjName,
+				r.name as protectObjName,
 				'' as routeName,
 				'' as person,
 				r.rpn as title,
@@ -1291,7 +1291,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				p.name as label,
-				'' as protectObjName,
+				p.name as protectObjName,
 				p.route_name as routeName,
 				p.charge_person_id as person,
 				case 
@@ -1327,7 +1327,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				e.name as label,
-				'' as protectObjName,
+				e.name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
@@ -1357,7 +1357,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				m.name as label,
-				group_concat(f.name) as protectObjName,
+				IFNULL(group_concat(f.name),'') as protectObjName,
 				'' as routeName,
 				'' as person,
 				m.name as title,
@@ -1428,7 +1428,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				name as label,
-				'' as protectObjName,
+				name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
@@ -1458,7 +1458,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				name as label,
-				'' as protectObjName,
+				name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
@@ -1488,7 +1488,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				name as label,
-				'' as protectObjName,
+				name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
@@ -1518,7 +1518,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				name as label,
-				'' as protectObjName,
+				name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
@@ -1548,7 +1548,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				name as label,
-				'' as protectObjName,
+				name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
@@ -1578,14 +1578,14 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				name as label,
-				'' as protectObjName,
+				name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
 				concat('fireFoamRoom-',id) as `key`
 			from f_fire_station where type = 1
 		) as tmp
-		where 1=1
+		<where>
 			<if test="inputText!=null" >
 	            AND (
 	            tmp.code LIKE '%${inputText}%'
@@ -1598,6 +1598,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 			<if test="orgCode!=null">
 				AND (tmp.orgCode = #{orgCode} OR tmp.orgCode like CONCAT(#{orgCode},'-%') )
 			</if>
+		</where>
 		LIMIT ${start},${length}
 	</select>
 	<select id="getAllPointInRegions" resultType="java.util.Map">