springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java
@@ -68,4 +68,10 @@ return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type); } @ApiOperation("通知公告列表") @GetMapping("notice") public R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId){ return communityService.noticeList(page,size,propertyId); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ComPropertyApi.java
New file @@ -0,0 +1,70 @@ package com.panzhihua.applets_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComPropertyVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; /** * @author zts */ @Slf4j @Api(tags = {"物业公司"}) @RestController @RequestMapping("/comProperty") public class ComPropertyApi extends BaseController { @Resource private CommunityService communityService; @Resource private UserService userService; /** * 分页查询所有数据 * * @param commonPage 查询实体 * @return 所有数据 */ @ApiOperation(value = "物业公司列表",response = ComPropertyVO.class) @PostMapping("queryAll") public R selectAll(@RequestBody CommonPage commonPage) { commonPage.setParamId(this.getCommunityId()); return this.communityService.comPropertySelectAll(commonPage); } @ApiOperation(value = "物业公司详情", response = ComPropertyVO.class) @ApiImplicitParam(name = "id", value = "物业公司id", required = true) @GetMapping("detail") public R detailProperty(@RequestParam("id") Long id) { return this.communityService.detailProperty(id); } @ApiOperation("新增投诉建议或问题留言") @PostMapping("addFeedBack") public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){ return userService.addFeedback(sysUserFeedbackDTO); } @ApiOperation("查看自己的投诉建议或问题留言记录") @GetMapping("myFeedBack") public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){ return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type); } @ApiOperation(value = "通知公告列表",response = ComPropertyVO.class) @GetMapping("notice") public R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId){ return communityService.noticeList(page,size,propertyId); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -253,4 +253,7 @@ @ApiModelProperty("权限等级1-5：超管-行业分中心-街道-社区-专家") private Integer level; @ApiModelProperty("物业公司id") private Long propertyId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActAnnouncementVO.java
@@ -57,4 +57,7 @@ @ApiModelProperty("分类名称") private String columnName; @ApiModelProperty("propertyId") private Long propertyId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -10566,4 +10566,10 @@ @DeleteMapping("/proceedings/remove") R removeProceedings(@RequestParam("id") Long id); /** * 获取物业公司通知公告列表 * */ @GetMapping("property/noticeList") R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComPropertyApi.java
@@ -83,4 +83,9 @@ public R detailProperty(@RequestParam("id") Long id) { return comPropertyService.detailProperty(id); } @GetMapping("/noticeList") public R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId){ return comPropertyService.noticeList(page,size,propertyId); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java
@@ -104,4 +104,6 @@ * @return */ List<ComPropertyEquipmentVO> getAlarmPointMapData(@Param("communityId") Long communityId); IPage<ComPropertyVO> noticeList(Page page, @Param("propertyId") Long propertyId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAnnouncement.java
@@ -66,5 +66,9 @@ */ @ApiModelProperty(value = "社区id") private Long communityId; /** * 物业公司id * */ private Long propertyId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPropertyService.java
@@ -55,4 +55,10 @@ * @return */ R detailProperty(Long id); /** * 物业公司通知公告列表 * @param propertyId 物业公司Id * */ R noticeList(Integer page, Integer size, Long propertyId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
@@ -63,7 +63,7 @@ if (comPropertyVO.getCommunityId().equals(10172)){ administratorsUserVO.setType(20); } administratorsUserVO.setAccount(comPropertyVO.getAccount()); administratorsUserVO.setAccount(comPropertyVO.getAccount()); administratorsUserVO.setPassword(comPropertyVO.getPassword()); administratorsUserVO.setRoleId(comPropertyVO.getRoleId()); administratorsUserVO.setCommunityId(comPropertyVO.getCommunityId()); @@ -145,4 +145,9 @@ comPropertyVO.setPassword(null); return R.ok(comPropertyVO); } @Override public R noticeList(Integer page, Integer size, Long propertyId) { return R.ok(comPropertyDao.noticeList(new Page(page,size),propertyId)); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyMapper.xml
@@ -243,4 +243,8 @@ ) </select> <select id="noticeList" resultType="com.panzhihua.common.model.vos.community.ComPropertyVO"> select * from com_act_announcement where property_id=#{propertyId} </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -435,4 +435,9 @@ * 是否为党员 * */ int isDpcMember(@Param("phone") String phone,@Param("name")String name); /** * 是否为物业公司后台账号 * */ Long isPropertyAccount(String phone); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -792,6 +792,13 @@ //是否是防疫工作人员 loginUserInfoVO.setIsAcidMember(0); ComActAcidMemberVO acidMember = userDao.selectAcidMemberByPhone(loginUserInfoVO.getPhone()); //是否为普达物业公司后台账号 if (nonNull(sysUserDO.getPhone())){ Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone()); if (nonNull(propertyAccount)){ loginUserInfoVO.setPropertyId(propertyAccount); } } if (nonNull(acidMember)) { if (acidMember.getRelationName().equals("panzhihua") || acidMember.getRelationName().equals("西区") || acidMember.getRelationName().equals("东区") || acidMember.getRelationName().equals("仁和区") || acidMember.getRelationName().equals("米易县") || acidMember.getRelationName().equals("盐边县")) { loginUserInfoVO.setIsAcidMember(1); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
@@ -838,4 +838,7 @@ <select id="isDpcMember" resultType="Integer"> select count(id) from com_act_dpc where name =#{name} and phone=#{phone} </select> <select id="isPropertyAccount" resultType="Integer"> select id from com_property where phone=#{phone} </select> </mapper>
