springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEasyAppDTO.java
New file @@ -0,0 +1,46 @@ 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; 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/service/grid/GridService.java
@@ -460,4 +460,12 @@ */ @PostMapping("/eventgridmembergpslog/{id}") R<EventGridMemberGpsLogDetailsVO> eventGridMemberGpsLogDetails(@PathVariable("id") Long id); /** * 查询随手拍列表 * @param easyAppDTO 请求参数 * @return 随手拍列表 */ @PostMapping("/easy/list") R easyList(@RequestBody PageEasyAppDTO easyAppDTO); } 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,42 @@ package com.panzhihua.grid_app.api; import com.panzhihua.common.controller.BaseController; 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.service.grid.GridService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; 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; import javax.annotation.Resource; /** * @author lyq */ @RestController @RequestMapping("/easy") @Api(tags = {"网格综治APP随手拍模块"}) public class EasyPhotoApi extends BaseController { @Resource private GridService gridService; @ApiOperation(value = "随手拍列表") @PostMapping("list") public R list(@RequestBody PageEasyAppDTO easyAppDTO){ LoginUserInfoVO userInfoVO = this.getLoginUserInfo(); if(userInfoVO == null){ return R.fail("请先登录"); } easyAppDTO.setCommunityId(userInfoVO.getCommunityId()); return R.ok(); } } 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,28 @@ package com.panzhihua.service_grid.api; import com.panzhihua.common.model.dtos.grid.PageEasyAppDTO; import com.panzhihua.common.model.vos.R; import lombok.extern.slf4j.Slf4j; 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; /** * * @author lyq * @version 1.0 * @since 1.0 * @date 2021-05-26 * */ @Slf4j @RestController @RequestMapping("/easy") public class EasyPhotoApi { @PostMapping("list") public R list(@RequestBody PageEasyAppDTO easyAppDTO){ return R.ok(); } }
