· 增加首页统计图查看权限

 · 增加粮情检查增删改查权限
 · 增加仓房信息查看权限
 · 增加库存/出库质量增删改查权限

app/src/main/java/com/unis/sxzcl/ui/grain_check/GrainCheckHomeFragment.java

@@ -12,6 +12,7 @@ import com.unis.model.DataCallback;
 import com.unis.model.DepotModel;
 import com.unis.model.GrainCheckModel;
 import com.unis.model.HouseModel;
+import com.unis.model.PermitConstant;
 import com.unis.model.ProcessModel;
 import com.unis.model.UserModel;
 import com.unis.model.bean.HouseListBean;
@@ -102,8 +103,9 @@ public class GrainCheckHomeFragment extends BaseFragment<FragmentBaseTabPagerBin
     @Override
     protected void onFirstShow() {
 
-        // 保管员显示新增
-        mBinding.bar.setRightVisible(UserModel.get().isUserRole(RoleType.R_BGY));
+        // 有新增权限 且 保管员
+        if (UserModel.get().isPermit(PermitConstant.grain_check_add))
+            mBinding.bar.setRightVisible(UserModel.get().isUserRole(RoleType.R_BGY));
 
         // 切换到用户角色所在的页面
         mBinding.viewPager.setCurrentItem(getRoleCurrentPage());
@@ -203,6 +205,8 @@ public class GrainCheckHomeFragment extends BaseFragment<FragmentBaseTabPagerBin
 
     @Override
     public void onPageSelected(int position) {
+        if (!UserModel.get().isPermit(PermitConstant.grain_check_add)) return;
+
         /**
          * 登录人是否可以新增
          * 每个页面所需角色不同

app/src/main/java/com/unis/sxzcl/ui/grain_check/GrainCheckListFragment.java

@@ -5,9 +5,8 @@ import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
 import com.unis.model.DataCallback;
-import com.unis.model.DepotModel;
 import com.unis.model.GrainCheckModel;
-import com.unis.model.HouseModel;
+import com.unis.model.PermitConstant;
 import com.unis.model.UserModel;
 import com.unis.model.bean.grain_check.GrainCheckBean;
 import com.unis.model.event.GrainCheckEvent;
@@ -139,6 +138,12 @@ public class GrainCheckListFragment extends BaseListFragment<FragmentBaseListBin
         } else {
             bundle.putString("pageType", "edit");
         }
+
+        // 没有修改权限只能查看
+        if (!UserModel.get().isPermit(PermitConstant.grain_check_update)) {
+            bundle.putString("pageType", "detail");
+        }
+
         bundle.putString("data", getGson().toJson(item));
         navigation(R.id.grainCheckDetailFragment, bundle);
     }

app/src/main/java/com/unis/sxzcl/ui/home/HomeFragment.java

@@ -9,6 +9,7 @@ import com.bumptech.glide.Glide;
 import com.unis.model.AnnounceModel;
 import com.unis.model.DataCallback;
 import com.unis.model.NoticeModel;
+import com.unis.model.PermitConstant;
 import com.unis.model.ProcessModel;
 import com.unis.model.UrlPath;
 import com.unis.model.UserModel;
@@ -85,8 +86,11 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
         // 初始化轮播图
         initBanner();
 
-        // 初始化企业统计
-        initCompanyStats();
+        // 有仓房权限
+        if (UserModel.get().isPermit(PermitConstant.house)) {
+            // 初始化企业统计
+            initCompanyStats();
+        }
 
     }
 

app/src/main/java/com/unis/sxzcl/ui/house/HouseDetailFragment.java

@@ -7,6 +7,8 @@ import android.view.ViewGroup;
 import com.unis.model.BasicModel;
 import com.unis.model.DataCallback;
 import com.unis.model.HouseModel;
+import com.unis.model.PermitConstant;
+import com.unis.model.UserModel;
 import com.unis.model.bean.EnumBean;
 import com.unis.model.bean.HouseBean;
 import com.unis.sxzcl.base.BaseListFragment;
@@ -45,6 +47,7 @@ public class HouseDetailFragment extends BaseListFragment<FragmentBaseListBindin
     private final String T_HOUSE_STATUS = "仓房状态";
     private final String T_STORAGE = "存储状态";
     private HouseBean mHouse;
+    private boolean mPermit;
 
     @Override
     protected FragmentBaseListBinding getViewBinding(LayoutInflater inflater, ViewGroup container) {
@@ -57,6 +60,7 @@ public class HouseDetailFragment extends BaseListFragment<FragmentBaseListBindin
 
         mAdapter = new BaseDetailAdapter();
         mAdapter.setOnItemClickListener((adapter, view, position) -> {
+            if (!mPermit) return;
             BaseDetailBean item = mAdapter.getData().get(position);
             String title = item.getTitle();
             switch (title) {
@@ -80,6 +84,8 @@ public class HouseDetailFragment extends BaseListFragment<FragmentBaseListBindin
 //        mAdapter.addData(new BaseDetailBean(BaseDetail.TITLE_CONTENT, T_HOUSE_STATUS, "满仓").setDownIcon(true));
 //        mAdapter.addData(new BaseDetailBean(BaseDetail.TITLE_CONTENT, T_STORAGE, "通风").setDownIcon(true));
 
+        mPermit = UserModel.get().isPermit(PermitConstant.house_update);
+
         onRefresh();
 
     }
@@ -97,15 +103,16 @@ public class HouseDetailFragment extends BaseListFragment<FragmentBaseListBindin
                 if (!isActive()) return;
                 if (data != null) {
                     mHouse = data;
+
                     List<BaseDetailBean> list = new ArrayList<>();
                     list.add(new BaseDetailBean(BaseDetail.TITLE_CONTENT, T_FOOD_TYPE,
-                            BasicModel.get().getEnumName(data.getGrainVarieties())).setDownIcon(true));
+                            BasicModel.get().getEnumName(data.getGrainVarieties())).setDownIcon(mPermit));
 
                     list.add(new BaseDetailBean(BaseDetail.TITLE_CONTENT, T_HOUSE_STATUS,
-                            BasicModel.get().getEnumName(data.getStorageStatus())).setDownIcon(true));
+                            BasicModel.get().getEnumName(data.getStorageStatus())).setDownIcon(mPermit));
 
                     list.add(new BaseDetailBean(BaseDetail.TITLE_CONTENT, T_STORAGE,
-                            BasicModel.get().getEnumName(data.getWarehouseStatus())).setDownIcon(true));
+                            BasicModel.get().getEnumName(data.getWarehouseStatus())).setDownIcon(mPermit));
                     mAdapter.setList(list);
                 }
                 loadComplete();

app/src/main/java/com/unis/sxzcl/ui/inventory_quality/QuantityQualityDetailFragment.java

@@ -1,4 +1,4 @@
-package com.unis.sxzcl.ui.inventory_quality;
+package com.unis.sxzcl.ui.quantity_quality;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;

app/src/main/java/com/unis/sxzcl/ui/inventory_quality/QuantityQualityHomeFragment.java

@@ -1,4 +1,4 @@
-package com.unis.sxzcl.ui.inventory_quality;
+package com.unis.sxzcl.ui.quantity_quality;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -11,6 +11,7 @@ import com.google.android.material.tabs.TabLayout;
 import com.unis.model.BasicModel;
 import com.unis.model.DepotModel;
 import com.unis.model.HouseModel;
+import com.unis.model.PermitConstant;
 import com.unis.model.ProcessModel;
 import com.unis.model.UserModel;
 import com.unis.model.bean.EnumBean;
@@ -98,7 +99,7 @@ public class QuantityQualityHomeFragment extends BaseFragment<FragmentBaseTabPag
         // 获取库存质量检查类型
         if (mWorkType.equals("0")) {
             mEnumList = BasicModel.get().getEnumList("31");
-        }else {
+        } else {
             mEnumList = BasicModel.get().getEnumList("32");
         }
         if (mEnumList == null) {
@@ -107,8 +108,8 @@ public class QuantityQualityHomeFragment extends BaseFragment<FragmentBaseTabPag
         }
 
 
-        // 保管员显示新增
-        mBinding.bar.setRightVisible(UserModel.get().isUserRole(RoleType.R_BGY));
+        // 是否有权限新增
+        mBinding.bar.setRightVisible(UserModel.get().isPermit(PermitConstant.quantity_add));
 
 
         // 切换到用户角色所在的页面

app/src/main/java/com/unis/sxzcl/ui/inventory_quality/QuantityQualityListAdapter.java

@@ -1,4 +1,4 @@
-package com.unis.sxzcl.ui.inventory_quality;
+package com.unis.sxzcl.ui.quantity_quality;
 
 import android.widget.ImageView;
 import android.widget.TextView;

app/src/main/java/com/unis/sxzcl/ui/inventory_quality/QuantityQualityListFragment.java

@@ -1,4 +1,4 @@
-package com.unis.sxzcl.ui.inventory_quality;
+package com.unis.sxzcl.ui.quantity_quality;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -7,7 +7,9 @@ import android.view.ViewGroup;
 import com.unis.model.DataCallback;
 import com.unis.model.DepotModel;
 import com.unis.model.HouseModel;
+import com.unis.model.PermitConstant;
 import com.unis.model.QuantityQualityModel;
+import com.unis.model.UserModel;
 import com.unis.model.bean.QuantityQualityBean;
 import com.unis.sxzcl.R;
 import com.unis.sxzcl.base.BaseListFragment;
@@ -151,9 +153,16 @@ public class QuantityQualityListFragment extends BaseListFragment<FragmentBaseLi
      */
     @Override
     public void onItemClickListener(QuantityQualityBean item) {
-        // 没有状态  或 状态为1时 可修改
-        String pageType = item.getSaveState() == null || item.getSaveState().equals("1") ?
+        // 检测查看权限
+        if (!UserModel.get().isPermit(PermitConstant.quantity_read_single)) return;
+
+        // 状态为1时 可修改
+        String pageType = item.getSaveState() != null || item.getSaveState().equals("1") ?
                 "edit" : "detail";
+        if (!UserModel.get().isPermit(PermitConstant.quantity_update)) {
+            // 无权限修改 只能查看
+            pageType = "detail";
+        }
         Bundle bundle = new Bundle();
         bundle.putString(QuantityQualityDetailFragment.key_page_type, pageType);
         bundle.putString(QuantityQualityDetailFragment.key_info, getGson().toJson(item));

app/src/main/java/com/unis/sxzcl/ui/work_module/WorkModuleBean.java

@@ -14,6 +14,7 @@ import java.util.List;
  */
 public class WorkModuleBean extends BaseExpandNode {
 
+    private int permitId;
     // 图片
     private int img;
     // 标题
@@ -26,13 +27,15 @@ public class WorkModuleBean extends BaseExpandNode {
     public WorkModuleBean() {
     }
 
-    public WorkModuleBean(String name, List<BaseNode> childList) {
+    public WorkModuleBean(int permitId, String name, List<BaseNode> childList) {
+        this.permitId = permitId;
         this.name = name;
         this.childList = childList;
         this.isWork = false;
     }
 
-    public WorkModuleBean(String name, int img) {
+    public WorkModuleBean(int permitId, String name, int img) {
+        this.permitId = permitId;
         this.name = name;
         this.img = img;
         this.isWork = true;
@@ -78,6 +81,9 @@ public class WorkModuleBean extends BaseExpandNode {
         return childList;
     }
 
+    public void setChildList(List<BaseNode> childList) {
+        this.childList = childList;
+    }
 
     public int getImg() {
         return img;
@@ -90,4 +96,12 @@ public class WorkModuleBean extends BaseExpandNode {
     public boolean isWork() {
         return isWork;
     }
+
+    public int getPermitId() {
+        return permitId;
+    }
+
+    public void setPermitId(int permitId) {
+        this.permitId = permitId;
+    }
 }

app/src/main/java/com/unis/sxzcl/ui/work_module/WorkModuleFragment.java

@@ -7,6 +7,7 @@ import android.view.ViewGroup;
 import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.unis.model.DepotModel;
+import com.unis.model.PermitConstant;
 import com.unis.model.UserModel;
 import com.unis.model.bean.MultiDepotBean;
 import com.unis.model.bean.user.UserBean;
@@ -123,6 +124,11 @@ public class WorkModuleFragment extends BaseListFragment<FragmentWorkModuleBindi
             mBinding.barCompany.setText(bean.depotName);
         }
 
+        // 没仓房权限 隐藏统计
+        if (!UserModel.get().isPermit(PermitConstant.house)) {
+            mBinding.barRight.setVisibility(View.GONE);
+        }
+
         // 刷新功能列表
         onRefresh();
     }

app/src/main/java/com/unis/sxzcl/ui/work_module/WorkbenchModel.java

@@ -1,5 +1,8 @@
 package com.unis.sxzcl.ui.work_module;
 
+import com.chad.library.adapter.base.entity.node.BaseNode;
+import com.unis.model.PermitConstant;
+import com.unis.model.UserModel;
 import com.unis.sxzcl.R;
 
 import java.util.ArrayList;
@@ -32,7 +35,6 @@ public class WorkbenchModel {
     public static final String TYPE_JBXX = "基本信息";
     public static final String TYPE_RYJG = "人员结构";
 
-
     public static final String TYPE_SLZL = "数量质量";
     public static final String TYPE_CFXX = "仓房信息";
     public static final String TYPE_RKZL = "入库质量";
@@ -67,35 +69,34 @@ public class WorkbenchModel {
     public static final String TYPE_ZCGL = "租仓管理";
     public static final String TYPE_WTGL = "委托管理";
 
-
     /**
-     * 所有作业功能
+     * 创建所有作业功能
      * 分一级标题 和 二级功能
      */
-    public List<WorkModuleBean> getModuleList() {
+    public List<WorkModuleBean> createModuleList() {
         List<WorkModuleBean> list = new ArrayList<>();
 
-        list.add(new WorkModuleBean(TYPE_JBXX, Arrays.asList(
-                new WorkModuleBean(TYPE_RYJG, R.drawable.ic_model_ryjg)
+        list.add(new WorkModuleBean(0, TYPE_JBXX, Arrays.asList(
+                new WorkModuleBean(0, TYPE_RYJG, R.drawable.ic_model_ryjg)
         )));
 
-        list.add(new WorkModuleBean(TYPE_SLZL, Arrays.asList(
-                new WorkModuleBean(TYPE_CFXX, R.drawable.ic_model_cfxx),
+        list.add(new WorkModuleBean(PermitConstant.quantity, TYPE_SLZL, Arrays.asList(
+                new WorkModuleBean(PermitConstant.house, TYPE_CFXX, R.drawable.ic_model_cfxx),
 //                new WorkModuleBean(TYPE_RKZL, R.drawable.ic_model_rkzl),
-                new WorkModuleBean(TYPE_KCZL, R.drawable.ic_model_kczl),
-                new WorkModuleBean(TYPE_CKZL, R.drawable.ic_model_ckzl)
+                new WorkModuleBean(PermitConstant.quantity, TYPE_KCZL, R.drawable.ic_model_kczl),
+                new WorkModuleBean(PermitConstant.quantity, TYPE_CKZL, R.drawable.ic_model_ckzl)
         )));
 
-        list.add(new WorkModuleBean(TYPE_CLGL, Arrays.asList(
-                new WorkModuleBean(TYPE_LQJC, R.drawable.ic_model_lqjc),
-                new WorkModuleBean(TYPE_JXTF, R.drawable.ic_model_jxtf)
+        list.add(new WorkModuleBean(0, TYPE_CLGL, Arrays.asList(
+                new WorkModuleBean(PermitConstant.grain_check, TYPE_LQJC, R.drawable.ic_model_lqjc),
+                new WorkModuleBean(0, TYPE_JXTF, R.drawable.ic_model_jxtf)
 //                new WorkModuleBean(TYPE_XZGL, R.drawable.ic_model_xzgl)
         )));
 
-        list.add(new WorkModuleBean(TYPE_YJGL, Arrays.asList(
-                new WorkModuleBean(TYPE_YJCG, R.drawable.ic_model_yjcg),
-                new WorkModuleBean(TYPE_YJBG, R.drawable.ic_model_yjbg),
-                new WorkModuleBean(TYPE_YJLY, R.drawable.ic_model_yjly)
+        list.add(new WorkModuleBean(0, TYPE_YJGL, Arrays.asList(
+                new WorkModuleBean(0, TYPE_YJCG, R.drawable.ic_model_yjcg),
+                new WorkModuleBean(0, TYPE_YJBG, R.drawable.ic_model_yjbg),
+                new WorkModuleBean(0, TYPE_YJLY, R.drawable.ic_model_yjly)
         )));
 
 //        list.add(new WorkModuleBean(TYPE_SSSB, Arrays.asList(
@@ -115,8 +116,34 @@ public class WorkbenchModel {
 //                new WorkModuleBean(TYPE_ZCGL, R.drawable.ic_model_zcgl),
 //                new WorkModuleBean(TYPE_WTGL, R.drawable.ic_model_wtgl)
 //        )));
+        return list;
+    }
+
 
+    /**
+     * 获取有权限的功能列表
+     */
+    public List<WorkModuleBean> getModuleList() {
+        List<WorkModuleBean> list = new ArrayList<>();
+        for (WorkModuleBean item : createModuleList()) {
+            // 判断是否有权限
+            if (UserModel.get().isPermit(item.getPermitId())) {
+
+                List<BaseNode> childList = new ArrayList<>();
+                for (BaseNode child : item.getChildNode()) {
+                    WorkModuleBean childBean = (WorkModuleBean) child;
+                    if (UserModel.get().isPermit(childBean.getPermitId())) {
+                        childList.add(childBean);
+                    }
+                }
+
+                item.setChildList(childList);
+
+                list.add(item);
+            }
+        }
         return list;
+
     }
 
-}
+}

app/src/main/res/navigation/nav_graph.xml

@@ -179,7 +179,7 @@
             android:label="药品保管详情" />
         <fragment
             android:id="@+id/quantityQualityHomeFragment"
-            android:name="com.unis.sxzcl.ui.inventory_quality.QuantityQualityHomeFragment"
+            android:name="com.unis.sxzcl.ui.quantity_quality.QuantityQualityHomeFragment"
             android:label="库存质量" >
             <action
                 android:id="@+id/action_quantityQualityHomeFragment_to_quantityQualityDetailFragment"
@@ -246,7 +246,7 @@
         </fragment>
     <fragment
         android:id="@+id/quantityQualityDetailFragment"
-        android:name="com.unis.sxzcl.ui.inventory_quality.QuantityQualityDetailFragment"
+        android:name="com.unis.sxzcl.ui.quantity_quality.QuantityQualityDetailFragment"
         android:label="库存质量详情" />
     <fragment
         android:id="@+id/policyDetailFragment"

model/src/main/java/com/unis/model/PermitConstant.java

@@ -0,0 +1,74 @@
+package com.unis.model;
+
+/**
+ * 权限常量
+ * 创建人: mQ
+ * 创建时间: 2021/2/3 9:21
+ */
+public class PermitConstant {
+
+    /******************** 库点 ********************/
+    // 库点
+    public static final int depot = 101;
+    public static final int depot_add = 102;
+    public static final int depot_update = 103;
+    public static final int depot_del = 104;
+    public static final int depot_read = 105;
+
+
+    /******************** 仓房 ********************/
+    // 仓房
+    public static final int house = 107;
+    // 查看
+    public static final int house_read = 109;
+    // 新增
+    public static final int house_add = 110;
+    // 修改
+    public static final int house_update = 111;
+    // 删除
+    public static final int house_del = 111;
+
+
+    /******************** 库存/出库质量 ********************/
+    // 库存/出库质量
+    public static final int quantity = 151;
+    // 新增
+    public static final int quantity_add = 153;
+    // 修改
+    public static final int quantity_update = 154;
+    // 删除
+    public static final int quantity_del = 155;
+    // 查看单个对象
+    public static final int quantity_read_single = 156;
+
+
+    /******************** 粮情检查 ********************/
+    // 粮情检查
+    public static final int grain_check = 126;
+    // 新增
+    public static final int grain_check_add = 131;
+    // 修改
+    public static final int grain_check_update = 135;
+    // 删除
+    public static final int grain_check_del = 136;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

model/src/main/java/com/unis/model/UrlPath.java

@@ -42,7 +42,7 @@ public class UrlPath {
     // 用户信息
     public static final String user_info = host + "/api/csc-szls-system-manage/user/authority/getById";
     // 角色权限
-    public static final String role_permit = host + "/api/csc-szls-system-manage/role/authority/getByColeId";
+    public static final String role_permit = host + "/api/csc-szls-system-manage/role/authority/getAllResource";
 
 
     /****************** 库 ******************/

model/src/main/java/com/unis/model/UserModel.java

@@ -15,6 +15,7 @@ import com.unis.model.bean.user.UserBean;
 import com.xyxsbj.mylibrary.tool.SPTool;
 import com.xyxsbj.mylibrary.tool.ToastTool;
 
+import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
 
 import java.io.File;
@@ -70,7 +71,7 @@ public class UserModel {
                     protected void onSuccessResult(Response<String> response) throws JSONException {
                         Gson gson = new Gson();
                         String dataJson = getDataJson(response.body());
-                        LoginBean bean = gson.fromJson(dataJson, LoginBean.class);
+                        final LoginBean bean = gson.fromJson(dataJson, LoginBean.class);
 
                         // 保存用户信息
                         String userInfo = gson.toJson(bean.getUser());
@@ -98,10 +99,22 @@ public class UserModel {
                         // 枚举字典
                         BasicModel.get().getEnumDic();
                         // 获取角色权限
-                        getPermit();
+                        getPermit(new DataCallback<String>() {
+                            @Override
+                            public void onSuccess(String data) {
+                                if (callBack != null)
+                                    callBack.onSuccess(bean);
+                            }
+
+                            @Override
+                            public void onError(String error) {
+                                super.onError(error);
+                                if (callBack != null)
+                                    callBack.onSuccess(bean);
+                            }
+                        });
+
 
-                        if (callBack != null)
-                            callBack.onSuccess(bean);
                     }
 
                     @Override
@@ -212,7 +225,7 @@ public class UserModel {
         ProcessModel.get().removeSelectTodo();
 
         // 移除角色权限
-        permitMap = new HashMap<>();
+        permitMap = null;
         SPTool.remove(Constant.KEY_ROLE_PERMIT);
     }
 
@@ -352,7 +365,7 @@ public class UserModel {
     /**
      * 获取角色权限
      */
-    public void getPermit() {
+    public void getPermit(final DataCallback<String> callback) {
         OkGo.<String>get(UrlPath.role_permit)
                 .params("id", getUser().getRoleIds())
                 .execute(new MyStringCallback() {
@@ -361,11 +374,13 @@ public class UserModel {
                         String json = getDataJson(response);
                         SPTool.saveString(Constant.KEY_ROLE_PERMIT, json);
                         getCachePermit();
+                        callback.onSuccess(null);
                     }
 
                     @Override
                     public void onError(Response<String> response) {
                         super.onError(response);
+                        callback.onError(getErrorMsg(response));
                     }
                 });
     }
@@ -375,6 +390,7 @@ public class UserModel {
      */
     private Map<Integer, Boolean> getCachePermit() {
         if (permitMap != null) return permitMap;
+        permitMap = new HashMap<>();
 
         String json = SPTool.getString(Constant.KEY_ROLE_PERMIT, null);
         List<Integer> list = new Gson().fromJson(json, new TypeToken<List<Integer>>() {
@@ -391,8 +407,27 @@ public class UserModel {
     /**
      * 判断是否有权限
      */
-    public boolean isPermit(int permitId) {
-        return getCachePermit().get(permitId);
+    public boolean isPermit(@NotNull int... permitId) {
+        for (int id : permitId) {
+            // 0有权限
+            if (id == 0)
+                continue;
+            // 权限缓存中是否有权限
+            if (!getCachePermit().containsKey(id))
+                return false;
+        }
+        return true;
     }
 
+
+
+
+
+
+
+
+
+
+
+
 }