Skip to content

A
amos-boot-biz
Commit dedbf223 authored by zhangsen's avatar zhangsen
Browse files
Options

漏洞文件漏洞修改 - 权限问题

parent 866e0ac1
Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 0 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BigScreenController.java
View file @ dedbf223
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
import com.yeejoin.equipmanage.common.utils.CommonPageable;
import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
import com.yeejoin.equipmanage.common.utils.DateUtils;
......@@ -50,6 +51,9 @@ public class BigScreenController extends AbstractBaseController {
@Value("${equipment.pressurepump.start}")
private String pressurePumpStart;
@Value("${auth-key-auth-enabled:}")
private String authKeyEnabled;
@GetMapping(value = "/list")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "系统、消防水池、工业水池、水源总容积、消防车辆(接口弃用)", notes = "系统、消防水池、工业水池、水源总容积、消防车辆")
......@@ -82,6 +86,8 @@ public class BigScreenController extends AbstractBaseController {
@ApiOperation(value = "稳压泵列表信息")
@GetMapping("/getPressurePumpInfo")
public ResponseModel getPressurePumpInfo(CommonPageable commonPageable,@RequestParam(required = false, value = "companyCode")String companyCode) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
View file @ dedbf223
......@@ -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;
......@@ -148,6 +149,9 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
@Value("${auth-key-fire-build-video:fire_build_video_info}")
private String buildVideoAuthKey;
@Value("${auth-key-auth-enabled:}")
private String authKeyEnable;
@Autowired
private JCSRemoteService jcsRemoteService;
......@@ -363,6 +367,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
}
private void synWarehouse(Map<String, Object> formKeyMap) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnable);
String parentId = (String) formKeyMap.get("parentId");
String stuctureName = formInstanceMapper.getStuctureName(parentId);
if (StringUtils.isEmpty(stuctureName)){
......@@ -377,6 +383,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
@Override
@Transactional(rollbackFor = {Exception.class, BaseException.class})
public Object updateForm(Long instanceId, String orgCode, Map<String, Object> map, String groupCode) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnable);
if (StringUtil.isNotEmpty(groupCode)) {
map.keySet().forEach(x -> {
formInstanceMapper.updateFormFieldValue(instanceId, x, String.valueOf(map.get(x)));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java
View file @ dedbf223
......@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.util.StringUtil;
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.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.component.feign.config.InnerInvokException;
......@@ -171,6 +172,9 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
@Value("${car.max.speed:100}")
private Integer CAR_MAX_SPEED;
@Value("${auth-key-auth-enabled:}")
private String authKey;
/**
* 当前登录用户信息
*/
......@@ -1299,6 +1303,8 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
@Override
public List<CarPropertyVo> getCarPropertyList(List<Long> idList, Long teamId, String nameKeys, Integer isIot) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
List<CarPropertyVo> list = carMapper.getCarPropertyList(idList, teamId, nameKeys, isIot);
if (!CollectionUtils.isEmpty(list)) {
return list;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java
View file @ dedbf223
......@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
import com.yeejoin.amos.boot.module.jcs.api.dto.IotSystemAlarmRo;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.systemctl.model.MessageModel;
......@@ -83,6 +84,9 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
private static IEquipmentSpecificSerivce equipmentSpecificSerivce;
@Value("${auth-key-auth-enabled:}")
private String authKey;
@Autowired
@Lazy
......@@ -137,6 +141,8 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
@Override
public Map<String, Object> getDetailsById(String alarmId, String equipId, String type, String area) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
final String videoType = "video";
Map<String, Object> res = new HashMap<>();
if (videoType.equals(type)) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java
View file @ dedbf223
......@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
......@@ -68,6 +69,9 @@ public class EmergencyServiceImpl implements IEmergencyService {
@Value("${equipment.pressurepump.start.cron}")
private String pumpYesterdayStart;
@Value("${auth-key-auth-enabled:}")
private String authKey;
@Override
public List<Map<String, Object>> getSystemState(String bizOrgCode) {
List<Map<String, Object>> list = emergencyMapper.getSystemState(bizOrgCode);
......@@ -192,6 +196,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
@Override
public List<Map<String, Object>> selectAlarmAnalysis(String startDate, String endDate, String dataType, String date, String systemType) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
List<String> strings = emergencyMapper.selectSystemCodes(systemType);
if (!CollectionUtils.isEmpty(strings)) {
return emergencyMapper.selectAlarmAnalysis(startDate, endDate, dataType, date, strings);
......@@ -202,6 +208,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
@Override
public List<Map<String, Object>> selectAlarmAnalysisCount(String systemType, String startDate, String endDate) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
List<String> strings = emergencyMapper.selectSystemCodes(systemType);
if (!CollectionUtils.isEmpty(strings)) {
return emergencyMapper.selectAlarmAnalysisCount(startDate, endDate, strings);
......@@ -217,6 +225,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
@Override
public List<Map<String, Object>> selectFireCannonAlarmAnalysisPie(String startDate, String endDate, String systemType) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
List<String> strings = emergencyMapper.selectSystemCodes(systemType);
if (!CollectionUtils.isEmpty(strings)) {
return emergencyMapper.selectFireCannonAlarmAnalysisPie(startDate, endDate, strings);
......@@ -226,6 +236,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
@Override
public List<Map<String, Object>> waterSystemAlarmAnalysisPie(String startDate, String endDate, String systemType) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
List<String> strings = emergencyMapper.selectSystemCodes(systemType);
if (!CollectionUtils.isEmpty(strings)) {
return emergencyMapper.waterSystemAlarmAnalysisPie(startDate, endDate, strings);
......@@ -235,6 +247,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
@Override
public List<Map<String, Object>> waterSystemAlarmAnalysis(String startDate, String endDate, String dataType, String date, String systemType) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
List<String> strings = emergencyMapper.selectSystemCodes(systemType);
if (!CollectionUtils.isEmpty(strings)) {
return emergencyMapper.waterSystemAlarmAnalysis(startDate, endDate, dataType, date, strings);
......@@ -245,6 +259,8 @@ public class EmergencyServiceImpl implements IEmergencyService {
@Override
public List<Map<String, Object>> fireCannonSystemAlarmAnalysis(String startDate, String endDate, String dataType, String date, String systemType) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
List<String> strings = emergencyMapper.selectSystemCodes(systemType);
if (!CollectionUtils.isEmpty(strings)) {
return emergencyMapper.fireCannonSystemAlarmAnalysis(startDate, endDate, dataType, date, strings);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmLogServiceImpl.java
View file @ dedbf223
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
import com.yeejoin.equipmanage.common.entity.*;
import com.yeejoin.equipmanage.common.entity.dto.EquipmentAlarmLogDto;
import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
......@@ -73,9 +74,13 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
IotFeign iotFeign;
@Autowired
IESeqService eSeqService;
@Value("${auth-key-auth-enabled:}")
private String authKey;
@Override
public void updateAlarmLogByIotCodeAndIndexKey(EquipmentSpecificAlarm equipmentSpecificAlarm) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
equipmentSpecificAlarmLogMapper.updateAlarmLogByIotCodeAndIndexKey(equipmentSpecificAlarm);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @ dedbf223
......@@ -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;
......@@ -376,6 +377,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Value("${equipment.pressurepump.start}")
private String pressurePumpStart;
@Value("${auth-key-auth-enabled:}")
private String authKey;
private StockBill buildStockBills(EquipmentSpecific equipmentSpecific, ReginParams reginParams, AgencyUserModel agencyUserModel) {
StockBill stockBill = new StockBill();
stockBill.setCreatorId(Long.valueOf(agencyUserModel.getUserId()));
......@@ -1186,6 +1190,8 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
}
public Map<String, Double> getEquipLocationInfo(Long equipmentSpecificId) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
return equipmentSpecificMapper.getEquipLocationInfo(equipmentSpecificId);
}
......@@ -2138,6 +2144,8 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Override
public void updateEquipSpecificStatus(String status, String id) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
Integer num = equipmentSpecificMapper.updateEquipSpecificStatus(status, id);
if (0 < num) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @ dedbf223
......@@ -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;
......@@ -155,6 +156,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Value("${auth-key-fire-system:fire_system_info}")
private String authKey;
@Value("${auth-key-auth-enabled:}")
private String authKeyEnabled;
@Value("${equipment.type}")
String equipmentCategoryLeftTypeCode;
......@@ -1437,6 +1441,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override
public Map<String, Object> equipAlarmTOP(HashMap<String, Object> hashMap) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
Map<String, Object> resultMap = new HashMap<>();
String id = fireFightingSystemMapper.equipmentId(hashMap);
hashMap.put("systemId", id);
......@@ -1460,6 +1466,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override
public Page<Map<String, Object>> equipmentState(Page res, HashMap<String, Object> hashMap) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
Page result = new Page<>(res.getCurrent(), res.getSize());
String id = fireFightingSystemMapper.equipmentId(hashMap);
Page<Map<String, Object>> mapPage = fireFightingSystemMapper.equipmentState(result, id);
......@@ -1468,6 +1476,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override
public Page<Map<String, Object>> equipmentStateBySuper(Page res, HashMap<String, Object> hashMap) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
Page result = new Page<>(res.getCurrent(), res.getSize());
String id = fireFightingSystemMapper.equipmentIdBySuper(hashMap);
if (!StringUtil.isNotEmpty(id)) {
......@@ -1582,6 +1592,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override
public BigScreenVo getCarInfo(String companyCode) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
String bizOrgCode = null;
if (StringUtil.isNotEmpty(companyCode)) {
bizOrgCode = fireFightingSystemMapper.queryByCompanyCode(companyCode);
......@@ -1603,6 +1615,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
}
private Map<String, Object> getData(String bizOrgCode, String startDate, String endDate) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
Map<String, Object> map = new HashMap<>();
// 查询该站信息以及所有系统
List<Map<String, Object>> system = fireFightingSystemMapper.selectSystemByBizOrgCode(bizOrgCode);
......@@ -1808,6 +1822,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
}
private Map<String, Object> getWeekData(String bizOrgCode, String startDate, String endDate) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
Map<String, Object> map = new HashMap<>();
// 查询该站信息以及所有系统
List<Map<String, Object>> systemList = fireFightingSystemMapper.selectSystemByBizOrgCode(bizOrgCode);
......@@ -2013,6 +2029,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
}
private Map<String, Object> getDayData(String bizOrgCode, String startDate, String endDate) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
Map<String, Object> map = new HashMap<>();
// 查询该站信息以及所有系统
List<Map<String, Object>> systemList = fireFightingSystemMapper.selectSystemByBizOrgCode(bizOrgCode);
......@@ -2221,6 +2239,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override
public Page<Map<String, Object>> getWaterInfo(Page page, String companyCode, String systemCode) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
String bizOrgCode = null;
if (StringUtil.isNotEmpty(companyCode)) {
bizOrgCode = fireFightingSystemMapper.queryByCompanyCode(companyCode);
......@@ -2230,6 +2250,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override
public Page<Map<String, Object>> getSystemInfo(Page page, String companyCode, String systemCode) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
String bizOrgCode = null;
if (StringUtil.isNotEmpty(companyCode)) {
bizOrgCode = fireFightingSystemMapper.queryByCompanyCode(companyCode);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FormInstanceServiceImpl.java
View file @ dedbf223
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
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.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
import com.yeejoin.equipmanage.common.entity.FormGroup;
......@@ -78,6 +79,9 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
@Value("${systemctl.dict.building-structure-type}")
private String buildingStructureType;
@Value("${auth-key-auth-enabled:}")
private String authKey;
private final String CODE = "code";
private final String ORGCODE = "orgCode";
......@@ -133,6 +137,8 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
@Override
@Transactional(rollbackFor = {Exception.class, BaseException.class})
public Map<String, Object> updateInstance(Long instanceId, String companyCode, Map<String, Object> map) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
//1.插入前数据校验
List<FormInstance> list = this.queryByInstanceId(instanceId);
if (CollectionUtils.isEmpty(list)) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MaintenanceResourceDataServiceImpl.java
View file @ dedbf223
......@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.interceptors.PermissionInterceptorContext;
import com.yeejoin.equipmanage.common.dto.MaintenanceResourceDataDto;
import com.yeejoin.equipmanage.common.entity.MaintenanceResource;
import com.yeejoin.equipmanage.common.entity.MaintenanceResourceData;
......@@ -26,6 +27,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -61,6 +63,9 @@ public class MaintenanceResourceDataServiceImpl extends ServiceImpl<MaintenanceR
@Autowired
private EmqKeeper emqKeeper;
@Value("${auth-key-auth-enabled:}")
private String authKey;
/**
* 查询消防设施资源数据
*
......@@ -113,6 +118,8 @@ public class MaintenanceResourceDataServiceImpl extends ServiceImpl<MaintenanceR
*/
@Override
public int deleteMaintenanceResourceDataByIds(Long[] ids) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
if (ids != null && ids.length > 0) {
List<MaintenanceResourceDataDto> list = maintenanceResourceDataMapper.deleteBeforeMainResCount(ids);
List<MaintenanceResourceDataDto> list1 = maintenanceResourceDataMapper.deleteBeforeMainResCount(null);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MaintenanceResourceServiceImpl.java
View file @ dedbf223
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
import com.yeejoin.equipmanage.common.dto.MaintenanceResourceDto;
import com.yeejoin.equipmanage.common.dto.WaterResourceDto;
import com.yeejoin.equipmanage.common.dto.WaterResourceTypeDto;
......@@ -20,6 +21,7 @@ import com.yeejoin.equipmanage.mapper.MaintenanceResourceDataMapper;
import com.yeejoin.equipmanage.mapper.MaintenanceResourceMapper;
import com.yeejoin.equipmanage.service.IMaintenanceResourceService;
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.springframework.util.ObjectUtils;
......@@ -50,6 +52,9 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
@Autowired
private JcsFeign jcsFeign;
@Value("${auth-key-auth-enabled:}")
private String authKey;
/**
* 查询维保设施资源树
*
......@@ -279,6 +284,8 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
@Override
public IPage<MaintenanceResourceDataVo> combineDataPage(Page page, Long fireFightSysId, Long fireFacilityId, String fireFacilityName, String classifyId, List<Long> buildingId,String maintenanceCompanyId, String appKey, String product, String token) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
// 存放组合键，ID+type，数据库查看是否已关联
List<String> keyList = new ArrayList<>();
int current = Integer.parseInt(String.valueOf(page.getCurrent()));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MonitorEventService.java
View file @ dedbf223
......@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.equipmanage.common.entity.MonitorEvent;
import com.yeejoin.equipmanage.common.entity.Video;
......@@ -14,6 +15,7 @@ import com.yeejoin.equipmanage.mapper.MonitorEventMapper;
import com.yeejoin.equipmanage.service.IVideoService;
import com.yeejoin.equipmanage.service.IVideoSourceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
......@@ -51,6 +53,9 @@ public class MonitorEventService
@Autowired
private IVideoSourceService videoSourceService;
@Value("${auth-key-auth-enabled:}")
private String authKey;
public MonitorEventDto createMonitorEvent(MonitorEventDto model)
......@@ -79,6 +84,8 @@ public class MonitorEventService
}
}
model.setId(UUIDUtils.getUUIDInOrderId().longValue());
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
monitorEventMapper.saveEvent(model);
return model;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java
View file @ dedbf223
......@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.influxdb.InfluxDbConnection;
......@@ -220,6 +221,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
private Resource systemStateIndex;
@Value("${message.alarm.char}")
private String specialChars;
@Value("${auth-key-auth-enabled:}")
private String authKeyEnable;
public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey,
String traceId, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService,
......@@ -1383,6 +1386,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
* @param equipmentSpecificIndex equipmentSpecificIndex
*/
private boolean doWaterPoolLevel(IotDataVO iotDataVO, EquipmentSpecificIndex equipmentSpecificIndex, Map<String, String> messageBody) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnable);
boolean alarmFlag = false;
MessageModel model = new MessageModel();
Map<String, Object> map = fireFightingSystemMapper.getWaterPoolLevel(equipmentSpecificIndex.getEquipmentSpecificId());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/PressurePumpServiceImpl.java
View file @ dedbf223
......@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
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.equipmanage.common.dto.OrgUsrDto;
......@@ -55,6 +56,9 @@ public class PressurePumpServiceImpl implements IPressurePumpService {
@Value("${equipment.pressurepump.pipepressure}")
private String pressurePumpPipePressure;
@Value("${auth-key-auth-enabled:}")
private String authKeyEnabled;
@Override
@Async
public void saveDataToRedis(List<IotDataVO> iotDatalist, String iotCode, String bizOrgCode) {
......@@ -437,6 +441,8 @@ public class PressurePumpServiceImpl implements IPressurePumpService {
}
public List<OrgUsrDto> getOrgUsrDtoInfo(Map<String, String> map) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
return orgUsrMapper.getOrgUsrDtoInfo(map);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/RiskSourceServiceImpl.java
View file @ dedbf223
......@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
import com.yeejoin.equipmanage.common.dto.FireRiskSourceDto;
import com.yeejoin.equipmanage.common.entity.*;
import com.yeejoin.equipmanage.common.enums.DynamicLabelEnum;
......@@ -17,6 +18,7 @@ import com.yeejoin.equipmanage.service.IRiskSourceService;
import liquibase.pro.packaged.E;
import lombok.extern.slf4j.Slf4j;
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;
......@@ -49,6 +51,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
@Autowired
EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
@Value("${auth-key-auth-enabled:}")
private String authKey;
@Override
@Transactional
public List<FireRiskSourceDto> getFiskSourceTierTree(Integer tier, Boolean isRegion) {
......@@ -75,6 +80,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
SendToMsgRiskAlarmInfoVo equipAlarm = new SendToMsgRiskAlarmInfoVo();
Map<String, Object> m = new HashMap<>();
RiskBizInfoVo infoVo = new RiskBizInfoVo();
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
if (source.equalsIgnoreCase(RiskSourceTypeEnum.PATROL.getName())) {
List<Map<String, Object>> checkInputItems = equipmentSpecificMapper.queryCheckInputItemsByCheckId(id);
Map<String, Object> map = checkInputItems.get(0);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java
View file @ dedbf223
......@@ -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;
......@@ -116,6 +118,9 @@ public class CheckServiceImpl implements ICheckService {
@Autowired
private IdxFeign idxFeign;
@Value("${auth-key-auth-enabled:}")
private String authKeyEnabled;
public static final Logger log = LoggerFactory.getLogger(CheckServiceImpl.class);
@Override
......@@ -1540,6 +1545,8 @@ public class CheckServiceImpl implements ICheckService {
private EquipFeign equipment;
@Override
public List<HashMap<String,Object>> getEquipByCheckId(CheckDetailInputPageParam param) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
// 如果不传巡检ID，则获取最新一条巡检点对应的巡检记录ID
if (param.getCheckID() == -1) {
Long checkID = getLastsetCheckByPointID(param.getPointID());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/InputItemServiceImpl.java
View file @ dedbf223
......@@ -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;
......@@ -48,6 +49,9 @@ public class InputItemServiceImpl implements IInputItemService {
@Autowired
private RemoteSecurityService remoteSecurityService;
@Value("${auth-key-auth-enabled:}")
private String authKeyEnabled;
......@@ -234,6 +238,8 @@ public class InputItemServiceImpl implements IInputItemService {
@Override
public List<PointInputItemVo> queryCustomInputItemNew(HashMap<String,Object> param, String orgCode,String companyBizOrgCode) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
param.put("orgCode",orgCode);
param.put("bizOrgCode",companyBizOrgCode);
List<String> list = new ArrayList<>();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java
View file @ dedbf223
......@@ -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;
......@@ -157,6 +158,9 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
private static final String path = "AppNormalLatentDangerReview";
@Value("${auth-key-auth-enabled:}")
private String authKeyEnabled;
@Value("${server.port}")
private String port;
......@@ -355,6 +359,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
}
private void updateCheckInputDangerState(Long id, int code) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
latentDangerMapper.updateCheckInputDangerState(id, code);
// 巡检站端与中心级数据同步
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
......@@ -1468,6 +1474,8 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
}
private List<String> getTroubleList(Long pointId) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
List<String> troubleList = Lists.newArrayList();
List<LatentDangerPatrolBo> patrolList = latentDangerPatrolMapper.listByPointId(pointId);
if (!CollectionUtils.isEmpty(patrolList)) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java
View file @ dedbf223
......@@ -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;
......@@ -143,6 +145,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
private final String APP_WEB = "APP/WEB";
private static final String TAB = "\r\n";
@Value("${auth-key-auth-enabled:}")
private String authKeyEnabled;
@Override
public Page<HashMap<String, Object>> getPlanTaskInfo(String toke, String product, String appKey, PlanTaskPageParam params) {
......@@ -1518,6 +1523,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
@Override
public AppPointCheckRespone queryPointPlanTaskDetailInVersion2(String toke, String product, String appKey, Long planTaskId, Long pointId) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
AppPointCheckRespone pointCheckRespone = new AppPointCheckRespone();
Check check = checkDao.findByPlanTaskIdAndPointId(planTaskId, pointId);
if (check != null) {
......@@ -2044,6 +2051,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
@Override
public List<Map<String, Object>> getStatics(String companyCode, String bizOrgCode) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
if (StringUtils.isEmpty(bizOrgCode) && StringUtil.isNotEmpty(companyCode)) {
bizOrgCode = planTaskMapper.queryByCompanyCode(companyCode);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RiskJudgmentTaskServiceImpl.java
View file @ dedbf223
......@@ -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;
......@@ -70,6 +72,9 @@ public class RiskJudgmentTaskServiceImpl implements IRiskJudgmentTaskService {
private static final String permissionType = "activitiItem";
@Value("${auth-key-auth-enabled:}")
private String authKeyEnabled;
@Override
public void initRiskJudgmentTask(Date date) {
List<CompanyBo> companyBoList = remoteSecurityService.listCompanyTree();
......@@ -143,6 +148,8 @@ public class RiskJudgmentTaskServiceImpl implements IRiskJudgmentTaskService {
}
private boolean initRiskJudgment(JSONObject taskInstance, DepartmentBo departmentBo, Date date, List<RiskJudgmentItemBo> items, String orgCode, String companyId, String instanceId, String businessKey) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
try {
RiskJudgmentTaskBo riskJudgmentTaskBo = new RiskJudgmentTaskBo();
String currentFlowTaskId = taskInstance.getString("id");
......@@ -333,6 +340,9 @@ public class RiskJudgmentTaskServiceImpl implements IRiskJudgmentTaskService {
@Override
public void updateRiskJudgmentTaskToOverTime(Date date) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
String dateStr = DateUtil.formatDatrToStr(date, DateUtil.SHORT_PATTERN);
RiskJudgmentTaskStatusEnum statusEnum = RiskJudgmentTaskStatusEnum.已超时;
List<RiskJudgmentTaskBo> taskBos = riskJudgmentTaskMapper.listByDateAndStatus(dateStr, RiskJudgmentTaskStatusEnum.进行中.getCode());
......@@ -366,6 +376,8 @@ public class RiskJudgmentTaskServiceImpl implements IRiskJudgmentTaskService {
@Override
public void updateRiskJudgmentTaskToProcess(Date date) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
String dateStr = DateUtil.formatDatrToStr(date, DateUtil.SHORT_PATTERN);
RiskJudgmentTaskStatusEnum statusEnum = RiskJudgmentTaskStatusEnum.进行中;
List<RiskJudgmentTaskBo> taskBos = riskJudgmentTaskMapper.listByDateAndStatus(dateStr, RiskJudgmentTaskStatusEnum.未开始.getCode());
......@@ -389,6 +401,8 @@ public class RiskJudgmentTaskServiceImpl implements IRiskJudgmentTaskService {
@Override
public void freshRiskJudgmentLangerCount(Long riskSourceId) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
RiskSourceBo riskSource = riskSourceMapper.getById(riskSourceId);
if (riskSource != null && StringUtil.isNotEmpty(riskSource.getBelongDepartmentId())) {
Long count1 = latentDangerMapper.countNotFinishByTypeAndDeptId(1, riskSource.getBelongDepartmentId());
......@@ -411,6 +425,8 @@ public class RiskJudgmentTaskServiceImpl implements IRiskJudgmentTaskService {
@Override
public void freshRiskJudgmentTaskwork(String deptId) {
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKeyEnabled);
//循环更新riskJudgmentFillRecordMapper 的 select_result and input_result
Long count = 0L;
String defaultSelectId = null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment