资源组接口调整

gic-platform-auth-api/src/main/java/com/gic/auth/service/ResourceGroupApiService.java

@@ -51,7 +51,7 @@ public interface ResourceGroupApiService {
      * @param resourceGroupId
      * @return
      */
-    ServiceResponse<Void> deleteResourceGroup(Integer resourceGroupId);
+    ServiceResponse<String> deleteResourceGroup(Integer resourceGroupId);
 
     /**
      * 管理员的门店资源查询

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceGroupApiServiceImpl.java

@@ -97,7 +97,7 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
     }
 
     @Override
-    public ServiceResponse<Void> deleteResourceGroup(Integer resourceGroupId) {
+    public ServiceResponse<String> deleteResourceGroup(Integer resourceGroupId) {
         //验证是否有管理员使用中
         TabSysResourceGroup record = resourceGroupService.getResourceGroup(resourceGroupId);
         if (record == null) {
@@ -112,7 +112,7 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
             // 同步好办
             authorizeService.delResource(resourceGroupId.longValue());
         }
-        return ServiceResponse.success();
+        return ServiceResponse.success(record.getResourceGroupName());
     }
 
     @Override

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java

@@ -4,13 +4,16 @@ import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.ResourceDTO;
+import com.gic.auth.dto.ResourceGroupDTO;
 import com.gic.auth.service.ResourceApiService;
+import com.gic.auth.service.ResourceGroupApiService;
 import com.gic.auth.web.qo.OrderResourceQO;
 import com.gic.auth.web.qo.PageQO;
 import com.gic.auth.web.qo.ResourceQO;
 import com.gic.auth.web.vo.*;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.download.utils.OperationResultUtils;
 import com.gic.download.utils.log.LogUtils;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.utils.ResultControllerUtils;
@@ -68,6 +71,8 @@ public class ResourceController {
     private ShopApiService shopApiService;
     @Autowired
     private EnterpriseLicenseApiService enterpriseLicenseApiService;
+    @Autowired
+    private ResourceGroupApiService resourceGroupApiService;
 
 
     @RequestMapping("/list-sms-sign")
@@ -81,6 +86,7 @@ public class ResourceController {
         }
     }
 
+    @Deprecated
     @RequestMapping("/save-resource")
     public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {
         ResourceDTO resourceDTO = EntityUtil.changeEntityByJSON(ResourceDTO.class, resourceQO);
@@ -108,6 +114,38 @@ public class ResourceController {
         return EnterpriseRestResponse.failure(response);
     }
 
+    @RequestMapping("/save-resource-new")
+    public RestResponse saveResourceNew(ResourceGroupDTO resourceGroup) {
+        resourceGroup.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        return OperationResultUtils.operationResult(resourceGroupApiService.saveResourceGroup(resourceGroup),
+                OperationResultUtils.LOG_NEW + "资源组", resourceGroup.getResourceGroupName());
+    }
+
+    @RequestMapping("/edit-resource-new")
+    public RestResponse editResourceNew(ResourceGroupDTO resourceGroup) {
+        resourceGroup.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        return OperationResultUtils.operationResult(resourceGroupApiService.editResourceGroup(resourceGroup),
+                OperationResultUtils.LOG_EDIT + "资源组", resourceGroup.getResourceGroupName());
+    }
+
+    @RequestMapping("/del-resource-new")
+    public RestResponse delResourceNew(Integer resourceGroupId) {
+        return OperationResultUtils.operationResult(resourceGroupApiService.deleteResourceGroup(resourceGroupId),
+                OperationResultUtils.LOG_DELETE + "资源组");
+    }
+
+    @RequestMapping("/list-resource-new")
+    public RestResponse listResourceNew(String name, Integer pageNum, Integer pageSize) {
+        return ResultControllerUtils.commonResult(resourceGroupApiService
+                .pageResourceGroup(name, UserDetailUtils.getUserDetail().getEnterpriseId(), pageNum, pageSize), ResourceGroupListVO.class);
+    }
+
+    @RequestMapping("/get-resource-new")
+    public RestResponse getResourceNew(Integer resourceId) {
+        return ResultControllerUtils.commonResultOne(resourceGroupApiService.getResourceGroup(resourceId), ResourceGroupDetailVO.class);
+    }
+
+    @Deprecated
     @RequestMapping("/del-resource")
     public RestResponse delResource(Integer resourceId) {
         ServiceResponse<ResourceDTO> resource = resourceApiService.getResource(resourceId);
@@ -118,6 +156,7 @@ public class ResourceController {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
+    @Deprecated
     @RequestMapping("/list-resource")
     public RestResponse listResource(ResourceQO resourceQO, PageQO pageQO) {
         ResourceDTO resourceDTO = EntityUtil.changeEntityByOrika(ResourceDTO.class, resourceQO);
@@ -127,6 +166,7 @@ public class ResourceController {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
+    @Deprecated
     @RequestMapping("/get-resource")
     public RestResponse getResource(Integer resourceId) {
         ServiceResponse<ResourceDTO> response = resourceApiService.getResource(resourceId);

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ResourceGroupDetailVO.java

+package com.gic.auth.web.vo;
+
+import java.io.Serializable;
+/**
+ * 资源组详情
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/11 3:35 PM

+ */
+public class ResourceGroupDetailVO implements Serializable{
+    private static final long serialVersionUID = -8544945442870509331L;
+
+    /**
+     *
+     */
+    private Integer resourceGroupId;
+
+    /**
+     * 资源名称
+     */
+    private String resourceGroupName;
+
+    /**
+     * 用户域 0:不授予 1:授予
+     */
+    private Integer customUser;
+
+    /**
+     * 用户域配置，json格式 [{"type":1,"sort":1,"cu":"","cuSelectId":""}]
+     */
+    private String customUserData;
+
+    /**
+     * 门店资源
+     */
+    private Long storeResource;
+
+    /**
+     * 商品资源
+     */
+    private Long goodsResourceId;
+
+    /**
+     * 线下门店订单 1:用户在授权管辖门店范围内的订单 2:用户下所有订单
+     */
+    private Integer storeOrderArea;
+
+    /**
+     * 微盟商城订单 1:用户在授权店铺范围内的订单 2:不授予
+     */
+    private Integer weimobOrderArea;
+
+    /**
+     * 微盟店铺多选，weimob_order_area选择1时选择店铺,英文逗号隔开
+     */
+    private String weimobStoreId;
+
+    /**
+     * 短信签名多选，英文逗号隔开
+     */
+    private String smsId;
+
+    public Integer getResourceGroupId() {
+        return resourceGroupId;
+    }
+
+    public ResourceGroupDetailVO setResourceGroupId(Integer resourceGroupId) {
+        this.resourceGroupId = resourceGroupId;
+        return this;
+    }
+
+    public String getResourceGroupName() {
+        return resourceGroupName;
+    }
+
+    public ResourceGroupDetailVO setResourceGroupName(String resourceGroupName) {
+        this.resourceGroupName = resourceGroupName;
+        return this;
+    }
+
+    public Integer getCustomUser() {
+        return customUser;
+    }
+
+    public ResourceGroupDetailVO setCustomUser(Integer customUser) {
+        this.customUser = customUser;
+        return this;
+    }
+
+    public String getCustomUserData() {
+        return customUserData;
+    }
+
+    public ResourceGroupDetailVO setCustomUserData(String customUserData) {
+        this.customUserData = customUserData;
+        return this;
+    }
+
+    public Long getStoreResource() {
+        return storeResource;
+    }
+
+    public ResourceGroupDetailVO setStoreResource(Long storeResource) {
+        this.storeResource = storeResource;
+        return this;
+    }
+
+    public Long getGoodsResourceId() {
+        return goodsResourceId;
+    }
+
+    public ResourceGroupDetailVO setGoodsResourceId(Long goodsResourceId) {
+        this.goodsResourceId = goodsResourceId;
+        return this;
+    }
+
+    public Integer getStoreOrderArea() {
+        return storeOrderArea;
+    }
+
+    public ResourceGroupDetailVO setStoreOrderArea(Integer storeOrderArea) {
+        this.storeOrderArea = storeOrderArea;
+        return this;
+    }
+
+    public Integer getWeimobOrderArea() {
+        return weimobOrderArea;
+    }
+
+    public ResourceGroupDetailVO setWeimobOrderArea(Integer weimobOrderArea) {
+        this.weimobOrderArea = weimobOrderArea;
+        return this;
+    }
+
+    public String getWeimobStoreId() {
+        return weimobStoreId;
+    }
+
+    public ResourceGroupDetailVO setWeimobStoreId(String weimobStoreId) {
+        this.weimobStoreId = weimobStoreId;
+        return this;
+    }
+
+    public String getSmsId() {
+        return smsId;
+    }
+
+    public ResourceGroupDetailVO setSmsId(String smsId) {
+        this.smsId = smsId;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "ResourceGroupDetailVO{" +
+                "resourceGroupId=" + resourceGroupId +
+                ", resourceGroupName='" + resourceGroupName + '\'' +
+                ", customUser=" + customUser +
+                ", customUserData='" + customUserData + '\'' +
+                ", storeResource=" + storeResource +
+                ", goodsResourceId=" + goodsResourceId +
+                ", storeOrderArea=" + storeOrderArea +
+                ", weimobOrderArea=" + weimobOrderArea +
+                ", weimobStoreId='" + weimobStoreId + '\'' +
+                ", smsId='" + smsId + '\'' +
+                '}';
+    }
+}

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ResourceGroupListVO.java

+package com.gic.auth.web.vo;
+
+import java.io.Serializable;
+/**
+ * 资源组列表
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/11 3:29 PM

+ */
+public class ResourceGroupListVO implements Serializable{
+    private static final long serialVersionUID = 2961702280977473397L;
+
+    /**
+     *
+     */
+    private Integer resourceGroupId;
+
+    /**
+     * 资源名称
+     */
+    private String resourceGroupName;
+
+    /**
+     * 授权管理员数量
+     */
+    private Integer userResourceCount;
+
+    public Integer getResourceGroupId() {
+        return resourceGroupId;
+    }
+
+    public ResourceGroupListVO setResourceGroupId(Integer resourceGroupId) {
+        this.resourceGroupId = resourceGroupId;
+        return this;
+    }
+
+    public String getResourceGroupName() {
+        return resourceGroupName;
+    }
+
+    public ResourceGroupListVO setResourceGroupName(String resourceGroupName) {
+        this.resourceGroupName = resourceGroupName;
+        return this;
+    }
+
+    public Integer getUserResourceCount() {
+        return userResourceCount;
+    }
+
+    public ResourceGroupListVO setUserResourceCount(Integer userResourceCount) {
+        this.userResourceCount = userResourceCount;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "ResourceGroupListVO{" +
+                "resourceGroupId=" + resourceGroupId +
+                ", resourceGroupName='" + resourceGroupName + '\'' +
+                ", userResourceCount=" + userResourceCount +
+                '}';
+    }
+}

gic-platform-auth-web/src/main/resources/dubbo-gic-platform-auth-web.xml

@@ -80,6 +80,7 @@
     <dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="ShopApiService" timeout="6000" />
 
     <dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.auth.service.ResourceGroupApiService" id="resourceGroupApiService" timeout="6000" />
 
 
 </beans>
\ No newline at end of file