Browse Source

政府端党建声音列表

dev_shibei_match
zhaoqifeng 5 years ago
parent
commit
bd6c4beaa4
  1. 21
      epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
  2. 34
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgFeignClient.java
  3. 27
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
  4. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
  5. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
  6. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
  7. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
  8. 23
      epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/DraftListFormDTO.java
  9. 23
      epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/OfflineListFormDTO.java
  10. 30
      epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/PublishedListFormDTO.java
  11. 34
      epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftListResultDTO.java
  12. 38
      epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/OfflineListResultDTO.java
  13. 42
      epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java
  14. 6
      epmet-module/gov-voice/gov-voice-server/pom.xml
  15. 40
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/aspect/RequestLogAspect.java
  16. 31
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
  17. 10
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/DraftController.java
  18. 36
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java
  19. 15
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java
  20. 24
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java
  21. 12
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/DraftService.java
  22. 59
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
  23. 13
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
  24. 52
      epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
  25. 14
      epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
  26. 40
      epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/aspect/RequestLogAspect.java
  27. 6
      epmet-user/epmet-user-client/pom.xml
  28. 14
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
  29. 8
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
  30. 17
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java
  31. 9
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
  32. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
  33. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
  34. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java
  35. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
  36. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java
  37. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
  38. 14
      epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

21
epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@ -55,6 +55,7 @@ public class OssController {
private ParamsRemoteService paramsRemoteService;
private final static String KEY = ModuleConstant.CLOUD_STORAGE_CONFIG_KEY;
public static final String IMAGE_JPG_VALUE = "image/jpg";
@GetMapping("page")
@ApiOperation(value = "分页")
@ -186,4 +187,24 @@ public class OssController {
return ossService.uploadImg(file);
}
@PostMapping("article/upload")
public Result uploadArticleImg(@RequestParam("file") MultipartFile file) {
// 校验文件类型
if (!MediaType.IMAGE_PNG_VALUE.equals(file.getContentType()) && !IMAGE_JPG_VALUE.equals(file.getContentType())) {
throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getCode()
, EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getMsg());
}
// 校验文件体积,不超过2m
long maxSize = 2 * 1024 * 1024;
long size = file.getSize();
if (size > maxSize) {
throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode()
, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());
}
return ossService.uploadImg(file);
}
}

34
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@ -0,0 +1,34 @@
package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.form.LatestGridFormDTO;
import com.epmet.dto.form.StaffInfoFromDTO;
import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
import com.epmet.dto.result.LatestCustomerResultDTO;
import com.epmet.dto.result.MineResultDTO;
import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
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 url = "localhost:8092"
* @Author sun
*/
@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
public interface GovOrgFeignClient {
/**
* 根据staffId查询所属的组织机构
* @param staffId
* @return
*/
@PostMapping("/gov/org/agency/agencybystaff/{staffId}")
Result<CustomerAgencyDTO> getAgencyByStaff(@PathVariable("staffId") String staffId);
}

27
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@ -0,0 +1,27 @@
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.CustomerAgencyDTO;
import com.epmet.dto.form.LatestGridFormDTO;
import com.epmet.dto.form.StaffInfoFromDTO;
import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
import com.epmet.dto.result.LatestCustomerResultDTO;
import com.epmet.dto.result.MineResultDTO;
import com.epmet.feign.GovOrgFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @Description
* @Author sun
*/
@Component
public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
@Override
public Result<CustomerAgencyDTO> getAgencyByStaff(String staffId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyByStaff", staffId);
}
}

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java

@ -4,7 +4,6 @@ import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerDTO;
import com.epmet.dto.form.CustomerFormDTO;
import com.epmet.feign.fallback.OperCrmFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java

@ -5,7 +5,6 @@ import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerDTO;
import com.epmet.dto.form.CustomerFormDTO;
import com.epmet.feign.OperCrmFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java

