Merge remote-tracking branch 'origin/dev_voice' into dev_voice

# Conflicts:
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java
#	epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
#	epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml

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

@@ -104,8 +104,8 @@ public enum RequirePermissionEnum {
     WORK_PARTY_VOICE_OFFLINE_LIST("work_party_voice_offline_list", "党建声音:已下线列表", "已下线文章列表"),
     WORK_PARTY_VOICE_PUBLISH("work_party_voice_publish", "党建声音:创建文章", ""),
     WORK_PARTY_VOICE_EDIT("work_party_voice_edit", "党建声音:重新编辑", ""),
-    WORK_PARTY_VOICE_OFFLINE("work_party_voice_offline", "党建声音:下线文章", "");
-
+    WORK_PARTY_VOICE_OFFLINE("work_party_voice_offline", "党建声音:下线文章", ""),
+    WORK_PARTY_VOICE_OPERATION_LIST("work_party_voice_operation_list","党建声音:查看文章操作记录","");
 
 
     private String key;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonGovAccessFeignClient.java

@@ -2,40 +2,21 @@ package com.epmet.commons.tools.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.dto.form.HasSpecifiedPermissionFormDTO;
-import com.epmet.commons.tools.dto.form.LoginUserInfoFormDTO;
-import com.epmet.commons.tools.dto.form.LoginUserInfoResultDTO;
-import com.epmet.commons.tools.dto.form.RoleOpeScopeResultDTO;
 import com.epmet.commons.tools.feign.fallback.CommonGovAccessFeignClientFallback;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.List;
 
 /**
  * @Description
  * @Author sun
  */
-//, url = "localhost:8099"
+//@FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = CommonGovAccessFeignClientFallback.class, url = "localhost:8099")
 @FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = CommonGovAccessFeignClientFallback.class)
 public interface CommonGovAccessFeignClient {
 
-    /**
-     * 查询登陆用户信息
-     * @return
-     */
-    @PostMapping("/gov/access/access/loginuserinfo")
-    Result<LoginUserInfoResultDTO> getLoginUserInfo(@RequestBody LoginUserInfoFormDTO dto);
-
-    /**
-     * 查询角色所有operation及其范围(缓存)
-     * @return
-     */
-    @PostMapping("/gov/access/access/roleallopesandscopes/{roleId}")
-    Result<List<RoleOpeScopeResultDTO>> listRoleAllOperationScopesByRoleId(@PathVariable("roleId") String roleId);
-
     /**
      * 用户是否具有指定权限
      * @param form

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonGovAccessFeignClientFallback.java

@@ -2,16 +2,10 @@ package com.epmet.commons.tools.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.dto.form.HasSpecifiedPermissionFormDTO;
-import com.epmet.commons.tools.dto.form.LoginUserInfoFormDTO;
-import com.epmet.commons.tools.dto.form.LoginUserInfoResultDTO;
-import com.epmet.commons.tools.dto.form.RoleOpeScopeResultDTO;
 import com.epmet.commons.tools.feign.CommonGovAccessFeignClient;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import java.util.List;
 
 /**
  * 调用政府端权限
@@ -22,16 +16,6 @@ import java.util.List;
 @Component
 public class CommonGovAccessFeignClientFallback implements CommonGovAccessFeignClient {
 
-    @Override
-    public Result<LoginUserInfoResultDTO> getLoginUserInfo(LoginUserInfoFormDTO dto) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getLoginUserInfo", dto);
-    }
-
-    @Override
-    public Result<List<RoleOpeScopeResultDTO>> listRoleAllOperationScopesByRoleId(@PathVariable("roleId") String roleId){
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listRoleAllOperationScopesByRoleId", roleId);
-    }
-
     @Override
     public Result<Boolean> hasSpecifiedPermission(HasSpecifiedPermissionFormDTO form) {
         return  ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "hasSpecifiedPermission", form);

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/LoginUserInfoResultDTO.java → epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/LoginUserDetailsResultDTO.java

@@ -5,17 +5,22 @@ import lombok.Data;
 import java.util.Set;
 
 @Data
-public class LoginUserInfoResultDTO {
+public class LoginUserDetailsResultDTO {
 
     /**
-     * 用户ID
+     * 政府端:gov、居民端:resi、运营端:oper
      */
-    private String userId;
+    private String app;
+
+    /**
+     * PC端:web、微信小程序:wxmp
+     */
+    private String client;
 
     /**
-     * 权限列表
+     * 用户ID
      */
-    private Set<String> permissions;
+    private String userId;
 
     /**
      * 角色列表
@@ -28,18 +33,24 @@ public class LoginUserInfoResultDTO {
     private Set<String> deptIdList;
 
     /**
-     * 组织ID
+     * 当前登录的组织id(顶级)
      */
-    private String orgIdPath;
+    private String agencyId;
 
     /**
-     * 网格ID
+     * 组织ID
      */
-    private String gridId;
+    private String orgIdPath;
 
     /**
      * 网格ID列表
      */
     private Set<String> gridIdList;
 
+    /**
+     * 当前工作人员进入的客户id
+     */
+    private String customerId;
+
+
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java

@@ -1,16 +1,13 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.LoginUserInfoResultDTO;
 import com.epmet.dto.result.RoleOpeScopeResultDTO;
 import com.epmet.service.AccessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Set;
 
@@ -46,26 +43,26 @@ public class AccessController {
         return new Result();
     }
 
-    /**
-     * 从缓存中查询用户信息(DataFilterAspect中用到)
-     * @return
-     */
-    @PostMapping("loginuserinfo")
-    public Result<LoginUserInfoResultDTO> getLoginUserInfo(@RequestBody StaffPermCacheFormDTO dto) {
-        ValidatorUtils.validateEntity(dto, StaffPermCacheFormDTO.GetStaffCurrPermissions.class);
-        GovTokenDto govTokenDto = accessService.getUserDetails(dto.getApp(), dto.getClient(), dto.getStaffId());
-        LoginUserInfoResultDTO resultDTO = null;
-        if (govTokenDto != null) {
-            resultDTO = new LoginUserInfoResultDTO();
-            resultDTO.setRoleIdList(govTokenDto.getRoleIdList());
-            //resultDTO.setGridId(govTokenDto.getGridId());
-            resultDTO.setOrgIdPath(govTokenDto.getOrgIdPath());
-            resultDTO.setGridIdList(govTokenDto.getGridIdList());
-            resultDTO.setDeptIdList(govTokenDto.getDeptIdList());
-            resultDTO.setUserId(govTokenDto.getUserId());
-        }
-        return new Result<LoginUserInfoResultDTO>().ok(resultDTO);
-    }
+    ///**
+    // * 从缓存中查询用户信息(DataFilterAspect中用到)
+    // * @return
+    // */
+    //@PostMapping("loginuserinfo")
+    //public Result<LoginUserInfoResultDTO> getLoginUserInfo(@RequestBody StaffPermCacheFormDTO dto) {
+    //    ValidatorUtils.validateEntity(dto, StaffPermCacheFormDTO.GetStaffCurrPermissions.class);
+    //    GovTokenDto govTokenDto = accessService.getUserDetails(dto.getApp(), dto.getClient(), dto.getStaffId());
+    //    LoginUserInfoResultDTO resultDTO = null;
+    //    if (govTokenDto != null) {
+    //        resultDTO = new LoginUserInfoResultDTO();
+    //        resultDTO.setRoleIdList(govTokenDto.getRoleIdList());
+    //        //resultDTO.setGridId(govTokenDto.getGridId());
+    //        resultDTO.setOrgIdPath(govTokenDto.getOrgIdPath());
+    //        resultDTO.setGridIdList(govTokenDto.getGridIdList());
+    //        resultDTO.setDeptIdList(govTokenDto.getDeptIdList());
+    //        resultDTO.setUserId(govTokenDto.getUserId());
+    //    }
+    //    return new Result<LoginUserInfoResultDTO>().ok(resultDTO);
+    //}
 
     /**
      * 查询角色的操作key对应操作范围列表(缓存)

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessService.java

@@ -2,6 +2,7 @@ package com.epmet.service;
 
 import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.dto.form.GetSQLFilterFormDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.dto.result.RoleOpeScopeResultDTO;
 
 import java.util.List;
@@ -17,10 +18,10 @@ public interface AccessService {
     void updatePermissionCache(String staffId, String app, String client, Set<String> permissions, Set<String> roleIdList, String orgIdPath, String gridId);
 
     /**
-     * 查询用户当前权限列表
+     * 查询登陆用户登陆信息
      * @return
      */
-    GovTokenDto getUserDetails(String app, String client, String staffId);
+    LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String staffId);
 
     /**
      * 查询角色的操作key对应操作范围列表

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java

@@ -16,6 +16,7 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.GetSQLFilterFormDTO;
 import com.epmet.dto.form.StaffRoleFormDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.dto.result.RoleOpeScopeResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
@@ -90,8 +91,8 @@ public class AccessServiceImpl implements AccessService {
     }
 
     @Override
-    public GovTokenDto getUserDetails(String app, String client, String staffId) {
-        return cpUserDetailRedis.get(app, client, staffId, GovTokenDto.class);
+    public LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String staffId) {
+        return cpUserDetailRedis.get(app, client, staffId, LoginUserDetailsResultDTO.class);
     }
 
     /**
@@ -132,7 +133,7 @@ public class AccessServiceImpl implements AccessService {
             return true;
         }
 
-        GovTokenDto userDetails = getUserDetails(app, client, userId);
+        LoginUserDetailsResultDTO userDetails = getLoginUserDetails(app, client, userId);
         if (userDetails == null) {
             return false;
         }
@@ -157,7 +158,7 @@ public class AccessServiceImpl implements AccessService {
     @Override
     public String getSqlFilterSegment(GetSQLFilterFormDTO form) {
         hasConditions.set(false);
-        GovTokenDto userDetails = getUserDetails(form.getApp(), form.getClient(), form.getUserId());
+        LoginUserDetailsResultDTO userDetails = getLoginUserDetails(form.getApp(), form.getClient(), form.getUserId());
         if (userDetails == null) {
             logger.error("查询SQL过滤脚本:没有找到用户的登陆信息:app: {}, client: {}, userId:{}", form.getApp(), form.getClient(), form.getUserId());
             throw new RenException(EpmetErrorCode.ERR10006.getCode());
@@ -453,7 +454,7 @@ public class AccessServiceImpl implements AccessService {
     @Override
     public Set<String> listOperationPermissions(String staffId, String currAgencyId) {
 
-        GovTokenDto userDetails = getUserDetails(loginUserUtil.getLoginUserApp(), loginUserUtil.getLoginUserClient(), loginUserUtil.getLoginUserId());
+        LoginUserDetailsResultDTO userDetails = getLoginUserDetails(loginUserUtil.getLoginUserApp(), loginUserUtil.getLoginUserClient(), loginUserUtil.getLoginUserId());
         if (userDetails == null) {
             throw new RenException(EpmetErrorCode.ERR10006.getCode(), EpmetErrorCode.ERR10006.getMsg());
         }

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/ArticlePublishRangeDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -53,6 +54,11 @@ public class ArticlePublishRangeDTO implements Serializable {
      */
 	private String gridId;
 
