forked from luyan/epmet-cloud-lingshan
Browse Source
# Conflicts: # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # epmet-module/resi-group/resi-group-server/pom.xml # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java # epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.javamaster
jianjun
5 years ago
147 changed files with 2668 additions and 329 deletions
@ -0,0 +1,17 @@ |
|||||
|
package com.epmet.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.util.List; |
||||
|
|
||||
|
@Data |
||||
|
public class AccessConfigAdd4RoletFormDTO { |
||||
|
@NotBlank(message = "角色Key不能为空") |
||||
|
private String roleKey; |
||||
|
|
||||
|
@NotBlank(message = "操作Key不能为空") |
||||
|
private String operationKey; |
||||
|
|
||||
|
private List<String> scopeKeys; |
||||
|
} |
||||
@ -0,0 +1,14 @@ |
|||||
|
package com.epmet.resi.group.constant; |
||||
|
|
||||
|
public interface GroupAuditStatusConstant { |
||||
|
|
||||
|
// 审核中
|
||||
|
String UNDER_AUDITING = "under_auditing"; |
||||
|
|
||||
|
// 驳回
|
||||
|
String REJECTED = "rejected"; |
||||
|
|
||||
|
// 支持
|
||||
|
String APPROVED = "approved"; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,10 @@ |
|||||
|
package com.epmet.resi.group.constant; |
||||
|
|
||||
|
public interface GroupLimitConstant { |
||||
|
|
||||
|
/** |
||||
|
* 每月可以编辑2次 |
||||
|
*/ |
||||
|
Integer EDIT_NUM_LIMIT_MONTH = 2; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,40 @@ |
|||||
|
package com.epmet.resi.group.dto.group.form; |
||||
|
|
||||
|
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.Min; |
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Description 通用网格分页传参DTO |
||||
|
* @ClassName CommonGridAndPageFormDTO |
||||
|
* @Auth wangc |
||||
|
* @Date 2020-11-02 17:22 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class CommonGridAndPageFormDTO implements Serializable { |
||||
|
private static final long serialVersionUID = -7916909736115741017L; |
||||
|
|
||||
|
public interface GridPageGroup extends CustomerClientShowGroup{} |
||||
|
|
||||
|
/** |
||||
|
* 网格Id |
||||
|
*/ |
||||
|
@NotBlank(message = "网格Id不能为空" , groups = GridPageGroup.class) |
||||
|
private String gridId; |
||||
|
|
||||
|
/** |
||||
|
* 页码 |
||||
|
*/ |
||||
|
@Min(1) |
||||
|
private Integer pageNo; |
||||
|
|
||||
|
/** |
||||
|
* 每页多少条数 |
||||
|
*/ |
||||
|
@Min(1) |
||||
|
private Integer pageSize; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,39 @@ |
|||||
|
package com.epmet.resi.group.dto.group.form; |
||||
|
|
||||
|
import lombok.AllArgsConstructor; |
||||
|
import lombok.Data; |
||||
|
import lombok.NoArgsConstructor; |
||||
|
import org.hibernate.validator.constraints.Length; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
|
||||
|
@Data |
||||
|
@NoArgsConstructor |
||||
|
@AllArgsConstructor |
||||
|
public class EditGroupFormDTO { |
||||
|
|
||||
|
// 分组详情校验
|
||||
|
public interface GroupDetailVG {} |
||||
|
|
||||
|
// 提交组编辑校验组
|
||||
|
public interface SubmitGroupEditVG {} |
||||
|
|
||||
|
|
||||
|
/** |
||||
|
* 组id |
||||
|
*/ |
||||
|
@NotBlank(message = "组ID不能为空", groups = { GroupDetailVG.class, SubmitGroupEditVG.class }) |
||||
|
private String groupId; |
||||
|
|
||||
|
@NotBlank(message = "组头像不能为空", groups = { SubmitGroupEditVG.class }) |
||||
|
private String groupHeadPhoto; |
||||
|
|
||||
|
@NotBlank(message = "组名称不能为空", groups = { SubmitGroupEditVG.class }) |
||||
|
@Length(max = 10, message = "组名称长度不能超过10个字", groups = { SubmitGroupEditVG.class }) |
||||
|
private String groupName; |
||||
|
|
||||
|
@NotBlank(message = "组介绍不能为空", groups = { SubmitGroupEditVG.class }) |
||||
|
@Length(max = 500, message = "组介绍长度不能超过500个字", groups = { SubmitGroupEditVG.class }) |
||||
|
private String groupIntroduction; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,43 @@ |
|||||
|
package com.epmet.resi.group.dto.group.form; |
||||
|
|
||||
|
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Description 组信息修改审核入参DTO |
||||
|
* @ClassName GroupEditionAuditFormDTO |
||||
|
* @Auth wangc |
||||
|
* @Date 2020-11-02 17:30 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class GroupEditionAuditFormDTO implements Serializable { |
||||
|
private static final long serialVersionUID = 3851649860177395296L; |
||||
|
|
||||
|
public interface GroupEditionAuditGroup extends CustomerClientShowGroup{} |
||||
|
|
||||
|
/** |
||||
|
* 组Id |
||||
|
*/ |
||||
|
@NotBlank(message = "组Id不能为空",groups = GroupEditionAuditGroup.class) |
||||
|
private String groupId; |
||||
|
|
||||
|
/** |
||||
|
* 审核结果 审核结果。approved：支持;rejected:拒绝 |
||||
|
*/ |
||||
|
@NotBlank(message = "审核结果不能为空",groups = GroupEditionAuditGroup.class) |
||||
|
private String auditResult; |
||||
|
|
||||
|
/** |
||||
|
* 拒绝时的备注 |
||||
|
*/ |
||||
|
private String remark; |
||||
|
|
||||
|
/** |
||||
|
* 工作人员Id |
||||
|
*/ |
||||
|
@NotBlank(message = "工作人员Id不能为空",groups = GroupEditionAuditGroup.class) |
||||
|
private String staffId; |
||||
|
} |
||||
@ -0,0 +1,21 @@ |
|||||
|
package com.epmet.resi.group.dto.group.result; |
||||
|
|
||||
|
import lombok.AllArgsConstructor; |
||||
|
import lombok.Data; |
||||
|
import lombok.NoArgsConstructor; |
||||
|
|
||||
|
@Data |
||||
|
@NoArgsConstructor |
||||
|
@AllArgsConstructor |
||||
|
public class GroupDetailResultDTO { |
||||
|
|
||||
|
private String groupHeadPhoto; |
||||
|
private String groupName; |
||||
|
private String groupIntroduction; |
||||
|
private Integer editNumLimit; |
||||
|
private Integer avaliableEditNum; |
||||
|
private String auditStatus; |
||||
|
private Boolean editable; |
||||
|
private String remark; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,42 @@ |
|||||
|
package com.epmet.resi.group.dto.group.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
|
||||
|
/** |
||||
|
* @Description 工作端 群信息修改申请详情 |
||||
|
* @ClassName GroupEditionDetailResultDTO |
||||
|
* @Auth wangc |
||||
|
* @Date 2020-11-02 17:54 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class GroupEditionDetailResultDTO implements Serializable { |
||||
|
private static final long serialVersionUID = -784043668974222480L; |
||||
|
|
||||
|
/** |
||||
|
* 待审核的小组Id |
||||
|
*/ |
||||
|
private String groupId; |
||||
|
|
||||
|
/** |
||||
|
* 待审核小组名称 是提交的名称，如果没有更改群名称则还是原来的 |
||||
|
*/ |
||||
|
private String groupName; |
||||
|
|
||||
|
/** |
||||
|
* 待审核小组图片 是提交的群头像，如果没有更改群头像则还是原来的 |
||||
|
*/ |
||||
|
private String groupHeadPhoto; |
||||
|
|
||||
|
/** |
||||
|
* 待审核小组的介绍 是提交的群介绍，如果没有更改群介绍则还是原来的 |
||||
|
*/ |
||||
|
private String groupIntroduction; |
||||
|
|
||||
|
/** |
||||
|
* 群主的昵称 xx路-xx先生/女士 |
||||
|
*/ |
||||
|
private String groupLeaderName; |
||||
|
} |
||||
@ -0,0 +1,92 @@ |
|||||
|
/** |
||||
|
* Copyright 2018 人人开源 https://www.renren.io
|
||||
|
* <p> |
||||
|
* This program is free software: you can redistribute it and/or modify |
||||
|
* it under the terms of the GNU General Public License as published by |
||||
|
* the Free Software Foundation, either version 3 of the License, or |
||||
|
* (at your option) any later version. |
||||
|
* <p> |
||||
|
* This program is distributed in the hope that it will be useful, |
||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
|
* GNU General Public License for more details. |
||||
|
* <p> |
||||
|
* You should have received a copy of the GNU General Public License |
||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
*/ |
||||
|
|
||||
|
package com.epmet.modules.group.dao; |
||||
|
|
||||
|
import com.epmet.commons.mybatis.dao.BaseDao; |
||||
|
import com.epmet.modules.group.entity.GroupEditSubmitRecordEntity; |
||||
|
import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; |
||||
|
import org.apache.ibatis.annotations.Mapper; |
||||
|
import org.apache.ibatis.annotations.Param; |
||||
|
|
||||
|
import java.util.Date; |
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* 组编辑提交记录表 |
||||
|
* |
||||
|
* @author generator generator@elink-cn.com |
||||
|
* @since v1.0.0 2020-11-02 |
||||
|
*/ |
||||
|
@Mapper |
||||
|
public interface GroupEditSubmitRecordDao extends BaseDao<GroupEditSubmitRecordEntity> { |
||||
|
|
||||
|
/** |
||||
|
* 查询指定组，指定时间段内的编辑次数 |
||||
|
* @param groupId |
||||
|
* @param monthStart |
||||
|
* @param monthEnd |
||||
|
* @return |
||||
|
*/ |
||||
|
int countEditNum(@Param("groupId") String groupId, |
||||
|
@Param("monthStart") Date monthStart, |
||||
|
@Param("monthEnd") Date monthEnd); |
||||
|
|
||||
|
/** |
||||
|
* 查询最后一次编辑提交记录 |
||||
|
* @param groupId |
||||
|
*/ |
||||
|
GroupEditSubmitRecordEntity getLatestEditSubmitRecord(@Param("groupId") String groupId); |
||||
|
|
||||
|
/** |
||||
|
* @Description 工作端查询群组修改信息申请列表 |
||||
|
* @param gridId |
||||
|
* @return |
||||
|
* @author wangc |
||||
|
* @date 2020.11.03 13:39 |
||||
|
*/ |
||||
|
List<ApplyingGroupResultDTO> selectGroupEditApplyList(@Param("gridId")String gridId); |
||||
|
|
||||
|
/** |
||||
|
* @Description 查询小组修改信息详情 |
||||
|
* @param |
||||
|
* @return com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO |
||||
|
* @author wangc |
||||
|
* @date 2020.11.03 14:32 |
||||
|
*/ |
||||
|
GroupEditSubmitRecordEntity selectEditDetail(@Param("groupId")String groupId,@Param("auditResult") String auditResult); |
||||
|
|
||||
|
/** |
||||
|
* @Description 审核群信息更改 |
||||
|
* @param groupId |
||||
|
* @param staffId |
||||
|
* @param auditStatus |
||||
|
* @param remark |
||||
|
* @return int |
||||
|
* @author wangc |
||||
|
* @date 2020.11.03 17:33 |
||||
|
*/ |
||||
|
int updateAuditResult(@Param("groupId")String groupId,@Param("staffId") String staffId,@Param("auditStatus") String auditStatus,@Param("remark")String remark); |
||||
|
|
||||
|
/** |
||||
|
* @param gridId |
||||
|
* @author yinzuomei |
||||
|
* @description 根据网格id查询 待审核的变更小组信息申请 总数 |
||||
|
* @Date 2020/11/13 10:05 |
||||
|
**/ |
||||
|
Integer selectCountAuditingRec(String gridId); |
||||
|
} |
||||
@ -0,0 +1,101 @@ |
|||||
|
/** |
||||
|
* Copyright 2018 人人开源 https://www.renren.io
|
||||
|
* <p> |
||||
|
* This program is free software: you can redistribute it and/or modify |
||||
|
* it under the terms of the GNU General Public License as published by |
||||
|
* the Free Software Foundation, either version 3 of the License, or |
||||
|
* (at your option) any later version. |
||||
|
* <p> |
||||
|
* This program is distributed in the hope that it will be useful, |
||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
|
* GNU General Public License for more details. |
||||
|
* <p> |
||||
|
* You should have received a copy of the GNU General Public License |
||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
*/ |
||||
|
|
||||
|
package com.epmet.modules.group.entity; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.annotation.TableName; |
||||
|
|
||||
|
import com.epmet.commons.mybatis.entity.BaseEpmetEntity; |
||||
|
import lombok.Data; |
||||
|
import lombok.EqualsAndHashCode; |
||||
|
|
||||
|
import java.util.Date; |
||||
|
|
||||
|
/** |
||||
|
* 组编辑提交记录表 |
||||
|
* |
||||
|
* @author generator generator@elink-cn.com |
||||
|
* @since v1.0.0 2020-11-02 |
||||
|
*/ |
||||
|
@Data |
||||
|
@EqualsAndHashCode(callSuper=false) |
||||
|
@TableName("group_edit_submit_record") |
||||
|
public class GroupEditSubmitRecordEntity extends BaseEpmetEntity { |
||||
|
|
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
/** |
||||
|
* 小组ID |
||||
|
*/ |
||||
|
private String groupId; |
||||
|
|
||||
|
/** |
||||
|
* 客户ID |
||||
|
*/ |
||||
|
private String customerId; |
||||
|
|
||||
|
/** |
||||
|
* 网格ID |
||||
|
*/ |
||||
|
private String gridId; |
||||
|
|
||||
|
/** |
||||
|
* 头像 |
||||
|
*/ |
||||
|
private String groupHeadPhoto; |
||||
|
|
||||
|
/** |
||||
|
* 小组名称 |
||||
|
*/ |
||||
|
private String groupName; |
||||
|
|
||||
|
/** |
||||
|
* 小组介绍 |
||||
|
*/ |
||||
|
private String groupIntroduction; |
||||
|
|
||||
|
/** |
||||
|
* 审核状态。under_auditting:审核中,approved:通过，rejected:驳回 |
||||
|
*/ |
||||
|
private String auditStatus; |
||||
|
|
||||
|
/** |
||||
|
* 审核人ID |
||||
|
*/ |
||||
|
private String staffId; |
||||
|
|
||||
|
/** |
||||
|
* 回复 |
||||
|
*/ |
||||
|
private String remark; |
||||
|
|
||||
|
/** |
||||
|
* 审核时间 |
||||
|
*/ |
||||
|
private Date auditTime; |
||||
|
|
||||
|
/** |
||||
|
* 审核人员查看待审核列表时的文案 如:党员李华申请变更小组【原小组名】，请审核。 |
||||
|
*/ |
||||
|
private String messageText; |
||||
|
|
||||
|
/** |
||||
|
* 已读read 未读unread |
||||
|
*/ |
||||
|
private String readFlag; |
||||
|
|
||||
|
} |
||||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue