huanghongfa
2021-07-23 0727d8bce437e5b6fb99f4ea28ca880bbd29fa9e
大屏获取社区下网格员列表接口
6个文件已修改
1个文件已添加
56 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridMemberVO.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventGridMemberVO.java
New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.vos.community.screen.event;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("网格员列表返回参数")
public class EventGridMemberVO {
    @ApiModelProperty("网格员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;
    @ApiModelProperty("网格员名称")
    private String nickName;
    @ApiModelProperty("网格员联系方式")
    private String phone;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -771,4 +771,7 @@
    @PostMapping("user/getUserGrids")
    R getGridIsOk(@RequestParam("userId")Long userId);
    @GetMapping("getGridsMemberList")
    R getGridsMemberList(@RequestParam("communityId")Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -12,6 +12,7 @@
import com.panzhihua.common.model.vos.screen.ScreenDrawEventVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -29,6 +30,8 @@
    private CommunityService communityService;
    @Resource
    private GridService gridService;
    @Resource
    private UserService userService;
    @ApiOperation(value = "大屏测试接口")
    @GetMapping("/test/noToken")
@@ -99,7 +102,7 @@
        return gridService.getCivilDrawList(eventListDTO);
    }
    @ApiOperation(value = "事件大屏画圈展示事件坐标点接口@lyq",response = ScreenDrawEventPopulationTotalVO.class)
    @ApiOperation(value = "根据小区id获取小区信息@lyq",response = ScreenDrawEventPopulationTotalVO.class)
    @GetMapping("/civil/village/statistics/noToken")
    public R civilVillageStatistics(@RequestParam("villageId") Long villageId) {
        if(villageId == null){
@@ -107,4 +110,13 @@
        }
        return gridService.civilVillageStatistics(villageId);
    }
    @ApiOperation(value = "获取社区网格员列表接口@lyq",response = EventGridMemberVO.class)
    @GetMapping("/grids/member/noToken")
    public R getGridsMemberList(@RequestParam("communityId") Long communityId) {
        if(communityId == null){
            return R.fail("参数错误");
        }
        return userService.getGridsMemberList(communityId);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -983,4 +983,9 @@
        return userService.getGridIsOk(userId);
    }
    @GetMapping("getGridsMemberList")
    public R getGridsMemberList(@RequestParam("communityId") Long communityId) {
        return userService.getGridsMemberList(communityId);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -16,6 +16,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridMemberVO;
import com.panzhihua.common.model.vos.grid.GridMemberVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
@@ -428,4 +429,7 @@
    @Select("select count(id) from event_grid_member_relation where grid_member_id = #{userId}")
    Integer getGridIsOk(@Param("userId") Long userId);
    @Select("select user_id,nick_name,phone from sys_user where type = 6 and community_id = #{communityId} limit 3")
    List<EventGridMemberVO> getGridsMemberList(@Param("communityId") Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -469,4 +469,6 @@
    R listAgreements(Long communityId);
    R getGridIsOk(Long userId);
    R getGridsMemberList(Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -2172,4 +2172,9 @@
            return R.fail();
        }
    }
    @Override
    public R getGridsMemberList(Long communityId){
        return R.ok(this.userDao.getGridsMemberList(communityId));
    }
}