7/12

gateway/src/main/java/com/yxt/wms/GatewayApplication.java

@@ -5,7 +5,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * @author wangpengfei
@@ -15,7 +14,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.wms"
 })
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = {})
 public class GatewayApplication {
     public static void main(String[] args) {
         SpringApplication.run(GatewayApplication.class, args);

wms/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoQuery.java

@@ -1,6 +1,7 @@
 package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,4 +11,12 @@ import lombok.Data;
 @Data
 public class BaseBrandInfoQuery implements Query {
     private String name;
+    private String orgLevelKey;//权限等级
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private int index;
 }

wms/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoService.java

@@ -5,6 +5,8 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.feign.base.basebrandinfo.*;
 import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,25 +25,26 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
     private FileUploadComponent fileUploadComponent;
     @Autowired
     BaseBrandInfoFeign baseBrandInfoFeign;
+    @Autowired
+    CommonMethod commonMethod;
 
     public ResultBean<PagerVo<BaseBrandInfoVo>> listPage(PagerQuery<BaseBrandInfoQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
+        BaseBrandInfoQuery query=pq.getParams();
+        //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
+        pq.getParams().setIndex(dataRule.getIndex());
         return baseBrandInfoFeign.listPage(pq);
     }
     public ResultBean<List<BaseBrandInfo>> listAll( OrgPathQuery query) {
-    ResultBean rb = ResultBean.fireFail();
-
     return baseBrandInfoFeign.listAll(query);
 }
     public ResultBean<String> saveOrUpdate(BaseBrandInfoDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-
         return baseBrandInfoFeign.saveOrUpdate(dto);
     }
 
     public ResultBean<BaseBrandInfoVo> initialization(String sid) {
-        ResultBean rb = ResultBean.fireFail();
-
          return baseBrandInfoFeign.initialization(sid);
     }
 

wms/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuQuery.java

@@ -1,6 +1,7 @@
 package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,4 +11,12 @@ import lombok.Data;
 @Data
 public class BaseGoodsSpuQuery implements Query {
     private String name;
+    private String orgLevelKey;//权限等级
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private int index;
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuService.java

@@ -6,12 +6,15 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfo;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoQuery;
 import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuDto;
 import com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendDto;
 import com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailDto;
 import com.yxt.wms.biz.func.basegoodstype.BaseGoodsType;
 import com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnit;
 import com.yxt.wms.biz.func.basemanufacturer.BaseManufacturer;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.feign.base.basebrandinfo.BaseBrandInfoFeign;
 import com.yxt.wms.feign.base.basegoodsspu.*;
 import com.yxt.wms.feign.base.basegoodstype.BaseGoodsTypeFeign;
@@ -54,10 +57,15 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
     String path;
     @Autowired
     BaseGoodsSpuFeign baseGoodsSpuFeign;
+    @Autowired
+    CommonMethod commonMethod;
 
 
     public ResultBean<PagerVo<BaseGoodsSpuVo>> listPage(PagerQuery<BaseGoodsSpuQuery> pq) {
-        ResultBean rb = ResultBean.fireFail();
+        BaseGoodsSpuQuery query=pq.getParams();
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
+        pq.getParams().setIndex(dataRule.getIndex());
         return baseGoodsSpuFeign.listPage(pq);
     }
 

wms/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeQuery.java

@@ -1,6 +1,7 @@
 package com.yxt.wms.biz.func.basegoodstype;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,4 +14,12 @@ public class BaseGoodsTypeQuery implements Query {
     private String code;//编码
     private String IsGoodID;//是否一品一码（goodID），0否，1是
     private String outStockRule;//出库规则（先进先出0、先进后出1、保质期优先2）
+    private String orgLevelKey;//权限等级
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private int index;
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeService.java

@@ -6,6 +6,9 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuQuery;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.base.basegoodstype.BaseGoodsTypeFeign;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
@@ -28,48 +31,14 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
     BaseGoodsTypeFeign baseGoodsTypeFeign;
     @Autowired
     SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    CommonMethod commonMethod;
 
     public ResultBean<PagerVo<BaseGoodsTypeVo>> listPage(PagerQuery<BaseGoodsTypeQuery> pq) {
-        ResultBean rb = ResultBean.fireFail();
+        BaseGoodsTypeQuery query=pq.getParams();
-        QueryWrapper<BaseGoodsType> qw = new QueryWrapper<>();
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
-//        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
-//            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        pq.getParams().setIndex(dataRule.getIndex());
-//            privilegeQuery.setOrgPath(query.getOrgPath());
-//            privilegeQuery.setMenuUrl(query.getMenuUrl());
-//            privilegeQuery.setUserSid(query.getUserSid());
-//            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-//            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
-//                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-//                String orgSidPath = query.getOrgPath();
-//                orgSidPath = orgSidPath + "/";
-//                int i1 = orgSidPath.indexOf("/");
-//                int i2 = orgSidPath.indexOf("/", i1 + 1);
-//                int i3 = orgSidPath.indexOf("/", i2 + 1);
-//                int i4 = orgSidPath.indexOf("/", i3 + 1);
-//                String orgLevelKey = defaultIdReltBean.getData();
-//                if ("1".equals(orgLevelKey)) {
-//                    orgSidPath = orgSidPath.substring(0, i1);
-//                    qw.like("u.orgSidPath", orgSidPath);
-//                } else if ("2".equals(orgLevelKey)) {
-//                    orgSidPath = orgSidPath.substring(0, i2);
-//                    qw.like("u.orgSidPath", orgSidPath);
-//                } else if ("3".equals(orgLevelKey)) {
-//                    orgSidPath = orgSidPath.substring(0, i3);
-//                    qw.like("u.orgSidPath", orgSidPath);
-//                } else if ("4".equals(orgLevelKey)) {
-//                    orgSidPath = orgSidPath.substring(0, i4);
-//                    qw.like("u.orgSidPath", orgSidPath);
-//                } else if ("5".equals(orgLevelKey)) {
-//                    qw.eq("p.createBySid", query.getUserSid());
-//                } else {
-//                    PagerVo<BaseGoodsTypeVo> p = new PagerVo<>();
-//                    return rb.success().setData(p);
-//                }
-//            } else {
-//                PagerVo<BaseGoodsTypeVo> p = new PagerVo<>();
-//                return rb.success().setData(p);
-//            }
-//        }
         return baseGoodsTypeFeign.listPage(pq);
     }
     public ResultBean<List<BaseGoodsType>> listAll(OrgPathQuery query) {

wms/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnit.java

@@ -11,4 +11,6 @@ import lombok.Data;
 public class BaseGoodsUnit extends BaseEntity {
 
     private String unitName;//单位名称
+    private String useOrgSid;//使用组织sid
+    private String createOrgSid;//创建组织sid
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitQuery.java

@@ -1,6 +1,7 @@
 package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,4 +11,12 @@ import lombok.Data;
 @Data
 public class BaseGoodsUnitQuery implements Query {
     private String name;
+    private String orgLevelKey;//权限等级
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private int index;
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitService.java

@@ -4,6 +4,9 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerQuery;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.feign.base.basegoodsunit.BaseGoodsUnitFeign;
 import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,9 +23,14 @@ public class BaseGoodsUnitService extends MybatisBaseService<BaseGoodsUnitMapper
 
     @Autowired
     BaseGoodsUnitFeign baseGoodsUnitFeign;
+    @Autowired
+    CommonMethod commonMethod;
 
     public ResultBean<PagerVo<BaseGoodsUnitVo>> listPage(PagerQuery<BaseGoodsUnitQuery> pq) {
-        ResultBean rb = ResultBean.fireFail();
+        BaseGoodsUnitQuery query=pq.getParams();
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
+        pq.getParams().setIndex(dataRule.getIndex());
         return baseGoodsUnitFeign.listPage(pq);
     }
     public ResultBean<List<BaseGoodsUnit>> listAll(OrgPathQuery query) {

wms/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitVo.java

@@ -24,4 +24,6 @@ public class BaseGoodsUnitVo implements Vo {
     private String state;
     private String isDelete;
     private String unitName;//单位名称
+    private String useOrgSid;//使用组织sid
+    private String createOrgSid;//创建组织sid
 }

wms/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerQuery.java

@@ -1,6 +1,7 @@
 package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,4 +11,12 @@ import lombok.Data;
 @Data
 public class BaseManufacturerQuery implements Query {
     private String name;
+    private String orgLevelKey;//权限等级
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private int index;
 }

wms/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerService.java

@@ -4,6 +4,9 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuQuery;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.feign.base.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,9 +23,14 @@ import java.util.List;
 public class BaseManufacturerService extends MybatisBaseService<BaseManufacturerMapper, BaseManufacturer> {
     @Autowired
     BaseManufacturerFeign baseManufacturerFeign;
+    @Autowired
+    CommonMethod commonMethod;
 
     public ResultBean<PagerVo<BaseManufacturerVo>> listPage(PagerQuery<BaseManufacturerQuery> pq) {
-        ResultBean rb = ResultBean.fireFail();
+        BaseManufacturerQuery query=pq.getParams();
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
+        pq.getParams().setIndex(dataRule.getIndex());
         return baseManufacturerFeign.listPage(pq);
     }
     public ResultBean<List<BaseManufacturer>> listAll( OrgPathQuery query) {

wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java

@@ -73,22 +73,16 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
     public ResultBean<String> saveOrUpdate(WarehouseInfoDto dto) {
         String orgPath = dto.getOrgPath();
         if (StringUtils.isBlank(dto.getSid())) {
-            String deptName = "";
             String deptSid = "";
             String createOrgSid = "";
             if (StringUtils.isNotBlank(orgPath)) {
                 List<String> split = Arrays.asList(orgPath.split("/"));
                 if (split.size() > 1) {
                     //获取本级sid获取本级部门信息
-                    SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
                     SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
-                    deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
-                    deptName = sysOrganization1.getName();
                     deptSid = sysOrganization1.getSid();
                 } else {
                     SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
-                    deptName = sysOrganization.getName();
-                    deptName = sysOrganization.getName();
                     deptSid = sysOrganization.getSid();
                 }
                 dto.setUseOrgSid(deptSid);

wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java

@@ -57,22 +57,16 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
     public ResultBean<String> saveOrUpdate(WarehouseRackDto dto) {
         String orgPath = dto.getOrgPath();
         if (StringUtils.isBlank(dto.getSid())) {
-            String deptName = "";
             String deptSid = "";
             String createOrgSid = "";
             if (StringUtils.isNotBlank(orgPath)) {
                 List<String> split = Arrays.asList(orgPath.split("/"));
                 if (split.size() > 1) {
                     //获取本级sid获取本级部门信息
-                    SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData();
                     SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
-                    deptName = sysOrganization.getName() + "/" + sysOrganization1.getName();
-                    deptName = sysOrganization1.getName();
                     deptSid = sysOrganization1.getSid();
                 } else {
                     SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
-                    deptName = sysOrganization.getName();
-                    deptName = sysOrganization.getName();
                     deptSid = sysOrganization.getSid();
                 }
                 dto.setUseOrgSid(deptSid);