diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserGridmanController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserGridmanController.java new file mode 100644 index 0000000..b772d37 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserGridmanController.java @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有,侵权必究! + */ + +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.annotation.LogOperation; +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; +import com.elink.esua.epdc.commons.tools.exception.ErrorCode; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.bo.ResourceBO; +import com.elink.esua.epdc.commons.tools.security.password.PasswordUtils; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.*; +import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; +import com.elink.esua.epdc.excel.SysUserExcel; +import com.elink.esua.epdc.optimize.modules.deptlevel.service.OptSysDeptService; +import com.elink.esua.epdc.service.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + +/** + * 网格员管理 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@RestController +@RequestMapping("sysUser") +@Api(tags = "网格员管理") +public class SysUserGridmanController { + @Autowired + private SysUserService sysUserService; + /** + * 获取网格员列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author jyyzz + * @since 2021/8/30 16:29 + */ + @GetMapping("gridmanList") + public Result> getGridmanList(@RequestBody EpdcAppGridManFormDTO formDto){ + List gridmanList = sysUserService.listGridmanInfo(formDto); + return new Result>().ok(gridmanList); + } +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java index 83ff0a9..e579fbe 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java @@ -9,6 +9,8 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.dto.*; +import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.entity.SysUserEntity; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import org.apache.ibatis.annotations.Mapper; @@ -139,4 +141,13 @@ public interface SysUserDao extends BaseDao { * @date 2021/6/4 9:22 */ List> getUserList4Vaccination(); + + /** + * 小程序-首页网格员列表 + * @params [formDto] + * @return java.util.List + * @author zhangfenghe + * @since 2021/8/28 22:18 + */ + List selectListGridmanInfo(EpdcAppGridManFormDTO formDto); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java index b21b6bf..4d38101 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java @@ -16,6 +16,8 @@ import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO; import com.elink.esua.epdc.dto.VerifyMobileDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.entity.SysUserEntity; import java.util.List; @@ -177,4 +179,13 @@ public interface SysUserService extends BaseService { * @date 2021/6/4 9:21 */ List> getUserList4Vaccination(); + + /** + * 首页-网格员列表获取 + * @params [formDto] + * @return java.util.List + * @author zhangfenghe + * @since 2021/8/28 22:00 + */ + List listGridmanInfo(EpdcAppGridManFormDTO formDto); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index 310c458..b724edc 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -28,6 +28,8 @@ import com.elink.esua.epdc.dao.SysUserDao; import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.entity.SysUserEntity; import com.elink.esua.epdc.service.SysDeptService; import com.elink.esua.epdc.service.SysEpmetUserRelationService; @@ -325,4 +327,13 @@ public class SysUserServiceImpl extends BaseServiceImpl> getUserList4Vaccination() { return baseDao.getUserList4Vaccination(); } + + @Override + public List listGridmanInfo(EpdcAppGridManFormDTO formDto) { + int pageIndex =(formDto.getPageIndex() - NumConstant.ONE)*formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List listGridmanInfo = baseDao.selectListGridmanInfo(formDto); + return listGridmanInfo; + } + } diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml index 554756b..24baca4 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml @@ -218,4 +218,21 @@ ORDER BY u.create_date DESC +