().ok(resiGroupService.getEditAuditingDetail(param));
+ }
+
+ /**
+ * @Description 工作端-作人员提交审核
+ * @param param
+ * @return void
+ * @author wangc
+ * @date 2020.11.03 16:02
+ */
+ @PostMapping("gov-audit-edit")
+ public Result govAuditEdit(@RequestBody GroupEditionAuditFormDTO param){
+ resiGroupService.auditEdit(param);
+ return new Result();
+ }
+
+
/**
* @param formDTO
* @author yinzuomei
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/GroupEditSubmitRecordDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/GroupEditSubmitRecordDao.java
new file mode 100644
index 0000000000..829beba4f7
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/GroupEditSubmitRecordDao.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+
+ /**
+ * 查询指定组,指定时间段内的编辑次数
+ * @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 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);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
index 867a3d11ba..2cbc78cae1 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
@@ -26,6 +26,7 @@ import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+
import java.util.List;
/**
@@ -188,4 +189,17 @@ public interface ResiGroupDao extends BaseDao {
* @date 2020.05.22 09:54
**/
List selectGroupListByGridIds(@Param("gridIds") List gridIds);
+
+ /**
+ * 编辑提交的时候,检查组名是否存在。网格内检查,
+ * 检查resi_group中已审核通过的和待审核的
+ * 检查submit_record中待审核的。已审核的不用检查,因为已经更新到resi_group中了
+ * @param groupId
+ * @param gridId
+ * @param groupName
+ * @return
+ */
+ int countExistsGroupNameBeforeEdit(@Param("groupId") String groupId,
+ @Param("gridId") String gridId,
+ @Param("groupName") String groupName);
}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java
new file mode 100644
index 0000000000..9f8b5c8816
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/GroupEditSubmitRecordRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/GroupEditSubmitRecordRedis.java
new file mode 100644
index 0000000000..346ebd5924
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/GroupEditSubmitRecordRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.group.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 组编辑提交记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-11-02
+ */
+@Component
+public class GroupEditSubmitRecordRedis {
+ @Autowired
+ private RedisUtils redisUtils;
+
+ public void delete(Object[] ids) {
+
+ }
+
+ public void set(){
+
+ }
+
+ public String get(String id){
+ return null;
+ }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java
index 7f2442a8e7..03dcc4ecba 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java
@@ -19,8 +19,12 @@ package com.epmet.modules.group.redis;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.redis.RedisKeys;
import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.UserBaseInfoResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.modules.constant.ResiGroupRedisKeys;
import com.epmet.modules.group.service.ResiGroupService;
import com.epmet.modules.group.service.ResiGroupStatisticalService;
@@ -36,6 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import java.util.*;
@@ -57,6 +62,9 @@ public class ResiGroupRedis {
@Autowired
private ResiGroupStatisticalService statisticalService;
+ @Autowired
+ private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
public void delete(Object[] ids) {
@@ -124,6 +132,16 @@ public class ResiGroupRedis {
return null;
}
+ /**
+ * @Description 删除组缓存
+ * @param groupId
+ * @return void
+ * @author wangc
+ * @date 2020.11.12 14:07
+ */
+ public void delGroup(String groupId){
+ redisUtils.delete(ResiGroupRedisKeys.getResiGroupInfoKey(groupId));
+ }
/**
* @param gridId
@@ -215,4 +233,22 @@ public class ResiGroupRedis {
}
});
}
+
+ /**
+ * @Description 从缓存中获取用户的真实姓名
+ * @param userId
+ * @return java.lang.String
+ * @author wangc
+ * @date 2020.11.03 15:27
+ */
+ public String getFullName(String userId){
+ String fieldValue = (String)redisUtils.hGet(RedisKeys.getResiUserKey(userId),"realName");
+ if(StringUtils.isNotBlank(fieldValue)) return fieldValue;
+ List userParam = new LinkedList<>(); userParam.add(userId);
+ Result> userCacheResult = epmetUserOpenFeignClient.queryUserBaseInfo(userParam);
+ if(userCacheResult.success() && !CollectionUtils.isEmpty(userCacheResult.getData())){
+ return userCacheResult.getData().iterator().next().getRealName();
+ }
+ return null;
+ }
}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
index c259137f33..6c4dd40356 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
@@ -295,13 +295,44 @@ public interface ResiGroupService extends BaseService {
* @return java.util.List
*/
List recommendedList(RecommendedListFormDTO formDTO);
-
+
+ GroupDetailResultDTO getGroupDetail(String groupId);
+
+ void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction, String editUserId);
+
+ /**
+ * @Description 工作端 查询组变更待审核列表
+ * @param param
+ * @return
+ * @author wangc
+ * @date 2020.11.03 10:19
+ */
+ List getEditAuditingList(CommonGridAndPageFormDTO param);
+
+ /**
+ * @Description 查询小组修改信息的详情内容
+ * @param param
+ * @returncom.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO
+ * @author wangc
+ * @date 2020.11.03 14:10
+ */
+ GroupEditionDetailResultDTO getEditAuditingDetail(GovGroupSummarizeFromDTO param);
+
+ /**
+ * @Description 工作人员提交审核
+ * @param param
+ * @return void
+ * @author wangc
+ * @date 2020.11.03 16:02
+ */
+ void auditEdit(GroupEditionAuditFormDTO param);
+
/**
* @return void
* @param formDTO
* @author yinzuomei
* @description 组长开启/关闭入群审核
- * @Date 2020/11/17 14:18
+ * @Date 2020/11/17 14:18
**/
void editAuditSwitch(EditAuditSwitchFormDTO formDTO);
}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index c36aa614d4..cc1eac2dc2 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -32,6 +32,13 @@ import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
+import com.epmet.commons.tools.scan.param.ImgTaskDTO;
+import com.epmet.commons.tools.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
+import com.epmet.commons.tools.utils.*;
import com.epmet.constant.ReadFlagConstant;
import com.epmet.dto.form.*;
import com.epmet.dto.result.UserResiInfoResultDTO;
@@ -41,8 +48,10 @@ import com.epmet.modules.constant.UserMessageConstant;
import com.epmet.modules.feign.EpmetMessageFeignClient;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.feign.GovOrgFeignClient;
+import com.epmet.modules.group.dao.GroupEditSubmitRecordDao;
import com.epmet.modules.group.dao.ResiGroupDao;
import com.epmet.modules.group.dao.ResiGroupOperationDao;
+import com.epmet.modules.group.entity.GroupEditSubmitRecordEntity;
import com.epmet.modules.group.entity.ResiGroupEntity;
import com.epmet.modules.group.entity.ResiGroupOperationEntity;
import com.epmet.modules.group.redis.ResiGroupRedis;
@@ -66,13 +75,16 @@ import com.epmet.resi.group.dto.group.result.*;
import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO;
+import com.github.pagehelper.PageHelper;
import com.epmet.resi.group.dto.member.form.EditAuditSwitchFormDTO;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -127,6 +139,27 @@ public class ResiGroupServiceImpl extends BaseServiceImpl groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId());
-
if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName());
} else {
@@ -344,38 +376,45 @@ public class ResiGroupServiceImpl extends BaseServiceImpl resiResult =
- epmetUserFeignClient.getUserResiInfoDTO(resiParam);
- String userName = "";
- if(resiResult.success() && null != resiResult.getData()){
- userName = (StringUtils.isBlank(resiResult.getData().getSurname()) ? "" : resiResult.getData().getSurname())
- + (StringUtils.isBlank(resiResult.getData().getName()) ? "" :resiResult.getData().getName());
- }
+ //4.获取居民注册信息
+ UserResiInfoFormDTO resiParam = new UserResiInfoFormDTO();
+ resiParam.setCustomerId(applyCreateGroupFormDTO.getCustomerId());
+ resiParam.setUserId(applyCreateGroupFormDTO.getUserId());
+ Result resiResult =
+ epmetUserFeignClient.getUserResiInfoDTO(resiParam);
+ String userName = "";
+ if(resiResult.success() && null != resiResult.getData()){
+ userName = (StringUtils.isBlank(resiResult.getData().getSurname()) ? "" : resiResult.getData().getSurname())
+ + (StringUtils.isBlank(resiResult.getData().getName()) ? "" :resiResult.getData().getName());
+ }
userName = StringUtils.isBlank(userName) ? ModuleConstant.UNKNOWN : userName;
- String msg = String.format(UserMessageConstant.CREATION_OF_GROUP_MESSAGE_TEMPLATE,roleName,userName,applyCreateGroupFormDTO.getGroupName());
- //3.2、插入一条待审核的操作记录
+ String msg = String.format(UserMessageConstant.CREATION_OF_GROUP_MESSAGE_TEMPLATE,roleName,userName,applyCreateGroupFormDTO.getGroupName());
+ //4.2、插入一条待审核的操作记录
ResiGroupOperationDTO resiGroupOperation = new ResiGroupOperationDTO();
resiGroupOperation.setResiGroupId(resiGroupEntity.getId());
resiGroupOperation.setState(GroupStateConstant.GROUP_UNDER_AUDITTING);
@@ -383,7 +422,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl 0) {
+ // 已存在组名,拒绝提交
+ throw new RenException(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode(), EpmetErrorCode.GROUP_ALREADY_EXISTED.getMsg());
+ }
+
+ Date now = new Date();
+ int usedEditNum = groupEditSubmitRecordDao.countEditNum(groupId, DateUtils.getMonthStart(now), DateUtils.getMonthEnd(now));
+ if (GroupLimitConstant.EDIT_NUM_LIMIT_MONTH <= usedEditNum) {
+ // 达到最大编辑次数了
+ throw new RenException(EpmetErrorCode.GROUP_EDIT_NUM_LIMITED.getCode(), EpmetErrorCode.GROUP_EDIT_NUM_LIMITED.getMsg());
+ }
+
+ // 3.内容检查
+ scanGroupEditContent(groupName, groupIntroduction, groupHeadPhoto);
+
+ String app = loginUserUtil.getLoginUserApp();
+ String userId = loginUserUtil.getLoginUserId();
+ String messageText = generateGroupEditMessageText(app, userId, group.getCustomerId(), group.getGridId(), groupName);
+
+ // 4.创建编辑提交记录
+ GroupEditSubmitRecordEntity editRecord = new GroupEditSubmitRecordEntity();
+ editRecord.setAuditStatus(GroupAuditStatusConstant.UNDER_AUDITING);
+ editRecord.setCustomerId(group.getCustomerId());
+ editRecord.setGridId(group.getGridId());
+ editRecord.setGroupHeadPhoto(groupHeadPhoto);
+ editRecord.setGroupIntroduction(groupIntroduction);
+ editRecord.setGroupId(groupId);
+ editRecord.setGroupName(groupName);
+ editRecord.setReadFlag(ReadFlagConstant.UN_READ);
+ editRecord.setMessageText(messageText);
+
+ if (groupEditSubmitRecordDao.insert(editRecord) == 0) {
+ throw new RenException(EpmetErrorCode.GROUP_EDIT_ERROR.getCode(), EpmetErrorCode.GROUP_EDIT_ERROR.getMsg());
+ }
+
+ resiGroupRedis.addWorkGrassrootsGroupRedDotValue(group.getGridId());
+
+ }
+
+ /**
+ * 生成组信息编辑简介文本:xxx申请编辑组信息,请审核
+ * @param app
+ * @param userId
+ * @param customerId
+ * @param gridId
+ * @param groupName
+ * @return
+ */
+ private String generateGroupEditMessageText(String app, String userId, String customerId, String gridId, String groupName) {
+ List resiRoles = getResiRoles(app, customerId, userId, gridId);
+ boolean isPartymember = false;
+ boolean isWarmhearted = false;
+ for (UserRoleResultDTO role : resiRoles) {
+ if (EpmetRoleKeyConstant.WARMHEARTED.equals(role.getRoleKey())) {
+ isWarmhearted = true;
+ }
+ if (EpmetRoleKeyConstant.PARTYMEMBER.equals(role.getRoleKey())) {
+ isPartymember = true;
+ }
+ }
+ if (!isWarmhearted && isPartymember) {
+ throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode(), "只有党员和热心居民才能创建和编辑小组");
+ }
+ String roleName = "";
+ if (isPartymember) {
+ roleName = ModuleConstant.PARTYMEMBER;
+ } else if (isWarmhearted) {
+ roleName = ModuleConstant.WAREMHEARTED_RESI;
+ }
+
+ //3.获取居民注册信息
+ UserResiInfoFormDTO resiParam = new UserResiInfoFormDTO();
+ resiParam.setCustomerId(customerId);
+ resiParam.setUserId(userId);
+ Result resiResult =
+ epmetUserFeignClient.getUserResiInfoDTO(resiParam);
+ String userName = "";
+ if (resiResult.success() && null != resiResult.getData()) {
+ userName = (StringUtils.isBlank(resiResult.getData().getSurname()) ? "" : resiResult.getData().getSurname())
+ + (StringUtils.isBlank(resiResult.getData().getName()) ? "" : resiResult.getData().getName());
+ }
+ userName = StringUtils.isBlank(userName) ? ModuleConstant.UNKNOWN : userName;
+ return String.format(UserMessageConstant.EDIT_OF_GROUP_MESSAGE_TEMPLATE, roleName, userName, groupName);
+ }
+
+ /**
+ * 查询居民的角色列表
+ * @param app
+ * @param customerId
+ * @param userId
+ * @param gridId
+ * @return
+ */
+ private List getResiRoles(String app, String customerId, String userId, String gridId) {
+ UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
+ userRoleFormDTO.setApp(app);
+ userRoleFormDTO.setCustomerId(customerId);
+ userRoleFormDTO.setUserId(userId);
+ userRoleFormDTO.setGridId(gridId);
+ Result> rolesResult = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO);
+
+ if (! rolesResult.success()) {
+ logger.error("修改组信息:查询居民角色失败,详情:{}", rolesResult.getInternalMsg());
+ throw new RenException(EpmetErrorCode.GROUP_EDIT_ERROR.getCode(), "查询居民角色失败");
+ } else {
+ List roles = rolesResult.getData();
+ if (CollectionUtils.isEmpty(roles)) {
+ roles = new ArrayList<>();
+ }
+ return roles;
+ }
+ }
+
+ /**
+ * 内容检查
+ * @param groupName
+ * @param groupIntroduction
+ * @param groupHeadPhoto
+ */
+ private void scanGroupEditContent(String groupName, String groupIntroduction, String groupHeadPhoto) {
+ // 文本内容审核
+ TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+ TextTaskDTO taskDTO = new TextTaskDTO();
+ String content = groupName.concat("-").concat(groupIntroduction);
+ taskDTO.setContent(content);
+ taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+ textScanParamDTO.getTasks().add(taskDTO);
+ Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+ if (!textSyncScanResult.success()) {
+ logger.error("调用内容审核服务审核文本发生错误:{}", textSyncScanResult.getInternalMsg());
+ throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+ } else {
+ if (!textSyncScanResult.getData().isAllPass()) {
+ throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
+ }
+ }
+
+ // 图片内容审核
+ ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
+ ImgTaskDTO task = new ImgTaskDTO();
+ task.setDataId(UUID.randomUUID().toString().replace("-", ""));
+ task.setUrl(groupHeadPhoto);
+ imgScanParamDTO.getTasks().add(task);
+
+ Result imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
+ if (!imgScanResult.success()){
+ logger.error("调用内容审核服务审核图片发生错误:{}", textSyncScanResult.getInternalMsg());
+ throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+ } else {
+ if (!textSyncScanResult.getData().isAllPass()) {
+ throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode(), EpmetErrorCode.IMG_SCAN_FAILED.getMsg());
+ }
+ }
+ }
+
+ /**
+ * @Description 工作端 查询组变更待审核列表
+ * @param param
+ * @return
+ * @author wangc
+ * @date 2020.11.03 10:19
+ */
+ @Override
+ public List getEditAuditingList(CommonGridAndPageFormDTO param) {
+ return Optional.ofNullable(PageHelper.startPage(null == param.getPageNo() ? NumConstant.ONE : param.getPageNo() , null == param.getPageSize() ? NumConstant.TWELVE : param.getPageSize())
+ .doSelectPage(() -> {
+ groupEditSubmitRecordDao.selectGroupEditApplyList(param.getGridId());}).getResult()).orElse(new LinkedList<>())
+ .stream().map(o -> { return (ApplyingGroupResultDTO)o; }).collect(Collectors.toList());
+ }
+
+ /**
+ * @Description 查询小组修改信息的详情内容 不加事务!
+ * @param param
+ * @return com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO
+ * @author wangc
+ * @date 2020.11.03 14:10
+ */
+ @Override
+ public GroupEditionDetailResultDTO getEditAuditingDetail(GovGroupSummarizeFromDTO param) {
+ GroupEditSubmitRecordEntity edit = groupEditSubmitRecordDao.selectEditDetail(param.getGroupId(),null);
+ if(null == edit) {
+ logger.error("com.epmet.modules.group.service.impl.ResiGroupServiceImpl.getEditAuditingDetail,未找到小组变更信息记录,传参:{}",JSON.toJSONString(param));
+ return null;}
+ //取消未读状态
+ GroupEditSubmitRecordEntity _update = new GroupEditSubmitRecordEntity();
+ _update.setId(edit.getId());_update.setReadFlag(ModuleConstant.READ);
+ groupEditSubmitRecordDao.updateById(_update);
+ GroupEditionDetailResultDTO result = ConvertUtils.sourceToTarget(edit, GroupEditionDetailResultDTO.class);
+ result.setGroupLeaderName(resiGroupRedis.getFullName(edit.getCreatedBy()));
+ return result;
+ }
+
+ /**
+ * @Description 工作人员提交审核
+ * @param param
+ * @return void
+ * @author wangc
+ * @date 2020.11.03 16:02
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditEdit(GroupEditionAuditFormDTO param) {
+ if(StringUtils.equals(param.getAuditResult(),ModuleConstant.AUDITING_OPERATION_REJECT) && StringUtils.isBlank(param.getRemark())){
+ throw new RenException("拒绝理由不能为空");
+ }
+ GroupEditSubmitRecordEntity edit = groupEditSubmitRecordDao.selectEditDetail(param.getGroupId(),null);
+ if(null == edit){
+ logger.error("com.epmet.modules.group.service.impl.ResiGroupServiceImpl.auditEdit,找不到待审核的组更新记录,传参:{}",JSON.toJSONString(param));
+ throw new RenException("找不到待审核的组更新记录");
+ }
+
+ int affectedRows = groupEditSubmitRecordDao.updateAuditResult(param.getGroupId(),param.getStaffId(),param.getAuditResult(),param.getRemark());
+ if(affectedRows <= NumConstant.ZERO){
+ logger.error("com.epmet.modules.group.service.impl.ResiGroupServiceImpl.auditEdit,更新组编辑记录时受影响行数小于1,传参:{}",JSON.toJSONString(param));
+ throw new RenException("更新组编辑记录时受影响行数小于1");
+ }
+ if(!StringUtils.equals(param.getAuditResult(),ModuleConstant.AUDITING_OPERATION_REJECT)){
+ //同意
+ ResiGroupEntity _update = ConvertUtils.sourceToTarget(edit,ResiGroupEntity.class);
+ _update.setId(param.getGroupId());
+ baseDao.updateById(_update);
+ }
+ resiGroupRedis.subtractWorkGrassrootsPartyAuthRedDotValue(edit.getGridId());
+ resiGroupRedis.delGroup(param.getGroupId());
+ }
+
}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 1a5d8964a3..6e34af14da 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -18,7 +18,6 @@
package com.epmet.modules.topic.service.impl;
-
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -75,9 +74,9 @@ import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO;
import com.epmet.resi.group.dto.topic.ResiTopicDTO;
import com.epmet.resi.group.dto.topic.TopicInfoDTO;
-import com.epmet.resi.group.dto.topic.form.*;
import com.epmet.resi.group.dto.topic.form.CheckTopicPublisherFormDTO;
import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO;
+import com.epmet.resi.group.dto.topic.form.*;
import com.epmet.resi.group.dto.topic.result.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -1156,48 +1155,49 @@ public class ResiTopicServiceImpl extends BaseServiceImpl issueResult = govIssueFeignClient.issueShiftedToTopic(issueInfo);
+ if (issueResult == null || !issueResult.success() || StringUtils.isBlank(issueResult.getData())) {
+ throw new RenException(ModuleConstant.CREATE_ISSUE_ERROR);
+ }
//5.修改话题shiftIssue字段
- if(issueResult.success() && StringUtils.isNotBlank(issueResult.getData())){
- ResiTopicEntity topic2Upd = new ResiTopicEntity();
- topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
- topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId());
- topic2Upd.setShiftIssue(Boolean.TRUE);
- topic2Upd.setIssueId(issueResult.getData());
- topic2Upd.setUpdatedTime(now);
- int topicResult = baseDao.updateOne(topic2Upd);
- //6.新增话题操作记录
- if(topicResult == NumConstant.ONE) {
- ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
- operation.setCreatedTime(now);
- operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
- operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
- operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
- int operationResult = resiTopicOperationDao.insertOneByParams(operation);
- if(operationResult != NumConstant.ONE){
- logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
- }
- }
- //7.更新组统计信息 议题数量+1
- resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
- if(null != groupCache && null != groupCache.getGroupStatisticalInfo()){
- groupCache.getGroupStatisticalInfo().setTotalIssues(
- null == groupCache.getGroupStatisticalInfo().getTotalIssues() ? NumConstant.ONE
- : groupCache.getGroupStatisticalInfo().getTotalIssues() + NumConstant.ONE
- );
- resiGroupRedis.set(groupCache);
- }
- logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
+ ResiTopicEntity topic2Upd = new ResiTopicEntity();
+ topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
+ topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId());
+ topic2Upd.setShiftIssue(Boolean.TRUE);
+ topic2Upd.setIssueId(issueResult.getData());
+ topic2Upd.setUpdatedTime(now);
+ int topicResult = baseDao.updateOne(topic2Upd);
+ //6.新增话题操作记录
+ if (topicResult == NumConstant.ONE) {
+ ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
+ operation.setCreatedTime(now);
+ operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
+ operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
+ operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
+ int operationResult = resiTopicOperationDao.insertOneByParams(operation);
+ if (operationResult != NumConstant.ONE) {
+ logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
+ }
+ }
+ //7.更新组统计信息 议题数量+1
+ resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
+ if (null != groupCache && null != groupCache.getGroupStatisticalInfo()) {
+ groupCache.getGroupStatisticalInfo().setTotalIssues(
+ null == groupCache.getGroupStatisticalInfo().getTotalIssues() ? NumConstant.ONE
+ : groupCache.getGroupStatisticalInfo().getTotalIssues() + NumConstant.ONE
+ );
+ resiGroupRedis.set(groupCache);
}
+ logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
}
}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index bf00b9e475..4ed27345bb 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -327,7 +327,19 @@ public interface ModuleConstant extends Constant {
String FIELD_OPERATION_TYPE = "OPERATION_TYPE";
- String CLOSED_TOPIC_REASON_PREFIX="话题已关闭:";
+ String CLOSED_TOPIC_REASON_PREFIX = "话题已关闭:";
+
+ String CREATE_ISSUE_ERROR = "创建议题失败";
+
+ /**
+ * 审核操作 同意
+ */
+ String AUDITING_OPERATION_APPROVAL = "approved";
+
+ /**
+ * 审核操作 拒绝
+ */
+ String AUDITING_OPERATION_REJECT = "rejected";
/**
* 获取二维码的url
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
index a6984c950a..717cff838d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
@@ -134,3 +134,9 @@ thread:
maxPoolSize: @thread.pool.max-pool-size@
queueCapacity: @thread.pool.queue-capacity@
keepAlive: @thread.pool.keep-alive@
+
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.4__createGroupSubmitRecord.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.4__createGroupSubmitRecord.sql
new file mode 100644
index 0000000000..1e53a7d6f1
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.4__createGroupSubmitRecord.sql
@@ -0,0 +1,24 @@
+CREATE TABLE `group_edit_submit_record`
+(
+ `ID` varchar(64) NOT NULL,
+ `GROUP_ID` varchar(64) NOT NULL COMMENT '小组ID',
+ `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+ `GRID_ID` varchar(64) DEFAULT NULL COMMENT '网格ID',
+ `GROUP_HEAD_PHOTO` varchar(255) NOT NULL COMMENT '头像',
+ `GROUP_NAME` varchar(10) NOT NULL COMMENT '小组名称',
+ `GROUP_INTRODUCTION` varchar(500) NOT NULL COMMENT '小组介绍',
+ `AUDIT_STATUS` varchar(30) NOT NULL COMMENT '审核状态。under_auditting:审核中,approved:通过,rejected:驳回',
+ `STAFF_ID` varchar(64) DEFAULT NULL COMMENT '审核人ID',
+ `REMARK` varchar(255) DEFAULT NULL COMMENT '回复',
+ `AUDIT_TIME` datetime DEFAULT NULL COMMENT '审核时间',
+ `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识',
+ `REVISION` int(8) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+ `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人 提交人',
+ `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+ `UPDATED_BY` varchar(64) NOT NULL COMMENT '修改人ID',
+ `UPDATED_TIME` datetime NOT NULL COMMENT '修改时间',
+ `READ_FLAG` varchar(8) NOT NULL COMMENT '已读read 未读unread',
+ `MESSAGE_TEXT` varchar(255) NOT NULL COMMENT '审核人员查看待审核列表时的文案,如:党员李华申请变更小组【原小组名】,请审核。',
+ PRIMARY KEY (`ID`)
+) ENGINE = InnoDB
+ DEFAULT CHARSET = utf8mb4 COMMENT ='组编辑提交记录表'
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
index 40fb0f8615..705387b8cb 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,16 +127,19 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
-
+
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml
new file mode 100644
index 0000000000..b9b2924cdb
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+ id,
+ group_id,
+ customer_id,
+ grid_id,
+ group_head_photo,
+ group_name,
+ group_introduction,
+ audit_status,
+ staff_id,
+ remark,
+ audit_time,
+ read_flag,
+ message_text,
+ del_flag,
+ revision,
+ created_by,
+ created_time,
+ updated_by,
+ updated_time
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select count(1)
+ from group_edit_submit_record
+ where GROUP_ID = #{groupId}
+ and CREATED_TIME between #{monthStart} and #{monthEnd}
+ and DEL_FLAG=0
+
+
+
+ select
+
+ from group_edit_submit_record
+ where
+ DEL_FLAG=0
+ and group_id = #{groupId}
+ order by CREATED_TIME desc
+ limit 1
+
+
+
+
+ SELECT
+ edit.GROUP_ID,
+ groupp.GROUP_NAME,
+ groupp.GROUP_HEAD_PHOTO,
+ edit.READ_FLAG,
+ edit.MESSAGE_TEXT,
+ DATE_FORMAT( edit.CREATED_TIME, '%Y-%m-%d %H:%i' ) AS createdTime
+ FROM
+ group_edit_submit_record edit
+ LEFT JOIN resi_group groupp ON edit.GROUP_ID = groupp.ID
+ WHERE
+ edit.DEL_FLAG = '0'
+ AND edit.GRID_ID = #{gridId}
+ AND edit.AUDIT_STATUS = 'under_auditing'
+ AND edit.STAFF_ID IS NULL
+ ORDER BY edit.CREATED_TIME DESC
+
+
+
+
+ SELECT
+ ID,
+ GROUP_ID,
+ GROUP_NAME,
+ GROUP_HEAD_PHOTO,
+ GROUP_INTRODUCTION,
+ CREATED_BY,
+ GRID_ID
+ FROM
+ group_edit_submit_record
+ WHERE
+ DEL_FLAG = '0'
+ AND GROUP_ID = #{groupId}
+
+
+ AND AUDIT_STATUS = 'under_auditing'
+
+
+ AND AUDIT_STATUS = #{auditResult}
+
+
+
+ ORDER BY CREATED_TIME DESC
+ LIMIT 1
+
+
+
+
+ UPDATE
+ group_edit_submit_record
+ SET
+ AUDIT_STATUS = #{auditStatus},
+ STAFF_ID = #{staffId},
+
+ REMARK = #{remark},
+
+ AUDIT_TIME = NOW(),UPDATED_TIME = NOW(),UPDATED_BY = #{staffId}
+ WHERE
+ DEL_FLAG = '0'
+ AND
+ GROUP_ID = #{groupId}
+ AND
+ AUDIT_STATUS = 'under_auditIng'
+ AND
+ STAFF_ID IS NULL
+ LIMIT 1
+
+
+
+
+ SELECT
+ count( 1 ) AS total
+ FROM
+ group_edit_submit_record m
+ WHERE
+ m.DEL_FLAG = '0'
+ AND m.AUDIT_STATUS = 'under_auditting'
+ AND m.GRID_ID = #{gridId}
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 9f7b719a64..4e42f4abc6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -398,4 +398,25 @@
GRID_ID = #{gridId}
+
+
+ select sum(t.c) num
+ from (
+ select count(1) c
+ from resi_group g
+ where g.GROUP_NAME = #{groupName}
+ and g.DEL_FLAG = 0
+ and g.GRID_ID = #{gridId}
+ and g.ID != #{groupId}
+ and g.STATE in ('approved', 'under_auditting')
+ union all
+ select count(1) c
+ from group_edit_submit_record esr
+ where esr.GROUP_ID != #{groupId}
+ and esr.GRID_ID = #{gridId}
+ and esr.GROUP_NAME = #{groupName}
+ and esr.AUDIT_STATUS = 'under_auditting'
+ and esr.DEL_FLAG = 0
+ ) t
+
diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml
index 098b7a0ba5..1282b2f3e8 100644
--- a/epmet-module/resi-guide/resi-guide-server/pom.xml
+++ b/epmet-module/resi-guide/resi-guide-server/pom.xml
@@ -140,6 +140,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -172,6 +178,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -204,6 +216,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -233,6 +251,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
index ed94f661c3..836ea9f4ca 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
@@ -118,4 +118,9 @@ ribbon:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
index 936ac0df8c..174beb8e91 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml
index a44a834c35..61c2a76ffe 100644
--- a/epmet-module/resi-hall/resi-hall-server/pom.xml
+++ b/epmet-module/resi-hall/resi-hall-server/pom.xml
@@ -98,6 +98,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -124,6 +130,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -150,6 +162,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -173,6 +191,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
index 58e251be5b..479945892d 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
@@ -70,3 +70,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
index 39a130d7e1..be2d2c27e7 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml
index d43f84aaa6..dac75fd41b 100644
--- a/epmet-module/resi-home/resi-home-server/pom.xml
+++ b/epmet-module/resi-home/resi-home-server/pom.xml
@@ -116,6 +116,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -140,6 +146,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -164,6 +176,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -185,6 +203,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
index afb7ab3e38..3c5dee1515 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
@@ -69,3 +69,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
index a53039bc12..81dec45754 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml
index 96597e773c..f68f226c46 100644
--- a/epmet-module/resi-mine/resi-mine-server/pom.xml
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@@ -140,6 +140,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -163,6 +169,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -186,6 +198,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -206,6 +224,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
index 6e5eb54cc2..eff0b2bbb3 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
@@ -97,3 +97,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
index ffa4fdd447..2893426200 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 74088b3ac0..63d0d5e4bf 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -146,6 +146,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -178,6 +185,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -210,6 +224,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -239,6 +260,14 @@
true
+
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
index a2118ff3a3..62322c11c8 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
@@ -117,4 +117,9 @@ ribbon:
#pageHelper分页插件
pagehelper:
helper-dialect: mysql
- reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1
\ No newline at end of file
+ reasonable: false #分页合理化配置,例如输入页码为-1,则自动转化为最小页码1
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
index 02b45f2efc..ce07d2963b 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml
index 9985f3c6a5..4a1a3a18dc 100644
--- a/epmet-module/resi-voice/resi-voice-server/pom.xml
+++ b/epmet-module/resi-voice/resi-voice-server/pom.xml
@@ -102,6 +102,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -126,6 +133,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -150,6 +164,13 @@
false
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -174,6 +195,14 @@
false
+
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
index 03891ed01a..589e4fb19e 100644
--- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
@@ -65,3 +65,8 @@ hystrix:
ribbon:
ReadTimeout: 300000
ConnectTimeout: 300000
+
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
index 98bc0a986b..c6e86ca128 100644
--- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml
index c77bafe339..b80b8a843e 100644
--- a/epmet-openapi/epmet-openapi-scan/pom.xml
+++ b/epmet-openapi/epmet-openapi-scan/pom.xml
@@ -104,6 +104,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -129,6 +135,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -150,6 +162,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -175,6 +193,14 @@
false
+
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
index 84000daee9..2c2a29d61a 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
+++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
@@ -77,3 +77,8 @@ aliyun:
regionId: cn-shanghai
bizType: epmet_img_text
+dingTalk:
+ robot:
+ webHook: @dingTalk.robot.webHook@
+ secret: @dingTalk.robot.secret@
+
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml b/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml
index d244b6fa2a..9d2ad51e14 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml
+++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml
@@ -5,6 +5,8 @@
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
index c674685ee5..2c23abe08b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
@@ -1,6 +1,6 @@
package com.epmet.dto.result;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
import lombok.Data;
import java.io.Serializable;
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index ea80ac97fc..b00b21c704 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -335,6 +335,15 @@ public interface EpmetUserOpenFeignClient {
@PostMapping("/epmetuser/customerstaff/getstaffbasicinfo")
Result getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO);
+ /**
+ * @Description 根据角色key查询具有该key的所有角色列表
+ * @return
+ * @author wxz
+ * @date 2020.11.17 16:20
+ */
+ @PostMapping("/epmetuser/govstaffrole/list-roles-by-rolekey/{role-key}")
+ Result> listRolesByRoleKey(@PathVariable("role-key") String roleKey);
+
/**
* 根据userId集合查询用户注册信息
* @author sun
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
index 3ea59d86a6..11e774ff6b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
@@ -226,6 +226,11 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO);
}
+ @Override
+ public Result> listRolesByRoleKey(String roleKey) {
+ return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listRolesByRoleKey", roleKey);
+ }
+
@Override
public Result> getUserResiInfoList(UserResiInfoListFormDTO fromDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", fromDTO);
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 61c5b17203..385f86164d 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -155,6 +155,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -187,6 +193,12 @@
false
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -219,6 +231,12 @@
true
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
+
+ SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
+
@@ -248,6 +266,13 @@
true
+
+
+
+ https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c
+
+ SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1
+
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
index 81a79972c0..40cab6cb5a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
@@ -100,4 +100,16 @@ public class GovStaffRoleController {
return new Result();
}
+ /**
+ * @Description 根据角色key查询具有该key的所有角色列表
+ * @return
+ * @author wxz
+ * @date 2020.11.17 16:20
+ */
+ @PostMapping("list-roles-by-rolekey/{role-key}")
+ public Result> listRolesByRoleKey(@PathVariable("role-key") String roleKey) {
+ List roles = govStaffRoleService.listRolesByRoleKey(roleKey);
+ return new Result>().ok(roles);
+ }
+
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
index aab3c4ae30..f7875d63d5 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
@@ -75,4 +75,6 @@ public interface GovStaffRoleDao extends BaseDao {
int updateColumnsById(@Param("roleId") String roleId, @Param("roleName") String roleName);
int updateSortById(@Param("roleId") String roleId, @Param("sort") int sort);
+
+ List listRolesByRoleKey(@Param("roleKey") String roleKey);
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java
index ef513d0ac7..d0f6b2def7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java
@@ -75,4 +75,6 @@ public interface UserWechatDao extends BaseDao{
**/
List selectResiAndStrangerInfo(@Param("userIds") List userIds, @Param("realName")String realName);
+ //临时用下in
+ List selectNotInUserBaseInfoTemp();
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java
index eef3e6f0b0..346fad61b2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java
@@ -138,4 +138,6 @@ public interface GovStaffRoleService extends BaseService {
int updateRole(String roleId, String roleName);
void saveSortOrder(List roleIdList);
+
+ List listRolesByRoleKey(String roleKey);
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
index 6a22460731..726be2370d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
@@ -222,4 +222,15 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl listRolesByRoleKey(String roleKey) {
+ return govStaffRoleDao.listRolesByRoleKey(roleKey);
+ }
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index 7143b7d171..326e74912d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -166,7 +166,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl userWechatDTOList=userWechatDao.selectAll();
+ List userWechatDTOList=userWechatDao.selectNotInUserBaseInfoTemp();
List userIdList=new ArrayList<>();
for(UserWechatDTO userWechatDTO:userWechatDTOList){
userIdList.add(userWechatDTO.getUserId());
@@ -202,12 +202,12 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl
+
+
${appname}
@@ -125,11 +127,14 @@
15
-
-
+
+
ERROR
ACCEPT
DENY
+ ${webHook}
+ ${secret}
+ ${appname}
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
index 1a8c27b7d0..40539c565f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
@@ -103,4 +103,12 @@
)
+
+
+
+ select gsr.ID roleId, gsr.ROLE_KEY roleKey, gsr.ROLE_NAME, gsr.CUSTOMER_ID customerId
+ from gov_staff_role gsr
+ where gsr.ROLE_KEY = #{roleKey}
+ and gsr.DEL_FLAG=0
+
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
index fc345f9fd2..0aa445acfa 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
@@ -42,34 +42,28 @@
SELECT
- uri.id,
- uc.USER_ID,
+ ubi.USER_ID,
uri.REG_MOBILE,
- uri.SURNAME,
- uri.`NAME`,
- uri.STREET,
- uri.DISTRICT,
+ ubi.SURNAME,
+ ubi.`NAME`,
+ ubi.STREET,
+ ubi.DISTRICT,
uri.RESI_VISIT_ID,
- uri.BUILDING_ADDRESS,
- CONCAT(
- uri.STREET,
- '-',
- uri.SURNAME,
- ( CASE WHEN uw.SEX = '1' THEN '先生' WHEN uw.SEX = '2' THEN '女士' ELSE '先生/女士' END )
+ ubi.BUILDING_ADDRESS,
+ CONCAT(
+ ubi.STREET,
+ '-',
+ ubi.SURNAME,
+ ( CASE WHEN ubi.GENDER = '1' THEN '先生' WHEN ubi.GENDER = '2' THEN '女士' ELSE '先生/女士' END )
) AS show_name,
uw.HEAD_IMG_URL AS head_photo
-
FROM
- user_customer uc
- LEFT JOIN user_resi_info uri ON ( uc.USER_ID = uri.USER_ID )
- LEFT JOIN user_wechat uw ON (uc.USER_ID = uw.USER_ID)
+ user_base_info ubi
+ LEFT JOIN user_resi_info uri ON ( ubi.USER_ID = uri.USER_ID AND uri.DEL_FLAG = '0' )
+ LEFT JOIN user_wechat uw ON ( uri.USER_ID = uw.USER_ID AND uw.DEL_FLAG = '0' )
WHERE
- uc.DEL_FLAG = '0'
- AND uri.DEL_FLAG = '0'
- AND uc.CUSTOMER_ID = #{customerId}
- AND uc.USER_ID = #{userId}
- AND uw.DEL_FLAG = '0'
- AND uw.USER_ID = #{userId}
+ ubi.USER_ID =#{userId}
+ AND ubi.DEL_FLAG = '0'
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
index 98a5c58075..5797e95eef 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
@@ -115,4 +115,24 @@
ORDER BY
base.REAL_NAME , wechat.NICKNAME
+
+
+
+ SELECT
+ *
+ FROM
+ user_wechat uw
+ WHERE
+ uw.USER_ID IN (
+ SELECT DISTINCT
+ uri.USER_ID
+ FROM
+ user_resi_info uri
+ WHERE
+ uri.USER_ID NOT IN ( SELECT uri.USER_ID FROM user_base_info uri where uri.DEL_FLAG='0')
+ AND uri.DEL_FLAG = '0'
+ )
+ AND uw.DEL_FLAG = '0'
+ and uw.NICKNAME is not null
+