From 86d164dbc8c1a70a6e2c7ff88d311285332cec38 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 30 Jul 2020 16:07:25 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?-=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E5=B7=B2=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/resi/ResiActDetailResultDTO.java | 5 +++++ .../main/java/com/epmet/dao/ActUserRelationDao.java | 11 +++++++++++ .../com/epmet/service/impl/ActInfoServiceImpl.java | 10 +++++++++- .../src/main/resources/mapper/ActUserRelationDao.xml | 12 ++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java index 18dba0c301..fe8ef51b45 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java @@ -137,4 +137,9 @@ public class ResiActDetailResultDTO implements Serializable { * 是否已签到(true已签到，false未签到) */ private Boolean isSignUp; + + /** + * 用户是否已报名该活动 true用户已报名；false用户未报名 + */ + private Boolean isRegistration; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java index b60d5f9b4a..7b97d6cf80 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java @@ -206,4 +206,15 @@ public interface ActUserRelationDao extends BaseDao { * @Date 2020/7/27 14:59 **/ List selectAuditingAndPassedList(String actId); + + /** + * 查询当前用户与活动之间的状态 + * + * @param actId + * @param userId + * @return java.lang.String + * @Author zhangyong + * @Date 15:59 2020-07-30 + **/ + String selectUserStatusByActIdAndUserId(@Param("actId") String actId, @Param("userId")String userId); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java index a7a058164f..2470f86c76 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java @@ -222,6 +222,14 @@ public class ActInfoServiceImpl extends BaseServiceImpl actUserRelationWrapper = new QueryWrapper<>(); actUserRelationWrapper.eq("ACT_ID", actId) .eq("USER_ID", userId) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml index 6d53c1f139..edf2f0252d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml @@ -303,4 +303,16 @@ AND ( aur.STATUS = 'auditing' OR aur.`STATUS` = 'passed' ) AND aur.ACT_ID = #{actId} + + + From 9e4bbb16728826ed949647ebc453538a30d9c048 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 30 Jul 2020 16:10:45 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0-thirdOpenFeign=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/EpmetThirdFeignClient.java | 116 ------------------ .../EpmetThirdFeignClientFallback.java | 71 ----------- 2 files changed, 187 deletions(-) delete mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java delete mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java deleted file mode 100644 index ff62e37885..0000000000 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.epmet.feign; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.UserWechatDTO; -import com.epmet.dto.form.RegisterFormDTO; -import com.epmet.dto.form.SaveUserVisitedFormDTO; -import com.epmet.dto.form.WxLoginFormDTO; -import com.epmet.dto.result.*; -import com.epmet.feign.fallback.EpmetThirdFeignClientFallback; -import me.chanjar.weixin.mp.bean.result.WxMpUser; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 本服务对外开放的API,其他服务通过引用此client调用该服务 - * - * @Author zxc - * @CreateTime 2020/7/5 14:45 - * ,url="localhost:8110" - */ -@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = EpmetThirdFeignClientFallback.class) - -public interface EpmetThirdFeignClient { - - /** - * @param wxMpUser - * @return - * @Author sun - * @Description 根据openId新增或更新用户信息 - **/ - @PostMapping(value = "third/pauser/saveuser", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) - Result saveUser(@RequestBody WxMpUser wxMpUser); - - /** - * @param phone - * @return - * @Author sun - * @Description 根据手机号查询公众号用户基本信息，校验用户是否存在 - **/ - @PostMapping(value = "third/pauser/checkpauser/{phone}") - Result checkPaUser(@PathVariable("phone") String phone); - - /** - * @param visited - * @return - * @Author sun - * @Description 用户登陆，新增访问记录数据 - **/ - @PostMapping(value = "third/pauservisited/saveuservisited") - Result saveUserVisited(@RequestBody SaveUserVisitedFormDTO visited); - - /** - * @param customerId - * @return - * @Author sun - * @Description 根据客户Id查询各项注册信息 - **/ - @PostMapping(value = "third/pacustomer/getcustomeragencyuser/{customerId}") - Result getCustomerAgencyUser(@PathVariable("customerId") String customerId); - - /** - * @param customerId - * @return - * @Author sun - * @Description 修改客户数据状态为已完成初始化 - **/ - @PostMapping(value = "third/pacustomer/updatecustomer/{customerId}") - Result updateCustomer(@PathVariable("customerId") String customerId); - - /** - * @Description 获取【component_access_token】的定时任务 10min/次 - * @param - * @author zxc - */ - @PostMapping(value = "third/wechatthird/componentaccesstoken") - Result getComponentAccessTokenJob(); - - /** - * @Description 获取/刷新接口调用令牌 10min/次 - * @param - * @author zxc - */ - @PostMapping(value = "third/wechatthird/refreshtoken") - Result refreshAuthorizerAccessTokenJob(); - - /** - * @param formDTO - * @return - * @Author sun - * @Description 校验appId是否有效以及是否授权,校验通过的调用微信API获取用户基本信息 - **/ - @PostMapping(value = "third/customermp/resiandworklogin") - Result resiAndWorkLogin(@RequestBody WxLoginFormDTO formDTO); - - /** - * @param appId - * @return - * @Author sun - * @Description 根据appId查询公众号注册的客户信息 - **/ - @PostMapping(value = "third/customermp/getcustomermsg/{appId}") - Result getCustomerMsg(@PathVariable("appId") String appId); - - /** - * @param formDTO - * @return - * @Author sun - * @Description 用户登陆，新增访问记录数据 - **/ - @PostMapping(value = "third/pacustomer/register") - Result register(@RequestBody RegisterFormDTO formDTO); -} diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java deleted file mode 100644 index d3d97faa1a..0000000000 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.epmet.feign.fallback; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.UserWechatDTO; -import com.epmet.dto.form.RegisterFormDTO; -import com.epmet.dto.form.SaveUserVisitedFormDTO; -import com.epmet.dto.form.WxLoginFormDTO; -import com.epmet.dto.result.*; -import com.epmet.feign.EpmetThirdFeignClient; -import me.chanjar.weixin.mp.bean.result.WxMpUser; -import org.springframework.stereotype.Component; - -/** - * @Author zxc - * @CreateTime 2020/7/5 14:46 - */ -@Component -public class EpmetThirdFeignClientFallback implements EpmetThirdFeignClient { - - @Override - public Result saveUser(WxMpUser wxMpUser) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "saveUser", wxMpUser); - } - - @Override - public Result checkPaUser(String phone) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "checkPaUser", phone); - } - - @Override - public Result saveUserVisited(SaveUserVisitedFormDTO visited) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "saveUserVisited", visited); - } - - @Override - public Result getCustomerAgencyUser(String customerId) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getCustomerAgencyUser", customerId); - } - - @Override - public Result updateCustomer(String customerId) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "updateCustomer", customerId); - } - - @Override - public Result getComponentAccessTokenJob() { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getComponentAccessTokenJob"); - } - - @Override - public Result refreshAuthorizerAccessTokenJob() { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "refreshAuthorizerAccessTokenJob"); - } - - @Override - public Result resiAndWorkLogin(WxLoginFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "resiAndWorkLogin", formDTO); - } - - @Override - public Result getCustomerMsg(String appId) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getCustomerMsg", appId); - } - - @Override - public Result register(RegisterFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "register", formDTO); - } -} From 311079bf8a581d5c61869e7b481a7cb1e6c0c757 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Jul 2020 16:12:16 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/UserBaseInfoDao.java | 9 ++ .../com/epmet/redis/UserBaseInfoRedis.java | 116 ++++++++++++++++-- .../service/impl/UserBaseInfoServiceImpl.java | 4 +- .../main/resources/mapper/UserBaseInfoDao.xml | 21 ++++ 4 files changed, 141 insertions(+), 9 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java index 1afb03057f..5bafec9228 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java @@ -62,4 +62,13 @@ public interface UserBaseInfoDao extends BaseDao { * @Date 15:20 2020-07-28 **/ ResiUserBaseInfoResultDTO selecUserBaseInfoByUserId(@Param("userId") String userId); + + /** + * @Description 不覆盖更新 + * @param entity + * @return + * @author wangc + * @date 2020.07.30 14:01 + **/ + void updateWithoutCover(UserBaseInfoEntity entity); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index 40b34099a7..f48539a622 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -20,6 +20,7 @@ package com.epmet.redis; import cn.hutool.core.bean.BeanUtil; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserRedisKeys; import com.epmet.dao.GridLatestDao; @@ -30,12 +31,14 @@ import com.epmet.dto.result.BelongGridNameResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.entity.RegisterRelationEntity; +import com.epmet.entity.UserBaseInfoEntity; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.util.ModuleConstant; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.lang.reflect.Field; import java.util.Map; import static com.epmet.commons.tools.redis.RedisUtils.NOT_EXPIRE; @@ -127,18 +130,115 @@ public class UserBaseInfoRedis { baseInfo.setShowName(buffer.toString()); } } - }else{ - //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id - LatestGridInfoResultDTO gridLatest = - gridLatestDao.selectLatestGridInfoByUserId(userId); - if(null != gridLatest){ - baseInfo.setCustomerId(gridLatest.getCustomerId()); + else{ + //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id + LatestGridInfoResultDTO gridLatest = + gridLatestDao.selectLatestGridInfoByUserId(userId); + if(null != gridLatest){ + baseInfo.setCustomerId(gridLatest.getCustomerId()); + } } + set(baseInfo); + return baseInfo; } - set(baseInfo); - return baseInfo; + } return null; } + + /** + * @Description 更新缓存 + * @param entity + * @return + * @author wangc + * @date 2020.07.30 14:07 + **/ + public void updateUserCache(UserBaseInfoEntity entity){ + if(null == entity || StringUtils.isBlank(entity.getUserId())) return; + + UserBaseInfoResultDTO currentCache = ConvertUtils.sourceToTarget(entity,UserBaseInfoResultDTO.class); + + RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(entity.getUserId()); + //如果没有首次注册网格，则没有网格名称(xx机关-xx网格)、显示昵称(xx网格-x先生/女士) + if(null != relation && StringUtils.isNotBlank(relation.getGridId())){ + currentCache.setCustomerId(relation.getCustomerId()); + BelongGridNameFormDTO gridParam = new BelongGridNameFormDTO(); + gridParam.setGridId(relation.getGridId()); + currentCache.setRegisteredGridId(relation.getGridId()); + Result gridResult = + govOrgOpenFeignClient.getGridNameByGridId(gridParam); + if(gridResult.success() && null != gridResult.getData() + && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())){ + String gridFullName = gridResult.getData().getBelongsGridName(); + currentCache.setRegisteredGridName(gridFullName); + StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(currentCache.getSurname()); + switch (currentCache.getGender()) { + case NumConstant.ONE_STR: + buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE); + break; + case NumConstant.TWO_STR: + buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE); + break; + default: + buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_GENDER_UNKNOWN); + } + currentCache.setShowName(buffer.toString()); + } + }else{ + //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id + LatestGridInfoResultDTO gridLatest = + gridLatestDao.selectLatestGridInfoByUserId(entity.getUserId()); + if(null != gridLatest){ + currentCache.setCustomerId(gridLatest.getCustomerId()); + } + } + + //更新缓存的入口只有1.更新微信信息，entity中一定携带微信信息，2.注册居民信息，在调用此方法之前，已经查询过微信信息并赋值到entity中 + //因此以下代码不需执行 + //if(StringUtils.isBlank(currentCache.getNickname()) || StringUtils.isBlank(currentCache.getHeadImgUrl())){ + // UserBaseInfoResultDTO wechatInfo = userBaseInfoDao.selectListByUserIdList(entity.getUserId()); + // if(null != wechatInfo){ + // currentCache.setNickname(wechatInfo.getNickname()); + // currentCache.setGender(wechatInfo.getGender()); + // currentCache.setHeadImgUrl(wechatInfo.getHeadImgUrl()); + // } + //} + + Map map = redisUtils.hGetAll(UserRedisKeys.getResiUserKey(entity.getUserId())); + if(null != map && !map.isEmpty()) { + //缓存中有数据，直接返回 + UserBaseInfoResultDTO orientCache = BeanUtil.mapToBean(map, UserBaseInfoResultDTO.class, true); + mergeObject(currentCache , orientCache); + set(orientCache); + }else{ + //缓存中没有该数据 + set(currentCache); + } + + + + } + + + public void mergeObject(T origin, T destination) { + if (origin == null || destination == null) + return; + if (!origin.getClass().equals(destination.getClass())) + return; + + Field[] fields = origin.getClass().getDeclaredFields(); + for (int i = 0; i < fields.length; i++) { + try { + fields[i].setAccessible(true); + Object value = fields[i].get(origin); + if (null != value) { + fields[i].set(destination, value); + } + fields[i].setAccessible(false); + } catch (Exception e) { + + } + } + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 20865a94bb..1ab351a962 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -225,11 +225,13 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl + + + UPDATE user_base_info + + mobile = #{mobile}, + surname = #{surname}, + name = #{name}, + real_name = #{realName}, + id_num = #{idNum}, + gender = #{gender}, + street = #{street}, + district = #{district}, + building_address = #{buildingAddress}, + nickname = #{nickname}, + head_img_url = #{headImgUrl}, + del_flag = #{delFlag}, + updated_by = #{updatedBy}, + updated_time = now() + + WHERE id = #{id} + From 7c90842153283dd30b114fb6c1d318b894214286 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 16:35:23 +0800 Subject: [PATCH 04/10] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/PublicUserLoginServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 3c04b206be..2415e9de19 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -75,12 +75,15 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { dto.setSource(formDTO.getSource()); //2.将获取的用户基本信息初始化到数据库 - String url = ThirdApiConstant.THIRD_PAUSER_SAVEUSER; - Result result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(dto)); + String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_SAVEUSER, JSON.toJSONString(dto)).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); if (!result.success()) { throw new RenException(PublicUserLoginConstant.SAVE_USER_EXCEPTION); } - SaveUserResultDTO resultDTO = JSONObject.parseObject(result.getData(), SaveUserResultDTO.class); + Object RegisterResult = result.getData(); + JSONObject jsonObject = JSON.parseObject(RegisterResult.toString()); + SaveUserResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, SaveUserResultDTO.class); //3.获取用户token String token = this.generateGovWxmpToken(resultDTO.getUserId()); From 90d2c5437b0e56f56955f0ff43fcc57d214a592f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Jul 2020 16:38:47 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=8B=92=E7=BB=9D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/WorkActUserServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java index 8ac5edd27a..f59170c609 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java @@ -320,6 +320,8 @@ public class WorkActUserServiceImpl implements WorkActUserService { historicalAuditResult.setLatestAuditTime(latestRefused.getCreatedTime()); historicalAuditResult.setLatestRefusedReason(latestRefused.getReason()); historicalAuditResult.setRefusedCountDesc(String.format("已拒绝%s次",refusedCount)); + resultDTO.setLatestAuditTime(latestRefused.getCreatedTime()); + resultDTO.setLatestRefusedReason(latestRefused.getReason()); resultDTO.setHistoricalAuditResult(historicalAuditResult); } }else if(ActConstant.ACT_USER_STATUS_PASSED.equals(resultDTO.getStatus())||ActConstant.ACT_USER_STATUS_REFUSED.equals(resultDTO.getStatus())){ @@ -451,7 +453,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { actUserLogEntity.setActId(actUserRelationEntity.getActId()); actUserLogEntity.setUserId(actUserRelationEntity.getUserId()); actUserLogEntity.setOperationType(ActConstant.ACT_USER_LOG_OPER_REFUSED); - actUserLogEntity.setReason(StrConstant.EPMETY_STR); + actUserLogEntity.setReason(formDTO.getRejectReason()); actUserLogEntity.setCreatedTime(auditTime); //插入一条日志 actUserLogDao.insert(actUserLogEntity); From dfec2e7f94a5f541baf43b18e54301b543335f7e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Jul 2020 16:44:24 +0800 Subject: [PATCH 06/10] =?UTF-8?q?heart+1=E3=80=81user+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index d746c51e89..54f4d3a219 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.16 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.17 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 0b946b3626..e551f4bc82 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.16 + 0.0.17 com.epmet epmet-heart diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index feff4bb7f9..31f2c5674d 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.94 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.95 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 1fbbb60589..db21013580 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.94 + 0.3.95 com.epmet epmet-user From 0a5d0213cd22fb07b3e5ebadf855423daa95dd56 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 16:56:11 +0800 Subject: [PATCH 07/10] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/GovLoginServiceImpl.java | 7 ++++--- .../com/epmet/service/impl/PublicUserLoginServiceImpl.java | 7 ------- .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 3 --- .../service/impl/ComponentAccessTokenServiceImpl.java | 2 -- .../service/impl/RefreshAuthAccessTokenServiceImpl.java | 2 -- .../java/com/epmet/service/impl/CustomerServiceImpl.java | 7 ++++--- .../service/impl/StrangerAccessRecordServiceImpl.java | 3 --- 7 files changed, 8 insertions(+), 23 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index d9134aabec..ee60b3c22f 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -21,7 +21,10 @@ import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.GovStaffRoleDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.feign.*; +import com.epmet.feign.EpmetMessageOpenFeignClient; +import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovOrgFeignClient; import com.epmet.jwt.JwtTokenProperties; import com.epmet.jwt.JwtTokenUtils; import com.epmet.redis.CaptchaRedis; @@ -64,8 +67,6 @@ public class GovLoginServiceImpl implements GovLoginService { private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; @Autowired private EpmetUserOpenFeignClient userOpenFeignClient; - @Autowired - private EpmetThirdFeignClient epmetThirdFeignClient; /** * @param formDTO diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 2415e9de19..73c3390b0d 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -7,10 +7,6 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.*; -import com.epmet.commons.tools.utils.CpUserDetailRedis; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.HttpClientManager; -import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.PhoneValidatorUtils; import com.epmet.constant.AuthHttpUrlConstant; import com.epmet.constant.PublicUserLoginConstant; @@ -22,7 +18,6 @@ import com.epmet.dto.PaUserWechatDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.feign.EpmetMessageOpenFeignClient; -import com.epmet.feign.EpmetThirdFeignClient; import com.epmet.jwt.JwtTokenProperties; import com.epmet.jwt.JwtTokenUtils; import com.epmet.redis.CaptchaRedis; @@ -53,8 +48,6 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { @Autowired private WxMpService wxMpService; @Autowired - private EpmetThirdFeignClient epmetThirdFeignClient; - @Autowired private JwtTokenUtils jwtTokenUtils; @Autowired private JwtTokenProperties jwtTokenProperties; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 9b3c2fc0a7..9ac10784bc 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -16,7 +16,6 @@ import com.epmet.constant.AuthHttpUrlConstant; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.feign.EpmetThirdFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.jwt.JwtTokenProperties; @@ -52,8 +51,6 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { @Autowired private CpUserDetailRedis cpUserDetailRedis; @Autowired - private EpmetThirdFeignClient epmetThirdFeignClient; - @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Autowired private GovOrgOpenFeignClient govOrgOpenFeignClient; diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ComponentAccessTokenServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ComponentAccessTokenServiceImpl.java index c5f112e056..651af393cf 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ComponentAccessTokenServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ComponentAccessTokenServiceImpl.java @@ -6,10 +6,8 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.HttpUrlConstant; -import com.epmet.feign.EpmetThirdFeignClient; import com.epmet.service.ComponentAccessTokenService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/RefreshAuthAccessTokenServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/RefreshAuthAccessTokenServiceImpl.java index 8961d7db14..c66352b628 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/RefreshAuthAccessTokenServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/RefreshAuthAccessTokenServiceImpl.java @@ -6,9 +6,7 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.HttpUrlConstant; -import com.epmet.feign.EpmetThirdFeignClient; import com.epmet.service.RefreshAuthAccessTokenService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 77a9f6bad9..9f2d59c47b 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -37,7 +37,10 @@ import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerEntity; -import com.epmet.feign.*; +import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.feign.GovOrgFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.feign.OperCustomizeFeignClient; import com.epmet.redis.CustomerRedis; import com.epmet.service.CustomerService; import com.github.pagehelper.PageHelper; @@ -71,8 +74,6 @@ public class CustomerServiceImpl extends BaseServiceImpl Date: Thu, 30 Jul 2020 16:57:07 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 5399212a46..8df8624b8a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -28,7 +28,6 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.SmsTemplateConstant; -import com.epmet.constant.UserConstant; import com.epmet.constant.UserRoleConstant; import com.epmet.dao.UserCustomerDao; import com.epmet.dao.UserResiInfoDao; @@ -241,12 +240,12 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Thu, 30 Jul 2020 16:58:07 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 8f81520b29..1abc949f24 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.80 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.81 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index c21cbba05b..624ea9926a 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.80 + 0.0.81 com.epmet From f8bec2e42d2bc9a8ff5d75c41b94180eeb2de241 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Jul 2020 17:01:08 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=8D=87=E7=BA=A7user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 31f2c5674d..821d21ec2e 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.95 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.96 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index db21013580..5437043889 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.95 + 0.3.96 com.epmet epmet-user