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-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppScanVersionNumDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppScanVersionNumDTO.java new file mode 100644 index 000000000..2ead545d8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppScanVersionNumDTO.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.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 扫码开关 + * + * @author wanggongfeng + * @since v1.0.0 2019-10-10 + */ +@Data +public class EpdcAppScanVersionNumDTO implements Serializable { + + /** + * 版本号 + */ + @NotBlank(message = "版本号不能为空") + private String versionNum; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppScanFlagDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppScanFlagDTO.java new file mode 100644 index 000000000..3a2027aff --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppScanFlagDTO.java @@ -0,0 +1,52 @@ +/** + * 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.result; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +/** + * 扫码开关 + * + * @author wanggongfeng + * @since v1.0.0 2019-10-10 + */ +@Data +public class EpdcAppScanFlagDTO implements Serializable { + + /** + * 扫码开关 0关1开 + */ + @NotNull + private int scanFlag; + + /** + * 维护状态：0-关闭维护，1-开启维护 + */ + @NotNull + 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/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/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..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 @@ -18,17 +18,19 @@ 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.ScanSwitchDTO; +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.*; + import java.util.Map; @@ -84,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(){ - Map data = scanSwitchService.getOne(); - 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 fb3c81754..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 @@ -37,8 +37,34 @@ public class ScanSwitchEntity extends BaseEpdcEntity { /** - * 扫码开关 0关1开 - */ + * 扫码开关 0关1开 + */ private int scanFlag; + /** + * 维护状态 0关1开 + */ + private int maintainFlag; + + /** + * 版本号 + */ + private String versionNum; + + /** + * 维护信息 + */ + 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/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/ScanSwitchService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ScanSwitchService.java index 57c524118..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 @@ -20,6 +20,8 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.ScanSwitchDTO; +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; @@ -97,9 +99,9 @@ public interface ScanSwitchService extends BaseService { /*** * 前端获取开关 * @param - * @return com.elink.esua.epdc.dto.ScanSwitchDTO + * @return com.elink.esua.epdc.dto.form.EpdcAppScanVersionNumDTO * @author qushutong * @date 2019/10/10 12:01 */ - Map getOne(); + 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/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..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,14 +189,17 @@ 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) { // 查询当前微信是否已注册用户 - Result userInfoResult = userFeignClient.getUserForLoginByOpenId(openId); + EpdcAppQueryUserInfoFormDTO formDTO = new EpdcAppQueryUserInfoFormDTO(); + formDTO.setOpenId(wxMaJscode2SessionResult.getOpenid()); + formDTO.setUnionId(wxMaJscode2SessionResult.getUnionid()); + Result userInfoResult = userFeignClient.queryUserDto(formDTO); if (!userInfoResult.success()) { return new Result().error(userInfoResult.getMsg()); } @@ -978,4 +983,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-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..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 @@ -20,11 +20,13 @@ 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.ScanSwitchDTO; +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; @@ -33,7 +35,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; @@ -54,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); } @@ -101,13 +119,21 @@ public class ScanSwitchServiceImpl extends BaseServiceImpl getOne() { - QueryWrapper wrapper = new QueryWrapper<>(); + public EpdcAppScanFlagDTO getOne(EpdcAppScanVersionNumDTO 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); - Map map=new HashMap<>(); - map.put("switch",scanSwitchEntity.getScanFlag()+""); - return map; + 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; } } \ 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 @@ + + + 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 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..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 @@ -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()); @@ -505,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()); @@ -722,4 +733,43 @@ 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<>(); + 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()) + .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(); + } + }