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 3c04b206be..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; @@ -75,12 +68,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()); 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-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActRegistrationResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActRegistrationResultDTO.java new file mode 100644 index 0000000000..14e8cbd9b3 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActRegistrationResultDTO.java @@ -0,0 +1,45 @@ +/** + * 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.epmet.dto.result.resi; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 活动内容 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-07-19 + */ +@Data +public class ResiActRegistrationResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + private Integer flag; + + /** + * 提示信息 + */ + private String tip; +} 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 730ba2347b..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.14 + 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 a481eb29b8..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.14 + 0.0.17 com.epmet epmet-heart diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java index 73605d19a9..046a2c6854 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java @@ -294,12 +294,12 @@ public class ResiActListController { * * @param tokenDto * @param formDTO - * @return com.epmet.commons.tools.utils.Result + * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 16:26 2020-07-28 **/ @PostMapping("registration") - public Result registration(@LoginUser TokenDto tokenDto, @RequestBody ResiActRegistrationFormDTO formDTO) { + public Result registration(@LoginUser TokenDto tokenDto, @RequestBody ResiActRegistrationFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ResiActRegistrationFormDTO.AddUserInternalGroup.class); return actUserRelationService.registration(tokenDto, formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java index f77b373208..91ec9355da 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.ActUserRelationDTO; import com.epmet.dto.form.resi.ResiActRegistrationFormDTO; import com.epmet.dto.form.resi.ResiActUserCancelSignUpFormDTO; +import com.epmet.dto.result.resi.ResiActRegistrationResultDTO; import com.epmet.entity.ActUserRelationEntity; import org.apache.ibatis.annotations.Param; @@ -145,9 +146,9 @@ public interface ActUserRelationService extends BaseService * @Author zhangyong - * @Date 15:54 2020-07-28 + * @Date 17:14 2020-07-30 **/ - Result registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO); + Result registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java index e9e675b7e4..f8c48c27a5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java @@ -39,6 +39,7 @@ import com.epmet.dto.ActUserRelationDTO; import com.epmet.dto.form.resi.ResiActRegistrationFormDTO; import com.epmet.dto.form.resi.ResiActUserCancelSignUpFormDTO; import com.epmet.dto.result.UserRoleResultDTO; +import com.epmet.dto.result.resi.ResiActRegistrationResultDTO; import com.epmet.entity.ActUserLogEntity; import com.epmet.entity.ActUserRelationEntity; import com.epmet.entity.HeartUserInfoEntity; @@ -195,7 +196,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO) { formDTO.setUserId(tokenDto.getUserId()); boolean satisfy = false; @@ -221,12 +222,18 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl().ok(dto); } } else { // 不满足，提示用户去认证志愿者 logger.info(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER); - throw new RenException(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getCode()); + ResiActRegistrationResultDTO dto = new ResiActRegistrationResultDTO(); + dto.setFlag(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getCode()); + dto.setTip(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getMsg()); + return new Result().ok(dto); } return new Result(); } 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 aea287bb50..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())){ @@ -357,7 +359,7 @@ public class WorkActUserServiceImpl implements WorkActUserService { HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId()); resultDTO.setSignInActNum(historicalActInfo.getSignInActNum()); //减去当前的 - resultDTO.setSignUpActNum(historicalActInfo.getSignUpActNum()-1); + resultDTO.setSignUpActNum(historicalActInfo.getSignUpActNum()); resultDTO.setObtainPointsActNum(historicalActInfo.getObtainPointsActNum()); //历史活动列表 List actInfoList=actUserRelationDao.selectAllByUserId(formDTO.getUserId(),formDTO.getCurrentActId()); @@ -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); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 75d62f1059..957e8f9dfb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -142,7 +142,7 @@ i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 'in_progress' AS actCurrentState, -- 活动状态：进行中 - IF(u.USER_ID = #{userId},'1','0') as signupFlag -- 用户报名状态（0-未报名，1已报名） + IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID @@ -168,7 +168,7 @@ i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 'finished' AS actCurrentState, -- 活动状态：已结束 - IF(u.USER_ID = #{userId},'1','0') as signupFlag -- 用户报名状态（0-未报名，1已报名） + IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID 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 edf2f0252d..9d7e256b9e 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 @@ -121,6 +121,7 @@ act_user_relation acu WHERE DEL_FLAG = '0' + and acu.STATUS !='auditing' AND acu.USER_ID = #{userId} 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/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); - } -} 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 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 4.0.0 - 0.3.93 + 0.3.97 com.epmet epmet-user diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java index 8844cfbdc1..56a75d64cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java @@ -149,6 +149,7 @@ public class UserResiInfoController { **/ @PostMapping("saveResiInfo") public Result saveResiInfo (@RequestBody UserResiInfoDTO userResiInfoDTO) { + ValidatorUtils.validateEntity(userResiInfoDTO); return userResiInfoService.saveResiInfo(userResiInfoDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java index 4dc226e8a7..04473a7b88 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.UserCustomerEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * @Description 客户用户关系表 @@ -11,6 +12,14 @@ import org.apache.ibatis.annotations.Mapper; * @date 2020.03.31 13:53 */ @Mapper -public interface UserCustomerDao extends BaseDao{ +public interface UserCustomerDao extends BaseDao { + /** + * desc:修改客户的用户的注册状态为已注册 + * + * @param customerId + * @param userId + * @return + */ + int updateRegistered(@Param("customerId") String customerId, @Param("userId") String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index acb1ce5ab2..fee5c2730b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -39,8 +39,8 @@ import java.util.List; public interface UserResiInfoDao extends BaseDao { /** - * @return com.epmet.dto.UserResiInfoDTO * @param userResiInfoFormDTO + * @return com.epmet.dto.UserResiInfoDTO * @Author yinzuomei * @Description 查询用户注册信息 * @Date 2020/3/30 11:10 @@ -48,23 +48,23 @@ public interface UserResiInfoDao extends BaseDao { UserResiInfoResultDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); /** - * @Description 查询用户注册信息 不按照客户Id查询 * @param userResiInfoFormDTO - * @return UserResiInfoResultDTO + * @return UserResiInfoResultDTO + * @Description 查询用户注册信息 不按照客户Id查询 * @author wangc * @date 2020.05.21 13:18 - **/ + **/ UserResiInfoResultDTO selectUserResiInfoNotByCustId(UserResiInfoFormDTO userResiInfoFormDTO); /** * @Author sun * @Description 根据手机号查询居民注册信息(user_resi_info)表数据 **/ - List selectResiInfoByMobile(String regMobile); + List selectResiInfoByMobile(@Param("regMobile") String regMobile, @Param("customerId") String customerId); /** - * @return java.util.List * @param userIdList + * @return java.util.List * @Author yinzuomei * @Description 根据userId集合查询用户注册信息 * @Date 2020/4/7 18:26 @@ -72,18 +72,18 @@ public interface UserResiInfoDao extends BaseDao { List selectListUserResiInfoDTO(@Param("userIdList") List userIdList); /** - * @Description 根据userId查询议题发起人 * @param formDTO + * @Description 根据userId查询议题发起人 * @author zxc * @date 2020/5/11 11:18 */ IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO); /** - * @return com.epmet.dto.UserResiInfoDTO * @param userId + * @return com.epmet.dto.UserResiInfoDTO * @author yinzuomei - * @description 根据要用户id,查询用户注册的信息 + * @description 根据要用户id, 查询用户注册的信息 * @Date 2020/7/22 10:58 **/ UserResiInfoDTO selectByUserId(String userId); 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 1aaead92ed..bf565610d5 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 @@ -19,6 +19,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.common.token.util.UserUtil; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.FieldConstant; @@ -28,11 +29,12 @@ 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; import com.epmet.dao.UserWechatDao; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.UserResiRegisterVisitDTO; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.IssueInitiatorResultDTO; @@ -79,6 +81,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl result = epmetMessageOpenFeignClient.sendVerificationCode(sendVerificationCodeFormDTO); - if(!result.success()||null==result.getData()||StringUtils.isBlank(result.getData().getCode())){ + if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getCode())) { return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); } //4:删除缓存中可能存在的旧验证码 @@ -241,21 +247,24 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl list = userResiInfoDao.selectResiInfoByMobile(mobile); + List list = userResiInfoDao.selectResiInfoByMobile(mobile, customerId); if (list.size() > 0) { bl = false; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserCustomerDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserCustomerDao.xml index d775556e5e..60348584a3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserCustomerDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserCustomerDao.xml @@ -3,18 +3,8 @@ - - - - - - - - - - - - - + + update user_customer set IS_REGISTER = 1 where CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} and USER_ID = #{userId,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index 724d49a68b..fc345f9fd2 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -98,8 +98,12 @@ SELECT FROM user_resi_info uri - WHERE uri.del_flag = '0' - AND uri.reg_mobile = #{regMobile} + LEFT JOIN user_customer uc ON uri.USER_ID = uc.USER_ID + WHERE + uri.DEL_FLAG = '0' + AND uri.REG_MOBILE = #{regMobile,jdbcType=VARCHAR} + AND uc.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} + AND uc.IS_REGISTER = 1