去掉s_user表

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/common/response/EquipDetailsResponse.java

@@ -20,6 +20,8 @@ public class EquipDetailsResponse {
 	
 	private String remarks;
 	
+	private String userId;
+
 	public String getName() {
 		return name;
 	}
@@ -83,4 +85,14 @@ public class EquipDetailsResponse {
 	public void setStationName(String stationName) {
 		this.stationName = stationName;
 	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	
+	
 }

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

@@ -9,6 +9,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.dao.mapper.AccidentTypeMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IAccidentTypeDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskFactorDao;
@@ -17,6 +18,8 @@ import com.yeejoin.amos.fas.business.service.intfc.IAccidentTypeService;
 import com.yeejoin.amos.fas.dao.entity.AccidentType;
 import com.yeejoin.amos.fas.dao.entity.RiskFactor;
 import com.yeejoin.amos.fas.exception.YeeException;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 @Service("accidentTypeService")
 public class AccidentTypeServiceImpl implements IAccidentTypeService {
@@ -72,6 +75,26 @@ public class AccidentTypeServiceImpl implements IAccidentTypeService {
 	public Page<HashMap<String, Object>> queryAccidentTypePage(CommonPageInfoParam param) {
 		long total = accidentTypeMapper.countPageData(param);
 		List<HashMap<String, Object>> content  = accidentTypeMapper.findAccidentTypePage(param);
+		StringBuffer sb = new StringBuffer();
+		for(HashMap<String, Object> map : content)
+		{
+			sb.append(map.get("createBy"));
+			sb.append(map.get(","));
+		}
+		sb.deleteCharAt(sb.length()-1);
+		FeignClientResult<List<AgencyUserModel>> resultSec = Privilege.agencyUserClient.queryByIds(sb.toString());
+		for(HashMap<String, Object> map : content)
+		{
+			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;
+				}
+			}
+		}
 		Page<HashMap<String, Object>> result = new PageImpl<>(content, param, total);
 		return result;
 	}

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

 package com.yeejoin.amos.fas.business.service.impl;
 
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import javax.annotation.PostConstruct;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.domain.Sort.Order;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.FireEquipMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.ImpAndFireEquipMapper;
@@ -22,29 +53,8 @@ import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
 import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
 import com.yeejoin.amos.fas.exception.YeeException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.domain.Sort.Order;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.PostConstruct;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 @Service("equipService")
 public class EquipmentServiceImpl implements IEquipmentService {
@@ -399,7 +409,12 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
     @Override
     public EquipDetailsResponse findEquipDetailsById(Long id) {
-        return fireEquipMapper.findEquipDetailsById(id);
+    	EquipDetailsResponse equipDetailsResponse =  fireEquipMapper.findEquipDetailsById(id);
+    	FeignClientResult<AgencyUserModel> feignClientResult = Privilege.agencyUserClient.queryByUserId(equipDetailsResponse.getUserId());
+    	AgencyUserModel user = feignClientResult.getResult();
+    	equipDetailsResponse.setUsername(user.getRealName());
+    	equipDetailsResponse.setTel(user.getMobile());
+        return equipDetailsResponse;
     }
 
 

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

 package com.yeejoin.amos.fas.business.service.impl;
 
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.dao.mapper.FmeaEquipmentPointMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.FmeaMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.FmeaPointInputitemMapper;
@@ -16,6 +17,10 @@ import com.yeejoin.amos.fas.dao.entity.Fmea;
 import com.yeejoin.amos.fas.dao.entity.RiskFactor;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
+import org.bouncycastle.util.Arrays;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -82,6 +87,71 @@ public class FmeaServiceImpl implements IFmeaService {
     public Page<HashMap<String, Object>> queryFmeaList(CommonPageInfoParam param) {
         long total = fmeaMapper.countPageData(param);
         List<HashMap<String, Object>> content = fmeaMapper.queryFmeaPage(param);
+		StringBuffer sb = new StringBuffer();
+		for(HashMap<String, Object> map : content)
+		{
+			
+			//String[] ids = sb.toString().split(",");
+
+			//String companyLeaderId = String.valueOf(map.get("companyLeaderId"));
+			sb.append(map.get("companyLeaderId"));
+			sb.append(map.get(","));
+
+			//String departmentLeaderId = String.valueOf(map.get("departmentLeaderId"));
+
+			sb.append(map.get("departmentLeaderId"));
+			sb.append(map.get(","));
+
+			//String groupLeaderId = String.valueOf(map.get("groupLeaderId"));
+
+			sb.append(map.get("groupLeaderId"));
+			sb.append(map.get(","));
+
+			//String personLeaderId = String.valueOf(map.get("personLeaderId"));
+
+			sb.append(map.get("personLeaderId"));
+			sb.append(map.get(","));
+
+			//String identifyUserId = String.valueOf(map.get("identifyUserId"));
+
+			sb.append(map.get("identifyUserId"));
+			sb.append(map.get(","));
+
+		}
+		sb.deleteCharAt(sb.length()-1);
+		FeignClientResult<List<AgencyUserModel>> resultSec = Privilege.agencyUserClient.queryByIds(sb.toString());
+		for(HashMap<String, Object> map : content)
+		{
+			String companyLeaderId = String.valueOf(map.get("companyLeaderId"));
+			String departmentLeaderId = String.valueOf(map.get("departmentLeaderId"));
+			String groupLeaderId = String.valueOf(map.get("groupLeaderId"));
+			String personLeaderId = String.valueOf(map.get("personLeaderId"));
+			String identifyUserId = String.valueOf(map.get("identifyUserId"));
+			for(AgencyUserModel user : resultSec.getResult())
+			{
+				if(companyLeaderId!=null&& companyLeaderId.equals(user.getUserId()))
+				{
+					map.put("companyLeaderName", user.getRealName());
+				}
+				if(departmentLeaderId!=null&& departmentLeaderId.equals(user.getUserId()))
+				{
+					map.put("departmentLeaderName", user.getRealName());
+				}
+				if(groupLeaderId!=null&& groupLeaderId.equals(user.getUserId()))
+				{
+					map.put("groupLeaderName", user.getRealName());
+				}
+				if(personLeaderId!=null&& personLeaderId.equals(user.getUserId()))
+				{
+					map.put("personLeaderName", user.getRealName());
+				}
+				if(identifyUserId!=null&& identifyUserId.equals(user.getUserId()))
+				{
+					map.put("identifyUserName", user.getRealName());
+				}
+			}
+		}
+		
         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/impl/RiskFactorServiceImpl.java

 package com.yeejoin.amos.fas.business.service.impl;
 
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.dao.mapper.RiskFactorMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.RiskSourceMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IFmeaDao;
@@ -10,6 +11,9 @@ import com.yeejoin.amos.fas.business.service.intfc.IRiskFactorService;
 import com.yeejoin.amos.fas.dao.entity.Fmea;
 import com.yeejoin.amos.fas.dao.entity.RiskFactor;
 import com.yeejoin.amos.fas.exception.YeeException;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -38,6 +42,26 @@ public class RiskFactorServiceImpl implements IRiskFactorService {
     public Page<HashMap<String, Object>> queryRiskFactorPage(CommonPageInfoParam param) {
         long total = riskFactorMapper.countPageData(param);
         List<HashMap<String, Object>> content = riskFactorMapper.queryRiskFactorPage(param);
+		StringBuffer sb = new StringBuffer();
+		for(HashMap<String, Object> map : content)
+		{
+			sb.append(map.get("createBy"));
+			sb.append(map.get(","));
+		}
+		sb.deleteCharAt(sb.length()-1);
+		FeignClientResult<List<AgencyUserModel>> resultSec = Privilege.agencyUserClient.queryByIds(sb.toString());
+		for(HashMap<String, Object> map : content)
+		{
+			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;
+				}
+			}
+		}
         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

@@ -10,6 +10,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 
+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;
@@ -18,6 +19,8 @@ import com.yeejoin.amos.fas.business.service.intfc.IRiskLevelService;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
 import com.yeejoin.amos.fas.exception.YeeException;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 @Service("riskLevelService")
 public class RiskLevelServiceImpl implements IRiskLevelService {
 	@Autowired 
@@ -31,6 +34,26 @@ public class RiskLevelServiceImpl implements IRiskLevelService {
 	public Page<HashMap<String, Object>> queryRiskLevelPage(CommonPageInfoParam param) {
 		long total = riskLevelMapper.countPageData(param);
 		List<HashMap<String, Object>> content = riskLevelMapper.queryRiskLevelPage(param);
+		StringBuffer sb = new StringBuffer();
+		for(HashMap<String, Object> map : content)
+		{
+			sb.append(map.get("createBy"));
+			sb.append(map.get(","));
+		}
+		sb.deleteCharAt(sb.length()-1);
+		FeignClientResult<List<AgencyUserModel>> resultSec = Privilege.agencyUserClient.queryByIds(sb.toString());
+		for(HashMap<String, Object> map : content)
+		{
+			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;
+				}
+			}
+		}
 		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

 package com.yeejoin.amos.fas.business.service.impl;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import javax.annotation.PostConstruct;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.component.cache.Redis;
+import org.typroject.tyboot.component.cache.enumeration.CacheType;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.fas.business.bo.BindRegionBo;
 import com.yeejoin.amos.fas.business.bo.RpnCalculationBo;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
-import com.yeejoin.amos.fas.business.dao.mapper.*;
+import com.yeejoin.amos.fas.business.dao.mapper.FireEquipMapper;
+import com.yeejoin.amos.fas.business.dao.mapper.FireEquipPointMapper;
+import com.yeejoin.amos.fas.business.dao.mapper.FmeaEquipmentPointMapper;
+import com.yeejoin.amos.fas.business.dao.mapper.FmeaMapper;
+import com.yeejoin.amos.fas.business.dao.mapper.FmeaPointInputitemMapper;
+import com.yeejoin.amos.fas.business.dao.mapper.ImpAndFireEquipMapper;
+import com.yeejoin.amos.fas.business.dao.mapper.RiskSourceMapper;
 import com.yeejoin.amos.fas.business.dao.mongo.EquipCommunicationDao;
-import com.yeejoin.amos.fas.business.dao.repository.*;
+import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
+import com.yeejoin.amos.fas.business.dao.repository.IDictDao;
+import com.yeejoin.amos.fas.business.dao.repository.IEvaluationModelDao;
+import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDao;
+import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDataDao;
+import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentPointDao;
+import com.yeejoin.amos.fas.business.dao.repository.IFmeaDao;
+import com.yeejoin.amos.fas.business.dao.repository.IPPointDao;
+import com.yeejoin.amos.fas.business.dao.repository.IPreplanPictureDao;
+import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
+import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
+import com.yeejoin.amos.fas.business.dao.repository.IRpnChangeLogDao;
 import com.yeejoin.amos.fas.business.feign.RemoteRuleServer;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.feign.RemoteWebSocketServer;
@@ -24,7 +79,12 @@ import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance;
 import com.yeejoin.amos.fas.business.service.intfc.IDataRefreshService;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService;
-import com.yeejoin.amos.fas.business.service.model.*;
+import com.yeejoin.amos.fas.business.service.model.CheckInputItemRo;
+import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
+import com.yeejoin.amos.fas.business.service.model.ContingencyRo;
+import com.yeejoin.amos.fas.business.service.model.FireEquimentDataRo;
+import com.yeejoin.amos.fas.business.service.model.ProtalDataRo;
+import com.yeejoin.amos.fas.business.service.model.RiskSourceRuleRo;
 import com.yeejoin.amos.fas.business.util.DateUtils;
 import com.yeejoin.amos.fas.business.util.JexlUtil;
 import com.yeejoin.amos.fas.business.util.RpnUtils;
@@ -34,31 +94,24 @@ import com.yeejoin.amos.fas.common.enums.DataRefreshTypeEum;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
 import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
-import com.yeejoin.amos.fas.dao.entity.*;
+import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
+import com.yeejoin.amos.fas.dao.entity.Dict;
+import com.yeejoin.amos.fas.dao.entity.Equipment;
+import com.yeejoin.amos.fas.dao.entity.EvaluationModel;
+import com.yeejoin.amos.fas.dao.entity.FireEquipment;
+import com.yeejoin.amos.fas.dao.entity.FireEquipmentData;
+import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
+import com.yeejoin.amos.fas.dao.entity.Fmea;
+import com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint;
+import com.yeejoin.amos.fas.dao.entity.FmeaPointInputitem;
+import com.yeejoin.amos.fas.dao.entity.PPoint;
+import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
+import com.yeejoin.amos.fas.dao.entity.RiskLevel;
+import com.yeejoin.amos.fas.dao.entity.RiskSource;
+import com.yeejoin.amos.fas.dao.entity.RpnChangeLog;
 import com.yeejoin.amos.fas.exception.YeeException;
+import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.component.cache.Redis;
-import org.typroject.tyboot.component.cache.enumeration.CacheType;
-
-import javax.annotation.PostConstruct;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.stream.Collectors;
 
 
 @Service("riskSourceService")
@@ -526,6 +579,32 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             return new PageImpl<>(content, null, total);
         }
         content = fmeaPointInputitemMapper.listByFmeaId(fmeaId, pageNumber, pageSize);
+        StringBuffer sb = new StringBuffer();
+        for(Map<String, Object> map :content)
+        {
+        	if(map.get("userId")!=null)
+        	{
+            	sb.append(map.get("userId"));
+            	sb.append(",");	
+        	}
+        }
+        sb.deleteCharAt(sb.length()-1);
+        FeignClientResult<List<AgencyUserModel>> result = Privilege.agencyUserClient.queryByIds(sb.toString());
+        for(Map<String, Object> map :content)
+        {
+			String userId =String.valueOf(map.get("userId")) ;
+			for(AgencyUserModel user : result.getResult())
+			{
+				if(userId!=null&& userId.equals(user.getUserId()))
+				{
+					map.put("username", user.getRealName());
+					map.put("tel", user.getMobile());
+					break;
+				}
+			}
+        }
+        
+        
         return new PageImpl<>(content, null, total);
     }
 

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

@@ -8,7 +8,6 @@
 		count(1) AS total_num
 		FROM
 		f_accident_type a
-		left join s_user b on a.create_by = b.id
 		left join s_department c on a.dept_id = c.id
 		<trim prefix="WHERE" prefixOverrides="AND ">
 			<if test="name!=null"> and a.name like concat(concat("%",#{name}),"%") </if>
@@ -23,12 +22,11 @@
 		a.severity,
 		c.id as deptId ,
 		c.department_name as deptName,
-		b.name as userName ,
+		a.create_by as createBy ,
 		a.create_date as createDate,
 		a.remark
 		FROM
 		f_accident_type a
-		left join s_user b on a.create_by = b.id
 		left join s_department c on a.dept_id = c.id
 		<trim prefix="WHERE" prefixOverrides="AND ">
 			<if test="name!=null"> and a.name like concat(concat("%",#{name}),"%") </if>
@@ -48,14 +46,13 @@
 		fem.coefficient as severity,
 		c.id as deptId ,
 		c.department_name as deptName,
-		b.name as userName ,
+		a.create_by as createBy ,
 		a.create_date as createDate,
 		a.evaluation_sid as evaluationSid,
 		a.remark
 		FROM
 		f_accident_type a
 		left join f_evaluation_model fem on fem.id = a.evaluation_sid
-		left join s_user b on a.create_by = b.id
 		left join s_department c on a.dept_id = c.id
 		<trim prefix="WHERE" prefixOverrides="AND ">
 			<if test="name!=null"> and a.name like concat(concat("%",#{name}),"%") </if>

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

@@ -298,11 +298,9 @@
         eq.address,
         fs.`name` stationName,
         sd.department_name depName,
-        su.`name` username,
-        su.telephone tel
+        eq.charge_user_id userId
         FROM
         f_equipment eq
-        LEFT JOIN s_user su ON su.id = eq.charge_user_id
         LEFT JOIN s_department sd ON sd.id = su.department_id
         LEFT JOIN f_fire_station fs ON fs.id = eq.fire_station_id
         WHERE 1=1

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

@@ -45,16 +45,16 @@
 			fm.department_leader as departmentLeader,
 			fm.group_leader as groupLeader,
 			fm.person_leader as personLeader,
-			(select name from s_user where id = fm.company_leader) as companyLeaderName,
-			(select name from s_user where id = fm.department_leader) as departmentLeaderName,
-			(select name from s_user where id = fm.group_leader) as groupLeaderName,
-			(select name from s_user where id = fm.person_leader) as personLeaderName,
+			fm.company_leader as companyLeaderId,
+			fm.department_leader as departmentLeaderId,
+			fm.group_leader as groupLeaderId,
+			fm.person_leader as personLeaderId,
+			fm.identify_user as identifyUserId,
 		    rf.`name` AS riskFactorName,
 		    fat.`name` AS accidentTypeName,
 		    fat.id AS accidentTypeId,
 		    concat(fems.influence,'-',fems.describe) as influence,
 		    fm.identify_user as identifyUser,
-		    (select name from s_user where id = fm.identify_user) as identifyUserName,
 		    fm.identify_method as identifyMethod,
 			fr.name AS level
 		FROM

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

@@ -55,8 +55,6 @@
             left join
                 p_point as pp on pp.id = b.point_id
             left join
-                s_user as su on su.id = pp.charge_person_id
-            left join
                 s_department as sd on sd.id = pp.charge_dept_id
             where
                 a.fmea_id = #{fmeaId}
@@ -75,8 +73,7 @@
             pp.point_no as pointNo,
             pp.name as pointName,
             sd.department_name as depName,
-            su.name as username,
-            su.telephone as tel,
+            pp.charge_person_id as userId,
             group_concat(concat(pii.name, '##', a.state) SEPARATOR <![CDATA[ '\n' ]]>) as inputItems
         from
             f_fmea_point_inputitem a
@@ -87,8 +84,6 @@
         left join
             p_point as pp on pp.id = b.point_id
         left join
-            s_user as su on su.id = pp.charge_person_id
-        left join
             s_department as sd on sd.id = pp.charge_dept_id
         where
             a.fmea_id = #{fmeaId}

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

@@ -22,12 +22,11 @@
 			a.type,
 			a.dept_id as deptId,
 			c.department_name as deptName,
-			b.name as userName,
+			a.create_by as createBy,
 			a.create_date as createDate,
 			a.remark
 		FROM
 		f_risk_factor a
-		left join s_user b on a.create_by = b.id
 		left join s_department c on a.dept_id = c.id
 		left join f_accident_type d on a.accident_type_id = d.id
 		<trim prefix="WHERE" prefixOverrides="AND ">

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

@@ -23,12 +23,11 @@
 		a.severity,
 		a.name,
 		a.color,
-		b.name as userName ,
+		a.create_by as createBy,
 		a.create_date as createDate,
 		a.remark
 		FROM
 		f_risk_level a
-		left join s_user b on a.create_by = b.id
 		<trim prefix="WHERE" prefixOverrides="AND ">
 			<if test="evalModelId!=null"> and a.evaluation_model_id = #{evalModelId} </if>
 		</trim>

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

@@ -332,8 +332,7 @@
 			pp.point_no pointNo,
 			pp.`name` pointName,
 			sd.department_name depName,
-			su.`name` username,
-			su.telephone tel,
+			pp.charge_person_id userId,
 		GROUP_CONCAT(pii.`name`) inputItems
 		FROM
 			`f_risk_source_point_inputitem` rspi