账号分组web

gic-data-cloud-web/pom.xml

@@ -19,6 +19,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <libraryVersion>4.0-SNAPSHOT</libraryVersion>
+        <gic-data-cloud-api>4.0-SNAPSHOT</gic-data-cloud-api>
     </properties>
 
     <dependencies>
@@ -83,6 +84,11 @@
         </dependency>
         <dependency>
             <groupId>com.gic</groupId>
+            <artifactId>gic-data-cloud-api</artifactId>
+            <version>${gic-data-cloud-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
             <artifactId>gic-platform-finance-api</artifactId>
             <version>${gic-platform-finance-api}</version>
         </dependency>

gic-data-cloud-web/src/main/java/com/gic/cloud/web/controller/UserController.java

+package com.gic.cloud.web.controller;
+
+import com.gic.cloud.dto.AccountGroupDTO;
+import com.gic.cloud.service.AccountGroupApiService;
+import com.gic.cloud.service.UserApiService;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.utils.ResultControllerUtils;
+import com.gic.enterprise.utils.UserDetailUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/user")
+public class UserController {
+    private final static Logger LOGGER = LogManager.getLogger(UserController.class);
+
+    @Autowired
+    private AccountGroupApiService accountGroupApiService;
+    @Autowired
+    private UserApiService userApiService;
+
+    @RequestMapping("/save-account-group")
+    public RestResponse saveAccountGroup(AccountGroupDTO dto) {
+        return ResultControllerUtils.commonResult(accountGroupApiService.saveAccountGroup(dto));
+    }
+
+    @RequestMapping("/edit-account-group")
+    public RestResponse editAccountGroup(AccountGroupDTO dto) {
+        return ResultControllerUtils.commonResult(accountGroupApiService.editAccountGroup(dto));
+    }
+
+    @RequestMapping("/sort-account-group")
+    public RestResponse sortAccountGroup(Integer accountGroupId, Integer targetSort) {
+        return ResultControllerUtils.commonResult(accountGroupApiService.sortAccountGroup(accountGroupId, targetSort));
+    }
+
+    @RequestMapping("/list-account-group")
+    public RestResponse listAccountGroup() {
+        return ResultControllerUtils.commonResult(accountGroupApiService
+                .listAccountGroupOfCountMember(UserDetailUtils.getUserDetail().getEnterpriseId()));
+    }
+
+    @RequestMapping("/delete-account-group")
+    public RestResponse deleteAccountGroup(Integer accountGroupId) {
+        return ResultControllerUtils.commonResult(accountGroupApiService.deleteAccountGroup(accountGroupId));
+    }
+}

gic-data-cloud-web/src/main/resources/dubbo-gic-data-cloud-web.xml

@@ -12,7 +12,7 @@
     <context:component-scan base-package="com.gic.enterprise"/>
 
     <!-- 应用名称 -->
-    <dubbo:application name="gic-platform-enterprise-web"/>
+    <dubbo:application name="gic-data-cloud-web"/>
 
     <dubbo:reference interface="com.gic.store.service.StoreRegionApiService" id="storeRegionApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.store.service.StoreBrandApiService" id="storeBrandApiService" timeout="60000" retries="0"/>
@@ -72,9 +72,6 @@
     <dubbo:reference interface="com.gic.enterprise.service.QrCodeApiService" id="qrCodeApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.wechat.business.api.service.fwh.WeixinBaseFunService" id="weixinBaseFunService" timeout="6000" />
     <dubbo:reference interface="com.gic.wechat.business.api.service.wxa.WeixinWxaFunService" id="weixinWxaFunService" timeout="6000" />
-    <!--用户-->
-    <dubbo:reference interface="com.gic.auth.service.UserApiService" id="userApiService" timeout="6000" />
-    <dubbo:reference interface="com.gic.marketing.api.service.sms.SmsOuterApiService" id="smsOuterApiService" timeout="6000" />
     <!--短信-->
     <!--首页配置-->
     <dubbo:reference interface="com.gic.enterprise.service.IndexModuleApiService" id="indexModuleApiService" timeout="6000" />
@@ -139,4 +136,9 @@
     <dubbo:reference interface="com.gic.member.config.api.service.OrderPointCalculationPartyApiService" id="orderPointCalculationPartyApiService" timeout="60000" />
 
     <dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" retries="0"/>
+
+
+    <dubbo:reference interface="com.gic.cloud.service.AccountGroupApiService" id="accountGroupApiService" timeout="6000" retries="0"/>
+    <dubbo:reference interface="com.gic.cloud.service.UserApiService" id="userApiService" timeout="6000" retries="0"/>
+    <dubbo:reference interface="com.gic.cloud.service.FunctionApiService" id="functionApiService" timeout="6000" retries="0"/>
 </beans>