springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoHandleDTO.java
New file @@ -0,0 +1,44 @@ package com.panzhihua.common.model.dtos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.Max; import java.util.List; /** * 随手拍处理请求参数 * * @author cedoo email:cedoo(a)qq.com * @version 1.0 * @since 1.0 * @date 2021-05-26 * */ @Data @ApiModel("随手拍处理请求参数") public class ComActEasyPhotoHandleDTO { @ApiModelProperty(value = "随手拍id") private Long id; @Length(max=65535) @ApiModelProperty(value = "处理结果", hidden = false, example = "") private String handleResult; @Length(max=65535) @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "") private String handlePhotoList; @Max(127) @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1") private Integer isPublicity; @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1") private Long handlerId; @ApiModelProperty(value = "随手拍类型id集合") private List<Long> easyTypeIds; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -483,4 +483,28 @@ */ @PostMapping("/easy/type/list") R easyTypeListByApp(); /** * 随手拍处理 * @param photoHandleDTO 请求参数 * @return 处理结果 */ @PostMapping("/easy/handle") R easyHandle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO); /** * 随手拍公示状态切换 * @param photoHandleDTO 请求参数 * @return 切换结果 */ @PostMapping("/easy/publicity") R easyPublicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO); /** * 随手拍上报社区 * @param photoHandleDTO 请求参数 * @return 上报结果 */ @PostMapping("/easy/report") R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EasyPhotoApi.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_grid.api; import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoHandleDTO; import com.panzhihua.common.model.dtos.grid.PageEasyAppDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_grid.service.ComActEasyPhotoService; @@ -54,4 +55,34 @@ public R typeList(){ return comActEasyPhotoTypeService.typeList(); } /** * 随手拍处理 * @param photoHandleDTO 请求参数 * @return 处理结果 */ @PostMapping("handle") public R easyHandle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){ return comActEasyPhotoService.easyHandle(photoHandleDTO); } /** * 随手拍公示状态切换 * @param photoHandleDTO 请求参数 * @return 切换结果 */ @PostMapping("publicity") public R easyPublicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){ return comActEasyPhotoService.easyPublicity(photoHandleDTO); } /** * 随手拍上报社区 * @param photoHandleDTO 请求参数 * @return 上报结果 */ @PostMapping("report") public R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){ return comActEasyPhotoService.easyReport(photoHandleDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java
@@ -95,10 +95,6 @@ */ private String rejectReason; /** * 封面图片 列: cover */ private String cover; /** * 是否删除 0 否 1 是 列: del_tag */ private Integer delTag; @@ -110,9 +106,22 @@ * 是否公示(0.否 1.是) 列: is_publicity */ private Integer isPublicity; /** * 处理状态（1.待处理 2.已处理） */ private Integer handleStatus; /** * 处理状态（1.待处理 2.已处理） */ public interface handleStatus{ int no = 1; int yes = 2; } /** * 是否上报社区处理(0.否 1.是) */ public interface isReport{ int no = 0; int yes = 1; } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoService.java
@@ -60,5 +60,26 @@ */ R detail(Long easyId); /** * 随手拍处理 * @param photoHandleDTO 请求参数 * @return 处理结果 */ R easyHandle(ComActEasyPhotoHandleDTO photoHandleDTO); /** * 随手拍公示状态切换 * @param photoHandleDTO 请求参数 * @return 切换结果 */ R easyPublicity(ComActEasyPhotoHandleDTO photoHandleDTO); /** * 随手拍上报社区 * @param photoHandleDTO 请求参数 * @return 上报结果 */ R easyReport(ComActEasyPhotoHandleDTO photoHandleDTO); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java
@@ -11,11 +11,13 @@ import com.panzhihua.service_grid.dao.*; import com.panzhihua.service_grid.model.dos.*; import com.panzhihua.service_grid.service.ComActEasyPhotoService; import com.panzhihua.service_grid.service.ComActEasyPhotoTypeRelationService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.beans.BeanUtils; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -32,6 +34,8 @@ private ComActEasyPhotoMapper comActEasyPhotoMapper; @Resource private ComActEasyPhotoTypeRelationMapper comActEasyPhotoTypeRelationMapper; @Resource private ComActEasyPhotoTypeRelationService comActEasyPhotoTypeRelationService; /** * 新增社区活动 》随手拍 * @param comActEasyPhotoAddDTO @@ -132,4 +136,82 @@ return R.ok(easyPhotoVO); } /** * 随手拍处理 * @param photoHandleDTO 请求参数 * @return 处理结果 */ @Override public R easyHandle(ComActEasyPhotoHandleDTO photoHandleDTO){ ComActEasyPhotoDO easyPhotoDO = this.baseMapper.selectById(photoHandleDTO.getId()); if(easyPhotoDO == null){ return R.fail("随手拍不存在"); } if(easyPhotoDO.getHandleStatus().equals(ComActEasyPhotoDO.handleStatus.yes)){ return R.fail("该随手拍已处理"); } BeanUtils.copyProperties(photoHandleDTO,easyPhotoDO); easyPhotoDO.setHandleStatus(ComActEasyPhotoDO.handleStatus.yes); //关联随手拍类型 if(!photoHandleDTO.getEasyTypeIds().isEmpty()){ List<ComActEasyPhotoTypeRelationDO> typeRelationDOList = new ArrayList<>(); photoHandleDTO.getEasyTypeIds().forEach(typeId -> { ComActEasyPhotoTypeRelationDO typeRelationDO = new ComActEasyPhotoTypeRelationDO(); typeRelationDO.setEasyId(easyPhotoDO.getId()); typeRelationDO.setEasyTypeId(typeId); typeRelationDO.setCreateAt(new Date()); typeRelationDOList.add(typeRelationDO); }); comActEasyPhotoTypeRelationService.saveBatch(typeRelationDOList); } if(this.baseMapper.updateById(easyPhotoDO) > 0){ return R.ok(); }else{ return R.fail(); } } /** * 随手拍公示状态切换 * @param photoHandleDTO 请求参数 * @return 切换结果 */ @Override public R easyPublicity(ComActEasyPhotoHandleDTO photoHandleDTO){ ComActEasyPhotoDO easyPhotoDO = this.baseMapper.selectById(photoHandleDTO.getId()); if(easyPhotoDO == null){ return R.fail("随手拍不存在"); } easyPhotoDO.setIsPublicity(photoHandleDTO.getIsPublicity()); if(this.baseMapper.updateById(easyPhotoDO) > 0){ return R.ok(); }else{ return R.fail(); } } /** * 随手拍上报社区 * @param photoHandleDTO 请求参数 * @return 上报结果 */ @Override public R easyReport(ComActEasyPhotoHandleDTO photoHandleDTO){ ComActEasyPhotoDO easyPhotoDO = this.baseMapper.selectById(photoHandleDTO.getId()); if(easyPhotoDO == null){ return R.fail("随手拍不存在"); } if(easyPhotoDO.getIsReport().equals(ComActEasyPhotoDO.isReport.yes)){ return R.fail("随手拍已上报"); } easyPhotoDO.setIsReport(ComActEasyPhotoDO.isReport.yes); if(this.baseMapper.updateById(easyPhotoDO) > 0){ return R.ok(); }else{ return R.fail(); } } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml
@@ -22,7 +22,6 @@ <result property="isNeedFeedBack" column="is_need_feed_back"/> <result property="feedbackAt" column="feedback_at"/> <result property="rejectReason" column="reject_reason"/> <result property="cover" column="cover"/> <result property="delTag" column="del_tag"/> <result property="isReport" column="is_report"/> <result property="isPublicity" column="is_publicity"/> @@ -31,7 +30,7 @@ <sql id="columns"> <![CDATA[ id,sponsor_id,happen_addr,addr_remark,status,handler_id,create_at,examine_at,detail,photo_path_list,handle_result,handle_photo_list,community_id,is_hide,is_need_feed_back,feedback_at,reject_reason,cover,del_tag,is_report,is_publicity id,sponsor_id,happen_addr,addr_remark,status,handler_id,create_at,examine_at,detail,photo_path_list,handle_result,handle_photo_list,community_id,is_hide,is_need_feed_back,feedback_at,reject_reason,del_tag,is_report,is_publicity ]]> </sql>
