Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/FileCommonDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.commons.tools.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/12/21 15:37
+ */
+@NoArgsConstructor
+@Data
+public class FileCommonDTO implements Serializable {
+
+	private static final long serialVersionUID = -5307959406648243353L;
+	/**
+	 * 文件名
+	 */
+	private String name;
+	/**
+	 * url地址
+	 */
+	private String url;
+	/**
+	 * 文件类型(图片 - image、 视频 - video、 语音 - voice、 文档 - doc)
+	 */
+	private String type;
+	/**
+	 * 后缀名
+	 */
+	private String format;
+	/**
+	 * 文件大小  kb
+	 */
+	private Integer size;
+	/**
+	 * 语音或视频文件时长，单位秒
+	 */
+	private Integer duration;
+}

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/ActDetailGovResultDTO.java

@@ -0,0 +1,141 @@
+package com.epmet.dto.result;
+
+import com.epmet.commons.tools.dto.form.FileCommonDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 工作端小组内，活动详情返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/29 9:30
+ */
+@Data
+public class ActDetailGovResultDTO implements Serializable {
+    private static final long serialVersionUID = 3982724635100043221L;
+
+    private String groupActId;
+
+    /**
+     * 小组id
+     */
+    private String groupId;
+
+    /**
+     * 活动标题；
+     */
+    private String title;
+
+    /**
+     * 活动时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date startTime;
+
+    /**
+     * 活动所属类别编码
+     */
+    private String categoryCode;
+
+    /**
+     * 上级类别编码
+     */
+    private String parentCode;
+
+    private String menuCode;
+
+    /**
+     * 活动类别名称；eg：支部建设-三会一课
+     */
+    private String allCategoryName;
+
+    /**
+     * 活动地点
+     */
+    private String address;
+
+    /**
+     * 应参加人数组长填入；此列也是应签到人数；
+     */
+    private Integer shouldAttend;
+
+    /**
+     * 活动状态：已发布：published;已取消：canceled；已变更：changed；已关闭：closed
+     */
+    private String status;
+
+    /**
+     * 签到开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date signInStartTime;
+
+    /**
+     * 签到截止时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date signInEndTime;
+
+    /**
+     * 是否填写总结？1：已填写；0：未填写
+     */
+    private Integer summaryFlag;
+
+    /**
+     * 取消时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date canceledTime;
+
+    /**
+     * 关闭时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date closedTime;
+
+    /**
+     * 活动发布人用户id
+     */
+    private String publishUserId;
+
+    /**
+     * 内容列表
+     */
+    private List<String> textList;
+
+    /**
+     * 图片列表
+     */
+    private List<String> imgArrayList;
+
+    /**
+     * 图片列表，最多3张
+     */
+    private List<FileCommonDTO> imgList;
+
+    //以下字段需要单独赋值
+    /**
+     * 取消原因
+     */
+    private String canceledReason;
+
+    /**
+     * 已签到人数（有人签到自动+1）
+     */
+    private Integer signedInNum;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+}

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java

@@ -2,15 +2,15 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.result.ActDetailGovResultDTO;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
 import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.result.*;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
-import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.ResiGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -175,5 +175,19 @@ public class ResiGroupController {
 		return groupOpenFeignClient.govAuditEdit(param);
 	}
 
-
+	/**
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActDetailResultDTO>
+	 * @param tokenDto
+	 * @param actDetailFormDTO
+	 * @author yinzuomei
+	 * @description 工作端查看小组内活动详情
+	 * @Date 2021/4/29 9:38
+	 **/
+	@PostMapping("actdetail")
+	public Result<ActDetailGovResultDTO> queryActDetailForWork(@LoginUser TokenDto tokenDto, @RequestBody ActDetailFormDTO actDetailFormDTO){
+		actDetailFormDTO.setUserId(tokenDto.getUserId());
+		actDetailFormDTO.setClient(AppClientConstant.APP_GOV);
+		ValidatorUtils.validateEntity(actDetailFormDTO,ActDetailFormDTO.AddUserInternalGroup.class);
+		return new Result<ActDetailGovResultDTO>().ok(resiGroupService.queryActDetailForWork(actDetailFormDTO));
+	}
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java

@@ -6,6 +6,8 @@ import com.epmet.controller.TestFormDTO1;
 import com.epmet.controller.TestResultDTO1;
 import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
+import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
 import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
 import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
 import com.epmet.resi.group.dto.group.form.*;
