推荐群返参新增status,ErrorCode添加注释

epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/SysLogErrorEntity.java

@@ -62,7 +62,7 @@ public class SysLogErrorEntity implements Serializable {
 	/**
 	 * 创建者
 	 */
-	private Long creator;
+	private String creator;
 	/**
 	 * 创建时间
 	 */

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ErrorCode.java

@@ -18,26 +18,107 @@ package com.epmet.commons.tools.exception;
  * @since 1.0.0
  */
 public interface ErrorCode {
+    /**
+     * 服务器内部异常
+     */
     int INTERNAL_SERVER_ERROR = 500;
+    /**
+     * 未授权
+     */
     int UNAUTHORIZED = 401;
+
+    /**
+     * 拒绝访问，没有权限
+     */
     int FORBIDDEN = 403;
 
+    /**
+     * {0}不能为空
+     */
     int NOT_NULL = 10001;
+
+    /**
+     * 数据库中已存在该记录
+     */
     int DB_RECORD_EXISTS = 10002;
+
+    /**
+     * 获取参数失败
+     */
     int PARAMS_GET_ERROR = 10003;
+
+    /**
+     * 账号或密码错误
+     */
     int ACCOUNT_PASSWORD_ERROR = 10004;
+
+    /**
+     * 账号已被停用
+     */
     int ACCOUNT_DISABLE = 10005;
+
+    /**
+     * 唯一标识不能为空
+     */
     int IDENTIFIER_NOT_NULL = 10006;
+
+    /**
+     * 验证码不正确
+     */
     int CAPTCHA_ERROR = 10007;
+
+    /**
+     * 先删除子菜单或按钮
+     */
     int SUB_MENU_EXIST = 10008;
+
+    /**
+     * 原密码不正确
+     */
     int PASSWORD_ERROR = 10009;
+
+    /**
+     * 账号不存在
+     */
     int ACCOUNT_NOT_EXIST = 10010;
+
+    /**
+     * 上级部门选择错误
+     */
     int SUPERIOR_DEPT_ERROR = 10011;
+
+    /**
+     * 上级菜单不能为自身
+     */
     int SUPERIOR_MENU_ERROR = 10012;
+
+    /**
+     * 数据权限接口，只能是Map类型参数
+     */
     int DATA_SCOPE_PARAMS_ERROR = 10013;
+
+    /**
+     * 请先删除下级部门
+     */
     int DEPT_SUB_DELETE_ERROR = 10014;
+
+    /**
+     * 请先删除部门下的用户
+     */
     int DEPT_USER_DELETE_ERROR = 10015;
+
+    /**
+     * 参数格式不正确，请使用JSON格式
+     */
     int JSON_FORMAT_ERROR = 10016;
+
+    /**
+     * 上级区域选择错误
+     */
     int SUPERIOR_REGION_ERROR = 10017;
+
+    /**
+     * 请先删除下级区域
+     */
     int REGION_SUB_DELETE_ERROR = 10018;
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java

@@ -14,7 +14,7 @@ import com.epmet.commons.tools.config.ModuleConfig;
 import com.epmet.commons.tools.log.SysLogError;
 import com.epmet.commons.tools.log.enums.LogTypeEnum;
 import com.epmet.commons.tools.log.producer.LogProducer;
-import com.epmet.commons.tools.security.user.SecurityUser;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.HttpContextUtils;
 import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -93,8 +93,8 @@ public class RenExceptionHandler {
 		}
 
 		//登录用户ID
-		log.setCreator(SecurityUser.getUserId());
 
+		log.setCreator(LoginUserUtil.getLoginUserId());
 		//异常信息
 		log.setErrorInfo(ExceptionUtils.getErrorStackTrace(ex));
 

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/SysLogError.java

@@ -56,7 +56,7 @@ public class SysLogError extends BaseLog {
 	/**
 	 * 创建者
 	 */
-	private Long creator;
+	private String creator;
 	/**
 	 * 创建时间
 	 */

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java

@@ -38,4 +38,9 @@ public class RecommendGroupResultDTO implements Serializable {
 	 */
 	private Integer totalPartyMember;
 
+	/**
+	 * under_auditting审核中、rejected已拒绝的前端显示加入
+	 */
+	private String status="";
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -19,6 +19,7 @@ package com.epmet.modules.group.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -186,6 +187,13 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		recommendGroupFormDTO.setPageNo(pageIndex);
 		//显示当前网格内所有当前用户还未加入的组，以组的人数由高到低排序；如果人数相同，以最新话题的时间有近到远排序
 		List<RecommendGroupResultDTO> recommendGroupList = baseDao.selectListRecommendGroup(recommendGroupFormDTO);
+		for (RecommendGroupResultDTO recommendGroupResultDTO : recommendGroupList) {
+			GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.selectLatestRecord(recommendGroupResultDTO.getGroupId(),
+					recommendGroupFormDTO.getUserId());
+			if (null != groupMemeberOperationDTO) {
+				recommendGroupResultDTO.setStatus(groupMemeberOperationDTO.getOperateStatus());
+			}
+		}
 		return new Result<List<RecommendGroupResultDTO>>().ok(recommendGroupList);
 	}
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/GroupMemeberOperationDao.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.member.entity.GroupMemeberOperationEntity;
 import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 组成员出入群记录表
@@ -39,4 +40,14 @@ public interface GroupMemeberOperationDao extends BaseDao<GroupMemeberOperationE
 	 * @Date 2020/3/31 13:05
 	 **/
 	GroupMemeberOperationDTO selectLeaderRecord(String groupId);
+
+	/**
+	 * @param groupId
+	 * @param userId
+	 * @return com.epmet.resi.group.dto.member.GroupMemeberOperationDTO
+	 * @Author yinzuomei
+	 * @Description 查询用户与小组的关系（取最新记录）
+	 * @Date 2020/4/11 10:47
+	 **/
+	GroupMemeberOperationDTO selectLatestRecord(@Param("groupId")String groupId, @Param("userId") String userId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java

@@ -24,6 +24,7 @@ import com.epmet.modules.member.entity.GroupMemeberOperationEntity;
 import com.epmet.modules.member.entity.ResiGroupMemberEntity;
 import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -105,4 +106,14 @@ public interface GroupMemeberOperationService extends BaseService<GroupMemeberOp
      * @date 2020-03-29
      */
     Result saveMemberOperation(RemoveMemberFormDTO removeMemberFormDTO, ResiGroupMemberEntity resiGroupMemberEntity);
+
+    /**
+     * @param groupId 小组id
+     * @param userId  用户id
+     * @return com.epmet.resi.group.dto.member.GroupMemeberOperationDTO
+     * @Author yinzuomei
+     * @Description 查询用户与小组的关系（取最新记录）
+     * @Date 2020/4/11 10:41
+     **/
+    GroupMemeberOperationDTO selectLatestRecord(String groupId, String userId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java

@@ -119,4 +119,17 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
         return new Result();
     }
 
+    /**
+     * @param groupId 小组id
+     * @param userId  用户id
+     * @return com.epmet.resi.group.dto.member.GroupMemeberOperationDTO
+     * @Author yinzuomei
+     * @Description 查询用户与小组的关系（取最新记录）
+     * @Date 2020/4/11 10:41
+     **/
+    @Override
+    public GroupMemeberOperationDTO selectLatestRecord(String groupId, String userId) {
+        return baseDao.selectLatestRecord(groupId,userId);
+    }
+
 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/GroupMemeberOperationDao.xml

@@ -14,4 +14,18 @@
             AND gmo.GROUP_ID = #{groupId}
     </select>
 
+    <!--    查询用户与小组的关系（取最新记录） -->
+    <select id="selectLatestRecord" resultType="com.epmet.resi.group.dto.member.GroupMemeberOperationDTO" parameterType="map">
+        SELECT
+            *
+        FROM
+            group_memeber_operation gmo
+        WHERE
+            gmo.DEL_FLAG = '0'
+            AND gmo.GROUP_ID = #{groupId}
+            AND gmo.CUSTOMER_USER_ID = #{userId}
+        ORDER BY
+            gmo.CREATED_TIME DESC
+            LIMIT 1
+    </select>
 </mapper>