@ -35,7 +35,6 @@ import com.epmet.dto.result.CommonStaffInfoResultDTO;
import com.epmet.dto.result.LatestCustomerResultDTO;
import com.epmet.entity.CustomerStaffAgencyEntity;
import com.epmet.feign.EpmetUserFeignClient;
import com.epmet.feign.OperCrmFeignClient;
import com.epmet.redis.CustomerStaffAgencyRedis;
import com.epmet.service.CustomerAgencyService;
import com.epmet.service.CustomerDepartmentService;

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@ -12,7 +12,6 @@ import com.epmet.dto.result.*;
import com.epmet.entity.CustomerAgencyEntity;
import com.epmet.entity.CustomerStaffAgencyEntity;
import com.epmet.feign.EpmetUserFeignClient;
import com.epmet.feign.OperCrmFeignClient;
import com.epmet.service.CustomerAgencyService;
import com.epmet.service.CustomerStaffAgencyService;
import com.epmet.service.StaffService;

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

@ -0,0 +1,23 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/6/3 14:43
*/
@Data
public class DraftListFormDTO implements Serializable {
private static final long serialVersionUID = 7957826609741967502L;
/**
* 页码
*/
private Integer pageNo;
/**
* 每页显示数量
*/
private Integer pageSize;
}

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

@ -0,0 +1,23 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/6/3 14:47
*/
@Data
public class OfflineListFormDTO implements Serializable {
private static final long serialVersionUID = -5928134434874117068L;
/**
* 页码
*/
private Integer pageNo;
/**
* 每页显示数量
*/
private Integer pageSize;
}

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

@ -0,0 +1,30 @@
package com.epmet.dto.form;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/6/2 14:09
*/
@Data
public class PublishedListFormDTO implements Serializable {
private static final long serialVersionUID = -8377558773628524229L;
/**
* 页码
*/
private Integer pageNo;
/**
* 每页显示数量
*/
private Integer pageSize;
/**
* 标签
*/
private List<String> tagIdList;
}

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

@ -0,0 +1,34 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/6/3 14:44
*/
@NoArgsConstructor
@Data
public class DraftListResultDTO implements Serializable {
private static final long serialVersionUID = -3596277149943610099L;
/**
* 文章ID
*/
private String draftId;
/**
* 文章标题
*/
private String title;
/**
* 文章内容
*/
private String content;
/**
* 创建时间
*/
private Long createdTime;
}

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

@ -0,0 +1,38 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/6/3 14:48
*/
@NoArgsConstructor
@Data
public class OfflineListResultDTO implements Serializable {
private static final long serialVersionUID = -5817451219557672084L;
/**
* 文章ID
*/
private String articleId;
/**
* 文章标题
*/
private String title;
/**
* 发布单位
*/
private String publisherName;
/**
* 发布时间
*/
private String publishDate;
/**
* 概要内容
*/
private String previewContent;
}

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

@ -0,0 +1,42 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/6/2 14:12
*/
@NoArgsConstructor
@Data
public class PublishedListResultDTO implements Serializable {
private static final long serialVersionUID = -8525181219822398750L;
/**
* 文章ID
*/
private String articleId;
/**
* 文章标题
*/
private String title;
/**
* 发布单位
*/
private String publisherName;
/**
* 发布时间
*/
private String publishDate;
/**
* 文章标签串
*/
private String tags;
/**
* 概要内容
*/
private String previewContent;
}

6
epmet-module/gov-voice/gov-voice-server/pom.xml

@ -71,6 +71,12 @@
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-user-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

40
epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/aspect/RequestLogAspect.java

