合并分支

4 years ago · c9ae570486
6 changed files with 82 additions and 22 deletions
--- a/epdc-cloud-group/pom.xml
+++ b/epdc-cloud-group/pom.xml
@ -70,6 +70,12 @@
            <version>${epdc-cloud-commons.version}</version>
        </dependency>
        <!-- commons end -->
+
+        <dependency>
+            <groupId>com.esua.epdc.yushan</groupId>
+            <artifactId>epdc-commons-points-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
    </dependencies>

    <build>
@ -153,9 +159,11 @@
                <nacos.ip></nacos.ip>
                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
                <!--RocketMQ-->
-                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
+                <rocketmq.name.server>47.104.85.99:9876</rocketmq.name.server>
+                <rocketmq.producer.group>yushan-pointsGroup</rocketmq.producer.group>
                <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
                <rocketmq.consumer.user.group>userGroup</rocketmq.consumer.user.group>
+                <rocketmq.consumer.points.group>yushan-pointsGroup</rocketmq.consumer.points.group>
            </properties>
        </profile>

@ -199,8 +207,10 @@
                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
                <!--RocketMQ-->
                <rocketmq.name.server>47.104.85.99:9876</rocketmq.name.server>
+                <rocketmq.producer.group>yushan-pointsGroup</rocketmq.producer.group>
                <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
                <rocketmq.consumer.user.group>userGroup</rocketmq.consumer.user.group>
+                <rocketmq.consumer.points.group>yushan-pointsGroup</rocketmq.consumer.points.group>
            </properties>
            <!--<properties>
                <server.port>9063</server.port>
@ -238,8 +248,10 @@
                <nacos.namespace></nacos.namespace>
                <!--RocketMQ-->
                <rocketmq.name.server>172.16.1.242:9876;172.16.1.243:9876</rocketmq.name.server>
+                <rocketmq.producer.group>yushan-pointsGroup</rocketmq.producer.group>
                <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
                <rocketmq.consumer.user.group>userGroup</rocketmq.consumer.user.group>
+                <rocketmq.consumer.points.group>yushan-pointsGroup</rocketmq.consumer.points.group>
            </properties>
        </profile>
    </profiles>
--- a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/controller/GroupController.java
+++ b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/controller/GroupController.java
@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.group.controller;

 import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
@ -30,6 +31,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.group.*;
 import com.elink.esua.epdc.modules.group.excel.GroupExcel;
 import com.elink.esua.epdc.modules.group.service.GroupService;
+import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