@@ -151,4 +153,14 @@ public interface ResiGroupFeignClient {
 
 	@PostMapping(value = "/resi/group/group/test",consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<TestResultDTO1> test(@RequestBody TestFormDTO1 testFormDTO1);
+
+	/**
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActDetailResultDTO>
+	 * @param actDetailFormDTO
+	 * @author yinzuomei
+	 * @description 查询活动详情
+	 * @Date 2021/4/29 9:57
+	 **/
+	@PostMapping(value = "/resi/group/act/actdetail",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<ActDetailResultDTO> queryActDetail(@RequestBody ActDetailFormDTO actDetailFormDTO);
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java

@@ -7,6 +7,8 @@ import com.epmet.controller.TestFormDTO1;
 import com.epmet.controller.TestResultDTO1;
 import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.feign.ResiGroupFeignClient;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
+import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
 import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
 import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
 import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
@@ -120,4 +122,16 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
 	public Result<TestResultDTO1> test(TestFormDTO1 testFormDTO1) {
 		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "test", testFormDTO1);
 	}
+
+	/**
+	 * @param actDetailFormDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActDetailResultDTO>
+	 * @author yinzuomei
+	 * @description 查询活动详情
+	 * @Date 2021/4/29 9:57
+	 **/
+	@Override
+	public Result<ActDetailResultDTO> queryActDetail(ActDetailFormDTO actDetailFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryActDetail", actDetailFormDTO);
+	}
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java

@@ -1,10 +1,10 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
+import com.epmet.dto.result.ActDetailGovResultDTO;
-import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
-import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.group.form.*;
+import com.epmet.resi.group.dto.group.result.*;
 
 import java.util.List;
 
@@ -74,4 +74,5 @@ public interface ResiGroupService {
 	 **/
 	Result disagreeApplying(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO);
 
+	ActDetailGovResultDTO queryActDetailForWork(ActDetailFormDTO actDetailFormDTO);
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java

@@ -1,11 +1,14 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.ActDetailGovResultDTO;
 import com.epmet.feign.ResiGroupFeignClient;
-import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
-import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
+import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
-import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.group.form.*;
+import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.service.ResiGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -57,5 +60,15 @@ public class ResiGroupServiceImpl implements ResiGroupService{
 		return resiGroupFeignClient.disagreeApplying(disAgreeApplyGroupFormDTO);
 	}
 
+	@Override
+	public ActDetailGovResultDTO queryActDetailForWork(ActDetailFormDTO actDetailFormDTO) {
+		Result<ActDetailResultDTO> actDetailResult=resiGroupFeignClient.queryActDetail(actDetailFormDTO);
+		if(actDetailResult.success()&&null!=actDetailResult.getData()){
+			ActDetailGovResultDTO resultDTO= ConvertUtils.sourceToTarget(actDetailResult.getData(),ActDetailGovResultDTO.class);
+			return resultDTO;
+		}
+		throw new RenException("调用resi-group服务，查询活动详情异常");
+	}
+
 
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActDetailFormDTO.java

@@ -24,4 +24,12 @@ public class ActDetailFormDTO implements Serializable {
      */
     @NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
     private String userId;
+
+
+
+    /**
+     * 工作端：gov; 居民端：resi
+     * 这个是代码里赋值的
+     */
+    private String client;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java

@@ -18,6 +18,7 @@
 package com.epmet.modules.act.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -74,6 +75,7 @@ public class GroupActInfoController {
     @PostMapping("actdetail")
     public Result<ActDetailResultDTO> queryActDetail(@LoginUser TokenDto tokenDto, @RequestBody ActDetailFormDTO actDetailFormDTO){
         actDetailFormDTO.setUserId(tokenDto.getUserId());
+        actDetailFormDTO.setClient(AppClientConstant.APP_RESI);
         ValidatorUtils.validateEntity(actDetailFormDTO,ActDetailFormDTO.AddUserInternalGroup.class);
         return new Result<ActDetailResultDTO>().ok(groupActInfoService.queryActDetail(actDetailFormDTO));
     }

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

@@ -484,12 +484,15 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         if(null==groupActInfoEntity){
             throw new RenException(String.format("根据groupActId:%s,查询活动信息为null",formDTO.getGroupActId()));
         }
-        //当前内容仅允许组内成员查看
-        ResiGroupMemberDTO resiGroupMemberDTO=resiGroupMemberService.getResiGroupMember(groupActInfoEntity.getGroupId(),formDTO.getUserId());
-        if(null==resiGroupMemberDTO){
-            throw new RenException(EpmetErrorCode.NOT_IN_GROUP_CAN_NOT_VIEW.getCode(), EpmetErrorCode.NOT_IN_GROUP_CAN_NOT_VIEW.getMsg());
-        }
         ActDetailResultDTO resultDTO=ConvertUtils.sourceToTarget(groupActInfoEntity,ActDetailResultDTO.class);
+        if(AppClientConstant.APP_RESI.equals(formDTO.getClient())){
+            //当前内容仅允许组内成员查看
+            ResiGroupMemberDTO resiGroupMemberDTO=resiGroupMemberService.getResiGroupMember(groupActInfoEntity.getGroupId(),formDTO.getUserId());
+            if(null==resiGroupMemberDTO){
+                throw new RenException(EpmetErrorCode.NOT_IN_GROUP_CAN_NOT_VIEW.getCode(), EpmetErrorCode.NOT_IN_GROUP_CAN_NOT_VIEW.getMsg());
+            }
+            resultDTO.setUserRole(resiGroupMemberDTO.getGroupLeaderFlag());
+        }
         resultDTO.setMenuCode(resultDTO.getCategoryCode().substring(NumConstant.ZERO,NumConstant.THREE));
         resultDTO.setGroupActId(formDTO.getGroupActId());
         resultDTO.setTextList(groupActContentDao.selectContentList(formDTO.getGroupActId(),GroupActConstant.TEXT));
@@ -503,42 +506,29 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         });
         resultDTO.setImgList(imgList);
         resultDTO.setCanceledReason(GroupActConstant.CANCELED.equals(resultDTO.getStatus()) ? actOperationRecordDao.selectCanceledReason(formDTO.getGroupActId()) : StrConstant.EPMETY_STR);
-
         handleSignInDesc(resultDTO,formDTO.getUserId());
-
-        resultDTO.setUserRole(resiGroupMemberDTO.getGroupLeaderFlag());
         // 有签到后不可以修改活动时间：true可以修改，false不可以，
         resultDTO.setStartTimeEditFlag(groupActInfoEntity.getSignedInNum() > NumConstant.ZERO ? false : true);
-        //如果活动关闭，则不更新已读记录
+
-        //非关闭状态下，返回详情，并且已读状态
+        //居民端记录已读标志
-        ActReadRecordEntity actReadRecordEntity = actReadRecordDao.selectUserRec(formDTO.getGroupActId(), formDTO.getUserId());
+        if(AppClientConstant.APP_RESI.equals(formDTO.getClient())){
-        if (null != actReadRecordEntity) {
+            ActReadRecordEntity actReadRecordEntity = actReadRecordDao.selectUserRec(formDTO.getGroupActId(), formDTO.getUserId());
-            /*if (!GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())) {
+            if (null != actReadRecordEntity) {
-                //插入已读记录，默认不属于应读人。
+                if(!GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())){
-                ActReadRecordEntity insertEntity = new ActReadRecordEntity();
+                    //非关闭状态下，返回详情，并且已读状态
-                insertEntity.setCustomerId(groupActInfoEntity.getCustomerId());
+                    if (GroupActConstant.UN_READ.equals(actReadRecordEntity.getReadFlag())) {
-                insertEntity.setGroupActId(formDTO.getGroupActId());
+                        //未读->已读
-                insertEntity.setReadFlag(GroupActConstant.READ);
+                        actReadRecordEntity.setReadFlag(GroupActConstant.READ);
-                insertEntity.setShouldBeRead(Constant.NO);
+                        actReadRecordEntity.setUpdatedTime(new Date());
-                insertEntity.setUserId(formDTO.getUserId());
+                        actReadRecordEntity.setViewDetail(GroupActConstant.READ);
-                insertEntity.setGridId(groupActInfoEntity.getGridId());
+                        actReadRecordDao.updateById(actReadRecordEntity);
-                insertEntity.setGroupId(groupActInfoEntity.getGroupId());
+                    }
-                insertEntity.setViewDetail(GroupActConstant.READ);
+                }else{
-                actReadRecordDao.insert(insertEntity);
+                    //如果活动关闭，则不更新已读、未读。只记录是否查看过详情。
-            }*/
-        // } else {
-            if(!GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())){
-                if (GroupActConstant.UN_READ.equals(actReadRecordEntity.getReadFlag())) {
-                    //未读->已读
-                    actReadRecordEntity.setReadFlag(GroupActConstant.READ);
                     actReadRecordEntity.setUpdatedTime(new Date());
                     actReadRecordEntity.setViewDetail(GroupActConstant.READ);
                     actReadRecordDao.updateById(actReadRecordEntity);
                 }
-            }else{
-                actReadRecordEntity.setUpdatedTime(new Date());
-                actReadRecordEntity.setViewDetail(GroupActConstant.READ);
-                actReadRecordDao.updateById(actReadRecordEntity);
             }
         }
         return resultDTO;