@ -0,0 +1,40 @@
package com.epmet.aspect;
import com.epmet.commons.tools.aspect.BaseRequestLogAspect;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* 日志/异常处理切面实现调用父类方法完成日志记录和异常处理
*/
@Aspect
@Component
@Order(0)
public class RequestLogAspect extends BaseRequestLogAspect {
@Override
@Around(value = "execution(* com.epmet.controller.*Controller*.*(..)) ")
public Object proceed(ProceedingJoinPoint point) throws Throwable {
return super.proceed(point, getRequest());
}
/**
* 获取Request对象
*
* @return
*/
private HttpServletRequest getRequest() {
RequestAttributes ra = RequestContextHolder.getRequestAttributes();
ServletRequestAttributes sra = (ServletRequestAttributes) ra;
return sra.getRequest();
}
}

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

@ -239,4 +239,35 @@ public class ArticleController {
return new Result<Boolean>().ok(isSuccess);
}
/**
* 已发布文章列表
* @author zhaoqifeng
* @date 2020/6/3 16:19
* @param tokenDto
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData>
*/
@PostMapping("publishedarticlelist")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISHED_LIST)
public Result<PageData> publishedArticleList(@LoginUser TokenDto tokenDto, @RequestBody PublishedListFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return new Result<PageData>().ok(articleService.publishedArticleList(tokenDto, formDTO));
}
/**
* 已下线文章列表
* @author zhaoqifeng
* @date 2020/6/3 16:19
* @param tokenDto
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData>
*/
@PostMapping("offlinearticlelist")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_OFFLINE_LIST)
public Result<PageData> offLineList(@LoginUser TokenDto tokenDto, @RequestBody OfflineListFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return new Result<PageData>().ok(articleService.offlineList(tokenDto, formDTO));
}
}

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

@ -17,9 +17,11 @@
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;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
@ -29,6 +31,7 @@ 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.dto.form.DraftListFormDTO;
import com.epmet.excel.DraftExcel;
import com.epmet.service.DraftService;
import org.springframework.beans.factory.annotation.Autowired;
@ -108,4 +111,11 @@ public class DraftController {
draftService.deleteDraft(formDTO);
return new Result();
}
@PostMapping("draftlist")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_LIST)
public Result<PageData> draftList(@LoginUser TokenDto tokenDto, DraftListFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return new Result<PageData>().ok(draftService.draftList(tokenDto, formDTO));
}
}

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

@ -14,12 +14,13 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.annotation.DataFilter;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.GovArticleContentDTO;
import com.epmet.dto.result.GovArticleDetailResultDTO;
import com.epmet.dto.result.*;
import com.epmet.dto.form.ResiTagListFormDto;
import com.epmet.entity.ArticleEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -55,4 +56,35 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
*/
Integer checkPublishArticle(ResiTagListFormDto formDto);
/**
* 已发布列表---组织工作人员
* @author zhaoqifeng
* @date 2020/6/2 16:59
* @param customerId
* @return java.util.List<com.epmet.dto.result.PublishedListResultDTO>
*/
@DataFilter(tableAliases = "a")
List<PublishedListResultDTO> selectArticleListForAgency(@Param("customerId") String customerId);
/**
* 已发布列表---网格工作人员
* @author zhaoqifeng
* @date 2020/6/2 16:59
* @param customerId
* @param gridList
* @return java.util.List<com.epmet.dto.result.PublishedListResultDTO>
*/
@DataFilter(tableAliases = {"a", "apr"}, gridIdArgName = "gridList")
List<PublishedListResultDTO> selectArticleListForGrid(@Param("customerId") String customerId, @Param("gridList") List<String> gridList);
/**
* 已下线文章列表
* @author zhaoqifeng
* @date 2020/6/3 15:16
* @param gridList
* @return java.util.List<com.epmet.dto.result.OfflineListResultDTO>
*/
@DataFilter(tableAliases = "a", gridIdArgName = "gridList")
List<OfflineListResultDTO> selectOfflineList(@Param("gridList") List<String> gridList);
}

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

