Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

CeDo

2021-05-28 bd0ac05436fa6195aac2bcc41381a9c154d2990b

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

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml

 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/model/dtos/grid/PageEasyAppDTO.java

New file
@@ -0,0 +1,55 @@
package com.panzhihua.common.model.dtos.grid;

import com.google.common.base.CaseFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Pattern;

/**
 * 随手拍列表请求参数
 *
 * @author lyq
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("随手拍列表请求参数")
public class PageEasyAppDTO {

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt",hidden = true)
    private String sortAttr="createAt";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String sortType="desc";

    @ApiModelProperty(value = "状态 1.待处理 2.已上报 3.已公示  4.未公示")
    private Integer status;

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)",hidden = true)
    private Integer isReport;

    @ApiModelProperty(value = "是否公示(0.否 1.是)",hidden = true)
    private Integer isPublicity;

    @ApiModelProperty(value = "处理状态（1.待处理 2.已处理）",hidden = true)
    private Integer handleStatus;

    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java

@@ -130,4 +130,9 @@
    @ApiModelProperty(value = "地址备注")
    private String addrRemark;

    @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
    private Integer isReport;

    @ApiModelProperty(value = "是否公示(0.否 1.是)")
    private Integer isPublicity;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java

@@ -30,19 +30,18 @@
    @ApiModelProperty(value = "地址备注")
    private String addrRemark;

    @ApiModelProperty(value = "状态 1待处理 2已处理")
    private Integer status;
//    @ApiModelProperty(value = "状态 1待处理 2已处理")
//    private Integer status;

    @ApiModelProperty(value = "处理人id")
    private Long handlerId;

    @ApiModelProperty(value = "处理人名字")
    private String handlerName;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "审核时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date examineAt;

    @ApiModelProperty(value = "详情")
    private String detail;
@@ -62,18 +61,12 @@
    @ApiModelProperty(value = "是否匿名发布 0 否 1 是")
    private Integer isHide;

    @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要")
    private Integer isNeedFeedBack;

    @ApiModelProperty(value = "反馈时间")
    @ApiModelProperty(value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date feedbackAt;

    @ApiModelProperty(value = "驳回原因")
    private String rejectReason;

    @ApiModelProperty(value = "封面图片")
    private String cover;
//    @ApiModelProperty(value = "封面图片")
//    private String cover;

    @ApiModelProperty(value = "是否删除 0 否 1 是")
    private Integer delTag;
@@ -84,5 +77,13 @@
    @ApiModelProperty(value = "是否公示(0.否 1.是)")
    private Integer isPublicity;

    @ApiModelProperty(value = "发布人名称")
    private String nickName;

    @ApiModelProperty(value = "发布人头像")
    private String imageUrl;

    @ApiModelProperty(value = "随手拍类型列表")
    private List<String> easyPhotoList;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -564,4 +564,51 @@
     */
    @PostMapping("/event/draftRelease")
    R draftRelease(@RequestBody CommonEventPublicDTO commonEventPublicDTO);

    /**
     * 查询随手拍列表
     * @param easyAppDTO    请求参数
     * @return  随手拍列表
     */
    @PostMapping("/easy/list")
    R easyList(@RequestBody PageEasyAppDTO easyAppDTO);

    /**
     * 查询随手拍详情
     * @param easyId    随手拍id
     * @return  随手拍详情
     */
    @PostMapping("/easy/detail")
    R easyDetailByApp(@RequestParam("easyId") Long easyId);

    /**
     * 查询随手拍类型列表
     * @return  类型列表
     */
    @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/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java

@@ -303,7 +303,6 @@
        return communityService.listBuildType();
    }


    @ApiOperation(value = "分页查询其他建筑",response = ComMngStructOtherBuildVO.class)
    @PostMapping("pageotherbuild")
    public R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
