From 66825c94f6ad7c8c44dd9a54261aebe04c20a9bb Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 22 Oct 2019 14:03:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/DeptMaCodeDTO.java | 5 ++ .../epdc/controller/DeptMaCodeController.java | 12 ++++ .../esua/epdc/entity/DeptMaCodeEntity.java | 7 ++- .../esua/epdc/service/DeptMaCodeService.java | 9 +++ .../service/impl/DeptMaCodeServiceImpl.java | 61 ++++++++++++++++--- .../main/resources/mapper/DeptMaCodeDao.xml | 1 + 6 files changed, 85 insertions(+), 10 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptMaCodeDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptMaCodeDTO.java index b4087c925..60c74d048 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptMaCodeDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptMaCodeDTO.java @@ -49,6 +49,11 @@ public class DeptMaCodeDTO implements Serializable { */ private String codeUrl; + /** + * 是否是网格长码，0否 1是 + */ + private String leaderFlag; + /** * 乐观锁 */ diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/DeptMaCodeController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/DeptMaCodeController.java index 2d1bdb336..74b83f08b 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/DeptMaCodeController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/DeptMaCodeController.java @@ -118,5 +118,17 @@ public class DeptMaCodeController { return deptMaCodeService.createDeptMaCode(gridId); } + /** + * 创建网格长注册小程序码 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/10/22 09:59 + */ + @PostMapping("gridLeader") + public Result createGridLeaderMaCode() { + return deptMaCodeService.createGridLeaderMaCode(); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java index ee301c719..18a963683 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java @@ -23,8 +23,6 @@ import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 网格小程序码 * @@ -48,4 +46,9 @@ public class DeptMaCodeEntity extends BaseEpdcEntity { */ private String codeUrl; + /** + * 是否是网格长码，0否 1是 + */ + private String leaderFlag; + } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/DeptMaCodeService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/DeptMaCodeService.java index 90ae915f4..c82db655e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/DeptMaCodeService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/DeptMaCodeService.java @@ -112,4 +112,13 @@ public interface DeptMaCodeService extends BaseService { * @date 2019/9/19 11:05 */ Result createDeptMaCode(String gridId); + + /** + * 创建网格长注册小程序码 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/10/22 09:59 + */ + Result createGridLeaderMaCode(); } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java index bad404359..a56fae94f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java @@ -24,6 +24,8 @@ 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.NumConstant; +import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; +import com.elink.esua.epdc.commons.tools.exception.RenException; 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; @@ -64,6 +66,26 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl page(Map params) { + String leaderFlag = (String) params.get("leaderFlag"); + if (StringUtils.isNotBlank(leaderFlag) && leaderFlag.equals(YesOrNoEnum.YES.value())) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("LEADER_FLAG", leaderFlag); + + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + wrapper + ); + + PageData pageData = getPageData(page, DeptMaCodeDTO.class); + List pageDataList = pageData.getList(); + for (DeptMaCodeDTO dto : pageDataList) { + dto.setStreet("全部街道通用"); + dto.setCommunity("全部社区通用"); + dto.setGrid("全部网格通用"); + } + + return pageData; + } IPage page = this.getPage(params); List dtoList = this.baseDao.selectListDeptMaCode(params); @@ -154,11 +176,38 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl ossResult = ossFeignClient.uploadFile(dto); if (null == ossResult || !ossResult.success() || null == ossResult.getData()) { - return new Result().error("小程序码上传失败"); + throw new RenException("小程序码上传失败"); } - DeptMaCodeEntity entity = new DeptMaCodeEntity(); - entity.setCodeUrl(ossResult.getData()); - entity.setGridId(Long.parseLong(gridId)); - this.baseDao.insert(entity); - return new Result(); + return ossResult.getData(); } /** diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/DeptMaCodeDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/DeptMaCodeDao.xml index e46654979..2889a5e88 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/DeptMaCodeDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/DeptMaCodeDao.xml @@ -11,6 +11,7 @@ dg.id AS GRID_ID, ed.CREATED_TIME, ed.ID, + ed.leader_flag, ed.CODE_URL FROM sys_dept dg