添加监管机构树接口

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsTwoStaffingController.java

 package com.yeejoin.amos.boot.module.tcm.biz.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
-import com.yeejoin.amos.boot.module.tcm.biz.service.impl.TzsTwoStaffingServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzsTwoStaffingDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
-/**
- * 
- *
- * @author system_generator
- * @date 2023-10-27
- */
 @RestController
-@Api(tags = "FreeMarker template error (DEBUG mode; use RETHROW in production!):
-The following has evaluated to null or missing:
-==> table.comment  [in template "template/controller.java.ftl" at line 34, column 16]
-
-----
-Tip: It's the step after the last dot that caused this error, not those before it.
-----
-Tip: If the failing expression is known to legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
+@Api(tags = "统计")
+@RequestMapping(value = "/twoStaff")
+public class TzsTwoStaffingController extends BaseController {
 
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: ${table.comment}  [in template "template/controller.java.ftl" at line 34, column 14]
-----
 
-Java stack trace (for programmers):
-----
-freemarker.core.InvalidReferenceException: [... Exception message was already printed; see it above ...]
-	at freemarker.core.InvalidReferenceException.getInstance(InvalidReferenceException.java:134)
-	at freemarker.core.EvalUtil.coerceModelToTextualCommon(EvalUtil.java:481)
-	at freemarker.core.EvalUtil.coerceModelToStringOrMarkup(EvalUtil.java:401)
-	at freemarker.core.EvalUtil.coerceModelToStringOrMarkup(EvalUtil.java:370)
-	at freemarker.core.DollarVariable.calculateInterpolatedStringOrMarkup(DollarVariable.java:100)
-	at freemarker.core.DollarVariable.accept(DollarVariable.java:63)
-	at freemarker.core.Environment.visit(Environment.java:347)
-	at freemarker.core.Environment.visit(Environment.java:353)
-	at freemarker.core.Environment.visit(Environment.java:353)
-	at freemarker.core.Environment.process(Environment.java:326)
-	at freemarker.template.Template.process(Template.java:383)
-	at com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine.writer(FreemarkerTemplateEngine.java:52)
-	at com.baomidou.mybatisplus.generator.engine.AbstractTemplateEngine.batchOutput(AbstractTemplateEngine.java:81)
-	at com.baomidou.mybatisplus.generator.AutoGenerator.execute(AutoGenerator.java:102)
-	at com.yeejoin.amos.boot.biz.common.utils.MyBatisPlusCodeGeneratorTzs.main(MyBatisPlusCodeGeneratorTzs.java:305)
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java

@@ -33,9 +33,8 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 @Api(tags = "用户信息Api")
@@ -54,6 +53,8 @@ public class TzsUserInfoController extends BaseController {
     @Autowired
     RedisUtils redisUtils;
 
+    private static final String REGULATOR_UNIT_TREE = "REGULATOR_UNIT_TREE";
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
@@ -327,4 +328,38 @@ public class TzsUserInfoController extends BaseController {
 //        return ResponseHelper.buildResponse("ok");
 //    }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getTree")
+    @ApiOperation(httpMethod = "GET", value = "通过组id查询组及组内人员信息", notes = "通过组id查询组及组内人员信息")
+    public ResponseModel<Object> getGroupAndPersonInfo() {
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        if (ObjectUtils.isEmpty(reginParams)) {
+            return null;
+        }
+        Long id = reginParams.getCompany().getSequenceNbr();
+        List<LinkedHashMap> data = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
+        ArrayList<LinkedHashMap> result = new ArrayList<>();
+        return ResponseHelper.buildResponse(screenData(result, data, id.toString()));
+    }
+
+    private List<LinkedHashMap> screenData(List<LinkedHashMap> result, List<LinkedHashMap> data, String id) {
+        if (!ObjectUtils.isEmpty(result)) {
+            return result;
+        }
+        List<LinkedHashMap> list = data.stream().filter(item -> item.get("sequenceNbr").toString().equals(id)).collect(Collectors.toList());
+        if (!ObjectUtils.isEmpty(list)) {
+            return list;
+        }
+        for (LinkedHashMap item : data) {
+            if (!ObjectUtils.isEmpty(item.get("children"))) {
+                List<LinkedHashMap> children = screenData(result, (List<LinkedHashMap>) item.get("children"), id);
+                if (!ObjectUtils.isEmpty(children)) {
+                    result = children;
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
 }