+	/**
+	 * 组织-网格名称
+	 */
+	private String agencyGridName;
+
     /**
      * 下线时间
      */

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/DraftPublishRangeDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -53,6 +54,11 @@ public class DraftPublishRangeDTO implements Serializable {
      */
 	private String gridId;
 
+	/**
+	 * 组织-网格名称
+	 */
+	private String agencyGridName;
+
     /**
      * 下线时间
      */

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

@@ -0,0 +1,25 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 查询文章操作记录
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/2 16:42
+ */
+@Data
+public class ArticleOperationFormDTO implements Serializable {
+    private static final long serialVersionUID = -6659391832410565077L;
+
+    public interface AddUserInternalGroup {}
+
+    /**
+     * 文章id
+     */
+    @NotBlank(message = "文章id不能为空", groups = {ArticleOperationFormDTO.AddUserInternalGroup.class})
+    private String articleId;
+}

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DeleteDraftFormDTO.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/2 15:25
+ */
+@Data
+public class DeleteDraftFormDTO implements Serializable {
+    private static final long serialVersionUID = -2424432724401298206L;
+
+    public interface AddUserInternalGroup {}
+
+    /**
+     * 草稿id
+     */
+    @NotBlank(message = "草稿id不能为空", groups = {AddUserInternalGroup.class})
+    private String draftId;
+}

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

@@ -35,15 +35,7 @@ public class DraftContentFromDTO implements Serializable {
 
 
 	private static final long serialVersionUID = -4206020151361420221L;
-	/**
-	 * 文章ID 重新编辑时必填
-	 */
-	private String articleId;
 
-	/**
-	 * 客户ID
-	 */
-	private String customerId;
 
 	/**
 	 * 草稿ID
@@ -69,7 +61,7 @@ public class DraftContentFromDTO implements Serializable {
 		/**
 		 * 内容Id
 		 */
-		private String draftId;
+		private String draftContentId;
 		/**
 		 * 内容
 		 */
@@ -80,16 +72,6 @@ public class DraftContentFromDTO implements Serializable {
 		 */
 		private String contentType;
 
-		/**
-		 * 审核状态 通过:pass；失败:fail；
-		 */
-		private String auditStatus;
-
-		/**
-		 * 审核理由
-		 */
-		private String auditReason;
-
 		/**
 		 * 内容顺序 从1开始
 		 */

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

@@ -0,0 +1,24 @@
+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/2 17:21
+ */
+@Data
+public class GovArticleDetailFormDTO implements Serializable {
+    private static final long serialVersionUID = 2149876964249893025L;
+    public interface AddUserInternalGroup {}
+
+    /**
+     * 文章id
+     */
+    @NotBlank(message = "文章id不能为空", groups = {GovArticleDetailFormDTO.AddUserInternalGroup.class})
+    private String articleId;
+}

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

@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/2 16:44
+ */
+@Data
+public class ArticleOperationResultDTO implements Serializable {
+    private static final long serialVersionUID = -436748500797911121L;
+    private String id;
+    private String content;
+    private Long createdTime;
+}

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

@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 政府端：（已发布、已下线）文章内容详情
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/3 9:39
+ */
+@Data
+public class GovArticleContentDTO implements Serializable {
+    private static final long serialVersionUID = 1519014754254863006L;
+    /**
+     * 内容类型，图片：img；文字：text
+     */
+    private String contentType;
+
+    /**
+     * 内容
+     */
+    private String content;
+}

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

@@ -0,0 +1,69 @@
+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;
+
+/**
+ * 政府端：（已发布、已下线）文章详情 返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/3 9:29
+ */
+@Data
+public class GovArticleDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = -8328304788721564622L;
+    /**
+     * 文章id
+     */
+    private String articleId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 发布单位名称
+     */
+    private String publisherName;
+
+    /**
+     * 发布日期
+     */
+    @JsonFormat(pattern="yyyy-MM-dd")
+    private Date publishDate;
+
+    /**
+     * 访问量
+     */
+    private Integer visitRecordCount;
+
+    /**
+     * 发布范围字符串
+     */
+    private String publishRangeDesc;
+
+    /**
+     * 标签字符串
+     */
+    private String tags;
+
+    /**
+     * 发布状态 已发布:published；已下线：offline
+     */
+    private String statusFlag;
+
+    /**
+     * 草稿Id，重新编辑时使用
+     */
+    private String draftId;
+
+    /**
+     * 内容列表
+     */
+    private List<GovArticleContentDTO> articleContentList;
+}

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java

@@ -10,8 +10,24 @@ package com.epmet.constant;
 
 /**
  * 常量
+ * 
  * @author sun
  * @since 1.0.0
  */
 public interface DraftConstant {
+    // 发布状态
+    /**
+     * 未发布：unpublish
+     */
+    String UNPUBLISH = "unpublish";
+
+    /**
+     * 已发布:published
+     */
+    String PUBLISHED = "published";
+
+    /**
+     * 审核中：auditing
+     */
+    String AUDITING = "auditing";
 }

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

@@ -18,6 +18,8 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -28,11 +30,14 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ArticleDTO;
-import com.epmet.dto.form.LatestListFormDTO;
-import com.epmet.dto.result.ArticleGridResultDTO;
-import com.epmet.dto.result.LatestListResultDTO;
+import com.epmet.dto.form.ArticleOperationFormDTO;
 import com.epmet.dto.form.DraftContentFromDTO;
+import com.epmet.dto.form.GovArticleDetailFormDTO;
+import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.ArticleOperationResultDTO;
+import com.epmet.dto.result.GovArticleDetailResultDTO;
 import com.epmet.excel.ArticleExcel;
+import com.epmet.service.ArticleOperateRecordService;
 import com.epmet.service.ArticleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -54,6 +59,8 @@ public class ArticleController {
     
     @Autowired
     private ArticleService articleService;
+    @Autowired
+    private ArticleOperateRecordService articleOperateRecordService;
 
     @GetMapping("page")
     public Result<PageData<ArticleDTO>> page(@RequestParam Map<String, Object> params){
@@ -114,9 +121,40 @@ public class ArticleController {
      * @throws Exception
      */
     @GetMapping("savecontent")
-    public Result<String> savecontent(@RequestBody DraftContentFromDTO  fromDTO) throws Exception {
-        String draftId = articleService.saveOrUpdateContent(fromDTO);
+    public Result<String> saveOrUpdateContent(@LoginUser TokenDto tokenDto,@RequestBody DraftContentFromDTO  fromDTO) throws Exception {
+        String draftId = articleService.saveOrUpdateContent(tokenDto, fromDTO);
         return new Result<String>().ok(draftId);
     }
 
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.form.ArticleOperationResultDTO>>
+     * @author yinzuomei@elink-cn.com
+     * @description 政府端：查询文章操作记录
+     * @date 2020/6/2 16:50
+     **/
+    @PostMapping("oprationlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_OPERATION_LIST)
+    public Result<List<ArticleOperationResultDTO>> operationList(@RequestBody ArticleOperationFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, ArticleOperationFormDTO.AddUserInternalGroup.class);
+        List<ArticleOperationResultDTO> list =
+            articleOperateRecordService.listOfArticleOperation(formDTO.getArticleId());
+        return new Result<List<ArticleOperationResultDTO>>().ok(list);
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.GovArticleDetailResultDTO>
+     * @author yinzuomei@elink-cn.com
+     * @description 政府端：（已发布、已下线）文章详情
+     * @date 2020/6/3 9:44
+     **/
+    @PostMapping("articledetail")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DETAIL)
+    public Result<GovArticleDetailResultDTO> articleDetail(@RequestBody GovArticleDetailFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, GovArticleDetailFormDTO.AddUserInternalGroup.class);
+        GovArticleDetailResultDTO articleDetail = articleService.queryGovArticleDetail(formDTO.getArticleId());
+        return new Result<GovArticleDetailResultDTO>().ok(articleDetail);
+    }
+
 }

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

@@ -17,6 +17,8 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -26,6 +28,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.DraftDTO;
+import com.epmet.dto.form.DeleteDraftFormDTO;
 import com.epmet.excel.DraftExcel;
 import com.epmet.service.DraftService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +94,18 @@ public class DraftController {
         ExcelUtils.exportExcelToTarget(response, null, list, DraftExcel.class);
     }
 
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei@elink-cn.com
+     * @description 政府端：工作人员,删除草稿
+     * @date 2020/6/2 16:00
+     **/
+    @PostMapping("deletedraft")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_DELETE)
+    public Result deleteDraft(@RequestBody DeleteDraftFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, DeleteDraftFormDTO.AddUserInternalGroup.class);
+        draftService.deleteDraft(formDTO);
+        return new Result();
+    }
 }

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

@@ -1,27 +1,28 @@
 /**
  * Copyright 2018 人人开源 https://www.renren.io
  * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later
+ * version.
  * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.GovArticleContentDTO;
+import com.epmet.dto.result.GovArticleDetailResultDTO;
 import com.epmet.dto.form.ResiTagListFormDto;
 import com.epmet.entity.ArticleEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 文章表
  *
@@ -31,6 +32,22 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ArticleDao extends BaseDao<ArticleEntity> {
 
+    /**
+     * 政府端查询文章详情
+     *
+     * @param articleId
+     *            文章id
+     */
+    GovArticleDetailResultDTO queryGovArticleDetail(String articleId);
+
+    /**
+     * 政府端查询文章详情-内容
+     *
+     * @param articleId
+     *            文章id
+     */
+    List<GovArticleContentDTO> queryGovArticleContent(String articleId);
+
     /**
      * @Description
      * @param formDto

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

@@ -18,9 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.ArticleOperationResultDTO;
 import com.epmet.entity.ArticleOperateRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 文章操作记录表
  *
@@ -29,5 +32,11 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ArticleOperateRecordDao extends BaseDao<ArticleOperateRecordEntity> {
-	
+
+    /**
+     * 根据文章id查询操作记录
+     *
+     * @param articleId
+     */
+    List<ArticleOperationResultDTO> selectListByArticleId(String articleId);
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticlePublishRangeEntity.java

@@ -53,6 +53,11 @@ public class ArticlePublishRangeEntity extends BaseEpmetEntity {
      */
 	private String gridId;
 
+	/**
+	 * 组织-网格名称
+	 */
+	private String agencyGridName;
+
     /**
      * 下线时间
      */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftPublishRangeEntity.java

@@ -53,6 +53,11 @@ public class DraftPublishRangeEntity extends BaseEpmetEntity {
      */
 	private String gridId;
 
+	/**
+	 * 组织-网格名称
+	 */
+	private String agencyGridName;
+
     /**
      * 下线时间
      */

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

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ArticleOperateRecordDTO;
+import com.epmet.dto.result.ArticleOperationResultDTO;
 import com.epmet.entity.ArticleOperateRecordEntity;
 
 import java.util.List;
@@ -92,4 +93,14 @@ public interface ArticleOperateRecordService extends BaseService<ArticleOperateR
      * @date 2020-06-02
      */
     void delete(String[] ids);
+
+    /**
+     * 查询文章操作记录
+     *
+     * @param articleId
+     * @return com.epmet.dto.form.ArticleOperationResultDTO
+     * @author yinzuomei@elink-cn.com
+     * @date 2020-06-02
+     */
+    List<ArticleOperationResultDTO> listOfArticleOperation(String articleId);
 }

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

@@ -21,8 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.ArticleDTO;
-import com.epmet.dto.result.ArticleGridResultDTO;
 import com.epmet.dto.form.DraftContentFromDTO;
+import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.GovArticleDetailResultDTO;
 import com.epmet.entity.ArticleEntity;
 
 import java.util.List;
@@ -106,8 +107,20 @@ public interface ArticleService extends BaseService<ArticleEntity> {
 
     /**
      * desc:保存或修改文章内容
+     *
+     * @param tokenDto
      * @param fromDTO
      * @return
      */
-	String saveOrUpdateContent(DraftContentFromDTO fromDTO);
+	String saveOrUpdateContent(TokenDto tokenDto, DraftContentFromDTO fromDTO);
+
+    /**
+     * 政府端：（已发布、已下线）文章详情
+     *
+     * @param articleId
+     * @return com.epmet.dto.result.GovArticleDetailResultDTO
+     * @author yinzuomei@elink-cn.com
+     * @date 2020-06-03
+     */
+    GovArticleDetailResultDTO queryGovArticleDetail(String articleId);
 }

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

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.DraftDTO;
+import com.epmet.dto.form.DeleteDraftFormDTO;
 import com.epmet.entity.DraftEntity;
 
 import java.util.List;
@@ -92,4 +93,13 @@ public interface DraftService extends BaseService<DraftEntity> {
      * @date 2020-06-02
      */
     void delete(String[] ids);
+
+    /**
+     * @param formDTO
+     * @return void
+     * @author yinzuomei@elink-cn.com
+     * @description 政府端工作人员,删除草稿
+     * @date 2020/6/2 16:09
+     **/
+    void deleteDraft(DeleteDraftFormDTO formDTO);
 }

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

@@ -20,11 +20,12 @@ package com.epmet.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;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.ArticleOperateRecordDao;
 import com.epmet.dto.ArticleOperateRecordDTO;
+import com.epmet.dto.result.ArticleOperationResultDTO;
 import com.epmet.entity.ArticleOperateRecordEntity;
 import com.epmet.redis.ArticleOperateRecordRedis;
 import com.epmet.service.ArticleOperateRecordService;
@@ -33,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -101,4 +103,13 @@ public class ArticleOperateRecordServiceImpl extends BaseServiceImpl<ArticleOper
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<ArticleOperationResultDTO> listOfArticleOperation(String articleId) {
+        List<ArticleOperationResultDTO> list = baseDao.selectListByArticleId(articleId);
+        if (null == list) {
+            return new ArrayList<>();
+        }
+        return list;
+    }
+
 }

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

@@ -22,11 +22,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
@@ -36,8 +36,10 @@ import com.epmet.dao.DraftContentDao;
 import com.epmet.dao.DraftDao;
 import com.epmet.dto.ArticleDTO;
 import com.epmet.dto.feign.GovOrgSelfFeignClient;
-import com.epmet.dto.result.ArticleGridResultDTO;
 import com.epmet.dto.form.DraftContentFromDTO;
+import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.GovArticleContentDTO;
+import com.epmet.dto.result.GovArticleDetailResultDTO;
 import com.epmet.entity.ArticleEntity;
 import com.epmet.entity.DraftContentEntity;
 import com.epmet.entity.DraftEntity;
@@ -49,11 +51,9 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 文章表
@@ -63,6 +63,11 @@ import java.util.stream.Collectors;
  */
 @Service
 public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntity> implements ArticleService {
+	private final Log logger = LogFactory.getLog(getClass());
+	@Autowired
+	private ArticleRedis articleRedis;
+	@Autowired
+	private GovOrgSelfFeignClient govOrgSelfFeignClient;
 
     @Autowired
     private ArticleRedis articleRedis;
@@ -73,8 +78,6 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	private DraftDao draftDao;
 	@Autowired
 	private DraftContentDao draftContentDao;
-	@Autowired
-	private ArticleDao articleDao;
 
 	@Override
 	public PageData<ArticleDTO> page(Map<String, Object> params) {
@@ -128,39 +131,27 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		baseDao.deleteBatchIds(Arrays.asList(ids));
 	}
 
-    /**
-     * @param tokenDTO
-     * @return
-     * @Author sun
-     * @Description 党建声音-政府端-可选发布范围
-     **/
-    @Override
-    public ArticleGridResultDTO agencyGridList(TokenDto tokenDTO) {
-        Result<ArticleGridResultDTO> result = govOrgSelfFeignClient.getAgencyGridList(tokenDTO.getUserId());
-        return result.getData();
-    }
+	/**
+	 * @param tokenDTO
+	 * @return
+	 * @Author sun
+	 * @Description 党建声音-政府端-可选发布范围
+	 **/
+	@Override
+	public ArticleGridResultDTO agencyGridList(TokenDto tokenDTO) {
+		Result<ArticleGridResultDTO> result = govOrgSelfFeignClient.getAgencyGridList(tokenDTO.getUserId());
+		return result.getData();
+	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public String saveOrUpdateContent(DraftContentFromDTO fromDTO) {
+	public String saveOrUpdateContent(TokenDto tokenDto, DraftContentFromDTO fromDTO) {
 		logger.debug("saveOrUpdateContent param:" + JSON.toJSONString(fromDTO));
 		ValidatorUtils.validateEntity(fromDTO, AddGroup.class, DefaultGroup.class);
-		boolean havePublished = StringUtils.isBlank(fromDTO.getArticleId()) ? false : true;
-
-		if (havePublished) {
-			//TODO 校验文章是否已下线
-			//....
-			Map<String,Object> articleParamMap  = new HashMap<>();
-			articleParamMap.put("ARTICLE_ID", fromDTO.getArticleId());
-			articleParamMap.put("ARTICLE_ID", fromDTO.getArticleId());
-			articleDao.selectByMap(articleParamMap);
-		}
 
 		DraftEntity draftEntity = null;
 		List<DraftContentEntity> draftContentList = null;
 		if (StringUtils.isNotBlank(fromDTO.getDraftId())) {
-			//TODO
-
 			draftEntity = draftDao.selectById(fromDTO.getDraftId());
 			if (draftEntity == null) {
 				logger.warn("saveOrUpdateContent draftId is not exist in db");
@@ -173,63 +164,75 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		} else {
 			draftEntity = new DraftEntity();
 			draftEntity.setTitle(fromDTO.getTitle());
+			draftEntity.setCustomerId(tokenDto.getCustomerId());
+			draftEntity.setPreviewContent("");
+			draftEntity.setIsTop(0);
+			draftEntity.setPublishRangeDesc("");
+			draftEntity.setPublisherId("");
+			draftEntity.setPublisherName("");
+			draftEntity.setPublisherType("");
+			draftEntity.setPublishDate(new Date());
+			draftEntity.setStatusFlag("");
+			draftEntity.setTags("");
+			draftEntity.setOrgId("");
+			draftEntity.setOrgIdPath("");
+			draftEntity.setGridId("");
+			draftEntity.setDepartmentId("");
+			draftEntity.setRevision(0);
+			draftEntity.setDelFlag(NumConstant.ZERO_STR);
+
 			draftDao.insert(draftEntity);
 		}
 
+		String draftId = draftEntity.getId();
+		fromDTO.setDraftId(draftId);
+		draftContentList = buildDraftContent(tokenDto, fromDTO);
 		if (CollectionUtils.isEmpty(draftContentList)) {
 			logger.warn("saveOrUpdateContent contentList is empty");
 			throw new RenException("参数错误");
 		}
-		draftContentList = buildDraftContent(fromDTO, havePublished);
+
+		Map<String, Object> draftIdMap = new HashMap<>();
+		draftIdMap.put("DRAFT_ID", fromDTO.getDraftId());
+		draftContentDao.deleteByMap(draftIdMap);
 		//TODO 改为批量插入
 		draftContentList.forEach(content -> draftContentDao.insert(content));
 
-		String draftId = draftEntity.getId();
-
-
-		return null;
+		return draftId;
 	}
 
+	@Override
+    public GovArticleDetailResultDTO queryGovArticleDetail(String articleId) {
+        GovArticleDetailResultDTO articleDetail = baseDao.queryGovArticleDetail(articleId);
+        if (null != articleDetail) {
+            List<GovArticleContentDTO> articleContentList = baseDao.queryGovArticleContent(articleId);
+            articleDetail.setArticleContentList(articleContentList);
+        }
+        return articleDetail;
+    }
+
 	/**
 	 * desc：构建 内容对象
 	 *
+	 * @param tokenDto
 	 * @param fromDTO
-	 * @param havePublished
 	 * @return
 	 */
-	private List<DraftContentEntity> buildDraftContent(DraftContentFromDTO fromDTO, boolean havePublished) {
-		//如果已发布  则需要校验内容是否更改过  没有更改则 不对审核状态进行重置
+	private List<DraftContentEntity> buildDraftContent(TokenDto tokenDto, DraftContentFromDTO fromDTO) {
 		List<DraftContentEntity> newContentList = new ArrayList<>();
-		Map<String, DraftContentEntity> oldContentMap = null;
-		Map<String, Object> draftIdMap = new HashMap<>();
-		draftIdMap.put("DRAFT_ID", fromDTO.getDraftId());
-		if (havePublished) {
-			List<DraftContentEntity> oldContentEntities = draftContentDao.selectByMap(draftIdMap);
-			oldContentMap = oldContentEntities.stream().collect(Collectors.toMap(DraftContentEntity::getId, content -> content));
-			//删掉所有
-			draftContentDao.deleteByMap(draftIdMap);
-		}
+
 		List<DraftContentFromDTO.DraftContentDTO> contentList = fromDTO.getContentList();
 
-		Map<String, DraftContentEntity> finalOldContentMap = oldContentMap;
-		Set<Integer> orderNumSet = new HashSet<>();
-		contentList.forEach(content -> {
-			if (finalOldContentMap != null && finalOldContentMap.get(content.getDraftId()) != null) {
-				DraftContentEntity oldContent = finalOldContentMap.get(content.getDraftId());
-				if (oldContent.getContent().equals(content.getContent())) {
-					content.setAuditReason(oldContent.getAuditReason());
-					content.setAuditStatus(oldContent.getAuditStatus());
-				}
-			}
+		for (int i = 0; i < contentList.size(); i++) {
+			DraftContentFromDTO.DraftContentDTO content = contentList.get(i);
 			DraftContentEntity entity = ConvertUtils.sourceToTarget(content, DraftContentEntity.class);
-			entity.setId(content.getDraftId());
-			orderNumSet.add(content.getOrderNum());
+			entity.setId(content.getDraftContentId());
+			entity.setCustomerId(tokenDto.getCustomerId());
+			entity.setDraftId(fromDTO.getDraftId());
+			entity.setOrderNum(i + 1);
 			newContentList.add(entity);
-		});
-		if (orderNumSet.size() != newContentList.size()) {
-			logger.warn("saveOrUpdateContent contentList orderNum is repeat");
-			throw new RenException("参数错误");
 		}
+
 		return newContentList;
 	}
 

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

@@ -20,15 +20,20 @@ package com.epmet.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;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.constant.DraftConstant;
 import com.epmet.dao.DraftDao;
 import com.epmet.dto.DraftDTO;
+import com.epmet.dto.form.DeleteDraftFormDTO;
 import com.epmet.entity.DraftEntity;
 import com.epmet.redis.DraftRedis;
 import com.epmet.service.DraftService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,7 +50,7 @@ import java.util.Map;
  */
 @Service
 public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> implements DraftService {
-
+    private Logger logger = LoggerFactory.getLogger(getClass());
     @Autowired
     private DraftRedis draftRedis;
 
@@ -101,4 +106,16 @@ public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> imp
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public void deleteDraft(DeleteDraftFormDTO formDTO) {
+        DraftDTO draftDTO = this.get(formDTO.getDraftId());
+        // 已发布的草稿不能删除
+        if (null == draftDTO || DraftConstant.PUBLISHED.equals(draftDTO.getStatusFlag())) {
+            logger.error(String.format("删除草稿错误,已发布的草稿不能删除。草稿id%s", formDTO.getDraftId()));
+            return;
+        }
+        draftDTO.setDelFlag(NumConstant.ONE);
+        this.update(draftDTO);
+    }
+
 }

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

@@ -2,7 +2,38 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.ArticleDao">
+    <!--  政府端：（已发布、已下线）文章详情 属性 -->
+    <select id="queryGovArticleDetail" parameterType="java.lang.String" resultType="com.epmet.dto.result.GovArticleDetailResultDTO">
+        SELECT
+            id AS ARTICLE_ID,
+            TITLE,
+            PUBLISHER_NAME,
+            PUBLISH_DATE,
+            ( SELECT count( 1 ) FROM article_visit_record avr WHERE avr.DEL_FLAG = '0' AND avr.ARTICLE_ID =#{articleId}) AS VISIT_RECORD_COUNT,
+            PUBLISH_RANGE_DESC,
+            TAGS,
+            STATUS_FLAG,
+            DRAFT_ID
+        FROM
+            article
+        WHERE
+            DEL_FLAG = '0'
+            AND id =#{articleId}
+    </select>
 
+    <!--  政府端：（已发布、已下线）文章详情 内容  -->
+    <select id="queryGovArticleContent" parameterType="java.lang.String" resultType="com.epmet.dto.result.GovArticleContentDTO">
+        SELECT
+            ac.CONTENT_TYPE,
+            ac.CONTENT
+        FROM
+            article_content ac
+        WHERE
+            ac.DEL_FLAG = '0'
+            and ac.ARTICLE_ID=#{articleId}
+        ORDER BY
+            ac.ORDER_NUM ASC
+    </select>
     <select id="checkPublishArticle" resultType="integer" parameterType="com.epmet.dto.form.ResiTagListFormDto">
         SELECT
             COUNT(*) AS articleCounts

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

@@ -3,5 +3,18 @@
 
 <mapper namespace="com.epmet.dao.ArticleOperateRecordDao">
 
-
+    <!--  根据文章id查询操作记录  -->
+    <select id="selectListByArticleId" parameterType="java.lang.String" resultType="com.epmet.dto.result.ArticleOperationResultDTO">
+        SELECT
+            id,
+            content,
+            UNIX_TIMESTAMP( CREATED_TIME ) AS createdTime
+        FROM
+            article_operate_record
+        WHERE
+            DEL_FLAG = '0'
+            AND ARTICLE_ID =#{articleId}
+        ORDER BY
+            CREATED_TIME DESC
+    </select>
 </mapper>

epmet-module/gov-voice/gov-voice-server/src/main/resources/migration/epmet_gov_voice.sql

@@ -1,11 +1,4 @@
-/*
- Date: 2/06/2020 16:13:38
-*/
-
--- SET NAMES utf8mb4;
--- #SET FOREIGN_KEY_CHECKS = 0;
-
-CREATE DATABASE `epmet_gov_access` DEFAULT CHARACTER SET utf8mb4;
+DROP TABLE tag_default;/*SkipError*/
 CREATE TABLE tag_default(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID' ,
     TAG_NAME VARCHAR(32) NOT NULL   COMMENT '标签名称' ,
@@ -19,6 +12,7 @@ CREATE TABLE tag_default(
 ) COMMENT = '默认标签表 默认标签表';
 
 ALTER TABLE tag_default COMMENT '默认标签表';
+DROP TABLE tag_customer;/*SkipError*/
 CREATE TABLE tag_customer(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
@@ -35,6 +29,7 @@ CREATE TABLE tag_customer(
 
 ALTER TABLE tag_customer ADD INDEX INX_TAG_NAME(TAG_NAME);
 ALTER TABLE tag_customer COMMENT '客户标签表';
+DROP TABLE tag_grid;/*SkipError*/
 CREATE TABLE tag_grid(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
@@ -52,6 +47,7 @@ CREATE TABLE tag_grid(
 ) COMMENT = '网格标签表 网格标签表';
 
 ALTER TABLE tag_grid COMMENT '网格标签表';
+DROP TABLE article_tags;/*SkipError*/
 CREATE TABLE article_tags(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
@@ -69,18 +65,19 @@ CREATE TABLE article_tags(
 
 ALTER TABLE article_tags ADD INDEX IDX_ARTICLE_ID(ARTICLE_ID);
 ALTER TABLE article_tags COMMENT '文章标签表';
+DROP TABLE draft;/*SkipError*/
 CREATE TABLE draft(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
     TITLE VARCHAR(128) NOT NULL   COMMENT '文章标题' ,
     PREVIEW_CONTENT VARCHAR(512) NOT NULL   COMMENT '文章内容 精简内容' ,
-    IS_TOP INT NOT NULL   COMMENT '是否置顶' ,
+    IS_TOP INT NOT NULL   COMMENT '是否置顶 1是；0否；' ,
     PUBLISH_RANGE_DESC VARCHAR(512) NOT NULL   COMMENT '发布范围描述 所有发布范围集合' ,
     PUBLISHER_ID VARCHAR(64) NOT NULL   COMMENT '发布单位ID' ,
     PUBLISHER_NAME VARCHAR(128) NOT NULL   COMMENT '发布单位名称' ,
     PUBLISHER_TYPE VARCHAR(32) NOT NULL   COMMENT '发布单位类型 机关:agency；部门：department；网格：grid' ,
     PUBLISH_DATE DATE NOT NULL   COMMENT '发布时间' ,
-    STATUS_FLAG VARCHAR(32) NOT NULL   COMMENT '发布状态 未发布：unpublish ；已发布:published，审核中：auditing，审核失败：auditfail' ,
+    STATUS_FLAG VARCHAR(32) NOT NULL   COMMENT '发布状态 未发布：unpublish ；已发布:published，审核中：auditing；审核失败：auditfail' ,
     TAGS VARCHAR(512) NOT NULL   COMMENT '文章标签串 竖杠分割的标签名称' ,
     ORG_ID VARCHAR(64)    COMMENT '组织ID' ,
     ORG_ID_PATH VARCHAR(512)    COMMENT '组织ID路径 eg：字段为def:abc' ,
@@ -96,14 +93,15 @@ CREATE TABLE draft(
 ) COMMENT = '草稿表 草稿表';
 
 ALTER TABLE draft COMMENT '草稿表';
+DROP TABLE draft_content;/*SkipError*/
 CREATE TABLE draft_content(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID 主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
     DRAFT_ID VARCHAR(64) NOT NULL   COMMENT '草稿ID' ,
     CONTENT VARCHAR(1024) NOT NULL   COMMENT '内容' ,
     CONTENT_TYPE VARCHAR(32) NOT NULL   COMMENT '内容类型 图片：img；文字：text' ,
-    AUDIT_STATUS VARCHAR(32) NOT NULL   COMMENT '审核状态 通过:pass；失败:fail；' ,
-    AUDIT_REASON VARCHAR(128) NOT NULL   COMMENT '审核理由' ,
+    AUDIT_STATUS VARCHAR(32)    COMMENT '审核状态 通过:pass；失败:fail；审核中：auditing;' ,
+    AUDIT_REASON VARCHAR(128)    COMMENT '审核理由' ,
     ORDER_NUM INT NOT NULL   COMMENT '内容顺序 从1开始' ,
     DEL_FLAG INT NOT NULL  DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' ,
     REVISION INT NOT NULL   COMMENT '乐观锁' ,
@@ -115,11 +113,13 @@ CREATE TABLE draft_content(
 ) COMMENT = '草稿内容表 草稿内容表';
 
 ALTER TABLE draft_content COMMENT '草稿内容表';
+DROP TABLE draft_publish_range;/*SkipError*/
 CREATE TABLE draft_publish_range(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
     DRAFT_ID VARCHAR(64) NOT NULL   COMMENT 'ID草稿' ,
     GRID_ID VARCHAR(64) NOT NULL   COMMENT '网格ID' ,
+    AGENCY_GRID_NAME VARCHAR(64) NOT NULL   COMMENT '组织-网格名称' ,
     OFF_LINE_TIME DATETIME    COMMENT '下线时间' ,
     PUBLISH_STATUS VARCHAR(32) NOT NULL   COMMENT '发布状态 未发布：unpublish ；已发布:published' ,
     DEL_FLAG INT NOT NULL  DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' ,
@@ -132,13 +132,14 @@ CREATE TABLE draft_publish_range(
 ) COMMENT = '草稿发布范围表 草稿发布范围表';
 
 ALTER TABLE draft_publish_range COMMENT '草稿发布范围表';
+DROP TABLE draft_cover;/*SkipError*/
 CREATE TABLE draft_cover(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
     DRAFT_ID VARCHAR(64) NOT NULL   COMMENT '草稿ID' ,
     IMG_URL VARCHAR(512) NOT NULL   COMMENT '封面图片地址 url地址' ,
-    AUDIT_STATUS VARCHAR(32) NOT NULL   COMMENT '审核状态 通过:pass；失败:fail；' ,
-    AUDIT_REASON VARCHAR(128) NOT NULL   COMMENT '审核理由' ,
+    AUDIT_STATUS VARCHAR(32)    COMMENT '审核状态 通过:pass；失败:fail；审核中：auditing;' ,
+    AUDIT_REASON VARCHAR(128)    COMMENT '审核理由' ,
     DEL_FLAG INT NOT NULL  DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' ,
     REVISION INT NOT NULL   COMMENT '乐观锁' ,
     CREATED_BY VARCHAR(32) NOT NULL   COMMENT '创建人' ,
@@ -149,14 +150,15 @@ CREATE TABLE draft_cover(
 ) COMMENT = '草稿封面表 草稿封面表';
 
 ALTER TABLE draft_cover COMMENT '草稿封面表';
+DROP TABLE article;/*SkipError*/
 CREATE TABLE article(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
     DRAFT_ID VARCHAR(64) NOT NULL   COMMENT '草稿ID' ,
     TITLE VARCHAR(128) NOT NULL   COMMENT '文章标题' ,
     PREVIEW_CONTENT VARCHAR(512) NOT NULL   COMMENT '文章内容 精简内容' ,
-    IS_TOP INT NOT NULL   COMMENT '是否置顶' ,
-    PUBLISH_RANGE_DESC VARCHAR(512) NOT NULL   COMMENT '发布范围描述 所有发布范围集合' ,
+    IS_TOP INT NOT NULL   COMMENT '是否置顶 1是；0否；' ,
+    PUBLISH_RANGE_DESC VARCHAR(512) NOT NULL   COMMENT '发布范围描述 所有发布范围集合，顿号隔开' ,
     PUBLISHER_ID VARCHAR(64) NOT NULL   COMMENT '发布单位ID' ,
     PUBLISHER_NAME VARCHAR(128) NOT NULL   COMMENT '发布单位名称' ,
     PUBLISHER_TYPE VARCHAR(32) NOT NULL   COMMENT '发布单位类型 机关:agency；部门：department；网格：grid' ,
@@ -178,14 +180,15 @@ CREATE TABLE article(
 ) COMMENT = '文章表 正式文章表';
 
 ALTER TABLE article COMMENT '文章表';
+DROP TABLE article_content;/*SkipError*/
 CREATE TABLE article_content(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID 主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
     ARTICLE_ID VARCHAR(64) NOT NULL   COMMENT '文章ID' ,
     CONTENT VARCHAR(1024) NOT NULL   COMMENT '内容' ,
     CONTENT_TYPE VARCHAR(32) NOT NULL   COMMENT '内容类型 图片：img；文字：text' ,
-    AUDIT_STATUS VARCHAR(32) NOT NULL   COMMENT '审核状态 通过:pass；失败:fail；审核中：auditing' ,
-    AUDIT_REASON VARCHAR(128) NOT NULL   COMMENT '审核理由' ,
+    AUDIT_STATUS VARCHAR(32)    COMMENT '审核状态 通过:pass；失败:fail；审核中：auditing;' ,
+    AUDIT_REASON VARCHAR(128)    COMMENT '审核理由' ,
     ORDER_NUM INT NOT NULL   COMMENT '内容顺序 从1开始' ,
     DEL_FLAG INT NOT NULL  DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' ,
     REVISION INT NOT NULL   COMMENT '乐观锁' ,
@@ -197,13 +200,14 @@ CREATE TABLE article_content(
 ) COMMENT = '文章内容表 文章内容表';
 
 ALTER TABLE article_content COMMENT '文章内容表';
+DROP TABLE article_cover;/*SkipError*/
 CREATE TABLE article_cover(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
     ARTICLE_ID VARCHAR(64) NOT NULL   COMMENT '文章ID' ,
     IMG_URL VARCHAR(512) NOT NULL   COMMENT '封面图片地址 url地址' ,
-    AUDIT_STATUS VARCHAR(32) NOT NULL   COMMENT '审核状态 通过:pass；失败:fail；审核中：auditing' ,
-    AUDIT_REASON VARCHAR(128) NOT NULL   COMMENT '审核理由' ,
+    AUDIT_STATUS VARCHAR(32)    COMMENT '审核状态 通过:pass；失败:fail；审核中：auditing' ,
+    AUDIT_REASON VARCHAR(128)    COMMENT '审核理由' ,
     DEL_FLAG INT NOT NULL  DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' ,
     REVISION INT NOT NULL   COMMENT '乐观锁' ,
     CREATED_BY VARCHAR(32) NOT NULL   COMMENT '创建人' ,
@@ -214,13 +218,15 @@ CREATE TABLE article_cover(
 ) COMMENT = '文章封面表 文章封面表';
 
 ALTER TABLE article_cover COMMENT '文章封面表';
+DROP TABLE article_publish_range;/*SkipError*/
 CREATE TABLE article_publish_range(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
     ARTICLE_ID VARCHAR(64) NOT NULL   COMMENT '文章ID' ,
     GRID_ID VARCHAR(64) NOT NULL   COMMENT '网格ID' ,
+    AGENCY_GRID_NAME VARCHAR(64) NOT NULL   COMMENT '组织-网格名称' ,
     OFF_LINE_TIME DATETIME    COMMENT '下线时间' ,
-    PUBLISH_STATUS VARCHAR(32) NOT NULL   COMMENT '发布状态' ,
+    PUBLISH_STATUS VARCHAR(32) NOT NULL   COMMENT '发布状态 未发布：unpublish ；已发布:published' ,
     DEL_FLAG INT NOT NULL  DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除' ,
     REVISION INT NOT NULL   COMMENT '乐观锁' ,
     CREATED_BY VARCHAR(32) NOT NULL   COMMENT '创建人' ,
@@ -232,6 +238,7 @@ CREATE TABLE article_publish_range(
 
 ALTER TABLE article_publish_range ADD INDEX IDX_ARTICLE_ID(ARTICLE_ID);
 ALTER TABLE article_publish_range COMMENT '文章发布范围表';
+DROP TABLE article_operate_record;/*SkipError*/
 CREATE TABLE article_operate_record(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID 主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
@@ -250,6 +257,7 @@ CREATE TABLE article_operate_record(
 ) COMMENT = '文章操作记录表 文章操作记录表';
 
 ALTER TABLE article_operate_record COMMENT '文章操作记录表';
+DROP TABLE article_visit_record;/*SkipError*/
 CREATE TABLE article_visit_record(
     ID VARCHAR(64) NOT NULL   COMMENT '主键ID' ,
     CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,

epmet-module/gov-voice/gov-voice-server/src/test/java/com/epmet/ArticleServiceTest.java

@@ -0,0 +1,45 @@
+package com.epmet;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.DraftContentFromDTO;
+import com.epmet.service.ArticleService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ArticleServiceTest {
+
+   
+
+    @Autowired
+    private ArticleService articleService;
+
+    @Test
+    public void genToken() {
+        TokenDto tokenDto = new TokenDto();
+        tokenDto.setCustomerId("1");
+        tokenDto.setUserId("1");
+        DraftContentFromDTO draftContentFromDTO = new DraftContentFromDTO();
+        //draftContentFromDTO.setDraftId("1");
+        draftContentFromDTO.setTitle("testTitle");
+        List<DraftContentFromDTO.DraftContentDTO> list = new ArrayList<>();
+        for (int i = 0; i <2 ; i++) {
+            DraftContentFromDTO.DraftContentDTO contentDTO = new DraftContentFromDTO.DraftContentDTO();
+            contentDTO.setDraftContentId("");
+            contentDTO.setContent("内容"+i);
+            contentDTO.setContentType("text");
+            contentDTO.setOrderNum(1+i);
+            list.add(contentDTO);
+        }
+            draftContentFromDTO.setContentList(list);
+        String s = articleService.saveOrUpdateContent(tokenDto, draftContentFromDTO);
+        System.out.println(s);
+    }
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LoginUserDetailsFormDTO.java

@@ -0,0 +1,10 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+@Data
+public class LoginUserDetailsFormDTO {
+    private String app;
+    private String client;
+    private String userId;
+}

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.53
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.55
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.53</version>
+    <version>0.3.55</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java

@@ -10,11 +10,11 @@ import com.epmet.dto.UserDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.dto.result.MyResiUserInfoResultDTO;
 import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
 import com.epmet.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -111,4 +111,15 @@ public class UserController {
 		return new Result<MyResiUserInfoResultDTO>().ok(userService.resiMyselfMsg(myResiUserInfoFormDTO));
 	}
 
+	/**
+	 * 从缓存中查询已登录用户的基本信息以及角色等相关信息
+	 * @return
+	 */
+	@PostMapping("loginuserdetails")
+	public Result<LoginUserDetailsResultDTO> getLoginUserDetails(@RequestBody LoginUserDetailsFormDTO dto) {
+		ValidatorUtils.validateEntity(dto, StaffPermCacheFormDTO.GetStaffCurrPermissions.class);
+		LoginUserDetailsResultDTO govTokenDto = userService.getLoginUserDetails(dto.getApp(), dto.getClient(), dto.getUserId());
+		return new Result<LoginUserDetailsResultDTO>().ok(govTokenDto);
+	}
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java

@@ -1,19 +1,16 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.dto.result.MyResiUserInfoResultDTO;
 import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
 import com.epmet.entity.UserEntity;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * @Description
  * @IntefaceName UserService
@@ -73,4 +70,10 @@ public interface UserService extends BaseService<UserEntity> {
      * @date 2020.05.22 19:24
     **/
     MyResiUserInfoResultDTO resiMyselfMsg(MyResiUserInfoFormDTO myResiUserInfoFormDTO);
+
+    /**
+     * 查询登陆用户信息
+     * @return
+     */
+    LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String staffId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserConstant;
 import com.epmet.dao.UserDao;
@@ -42,6 +43,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     private GovOrgFeignClient govOrgFeignClient;
     @Autowired
     private UserRoleDao userRoleDao;
+    @Autowired
+    private CpUserDetailRedis cpUserDetailRedis;
 
     private static final Logger log = LoggerFactory.getLogger(UserServiceImpl.class);
 
@@ -174,4 +177,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         return null;
     }
+
+    @Override
+    public LoginUserDetailsResultDTO getLoginUserDetails(String app, String client, String userId) {
+        return cpUserDetailRedis.get(app, client, userId, LoginUserDetailsResultDTO.class);
+    }
 }