fix: SCA扫描漏洞处理(Access Control: Database)

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -104,6 +104,8 @@ public class OrgUsrController extends BaseController {
 	String deptKey;
 	@Value("special-deptType")
 	String deptTypeKey;
+	@Value("${auth-key-auth-enabled:}")
+	private String authKey;
 
 	@Autowired
 	DynamicFormInstanceMapper dynamicFormInstanceMapper;
@@ -1153,6 +1155,7 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(orgUsrList);
 	}
 
+	@PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "查询单位基本信息", notes = "查询单位基本信息")
 	@GetMapping(value = "/candidateGroupsUser")
@@ -1166,6 +1169,10 @@ public class OrgUsrController extends BaseController {
 		List<Map> objects = JSONObject.parseArray(result,Map.class);
 		//9891 按照测试要求转成人员管理信息且按换流站过滤
 		List<Map> map = new ArrayList<>();
+
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
+
 		objects.stream().forEach(e->{
 			OrgUsr orgUsr = orgUsrMapper.queryByUserId(Long.valueOf(e.get("userId").toString()));
 			if (!ObjectUtils.isEmpty(orgUsr) && orgUsr.getBizOrgCode().startsWith(bizOrgCode)){

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCarServiceImpl.java

@@ -6,8 +6,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -36,7 +38,7 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 
 
 	@Autowired
-	FirefightersMapper firefightersMapper;		
+	FirefightersMapper firefightersMapper;
 
 	@Autowired
 	EquipFeignClient equipFeignClient;
@@ -45,6 +47,8 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 
 	@Autowired
 	EquipFeignClient equipFeign;
+	@Value("${auth-key-auth-enabled:}")
+	private String authKey;
 
 
 
@@ -166,6 +170,8 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 			}
 			resultList.add(titleMap_2);
 			String carId =map.get(CARID).toString();
+			// 权限处理
+			PermissionInterceptorContext.setDataAuthRule(authKey);
 			Map<String, Object> instanceMap = dutyPersonShiftMapper.getInstanceIdForSpecifyDateAndEquipment(dutyDay,
 					this.getGroupCode(), carId);
 			if(instanceMap==null) {
@@ -174,7 +180,7 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 			String instanceId = instanceMap.get("instanceIds").toString();
 			if (StringUtils.isNotBlank(instanceId)) {
 				String[] instanceIds = instanceId.split(",");
-				
+
 
 						// 获取当前装备ID下的排版数据
 						List<Map<String, Object>> specifyDateList = dutyPersonShiftMapper.getPositionStaffDutyForSpecifyDate(dutyDay,
@@ -200,6 +206,8 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 	}
     @Override
 	public int getDutyCarCount(Long carId) {
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
 		List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getEquipmentForSpecifyDate(DateUtils.getDateNowShortStr(),
 				this.getGroupCode(), CARID, CARNAME, TEAMNAME,"");
 		int count =0;
@@ -227,6 +235,8 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 	public List<Map<String, Object>> theCarDutyPerson(Long carId) {
 		List<Map<String, Object>> specifyDateList =null;
 		  String dutyDay = DateUtils.getDateNowShortStr();
+		  // 权限处理
+		  PermissionInterceptorContext.setDataAuthRule(authKey);
 		  Map<String, Object> instanceMap = dutyPersonShiftMapper.getInstanceIdForSpecifyDateAndEquipment(dutyDay,
 					this.getGroupCode(), carId.toString());
 			if(instanceMap==null) {
@@ -237,7 +247,7 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 				String[] instanceIds = instanceId.split(",");
 				 specifyDateList = dutyPersonShiftMapper.getPositionStaffDutyForSpecifyDate(dutyDay,
 						this.getGroupCode(), instanceIds,null, null);
-			}	
+			}
 		return specifyDateList;
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyFireFightingServiceImpl.java

@@ -6,8 +6,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -23,18 +25,20 @@ public class DutyFireFightingServiceImpl extends DutyCommonServiceImpl implement
 
 	@Autowired
 	FireStationServiceImpl fireStationServiceImpl;
-	
+
 	private static final  String USERNAME="userName";
 	private static final  String POSTTYPENAME="postTypeName";
 	private static final  String TEAMNAME="teamName";
-	
+	@Value("${auth-key-auth-enabled:}")
+	private String authKey;
+
 	@Autowired
 	DynamicFormInstanceServiceImpl alertFormValueServiceImpl;
-	
+
 	public String getGroupCode() {
 		return "dutyFireFighting";
 	}
-	
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public DutyFireFightingDto save(DutyFireFightingDto dto) {
@@ -56,6 +60,8 @@ public class DutyFireFightingServiceImpl extends DutyCommonServiceImpl implement
 		return dto;
 	}
 	public Object getSchedulingDutyForSpecifyDate(String dutyDay, Long shiftId, String postType, String fieldCode) {
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
 		List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getEquipmentForSpecifyDate(dutyDay,
 				this.getGroupCode(), "fireFightingId", "fireFighting", TEAMNAME,"result.fireFightingId");
 		if(equipmentList==null || equipmentList.size()<1 || equipmentList.get(0)==null) {
@@ -81,7 +87,7 @@ public class DutyFireFightingServiceImpl extends DutyCommonServiceImpl implement
 			String instanceId = instanceMap.get("instanceIds").toString();
 			if (StringUtils.isNotBlank(instanceId)) {
 				String[] instanceIds = instanceId.split(",");
-				
+
 
 						// 获取当前装备ID下的排版数据
 						List<Map<String, Object>> specifyDateList = dutyPersonShiftMapper.getPositionStaffDutyForSpecifyDate(dutyDay,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyFirstAidServiceImpl.java

@@ -5,8 +5,11 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -20,10 +23,12 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 
 
 
+	@Value("${auth-key-auth-enabled:}")
+	private String authKey;
 
 	@Autowired
 	OrgUsrServiceImpl orgUsrServiceImpl;
-	
+
    private static final String POSTTYPENAME="postTypeName";
 	private static final String USERNAME= "userName";
 
@@ -55,6 +60,8 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 
 	@Override
 	public Object getSchedulingDutyForSpecifyDate(String dutyDay, Long shiftId, String postType, String fieldCode) {
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
 		List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getEquipmentForSpecifyDate(dutyDay,
 				this.getGroupCode(), "firstAidId", "firstAid", "teamName", "result.firstAidId");
 		if (equipmentList == null || equipmentList.size() < 1 || equipmentList.get(0) == null) {
@@ -108,6 +115,9 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 		List<String> firstAidSimpleList = new ArrayList<String>();
 		List<String> companyNameList = new ArrayList<String>();
 
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
+
 		String firstAidCompanyId = dutyPersonShiftMapper.getFirstAidCompanyId();
 		if (!"".equals(firstAidCompanyId) && firstAidCompanyId != null){
 			ids.add(firstAidCompanyId);
@@ -139,6 +149,10 @@ public class DutyFirstAidServiceImpl extends DutyCommonServiceImpl implements ID
 				});
 
 			detailMap.put(POSTTYPENAME,dataDicSimpleList);
+
+			// 权限处理
+			PermissionInterceptorContext.setDataAuthRule(authKey);
+
 			List<Map<String, Object>> list = dutyPersonShiftMapper.getFirstAidForTypeCodeAndCompanyId(
 					Long.parseLong(firstAidCompanyId));
 			list.stream().forEach(m -> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyPersonServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DutyPersonShift;
@@ -14,6 +15,7 @@ import com.yeejoin.amos.boot.module.common.biz.enums.DynamicGroupCodeEnum;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -41,6 +43,8 @@ public class DutyPersonServiceImpl extends DutyCommonServiceImpl implements IDut
     private static final String POSTTYPENAME="postTypeName";
     private static final String WXXFZ="微型消防站";
     private static final String VALUE="value";
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
 
 @Override
     public String getGroupCode(){
@@ -260,12 +264,12 @@ public class DutyPersonServiceImpl extends DutyCommonServiceImpl implements IDut
                 });
         return temp;
     }
-    
-    
-    
-    
+
+
+
+
 public Object BuildScheduleDetails(String dutyDay, Long shiftId, String postType) {
-		
+
 		List<Map<String, Object>> list = dayDutyPersonList(dutyDay, shiftId, postType);
 		list.stream().forEach(i->{
 			List<Object> fieldsList= new ArrayList<Object>();
@@ -278,14 +282,14 @@ public Object BuildScheduleDetails(String dutyDay, Long shiftId, String postType
 			map.clear();
 			map.put("name", WXXFZ);
 			map.put(VALUE,i.get(DEPTNAME).toString());
-			
+
 		});
-		
-	
-		
+
+
+
 		return postType;
 	}
-    
+
 
 
 	@Override
@@ -309,6 +313,8 @@ public Object BuildScheduleDetails(String dutyDay, Long shiftId, String postType
     }
 
     public Object getSchedulingDutyForSpecifyDate(String dutyDay, Long shiftId, String postType, String fieldCode) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
 		List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getNewEquipmentForSpecifyDate(dutyDay,
 				this.getGroupCode(), DEPTID, DEPTNAME, "result.deptId");
 		if (equipmentList == null || equipmentList.size() < 1 || equipmentList.get(0) == null) {
@@ -322,6 +328,8 @@ public Object BuildScheduleDetails(String dutyDay, Long shiftId, String postType
 				resultList.add( map.get(DEPTNAME).toString());
 			}
 			String carId = map.get(DEPTID).toString();
+            // 权限处理
+            PermissionInterceptorContext.setDataAuthRule(authKey);
 			Map<String, Object> instanceMap = dutyPersonShiftMapper.getInstanceIdForSpecifyDateAndEquipment(dutyDay,
 					this.getGroupCode(), carId);
 			if (instanceMap == null) {
@@ -350,22 +358,22 @@ public Object BuildScheduleDetails(String dutyDay, Long shiftId, String postType
 		}
 		return detailList;
 	}
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireTeamServiceImpl.java

@@ -12,6 +12,7 @@ import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
@@ -69,6 +70,8 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
     private static final String GETSEQUENCENBR="getSequenceNbr";
     private static final String TEAMID ="teamId";
     private static final String IS_DELETE="is_delete";
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
     /**
      * 获取监控大队列表
      *
@@ -116,6 +119,8 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         IPage<FireTeamCardDto> fireTeamListPage = this.baseMapper.getFireTeamForPage(page, team);
         List<FireTeamCardDto> fireTeamList = fireTeamListPage.getRecords();
         Map<Object, Long> finalTeamCarCountMap = teamCarCountMap;
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         fireTeamList.forEach(t -> {
             // 递归返回teamId bug2684 bykongfm
             List<Long> teamIds = new ArrayList<>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
@@ -27,6 +28,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -65,6 +67,8 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 
 	@Autowired
 	private IDataSyncService dataSyncService;
+	@Value("${auth-key-auth-enabled:}")
+	private String authKey;
 
 
 	private static final  String BIZORGCODE ="bizOrgCode";
@@ -302,6 +306,8 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	public BigScreen1VO getFireForceInfoByCode(String companyCode) {
 		String bizOrgCode = null;
 		if (StringUtils.isNotEmpty(companyCode)) {
+			// 权限处理
+			PermissionInterceptorContext.setDataAuthRule(authKey);
 			OrgUsr orgUsr = orgUsrMapper.queryByCompanyCode(companyCode);
 			if (ObjectUtils.isNotEmpty(orgUsr)) {
 				bizOrgCode = orgUsr.getBizOrgCode();
@@ -327,6 +333,8 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		HashMap<String, Object> teamInfoMap = new HashMap<>();
 		teamInfoList.add(teamInfoMap);
 		bigScreen1VO.setTeamNumInfo(teamInfoList);
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
 		List<Map<String, Object>> stationSignInfo = firefightersMapper.getStationSignInfo(bizOrgCode);
 		bigScreen1VO.setUsrSignInfo(stationSignInfo);
 		List<Map<String, Object>> usrSignInfoByBizOrgCode = firefightersMapper.getUsrSignInfoByBizOrgCode(bizOrgCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/LinkageUnitServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
@@ -23,6 +24,7 @@ import com.yeejoin.amos.boot.module.common.api.mapper.LinkageUnitMapper;
 import com.yeejoin.amos.boot.module.common.api.service.ILinkageUnitService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -60,6 +62,8 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 
 	@Autowired
 	DataDictionaryServiceImpl iDataDictionaryService;
+	@Value("${auth-key-auth-enabled:}")
+	private String authKey;
 
 	public String getGroupCode() {
 		return "linkageUnit";
@@ -67,7 +71,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 
 	/**
 	 * 分页查询
-	 * 
+	 *
 	 * @param inAgreement
 	 */
 	@Override
@@ -79,9 +83,11 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 			 String linkageUnitType,  String emergencyLinkageUnitCode,
 			String inAgreement,
 														String bizOrgCode) {
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
 		Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitType,linkageUnitTypeCode, emergencyLinkageUnitCode,inAgreement, bizOrgCode);
 		List<Map> linkageUnitListMap = JSON.parseArray(JSON.toJSONString(linkageUnitList.getRecords()), Map.class);
-		
+
 		List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll(getGroupCode());
 		linkageUnitListMap.forEach(i -> {
 			String mainString = i.get("instanceId").toString();

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
 import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto;
@@ -25,6 +26,7 @@ import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyServic
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -80,6 +82,8 @@ public class MaintenanceCompanyServiceImpl
     SourceFileServiceImpl sourceFileService;
     @Autowired
     OrgUsrMapper orgUsrMapper;
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
 
 
    private static final String STATUS ="status";
@@ -715,6 +719,8 @@ public class MaintenanceCompanyServiceImpl
         wrapper.eq(MaintenanceCompany::getType, COMPANY);
         // 查询所有维保单位信息
         List<MaintenanceCompany> lists = maintenanceCompanyMapper.selectList(wrapper);
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         lists.forEach(list -> {
             Map<String, Object> maintenanceCompany = new HashMap<>();
             maintenanceCompany.put("id", list.getSequenceNbr());

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -184,6 +184,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	@Autowired
 	IdxFeignClient idxFeignClient;
 
+	@Value("${auth-key-auth-enabled:}")
+	private String authKeyAuthEnabled;
+
 	public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
 
 		List<OrgMenuDto> menuList = list.stream()
@@ -1854,6 +1857,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	@Override
 	public UserUnitDto getUserUnit(String userId) {
 		String[] typeArr = TYPE.split(",");
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
 		// 业主单位人员
 		List<UserUnitDto> list = orgUsrMapper.getUserUnit(userId, typeArr[0], null);
 		// 维保单位人员
@@ -1901,6 +1906,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		List<UserDto> userDtoList = new ArrayList<>();
 		if (StringUtils.isNotBlank(userId)) {
 			String[] typeArr = TYPE.split(",");
+			// 权限处理
+			PermissionInterceptorContext.setDataAuthRule(authKey);
 			// 业主单位
 			List<UserDto> list = orgUsrMapper.getUserInfo(userId, typeArr[0], null, FIELD_CODE.split(","));
 			if (!CollectionUtils.isEmpty(list)) {
@@ -2772,6 +2779,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@Override
 	public UserDto getUserParentInfo(String userId) {
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKeyAuthEnabled);
+
 		OrgUsr orgUsr = orgUsrMapper.queryByUserId(Long.parseLong(userId));
 		if (null != orgUsr) {
 			UserDto userDto = new UserDto();
@@ -2800,6 +2810,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@Override
 	public UserDto selectByIdUser(String userId) {
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
 		OrgUsr orgUsr = orgUsrMapper.queryByUserId(Long.parseLong(userId));
 		if (null != orgUsr) {
 			UserDto userDto = new UserDto();
@@ -2842,6 +2854,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		if(userDto.getBizOrgType().equals("COMPANY")){
 			return userDto.getBizOrgCode();
 		}else{
+			// 权限处理
+			PermissionInterceptorContext.setDataAuthRule(authKey);
 			OrgUsr bizOrg = orgUsrMapper.queryBySequenceNbr(userDto.getParentId());
 			return getCompany(bizOrg);
 		}
@@ -3588,7 +3602,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@Override
 	public List<OrgMenuDto> companyUserTreeByUserAndTypeAll(String bizorgcode) {
-
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKeyAuthEnabled);
 		List<OrgUsr> list = orgUsrMapper.companyUserTreeByUserAndTypeALL(bizorgcode);
 		return buildTreeParallel(list);
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/AnalysisReportLogServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.equipmanage.common.dto.AnalysisReportLogDto;
 import com.yeejoin.equipmanage.common.entity.AnalysisReportLog;
 import com.yeejoin.equipmanage.common.entity.UploadFile;
@@ -60,6 +61,9 @@ public class AnalysisReportLogServiceImpl extends ServiceImpl<AnalysisReportLogM
 
     @Value("classpath:/json/systemIndex.json")
     private Resource systemIndex;
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
+
 
     @Override
     public IPage<AnalysisReportLog> listPage(Page page, AnalysisReportLog analysisReportLog) {
@@ -87,6 +91,8 @@ public class AnalysisReportLogServiceImpl extends ServiceImpl<AnalysisReportLogM
         this.saveAnalysisReportLog(reportEnum, beginDate, endDate);
         // 创建月分析统计报告数据
         // 1、 查询消防系统表，捞出所有系统，新增字段，存放自定义用的告警指标模糊查询指标key，逗号分隔
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         List<Map<String, Object>> list = fireFightingSystemMapper.selectSystemByBizOrgCode(null);
         // 2、循环插入 wl_analysis_report_month、wl_analysis_report_summary
         String beginDateStr = DateUtils.dateFormat(beginDate,DateUtils.DATE_PATTERN);
@@ -105,6 +111,8 @@ public class AnalysisReportLogServiceImpl extends ServiceImpl<AnalysisReportLogM
                     filter(index -> index.get("code").equals(String.valueOf(f.get("typeCode")))).collect(Collectors.toList());
             if (!ObjectUtils.isEmpty(collect)) {
                 String indicator = String.valueOf(collect.get(0).get("index"));
+                // 权限处理
+                PermissionInterceptorContext.setDataAuthRule(authKey);
                 analysisReportMonthMapper.insertSystemMonthData(new ArrayList<>(Arrays.asList(indicator.split(","))), beginDateStr, endDateStr, Long.valueOf(f.get("id").toString()));
                 analysisReportSummaryMapper.insertSystemMonthSummaryData(new ArrayList<>(Arrays.asList(indicator.split(","))), beginDateStr, endDateStr, Long.valueOf(f.get("id").toString()));
             }
@@ -118,6 +126,8 @@ public class AnalysisReportLogServiceImpl extends ServiceImpl<AnalysisReportLogM
         this.saveAnalysisReportLog(reportEnum, beginDate, endDate);
         // 创建月分析统计报告数据
         // 1、 查询消防系统表，捞出所有系统，新增字段，存放自定义用的告警指标模糊查询指标key，逗号分隔
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         List<Map<String, Object>> list = fireFightingSystemMapper.selectSystemByBizOrgCode(null);
         // 2、循环插入 wl_analysis_report_month、wl_analysis_report_summary
         String beginDateStr = DateUtils.dateFormat(beginDate,DateUtils.DATE_PATTERN);
@@ -136,6 +146,8 @@ public class AnalysisReportLogServiceImpl extends ServiceImpl<AnalysisReportLogM
                     filter(index -> index.get("code").equals(String.valueOf(f.get("typeCode")))).collect(Collectors.toList());
             if (!ObjectUtils.isEmpty(collect)) {
                 String indicator = String.valueOf(collect.get(0).get("index"));
+                // 权限处理
+                PermissionInterceptorContext.setDataAuthRule(authKey);
                 analysisReportMonthMapper.insertSystemMonthData(new ArrayList<>(Arrays.asList(indicator.split(","))), beginDateStr, endDateStr, Long.valueOf(f.get("id").toString()));
                 analysisReportSummaryMapper.insertSystemMonthSummaryData(new ArrayList<>(Arrays.asList(indicator.split(","))), beginDateStr, endDateStr, Long.valueOf(f.get("id").toString()));
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -11,6 +11,7 @@ import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.SnowFlakeGenerateIdWorker;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
@@ -177,6 +178,10 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Value("${firefightingsystem.equip.alarms.url}")
     private String ffsEquipAlarmsUrl;
 
+    @Value("${auth-key-auth-enabled:}")
+    private String authKeyAuthEnabled;
+
+
     final String ALL_BUILDING = "allBuilding";
 
     final static String[] list = {"92031900", "92011000", "92010700"};
@@ -399,6 +404,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         if (!"0".equals(parentId)) {
             fullName = parentName + '-' + name;
         }
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKeyAuthEnabled);
         formInstanceMapper.updateStr(instanceId, name, fullName, parentId, code,bizOrgCode,bizOrgName);
         /*若还有子级节点，一起修改*/
         List<Map<String, Object>> result = formInstanceMapper.getParentId(instanceId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.SecureRandomUtil;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.equipmanage.common.entity.DynamicFormGroup;
@@ -51,6 +52,8 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
 
     @Value("${equipment.fire.systemid}")
     private String fireSystemId;
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
 
     @Override
     public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance,
@@ -70,6 +73,8 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
         map.put("nameOrCode", nameOrCode);
         map.put("systemStatus", systemStatus);
         map.put("invokeSource", invokeSource);
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         List<EquipmentManageVo> dataList = equipmentManageMapper.queryEquipmenInfo(map);
         Long count = equipmentManageMapper.queryEquipmenCount(map);
         map.clear();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
@@ -80,6 +81,8 @@ import static org.typroject.tyboot.core.foundation.utils.DateTimeUtil.ISO8601_DA
 @Slf4j
 public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificMapper, EquipmentSpecific> implements IEquipmentSpecificSerivce {
 
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
     private final String injection = "{\n" +
             "\n" +
             "        \"items\": [\n" +
@@ -2145,6 +2148,8 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             if (StringUtil.isNotEmpty(equipmentSpecific.getSystemId())) {
                 List<String> ids = new ArrayList<>();
                 ids = Arrays.asList(equipmentSpecific.getSystemId().split(","));
+                // 权限处理
+                PermissionInterceptorContext.setDataAuthRule(authKey);
                 ids.forEach(x -> {
                     // 系统赋码
                     String equipStatus = equipmentSpecificMapper.getEquipStatusList(x);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
@@ -169,6 +170,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 
     @Value("${redis_equip_type_count}")
     private String equipTypeAndCount;
+    @Value("${auth-key-auth-enabled:}")
+    private String authKeyAuthEnabled;
 
     @Autowired
     @Lazy
@@ -219,6 +222,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                 userMap.put(z.getUserId(), z.getRealName());
             });
         }*/
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKeyAuthEnabled);
         dataList.forEach(x -> {
 //            x.setChargePerson(userMap.get(x.getChargePerson()));
             x.setSystemimg(equipmentManageMapper.getFiles(valueOf(x.getId()), "face"));

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/QREquipmentKnowledgeServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
@@ -22,6 +23,7 @@ import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -85,7 +87,9 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
 	private IEquipmentSpecificSerivce equipmentSpecificSerivce;
 	@Autowired
 	private IStockDetailService iStockDetailService;
-	 
+	@Value("${auth-key-auth-enabled:}")
+	private String authKey;
+
 	public ScanResult<QREquipResponse> scan(QRCodeRequest request) throws RuntimeException {
 		try {
 			String qrCode = StringUtil.splitQRCode(request)[1];
@@ -93,7 +97,7 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
 			QREquipResponse response = new QREquipResponse();
 
 			ScanTypeEnum type = ScanTypeEnum.getEnum(request.getType());
-			
+
 			// 出库需要知道装备的附加信息
 			response.setNeedEdditionalInfo(true);
 			switch (type) {
@@ -249,15 +253,15 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
 		if (null == equipmentSpecific) {
 			throw new IllegalArgumentException("该二维码不属于本系统！");
 		}
-		
+
 //		if (equipmentSpecific.getSingle() == false){
 //			throw new IllegalArgumentException("该功能只支持单件管理！");
 //		}
 		ScanEquipmentBasicInfo info = new ScanEquipmentBasicInfo();
-		
+
 		 Boolean flag = equipmentSpecificSerivce.equipmentgetIsSingleByQrcode(qrCode, null);
 		 info.setSingleOrDouble(flag);
-		
+
 		// 获取装备信息
 		EquipmentDetail equipmentDetail = iEquipmentDetailService.getOneById(equipmentSpecific.getEquipmentDetailId());
 		Equipment equipmentOne = iEquipmentService.getById(equipmentDetail.getEquipmentId());
@@ -305,9 +309,9 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
 		}
 		ParsePropertyUtil.setting(info::setBrand, equipmentDetail::getBrand);
 
-		
-		
-		
+
+
+
 		// ParsePropertyUtil.setting(info::setSupplier,
 		// equipmentDetail::getSupplierName);
 		ParsePropertyUtil.setting(info::setDateProduced, () -> DateUtils.date2LongStr(equipmentSpecific.getCreateDate()));
@@ -454,7 +458,7 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
 				ParsePropertyUtil.setting(info::setStockDetailId, equipmentOnCar::getStockDetailId);
 				//设置二维码包含数量
 				info.setAmount(stockDetail.getAmount());
-				
+
 				ParsePropertyUtil.setting(info::setStatus,
 						() -> EquipStatusEnum.getEnum(Long.valueOf(stockDetail.getStatus())).getDescribe());
 				ParsePropertyUtil.setting(info::setCarType, () -> {
@@ -485,8 +489,8 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
 						.selectById(detail1.getWarehouseStructureId());
 				// 获取仓库
 				Warehouse warehouse = warehouseDao.selectById(detail1.getWarehouseId());
-				
-				
+
+
 				//设置二维码包含数量
 				info.setAmount(detail1.getAmount());
 				ParsePropertyUtil.setting(info::setGoodsAllocationCode, warehouseStructure::getCode);
@@ -520,11 +524,11 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
 						d -> EquipStatusEnum.getEnum(Long.valueOf(d.getStatus())) == EquipStatusEnum.REPAIR);
 				List<StockDetail> maintainE = ArrayUtil.filter(details,
 						d -> EquipStatusEnum.getEnum(Long.valueOf(d.getStatus())) == EquipStatusEnum.ONCAR);
-				
-				
-				
-				
-				
+
+
+
+
+
 				// List<StockDetail> retirementEquips =
 				// ArrayUtil.filter(details, d ->
 				// EquipStatusEnum.getEnum(Long.valueOf(d.getStatus())) ==
@@ -538,7 +542,7 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
 					ParsePropertyUtil.setting(info::setCarType, () -> findCategoryNameByID(lossEquips.get(0).getId()));
 					ParsePropertyUtil.setting(info::setCarCompany, getSelectedOrgInfo().getCompany()::getCompanyName);
 				} else if (!maintainEquips.isEmpty()) {
-					
+
 					//设置二维码包含数量
 					info.setAmount(maintainEquips.get(0).getAmount());
 					ParsePropertyUtil.setting(info::setStatus, () -> EquipStatusEnum.REPAIR.getDescribe());
@@ -547,28 +551,28 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
 							() -> findCategoryNameByID(maintainEquips.get(0).getId()));
 					ParsePropertyUtil.setting(info::setCarCompany, getSelectedOrgInfo().getCompany()::getCompanyName);
 				}else if(!maintainE.isEmpty()){
-					
-					
-					
+
+
+
 					//查询车载数量
 					EquipmentOnCar equipmentOnCar=	findEquipmentOnCarda(maintainE.get(0).getId());
-					
+
 					//设置二维码包含数量
 					info.setAmount(equipmentOnCar.getAmount());
-					
+
 					ParsePropertyUtil.setting(info::setStatus, () -> EquipStatusEnum.ONCAR.getDescribe());
 					ParsePropertyUtil.setting(info::setStockDetailId, () -> maintainE.get(0).getId());
 					ParsePropertyUtil.setting(info::setCarType,
 							() -> findCategoryNameByID(maintainE.get(0).getId()));
 					ParsePropertyUtil.setting(info::setCarCompany, getSelectedOrgInfo().getCompany()::getCompanyName);
-					
-					
-					
+
+
+
 				}
-				
-				
-				
-				
+
+
+
+
 				// else if (!retirementEquips.isEmpty()){
 				// ParsePropertyUtil.setting(info::setStatus,
 				// ()->EquipStatusEnum.RETIREMENT.getDescribe());
@@ -628,6 +632,8 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
 	}
 
 	public String findCategoryNameByID(long id) {
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
 		List<Map<String, Object>> list = iStockDetailDao.findCategoryNameByID(id);
 		if (list != null && list.size() > 0) {
 			return list.get(0).get("name").toString();
@@ -1117,7 +1123,7 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
 		if (stockDetail != null) {
 			for (int i = 0; i < stockDetail.size(); i++) {
 				 num = num+stockDetail.get(i).getAmount();
-			}			
+			}
 		}
 		return num;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -19,6 +19,7 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.module.command.api.dto.FrontlineLiaisonDto;
 import com.yeejoin.amos.boot.module.command.biz.service.impl.FrontlineLiaisonServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.entity.*;
@@ -191,6 +192,8 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
     private String  fireBrigade = "fireBrigade";
     private String  telephone = "telephone";
     private String  sequenceNbr = "sequenceNbr";
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
 
     @Autowired
     FireTeamServiceImpl fireTeamServiceImpl;
@@ -892,6 +895,8 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         String urlString="";
         report.setEndTime(DateUtils.convertDateToString(new Date(), DateUtils.DATE_TIME_PATTERN));
 
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         // 查询第一次调派
         List<Map<String, Object>> first = alertSubmittedMapper.getFirst(alertCalled.getSequenceNbr());
 
@@ -1151,6 +1156,8 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         dto.setStation(map.get(companyName).toString());
         // 随车人员
         if (map.containsKey("id")) {
+            // 权限处理
+            PermissionInterceptorContext.setDataAuthRule(authKey);
             List<PowerData> powerDataOne = powerTransferMapper.getPowerDataOne(Long.valueOf(map.get("id").toString()));
             if (!ValidationUtil.isEmpty(powerDataOne)) {
                 dto.setPersonNum(String.valueOf(powerDataOne.size()));

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.entity.DutyShift;
 import com.yeejoin.amos.boot.module.common.api.mapper.DutyPersonShiftMapper;
@@ -131,6 +132,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     private static final  String USERNAME="userName";
     private static final  String COUNT= "count";
     private static final  String TOTAL= "total";
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
 
 
     @Override
@@ -299,13 +302,13 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                                         if (specifyDateList == null || specifyDateList.size() < 1 || specifyDateList.get(0) == null) {
                                             continue;
                                         }
-                                       
+
                                         int num=0;
                                         LinkedHashMap<String, String> infoMap_1 = new LinkedHashMap<String, String>();
                                         for (Map<String, Object> specify : specifyDateList) {
 //
                                             if (specify.containsKey(USERNAME) && specify.get(USERNAME) != null) {
-                                            	
+
                                                 if (specify.get(USERNAME).toString().contains(",")) {
                                                     String[] userNames = specify.get(USERNAME).toString().split(",");
                                                     num = num+ userNames.length;
@@ -660,6 +663,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 
     @Override
     public List<PowerCompanyCountDto> getPowerCompanyCountDtocount(Long id) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         List<PowerCompanyCountDto> list = powerTransferMapper.getPowerCompanyCountDtocount(id);
         if (list != null && list.size() > 0) {
             list.stream().forEach(powerCompanyCountDto -> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.patrol.business.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;
@@ -124,6 +125,8 @@ public class CheckController extends AbstractBaseController {
 
     @Autowired
     PointMapper pointMapper;
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
 
     /**
      *
@@ -303,6 +306,8 @@ public class CheckController extends AbstractBaseController {
 
                 }
 
+                // 权限处理
+                PermissionInterceptorContext.setDataAuthRule(authKey);
                 List<Map<String, Object>> checkInputItems = checkMapper.queryCheckInputItemsByCheckId(checkDto.getCheckId());
                 publishDataToMessage(checkInputItems);
                 is.pointCheckInfoPushToB(checkDto.getCheckId());
@@ -349,6 +354,8 @@ public class CheckController extends AbstractBaseController {
             equipInfoVo.setTraceId(map.get("traceId").toString());
             }
 
+            // 权限处理
+            PermissionInterceptorContext.setDataAuthRule(authKey);
             Map<String, Object> pointMap = pointMapper.getPointById(Long.valueOf(String.valueOf(map.get("pointId"))));
             alarmInfoVo.setIndexNo(String.valueOf(pointMap.get("id")));
             alarmInfoVo.setName(String.valueOf(pointMap.get("pointName")));

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.dao.mapper.InputItemMapper;
@@ -81,6 +82,8 @@ public class InputItemController extends AbstractBaseController {
 
 	@Autowired
 	private RedisUtils redisUtils;
+	@Value("${auth-key-auth-enabled:}")
+	private String authKey;
 
 	/**
 	 * 检查项列表左侧树缓存Key
@@ -110,6 +113,8 @@ public class InputItemController extends AbstractBaseController {
 				map.put(i, Integer.valueOf(result[i]));
 			}
 
+			// 权限处理
+			PermissionInterceptorContext.setDataAuthRule(authKey);
 			Map<String, String> equipmentCategory = inputItemMapper.getCategoryByCode(treeId.replace("@",""), "2");
 			if (equipmentCategory == null) {
 				throw new RuntimeException("装备定义code有误");
@@ -127,6 +132,8 @@ public class InputItemController extends AbstractBaseController {
 					}
 					break;
 				} else {
+					// 权限处理
+					PermissionInterceptorContext.setDataAuthRule(authKey);
 					//查找到循环几次为空
 					equipmentCategory = inputItemMapper.getCategoryById(equipmentCategory.get("parentId"));
 				}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -8,6 +8,7 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
@@ -48,6 +49,7 @@ import org.assertj.core.util.Sets;
 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.cglib.beans.BeanMap;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -115,6 +117,8 @@ public class CheckServiceImpl implements ICheckService {
 
     @Autowired
     private IdxFeign idxFeign;
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
 
     public static final Logger log = LoggerFactory.getLogger(CheckServiceImpl.class);
 
@@ -248,6 +252,8 @@ public class CheckServiceImpl implements ICheckService {
         Point point = iPointService.queryPointById(requestParam.getPointId());
         try {
             if (!ObjectUtils.isEmpty(requestParam) && !ObjectUtils.isEmpty(requestParam.getPlanTaskId()) && requestParam.getPlanTaskId() > 0) {
+                // 权限处理
+                PermissionInterceptorContext.setDataAuthRule(authKey);
                 detail = planTaskDetailMapper.findPlanTaskByTaskIdAndPointId(requestParam.getPlanTaskId(), requestParam.getPointId());
                 if (!ObjectUtils.isEmpty(detail)) {
                     check = checkDao.findByPlanTaskIdAndPointId(requestParam.getPlanTaskId(), requestParam.getPointId());
@@ -433,6 +439,8 @@ public class CheckServiceImpl implements ICheckService {
                 checkService.saveCheckImg(imgList);
             }
             if (check.getPlanTaskId() > 0 && null != detail) {
+                // 权限处理
+                PermissionInterceptorContext.setDataAuthRule(authKey);
                 planTaskDetailMapper.finishTaskDetail(Long.parseLong(detail.get("planTaskDetailId").toString()), requestParam.getPointId(), requestParam.getPlanTaskId(), user.getUserId());
             } else {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -751,11 +759,15 @@ public class CheckServiceImpl implements ICheckService {
 
     @Override
     public List<Map<String, Object>> selectCheckById(Long id, Long pointId) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         return checkMapper.selectCheckById(id, pointId);
     }
 
     @Override
     public void delCheckByTaskId(Long id, List<Long> ids, Long pointId) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         checkMapper.delCheckByTaskId(id, pointId);
         checkMapper.delCheckInputByCheckId(ids);
     }
@@ -1517,6 +1529,8 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     private Long getLastsetCheckByPointID(Long pointId) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         Long checkID = checkMapper.getLastsetCheckByPointID(pointId);
         return checkID;
     }
@@ -1531,6 +1545,8 @@ public class CheckServiceImpl implements ICheckService {
             }
         }
         Long checkID = param.getCheckID();
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         long total = checkMapper.countCheckInputByMybatis(checkID);
         List<CheckInputBo> content = checkMapper.getCheckInputByCheckId(param);
         CommonPage<CheckInputBo> result = new CommonPage<>(content, param, total);
@@ -1547,6 +1563,8 @@ public class CheckServiceImpl implements ICheckService {
                 param.setCheckID(checkID);
             }
         }
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         List<HashMap<String,Object>>  equipList= checkMapper.getCheckEquipByCheckID(param.getCheckID());
         equipList.forEach(equip->{
             param.setClassifyId(equip.get("classifyId").toString());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/InputItemServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.patrol.business.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.patrol.business.dao.mapper.InputItemMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.RouteMapper;
 import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
@@ -44,6 +45,8 @@ public class InputItemServiceImpl implements IInputItemService {
 	private ICatalogTreeService iCatalogTreeService;
 	@Value("${input.custom.prefix}")
 	private String customPre;
+	@Value("${auth-key-auth-enabled:}")
+	private String authKey;
 
 	@Autowired
 	private RemoteSecurityService remoteSecurityService;
@@ -253,6 +256,8 @@ public class InputItemServiceImpl implements IInputItemService {
 	}
 
 	public List<String> getEquipParent(String code,List<String> objects){
+		// 权限处理
+		PermissionInterceptorContext.setDataAuthRule(authKey);
 		Map<String, String> equipmentType = inputItemMapper.getEquipParentCode(code);
 		if (equipmentType == null) {
 			equipmentType =	inputItemMapper.getSystemParentCode(code);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java

@@ -9,6 +9,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
@@ -159,6 +160,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
 
     @Value("${server.port}")
     private String port;
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
 
 //    @Value("${LatentDanger.flow.photoUrls}")
 //    private String photoUrlPre;
@@ -248,6 +251,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         }
 
         for (LatentDangerPatrolItemParam param : itemList) {
+            // 权限处理
+            PermissionInterceptorContext.setDataAuthRule(authKey);
             InputCheckDto inputCheckDto = checkInputMapper.getByCheckIdAndItemIdAndRoutePointItemId(checkId,
                                                                                                     param.getItemId(), param.getRoutePointItemId(), null);
             if (CheckModeEnum.WEB_OUT.getCode().equals(check.getCheckMode())) {
@@ -340,6 +345,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
             }
             latentDangerBo.setCurrentFlowRecordId(inputRecord.getId());
             latentDangerBo.setInstanceId(instance.getString("id"));
+            // 权限处理
+            PermissionInterceptorContext.setDataAuthRule(authKey);
             latentDangerMapper.update(latentDangerBo);
             //修改管控措施的状态为失效
             LatentDangerPatrolBo patrolBo = latentDangerPatrolMapper.getByDangerId(latentDangerBo.getId());
@@ -355,6 +362,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
     }
 
     private void updateCheckInputDangerState(Long id, int code) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         latentDangerMapper.updateCheckInputDangerState(id, code);
         //  巡检站端与中心级数据同步
         TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@@ -377,6 +386,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         map.put("measuresContentId", measuresContentId);
         map.put("evaluateId", evaluateId);
         map.put("status", riskFactorsCmStatusEnum.getCode());
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         riskFactorCmMapper.updateStatusByMap(map);
         RiskFactorBo riskFactorBo = new RiskFactorBo();
         riskFactorBo.setId(riskFactorId);
@@ -448,6 +459,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         record.setDeleted(0);
         record.setActionFlag(taskName);
         record.setRemark(remark);
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         latentDangerFlowRecordMapper.save(record);
         return record;
     }
@@ -476,6 +489,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         if (flowJson != null) {
             flowRecord.setFlowJson(flowJson.toJSONString());
         }
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         latentDangerFlowRecordMapper.update(flowRecord);
     }
 
@@ -695,6 +710,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         DangerExecuteSubmitDto executeSubmitDto = new DangerExecuteSubmitDto();
         LatentDangerBo latentDangerBo = null;
         if (StringUtil.isNotEmpty(latentDangerExcuteParam.getDangerId())) {
+            // 权限处理
+            PermissionInterceptorContext.setDataAuthRule(authKey);
             latentDangerBo = latentDangerMapper.getById(latentDangerExcuteParam.getDangerId());
         }
         if(StringUtil.isNotEmpty(latentDangerExcuteParam.getReformLimitDate())){
@@ -751,6 +768,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
 
         JSONObject task = jsonObject.getJSONObject("data");
 
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         LatentDangerBo latentDangerBo = latentDangerMapper.getbyBusinessKey(task.getString("businessKey"));
 
 //        LinkedHashMap<String,Object> positionAll  = equipFeign.getBuildingAbsolutePosition();
@@ -832,6 +851,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
     private void buildOfDifferentDangerType(LatentDangerBo latentDangerBo, LatentDangerDetailVo detailVo) {
         if (latentDangerBo.getDangerType().equals(LatentDangerTypeEnum.计划检查.getCode().toString())
                 || latentDangerBo.getDangerType().equals(LatentDangerTypeEnum.无计划检查.getCode().toString())) {
+            // 权限处理
+            PermissionInterceptorContext.setDataAuthRule(authKey);
             LatentDangerPatrolBo patrolBo = latentDangerPatrolMapper.getByDangerId(latentDangerBo.getId());
             if (patrolBo != null) {
                 LatentDangerDetailRiskVo riskVo = new LatentDangerDetailRiskVo();
@@ -879,6 +900,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
 
     @Override
     public CommonResponse getByInstanceId(String instanceId) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         LatentDangerBo latentDangerBo = latentDangerMapper.getByInstanceId(instanceId);
         if (latentDangerBo == null) {
             return CommonResponseUtil.failure("隐患不存在");
@@ -929,6 +952,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 }
             }
         }
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         LatentDangerFlowRecordBo reviewRecordBo = latentDangerFlowRecordMapper.getByDangerIdAndActionFlag(latentDangerBo.getId(), "B_2");
         LatentDangerFlowRecordBo reformRecordBo = latentDangerFlowRecordMapper.getByDangerIdAndActionFlag(latentDangerBo.getId(), "B_3");
         if (reviewRecordBo != null) {
@@ -1003,6 +1028,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                                                  String userId, String userRealName, String departmentId, String departmentName) {
         DangerExecuteSubmitDto executeSubmitDto = new DangerExecuteSubmitDto();
         executeSubmitDto.setIsOk(true);
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         LatentDangerBo latentDangerBo = latentDangerMapper.getByInstanceId(instanceId);
         if (latentDangerBo != null) {
             LatentDangerFlowRecordBo currentRecord = latentDangerFlowRecordMapper.getById(latentDangerBo.getCurrentFlowRecordId());
@@ -1021,6 +1048,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                     patrolBo = latentDangerPatrolMapper.getByDangerId(latentDangerBo.getId());
                     userIds = Joiner.on(",").join(getUserIdsStrByPerTypeAndDefKey(flowJson));
                 } else {
+                    // 权限处理
+                    PermissionInterceptorContext.setDataAuthRule(authKey);
                     LatentDangerFlowRecordBo recordBo = latentDangerFlowRecordMapper.getByDangerIdAndActionFlag(latentDangerBo.getId(), "B_8");
                     userIds = recordBo.getFlowTaskUserIds();
                 }
@@ -1069,6 +1098,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                     patrolBo = latentDangerPatrolMapper.getByDangerId(latentDangerBo.getId());
                     userIds = Joiner.on(",").join(getUserIdsStrByPerTypeAndDefKey(flowJson));
                 } else {
+                    // 权限处理
+                    PermissionInterceptorContext.setDataAuthRule(authKey);
                     LatentDangerFlowRecordBo recordBo = latentDangerFlowRecordMapper.getByDangerIdAndActionFlag(latentDangerBo.getId(), "B_3");
                     userIds = recordBo.getFlowTaskUserIds();
                 }
@@ -1089,6 +1120,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
     @Override
     public void updateDangerStateOfOvertime() {
         logger.info("修改治理过期隐患的逾期状态");
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         List<LatentDangerBo> overtimeList = latentDangerMapper.listOfOvertime();
         for (LatentDangerBo latentDangerBo : overtimeList) {
             latentDangerBo.setOvertimeState(LatentDangerOvertimeStateEnum.已超时.getCode());
@@ -1140,6 +1173,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
 
     @Override
     public CommonResponse listFlowRecord(String token, String product, String appKey, Long id) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         LatentDangerBo latentDangerBo = latentDangerMapper.getById(id);
         if (latentDangerBo == null) {
             return CommonResponseUtil.failure("隐患不存在");
@@ -1300,6 +1335,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 }
             } else {// 延期治理评审通过且 需要 公司审核
                 latentDangerBo.setDangerState(LatentDangerStateEnum.延期治理申请待公司审核.getCode().toString());
+                // 权限处理
+                PermissionInterceptorContext.setDataAuthRule(authKey);
                 LatentDangerFlowRecordBo recordBo =
                         latentDangerFlowRecordMapper.getByDangerIdAndCreate(latentDangerBo.getId());
                 String flowJsonStr = recordBo.getFlowJson();
@@ -1348,6 +1385,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
      * @return
      */
     public boolean assignGovernUser(LatentDangerBo latentDangerBo, DangerExecuteSubmitDto executeSubmitDto) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         // 获取最后一次评审时选择的治理人
         LatentDangerFlowRecordBo record = latentDangerFlowRecordMapper.getByDangerIdAndActionFlag(latentDangerBo.getId(), "隐患评审");
         JSONObject recordObj = JSONObject.parseObject(record.getFlowJson());
@@ -1499,6 +1538,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
 
     private void updateRiskSourceDangerState(Boolean isSave, Long riskSourceId, LatentDangerLevelEnum
             levelEnum, Long pointId, Long dangerId) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         RiskSourceBo riskSourceBo = riskSourceMapper.getById(riskSourceId);
         if (riskSourceBo != null) {
             if (isSave) {
@@ -1520,6 +1561,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                 HashMap<String, Object> params = new HashMap<>();
                 params.put("pointId", pointId);
                 params.put("dangerId", dangerId);
+                // 权限处理
+                PermissionInterceptorContext.setDataAuthRule(authKey);
                 List<LatentDangerBo> latentDangerBos = latentDangerMapper.listNotFinishByPointId(params);
                 if (CollectionUtils.isEmpty(latentDangerBos)) {
                     riskSourceBo.setIsDanger(false);
@@ -1529,6 +1572,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
                     riskSourceBo.setDangerLevel(dangerLevel);
                 }
             }
+            // 权限处理
+            PermissionInterceptorContext.setDataAuthRule(authKey);
             riskSourceMapper.updateDangerState(riskSourceBo);
         }
     }
@@ -1552,6 +1597,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
     @Override
     public void freshRiskJudgmentLangerCount(LatentDangerExcuteParam latentDangerExcuteParam) {
         Long currentFlowRecordId = latentDangerExcuteParam.getFlowRecordId();
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         LatentDangerFlowRecordBo currentRecord = latentDangerFlowRecordMapper.getById(currentFlowRecordId);
         if (currentRecord == null) {
             return;

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/MessageServiceImpl.java

 package com.yeejoin.amos.patrol.business.service.impl;
 
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
@@ -29,6 +30,7 @@ import org.apache.commons.lang.StringUtils;
 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.http.HttpStatus;
@@ -91,10 +93,14 @@ public class MessageServiceImpl implements IMessageService {
 
 	@Autowired
 	private  JcsFeignClient jcsFeignClient;
+	@Value("${auth-key-auth-enabled:}")
+	private String authKey;
 
 	@Override
 	public void pushCheckMessage(String toke,String product,String appKey,Long checkId) {
 		try{
+			// 权限处理
+			PermissionInterceptorContext.setDataAuthRule(authKey);
 			//消息发送内容、执行人id，巡检点id，巡检线路id
 			CheckMsgBo checkMsgBo = msgMapper.getCheckMsgBos(checkId);
 			if(checkMsgBo != null){
@@ -141,6 +147,8 @@ public class MessageServiceImpl implements IMessageService {
 						jpushUser.add(pb);
 					}
 				});
+				// 权限处理
+				PermissionInterceptorContext.setDataAuthRule(authKey);
 				//获取需要推送的email的用户
 				List<PushTargetBo> emailUser = msgMapper.getPushUserBo("email", String.join(",", needUserIds), checkMsgBo.getRouteId(),getEmailPushConfig(checkMsgBo.getStatus()));
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Joiner;
 import com.yeejoin.amos.boot.biz.common.constants.RuleConstant;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -56,6 +57,7 @@ import org.apache.commons.compress.utils.Sets;
 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.stereotype.Service;
@@ -142,6 +144,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     private final String WEB = "WEB";
     private final String APP_WEB = "APP/WEB";
     private static final String TAB = "\r\n";
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
 
 
     @Override
@@ -1459,6 +1463,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         if (check != null) {
             pointCheckRespone = checkService.queryCheckPointDetail(toke, product, appKey, check.getId());
         } else {
+            // 权限处理
+            PermissionInterceptorContext.setDataAuthRule(authKey);
             PointCheckDetailBo planPointInfo = planTaskMapper.getPointPlanTaskInfo(planTaskId, pointId);
 
 
@@ -1484,6 +1490,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 pointCheckRespone.setPointNo(planPointInfo.getPointNo());
                 pointCheckRespone.setPointStatus("0");
                 pointCheckRespone.setPlanName(planPointInfo.getPlanName());
+                // 权限处理
+                PermissionInterceptorContext.setDataAuthRule(authKey);
                 List<PointCheckDetailBo> pointInputs = planTaskMapper.getPointInputByRouteIdAndPointId(planPointInfo.getRouteId(), planPointInfo.getPointId());
                 JSONObject appResponeMap = new JSONObject();
                 pointInputs.forEach(action -> {
@@ -1523,6 +1531,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         if (check != null) {
             pointCheckRespone = checkService.queryCheckPointDetailInVersion2(toke, product, appKey, check.getId());
         } else {
+            // 权限处理
+            PermissionInterceptorContext.setDataAuthRule(authKey);
             PointCheckDetailBo planPointInfo = planTaskMapper.getPointPlanTaskInfo(planTaskId, pointId);
 
             if (planPointInfo != null) {
@@ -1596,6 +1606,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     @Override
     public AppPointCheckRespone queryPointPlanTaskDetailInVersion2New( Long planTaskId, Long pointId) {
         AppPointCheckRespone pointCheckRespone = new AppPointCheckRespone();
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         Check check = checkDao.findByPlanTaskIdAndPointId(planTaskId, pointId);
         if (check != null) {
             pointCheckRespone = checkService.queryCheckPointDetailInVersion2New(check.getId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.InputItemMapper;
@@ -39,6 +40,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.*;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
@@ -113,6 +115,8 @@ public class PointServiceImpl implements IPointService {
 
     @Autowired
     private IPatrolDataSyncService patrolDataSyncService;
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
 
     @Override
     @Transactional
@@ -1898,6 +1902,9 @@ public class PointServiceImpl implements IPointService {
 
     @Override
     public List<Map<String, Object>> queryEquipPointInputItem(Long pointId) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
+
         List<Map<String, Object>> content =  pointMapper.queryEquipPointInputItem(pointId);
         content.forEach(e->{
             if(e.get("id")!=null && !StringUtils.isBlank(e.get("id").toString())){

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RiskJudgmentTaskServiceImpl.java

@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
@@ -27,6 +28,7 @@ import org.assertj.core.util.Sets;
 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.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -67,6 +69,8 @@ public class RiskJudgmentTaskServiceImpl implements IRiskJudgmentTaskService {
 
     @Autowired
     private AsyncTask asyncTask;
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
 
     private static final String permissionType = "activitiItem";
 
@@ -191,6 +195,8 @@ public class RiskJudgmentTaskServiceImpl implements IRiskJudgmentTaskService {
                 record.setOrgCode(orgCode);
                 records.add(record);
             }
+            // 权限处理
+            PermissionInterceptorContext.setDataAuthRule(authKey);
             riskJudgmentFillRecordMapper.saveBatch(records);
         } catch (Exception e) {
             logger.error("风险研判填写记录表初始化失败");
@@ -265,6 +271,8 @@ public class RiskJudgmentTaskServiceImpl implements IRiskJudgmentTaskService {
 
     public Long getCount(String flag, String deptId) {
         Long count = null;
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         switch (flag) {
             case "other_latent_danger_state_"://安全问题--
                 count = latentDangerMapper.countNotFinishByTypeAndDeptId(0, deptId);
@@ -389,6 +397,8 @@ public class RiskJudgmentTaskServiceImpl implements IRiskJudgmentTaskService {
 
     @Override
     public void freshRiskJudgmentLangerCount(Long riskSourceId) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         RiskSourceBo riskSource = riskSourceMapper.getById(riskSourceId);
         if (riskSource != null && StringUtil.isNotEmpty(riskSource.getBelongDepartmentId())) {
             Long count1 = latentDangerMapper.countNotFinishByTypeAndDeptId(1, riskSource.getBelongDepartmentId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RouteServiceImpl.java

@@ -13,8 +13,10 @@ import java.util.Set;
 
 import javax.annotation.Resource;
 
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import org.apache.commons.lang.StringUtils;
 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.stereotype.Service;
@@ -98,7 +100,9 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
 
     @Autowired
     private IRoutePointItemDao iRoutePointItemDao;
-    
+    @Value("${auth-key-auth-enabled:}")
+    private String authKey;
+
 
 
     @Override
@@ -526,6 +530,8 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
 
     @Override
     public List<PointInputItemVo> listRoutePointInputItem(Long routeId, Long pointId) {
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
         List<PointInputItemVo> inputItemList = routeMapper.getInputItemById(routeId, pointId);
         return inputItemList;
     }

amos-boot-system-jcs/src/main/resources/application-dev.properties

@@ -62,4 +62,6 @@ ifc.call-back.localIp=11.11.16.1
 #平台应用名称
 privilege.fegin.name=AMOS-API-PRIVILEGE
 feign.client.config.default.connect-timeout=20000
-feign.client.config.default.read-timeout=20000
+feign.client.config.default.read-timeout=20000
\ No newline at end of file
+
+auth-key-auth-enabled=auth-enabled
\ No newline at end of file

amos-boot-system-jcs/src/main/resources/application.properties

@@ -126,6 +126,7 @@ auth-key-fire-station=fire_station_info
 auth-key-key-site=key_site_info
 #消防人员
 auth-key-fire-fighters=fire_fighters_info
+auth-key-auth-enabled=auth-enabled
 #权限开关： true 启用权限 false 不启用
 mybatis.interceptor.enabled = true
 

amos-boot-system-patrol/src/main/resources/application-dev.properties

@@ -98,4 +98,6 @@ file.url=http://172.16.11.201:9000/
 logic=false
 
 #是否为中心级系统  true-中心级系统  false-站端系统
-is.zxj=true
+is.zxj=true
\ No newline at end of file
+
+auth-key-auth-enabled=auth-enabled
\ No newline at end of file