@ -18,12 +18,10 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.CoverImgDTO;
import com.epmet.dto.result.DraftAttrResultDTO;
import com.epmet.dto.result.DraftContentDetailDTO;
import com.epmet.dto.result.DraftContentResultDTO;
import com.epmet.dto.result.*;
import com.epmet.entity.DraftEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -74,4 +72,13 @@ public interface DraftDao extends BaseDao<DraftEntity> {
* 草稿id
*/
List<String> selectDraftGrids(String draftId);
/**
* 草稿列表
* @author zhaoqifeng
* @date 2020/6/3 14:54
* @param userId
* @return java.util.List<com.epmet.dto.result.DraftListResultDTO>
*/
List<DraftListResultDTO> selectDraftList(@Param("userId") String userId);
}

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

@ -21,9 +21,7 @@ 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.form.DraftAttrFromDTO;
import com.epmet.dto.form.DraftContentFromDTO;
import com.epmet.dto.form.OffLineArticleFormDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.ArticleGridResultDTO;
import com.epmet.dto.result.GovArticleDetailResultDTO;
import com.epmet.dto.result.PublishAgencyListResultDTO;
@ -158,4 +156,24 @@ public interface ArticleService extends BaseService<ArticleEntity> {
* @return
*/
Boolean previewSaveDraftAttr(TokenDto tokenDto, DraftAttrFromDTO fromDTO);
/**
* 已发布文章列表
* @author zhaoqifeng
* @date 2020/6/2 14:38
* @param tokenDto token
* @param formDTO 参数
* @return java.util.List<com.epmet.dto.result.PublishedListResultDTO>
*/
PageData publishedArticleList(TokenDto tokenDto, PublishedListFormDTO formDTO);
/**
* 已下线列表
* @author zhaoqifeng
* @date 2020/6/3 14:51
* @param tokenDto token
* @param formDTO 参数
* @return java.util.List<com.epmet.dto.result.OfflineListResultDTO>
*/
PageData offlineList(TokenDto tokenDto, OfflineListFormDTO formDTO);
}

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

@ -19,9 +19,11 @@ package com.epmet.service;
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.DraftDTO;
import com.epmet.dto.form.DeleteDraftFormDTO;
import com.epmet.dto.form.DraftDetailFormDTO;
import com.epmet.dto.form.DraftListFormDTO;
import com.epmet.dto.result.DraftAttrResultDTO;
import com.epmet.dto.result.DraftContentResultDTO;
import com.epmet.entity.DraftEntity;
@ -125,4 +127,14 @@ public interface DraftService extends BaseService<DraftEntity> {
* @date 2020-06-03
*/
DraftAttrResultDTO getDraftAttr(DraftDetailFormDTO formDTO);
/**
* 草稿列表
* @author zhaoqifeng
* @date 2020/6/3 14:51
* @param tokenDto token
* @param formDTO 参数
* @return java.util.List<com.epmet.dto.result.DraftListResultDTO>
*/
PageData draftList(TokenDto tokenDto, DraftListFormDTO formDTO);
}

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