@@ -447,7 +446,6 @@
        return communityService.deleteVolunteerExamine(comMngVolunteerMngVO);
    }


    @ApiOperation(value = "导入居民")
    @PostMapping("importuser")
    public R importUser(MultipartFile multipartFile)throws IOException {
@@ -464,9 +462,6 @@
        EasyExcel.read(multipartFile.getInputStream(), EexcelUserDTO.class, new UploadEexcelUserDTOListener(userService,name)) .extraRead(CellExtraTypeEnum.MERGE).headRowNumber(1).sheet().doRead();
        return R.ok();
    }




    @ApiOperation(value = "社区人员详情",response = CommunityUserInfoVO.class)
    @GetMapping("detailuser")
@@ -579,7 +574,6 @@
            return r;
        }
    }


    @ApiOperation(value = "选择导入的小区",response =ComMngStructAreaVO.class )
    @GetMapping("listareas")

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EasyPhotoApi.java

New file
@@ -0,0 +1,73 @@
package com.panzhihua.grid_app.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoHandleDTO;
import com.panzhihua.common.model.dtos.grid.PageEasyAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.service.grid.GridService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @author lyq
 */
@RestController
@RequestMapping("/easy")
@Api(tags = {"网格综治APP随手拍模块"})
public class EasyPhotoApi extends BaseController {

    @Resource
    private GridService gridService;

    @ApiOperation(value = "随手拍列表-lyq",response = ComActEasyPhotoVO.class)
    @PostMapping("list")
    public R list(@RequestBody PageEasyAppDTO easyAppDTO){
        LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
        if(userInfoVO == null){
            return R.fail("请先登录");
        }
        easyAppDTO.setCommunityId(userInfoVO.getCommunityId());
        return gridService.easyList(easyAppDTO);
    }

    @ApiOperation(value = "随手拍详情-lyq",response = ComActEasyPhotoVO.class)
    @PostMapping("detail")
    public R detail(@RequestParam("easyId") Long easyId){
        return gridService.easyDetailByApp(easyId);
    }

    @ApiOperation(value = "随手拍类型列表-lyq",response = ComActEasyPhotoVO.class)
    @PostMapping("type/list")
    public R typeList(){
        return gridService.easyTypeListByApp();
    }

    @ApiOperation(value = "随手拍处理-lyq")
    @PostMapping("handle")
    public R handle(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
        LoginUserInfoVO userInfoVO = this.getLoginUserInfo();
        if(userInfoVO == null){
            return R.fail("请先登录");
        }
        photoHandleDTO.setHandlerId(userInfoVO.getUserId());
        return gridService.easyHandle(photoHandleDTO);
    }

    @ApiOperation(value = "随手拍切换公示状态-lyq")
    @PostMapping("publicity")
    public R publicity(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
        return gridService.easyPublicity(photoHandleDTO);
    }

