Browse Source

Merge branch 'dev_voice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_voice

# Conflicts:
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
dev_shibei_match
sunyuchao 5 years ago
parent
commit
a382475e43
  1. 1
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
  2. 25
      epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftDetailFormDTO.java
  3. 20
      epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/CoverImgDTO.java
  4. 32
      epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftAttrResultDTO.java
  5. 45
      epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentDetailDTO.java
  6. 30
      epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentResultDTO.java
  7. 34
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
  8. 18
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java
  9. 11
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/DraftService.java
  10. 7
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
  11. 37
      epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
  12. 56
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LoginUserDetailsResultDTO.java
  13. 23
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserClientFeignClient.java
  14. 18
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserClientFeignClientFallback.java

1
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java

@ -100,6 +100,7 @@ public enum RequirePermissionEnum {
WORK_PARTY_VOICE_PUBLISHED_LIST("work_party_voice_published_list", "党建声音:已发布列表", "已发布文章列表查询"), WORK_PARTY_VOICE_PUBLISHED_LIST("work_party_voice_published_list", "党建声音:已发布列表", "已发布文章列表查询"),
WORK_PARTY_VOICE_DETAIL("work_party_voice_detail", "党建声音:文章详情", "已发布详情、已下线详情"), WORK_PARTY_VOICE_DETAIL("work_party_voice_detail", "党建声音:文章详情", "已发布详情、已下线详情"),
WORK_PARTY_VOICE_DRAFT_LIST("work_party_voice_draft_list", "党建声音:草稿箱列表", "草稿箱列表"), WORK_PARTY_VOICE_DRAFT_LIST("work_party_voice_draft_list", "党建声音:草稿箱列表", "草稿箱列表"),
WORK_PARTY_VOICE_DRAFT_EDIT("work_party_voice_draft_edit", "党建声音:编辑草稿", "编辑草稿"),
WORK_PARTY_VOICE_DRAFT_DELETE("work_party_voice_draft_delete", "党建声音:删除草稿", "删除草稿"), WORK_PARTY_VOICE_DRAFT_DELETE("work_party_voice_draft_delete", "党建声音:删除草稿", "删除草稿"),
WORK_PARTY_VOICE_OFFLINE_LIST("work_party_voice_offline_list", "党建声音:已下线列表", "已下线文章列表"), WORK_PARTY_VOICE_OFFLINE_LIST("work_party_voice_offline_list", "党建声音:已下线列表", "已下线文章列表"),
WORK_PARTY_VOICE_PUBLISH("work_party_voice_publish", "党建声音:创建文章", ""), WORK_PARTY_VOICE_PUBLISH("work_party_voice_publish", "党建声音:创建文章", ""),

25
epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftDetailFormDTO.java

@ -0,0 +1,25 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 编辑草稿-获取草稿内容属性统一入参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2020/6/3 12:58
*/
@Data
public class DraftDetailFormDTO implements Serializable {
private static final long serialVersionUID = 4492335656284426299L;
public interface AddUserInternalGroup {}
/**
* 草稿ID
*/
@NotBlank(message = "草稿id不能为空", groups = {DraftDetailFormDTO.AddUserInternalGroup.class})
private String draftId;
}

20
epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/CoverImgDTO.java

@ -0,0 +1,20 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* 政府端选中草稿编辑获取草稿属性-封面图片
*
* @author yinzuomei@elink-cn.com
* @date 2020/6/3 14:26
*/
@Data
public class CoverImgDTO implements Serializable {
private static final long serialVersionUID = -6735712590479867385L;
private String coverId;
private String url;
private String auditStatus;
private String auditReason;
}

32
epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftAttrResultDTO.java

@ -0,0 +1,32 @@
package com.epmet.dto.result;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 政府端选中草稿编辑获取草稿属性
*
* @author yinzuomei@elink-cn.com
* @date 2020/6/3 14:15
*/
@Data
public class DraftAttrResultDTO implements Serializable {
private static final long serialVersionUID = 6999941497971286747L;
private String draftId;
private CoverImgDTO coverImg;
private List<String> tagNameList;
private Integer isTop;
private List<String> gridIdList;
private String publisher;
private String publisherName;
@JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
private Date publishDate;
private String title;
private String publishRangeDesc;
private String tags;
private String publisherType;
}

45
epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentDetailDTO.java

@ -0,0 +1,45 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* 政府端选中草稿编辑获取草稿内容返参明细
*
* @author yinzuomei@elink-cn.com
* @date 2020/6/3 13:14
*/
@Data
public class DraftContentDetailDTO implements Serializable {
private static final long serialVersionUID = -415892498226389295L;
/**
*内容Id
*/
private String id;
/**
* 具体内容
*/
private String content;
/**
* 内容类型 图片img文字text
*/
private String contentType;
/**
* 内容序号
*/
private Integer orderNum;
/**
* 审核状态 通过:pass失败:fail
*/
private String auditStatus;
/**
* 审核理由
*/
private String auditReason;
}

30
epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftContentResultDTO.java

@ -0,0 +1,30 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 政府端选中草稿编辑获取草稿内容返参
*
* @author yinzuomei@elink-cn.com
* @date 2020/6/3 13:01
*/
@Data
public class DraftContentResultDTO implements Serializable {
private static final long serialVersionUID = -1310987373261903935L;
/**
*
*/
private String draftId;
/**
* 标题
*/
private String title;
/**
* 内容
*/
private List<DraftContentDetailDTO> contentList;
}

34
epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java

@ -32,7 +32,9 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.ArticleDTO; import com.epmet.dto.ArticleDTO;
import com.epmet.dto.form.ArticleOperationFormDTO; import com.epmet.dto.form.ArticleOperationFormDTO;
import com.epmet.dto.form.DraftContentFromDTO; import com.epmet.dto.form.DraftContentFromDTO;
import com.epmet.dto.form.DraftDetailFormDTO;
import com.epmet.dto.form.GovArticleDetailFormDTO; import com.epmet.dto.form.GovArticleDetailFormDTO;
import com.epmet.dto.result.*;
import com.epmet.dto.result.ArticleGridResultDTO; import com.epmet.dto.result.ArticleGridResultDTO;
import com.epmet.dto.result.ArticleOperationResultDTO; import com.epmet.dto.result.ArticleOperationResultDTO;
import com.epmet.dto.result.GovArticleDetailResultDTO; import com.epmet.dto.result.GovArticleDetailResultDTO;
@ -41,6 +43,7 @@ import com.epmet.dto.result.PublishAgencyListResultDTO;
import com.epmet.excel.ArticleExcel; import com.epmet.excel.ArticleExcel;
import com.epmet.service.ArticleOperateRecordService; import com.epmet.service.ArticleOperateRecordService;
import com.epmet.service.ArticleService; import com.epmet.service.ArticleService;
import com.epmet.service.DraftService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -63,6 +66,8 @@ public class ArticleController {
private ArticleService articleService; private ArticleService articleService;
@Autowired @Autowired
private ArticleOperateRecordService articleOperateRecordService; private ArticleOperateRecordService articleOperateRecordService;
@Autowired
private DraftService draftService;
@GetMapping("page") @GetMapping("page")
public Result<PageData<ArticleDTO>> page(@RequestParam Map<String, Object> params){ public Result<PageData<ArticleDTO>> page(@RequestParam Map<String, Object> params){
@ -159,6 +164,35 @@ public class ArticleController {
return new Result<GovArticleDetailResultDTO>().ok(articleDetail); return new Result<GovArticleDetailResultDTO>().ok(articleDetail);
} }
/**
* @param formDTO 草稿id
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.DraftContentResultDTO>
* @author yinzuomei@elink-cn.com
* @description 政府端选中草稿编辑获取草稿内容
* @date 2020/6/3 13:18
**/
@PostMapping("getcontent")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_EDIT)
public Result<DraftContentResultDTO> getContent(@RequestBody DraftDetailFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, GovArticleDetailFormDTO.AddUserInternalGroup.class);
DraftContentResultDTO draftContent=draftService.queryDraftContent(formDTO.getDraftId());
return new Result<DraftContentResultDTO>().ok(draftContent);
}
/**
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @author yinzuomei@elink-cn.com
* @description 政府端选中草稿编辑获取草稿属性
* @date 2020/6/3 13:51
**/
@PostMapping("getattr")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_EDIT)
public Result<DraftAttrResultDTO> getAttr(@RequestBody DraftDetailFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, GovArticleDetailFormDTO.AddUserInternalGroup.class);
DraftAttrResultDTO draftAttrResultDTO=new DraftAttrResultDTO();
return new Result<DraftAttrResultDTO>().ok(draftAttrResultDTO);
}
/** /**
* @param tokenDTO * @param tokenDTO
* @return * @return

18
epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java

@ -18,9 +18,13 @@
package com.epmet.dao; package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.DraftContentDetailDTO;
import com.epmet.dto.result.DraftContentResultDTO;
import com.epmet.entity.DraftEntity; import com.epmet.entity.DraftEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/** /**
* 草稿表 * 草稿表
* *
@ -29,5 +33,19 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface DraftDao extends BaseDao<DraftEntity> { public interface DraftDao extends BaseDao<DraftEntity> {
/**
* 政府端查询草稿内容详情
*
* @param draftId
* 草稿id
*/
DraftContentResultDTO selectDraftContent(String draftId);
/**
* 政府端查询草稿内容详情
*
* @param draftId
* 草稿id
*/
List<DraftContentDetailDTO> selectDraftContentDetail(String draftId);
} }

11
epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/DraftService.java

@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.DraftDTO; import com.epmet.dto.DraftDTO;
import com.epmet.dto.form.DeleteDraftFormDTO; import com.epmet.dto.form.DeleteDraftFormDTO;
import com.epmet.dto.result.DraftContentResultDTO;
import com.epmet.entity.DraftEntity; import com.epmet.entity.DraftEntity;
import java.util.List; import java.util.List;
@ -102,4 +103,14 @@ public interface DraftService extends BaseService<DraftEntity> {
* @date 2020/6/2 16:09 * @date 2020/6/2 16:09
**/ **/
void deleteDraft(DeleteDraftFormDTO formDTO); void deleteDraft(DeleteDraftFormDTO formDTO);
/**
* 政府端选中草稿编辑获取草稿内容
*
* @param draftId
* @return com.epmet.dto.result.DraftContentResultDTO
* @author yinzuomei@elink-cn.com
* @date 2020-06-03
*/
DraftContentResultDTO queryDraftContent(String draftId);
} }

7
epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java

@ -28,6 +28,7 @@ import com.epmet.constant.DraftConstant;
import com.epmet.dao.DraftDao; import com.epmet.dao.DraftDao;
import com.epmet.dto.DraftDTO; import com.epmet.dto.DraftDTO;
import com.epmet.dto.form.DeleteDraftFormDTO; import com.epmet.dto.form.DeleteDraftFormDTO;
import com.epmet.dto.result.DraftContentResultDTO;
import com.epmet.entity.DraftEntity; import com.epmet.entity.DraftEntity;
import com.epmet.redis.DraftRedis; import com.epmet.redis.DraftRedis;
import com.epmet.service.DraftService; import com.epmet.service.DraftService;
@ -118,4 +119,10 @@ public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> imp
this.update(draftDTO); this.update(draftDTO);
} }
@Override
public DraftContentResultDTO queryDraftContent(String draftId) {
DraftContentResultDTO draftContentResultDTO=baseDao.selectDraftContent(draftId);
return draftContentResultDTO;
}
} }

37
epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml

@ -2,6 +2,41 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.DraftDao"> <mapper namespace="com.epmet.dao.DraftDao">
<resultMap id="DraftContentResultDTOMap" type="com.epmet.dto.result.DraftContentResultDTO">
<id column="id" property="draftId"/>
<result column="title" property="title"/>
<collection property="contentList"
select="com.epmet.dao.DraftDao.selectDraftContentDetail" column="id">
</collection>
</resultMap>
<!-- 政府端查询草稿内容详情 -->
<select id="selectDraftContent" parameterType="java.lang.String" resultMap="DraftContentResultDTOMap">
SELECT
id,
TITLE
FROM
draft
WHERE
DEL_FLAG = '0'
and STATUS_FLAG!='published'
AND id = #{draftId}
</select>
<!-- 政府端查询草稿内容详情 -->
<select id="selectDraftContentDetail" parameterType="java.lang.String" resultType="com.epmet.dto.result.DraftContentDetailDTO">
SELECT
dc.id,
dc.CONTENT,
dc.CONTENT_TYPE,
dc.ORDER_NUM,
dc.AUDIT_STATUS,
dc.AUDIT_REASON
FROM
draft_content dc
WHERE
dc.DEL_FLAG = '0'
AND dc.DRAFT_ID = #{draftId}
ORDER BY
dc.ORDER_NUM ASC
</select>
</mapper> </mapper>

56
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LoginUserDetailsResultDTO.java

@ -0,0 +1,56 @@
package com.epmet.dto.result;
import lombok.Data;
import java.util.Set;
@Data
public class LoginUserDetailsResultDTO {
/**
* 政府端:gov居民端:resi运营端:oper
*/
private String app;
/**
* PC端:web微信小程序:wxmp
*/
private String client;
/**
* 用户ID
*/
private String userId;
/**
* 角色列表
*/
private Set<String> roleIdList;
/**
* 部门id列表
*/
private Set<String> deptIdList;
/**
* 当前登录的组织id(顶级)
*/
private String agencyId;
/**
* 组织ID
*/
private String orgIdPath;
/**
* 网格ID列表
*/
private Set<String> gridIdList;
/**
* 当前工作人员进入的客户id
*/
private String customerId;
}

23
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserClientFeignClient.java

@ -0,0 +1,23 @@
package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.LoginUserDetailsFormDTO;
import com.epmet.dto.result.LoginUserDetailsResultDTO;
import com.epmet.feign.fallback.EpmetUserClientFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserClientFeignClientFallback.class)
//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserClientFeignClientFallback.class, url = "localhost:8087")
public interface EpmetUserClientFeignClient {
/**
* 从缓存中查询已登录用户的基本信息以及角色等相关信息
* @return
*/
@PostMapping("/epmetuser/user/loginuserdetails")
Result<LoginUserDetailsResultDTO> getLoginUserDetails(@RequestBody LoginUserDetailsFormDTO dto);
}

18
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserClientFeignClientFallback.java

@ -0,0 +1,18 @@
package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.LoginUserDetailsFormDTO;
import com.epmet.dto.result.LoginUserDetailsResultDTO;
import com.epmet.feign.EpmetUserClientFeignClient;
import org.springframework.stereotype.Component;
@Component
public class EpmetUserClientFeignClientFallback implements EpmetUserClientFeignClient {
@Override
public Result<LoginUserDetailsResultDTO> getLoginUserDetails(LoginUserDetailsFormDTO dto) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLoginUserDetails", dto);
}
}
Loading…
Cancel
Save