elink-star
/
epmet-cloud-zhengwu-yantai
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

居民端-对议题发表建议

feature/evaluate
yinzuomei 5 years ago
parent
53dbc537b5
commit
56c871faad
11 changed files with 232 additions and 177 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/SaveIssueSuggestionResultDTO.java
  2. 16
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
  3. 12
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
  4. 61
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSuggestionController.java
  5. 73
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSuggestionService.java
  6. 122
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSuggestionServiceImpl.java
  7. 34
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/PublishSuggestionFormDTO.java
  8. 26
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/PublishSuggestionResultDTO.java
  9. 14
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
  10. 9
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
  11. 20
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

22
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/SaveIssueSuggestionResultDTO.java
View File

@ -0,0 +1,22 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* 保存居民端用户对议题的建议或意见 返回议题id, 建议id
*
* @author yinzuomei@elink-cn.com
* @date 2020/11/18 13:14
*/
@Data
public class SaveIssueSuggestionResultDTO implements Serializable {
private static final long serialVersionUID = 8199657776260756910L;
private String issueId;
/**
* issue_suggestion表主键
*/
private String suggestionId;
}

16
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
View File

@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.IssueSuggestionDTO;
import com.epmet.dto.form.UserIssueSuggestionFormDTO;
import com.epmet.dto.result.SaveIssueSuggestionResultDTO;
import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack;
import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;
import com.epmet.resi.group.dto.group.result.GroupClosedListResultDTO;
@ -57,9 +58,18 @@ public interface GovIssueOpenFeignClient {
/**
* @param formDTO
* @author yinzuomei
* @description
* @description 查询用户对于某个议题的想法 返回一条记录
* @Date 2020/11/18 10:17
**/
@PostMapping(value = "/gov/issue/issuesuggestion/queryuserissuesuggestion",consumes = MediaType.APPLICATION_JSON_VALUE)
Result<IssueSuggestionDTO> queryIssueSuggestion(@RequestBody UserIssueSuggestionFormDTO formDTO);
@PostMapping(value = "/gov/issue/issuesuggestion/queryuserissuesuggestion", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<IssueSuggestionDTO> queryIssueSuggestion(@RequestBody UserIssueSuggestionFormDTO formDTO);
/**
* @param issueSuggestionDTO
* @author yinzuomei
* @description 保存居民端用户对议题的建议或意见
* @Date 2020/11/18 13:24
**/
@PostMapping(value = "/gov/issue/issuesuggestion/save", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<SaveIssueSuggestionResultDTO> saveIssueSuggestion(@RequestBody IssueSuggestionDTO issueSuggestionDTO);
}

12
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
View File

@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.IssueSuggestionDTO;
import com.epmet.dto.form.UserIssueSuggestionFormDTO;
import com.epmet.dto.result.SaveIssueSuggestionResultDTO;
import com.epmet.feign.GovIssueOpenFeignClient;
import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;
import com.epmet.resi.group.dto.group.result.GroupClosedListResultDTO;
@ -71,4 +72,15 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
public Result<IssueSuggestionDTO> queryIssueSuggestion(UserIssueSuggestionFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryIssueSuggestion", formDTO);
}
/**
* @param issueSuggestionDTO
* @author yinzuomei
* @description 保存居民端用户对议题的建议或意见
* @Date 2020/11/18 13:24
**/
@Override
public Result<SaveIssueSuggestionResultDTO> saveIssueSuggestion(IssueSuggestionDTO issueSuggestionDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "saveIssueSuggestion", issueSuggestionDTO);
}
}

61
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSuggestionController.java
View File