@ -34,21 +34,24 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.constant.ArticleConstant;
import com.epmet.constant.DraftConstant;
import com.epmet.constant.RoleKeyConstants;
import com.epmet.dao.*;
import com.epmet.dto.ArticleDTO;
import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.CustomerStaffDTO;
import com.epmet.dto.feign.GovOrgSelfFeignClient;
import com.epmet.dto.form.DraftAttrFromDTO;
import com.epmet.dto.form.DraftContentFromDTO;
import com.epmet.dto.form.OffLineArticleFormDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.entity.*;
import com.epmet.feign.EpmetUserFeignClient;
import com.epmet.feign.EpmetUserSelfFeignClient;
import com.epmet.feign.GovOrgFeignClient;
import com.epmet.redis.ArticleRedis;
import com.epmet.service.ArticleOperateRecordService;
import com.epmet.service.ArticlePublishRangeService;
import com.epmet.service.ArticleService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -89,6 +92,13 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
private DraftCoverDao draftCoverDao;
@Autowired
private DraftPublishRangeDao draftPublishRangeDao;
@Autowired
private GovOrgFeignClient govOrgFeignClient;
@Autowired
private EpmetUserFeignClient epmetUserFeignClient;
private static final String AGENCY = "agency";
private static final String GRID = "grid";
@Override
public PageData<ArticleDTO> page(Map<String, Object> params) {
@ -512,4 +522,47 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
articleOperateRecordService.insert(recordEntity);
}
@Override
public PageData publishedArticleList(TokenDto tokenDto, PublishedListFormDTO formDTO) {
PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
List<PublishedListResultDTO> resultList;
Result<CustomerAgencyDTO> customerAgencyResult = govOrgFeignClient.getAgencyByStaff(tokenDto.getUserId());
if (!customerAgencyResult.success()) {
throw new RenException(customerAgencyResult.getCode(), customerAgencyResult.getMsg());
}
List<CustomerStaffRoleResultDTO> roles = epmetUserFeignClient.getStaffRoles(tokenDto.getUserId()).getData();
String staffLevel = "";
for (CustomerStaffRoleResultDTO role : roles) {
//党建负责人
if (RoleKeyConstants.ROLE_KEY_PARTY_PRINCIPALS.equals(role.getRoleKey()) ||
RoleKeyConstants.ROLE_KEY_AGENCY_LEADER.equals(role.getRoleKey()) ||
RoleKeyConstants.ROLE_KEY_MANAGER.equals(role.getRoleKey()) ||
RoleKeyConstants.ROLE_KEY_STAFF.equals(role.getRoleKey()) ||
RoleKeyConstants.ROLE_KEY_DEPT_LEADER.equals(role.getRoleKey())) {
staffLevel = AGENCY;
break;
} else {
staffLevel = GRID;
}
}
if (AGENCY.equals(staffLevel)) {
resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId());
} else {
//TODO
List<String> gridList = new ArrayList<>();
resultList = baseDao.selectArticleListForGrid(tokenDto.getCustomerId(), gridList);
}
PageInfo<PublishedListResultDTO> pageInfo = new PageInfo<>(resultList);
return new PageData<>(resultList, pageInfo.getTotal());
}
@Override
public PageData offlineList(TokenDto tokenDto, OfflineListFormDTO formDTO) {
PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
List<String> gridList = new ArrayList<>();
List<OfflineListResultDTO> resultList = baseDao.selectOfflineList(gridList);
PageInfo<OfflineListResultDTO> pageInfo = new PageInfo<>(resultList);
return new PageData<>(resultList, pageInfo.getTotal());
}
}

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

@ -23,18 +23,23 @@ 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.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.constant.DraftConstant;
import com.epmet.dao.DraftDao;
import com.epmet.dto.DraftDTO;
import com.epmet.dto.form.DeleteDraftFormDTO;
import com.epmet.dto.form.DraftDetailFormDTO;
import com.epmet.dto.form.DraftListFormDTO;
import com.epmet.dto.result.CoverImgDTO;
import com.epmet.dto.result.DraftAttrResultDTO;
import com.epmet.dto.result.DraftContentResultDTO;
import com.epmet.dto.result.DraftListResultDTO;
import com.epmet.entity.DraftEntity;
import com.epmet.redis.DraftRedis;
import com.epmet.service.DraftService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -146,4 +151,12 @@ public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> imp
return draftAttrResultDTO;
}
@Override
public PageData draftList(TokenDto tokenDto, DraftListFormDTO formDTO) {
PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
List<DraftListResultDTO> resultList = baseDao.selectDraftList(tokenDto.getUserId());
PageInfo<DraftListResultDTO> pageInfo = new PageInfo<>(resultList);
return new PageData<>(resultList, pageInfo.getTotal());
}
}

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