    @ApiOperation(value = "随手拍上报社区-lyq")
    @PostMapping("report")
    public R report(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO){
        return gridService.easyReport(photoHandleDTO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -36,6 +36,8 @@
            "p.`photo_path_list`,\n" +
            "p.create_at,\n" +
            "p.feedback_at,\n" +
            "p.is_report,\n" +
            "p.is_publicity,\n" +
            "p.examine_at \n" +
            "FROM\n" +
            "com_act_easy_photo p\n" +
@@ -91,6 +93,8 @@
            "p.`photo_path_list`,\n" +
            "p.create_at,\n" +
            "p.feedback_at,\n" +
            "p.is_report,\n" +
            "p.is_publicity,\n" +
            "p.examine_at \n" +
            "FROM\n" +
            "com_act_easy_photo p\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -35,7 +35,7 @@
    private String happenAddr;

    /**
     * 状态 1待审核   2进行中 3已驳回 4已完成
     * 状态 1待处理 2已处理
     */
    private Integer status;

@@ -105,4 +105,14 @@
     * 是否删除 0 否 1 是
     */
    private Integer delTag;

    /**
     * 是否上报社区处理(0.否 1.是)
     */
    private Integer isReport;

    /**
     * 是否公示(0.否 1.是)
     */
    private Integer isPublicity;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EasyPhotoApi.java

New file
@@ -0,0 +1,88 @@
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;
import com.panzhihua.service_grid.service.ComActEasyPhotoTypeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 *
 * @author lyq
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Slf4j
@RestController
@RequestMapping("/easy")
public class EasyPhotoApi {

    @Resource
    private ComActEasyPhotoService comActEasyPhotoService;
    @Resource
    private ComActEasyPhotoTypeService comActEasyPhotoTypeService;

    /**
     * 分页查询随手拍
     * @param easyAppDTO    请求参数
     * @return 随手拍列表
     */
    @PostMapping("list")
    public R list(@RequestBody PageEasyAppDTO easyAppDTO){
        return comActEasyPhotoService.query(easyAppDTO);
    }

    /**
     * 根据随手拍id查询随手拍详情
     * @param easyId    随手拍id
     * @return  随手拍详情
     */
    @PostMapping("detail")
    public R detail(@RequestParam("easyId") Long easyId){
        return comActEasyPhotoService.detail(easyId);
    }

    /**
     * 查询随手拍类型列表
     * @return  类型列表
     */
    @PostMapping("type/list")
    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/dao/ComActEasyPhotoMapper.java

@@ -1,11 +1,9 @@
package com.panzhihua.service_grid.dao;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoDTO;
import com.panzhihua.common.model.dtos.grid.PageEasyAppDTO;
import com.panzhihua.service_grid.model.dos.ComActEasyPhotoDO;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
import org.apache.ibatis.annotations.Mapper;
@@ -16,17 +14,24 @@
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
 * @since 1.0
 */
@Mapper
public interface ComActEasyPhotoMapper extends BaseMapper<ComActEasyPhotoDO> {

        /**
         * 分页查询
         * @param pageComActEasyPhotoDTO
         * @return
         */
        IPage<ComActEasyPhotoVO> findByPage(Page page, @Param("pageComActEasyPhotoDTO")PageComActEasyPhotoDTO pageComActEasyPhotoDTO);
    /**
     * 分页查询
     * @param easyAppDTO    请求参数
     * @return  随手拍列表
     */
    IPage<ComActEasyPhotoVO> findByPage(Page page, @Param("easyAppDTO") PageEasyAppDTO easyAppDTO);

    /**
     * 根据随手拍id查询随手拍详情
     * @param easyId    随手拍id
     * @return  随手拍详情
     */
    ComActEasyPhotoVO findByEaseId(@Param("easyId") Long easyId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoTypeRelationMapper.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_grid.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeRelationDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-27
 * */
@Mapper
public interface ComActEasyPhotoTypeRelationMapper extends BaseMapper<ComActEasyPhotoTypeRelationDO> {

    /**
     * 根据随手拍id查询随手拍类型
     * @param easyId    随手拍id
     * @return  随手拍类型名称列表
     */
    List<String> getEasyPhotoTypeRelationByEasyId(@Param("easyId") Long easyId);


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java

@@ -42,7 +42,7 @@
     */
    private String addrRemark;
    /**
     * 状态 1待处理 2已处理   列: status
     * 状态 1待审核   2进行中 3已驳回 4已完成  列: status
     */
    private Integer status;
    /**
@@ -95,10 +95,6 @@
     */
    private String rejectReason;
    /**
     * 封面图片   列: cover
     */
    private String cover;
    /**
     * 是否删除 0 否 1 是   列: del_tag
     */
    private Integer delTag;
@@ -110,4 +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/model/dos/ComActEasyPhotoTypeRelationDO.java

New file
@@ -0,0 +1,42 @@
package com.panzhihua.service_grid.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;



/**
 * 随手拍类型关联实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-27
 * */
@Data
@TableName("com_act_easy_photo_type_relation")
public class ComActEasyPhotoTypeRelationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id   列: id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 随手拍id   列: easy_id
     */
    private Long easyId;
    /**
     * 随手拍类型id   列: easy_type_id
     */
    private Long easyTypeId;
    /**
     * 创建时间   列: create_at
     */
    private Date createAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoService.java

@@ -2,10 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoAddDTO;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoDeleteDTO;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoEditDTO;
import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoDetailsVO;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
@@ -36,11 +33,11 @@
    R edit(ComActEasyPhotoEditDTO comActEasyPhotoEditDTO);

    /**
     * 分页查找社区活动 》随手拍
     * @param pageComActEasyPhotoDTO
     * @return 维护结果
     * 分页查询随手拍
     * @param easyAppDTO    请求参数
     * @return 随手拍列表
     */
    R<IPage<ComActEasyPhotoVO>> query(PageComActEasyPhotoDTO pageComActEasyPhotoDTO);
    R<IPage<ComActEasyPhotoVO>> query(PageEasyAppDTO easyAppDTO);

    /**
     * 删除社区活动 》随手拍
@@ -56,5 +53,33 @@
     */
    R<ComActEasyPhotoDetailsVO> comActEasyPhotoDetails(Long id);

    /**
     * 根据随手拍id查询随手拍详情
     * @param easyId    随手拍id
     * @return  随手拍详情
     */
    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/ComActEasyPhotoTypeRelationService.java

New file
@@ -0,0 +1,17 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeRelationDO;

/**
 * 随手拍类型关联 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-27
 * */
public interface ComActEasyPhotoTypeRelationService extends IService<ComActEasyPhotoTypeRelationDO> {


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoTypeService.java

@@ -56,5 +56,11 @@
     */
    R<ComActEasyPhotoTypeDetailsVO> comActEasyPhotoTypeDetails(Long id);

    /**
     * 查询随手拍类型列表
     * @return  类型列表
     */
    R typeList();


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java

@@ -1,24 +1,25 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoAddDTO;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoDeleteDTO;
import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoEditDTO;
import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoDetailsVO;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
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;

/**
 * @auther lyq
@@ -31,6 +32,10 @@

    @Resource
    private ComActEasyPhotoMapper comActEasyPhotoMapper;
    @Resource
    private ComActEasyPhotoTypeRelationMapper comActEasyPhotoTypeRelationMapper;
    @Resource
    private ComActEasyPhotoTypeRelationService comActEasyPhotoTypeRelationService;
    /**
     * 新增社区活动 》随手拍
     * @param comActEasyPhotoAddDTO
@@ -63,18 +68,30 @@

    /**
     * 分页查找社区活动 》随手拍
     * @param pageComActEasyPhotoDTO
     * @param easyAppDTO
     * @return 维护结果
     */
    public R<IPage<ComActEasyPhotoVO>> query(PageComActEasyPhotoDTO pageComActEasyPhotoDTO){
        Page page = new Page(1,10);
        if(pageComActEasyPhotoDTO.getPageNum()!=null) {
            page.setCurrent(pageComActEasyPhotoDTO.getPageNum());
    public R<IPage<ComActEasyPhotoVO>> query(PageEasyAppDTO easyAppDTO){
        Page page = new Page(easyAppDTO.getPageNum(),easyAppDTO.getPageSize());
        if(easyAppDTO.getStatus() != null){
            switch (easyAppDTO.getStatus()){
                case 1:
                    easyAppDTO.setHandleStatus(1);
                    break;
                case 2:
                    easyAppDTO.setIsReport(1);
                    break;
                case 3:
                    easyAppDTO.setIsPublicity(1);
                    break;
                case 4:
                    easyAppDTO.setIsPublicity(0);
                    break;
                default:
                    break;
            }
        }
        if(pageComActEasyPhotoDTO.getPageSize()!=null) {
            page.setSize(pageComActEasyPhotoDTO.getPageSize());
        }
        return R.ok(comActEasyPhotoMapper.findByPage(page, pageComActEasyPhotoDTO));
        return R.ok(comActEasyPhotoMapper.findByPage(page, easyAppDTO));
    }

    /**
@@ -101,4 +118,100 @@
        return R.fail();
    }

    /**
     * 根据随手拍id查询随手拍详情
     * @param easyId    随手拍id
     * @return  随手拍详情
     */
    @Override
    public R detail(Long easyId){
        ComActEasyPhotoVO easyPhotoVO = this.baseMapper.findByEaseId(easyId);
        if(easyPhotoVO != null){
            //查询随手拍类型
            List<String> typeRelationList = comActEasyPhotoTypeRelationMapper.getEasyPhotoTypeRelationByEasyId(easyId);
            if(!typeRelationList.isEmpty()){
                easyPhotoVO.setEasyPhotoList(typeRelationList);
            }
        }
        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/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoTypeRelationServiceImpl.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.ComActEasyPhotoTypeRelationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 */
@Slf4j
@Service
public class ComActEasyPhotoTypeRelationServiceImpl extends ServiceImpl<ComActEasyPhotoTypeRelationMapper, ComActEasyPhotoTypeRelationDO> implements ComActEasyPhotoTypeRelationService {

    @Resource
    private ComActEasyPhotoTypeRelationMapper comActEasyPhotoTypeRelationMapper;


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoTypeServiceImpl.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_grid.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -101,4 +102,13 @@
        return R.fail();
    }

    /**
     * 查询随手拍类型列表
     * @return  类型列表
     */
    @Override
    public R typeList(){
        return R.ok(this.baseMapper.selectList(null));
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml

@@ -22,100 +22,81 @@
        <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"/>
        <result property="handleStatus" column="handle_status"/>
    </resultMap>

    <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>


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoDTO">
        SELECT <include refid="columns" />
        FROM com_act_easy_photo
        parameterType="com.panzhihua.common.model.dtos.grid.PageEasyAppDTO">
        SELECT
        caep.id,
        su.nick_name,
        su.image_url,
        caep.sponsor_id,
        caep.detail,
        caep.create_at,
        caep.`status`,
        caep.is_publicity,
        caep.photo_path_list,
        caep.happen_addr,
        caep.is_report
        FROM
        com_act_easy_photo AS caep
        LEFT JOIN sys_user AS su ON su.user_id = caep.sponsor_id
        <where>
           <if test="pageComActEasyPhotoDTO.id!=null">
                AND id = #{pageComActEasyPhotoDTO.id}
            AND caep.delTag = 0
            <if test="easyAppDTO.communityId!=null">
                AND caep.community_id = #{easyAppDTO.communityId}
            </if>
           <if test="pageComActEasyPhotoDTO.sponsorId!=null">
                AND sponsor_id = #{pageComActEasyPhotoDTO.sponsorId}
           <if test="easyAppDTO.isReport!=null">
                AND caep.is_report = #{easyAppDTO.isReport}
            </if>
           <if test="pageComActEasyPhotoDTO.happenAddr!=null">
                AND happen_addr = #{pageComActEasyPhotoDTO.happenAddr}
           <if test="easyAppDTO.isPublicity!=null">
                AND caep.is_publicity = #{easyAppDTO.isPublicity}
            </if>
           <if test="pageComActEasyPhotoDTO.addrRemark!=null">
                AND addr_remark = #{pageComActEasyPhotoDTO.addrRemark}
            </if>
           <if test="pageComActEasyPhotoDTO.status!=null">
                AND status = #{pageComActEasyPhotoDTO.status}
            </if>
           <if test="pageComActEasyPhotoDTO.handlerId!=null">
                AND handler_id = #{pageComActEasyPhotoDTO.handlerId}
            </if>
           <if test="pageComActEasyPhotoDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageComActEasyPhotoDTO.createAtBegin}
           </if>
           <if test="pageComActEasyPhotoDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageComActEasyPhotoDTO.createAtEnd}
           </if>
           <if test="pageComActEasyPhotoDTO.examineAtBegin!=null">
                AND examine_at &gt;= #{pageComActEasyPhotoDTO.examineAtBegin}
           </if>
           <if test="pageComActEasyPhotoDTO.examineAtEnd!=null">
                AND examine_at &lt;= #{pageComActEasyPhotoDTO.examineAtEnd}
           </if>
           <if test="pageComActEasyPhotoDTO.detail!=null">
                AND detail = #{pageComActEasyPhotoDTO.detail}
            </if>
           <if test="pageComActEasyPhotoDTO.photoPathList!=null">
                AND photo_path_list = #{pageComActEasyPhotoDTO.photoPathList}
            </if>
           <if test="pageComActEasyPhotoDTO.handleResult!=null">
                AND handle_result = #{pageComActEasyPhotoDTO.handleResult}
            </if>
           <if test="pageComActEasyPhotoDTO.handlePhotoList!=null">
                AND handle_photo_list = #{pageComActEasyPhotoDTO.handlePhotoList}
            </if>
           <if test="pageComActEasyPhotoDTO.communityId!=null">
                AND community_id = #{pageComActEasyPhotoDTO.communityId}
            </if>
           <if test="pageComActEasyPhotoDTO.isHide!=null">
                AND is_hide = #{pageComActEasyPhotoDTO.isHide}
            </if>
           <if test="pageComActEasyPhotoDTO.isNeedFeedBack!=null">
                AND is_need_feed_back = #{pageComActEasyPhotoDTO.isNeedFeedBack}
            </if>
           <if test="pageComActEasyPhotoDTO.feedbackAtBegin!=null">
                AND feedback_at &gt;= #{pageComActEasyPhotoDTO.feedbackAtBegin}
           </if>
           <if test="pageComActEasyPhotoDTO.feedbackAtEnd!=null">
                AND feedback_at &lt;= #{pageComActEasyPhotoDTO.feedbackAtEnd}
           </if>
           <if test="pageComActEasyPhotoDTO.rejectReason!=null">
                AND reject_reason = #{pageComActEasyPhotoDTO.rejectReason}
            </if>
           <if test="pageComActEasyPhotoDTO.cover!=null">
                AND cover = #{pageComActEasyPhotoDTO.cover}
            </if>
           <if test="pageComActEasyPhotoDTO.delTag!=null">
                AND del_tag = #{pageComActEasyPhotoDTO.delTag}
            </if>
           <if test="pageComActEasyPhotoDTO.isReport!=null">
                AND is_report = #{pageComActEasyPhotoDTO.isReport}
            </if>
           <if test="pageComActEasyPhotoDTO.isPublicity!=null">
                AND is_publicity = #{pageComActEasyPhotoDTO.isPublicity}
            <if test="easyAppDTO.handleStatus!=null">
                AND caep.handle_status = #{easyAppDTO.handleStatus}
            </if>
        </where>
        <if test="pageComActEasyPhotoDTO.sortColumns!=null">
            ORDER BY ${pageComActEasyPhotoDTO.sortColumns} ${pageComActEasyPhotoDTO.sortType}
        </if>
        ORDER BY caep.create_at desc
    </select>

    <select id="findByEaseId" resultType="com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO">
        SELECT
        caep.id,
        su.nick_name,
        su.image_url,
        caep.sponsor_id,
        caep.detail,
        caep.create_at,
        caep.`status`,
        caep.is_publicity,
        caep.photo_path_list,
        caep.happen_addr,
        caep.handle_result,
        caep.handle_photo_list,
        caep.feedback_at,
        caep.handler_id,
        su1.`name` AS handlerName,
        caep.is_report
        FROM
        com_act_easy_photo AS caep
        LEFT JOIN sys_user AS su ON su.user_id = caep.sponsor_id
        LEFT JOIN sys_user AS su1 ON su1.user_id = caep.handler_id
        <where>
            <if test="easyId!=null">
                AND caep.id = #{easyId}
            </if>
        </where>
        ORDER BY caep.create_at desc
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoTypeRelationMapper.xml

New file
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_grid.dao.ComActEasyPhotoTypeRelationMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeRelationDO">
        <result property="id" column="id"/>
        <result property="easyId" column="easy_id"/>
        <result property="easyTypeId" column="easy_type_id"/>
        <result property="createAt" column="create_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,easy_id,easy_type_id
    ]]>
    </sql>

    <select id="getEasyPhotoTypeRelationByEasyId" resultType="String">
        SELECT
            caept.`name`
        FROM
            com_act_easy_photo_type_relation AS caeptr
            LEFT JOIN com_act_easy_photo_type AS caept ON caept.id = caeptr.easy_type_id
        <where>
            <if test="easyId!=null">
                caeptr.easy_id = #{easyId}
            </if>
        </where>
        ORDER BY caeptr.create_at desc
    </select>


</mapper>