diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index b69effafd..4f378f925 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -8,6 +8,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterSubmitFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateAvatarFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcLeaderGridResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO; @@ -19,6 +20,8 @@ import com.elink.esua.epdc.service.AppUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 用户模块 * @@ -170,4 +173,17 @@ public class ApiAppUserController { public Result gridLeaderSwitchGrid(@LoginUser TokenDto userDetail, @PathVariable("gridId") String gridId) { return appUserService.gridLeaderSwitchGrid(userDetail, gridId); } + + /** + * 获取网格长管理的所有网格 + * + * @param userDetail + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2019/10/23 15:58 + */ + @GetMapping("user/listGridForLeader") + public Result> listGridForLeader(@LoginUser TokenDto userDetail) { + return appUserService.listGridForLeader(userDetail.getUserId()); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 094f984ab..dacbfeab6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -6,6 +6,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterSubmitFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateAvatarFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcLeaderGridResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO; @@ -14,6 +15,8 @@ import com.elink.esua.epdc.dto.form.EpdcCheckRegisterFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; +import java.util.List; + /** * @author yujintao * @email yujintao@elink-cn.com @@ -135,4 +138,14 @@ public interface AppUserService { * @date 2019/10/23 10:40 */ Result gridLeaderSwitchGrid(TokenDto userDetail, String gridId); + + /** + * 获取网格长管理的所有网格 + * + * @param userId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2019/10/23 15:58 + */ + Result> listGridForLeader(String userId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 2889339a5..7f9bd32ed 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -14,6 +14,7 @@ import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.*; +import com.elink.esua.epdc.dto.epdc.result.EpdcLeaderGridResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO; @@ -281,6 +282,7 @@ public class AppUserServiceImpl implements AppUserService { appUser.setRealName(sysUser.getRealName()); appUser.setEmail(sysUser.getEmail()); appUser.setPartyFlag(YesOrNoEnum.NO.value()); + appUser.setLeaderFlag(YesOrNoEnum.NO.value()); PhoneDto phoneDto = PhoneUtil.getPhoneDto(mobile); if (phoneDto != null) { @@ -558,6 +560,11 @@ public class AppUserServiceImpl implements AppUserService { return new Result().ok(authorization); } + @Override + public Result> listGridForLeader(String userId) { + return userFeignClient.listGridForLeader(userId); + } + /** * 组装成功登录的数据 * EpdcAppAuthorizationDTO的userState属性默认设置为AppUserStateEnum.REGISTERED diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java index 98c08fd56..fbfd96c51 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java @@ -312,4 +312,9 @@ public class UserDTO implements Serializable { */ private String remark; + /** + * 是否是网格长 0否1是 + */ + private String leaderFlag; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java index 3ceefb8b9..0d3822f8c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java @@ -268,5 +268,8 @@ public class UserEntity extends BaseEpdcEntity { */ private String remark; - + /** + * 是否是网格长 0否1是 + */ + private String leaderFlag; } \ No newline at end of file