@ -46,4 +46,56 @@
AND created_by = #{userId}
</select>
<select id="selectArticleListForAgency" resultType="com.epmet.dto.result.PublishedListResultDTO">
SELECT
a.ID AS "articleId",
a.TITLE AS "title",
IFNULL(a.PREVIEW_CONTENT, "") AS "previewContent",
a.PUBLISHER_NAME AS "publisherName",
a.PUBLISH_DATE AS "publishDate",
IFNULL(a.TAGS, "") AS "tags"
FROM article a
WHERE a.DEL_FLAG = '0'
AND a.STATUS_FLAG = 'published'
AND a.CUSTOMER_ID = #{customerId}
</select>
<select id="selectArticleListForGrid" resultType="com.epmet.dto.result.PublishedListResultDTO">
SELECT
a.ID AS "articleId",
a.TITLE AS "title",
IFNULL(a.PREVIEW_CONTENT, "") AS "previewContent",
a.PUBLISHER_NAME AS "publisherName",
a.PUBLISH_DATE AS "publishDate",
IFNULL(a.TAGS, "") AS "tags"
FROM article a
WHERE a.DEL_FLAG = '0'
AND a.STATUS_FLAG = 'published'
AND a.CUSTOMER_ID = #{customerId}
UNION
SELECT DISTINCT
aa.ID AS "articleId",
aa.TITLE AS "title",
IFNULL(aa.PREVIEW_CONTENT, "") AS "previewContent",
aa.PUBLISHER_NAME AS "publisherName",
aa.PUBLISH_DATE AS "publishDate",
IFNULL(aa.TAGS, "") AS "tags"
FROM article aa
INNER JOIN article_publish_range apr ON aa.ID = apr.ARTICLE_ID AND apr.DEL_FLAG = 0 AND apr.PUBLISH_STATUS = 'published'
WHERE aa.DEL_FLAG = '0'
AND aa.STATUS_FLAG = 'published'
AND aa.CUSTOMER_ID = #{customerId}
</select>
<select id="selectOfflineList" resultType="com.epmet.dto.result.OfflineListResultDTO">
SELECT
a.ID AS "articleId",
a.TITLE AS "title",
IFNULL(a.PREVIEW_CONTENT, "") AS "previewContent",
a.PUBLISHER_NAME AS "publisherName",
a.PUBLISH_DATE AS "publishDate"
FROM article a
WHERE a.DEL_FLAG = '0'
AND a.STATUS_FLAG = 'offline'
</select>
</mapper>

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

@ -74,7 +74,7 @@
</select>
<!-- 政府端:选中草稿编辑,获取草稿属性-已选择发布网格 -->
<select id="selectDraftGrids" parameterType="java.lang.String" resultType="java.util.List">
<select id="selectDraftGrids" parameterType="java.lang.String" resultType="java.lang.String">
SELECT
GRID_ID
FROM
@ -84,4 +84,16 @@
AND dpr.PUBLISH_STATUS != 'published'
AND dpr.DRAFT_ID = #{draftId}
</select>
<select id="selectDraftList" resultType="com.epmet.dto.result.DraftListResultDTO">
SELECT
ID AS "draftId",
TITLE AS "title",
IFNULL(PREVIEW_CONTENT, "") AS "content",
UNIX_TIMESTAMP(CREATED_TIME) AS "createdTime"
FROM draft
WHERE DEL_FLAG = '0'
AND (STATUS_FLAG = 'unpublish' OR STATUS_FLAG = 'auditfail')
AND CREATED_BY = #{userId}
</select>
</mapper>

40
epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/aspect/RequestLogAspect.java

@ -0,0 +1,40 @@
package com.epmet.aspect;
import com.epmet.commons.tools.aspect.BaseRequestLogAspect;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* 日志/异常处理切面实现调用父类方法完成日志记录和异常处理
*/
@Aspect
@Component
@Order(0)
public class RequestLogAspect extends BaseRequestLogAspect {
@Override
@Around(value = "execution(* com.epmet.controller.*Controller*.*(..)) ")
public Object proceed(ProceedingJoinPoint point) throws Throwable {
return super.proceed(point, getRequest());
}
/**
* 获取Request对象
*
* @return
*/
private HttpServletRequest getRequest() {
RequestAttributes ra = RequestContextHolder.getRequestAttributes();
ServletRequestAttributes sra = (ServletRequestAttributes) ra;
return sra.getRequest();
}
}

