From 23f6e779d5d65fed823a42462939dff4e315e200 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 7 Dec 2019 13:59:27 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0:=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E5=BC=80=E5=85=B3=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/entity/ScanSwitchEntity.java | 5 +---- .../elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java | 2 +- .../src/main/resources/mapper/ScanSwitchDao.xml | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java index bb0e65661..fb3c81754 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java @@ -18,13 +18,10 @@ 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; - /** * 扫码开关 * @@ -42,6 +39,6 @@ public class ScanSwitchEntity extends BaseEpdcEntity { /** * 扫码开关 0关1开 */ - private String scanSwitch; + private int scanFlag; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java index 0083f3744..ba34178b0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java @@ -106,7 +106,7 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl map=new HashMap<>(); - map.put("switch",scanSwitchEntity.getScanSwitch()); + map.put("switch",scanSwitchEntity.getScanFlag()+""); return map; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml index e16e6f975..4a4be7f6e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml @@ -5,7 +5,7 @@ - + From 8f0b62a8724c3165212cb2b5e612b701a26fab83 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Sat, 7 Dec 2019 14:42:54 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E9=80=9A=E7=9F=A5=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=20deptid=20deptname=E5=AD=98=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/NoticeServiceImpl.java | 11 ++++++++--- .../src/main/resources/mapper/NoticeDao.xml | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java index 098aad80b..3d9ff3466 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java @@ -70,7 +70,8 @@ public class NoticeServiceImpl extends BaseServiceImpl @Override public PageData page(Map params) { - + String noticeTitle= (String) params.get("noticeTitle"); + params.put("noticeTitle",noticeTitle.trim()); QueryWrapper wrapper = this.getWrapper(params) .eq(FieldConstant.CREATED_BY, SecurityUser.getUserId()); @@ -135,8 +136,6 @@ public class NoticeServiceImpl extends BaseServiceImpl private void saveOrUpdate(NoticeDTO dto) { UserDetail user = SecurityUser.getUser(); dto.setCreatorName(user.getRealName()); - dto.setDeptId(user.getDeptId()); - dto.setDeptName(user.getDeptName()); NoticeEntity entity = ConvertUtils.sourceToTarget(dto, NoticeEntity.class); List allDeptIds = dto.getAllDeptIdsShow(); @@ -154,6 +153,12 @@ public class NoticeServiceImpl extends BaseServiceImpl entity.setAllDeptNames(deptDTO.getAllDeptNames()); entity.setParentDeptIds(deptDTO.getParentDeptIds()); entity.setParentDeptNames(deptDTO.getParentDeptNames()); + //赋值deptid name 最小组织 + String[] newAllDeptIds=deptDTO.getAllDeptIds().split(","); + entity.setDeptId(Long.parseLong(newAllDeptIds[newAllDeptIds.length-1])); + + String[] newAllDeptNames=deptDTO.getAllDeptNames().split("-"); + entity.setDeptName(newAllDeptNames[newAllDeptNames.length-1]); } }else { throw new RenException("所属部门不能为空"); diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml index 99328a0b0..a69febd06 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml @@ -49,7 +49,9 @@ parent_dept_ids = #{parentDeptIds}, parent_dept_names = #{parentDeptNames}, updated_by = #{updatedBy}, - updated_time = #{updatedTime} + updated_time = #{updatedTime}, + dept_id=#{deptId}, + dept_name=#{deptName} WHERE id = #{id} AND del_flag = '0' \ No newline at end of file From f5b36818db2ba37868f374c90004dd53f9ff7531 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Sat, 7 Dec 2019 14:59:10 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?= =?UTF-8?q?=EF=BC=8C=E9=80=9A=E7=9F=A5=EF=BC=8C=E7=82=B9=E5=87=BB=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E8=AF=A6=E6=83=85=EF=BC=8C=E9=80=9A=E7=9F=A5=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-news-server/src/main/resources/mapper/NoticeDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml index a69febd06..273298a79 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml @@ -32,7 +32,7 @@ n.NOTICE_CONTENT AS noticeContent, n.READING_AMOUNT AS readingAmount, n.RELEASE_TIME AS noticeTime, - SUBSTRING_INDEX(en.ALL_DEPT_NAMES,'-',-1) AS deptName + SUBSTRING_INDEX(n.ALL_DEPT_NAMES,'-',-1) AS deptName FROM epdc_notice n WHERE From 8bf402c03806fc4f393929427bf9ca51c625e347 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 7 Dec 2019 15:27:29 +0800 Subject: [PATCH 04/27] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=BC=80=E5=85=B3=E5=A2=9E=E5=88=A0=E6=94=B9?= =?UTF-8?q?=E6=9F=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/ScanSwitchDTO.java | 22 +++++++++++++++++-- .../esua/epdc/entity/ScanSwitchEntity.java | 19 ++++++++++++++-- .../main/resources/mapper/ScanSwitchDao.xml | 3 +++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanSwitchDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanSwitchDTO.java index b6b5e92c9..dd3e60d0c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanSwitchDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanSwitchDTO.java @@ -17,9 +17,11 @@ package com.elink.esua.epdc.dto; +import lombok.Data; + +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -36,18 +38,34 @@ public class ScanSwitchDTO implements Serializable { /** * id */ + @NotBlank(message = "ID不能为空") private String id; /** * 扫码开关 0关1开 */ - private String scanSwitch; + private int scanFlag; /** * 删除标识 0：未删除 1：删除 */ private String delFlag; + /** + * 维护状态：0-关闭维护，1-开启维护 + */ + private int maintainFlag; + + /** + * 维护信息 + */ + private String maintainInfo; + + /** + * 版本号 + */ + private String versionNum; + /** * 创建者 */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java index fb3c81754..f6e916e77 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java @@ -37,8 +37,23 @@ public class ScanSwitchEntity extends BaseEpdcEntity { /** - * 扫码开关 0关1开 - */ + * 扫码开关 0关1开 + */ private int scanFlag; + /** + * 维护状态 0关1开 + */ + private int maintainFlag; + + /** + * 版本号 + */ + private String versionNum; + + /** + * 维护信息 + */ + private String maintainInfo; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml index 4a4be7f6e..c4bf73a64 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml @@ -5,7 +5,10 @@ + + + From 483c9c58c704c257247780849a63c5666a9ef3fc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 7 Dec 2019 15:44:02 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=BC=80=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/ScanFlagDTO.java | 49 +++++++++++++++++++ .../controller/ApiScanSwitchController.java | 11 +++-- .../esua/epdc/service/ScanSwitchService.java | 5 +- .../service/impl/ScanSwitchServiceImpl.java | 18 ++++--- 4 files changed, 70 insertions(+), 13 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java new file mode 100644 index 000000000..864c14a84 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java @@ -0,0 +1,49 @@ +/** + * 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.dto; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 扫码开关 + * + * @author wanggongfeng + * @since v1.0.0 2019-10-10 + */ +@Data +public class ScanFlagDTO implements Serializable { + + /** + * 扫码开关 0关1开 + */ + private int scanFlag; + + /** + * 维护状态：0-关闭维护，1-开启维护 + */ + private int maintainFlag; + + /** + * 维护信息 + */ + private String maintainInfo; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java index 343e73b6a..dd0bff3c7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java @@ -18,17 +18,18 @@ 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.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.ScanFlagDTO; import com.elink.esua.epdc.dto.ScanSwitchDTO; import com.elink.esua.epdc.service.ScanSwitchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import java.util.Map; @@ -89,8 +90,8 @@ public class ApiScanSwitchController { * @date 2019/10/10 11:58 */ @GetMapping("scanSwitch") - public Result> get(){ - Map data = scanSwitchService.getOne(); - return new Result>().ok(data); + public Result get(){ + ScanFlagDTO data = scanSwitchService.getOne(); + return new Result().ok(data); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java index 57c524118..49109ad83 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java @@ -19,6 +19,7 @@ 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.ScanFlagDTO; import com.elink.esua.epdc.dto.ScanSwitchDTO; import com.elink.esua.epdc.entity.ScanSwitchEntity; @@ -97,9 +98,9 @@ public interface ScanSwitchService extends BaseService { /*** * 前端获取开关 * @param - * @return com.elink.esua.epdc.dto.ScanSwitchDTO + * @return com.elink.esua.epdc.dto.ScanFlagDTO * @author qushutong * @date 2019/10/10 12:01 */ - Map getOne(); + ScanFlagDTO getOne(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java index ba34178b0..61da8fb5c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java @@ -20,10 +20,11 @@ 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.ScanSwitchDao; +import com.elink.esua.epdc.dto.ScanFlagDTO; import com.elink.esua.epdc.dto.ScanSwitchDTO; import com.elink.esua.epdc.entity.ScanSwitchEntity; import com.elink.esua.epdc.service.ScanSwitchService; @@ -33,7 +34,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -101,13 +101,19 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl getOne() { + public ScanFlagDTO getOne() { + ScanFlagDTO scanFlagDTO = new ScanFlagDTO(); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.orderByDesc("updated_time"); ScanSwitchEntity scanSwitchEntity = baseDao.selectOne(wrapper); - Map map=new HashMap<>(); - map.put("switch",scanSwitchEntity.getScanFlag()+""); - return map; + int scanFlag = scanSwitchEntity.getScanFlag(); + int maintainFlag = scanSwitchEntity.getMaintainFlag(); + String maintainInfo = scanSwitchEntity.getMaintainInfo(); + + scanFlagDTO.setScanFlag(scanFlag); + scanFlagDTO.setMaintainFlag(maintainFlag); + scanFlagDTO.setMaintainInfo(maintainInfo); + return scanFlagDTO; } } \ No newline at end of file From 1198e18abba47632ef8d64847d19127f0ba3ff18 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Sat, 7 Dec 2019 16:09:30 +0800 Subject: [PATCH 06/27] =?UTF-8?q?=E6=96=B0=E5=A2=9EcheckWxUnionId=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9user/ma/getToken=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiAppUserController.java | 11 ++++++ .../esua/epdc/feign/UserFeignClient.java | 32 ++++++----------- .../fallback/UserFeignClientFallback.java | 15 +++----- .../esua/epdc/service/AppUserService.java | 8 +++++ .../epdc/service/impl/AppUserServiceImpl.java | 27 +++++++++++++- .../form/EpdcAppQueryUserInfoFormDTO.java | 20 +++++++++++ .../controller/EpdcAppUserController.java | 12 +++++++ .../elink/esua/epdc/service/UserService.java | 8 +++++ .../epdc/service/impl/UserServiceImpl.java | 35 +++++++++++++++++++ 9 files changed, 135 insertions(+), 33 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppQueryUserInfoFormDTO.java 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 f61945492..8c462b1fa 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 @@ -253,4 +253,15 @@ public class ApiAppUserController { return appUserService.invitationRecord(); } + /** + * @param tokenDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 查看用户是否已保存unionId + * @Date 2019/12/7 14:32 + **/ + @GetMapping("user/checkWxUnionId") + public Result checkWxUnionId(@LoginUser TokenDto tokenDto) { + return appUserService.checkWxUnionId(tokenDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index af2dad7c5..b9854986c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -47,28 +47,6 @@ public interface UserFeignClient { @GetMapping("app-user/epdc-app/user/getById/{userId}") Result getUserInfoById(@PathVariable("userId") String userId); - /** - * 获取用户信息（登录用） - * - * @param openId - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author work@yujt.net.cn - * @date 2019/9/20 18:43 - */ - @GetMapping("app-user/epdc-app/user/getForLogin/{openId}") - Result getUserForLoginByOpenId(@PathVariable("openId") String openId); - - /** - * 获取用户信息 - * - * @param unionId - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author yujintao - * @date 2019/9/7 11:04 - */ - @GetMapping("app-user/epdc-app/user/getByUnionId/{unionId}") - Result getUserInfoByUnionId(@PathVariable("unionId") String unionId); - /** * 用户注册 * @@ -338,4 +316,14 @@ public interface UserFeignClient { */ @GetMapping("app-user/epdc-app/user/invitationRecord") Result> invitationRecord(); + + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 根据openId或者unionId查询用户信息 + * @Date 2019/12/7 14:11 + **/ + @PostMapping(value="app-user/epdc-app/user/queryUserDto", consumes = MediaType.APPLICATION_JSON_VALUE) + Result queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 8cf5899f4..962b5f70b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -31,16 +31,6 @@ public class UserFeignClientFallback implements UserFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoById", userId); } - @Override - public Result getUserForLoginByOpenId(String openId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserForLoginByOpenId", openId); - } - - @Override - public Result getUserInfoByUnionId(String unionId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoByUnionId", unionId); - } - @Override public Result userRegist(UserDTO userDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "userRegist", userDto); @@ -164,4 +154,9 @@ public class UserFeignClientFallback implements UserFeignClient { public Result> invitationRecord() { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "invitationRecord"); } + + @Override + public Result queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "queryUserDto",formDTO); + } } 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 10f9227ed..4155c3c28 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 @@ -208,4 +208,12 @@ public interface AppUserService { */ Result> invitationRecord(); + /** + * @param tokenDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 查看用户是否已保存unionId + * @Date 2019/12/7 14:32 + **/ + Result checkWxUnionId(TokenDto tokenDto); } 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 fc7bc3bb7..fc8fe2210 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 @@ -194,7 +194,9 @@ public class AppUserServiceImpl implements AppUserService { */ private Result getTokenByOpenId(String openId) { // 查询当前微信是否已注册用户 - Result userInfoResult = userFeignClient.getUserForLoginByOpenId(openId); + EpdcAppQueryUserInfoFormDTO formDTO = new EpdcAppQueryUserInfoFormDTO(); + formDTO.setOpenId(openId); + Result userInfoResult = userFeignClient.queryUserDto(formDTO); if (!userInfoResult.success()) { return new Result().error(userInfoResult.getMsg()); } @@ -978,4 +980,27 @@ public class AppUserServiceImpl implements AppUserService { public Result> invitationRecord() { return userFeignClient.invitationRecord(); } + + /** + * @param tokenDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 查看用户是否已保存unionId + * @Date 2019/12/7 14:32 + * data:0 无unionId 1:有unionId + **/ + @Override + public Result checkWxUnionId(TokenDto tokenDto) { + Result result = new Result(); + Result userDTOResult = userFeignClient.getUserInfoById(tokenDto.getUserId()); + if (!userDTOResult.success() || null == userDTOResult.getData()) { + throw new RenException("查询用户信息失败"); + } + if (StringUtils.isNotBlank(userDTOResult.getData().getWxUnionId())) { + result.setData("1"); + } else { + result.setData("0"); + } + return result; + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppQueryUserInfoFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppQueryUserInfoFormDTO.java new file mode 100644 index 000000000..47acb88df --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppQueryUserInfoFormDTO.java @@ -0,0 +1,20 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 获取用户信息入参DTO + * @Author yinzuomei + * @Date 2019/12/7 13:55 + */ +@Data +public class EpdcAppQueryUserInfoFormDTO implements Serializable { + private static final long serialVersionUID = 7818827219206113924L; + + private String openId; + + + private String unionId; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java index 1ac771a1f..40dd10ad9 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java @@ -90,6 +90,18 @@ public class EpdcAppUserController { return userService.getUserInfoByUnionId(unionId); } + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 获取用户信息 合并上面的getByUnionId、getForLogin方法 + * @Date 2019/12/7 13:57 + **/ + @PostMapping("queryUserDto") + public Result queryUserDto(@RequestBody EpdcAppQueryUserInfoFormDTO formDTO) { + return userService.queryUserDto(formDTO); + } + /** * 移动端用户注册 * diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index 9c7594ee7..6185fc88e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -250,4 +250,12 @@ public interface UserService extends BaseService { */ Result getUserLastSwitchGird(String openId); + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 获取用户信息 合并上面的getByUnionId、getForLogin方法 + * @Date 2019/12/7 13:58 + **/ + Result queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index da08aef69..1a34af63b 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -722,4 +722,39 @@ public class UserServiceImpl extends BaseServiceImpl implem return new Result().ok(resultDto); } + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 获取用户信息 合并上面的getByUnionId、getForLogin方法 + * @Date 2019/12/7 13:58 + **/ + @Override + public Result queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO) { + if (!StringUtils.isNotBlank(formDTO.getUnionId()) && !StringUtils.isNotBlank(formDTO.getOpenId())) { + return new Result().error("openId、unionId不能同时为空"); + } + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(formDTO.getUnionId()), UserFieldConsant.WX_UNION_ID, formDTO.getUnionId()) + .eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId()) + .orderByDesc(FieldConstant.CREATED_TIME); + UserEntity userEntity = this.baseDao.selectOne(wrapper); + + if (null != userEntity) { + QueryWrapper ugWrapper = new QueryWrapper<>(); + ugWrapper.eq(UserFieldConsant.USER_ID, userEntity.getId()) + .orderByDesc(UserFieldConsant.SWITCHED_TIME); + List gridRelations = userGridRelationService.listUserGrid(userEntity.getId()); + if (CollUtil.isNotEmpty(gridRelations)) { + UserDTO dto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class); + dto.setGridId(gridRelations.get(NumConstant.ZERO).getGridId()); + dto.setGrid(gridRelations.get(NumConstant.ZERO).getGrid()); + return new Result().ok(dto); + } + } else { + return new Result().error("没有找到用户信息"); + } + return new Result<>(); + } + } From 26e3e38fe5d5eb6fb3588d549d9215368f8ee218 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 7 Dec 2019 16:10:04 +0800 Subject: [PATCH 07/27] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=BC=80=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/ScanFlagDTO.java | 3 ++ .../esua/epdc/dto/ScanVersionNumDTO.java | 41 +++++++++++++++++++ .../controller/ApiScanSwitchController.java | 5 ++- .../esua/epdc/service/ScanSwitchService.java | 3 +- .../service/impl/ScanSwitchServiceImpl.java | 11 +++-- 5 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanVersionNumDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java index 864c14a84..4dec0a0ec 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto; import lombok.Data; +import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -34,11 +35,13 @@ public class ScanFlagDTO implements Serializable { /** * 扫码开关 0关1开 */ + @NotNull private int scanFlag; /** * 维护状态：0-关闭维护，1-开启维护 */ + @NotNull private int maintainFlag; /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanVersionNumDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanVersionNumDTO.java new file mode 100644 index 000000000..97db58377 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanVersionNumDTO.java @@ -0,0 +1,41 @@ +/** + * 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.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 扫码开关 + * + * @author wanggongfeng + * @since v1.0.0 2019-10-10 + */ +@Data +public class ScanVersionNumDTO implements Serializable { + + /** + * 版本号 + */ + @NotBlank(message = "版本号不能为空") + private String versionNum; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java index dd0bff3c7..aff37fc20 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java @@ -26,6 +26,7 @@ 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.ScanFlagDTO; import com.elink.esua.epdc.dto.ScanSwitchDTO; +import com.elink.esua.epdc.dto.ScanVersionNumDTO; import com.elink.esua.epdc.service.ScanSwitchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -90,8 +91,8 @@ public class ApiScanSwitchController { * @date 2019/10/10 11:58 */ @GetMapping("scanSwitch") - public Result get(){ - ScanFlagDTO data = scanSwitchService.getOne(); + public Result get(ScanVersionNumDTO scanVersionNumDTO){ + ScanFlagDTO data = scanSwitchService.getOne(scanVersionNumDTO); return new Result().ok(data); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java index 49109ad83..8c736eaf7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.ScanFlagDTO; import com.elink.esua.epdc.dto.ScanSwitchDTO; +import com.elink.esua.epdc.dto.ScanVersionNumDTO; import com.elink.esua.epdc.entity.ScanSwitchEntity; import java.util.List; @@ -102,5 +103,5 @@ public interface ScanSwitchService extends BaseService { * @author qushutong * @date 2019/10/10 12:01 */ - ScanFlagDTO getOne(); + ScanFlagDTO getOne(ScanVersionNumDTO scanVersionNumDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java index 61da8fb5c..fe51f56f2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java @@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dao.ScanSwitchDao; import com.elink.esua.epdc.dto.ScanFlagDTO; import com.elink.esua.epdc.dto.ScanSwitchDTO; +import com.elink.esua.epdc.dto.ScanVersionNumDTO; import com.elink.esua.epdc.entity.ScanSwitchEntity; import com.elink.esua.epdc.service.ScanSwitchService; import org.apache.commons.lang3.StringUtils; @@ -101,15 +102,17 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); + public ScanFlagDTO getOne(ScanVersionNumDTO scanVersionNumDTO) { + ScanSwitchEntity scanSwitchEntityParam = new ScanSwitchEntity(); + String versionNum = scanVersionNumDTO.getVersionNum(); + scanSwitchEntityParam.setVersionNum(versionNum); + QueryWrapper wrapper = new QueryWrapper(scanSwitchEntityParam); wrapper.orderByDesc("updated_time"); ScanSwitchEntity scanSwitchEntity = baseDao.selectOne(wrapper); int scanFlag = scanSwitchEntity.getScanFlag(); int maintainFlag = scanSwitchEntity.getMaintainFlag(); String maintainInfo = scanSwitchEntity.getMaintainInfo(); - + ScanFlagDTO scanFlagDTO = new ScanFlagDTO(); scanFlagDTO.setScanFlag(scanFlag); scanFlagDTO.setMaintainFlag(maintainFlag); scanFlagDTO.setMaintainInfo(maintainInfo); From 7c12827c95652a4172f0d44d91c164a1b0bdddb5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 7 Dec 2019 16:14:42 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiScanSwitchController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java index aff37fc20..510c75dd3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java @@ -86,7 +86,7 @@ public class ApiScanSwitchController { /*** * 前端接口开关 - * @return com.elink.esua.epdc.commons.tools.utils.Result + * @return com.elink.esua.epdc.commons.tools.utils.Result * @author qushutong * @date 2019/10/10 11:58 */ From 758d62188cfa955acfe4b0007db302ab4c7b7a2e Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Sat, 7 Dec 2019 16:30:38 +0800 Subject: [PATCH 09/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9getTokenByOpenId?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/AppUserServiceImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 fc8fe2210..763583bee 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 @@ -100,17 +100,19 @@ public class AppUserServiceImpl implements AppUserService { @Override public Result getMpToken(EpdcAppUserTokenFormDTO formDto) { - return this.getTokenByOpenId(this.getWxMpUser(formDto.getWxCode()).getOpenId()); + return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode())); } @Override public Result getMaToken(EpdcAppUserMaTokenFormDTO formDto) { - return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode()).getOpenid()); + return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode())); } @Override public Result checkRegister(EpdcCheckRegisterFormDTO formDto) { - return this.getTokenByOpenId(formDto.getOpenId()); + WxMaJscode2SessionResult wxMaJscode2SessionResult=new WxMaJscode2SessionResult(); + wxMaJscode2SessionResult.setOpenid(formDto.getOpenId()); + return this.getTokenByOpenId(wxMaJscode2SessionResult); } @Override @@ -187,15 +189,16 @@ public class AppUserServiceImpl implements AppUserService { /** * 根据openId登录 * - * @param openId + * @param wxMaJscode2SessionResult * @return com.elink.esua.epdc.commons.tools.utils.Result * @author work@yujt.net.cn * @date 2019/9/20 18:46 */ - private Result getTokenByOpenId(String openId) { + private Result getTokenByOpenId(WxMaJscode2SessionResult wxMaJscode2SessionResult) { // 查询当前微信是否已注册用户 EpdcAppQueryUserInfoFormDTO formDTO = new EpdcAppQueryUserInfoFormDTO(); - formDTO.setOpenId(openId); + formDTO.setOpenId(wxMaJscode2SessionResult.getOpenid()); + formDTO.setUnionId(wxMaJscode2SessionResult.getUnionid()); Result userInfoResult = userFeignClient.queryUserDto(formDTO); if (!userInfoResult.success()) { return new Result().error(userInfoResult.getMsg()); From b9eb497344b00e48b1c7717fb9178930122fbec7 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 7 Dec 2019 16:37:19 +0800 Subject: [PATCH 10/27] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9ADTO?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpdcAppScanVersionNumDTO.java} | 4 +-- .../EpdcAppScanFlagDTO.java} | 4 +-- .../controller/ApiScanSwitchController.java | 12 ++++----- .../esua/epdc/entity/ScanSwitchEntity.java | 11 ++++++++ .../esua/epdc/service/ScanSwitchService.java | 8 +++--- .../service/impl/ScanSwitchServiceImpl.java | 25 ++++++++++++++++--- 6 files changed, 46 insertions(+), 18 deletions(-) rename esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/{ScanVersionNumDTO.java => form/EpdcAppScanVersionNumDTO.java} (90%) rename esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/{ScanFlagDTO.java => result/EpdcAppScanFlagDTO.java} (92%) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanVersionNumDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppScanVersionNumDTO.java similarity index 90% rename from esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanVersionNumDTO.java rename to esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppScanVersionNumDTO.java index 97db58377..2ead545d8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanVersionNumDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppScanVersionNumDTO.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.dto; +package com.elink.esua.epdc.dto.form; import lombok.Data; @@ -30,7 +30,7 @@ import java.io.Serializable; * @since v1.0.0 2019-10-10 */ @Data -public class ScanVersionNumDTO implements Serializable { +public class EpdcAppScanVersionNumDTO implements Serializable { /** * 版本号 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppScanFlagDTO.java similarity index 92% rename from esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java rename to esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppScanFlagDTO.java index 4dec0a0ec..3a2027aff 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ScanFlagDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppScanFlagDTO.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.elink.esua.epdc.dto; +package com.elink.esua.epdc.dto.result; import lombok.Data; @@ -30,7 +30,7 @@ import java.io.Serializable; * @since v1.0.0 2019-10-10 */ @Data -public class ScanFlagDTO implements Serializable { +public class EpdcAppScanFlagDTO implements Serializable { /** * 扫码开关 0关1开 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java index 510c75dd3..3b38e1175 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java @@ -24,9 +24,9 @@ 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.ScanFlagDTO; import com.elink.esua.epdc.dto.ScanSwitchDTO; -import com.elink.esua.epdc.dto.ScanVersionNumDTO; +import com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO; +import com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO; import com.elink.esua.epdc.service.ScanSwitchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -86,13 +86,13 @@ public class ApiScanSwitchController { /*** * 前端接口开关 - * @return com.elink.esua.epdc.commons.tools.utils.Result + * @return com.elink.esua.epdc.commons.tools.utils.Result * @author qushutong * @date 2019/10/10 11:58 */ @GetMapping("scanSwitch") - public Result get(ScanVersionNumDTO scanVersionNumDTO){ - ScanFlagDTO data = scanSwitchService.getOne(scanVersionNumDTO); - return new Result().ok(data); + public Result get(EpdcAppScanVersionNumDTO scanVersionNumDTO){ + EpdcAppScanFlagDTO data = scanSwitchService.getOne(scanVersionNumDTO); + return new Result().ok(data); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java index f6e916e77..d89db1824 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java @@ -56,4 +56,15 @@ public class ScanSwitchEntity extends BaseEpdcEntity { */ private String maintainInfo; + /** + * 扫码开关名称 + */ + private String scanFlagName; + + /** + * 维护状态名称 + */ + private String maintainFlagName; + + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java index 8c736eaf7..2e37d27af 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java @@ -19,9 +19,9 @@ 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.ScanFlagDTO; import com.elink.esua.epdc.dto.ScanSwitchDTO; -import com.elink.esua.epdc.dto.ScanVersionNumDTO; +import com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO; +import com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO; import com.elink.esua.epdc.entity.ScanSwitchEntity; import java.util.List; @@ -99,9 +99,9 @@ public interface ScanSwitchService extends BaseService { /*** * 前端获取开关 * @param - * @return com.elink.esua.epdc.dto.ScanFlagDTO + * @return com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO * @author qushutong * @date 2019/10/10 12:01 */ - ScanFlagDTO getOne(ScanVersionNumDTO scanVersionNumDTO); + EpdcAppScanFlagDTO getOne(EpdcAppScanVersionNumDTO scanVersionNumDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java index fe51f56f2..45a5079c5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java @@ -24,9 +24,9 @@ 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.dao.ScanSwitchDao; -import com.elink.esua.epdc.dto.ScanFlagDTO; import com.elink.esua.epdc.dto.ScanSwitchDTO; -import com.elink.esua.epdc.dto.ScanVersionNumDTO; +import com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO; +import com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO; import com.elink.esua.epdc.entity.ScanSwitchEntity; import com.elink.esua.epdc.service.ScanSwitchService; import org.apache.commons.lang3.StringUtils; @@ -55,6 +55,23 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl list = page.getRecords(); + for(int i = 0 ; i < list.size() ; i++){ + ScanSwitchEntity scanSwitchEntity = list.get(i); + int scanFlag = scanSwitchEntity.getScanFlag(); + int maintainFlag = scanSwitchEntity.getMaintainFlag(); + if(scanFlag == 0){ + scanSwitchEntity.setScanFlagName("不需要扫码"); + }else{ + scanSwitchEntity.setScanFlagName("需要扫码"); + } + if(maintainFlag == 0){ + scanSwitchEntity.setMaintainFlagName("关闭维护"); + }else{ + scanSwitchEntity.setMaintainFlagName("开启维护"); + } + }*/ + return getPageData(page, ScanSwitchDTO.class); } @@ -102,7 +119,7 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl Date: Sat, 7 Dec 2019 16:40:31 +0800 Subject: [PATCH 11/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9queryUserDto=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/UserServiceImpl.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 1a34af63b..ad804ce80 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -735,11 +735,17 @@ public class UserServiceImpl extends BaseServiceImpl implem return new Result().error("openId、unionId不能同时为空"); } QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(formDTO.getUnionId()), UserFieldConsant.WX_UNION_ID, formDTO.getUnionId()) - .eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId()) - .orderByDesc(FieldConstant.CREATED_TIME); - UserEntity userEntity = this.baseDao.selectOne(wrapper); - + UserEntity userEntity = null; + if (StringUtils.isNotBlank(formDTO.getUnionId())) { + wrapper.eq(UserFieldConsant.WX_UNION_ID, formDTO.getUnionId()); + userEntity = this.baseDao.selectOne(wrapper); + } + if (null == userEntity) { + wrapper.eq(UserFieldConsant.WX_UNION_ID, formDTO.getUnionId()) + .eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId()) + .orderByDesc(FieldConstant.CREATED_TIME); + userEntity = this.baseDao.selectOne(wrapper); + } if (null != userEntity) { QueryWrapper ugWrapper = new QueryWrapper<>(); ugWrapper.eq(UserFieldConsant.USER_ID, userEntity.getId()) From 4872b664c2bef8a293117079d25bf2d3b99e7ede Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 7 Dec 2019 16:41:40 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/entity/ScanSwitchEntity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java index d89db1824..5bb86d5cc 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java @@ -59,12 +59,12 @@ public class ScanSwitchEntity extends BaseEpdcEntity { /** * 扫码开关名称 */ - private String scanFlagName; + //private String scanFlagName; /** * 维护状态名称 */ - private String maintainFlagName; + //private String maintainFlagName; } \ No newline at end of file From daf1920a5ebcccd6c854d3bf280bd88353f7b377 Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 7 Dec 2019 16:55:35 +0800 Subject: [PATCH 13/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=B6=E7=9A=84=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/UserServiceImpl.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index ad804ce80..38112fe25 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -92,6 +92,7 @@ public class UserServiceImpl extends BaseServiceImpl implem private AdminFeignClient adminFeignClient; @Autowired private PartyAuthenticationFailedDao partyAuthenticationFailedDao; + @Override public PageData page(Map params) { this.verifyParams(params); @@ -425,8 +426,8 @@ public class UserServiceImpl extends BaseServiceImpl implem // userGridRel.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId()); // userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity()); // userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId()); - Result parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRel.getGrid()); - if(!parentAndAllDeptDTOResult.success()){ + Result parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGrid()); + if (!parentAndAllDeptDTOResult.success()) { return new Result().error(parentAndAllDeptDTOResult.getMsg()); } userGridRel.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); @@ -742,14 +743,14 @@ public class UserServiceImpl extends BaseServiceImpl implem } if (null == userEntity) { wrapper.eq(UserFieldConsant.WX_UNION_ID, formDTO.getUnionId()) - .eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId()) - .orderByDesc(FieldConstant.CREATED_TIME); + .eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId()) + .orderByDesc(FieldConstant.CREATED_TIME); userEntity = this.baseDao.selectOne(wrapper); } if (null != userEntity) { QueryWrapper ugWrapper = new QueryWrapper<>(); ugWrapper.eq(UserFieldConsant.USER_ID, userEntity.getId()) - .orderByDesc(UserFieldConsant.SWITCHED_TIME); + .orderByDesc(UserFieldConsant.SWITCHED_TIME); List gridRelations = userGridRelationService.listUserGrid(userEntity.getId()); if (CollUtil.isNotEmpty(gridRelations)) { UserDTO dto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class); @@ -757,10 +758,8 @@ public class UserServiceImpl extends BaseServiceImpl implem dto.setGrid(gridRelations.get(NumConstant.ZERO).getGrid()); return new Result().ok(dto); } - } else { - return new Result().error("没有找到用户信息"); } - return new Result<>(); + return new Result(); } } From 7441dd99f006285396ff07487c8a042a2c2acd50 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Sat, 7 Dec 2019 17:00:23 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=20=E6=94=B9=E6=88=90?= =?UTF-8?q?=E5=9B=9B=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/UserServiceImpl.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 38112fe25..ba86bec7f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -506,11 +506,21 @@ public class UserServiceImpl extends BaseServiceImpl implem String identityNo = userDto.getIdentityNo(); if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { PartyMembersEntity partyMembersEntity = new PartyMembersEntity(); - //修改数据库结构 - partyMembersEntity.setAllDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity() + "-" + userGridRelation.getGrid()); - partyMembersEntity.setAllDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId() + "," + userGridRelation.getGridId()); - partyMembersEntity.setParentDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity()); - partyMembersEntity.setParentDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId()); + + Result parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRelation.getGrid()); + if(!parentAndAllDeptDTOResult.success()){ + return new Result().error(parentAndAllDeptDTOResult.getMsg()); + } + partyMembersEntity.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); + partyMembersEntity.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds()); + partyMembersEntity.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames()); + partyMembersEntity.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds()); + +// //修改数据库结构 +// partyMembersEntity.setAllDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity() + "-" + userGridRelation.getGrid()); +// partyMembersEntity.setAllDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId() + "," + userGridRelation.getGridId()); +// partyMembersEntity.setParentDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity()); +// partyMembersEntity.setParentDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId()); partyMembersEntity.setGridId(userGridRelation.getGridId()); partyMembersEntity.setGridName(userGridRelation.getGrid()); From 737576379efdb7210768f164a669e3a2c795aedf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Sat, 7 Dec 2019 17:18:14 +0800 Subject: [PATCH 15/27] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 9337d3586..7cc56a2d6 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -37,6 +37,9 @@ item.USER_FACE, item.IS_PARTY_MEMBER, item.CREATED_TIME, + eve.APPROVE_NUM, + eve.OPPOSE_NUM, + eve.COMMENT_NUM, ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum, cate.CATEGORY_NAME, img.IMG_URL, From b08eed8b4282ff56e8e018d3799043b2e9321b00 Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 7 Dec 2019 17:20:22 +0800 Subject: [PATCH 16/27] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=97=B6=EF=BC=8C=E4=B8=BB=E8=A6=81=E7=94=A8?= =?UTF-8?q?unionid=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EpdcCompleteUserInfoFormDTO.java | 15 +++ .../epdc/service/impl/AppUserServiceImpl.java | 13 ++- .../src/main/resources/registry.conf | 2 +- .../epdc/dto/epdc/EpdcCompleteAppUserDTO.java | 5 + .../form/EpdcCheckUserRegisterFromDTO.java | 5 + .../epdc/service/impl/UserServiceImpl.java | 102 ++++++++++-------- 6 files changed, 97 insertions(+), 45 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java index dfbc61f96..8d89fe03a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java @@ -57,4 +57,19 @@ public class EpdcCompleteUserInfoFormDTO implements Serializable { */ @NotBlank(message = "性别不能为空") private String sex; + + /** + * 微信code + */ + private String wxCode; + + /** + * 用户信息 + */ + private String encryptedData; + + /** + * 加密算法的初始向量 + */ + private String iv; } 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 763583bee..ac58194a5 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 @@ -110,7 +110,7 @@ public class AppUserServiceImpl implements AppUserService { @Override public Result checkRegister(EpdcCheckRegisterFormDTO formDto) { - WxMaJscode2SessionResult wxMaJscode2SessionResult=new WxMaJscode2SessionResult(); + WxMaJscode2SessionResult wxMaJscode2SessionResult = new WxMaJscode2SessionResult(); wxMaJscode2SessionResult.setOpenid(formDto.getOpenId()); return this.getTokenByOpenId(wxMaJscode2SessionResult); } @@ -669,6 +669,7 @@ public class AppUserServiceImpl implements AppUserService { // 查询当前微信注册状态 EpdcCheckUserRegisterFromDTO checkFromDto = new EpdcCheckUserRegisterFromDTO(); checkFromDto.setOpenId(openId); + checkFromDto.setWxUnionId(unionId); checkFromDto.setGridId(formDto.getGridId()); Result userResult = userFeignClient.getUserRegisterState(checkFromDto); if (!userResult.success()) { @@ -764,8 +765,18 @@ public class AppUserServiceImpl implements AppUserService { @Override public Result completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) { + WxMaUserInfo wxMaUserInfo = null; + if (StringUtils.isNotBlank(infoDto.getWxCode())) { + String sessionKey = this.getUserSessionKey(infoDto.getWxCode()); + wxMaUserInfo = wxMaServiceUtils.normalWxMaService().getUserService().getUserInfo(sessionKey, infoDto.getEncryptedData(), infoDto.getIv()); + if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) { + return new Result().error("解析微信开放平台ID失败"); + } + } + UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class); userDto.setId(tokenDto.getUserId()); + userDto.setWxUnionId(wxMaUserInfo.getUnionId()); // 党员提交，验证身份证号 if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf index bccc306f5..fb64abd71 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf @@ -14,7 +14,7 @@ config { type = "nacos" nacos { - serverAddr = "nacos.server-addr" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java index fa7b52f85..f9a2e0cdf 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java @@ -94,4 +94,9 @@ public class EpdcCompleteAppUserDTO implements Serializable { */ private String state; + /** + * 微信unionId + */ + private String wxUnionId; + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java index 41efa78fe..87c8f9269 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCheckUserRegisterFromDTO.java @@ -17,6 +17,11 @@ public class EpdcCheckUserRegisterFromDTO implements Serializable { */ private String openId; + /** + * 微信unionId + */ + private String wxUnionId; + /** * 网格ID */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index ba86bec7f..0871b5228 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -364,22 +364,24 @@ public class UserServiceImpl extends BaseServiceImpl implem @Override public Result checkUserRegisterState(EpdcCheckUserRegisterFromDTO fromDto) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(UserFieldConsant.WX_OPEN_ID, fromDto.getOpenId()) - .select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG, - FieldConstant.MOBILE, UserFieldConsant.REAL_NAME, - FieldConstant.STATE, UserFieldConsant.PARTY_FLAG, UserFieldConsant.REMARK) - .orderByDesc(FieldConstant.CREATED_TIME); - List userEntityList = this.baseDao.selectList(wrapper); + + UserDTO userDto = this.selectUserByWxInfo(fromDto.getOpenId(), fromDto.getWxUnionId()); + +// QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.eq(UserFieldConsant.WX_OPEN_ID, fromDto.getOpenId()) +// .select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG, +// FieldConstant.MOBILE, UserFieldConsant.REAL_NAME, +// FieldConstant.STATE, UserFieldConsant.PARTY_FLAG, UserFieldConsant.REMARK) +// .orderByDesc(FieldConstant.CREATED_TIME); +// List userEntityList = this.baseDao.selectList(wrapper); EpdcUserRegisterInfoResultDTO resultDto = new EpdcUserRegisterInfoResultDTO(); resultDto.setGridId(fromDto.getGridId()); // 已注册 - if (CollUtil.isNotEmpty(userEntityList) && null != userEntityList.get(NumConstant.ZERO)) { - UserEntity userEntity = userEntityList.get(NumConstant.ZERO); - resultDto.setUserDTO(ConvertUtils.sourceToTarget(userEntity, UserDTO.class)); + if (null != userDto) { + resultDto.setUserDTO(userDto); // 获取用户关联当前网格信息 - UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), fromDto.getGridId()); + UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userDto.getId(), fromDto.getGridId()); // 未绑定当前网格 if (null == relationInfo) { resultDto.setRegisterState(NumConstant.ONE); @@ -507,8 +509,8 @@ public class UserServiceImpl extends BaseServiceImpl implem if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { PartyMembersEntity partyMembersEntity = new PartyMembersEntity(); - Result parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRelation.getGrid()); - if(!parentAndAllDeptDTOResult.success()){ + Result parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRelation.getGrid()); + if (!parentAndAllDeptDTOResult.success()) { return new Result().error(parentAndAllDeptDTOResult.getMsg()); } partyMembersEntity.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); @@ -622,25 +624,25 @@ public class UserServiceImpl extends BaseServiceImpl implem if (StringUtils.isBlank(formDTO.getAuthenticatedFlag())) { formDTO.setAuthenticatedFlag(YesOrNoEnum.NO.value()); } - UserDTO userDTO = this.get(formDTO.getUserId()); - if (null != userDTO) { - userDTO.setRemark(formDTO.getRemark());//审核不通过的原因 - 2019.12.05.zy + UserDTO userDto = this.get(formDTO.getUserId()); + if (null != userDto) { + userDto.setRemark(formDTO.getRemark());//审核不通过的原因 - 2019.12.05.zy if (YesOrNoEnum.NO.value().equals(formDTO.getAuthenticatedFlag())) {//不通过 - userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value()); + userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value()); } else if (YesOrNoEnum.YES.value().equals(formDTO.getAuthenticatedFlag())) {//通过 - userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value()); + userDto.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value()); } else { throw new RenException("是否认证通过数据不匹配"); } - this.update(userDTO); + this.update(userDto); //插入认证历史表 UserAuthenticateHistoryEntity authenticateHistoryEntity = new UserAuthenticateHistoryEntity(); - authenticateHistoryEntity.setUserId(userDTO.getId()); - authenticateHistoryEntity.setMobile(userDTO.getMobile()); - authenticateHistoryEntity.setRealName(userDTO.getRealName()); - authenticateHistoryEntity.setAddress(userDTO.getAddress()); + authenticateHistoryEntity.setUserId(userDto.getId()); + authenticateHistoryEntity.setMobile(userDto.getMobile()); + authenticateHistoryEntity.setRealName(userDto.getRealName()); + authenticateHistoryEntity.setAddress(userDto.getAddress()); authenticateHistoryEntity.setAuthenticatedFlag(formDTO.getAuthenticatedFlag());//是否认证通过 0未通过1通过 - //authenticateHistoryEntity.setRemark(userDTO.getRemark()); + //authenticateHistoryEntity.setRemark(userDto.getRemark()); authenticateHistoryEntity.setRemark(formDTO.getRemark()); //审核不通过的原因 - 2019.12.05.zy userAuthenticateHistoryDao.insert(authenticateHistoryEntity); } @@ -742,34 +744,48 @@ public class UserServiceImpl extends BaseServiceImpl implem **/ @Override public Result queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO) { - if (!StringUtils.isNotBlank(formDTO.getUnionId()) && !StringUtils.isNotBlank(formDTO.getOpenId())) { - return new Result().error("openId、unionId不能同时为空"); + UserDTO userDto = this.selectUserByWxInfo(formDTO.getOpenId(), formDTO.getUnionId()); + if (null != userDto) { + QueryWrapper ugWrapper = new QueryWrapper<>(); + ugWrapper.eq(UserFieldConsant.USER_ID, userDto.getId()) + .orderByDesc(UserFieldConsant.SWITCHED_TIME); + List gridRelations = userGridRelationService.listUserGrid(userDto.getId()); + if (CollUtil.isNotEmpty(gridRelations)) { + userDto.setGridId(gridRelations.get(NumConstant.ZERO).getGridId()); + userDto.setGrid(gridRelations.get(NumConstant.ZERO).getGrid()); + return new Result().ok(userDto); + } + } + return new Result(); + } + + /** + * 根据微信信息查询用户 + * + * @param openId + * @param unionId + * @return com.elink.esua.epdc.dto.UserDTO + * @author work@yujt.net.cn + * @date 2019/12/7 17:19 + */ + private UserDTO selectUserByWxInfo(String openId, String unionId) { + if (!StringUtils.isNotBlank(openId) && !StringUtils.isNotBlank(unionId)) { + throw new RenException("openId、unionId不能同时为空"); } QueryWrapper wrapper = new QueryWrapper<>(); UserEntity userEntity = null; - if (StringUtils.isNotBlank(formDTO.getUnionId())) { - wrapper.eq(UserFieldConsant.WX_UNION_ID, formDTO.getUnionId()); + if (StringUtils.isNotBlank(unionId)) { + wrapper.eq(UserFieldConsant.WX_UNION_ID, unionId); userEntity = this.baseDao.selectOne(wrapper); } if (null == userEntity) { - wrapper.eq(UserFieldConsant.WX_UNION_ID, formDTO.getUnionId()) - .eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId()) + wrapper.eq(UserFieldConsant.WX_UNION_ID, unionId) + .or() + .eq(StringUtils.isNotBlank(openId), UserFieldConsant.WX_OPEN_ID, openId) .orderByDesc(FieldConstant.CREATED_TIME); userEntity = this.baseDao.selectOne(wrapper); } - if (null != userEntity) { - QueryWrapper ugWrapper = new QueryWrapper<>(); - ugWrapper.eq(UserFieldConsant.USER_ID, userEntity.getId()) - .orderByDesc(UserFieldConsant.SWITCHED_TIME); - List gridRelations = userGridRelationService.listUserGrid(userEntity.getId()); - if (CollUtil.isNotEmpty(gridRelations)) { - UserDTO dto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class); - dto.setGridId(gridRelations.get(NumConstant.ZERO).getGridId()); - dto.setGrid(gridRelations.get(NumConstant.ZERO).getGrid()); - return new Result().ok(dto); - } - } - return new Result(); + return ConvertUtils.sourceToTarget(userEntity, UserDTO.class); } } From c247792da4418e358ae6b9f30bde82cff2f307b6 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Sat, 7 Dec 2019 17:24:07 +0800 Subject: [PATCH 17/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9saveUserOrBindGrid?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/service/impl/UserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index ad804ce80..2ed35c411 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -425,7 +425,7 @@ public class UserServiceImpl extends BaseServiceImpl implem // userGridRel.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId()); // userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity()); // userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId()); - Result parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRel.getGrid()); + Result parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRel.getGridId().toString()); if(!parentAndAllDeptDTOResult.success()){ return new Result().error(parentAndAllDeptDTOResult.getMsg()); } From fb19d90743b7bd7937420dd4a77f4e74f8a09f7c Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 7 Dec 2019 17:51:35 +0800 Subject: [PATCH 18/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=B6=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/UserServiceImpl.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 83c97a184..b1b86efbc 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -428,8 +428,8 @@ public class UserServiceImpl extends BaseServiceImpl implem // userGridRel.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId()); // userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity()); // userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId()); - Result parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRel.getGridId().toString()); - if(!parentAndAllDeptDTOResult.success()){ + Result parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGridId().toString()); + if (!parentAndAllDeptDTOResult.success()) { return new Result().error(parentAndAllDeptDTOResult.getMsg()); } userGridRel.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); @@ -769,8 +769,8 @@ public class UserServiceImpl extends BaseServiceImpl implem * @date 2019/12/7 17:19 */ private UserDTO selectUserByWxInfo(String openId, String unionId) { - if (!StringUtils.isNotBlank(openId) && !StringUtils.isNotBlank(unionId)) { - throw new RenException("openId、unionId不能同时为空"); + if (StringUtils.isBlank(openId)) { + throw new RenException("openId不能同时为空"); } QueryWrapper wrapper = new QueryWrapper<>(); UserEntity userEntity = null; @@ -779,9 +779,7 @@ public class UserServiceImpl extends BaseServiceImpl implem userEntity = this.baseDao.selectOne(wrapper); } if (null == userEntity) { - wrapper.eq(UserFieldConsant.WX_UNION_ID, unionId) - .or() - .eq(StringUtils.isNotBlank(openId), UserFieldConsant.WX_OPEN_ID, openId) + wrapper.eq(UserFieldConsant.WX_OPEN_ID, openId) .orderByDesc(FieldConstant.CREATED_TIME); userEntity = this.baseDao.selectOne(wrapper); } From e2b8e869ad39d05dbb45c8155517134d4ada7eb5 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 7 Dec 2019 17:56:27 +0800 Subject: [PATCH 19/27] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/entity/ScanSwitchEntity.java | 11 ----------- .../service/impl/ScanSwitchServiceImpl.java | 17 ----------------- 2 files changed, 28 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java index 5bb86d5cc..f6e916e77 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ScanSwitchEntity.java @@ -56,15 +56,4 @@ public class ScanSwitchEntity extends BaseEpdcEntity { */ private String maintainInfo; - /** - * 扫码开关名称 - */ - //private String scanFlagName; - - /** - * 维护状态名称 - */ - //private String maintainFlagName; - - } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java index 45a5079c5..43f8b477a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java @@ -55,23 +55,6 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl list = page.getRecords(); - for(int i = 0 ; i < list.size() ; i++){ - ScanSwitchEntity scanSwitchEntity = list.get(i); - int scanFlag = scanSwitchEntity.getScanFlag(); - int maintainFlag = scanSwitchEntity.getMaintainFlag(); - if(scanFlag == 0){ - scanSwitchEntity.setScanFlagName("不需要扫码"); - }else{ - scanSwitchEntity.setScanFlagName("需要扫码"); - } - if(maintainFlag == 0){ - scanSwitchEntity.setMaintainFlagName("关闭维护"); - }else{ - scanSwitchEntity.setMaintainFlagName("开启维护"); - } - }*/ - return getPageData(page, ScanSwitchDTO.class); } From ba611ae0edfb6ef2fa881db4847ca2880d6e4744 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Sat, 7 Dec 2019 18:07:19 +0800 Subject: [PATCH 20/27] =?UTF-8?q?selectUserByWxInfo=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/service/impl/UserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index b1b86efbc..0d95467bd 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -770,7 +770,7 @@ public class UserServiceImpl extends BaseServiceImpl implem */ private UserDTO selectUserByWxInfo(String openId, String unionId) { if (StringUtils.isBlank(openId)) { - throw new RenException("openId不能同时为空"); + throw new RenException("openId不能为空"); } QueryWrapper wrapper = new QueryWrapper<>(); UserEntity userEntity = null; From 2303adf4f3d8a35e5e81c46237502e72882779b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Sat, 7 Dec 2019 18:17:45 +0800 Subject: [PATCH 21/27] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/issue/IssueDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index c4dab514d..042f2fa4a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -345,7 +345,7 @@ COUNT( issue.ID ) AS issueNum, SUM( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.BROWSE_NUM + eve.COMMENT_NUM ) AS attitudeNum, cate.CATEGORY_NAME, - cate.ID AS categoryCode + cate.CATEGORY_CODE AS categoryCode FROM epdc_issue issue LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID From 45a4e277684e0808f41a66441d63f6b3edf1d354 Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 7 Dec 2019 19:19:56 +0800 Subject: [PATCH 22/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/AppUserServiceImpl.java | 15 +++++++-------- .../esua/epdc/service/impl/UserServiceImpl.java | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) 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 ac58194a5..7e12973bf 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 @@ -765,19 +765,18 @@ public class AppUserServiceImpl implements AppUserService { @Override public Result completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) { - WxMaUserInfo wxMaUserInfo = null; + UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class); + userDto.setId(tokenDto.getUserId()); + if (StringUtils.isNotBlank(infoDto.getWxCode())) { String sessionKey = this.getUserSessionKey(infoDto.getWxCode()); - wxMaUserInfo = wxMaServiceUtils.normalWxMaService().getUserService().getUserInfo(sessionKey, infoDto.getEncryptedData(), infoDto.getIv()); + WxMaUserInfo wxMaUserInfo = wxMaServiceUtils.normalWxMaService().getUserService().getUserInfo(sessionKey, infoDto.getEncryptedData(), infoDto.getIv()); if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) { return new Result().error("解析微信开放平台ID失败"); } + userDto.setWxUnionId(wxMaUserInfo.getUnionId()); } - UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class); - userDto.setId(tokenDto.getUserId()); - userDto.setWxUnionId(wxMaUserInfo.getUnionId()); - // 党员提交，验证身份证号 if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { String identityNo = userDto.getIdentityNo(); @@ -1011,9 +1010,9 @@ public class AppUserServiceImpl implements AppUserService { throw new RenException("查询用户信息失败"); } if (StringUtils.isNotBlank(userDTOResult.getData().getWxUnionId())) { - result.setData("1"); + result.setData(YesOrNoEnum.YES.value()); } else { - result.setData("0"); + result.setData(YesOrNoEnum.NO.value()); } return result; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 0d95467bd..4ce779a1d 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -779,6 +779,7 @@ public class UserServiceImpl extends BaseServiceImpl implem userEntity = this.baseDao.selectOne(wrapper); } if (null == userEntity) { + wrapper = new QueryWrapper<>(); wrapper.eq(UserFieldConsant.WX_OPEN_ID, openId) .orderByDesc(FieldConstant.CREATED_TIME); userEntity = this.baseDao.selectOne(wrapper); From 00ffd989293c3aca51d464beab0b3239d3b0482b Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 7 Dec 2019 19:35:35 +0800 Subject: [PATCH 23/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 2 +- .../com/elink/esua/epdc/service/impl/MessageServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7e12973bf..2ba55265c 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 @@ -641,7 +641,7 @@ public class AppUserServiceImpl implements AppUserService { authorization.setGrid(grid); // 暂用，部署生产环境时删除 - redisUtils.set("epdc:sys:security:cpuser:token:" + userId, token); + // redisUtils.set("epdc:sys:security:cpuser:token:" + userId, token); return authorization; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java index 60555578d..ee2f611b9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java @@ -69,9 +69,9 @@ public class MessageServiceImpl implements MessageService { public Result sendSmsCode(String mobile) { String smsCodeKey = RedisKeys.getPhoneSmsHistoryKey(mobile); if (null != redisUtils.get(smsCodeKey)) { - redisUtils.set(smsCodeKey, System.currentTimeMillis(), RedisUtils.MINUTE_ONE_EXPIRE); return new Result().error("操作频繁，请稍后重试"); } + redisUtils.set(smsCodeKey, System.currentTimeMillis(), RedisUtils.MINUTE_ONE_EXPIRE); return messageFeignClient.sendCode(mobile); } From c4f0e69cc0eb1d66ae3519ce3023563b6031d25a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 7 Dec 2019 19:43:28 +0800 Subject: [PATCH 24/27] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiScanSwitchController.java | 4 +++- .../com/elink/esua/epdc/dao/ScanSwitchDao.java | 11 +++++++++++ .../esua/epdc/service/ScanSwitchService.java | 2 +- .../service/impl/ScanSwitchServiceImpl.java | 17 ++--------------- .../src/main/resources/mapper/ScanSwitchDao.xml | 4 ++++ 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java index 3b38e1175..137b8ffb6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java @@ -92,7 +92,9 @@ public class ApiScanSwitchController { */ @GetMapping("scanSwitch") public Result get(EpdcAppScanVersionNumDTO scanVersionNumDTO){ - EpdcAppScanFlagDTO data = scanSwitchService.getOne(scanVersionNumDTO); + //效验数据 + ValidatorUtils.validateEntity(scanVersionNumDTO); + EpdcAppScanFlagDTO data = scanSwitchService.getOneScanInfo(scanVersionNumDTO); return new Result().ok(data); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ScanSwitchDao.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ScanSwitchDao.java index 5cc8adbfa..c73d1dbf3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ScanSwitchDao.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ScanSwitchDao.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.form.EpdcAppScanVersionNumDTO; +import com.elink.esua.epdc.dto.result.EpdcAppScanFlagDTO; import com.elink.esua.epdc.entity.ScanSwitchEntity; import org.apache.ibatis.annotations.Mapper; @@ -29,5 +31,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ScanSwitchDao extends BaseDao { + + /*** + * 前端获取开关 + * @param + * @return com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO + * @author qushutong + * @date 2019/10/10 12:01 + */ + EpdcAppScanFlagDTO selectOneOfScanInfo(EpdcAppScanVersionNumDTO scanVersionNumDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java index 2e37d27af..327a31b87 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java @@ -103,5 +103,5 @@ public interface ScanSwitchService extends BaseService { * @author qushutong * @date 2019/10/10 12:01 */ - EpdcAppScanFlagDTO getOne(EpdcAppScanVersionNumDTO scanVersionNumDTO); + EpdcAppScanFlagDTO getOneScanInfo(EpdcAppScanVersionNumDTO scanVersionNumDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java index 43f8b477a..b7787f550 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ScanSwitchServiceImpl.java @@ -102,21 +102,8 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper(scanSwitchEntityParam); - wrapper.orderByDesc("updated_time"); - ScanSwitchEntity scanSwitchEntity = baseDao.selectOne(wrapper); - int scanFlag = scanSwitchEntity.getScanFlag(); - int maintainFlag = scanSwitchEntity.getMaintainFlag(); - String maintainInfo = scanSwitchEntity.getMaintainInfo(); - EpdcAppScanFlagDTO scanFlagDTO = new EpdcAppScanFlagDTO(); - scanFlagDTO.setScanFlag(scanFlag); - scanFlagDTO.setMaintainFlag(maintainFlag); - scanFlagDTO.setMaintainInfo(maintainInfo); - return scanFlagDTO; + public EpdcAppScanFlagDTO getOneScanInfo(EpdcAppScanVersionNumDTO scanVersionNumDTO) { + return baseDao.selectOneOfScanInfo(scanVersionNumDTO); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml index c4bf73a64..9acb3bcfc 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ScanSwitchDao.xml @@ -16,5 +16,9 @@ + + \ No newline at end of file From 21511a65cc0c76c49b1ffa553b2eae6b39440159 Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 7 Dec 2019 19:51:24 +0800 Subject: [PATCH 25/27] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/SysDeptServiceImpl.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index bcad9ea9e..3f94f6c9e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -249,27 +249,27 @@ public class SysDeptServiceImpl extends BaseServiceImplgetCompleteDept:::部门ID格式转换异常:::deptId->{}", deptId); } - if (null == deptId) { + if (null == deptIdL) { return new Result().error("参数格式异常"); } CompleteDeptDTO completeDept = this.baseDao.getParentAndAllDept(deptIdL); ParentAndAllDeptDTO parentAndAllDeptDTO = new ParentAndAllDeptDTO(); - if(completeDept != null){ + if (completeDept != null) { parentAndAllDeptDTO.setGrid(StringUtils.isNotEmpty(completeDept.getGrid()) ? completeDept.getGrid() : ""); - parentAndAllDeptDTO.setGridId(completeDept.getGridId()!=null && completeDept.getGridId()!= 0 ? completeDept.getGridId() : null); + parentAndAllDeptDTO.setGridId(completeDept.getGridId() != null && completeDept.getGridId() != 0 ? completeDept.getGridId() : null); // 父所有部门（包含街道、社区） - String deptNames = (StringUtils.isNotEmpty(completeDept.getDistrict()) ? completeDept.getDistrict() +"-" : ""); - deptNames += (StringUtils.isNotEmpty(completeDept.getStreet()) ? completeDept.getStreet() +"-": ""); - deptNames += (StringUtils.isNotEmpty(completeDept.getCommunity()) ? completeDept.getCommunity() +"-": ""); - String deptIds = (completeDept.getDistrictId()!=null && completeDept.getDistrictId()!= 0 ? completeDept.getDistrictId().toString() +"," : ""); - deptIds += (completeDept.getStreetId()!=null && completeDept.getStreetId()!= 0 ? completeDept.getStreetId().toString() +",": ""); - deptIds += (completeDept.getCommunityId()!=null && completeDept.getCommunityId()!= 0 ? completeDept.getCommunityId().toString() +"," : ""); - parentAndAllDeptDTO.setParentDeptIds(!"".equals(deptIds)? deptIds.substring(0,deptIds.length()-1) : ""); - parentAndAllDeptDTO.setParentDeptNames(!"".equals(deptNames)? deptNames.substring(0,deptNames.length()-1) : ""); + String deptNames = (StringUtils.isNotEmpty(completeDept.getDistrict()) ? completeDept.getDistrict() + "-" : ""); + deptNames += (StringUtils.isNotEmpty(completeDept.getStreet()) ? completeDept.getStreet() + "-" : ""); + deptNames += (StringUtils.isNotEmpty(completeDept.getCommunity()) ? completeDept.getCommunity() + "-" : ""); + String deptIds = (completeDept.getDistrictId() != null && completeDept.getDistrictId() != 0 ? completeDept.getDistrictId().toString() + "," : ""); + deptIds += (completeDept.getStreetId() != null && completeDept.getStreetId() != 0 ? completeDept.getStreetId().toString() + "," : ""); + deptIds += (completeDept.getCommunityId() != null && completeDept.getCommunityId() != 0 ? completeDept.getCommunityId().toString() + "," : ""); + parentAndAllDeptDTO.setParentDeptIds(!"".equals(deptIds) ? deptIds.substring(0, deptIds.length() - 1) : ""); + parentAndAllDeptDTO.setParentDeptNames(!"".equals(deptNames) ? deptNames.substring(0, deptNames.length() - 1) : ""); // 所有部门（包含街道、社区、网格） deptNames += (StringUtils.isNotEmpty(completeDept.getGrid()) ? completeDept.getGrid() : ""); - deptIds += (completeDept.getGridId()!=null && completeDept.getGridId()!= 0 ? completeDept.getGridId().toString() : ""); + deptIds += (completeDept.getGridId() != null && completeDept.getGridId() != 0 ? completeDept.getGridId().toString() : ""); parentAndAllDeptDTO.setAllDeptIds(deptIds); parentAndAllDeptDTO.setAllDeptNames(deptNames); } else { @@ -347,12 +347,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl listUserSysDeptInfoResultDTO(UserSysDeptInfoFormDTO formDTO) { - if(CollUtil.isEmpty(formDTO.getDeptIdList())){ + if (CollUtil.isEmpty(formDTO.getDeptIdList())) { Long userId = SecurityUser.getUserId(); // 查询当前用户所具有的的数据权限 UserDetail userDetail = userDetailRedis.get(userId); // 用户拥有的所有部门权限 - List dataScopeDeptList=userDetail.getDeptIdList(); + List dataScopeDeptList = userDetail.getDeptIdList(); formDTO.setDeptIdList(dataScopeDeptList); } List list = baseDao.selectListUserSysDeptInfo(formDTO); From 79b96babaf62244182f15670d3cc963a7ce3a9b4 Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 7 Dec 2019 19:57:34 +0800 Subject: [PATCH 26/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/UserServiceImpl.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 4ce779a1d..945ecda32 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -424,10 +424,6 @@ public class UserServiceImpl extends BaseServiceImpl implem } userGridRel.setUserId(formUserDto.getId()); //修改数据库结构 -// userGridRel.setAllDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity() + "-" + formUserDto.getGrid()); -// userGridRel.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId()); -// userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity()); -// userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId()); Result parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGridId().toString()); if (!parentAndAllDeptDTOResult.success()) { return new Result().error(parentAndAllDeptDTOResult.getMsg()); @@ -509,7 +505,7 @@ public class UserServiceImpl extends BaseServiceImpl implem if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { PartyMembersEntity partyMembersEntity = new PartyMembersEntity(); - Result parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRelation.getGrid()); + Result parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(String.valueOf(userGridRelation.getGridId())); if (!parentAndAllDeptDTOResult.success()) { return new Result().error(parentAndAllDeptDTOResult.getMsg()); } From f8dbe8c9c74c6f3d11ebf0a3e9a3d7b29a156296 Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 7 Dec 2019 20:19:31 +0800 Subject: [PATCH 27/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/service/impl/UserServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 945ecda32..c488b016c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -495,6 +495,9 @@ public class UserServiceImpl extends BaseServiceImpl implem EpdcCompleteAppUserDTO completeAppUser = formDto.getCompleteAppUser(); UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser, UserDTO.class); + if (StringUtils.isBlank(userDto.getWxUnionId())) { + userDto.setWxUnionId(null); + } UserGridRelationDTO userGridRelation = formDto.getUserGridRelation(); String userId = userDto.getId();