Commit 09a0b393 authored by 麻笑宇's avatar 麻笑宇

25630 大屏-总览-左侧“安全追溯”卡片-更多列表,列表管辖机构筛选项异常,只有一个陕西省市场监督管理局

增加新接口,根据当前登录人监管单位查询下级。
parent 23206b40
...@@ -19,6 +19,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest; ...@@ -19,6 +19,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -181,4 +182,11 @@ public class ZLDPStatisticsController { ...@@ -181,4 +182,11 @@ public class ZLDPStatisticsController {
public ResponseModel<List<Map<String, String>>> personType(@RequestParam(value = "companyType",required = false) String companyType) { public ResponseModel<List<Map<String, String>>> personType(@RequestParam(value = "companyType",required = false) String companyType) {
return ResponseHelper.buildResponse(statisticsService.getPersonType(companyType)); return ResponseHelper.buildResponse(statisticsService.getPersonType(companyType));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getRegulatorUnitTree")
@ApiOperation(httpMethod = "GET", value = "查询监管部门树", notes = "查询监管部门树")
public ResponseModel<Object> getRegulatorUnitTree(){
return ResponseHelper.buildResponse(statisticsService.getRegulatorUnitTree());
}
} }
package com.yeejoin.amos.boot.module.statistcs.biz.service.impl; package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.dto.CountDto; import com.yeejoin.amos.boot.biz.common.dto.CountDto;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary; import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl; import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto; import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto; import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import com.yeejoin.amos.boot.module.common.api.entity.AlertStatistics; import com.yeejoin.amos.boot.module.common.api.entity.AlertStatistics;
...@@ -26,6 +30,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum; ...@@ -26,6 +30,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.feign.systemctl.model.RegionModel; import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import org.apache.catalina.security.SecurityUtil;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.queryparser.classic.QueryParser;
...@@ -49,6 +54,7 @@ import org.springframework.core.io.Resource; ...@@ -49,6 +54,7 @@ import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import java.io.IOException; import java.io.IOException;
...@@ -65,6 +71,7 @@ public class ZLDPStatisticsServiceImpl { ...@@ -65,6 +71,7 @@ public class ZLDPStatisticsServiceImpl {
private static final String EQU_STATE = "EQU_STATE"; private static final String EQU_STATE = "EQU_STATE";
private static final String REGULATOR_UNIT_TREE = "REGULATOR_UNIT_TREE";
private final ZLStatisticsMapper screenMapper; private final ZLStatisticsMapper screenMapper;
...@@ -89,6 +96,9 @@ public class ZLDPStatisticsServiceImpl { ...@@ -89,6 +96,9 @@ public class ZLDPStatisticsServiceImpl {
private Resource equipCategory; private Resource equipCategory;
@Autowired @Autowired
private RedisUtils redisUtils;
@Autowired
private TzsServiceFeignClient tzsServiceFeignClient; private TzsServiceFeignClient tzsServiceFeignClient;
public ZLDPStatisticsServiceImpl(ZLStatisticsMapper screenMapper, DataDictionaryServiceImpl iDataDictionaryService, AlertStatisticsMapper alertStatisticsMapper, RestHighLevelClient restHighLevelClient, StCommonServiceImpl stCommonService, EquipmentCategoryMapper equipmentCategoryMapper) { public ZLDPStatisticsServiceImpl(ZLStatisticsMapper screenMapper, DataDictionaryServiceImpl iDataDictionaryService, AlertStatisticsMapper alertStatisticsMapper, RestHighLevelClient restHighLevelClient, StCommonServiceImpl stCommonService, EquipmentCategoryMapper equipmentCategoryMapper) {
...@@ -1158,4 +1168,26 @@ public class ZLDPStatisticsServiceImpl { ...@@ -1158,4 +1168,26 @@ public class ZLDPStatisticsServiceImpl {
public List<Map<String, Object>> getInformationManageType() { public List<Map<String, Object>> getInformationManageType() {
return InformationManageTypeEnum.getEnumList(); return InformationManageTypeEnum.getEnumList();
} }
public Object getRegulatorUnitTree() {
List<LinkedHashMap> data = (List<LinkedHashMap>)redisUtils.get("REGULATOR_UNIT_TREE");
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
return findCompanyByCode(data,reginParams.getCompany().getCompanyCode());
}
private LinkedHashMap findCompanyByCode(List<LinkedHashMap> tree, String companyCode) {
for (LinkedHashMap node : tree) {
if (companyCode.equals(node.get("companyCode"))) {
return node;
}
if (node.containsKey("children") && node.get("children") instanceof List) {
LinkedHashMap foundNode = findCompanyByCode((List<LinkedHashMap>) node.get("children"), companyCode);
if (foundNode != null) {
return foundNode;
}
}
}
return 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