6
epmet-user/epmet-user-client/pom.xml

@ -26,6 +26,12 @@
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>gov-org-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

14
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@ -3,12 +3,16 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.TagCustomerFormDTO;
import com.epmet.dto.result.CustomerStaffRoleResultDTO;
import com.epmet.dto.result.TagCustomerResultDTO;
import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
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;
/**
* @Author zxc
* @CreateTime 2020/6/2 14:05
@ -26,4 +30,14 @@ public interface EpmetUserFeignClient {
@PostMapping("/epmetuser/user/getcustomeridbyuserid")
Result<TagCustomerResultDTO> getCustomerIdByUserId(@RequestBody TagCustomerFormDTO formDTO);
/**
* 根据staffId查询人员拥有的所有角色信息
* @author zhaoqifeng
* @date 2020/6/2 16:11
* @param staffId
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.CustomerStaffRoleResultDTO>>
*/
@PostMapping("/epmetuser/staffrole/staffroles/{staffId}")
Result<List<CustomerStaffRoleResultDTO>> getStaffRoles(@PathVariable String staffId);
}

8
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@ -4,10 +4,13 @@ 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.TagCustomerFormDTO;
import com.epmet.dto.result.CustomerStaffRoleResultDTO;
import com.epmet.dto.result.TagCustomerResultDTO;
import com.epmet.feign.EpmetUserFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @Description 居民端-陌生人导览 调用gov-org服务
* @Author sun
@ -20,4 +23,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
public Result<TagCustomerResultDTO> getCustomerIdByUserId(TagCustomerFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerIdByUserId", formDTO);
}
@Override
public Result<List<CustomerStaffRoleResultDTO>> getStaffRoles(String staffId) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffRoles", staffId);
}
}

17
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java

@ -5,6 +5,11 @@ import com.epmet.commons.mybatis.entity.DataScope;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.GovStaffRoleDTO;
import com.epmet.dto.form.CommonUserFormDTO;
import com.epmet.dto.form.CustomerRoleFormDTO;
import com.epmet.dto.form.RolesUsersListFormDTO;
import com.epmet.dto.form.StaffRoleFormDTO;
import com.epmet.dto.result.CustomerStaffRoleResultDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.CustomerStaffRoleListResultDTO;
import com.epmet.dto.result.GovStaffRoleResultDTO;
@ -150,4 +155,16 @@ public class StaffRoleController {
ValidatorUtils.validateEntity(formDTO);
return new Result<List<CustomerStaffRoleListResultDTO>>().ok(staffRoleService.getCustomerStaffRoleList(formDTO));
}
/**
* 根据staffId查询人员拥有的所有角色信息
* @author zhaoqifeng
* @date 2020/6/2 16:11
* @param staffId
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.CustomerStaffRoleResultDTO>>
*/
@PostMapping("staffroles/{staffId}")
public Result<List<CustomerStaffRoleResultDTO>> getStaffRoles(@PathVariable String staffId) {
return new Result<List<CustomerStaffRoleResultDTO>>().ok(staffRoleService.getStaffRoles(staffId));
}
}

9
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java

@ -89,4 +89,13 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
* @Author sun
**/
List<CustomerStaffRoleListResultDTO> selectCustomerStaffRoleList(CustomerStaffRoleListFormDTO formDTO);
/**
* 根据staffId查询人员拥有的所有角色信息
* @author zhaoqifeng
* @date 2020/6/2 15:54
* @param staffId
* @return java.util.List<com.epmet.dto.result.CustomerStaffRoleResultDTO>
*/
List<CustomerStaffRoleResultDTO> selectStaffRoles(@Param("staffId") String staffId);
}

1
epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java

