改為用JSON文件獲取應用信息

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.tzs.biz.utils.JsonUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -29,17 +30,11 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
-@Api(tags = "质量问题代码库表Api")
+@Api(tags = "跳转应用相关API")
 @RequestMapping(value = "/platformConfig")
 public class PlatformConfigController extends BaseController {
-    @Value("${appCode.pipeline.image:studio_normalapp_3404491,upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png}")
-    private String pipeAppImage;
-
-    @Value("${appCode.gasBottle.image:studio_normalapp_4403119,upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png}")
-    private String gasBottleAppImage;
-
-    @Value("${appCode.safety.image:studio_normalapp_4391091,upload/tzs/amos_studio/-28367904-1135092464.png}")
-    private String appCodeSafetyImage;
+    @Value("classpath:/json/appApplyInfo.json")
+    private org.springframework.core.io.Resource applyInfo;
 
     @Resource
     private RedisUtils redisUtils;
@@ -53,19 +48,17 @@ public class PlatformConfigController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "查询当前登录人的应用信息【燃气管道系统和气瓶安全追溯系统】", notes = "查询当前登录人的应用信息【燃气管道系统和气瓶安全追溯系统】")
     @GetMapping(value = "/queryApplyByToken")
     public ResponseModel<Map<String, Object>> queryApplyByToken() {
-        String exeUserId = RequestContext.getExeUserId();
-        String[] pipeInfo = pipeAppImage.split(",");
+        Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(applyInfo);
+        List<Map<String, Object>> applyList = resourceJson.get("appApplyInfo");
         //存放配置文件中取出的应用code和图片信息 key：应用Code  value：图片信息
         Map<String, String> appCodeImageMap = new HashMap<>();
-        appCodeImageMap.put(pipeInfo[0], pipeInfo[1]);
-        String[] gasBottleInfo = gasBottleAppImage.split(",");
-        appCodeImageMap.put(gasBottleInfo[0], gasBottleInfo[1]);
-
-        String[] appCodeSafety = appCodeSafetyImage.split(",");
-        appCodeImageMap.put(appCodeSafety[0], appCodeSafety[1]);
-
         //存放应用code用于下面过滤
-        List<String> list = Arrays.asList(pipeInfo[0], gasBottleInfo[0], appCodeSafety[0]);
+        List<String> list = new ArrayList<>();
+        applyList.forEach(item -> {
+            appCodeImageMap.put(String.valueOf(item.get("appKey")), String.valueOf(item.get("image")));
+            list.add(String.valueOf(item.get("appKey")));
+        });
+        String exeUserId = RequestContext.getExeUserId();
         AgencyUserModel result = Privilege.agencyUserClient.queryByUserId(exeUserId).getResult();
         Map<String, String> appCodeMap = Privilege.applicationClient.queryAgencyApplications().getResult().stream().filter(t -> list.contains(t.getAppCode())).collect(Collectors.toMap(ApplicationModel::getAppCode, ApplicationModel::getAppName));
         List<Map<String, Object>> resultList = new ArrayList<>();

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application.properties

@@ -157,15 +157,5 @@ regulator.unit.code=50
 
 spring.main.allow-bean-definition-overriding=true
 
-
-# 城燃管道应用key和应用图片地址 用英文逗号隔开 前面为应用code 后面为图片地址
-appCode.pipeline.image=studio_normalapp_4403119,upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png
-
-# 气瓶安全追溯系统应用key和应用图片地址 用英文逗号隔开 前面为应用code 后面为图片地址
-appCode.gasBottle.image=studio_normalapp_3404491,upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png
-
-# 特种设备安全追溯
-appCode.safety.image=studio_normalapp_4391091,upload/tzs/amos_studio/-28367904-1135092464.png
-
 # 若tzs和ugp一起，则true
 is.ugp=false
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/json/appApplyInfo.json

+{
+  "appApplyInfo": [
+    {
+      "name": "城燃管道",
+      "appKey": "studio_normalapp_4403119",
+      "image": "upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png"
+    },
+    {
+      "name": "气瓶安全追溯系统",
+      "appKey": "studio_normalapp_3404491",
+      "image": "upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png"
+    },
+    {
+      "name": "特种设备安全追溯",
+      "appKey": "studio_normalapp_4391091",
+      "image": "upload/tzs/amos_studio/9C968B74AC9F8C9F21C8E4A284FDEAB4.png"
+    }
+  ]
+}
\ No newline at end of file