Commit adebc90d authored by tianyiming's avatar tianyiming

添加行政审批局树

parent 55f3ce0a
...@@ -67,6 +67,19 @@ public class CommonController extends BaseController { ...@@ -67,6 +67,19 @@ public class CommonController extends BaseController {
return ResponseHelper.buildResponse(commonService.getTree()); return ResponseHelper.buildResponse(commonService.getTree());
} }
/**
* 获取行政审批局树
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getApproveTree")
@ApiOperation(httpMethod = "GET", value = "获取行政审批局树", notes = "获取行政审批局树")
public ResponseModel<Object> getApproveTree() {
return ResponseHelper.buildResponse(commonService.getApproveTree());
}
/** /**
* 通过单位类型获取单位列表 * 通过单位类型获取单位列表
* *
......
package com.yeejoin.amos.boot.module.jg.biz.listener;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.StartPlatformTokenService;
import lombok.extern.slf4j.Slf4j;
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.component.emq.EmqxListener;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
@Component
@Slf4j
public class PlatformUserTopicMessage extends EmqxListener {
private final String companyType = "行政审批局";
@Resource
protected EmqKeeper emqKeeper;
@Value("${amos.operation.log}")
private String amosOperationLog;
@PostConstruct
void init() throws Exception {
emqKeeper.subscript(amosOperationLog, 2, this);
}
@Value("${amos.agency.code}")
String amosAgencyCode;
@Autowired
RedisUtils redisUtil;
@Autowired
StartPlatformTokenService platformTokenService;
@Autowired
ICommonService commonService;
@Override
public void processMessage(String topic, MqttMessage message) {
platformTokenService.getToken();
JSONObject jsonObject = JSON.parseObject(message.toString());
JSONObject result = jsonObject.getJSONObject("result");
JSONObject dataResult = result.getJSONObject("result");
String path = result.getString("path");
String agencyCode = jsonObject.getString("agencyCode");
if (!amosAgencyCode.equals(agencyCode)) {
return;
}
try {
if (StringUtils.isNotEmpty(path)) {
if (dataResult.get("companyType").toString().contains(companyType)) {
commonService.creatApproveTree();
}
}
} catch (Exception e) {
log.info("平台同步消息失败:{}", e.getMessage());
}
log.info("平台推送消息同步完成");
}
}
...@@ -23,6 +23,7 @@ public interface ICommonService { ...@@ -23,6 +23,7 @@ public interface ICommonService {
List<LinkedHashMap> getRegion(String level, String parentId); List<LinkedHashMap> getRegion(String level, String parentId);
List<LinkedHashMap> getTree(); List<LinkedHashMap> getTree();
List<LinkedHashMap> getApproveTree();
List<LinkedHashMap> creatTree(); List<LinkedHashMap> creatTree();
...@@ -37,4 +38,6 @@ public interface ICommonService { ...@@ -37,4 +38,6 @@ public interface ICommonService {
List<Map<String,Object>> getEnterpriseEmployee(String unitCode); List<Map<String,Object>> getEnterpriseEmployee(String unitCode);
void generateCertificateReport(Map<String, Object> map, HttpServletResponse response); void generateCertificateReport(Map<String, Object> map, HttpServletResponse response);
List<LinkedHashMap> creatApproveTree();
} }
...@@ -73,6 +73,9 @@ public class CommonServiceImpl implements ICommonService { ...@@ -73,6 +73,9 @@ public class CommonServiceImpl implements ICommonService {
//管辖机构redis缓存key //管辖机构redis缓存key
private static final String REGULATOR_UNIT_TREE = "REGULATOR_UNIT_TREE"; private static final String REGULATOR_UNIT_TREE = "REGULATOR_UNIT_TREE";
//行政审批局redis缓存key
private static final String ADMINISTRATION_UNIT_TREE = "ADMINISTRATION_UNIT_TREE";
@Value("${regulator.unit.code}") @Value("${regulator.unit.code}")
private String code; private String code;
...@@ -174,7 +177,7 @@ public class CommonServiceImpl implements ICommonService { ...@@ -174,7 +177,7 @@ public class CommonServiceImpl implements ICommonService {
@Override @Override
public List<LinkedHashMap> creatTree() { public List<LinkedHashMap> creatTree() {
FeignClientResult tree = privilegeFeginService.tree(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct()); FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult(); List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
List<LinkedHashMap> treeData = deleteRegulatorTreeData(result); List<LinkedHashMap> treeData = deleteRegulatorTreeData(result);
List<LinkedHashMap> supervisionTree = treeData.stream().filter(e -> code.equals(e.get("orgCode"))).collect(Collectors.toList()); List<LinkedHashMap> supervisionTree = treeData.stream().filter(e -> code.equals(e.get("orgCode"))).collect(Collectors.toList());
...@@ -184,6 +187,41 @@ public class CommonServiceImpl implements ICommonService { ...@@ -184,6 +187,41 @@ public class CommonServiceImpl implements ICommonService {
} }
@Override @Override
public List<LinkedHashMap> getApproveTree() {
List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(ADMINISTRATION_UNIT_TREE);
//判断redis是否存在行政审批局树
return !ObjectUtils.isEmpty(result) ? result : creatApproveTree();
}
@Override
public List<LinkedHashMap> creatApproveTree() {
FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
List<LinkedHashMap> children = (List<LinkedHashMap>)result.get(0).get("children");
List<LinkedHashMap> treeData = deleteTreeData(children);
List<LinkedHashMap> resultTree = updateNullChildren(treeData);
redisUtils.set(ADMINISTRATION_UNIT_TREE, resultTree);
return resultTree;
}
private List<LinkedHashMap> deleteTreeData(List<LinkedHashMap> result) {
Iterator it = result.iterator();
while (it.hasNext()) {
LinkedHashMap e = (LinkedHashMap) it.next();
// 删除非行政审批局
if (!e.get("companyType").toString().contains("行政审批局")) {
it.remove();
}
if (!ObjectUtils.isEmpty(e.get("children"))) {
deleteTreeData((List<LinkedHashMap>) e.get("children"));
}
}
return result;
}
@Override
public List<Map<String, Object>> getUnitListByType(String type) { public List<Map<String, Object>> getUnitListByType(String type) {
if (type.equals("use")) { if (type.equals("use")) {
...@@ -341,6 +379,7 @@ public class CommonServiceImpl implements ICommonService { ...@@ -341,6 +379,7 @@ public class CommonServiceImpl implements ICommonService {
} }
} }
/** /**
* word 转 pdf * word 转 pdf
* *
......
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.yeejoin.amos.boot.module.jg.biz.utils.RedisUtil;
import com.yeejoin.amos.component.robot.AmosRequestContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
@Service
public class StartPlatformTokenService {
@Autowired
RedisUtil redisUtil;
@Autowired
AmosRequestContext amosRequestContext;
public void getToken() {
RequestContext.setProduct(amosRequestContext.getProduct());
RequestContext.setAppKey(amosRequestContext.getAppKey());
RequestContext.setToken(amosRequestContext.getToken());
}
}
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