@ -3,7 +3,6 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerDTO;
import com.epmet.feign.fallback.OperCrmFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

1
epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java

@ -4,7 +4,6 @@ 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.CustomerDTO;
import com.epmet.feign.OperCrmFeignClient;
import org.springframework.stereotype.Component;
/**

10
epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java

@ -25,6 +25,7 @@ import com.epmet.dto.StaffRoleDTO;
import com.epmet.dto.form.CommonUserFormDTO;
import com.epmet.dto.form.CustomerStaffRoleListFormDTO;
import com.epmet.dto.form.RolesUsersListFormDTO;
import com.epmet.dto.result.CustomerStaffRoleResultDTO;
import com.epmet.dto.result.CustomerStaffRoleListResultDTO;
import com.epmet.dto.result.GovStaffRoleResultDTO;
import com.epmet.dto.result.StaffRolesResultDTO;
@ -138,4 +139,13 @@ public interface StaffRoleService extends BaseService<StaffRoleEntity> {
* @Author sun
**/
List<CustomerStaffRoleListResultDTO> getCustomerStaffRoleList(CustomerStaffRoleListFormDTO formDTO);
/**
* 根据staffId查询人员拥有的所有角色信息
* @author zhaoqifeng
* @date 2020/6/2 15:54
* @param staffId
* @return java.util.List<com.epmet.dto.result.CustomerStaffRoleResultDTO>
*/
List<CustomerStaffRoleResultDTO> getStaffRoles(String staffId);
}

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

@ -36,7 +36,6 @@ import com.epmet.entity.RegisterRelationEntity;
import com.epmet.entity.UserCustomerEntity;
import com.epmet.entity.UserWechatEntity;
import com.epmet.feign.GovOrgFeignClient;
import com.epmet.feign.OperCrmFeignClient;
import com.epmet.redis.RegisterRelationRedis;
import com.epmet.service.GridVisitedService;
import com.epmet.service.RegisterRelationService;

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

@ -29,7 +29,6 @@ import com.epmet.dto.StaffAgencyVisitedDTO;
import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO;
import com.epmet.dto.result.StaffLatestAgencyResultDTO;
import com.epmet.entity.StaffAgencyVisitedEntity;
import com.epmet.feign.OperCrmFeignClient;
import com.epmet.service.CustomerStaffService;
import com.epmet.service.StaffAgencyVisitedService;
import org.apache.commons.lang3.StringUtils;

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

@ -33,6 +33,7 @@ import com.epmet.dto.StaffRoleDTO;
import com.epmet.dto.form.CommonUserFormDTO;
import com.epmet.dto.form.CustomerStaffRoleListFormDTO;
import com.epmet.dto.form.RolesUsersListFormDTO;
import com.epmet.dto.result.CustomerStaffRoleResultDTO;
import com.epmet.dto.result.CustomerStaffRoleListResultDTO;
import com.epmet.dto.result.GovStaffRoleResultDTO;
import com.epmet.dto.result.GovStaffRoleTemplateDTO;
@ -174,4 +175,9 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
return baseDao.selectCustomerStaffRoleList(formDTO);
}
@Override
public List<CustomerStaffRoleResultDTO> getStaffRoles(String staffId) {
return baseDao.selectStaffRoles(staffId);
}
}

14
epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

@ -142,4 +142,18 @@
AND staff.user_id = #{staffId}
</if>
</select>
<select id="selectStaffRoles" resultType="com.epmet.dto.result.CustomerStaffRoleResultDTO">
SELECT
sr.staff_id AS "staffId",
gsr.role_key AS "roleKey",
gsr.role_name AS "roleName"
FROM
staff_role sr
INNER JOIN gov_staff_role gsr ON sr.role_id = gsr.id
WHERE
sr.del_flag = '0'
AND gsr.del_flag = '0'
AND sr.staff_id = #{staffId}
</select>
</mapper>
Loading…
Cancel
Save