From ee2c4f6c831e97df5fe01b5e7c208c9a66e89c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 31 Jan 2024 13:41:21 +0800
Subject: [PATCH] 'commit'

---
 src/main/java/com/YunXiao/Study.java          |  2 +-
 .../Collect/Controller/CollectController.java | 42 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/YunXiao/Study.java b/src/main/java/com/YunXiao/Study.java
index e8bd34ba..e6656b29 100644
--- a/src/main/java/com/YunXiao/Study.java
+++ b/src/main/java/com/YunXiao/Study.java
@@ -63,7 +63,7 @@ public class Study {
         //初始化
         SyncUtil.init();
 
-
+        //从天喻获取所有单位名单
         List<JSONObject> list = new ArrayList<>();
         if (!RedisKit.Exists(KEY)) {
             //获取所有机构+学校
diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
index 50db9f37..83c17a37 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
@@ -1,6 +1,7 @@
 package com.dsideal.QingLong.Collect.Controller;
 
 import cn.hutool.core.io.FileUtil;
+import com.YunXiao.SortClass;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.QingLong.Base.Model.BaseModel;
@@ -1650,10 +1651,10 @@ public class CollectController extends Controller {
         int job_type = jobRecord.getInt("job_type");//任务类型：1：表单，2：EXCEL模板
         switch (job_type) {
             case 1:
-                cm.getSummaryExcelForFormFill(job_id,bureau_id,publish_role_id, excelPath); //测试用例 job_id=8
+                cm.getSummaryExcelForFormFill(job_id, bureau_id, publish_role_id, excelPath); //测试用例 job_id=8
                 break;
             case 2:
-                cm.getSummaryExcelForImportExcel(job_id,bureau_id,publish_role_id, excelPath);//测试用例 job_id=47
+                cm.getSummaryExcelForImportExcel(job_id, bureau_id, publish_role_id, excelPath);//测试用例 job_id=47
                 break;
         }
         //提供下载
@@ -1899,4 +1900,41 @@ public class CollectController extends Controller {
         renderJson(map);
     }
 
+    /**
+     * 功能：获取天喻的所有单位列表
+     * http://10.10.21.20:9000/QingLong/collect/getTyAllBureau
+     * @throws InterruptedException
+     */
+    @Before({GET.class, RepeatIntercetpor.class})
+    public void getTyAllBureau() throws InterruptedException {
+        String KEY = "TY_BUREAU";
+        //从天喻获取所有单位名单
+        List<JSONObject> list = new ArrayList<>();
+        if (!RedisKit.Exists(KEY)) {
+            //获取所有机构+学校
+            com.YunXiao.Model.BaseModel ybm = new com.YunXiao.Model.BaseModel();
+            List<JSONObject> jBureauList = ybm.getBureauList();
+            for (JSONObject jo : jBureauList) {
+                String org_id = jo.getString("org_id");
+                String org_name = jo.getString("org_name");
+                JSONObject jo2 = new JSONObject();
+                jo2.put("org_id", org_id);
+                jo2.put("org_name", org_name);
+                list.add(jo2);
+            }
+            //缓存到 Redis中，有效期12小时
+            RedisKit.Set(KEY, list.toString());
+            RedisKit.Expire(KEY, 60 * 60 * 12);
+        } else {
+            String json = RedisKit.Get(KEY);
+            JSONArray ja = JSONArray.parseArray(json);
+            for (int i = 0; i < ja.size(); i++) list.add(ja.getJSONObject(i));
+        }
+
+        //resultA是拼装好的List集合
+        SortClass sort = new SortClass();
+        Collections.sort(list, sort);
+        renderJson(list);
+    }
 }
+