From 30049acc81d1a8c88f2a6e51a9f744d61c86f341 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Tue, 31 Aug 2021 22:01:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml | 4 ++-- epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml index 5fc5696..f753290 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml @@ -228,9 +228,9 @@ sys_user u LEFT JOIN sys_epmet_user_relation eur on u.id = eur.sys_user_id WHERE - U.DEL_FLAG = 0 + u.DEL_FLAG = 0 AND eur.DEL_FLAG = 0 - AND eur.AGENCY_ID = #{deptId} + AND u.`dept_id` = #{deptId} ORDER BY eur.CREATED_TIME DESC LIMIT #{pageIndex}, #{pageSize} diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 40bd061..037ee65 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 40bd0613d9f3dd621d327713e3d7f15c656570f3 +Subproject commit 037ee6574bf347ae34d5251735a99c5511d81794 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 31d32c8..9d7cf7e 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 31d32c81a8018a5c93745bcca1a538cc0bf59e13 +Subproject commit 9d7cf7e81ccc634751f032f72e5333a90eb40ee2 From 24ff7b498eaaac8e91d400cb4c2480ef799e1b15 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 14 Sep 2021 10:50:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/GridMemberController.java | 94 ++++++++++++++++ .../elink/esua/epdc/dao/GridMemberDao.java | 33 ++++++ .../esua/epdc/entity/GridMemberEntity.java | 106 ++++++++++++++++++ .../esua/epdc/excel/GridMemberExcel.java | 95 ++++++++++++++++ .../esua/epdc/redis/GridMemberRedis.java | 47 ++++++++ .../esua/epdc/service/GridMemberService.java | 95 ++++++++++++++++ .../service/impl/GridMemberServiceImpl.java | 104 +++++++++++++++++ .../main/resources/mapper/GridMemberDao.xml | 30 +++++ 8 files changed, 604 insertions(+) create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/GridMemberEntity.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/GridMemberExcel.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/GridMemberRedis.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberService.java create mode 100644 epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java create mode 100644 epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java new file mode 100644 index 0000000..9c9f6de --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +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.UpdateGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.GridMemberDTO; +import com.elink.esua.epdc.excel.GridMemberExcel; +import com.elink.esua.epdc.service.GridMemberService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 网格员信息 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-14 + */ +@RestController +@RequestMapping("gridmember") +public class GridMemberController { + + @Autowired + private GridMemberService gridMemberService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = gridMemberService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + GridMemberDTO data = gridMemberService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody GridMemberDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + gridMemberService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody GridMemberDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + gridMemberService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + gridMemberService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = gridMemberService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, GridMemberExcel.class); + } + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java new file mode 100644 index 0000000..17abb0d --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.entity.GridMemberEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 网格员信息 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-14 + */ +@Mapper +public interface GridMemberDao extends BaseDao { + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/GridMemberEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/GridMemberEntity.java new file mode 100644 index 0000000..a29e43b --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/GridMemberEntity.java @@ -0,0 +1,106 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 网格员信息 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_grid_member") +public class GridMemberEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 姓名 + */ + private String name; + + /** + * 头像 + */ + private String imgUrl; + + /** + * 党员标识：0否1是 + */ + private String partyFlag; + + /** + * 格言 + */ + private String motto; + + /** + * 职责 + */ + private String duty; + + /** + * 负责区域 + */ + private String territory; + + /** + * 电话 + */ + private String mobile; + + /** + * 所属网格名称 + */ + private String dept; + + /** + * 所属网格id + */ + private Long deptId; + + /** + * 父所有部门 + */ + private String parentDeptIds; + + /** + * 父所有部门 + */ + private String parentDeptNames; + + /** + * 所有部门ID + */ + private String allDeptIds; + + /** + * 所有部门名称 + */ + private String allDeptNames; + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/GridMemberExcel.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/GridMemberExcel.java new file mode 100644 index 0000000..37f79c7 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/excel/GridMemberExcel.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 网格员信息 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-14 + */ +@Data +public class GridMemberExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "姓名") + private String name; + + @Excel(name = "头像") + private String imgUrl; + + @Excel(name = "党员标识：0否1是") + private String partyFlag; + + @Excel(name = "格言") + private String motto; + + @Excel(name = "职责") + private String duty; + + @Excel(name = "负责区域") + private String territory; + + @Excel(name = "电话") + private String mobile; + + @Excel(name = "所属网格名称") + private String dept; + + @Excel(name = "所属网格id") + private Long deptId; + + @Excel(name = "父所有部门") + private String parentDeptIds; + + @Excel(name = "父所有部门") + private String parentDeptNames; + + @Excel(name = "所有部门ID") + private String allDeptIds; + + @Excel(name = "所有部门名称") + private String allDeptNames; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + @Excel(name = "删除标记") + private String delFlag; + + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/GridMemberRedis.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/GridMemberRedis.java new file mode 100644 index 0000000..3fabade --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/redis/GridMemberRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.redis; + +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 网格员信息 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-14 + */ +@Component +public class GridMemberRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberService.java new file mode 100644 index 0000000..25cdb0e --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberService.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.GridMemberDTO; +import com.elink.esua.epdc.entity.GridMemberEntity; + +import java.util.List; +import java.util.Map; + +/** + * 网格员信息 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-14 + */ +public interface GridMemberService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-09-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-09-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return GridMemberDTO + * @author generator + * @date 2021-09-14 + */ + GridMemberDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-09-14 + */ + void save(GridMemberDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-09-14 + */ + void update(GridMemberDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-09-14 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java new file mode 100644 index 0000000..7a15c81 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java @@ -0,0 +1,104 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.dao.GridMemberDao; +import com.elink.esua.epdc.dto.GridMemberDTO; +import com.elink.esua.epdc.entity.GridMemberEntity; +import com.elink.esua.epdc.redis.GridMemberRedis; +import com.elink.esua.epdc.service.GridMemberService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 网格员信息 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-09-14 + */ +@Service +public class GridMemberServiceImpl extends BaseServiceImpl implements GridMemberService { + + @Autowired + private GridMemberRedis gridMemberRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, GridMemberDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, GridMemberDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public GridMemberDTO get(String id) { + GridMemberEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GridMemberDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(GridMemberDTO dto) { + GridMemberEntity entity = ConvertUtils.sourceToTarget(dto, GridMemberEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(GridMemberDTO dto) { + GridMemberEntity entity = ConvertUtils.sourceToTarget(dto, GridMemberEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml b/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml new file mode 100644 index 0000000..d312fda --- /dev/null +++ b/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 0df354f225211c978fb7851243845cd159dacd25 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 14 Sep 2021 14:52:28 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=98=9F=E4=BC=8D-?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dao/GridMemberDao.java | 7 ++++- .../service/impl/GridMemberServiceImpl.java | 30 ++++++++++++++----- .../main/resources/mapper/GridMemberDao.xml | 15 ++++++++++ 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java index 17abb0d..eef94c1 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java @@ -18,9 +18,13 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.GridMemberDTO; import com.elink.esua.epdc.entity.GridMemberEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 网格员信息 * @@ -29,5 +33,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface GridMemberDao extends BaseDao { - + + List getPageList(Map params); } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java index 7a15c81..b9603f4 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java @@ -20,12 +20,14 @@ package com.elink.esua.epdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.dao.GridMemberDao; +import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; import com.elink.esua.epdc.dto.GridMemberDTO; import com.elink.esua.epdc.entity.GridMemberEntity; +import com.elink.esua.epdc.optimize.modules.deptlevel.service.OptSysDeptService; import com.elink.esua.epdc.redis.GridMemberRedis; import com.elink.esua.epdc.service.GridMemberService; import org.apache.commons.lang3.StringUtils; @@ -49,13 +51,14 @@ public class GridMemberServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, GridMemberDTO.class); + IPage page = getPage(params); + List list = baseDao.getPageList(params); + return new PageData<>(list, page.getTotal()); } @Override @@ -77,13 +80,16 @@ public class GridMemberServiceImpl extends BaseServiceImpl + \ No newline at end of file From ce47172c3346c0e372a239b45ef7c13936a07d5a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 14 Sep 2021 17:18:42 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=98=9F=E4=BC=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/GridMemberController.java | 27 +++++++++++++- .../elink/esua/epdc/dao/GridMemberDao.java | 11 ++++++ .../elink/esua/epdc/dao/SysDeptInfoDao.java | 12 ++++++- .../esua/epdc/service/GridMemberService.java | 20 +++++++++++ .../service/impl/GridMemberServiceImpl.java | 35 +++++++++++++++++-- .../main/resources/mapper/GridMemberDao.xml | 15 ++++++++ .../main/resources/mapper/SysDeptInfoDao.xml | 6 ++++ 7 files changed, 122 insertions(+), 4 deletions(-) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java index 9c9f6de..291388e 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java @@ -23,8 +23,9 @@ 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.UpdateGroup; 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.AppMemberListFromDTO; import com.elink.esua.epdc.dto.GridMemberDTO; import com.elink.esua.epdc.excel.GridMemberExcel; import com.elink.esua.epdc.service.GridMemberService; @@ -91,4 +92,28 @@ public class GridMemberController { ExcelUtils.exportExcelToTarget(response, null, list, GridMemberExcel.class); } + /** + * @describe: 居民端-网格队伍-社区介绍 + * @author wangtong + * @date 2021/9/14 16:25 + * @params [userDetail] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getDeptInfo") + public Result getDeptInfo( AppMemberListFromDTO dto){ + return gridMemberService.getDeptInfo(dto); + } + + /** + * @describe: 居民端-网格队伍-网格员列表 + * @author wangtong + * @date 2021/9/14 16:29 + * @params [AppMemberListFromDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getMemberList") + public Result getMemberList( AppMemberListFromDTO dto){ + return gridMemberService.getMemberList(dto); + } + } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java index eef94c1..18e84d7 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java @@ -18,6 +18,8 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.AppMemberListFromDTO; +import com.elink.esua.epdc.dto.AppMemberListResultDTO; import com.elink.esua.epdc.dto.GridMemberDTO; import com.elink.esua.epdc.entity.GridMemberEntity; import org.apache.ibatis.annotations.Mapper; @@ -35,4 +37,13 @@ import java.util.Map; public interface GridMemberDao extends BaseDao { List getPageList(Map params); + + /** + * @describe: 居民端-网格队伍-网格员列表 + * @author wangtong + * @date 2021/9/14 16:52 + * @params [communityId] + * @return com.elink.esua.epdc.dto.AppMemberListResultDTO + */ + List getMemberList(AppMemberListFromDTO dto); } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java index da3595b..4961a90 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java @@ -18,8 +18,10 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.AppDeptInfoResultDTO; import com.elink.esua.epdc.entity.SysDeptInfoEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 部门信息表 组织信息表 @@ -29,5 +31,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface SysDeptInfoDao extends BaseDao { - + + /** + * @describe: 通过部门id查询 + * @author wangtong + * @date 2021/9/14 16:41 + * @params [id] + * @return com.elink.esua.epdc.dto.AppDeptInfoResultDTO + */ + AppDeptInfoResultDTO selectByDeptId(@Param("deptId") Long deptId); } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberService.java index 25cdb0e..fe567ed 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberService.java @@ -19,6 +19,8 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.AppMemberListFromDTO; import com.elink.esua.epdc.dto.GridMemberDTO; import com.elink.esua.epdc.entity.GridMemberEntity; @@ -92,4 +94,22 @@ public interface GridMemberService extends BaseService { * @date 2021-09-14 */ void delete(String[] ids); + + /** + * @describe: 居民端-网格队伍-社区介绍 + * @author wangtong + * @date 2021/9/14 16:25 + * @params [userDetail] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getDeptInfo(AppMemberListFromDTO dto); + + /** + * @describe: 居民端-网格队伍-网格员列表 + * @author wangtong + * @date 2021/9/14 16:29 + * @params [AppMemberListFromDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getMemberList(AppMemberListFromDTO dto); } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java index b9603f4..567e7b6 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java @@ -21,12 +21,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.GridMemberDao; -import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; -import com.elink.esua.epdc.dto.GridMemberDTO; +import com.elink.esua.epdc.dao.SysDeptDao; +import com.elink.esua.epdc.dao.SysDeptInfoDao; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.entity.GridMemberEntity; +import com.elink.esua.epdc.entity.SysDeptEntity; import com.elink.esua.epdc.optimize.modules.deptlevel.service.OptSysDeptService; import com.elink.esua.epdc.redis.GridMemberRedis; import com.elink.esua.epdc.service.GridMemberService; @@ -54,6 +58,12 @@ public class GridMemberServiceImpl extends BaseServiceImpl page(Map params) { IPage page = getPage(params); @@ -117,4 +127,25 @@ public class GridMemberServiceImpl extends BaseServiceImpl result = baseDao.getMemberList(dto); + return new Result().ok(result); + } + } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml b/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml index c25035b..852179b 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml @@ -40,6 +40,21 @@ order by CREATED_TIME desc + \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml index a326a86..216a781 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml @@ -21,6 +21,12 @@ + \ No newline at end of file From 3ab4785de56952ae9cc41221b2eaab53330a00c8 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 14 Sep 2021 17:27:54 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/GridMemberController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java index 291388e..aebb067 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java @@ -100,7 +100,7 @@ public class GridMemberController { * @return com.elink.esua.epdc.commons.tools.utils.Result */ @GetMapping("getDeptInfo") - public Result getDeptInfo( AppMemberListFromDTO dto){ + public Result getDeptInfo(@RequestBody AppMemberListFromDTO dto){ return gridMemberService.getDeptInfo(dto); } @@ -112,7 +112,7 @@ public class GridMemberController { * @return com.elink.esua.epdc.commons.tools.utils.Result */ @GetMapping("getMemberList") - public Result getMemberList( AppMemberListFromDTO dto){ + public Result getMemberList(@RequestBody AppMemberListFromDTO dto){ return gridMemberService.getMemberList(dto); } From 4b794ccf3c575135324bee8dc5110586bb713ec0 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 16 Sep 2021 20:19:39 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E5=A4=A7=E5=B1=8F=20?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=E9=A1=B9=E7=9B=AE=E6=9B=B4=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4=20admin=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/SysUserServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 21fa2f0..923e423 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 @@ -151,7 +151,11 @@ public class SysUserServiceImpl extends BaseServiceImpl