医健宝-优化功能开关

fs-admin/src/main/java/com/fs/web/controller/system/SysLoginController.java

@@ -8,6 +8,7 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.entity.SysRole;
 import com.fs.common.utils.PatternUtils;
 import com.fs.his.utils.ConfigUtil;
+import com.fs.hisStore.config.MedicalMallConfig;
 import com.fs.system.service.ISysRoleService;
 import lombok.Synchronized;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +51,9 @@ public class SysLoginController
     @Autowired
     private ConfigUtil configUtil;
 
+    @Autowired
+    private MedicalMallConfig medicalMallConfig;
+
     /**
      * 登录方法
      *
@@ -84,13 +88,10 @@ public class SysLoginController
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
         //药品商城参数
-        JSONObject jsonObject = configUtil.generateConfigByKey("medicalMall.func.switch");
         AjaxResult ajax = AjaxResult.success();
 
-        if(jsonObject!=null){
-            ajax.put("isMedicalMall", "1".equals(jsonObject.getString("isMedicalMall")));
-            ajax.put("isPadLimit", "1".equals(jsonObject.getString("isPadLimit")));
-            ajax.put("isStores", "1".equals(jsonObject.getString("isStores")));
+        if(medicalMallConfig!=null){
+            ajax.put("medicalMallConfig", medicalMallConfig);
         }
         ajax.put("user", user);
         Integer isAdmin = 0;

fs-service/src/main/java/com/fs/hisStore/config/MedicalMallConfig.java

@@ -1,6 +1,7 @@
 package com.fs.hisStore.config;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fs.his.utils.ConfigUtil;
 import lombok.Getter;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +14,7 @@ import javax.annotation.PostConstruct;
 public class MedicalMallConfig {
 
     @Autowired
+    @JsonIgnore
     private ConfigUtil configUtil;
     /*
     {"isMedicalMall":"0","statics":"1","isAudit":"0"}
@@ -23,6 +25,8 @@ public class MedicalMallConfig {
     private String statics;
     // 店铺、商品是否审核
     private String isAudit;
+    // 资源配置
+    private String isResource;
     @PostConstruct
     public void init() {
         JSONObject jsonObject = configUtil.generateConfigByKey("medicalMall.func.switch");
@@ -30,6 +34,7 @@ public class MedicalMallConfig {
             this.isMedicalMall = jsonObject.getString("isMedicalMall");
             this.statics = jsonObject.getString("statics");
             this.isAudit = jsonObject.getString("isAudit");
+            this.isResource = jsonObject.getString("isResource");
         }
     }