@ -47,34 +49,33 @@ import java.util.Map;
@RestController
@RequestMapping("group")
 public class GroupController {
-    
+
    @Autowired
    private GroupService groupService;

    /**
-     *
     * 社群列表 状态state 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散
     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.group.GroupDTO>>
     * @params [params]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.group.GroupDTO>>
     * @author liuchuang
     * @since 2019/10/11 14:53
     */
    @GetMapping("page")
    @DataFilter(tableAlias = "gp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
-    public Result<PageData<GroupManagementDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<GroupManagementDTO>> page(@RequestParam Map<String, Object> params) {
        PageData<GroupManagementDTO> page = groupService.page(params);
        return new Result<PageData<GroupManagementDTO>>().ok(page);
    }

    @GetMapping("{id}")
-    public Result<GroupDTO> get(@PathVariable("id") String id){
+    public Result<GroupDTO> get(@PathVariable("id") String id) {
        GroupDTO data = groupService.get(id);
        return new Result<GroupDTO>().ok(data);
    }

    @PostMapping
-    public Result save(@RequestBody GroupDTO dto){
+    public Result save(@RequestBody GroupDTO dto) {
        //效验数据
        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
        groupService.save(dto);
@ -82,7 +83,7 @@ public class GroupController {
    }

    @PutMapping
-    public Result update(@RequestBody GroupDTO dto){
+    public Result update(@RequestBody GroupDTO dto) {
        //效验数据
        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
        groupService.update(dto);
@ -90,7 +91,7 @@ public class GroupController {
    }

    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
        //效验数据
        AssertUtils.isArrayEmpty(ids, "id");
        groupService.delete(ids);
@ -104,26 +105,24 @@ public class GroupController {
    }

    /**
-     *
     * 社群审核详情信息
     *
-     * @params [id]
     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.group.GroupDetailDTO>
+     * @params [id]
     * @author liuchuang
     * @since 2019/10/21 10:32
     */
    @GetMapping("detail/{id}")
-    public Result<GroupDetailDTO> detail(@PathVariable("id") String id){
+    public Result<GroupDetailDTO> detail(@PathVariable("id") String id) {
        GroupDetailDTO data = groupService.getGroupDetail(id);
        return new Result<GroupDetailDTO>().ok(data);
    }

    /**
-     *
     * 审核、禁言、解禁、解散社群
     *
-     * @params [dto]
     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [dto]
     * @author liuchuang
     * @since 2019/10/21 9:31
     */
@ -135,11 +134,58 @@ public class GroupController {
    }

    /**
+     * 解散社群
     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [dto]
+     * @author liuchuang
+     * @since 2019/10/21 9:31
+     */
+    @PostMapping("dissolution")
+    @RecordUserBehavior(behavior = BehaviorEnum.GROUP_DISSOLUTION, referenceId = "#{dto.getId}", userId = "#{dto.getUserId}")
+    public Result dissolution(@RequestBody GroupSettingStateDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto);
+        return groupService.modifyGroupState(dto);
+    }
+
+    /**
+     * 审核通过
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [dto]
+     * @author liuchuang
+     * @since 2019/10/21 9:31
+     */
+    @PostMapping("pass")
+    @RecordUserBehavior(behavior = BehaviorEnum.GROUP_CREATE_SUCCESS, referenceId = "#{dto.getId}", userId = "#{dto.getUserId}")
+    public Result pass(@RequestBody GroupSettingStateDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto);
+        return groupService.modifyGroupState(dto);
+    }
+
+    /**
+     * 审核不通过
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [dto]
+     * @author liuchuang
+     * @since 2019/10/21 9:31
+     */
+    @PostMapping("noPass")
+    @RecordUserBehavior(behavior = BehaviorEnum.GROUP_APPLICATION_FAIL, referenceId = "#{dto.getId}", userId = "#{dto.getUserId}")
+    public Result noPass(@RequestBody GroupSettingStateDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto);
+        return groupService.modifyGroupState(dto);
+    }
+
+    /**
     * 获取网格下所有社群
     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.group.GroupListDTO>>
     * @params []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.group.GroupListDTO>>
     * @author liuchuang
     * @since 2019/11/12 9:30
     */
@ -150,11 +196,10 @@ public class GroupController {
    }

    /**
-     *
     * 排行榜-活跃度
     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.group.GroupActivityDTO>>
     * @params [params]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.group.GroupActivityDTO>>
     * @author liuchuang
     * @since 2019/11/12 16:10
     */
@ -166,11 +211,10 @@ public class GroupController {
    }

    /**
-     *
     * 排行榜-群成员数量
     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.group.GroupMemberDTO>>
     * @params [params]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.group.GroupMemberDTO>>
     * @author liuchuang
     * @since 2019/11/12 16:11
     */
--- a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/service/impl/GroupServiceImpl.java
+++ b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/group/service/impl/GroupServiceImpl.java
@ -164,7 +164,7 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
                userGroupService.save(userGroupDTO);
            }
        }
-        return new Result();
+        return new Result().ok(entity.getId());
    }

    @Override
--- a/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java
+++ b/epdc-cloud-group/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java
@ -194,7 +194,7 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp

            groupTopicUserReadService.insertBatch(readEntities);

-            return new Result();
+            return new Result().ok(entity.getId());
        }
        return new Result().error();
    }
--- a/epdc-cloud-group/src/main/resources/application.yml
+++ b/epdc-cloud-group/src/main/resources/application.yml
@ -113,3 +113,6 @@ rocketmq:
  consumer:
    group: @rocketmq.consumer.group@
    user: @rocketmq.consumer.user.group@
+    points-group: @rocketmq.consumer.points.group@
+  producer:
+    group: @rocketmq.producer.group@
--- a/epdc-cloud-group/src/main/resources/mapper/group/GroupDao.xml
+++ b/epdc-cloud-group/src/main/resources/mapper/group/GroupDao.xml
@ -48,7 +48,8 @@
            gp.GROUP_NAME,
            gp.GROUP_INTRODUCTION,
            gp.CREATED_TIME,
-            ugp.NICKNAME
+            ugp.NICKNAME,
+            ugp.USER_ID
        FROM
            epdc_group gp
            LEFT JOIN epdc_user_group ugp ON gp.ID = ugp.GROUP_ID