@ -17,20 +17,17 @@
package com.epmet.controller;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
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.IssueSuggestionDTO;
import com.epmet.dto.form.UserIssueSuggestionFormDTO;
import com.epmet.dto.result.SaveIssueSuggestionResultDTO;
import com.epmet.service.IssueSuggestionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
@ -46,42 +43,6 @@ public class IssueSuggestionController {
@Autowired
private IssueSuggestionService issueSuggestionService;
@GetMapping("page")
public Result<PageData<IssueSuggestionDTO>> page(@RequestParam Map<String, Object> params){
PageData<IssueSuggestionDTO> page = issueSuggestionService.page(params);
return new Result<PageData<IssueSuggestionDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<IssueSuggestionDTO> get(@PathVariable("id") String id){
IssueSuggestionDTO data = issueSuggestionService.get(id);
return new Result<IssueSuggestionDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody IssueSuggestionDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
issueSuggestionService.save(dto);
return new Result();
}
@PutMapping
public Result update(@RequestBody IssueSuggestionDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
issueSuggestionService.update(dto);
return new Result();
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
issueSuggestionService.delete(ids);
return new Result();
}
/**
* @param formDTO
* @author yinzuomei
@ -94,4 +55,16 @@ public class IssueSuggestionController {
IssueSuggestionDTO issueSuggestionDTO=issueSuggestionService.queryUserIssueSuggestion(formDTO);
return new Result<IssueSuggestionDTO>().ok(issueSuggestionDTO);
}
/**
* @param dto
* @author yinzuomei
* @description 保存居民端用户对议题的建议或意见
* @Date 2020/11/18 13:15
**/
@PostMapping("save")
public Result<SaveIssueSuggestionResultDTO> saveIssueSuggestion(@RequestBody IssueSuggestionDTO dto) {
SaveIssueSuggestionResultDTO resultDTO = issueSuggestionService.saveIssueSuggestion(dto);
return new Result<SaveIssueSuggestionResultDTO>().ok(resultDTO);
}
}

73
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueSuggestionService.java
View File

@ -18,14 +18,11 @@
package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.IssueSuggestionDTO;
import com.epmet.dto.form.UserIssueSuggestionFormDTO;
import com.epmet.dto.result.SaveIssueSuggestionResultDTO;
import com.epmet.entity.IssueSuggestionEntity;
import java.util.List;
import java.util.Map;
/**
* 居民端用户对议题建议或意见表
*
@ -34,66 +31,6 @@ import java.util.Map;
*/
public interface IssueSuggestionService extends BaseService<IssueSuggestionEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<IssueSuggestionDTO>
* @author generator
* @date 2020-11-18
*/
PageData<IssueSuggestionDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<IssueSuggestionDTO>
* @author generator
* @date 2020-11-18
*/
List<IssueSuggestionDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return IssueSuggestionDTO
* @author generator
* @date 2020-11-18
*/
IssueSuggestionDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2020-11-18
*/
void save(IssueSuggestionDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2020-11-18
*/
void update(IssueSuggestionDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2020-11-18
*/
void delete(String[] ids);
/**
* @param formDTO
* @author yinzuomei
@ -101,4 +38,12 @@ public interface IssueSuggestionService extends BaseService<IssueSuggestionEntit
* @Date 2020/11/18 10:12
**/
IssueSuggestionDTO queryUserIssueSuggestion(UserIssueSuggestionFormDTO formDTO);
/**
* @param dto
* @author yinzuomei
* @description 保存居民端用户对议题的建议或意见
* @Date 2020/11/18 13:16
**/
SaveIssueSuggestionResultDTO saveIssueSuggestion(IssueSuggestionDTO dto);
}

122
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSuggestionServiceImpl.java
View File

@ -17,24 +17,29 @@
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.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.scan.param.TextScanParamDTO;
import com.epmet.commons.tools.scan.param.TextTaskDTO;
import com.epmet.commons.tools.scan.result.SyncScanResult;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.utils.ScanContentUtils;
import com.epmet.dao.IssueSuggestionDao;
import com.epmet.dto.IssueDTO;
import com.epmet.dto.IssueSuggestionDTO;
import com.epmet.dto.form.UserIssueSuggestionFormDTO;
import com.epmet.dto.result.SaveIssueSuggestionResultDTO;
import com.epmet.entity.IssueSuggestionEntity;
import com.epmet.service.IssueService;
import com.epmet.service.IssueSuggestionService;
import org.apache.commons.lang3.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
* 居民端用户对议题建议或意见表
@ -42,61 +47,15 @@ import java.util.Map;
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-11-18
*/
@Slf4j
@Service
public class IssueSuggestionServiceImpl extends BaseServiceImpl<IssueSuggestionDao, IssueSuggestionEntity> implements IssueSuggestionService {
@Override
public PageData<IssueSuggestionDTO> page(Map<String, Object> params) {
IPage<IssueSuggestionEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, IssueSuggestionDTO.class);
}
@Override
public List<IssueSuggestionDTO> list(Map<String, Object> params) {
List<IssueSuggestionEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, IssueSuggestionDTO.class);
}
private QueryWrapper<IssueSuggestionEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<IssueSuggestionEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public IssueSuggestionDTO get(String id) {
IssueSuggestionEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, IssueSuggestionDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(IssueSuggestionDTO dto) {
IssueSuggestionEntity entity = ConvertUtils.sourceToTarget(dto, IssueSuggestionEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(IssueSuggestionDTO dto) {
IssueSuggestionEntity entity = ConvertUtils.sourceToTarget(dto, IssueSuggestionEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除（@TableLogic 注解）
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Autowired
private IssueService issueService;
@Value("${openapi.scan.server.url}")
private String scanApiUrl;
@Value("${openapi.scan.method.textSyncScan}")
private String textSyncScanMethod;
/**
* @param formDTO
* @author yinzuomei
@ -108,4 +67,43 @@ public class IssueSuggestionServiceImpl extends BaseServiceImpl<IssueSuggestionD
return baseDao.selectUserIssueSuggestion(formDTO);
}
/**
* @param dto
* @author yinzuomei
* @description 保存居民端用户对议题的建议或意见
* @Date 2020/11/18 13:16
**/
@Override
public SaveIssueSuggestionResultDTO saveIssueSuggestion(IssueSuggestionDTO dto) {
//校验建议内容
TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
TextTaskDTO taskDTO = new TextTaskDTO();
taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
taskDTO.setContent(dto.getSuggestion());
textScanParamDTO.getTasks().add(taskDTO);
Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
if (!textSyncScanResult.success()) {
log.error("居民端用户对议题发表建议,内容审核服务返回失败");
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
} else {
if (!textSyncScanResult.getData().isAllPass()) {
throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
}
}
//赋值网格id
IssueDTO issueDTO = issueService.get(dto.getIssueId());
if (null == issueDTO) {
throw new RenException(String.format("根据议题id%s,没有找到议题信息", dto.getIssueId()));
}
dto.setGridId(issueDTO.getGridId());
dto.setCustomerId(issueDTO.getCustomerId());
//插入
IssueSuggestionEntity entity = ConvertUtils.sourceToTarget(dto, IssueSuggestionEntity.class);
insert(entity);
SaveIssueSuggestionResultDTO resultDTO = new SaveIssueSuggestionResultDTO();
resultDTO.setIssueId(dto.getIssueId());
resultDTO.setSuggestionId(entity.getId());
return resultDTO;
}
}

34
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/PublishSuggestionFormDTO.java
View File

@ -0,0 +1,34 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 居民端-议题发表建议 入参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2020/11/18 12:35
*/
@Data
public class PublishSuggestionFormDTO implements Serializable {
private static final long serialVersionUID = 2545427013095892610L;
public interface AddUserInternalGroup {
}
public interface AddUserShowGroup extends CustomerClientShowGroup {
}
@NotBlank(message = "议题id不能为空", groups = {AddUserInternalGroup.class})
private String issueId;
@NotBlank(message = "是否匿名不能为空", groups = {AddUserInternalGroup.class})
private Boolean publicFlag;
@Length(max = 500, message = "内容不能超过500字", groups = {AddUserShowGroup.class})
private String suggestion;
}

26
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/PublishSuggestionResultDTO.java
View File

@ -0,0 +1,26 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* 居民端-议题发表建议 返参DTO
*
* @author yinzuomei@elink-cn.com
* @date 2020/11/18 13:08
*/
@Data
public class PublishSuggestionResultDTO implements Serializable {
private static final long serialVersionUID = -2752255960631605369L;
private String issueId;
/**
* issue_suggestion表主键
*/
private String suggestionId;
public PublishSuggestionResultDTO(String issueId, String suggestionId) {
this.issueId = issueId;
this.suggestionId = suggestionId;
}
}

14
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
View File

@ -1,8 +1,6 @@
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.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -222,5 +220,17 @@ public class IssueController {
return new Result<List<ProcessListResultDTO>>().ok(issueService.processList(issueId));
}
/**
* @param formDTO
* @author yinzuomei
* @description 居民端-议题发表建议
* @Date 2020/11/18 13:09
**/
@PostMapping("publishsuggestion")
public Result<PublishSuggestionResultDTO> publisSuggestion(@RequestBody PublishSuggestionFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO,PublishSuggestionFormDTO.AddUserShowGroup.class,PublishSuggestionFormDTO.AddUserInternalGroup.class);
PublishSuggestionResultDTO resultDTO=issueService.publisSuggestion(formDTO);
return new Result<PublishSuggestionResultDTO>().ok(resultDTO);
}
}

9
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java
View File

@ -1,11 +1,9 @@
package com.epmet.service;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@ -112,4 +110,11 @@ public interface IssueService {
*/
List<ShiftProjectListResultDTO> getShiftProjectList(ShiftProjectListFromDTO formDTO);
/**
* @param formDTO
* @author yinzuomei
* @description 居民端-议题发表建议
* @Date 2020/11/18 13:11
**/
PublishSuggestionResultDTO publisSuggestion(PublishSuggestionFormDTO formDTO);
}

20
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
View File

@ -300,6 +300,26 @@ public class IssueServiceImpl implements IssueService {
return resultList;
}
/**
* @param formDTO
* @author yinzuomei
* @description 居民端-议题发表建议
* @Date 2020/11/18 13:11
**/
@Override
public PublishSuggestionResultDTO publisSuggestion(PublishSuggestionFormDTO formDTO) {
IssueSuggestionDTO issueSuggestionDTO = new IssueSuggestionDTO();
issueSuggestionDTO.setSuggestion(formDTO.getSuggestion());
issueSuggestionDTO.setIssueId(formDTO.getIssueId());
issueSuggestionDTO.setPublicFlag(formDTO.getPublicFlag() == true ? NumConstant.ONE : NumConstant.ZERO);
issueSuggestionDTO.setCreatedBy(loginUserUtil.getLoginUserId());
Result<SaveIssueSuggestionResultDTO> result = govIssueOpenFeignClient.saveIssueSuggestion(issueSuggestionDTO);
if (result.success() && null != result.getData()) {
return new PublishSuggestionResultDTO(result.getData().getIssueId(), result.getData().getSuggestionId());
}
throw new RenException(result.getCode());
}
/**
* @Description 议题处理进展
* @param issueId

Write Preview
Loading…
Cancel
Save