From 8276d5901730d3f47c3e9fcfb73cee83d2f7951c Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 30 Jul 2020 09:17:34 +0800 Subject: [PATCH 01/21] =?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-=E6=97=A5=E5=BF=97=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/ThirdRunTimeInfoConstant.java | 19 +++++++++++++++++++ .../impl/AppLetAuthorizationServiceImpl.java | 1 - .../ComponentVerifyTicketServiceImpl.java | 19 ++++++++++--------- .../service/impl/WarrantServiceImpl.java | 3 +++ 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java index b7dc98d4b4..188c19a89e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java @@ -84,4 +84,23 @@ public interface ThirdRunTimeInfoConstant { String REFRESH_AUTH_ACCESS_TOKEN = "查询到新的 授权方【access_token】"; + String INFO_TYPE = "》》》》》》》》》》infoType = %s《《《《《《《《《《《《《《"; + + String COMPONENT_VERIFY_TICKET = "============================接收的票据为：%s==========================="; + + String AUTH_STATUS = "----------------------------授权成功------------------------------------"; + + String REMOVE_AUTH = "============================取消授权===================================="; + + String UPDATE_AUTH = "----------------------------变更授权------------------------------------"; + + String COMPONENT_ACCESS_TOKEN = "**********************************获取【component_access_token】请求参数componentVerifyTicket为：%s*************************************"; + + String EXIST_UPCOMING_EXPIRED = "===============================查询到即将过期的 ComponentAccessToken================================="; + + String BEGIN_DELETE_INSERT_AUTH_CODE = "**************************************开始删除旧的AuthCode并保存新的AuthCode******************************************"; + + String BEGIN_CREATE_OPEN = "============================开始执行绑定开放平台账号==================================="; + + String CODE_AUDIT_RESULT = "----------------------------------代码审核结果即将插入，需要插入的内容为：%s-----------------------------------------"; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java index b28550c54c..834866bfd2 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java @@ -62,7 +62,6 @@ public class AppLetAuthorizationServiceImpl implements AppLetAuthorizationServic public GoToAuthResultDTO goToAuth(TokenDto tokenDto, GoToAuthFormDTO formDTO) { GoToAuthResultDTO result = new GoToAuthResultDTO(); String userId = tokenDto.getUserId(); - String customerId = paCustomerAgencyDao.getCustomerIdByUserId(userId); //获取预授权码 String preAuthCode = componentVerifyTicketService.preAuthCode(); String redirectUrl = WxMaCodeConstant.WEB_URL + formDTO.getClientType(); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java index 2cbb986d40..0791597950 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java @@ -14,7 +14,6 @@ import com.epmet.dao.*; import com.epmet.dto.PaCustomerUserAgencyDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.mpaes.WXBizMsgCrypt; import com.epmet.mpaes.WXXmlToMapUtil; import com.epmet.redis.RedisThird; @@ -77,8 +76,6 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe @Autowired private BusinessInfoDao businessInfoDao; @Autowired - private EpmetUserOpenFeignClient epmetUserOpenFeignClient; - @Autowired private AuthResultRecordDao authResultRecordDao; @Autowired private PaCustomerUserAgencyDao paCustomerUserAgencyDao; @@ -112,6 +109,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe String nonce = request.getParameter(ModuleConstant.NONCE); String encryptType = request.getParameter(ModuleConstant.ENCRYPT_TYPE); String signature = request.getParameter(ModuleConstant.SIGNATURE); + log.info(String.format(ThirdRunTimeInfoConstant.VERIFY_TICKET,msgSignature,timeStamp,nonce,encryptType,signature)); // 从请求中读取整个post数据 InputStream inputStream; String postData = null; @@ -123,9 +121,11 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe // 将xml转为map Map result = WXXmlToMapUtil.xmlToMap(msg); String infotype = result.get(ModuleConstant.INFO_TYPE); + log.info(String.format(ThirdRunTimeInfoConstant.INFO_TYPE,infotype)); switch (infotype){ case ModuleConstant.TICKET_UNDERLINE_KEY: //接收票据 【component_verify_ticket】 String ComponentVerifyTicket = result.get(ModuleConstant.TICKET_KEY); + log.info(String.format(COMPONENT_VERIFY_TICKET)); // 缓存 ticket redisThird.setComponentVerifyTicket(ComponentVerifyTicket); // 存数据库 @@ -139,15 +139,18 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe break; case ModuleConstant.AUTHORIZED: //授权成功 this.disposeAuthResult(result); + log.info(AUTH_STATUS); break; case ModuleConstant.UNAUTHORIZED://用户取消授权 //todo 取消授权 String authorizerAppId = result.get(ModuleConstant.AUTHORIZER_APP_ID_HUMP); customerMpDao.updateAuthorizationFlag(authorizerAppId); this.disposeAuthResult(result); + log.info(REMOVE_AUTH); break; case ModuleConstant.UPDATE_AUTHORIZED://授权变更 this.disposeAuthResult(result); + log.info(UPDATE_AUTH); break; } } catch (Exception e) { @@ -195,11 +198,13 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe //距离超时时间小于15分钟的数量 Integer tokenCount = componentAccessTokenDao.selectWillOverTokenCount(); if ((tokenCount > NumConstant.ZERO && accessTokenCountFlag.equals(ModuleConstant.ACCOUNT_TOKEN_FLAG_TWO)) || accessTokenCountFlag.equals(ModuleConstant.ACCOUNT_TOKEN_FLAG_ONE)) { + log.info(String.format(EXIST_UPCOMING_EXPIRED)); String componentVerifyTicket = redisThird.getComponentVerifyTicket(); JSONObject jsonObject = new JSONObject(); jsonObject.put(ModuleConstant.COMPONENT_APPID, componentAppId); jsonObject.put(ModuleConstant.COMPONENT_APPSECRET, appSecret); jsonObject.put(ModuleConstant.TICKET_UNDERLINE_KEY, componentVerifyTicket); + log.info(String.format(ThirdRunTimeInfoConstant.COMPONENT_ACCESS_TOKEN,componentVerifyTicket)); String post = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_COMPONENT_TOKEN_URL, JSON.toJSONString(jsonObject)).getData(); Map hashMap = JSON.parseObject(post, Map.class); if (!hashMap.containsKey(ModuleConstant.ERR_MSG)) { @@ -389,7 +394,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe formDTO.setExpiresInTime(expiresInTime); formDTO.setClientType(clientType); formDTO.setCustomerId(customerId); - log.info(formDTO.toString()); + log.info(ThirdRunTimeInfoConstant.BEGIN_DELETE_INSERT_AUTH_CODE); authCodeDao.deleteCustomerAuthCode(customerId,clientType); authCodeDao.insertRedirectAuthCode(formDTO); //authCode存缓存 @@ -523,6 +528,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe } public void createAndBindOpenAccount(String customerId,String authAppId,String clientType){ + log.info(ThirdRunTimeInfoConstant.BEGIN_CREATE_OPEN); Map authorizerRefreshToken = redisThird.getAuthorizerRefreshToken(customerId + ThirdRedisKeyConstant.COLON + clientType); String authorizerAccessToken = authorizerRefreshToken.get("authorizerAccessToken").toString(); JSONObject bindInfoForm = new JSONObject(); @@ -531,7 +537,6 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe Map bindInfo = JSON.parseObject(bindResult, Map.class); boolean bindStatus = bindInfo.containsKey(ModuleConstant.OPEN_APP_ID); if (bindStatus != true) { - log.info(CREATE_AND_BIND_SUCCESS); Integer authCount = customerMpDao.selectAuthCount(customerId); String openPlatformId = null; if (authCount > 0) { @@ -655,11 +660,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe * @author zxc */ public String getLoginUserCustomerId(TokenDto tokenDto){ - /*LoginUserDetailsFormDTO dto = new LoginUserDetailsFormDTO(); - BeanUtils.copyProperties(tokenDto,dto); - LoginUserDetailsResultDTO data = epmetUserOpenFeignClient.getLoginUserDetails(dto).getData();*/ PaCustomerUserAgencyDTO result = paCustomerUserAgencyDao.selectByUserId(tokenDto.getUserId()); -// return data.getCustomerId(); return result.getCustomerId(); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index 71dbf9c3d4..20f75b74fb 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java @@ -68,6 +68,7 @@ public class WarrantServiceImpl implements WarrantService { @Transactional(rollbackFor = Exception.class) @Override public String acceptMessageAndEvent(HttpServletRequest request, String appId, HttpServletResponse response)throws IOException, DocumentException, AesException { + log.info("消息与事件接收URL【代码审核结果】开始执行......"); log.info("appId："+ appId); request.setCharacterEncoding(ModuleConstant.UTF8); String msgSignature = request.getParameter(ModuleConstant.MSG_SIGNATURE); @@ -109,6 +110,7 @@ public class WarrantServiceImpl implements WarrantService { codeAuditRecord.setAuthAppId(authAppId); codeAuditRecord.setTemplateId(templateId); //插入 代码审核 记录 + log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT,xml)); codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord); // 修改 code_audit_result 中的代码审核结果 String event = codeAuditRecord.getEvent(); @@ -134,6 +136,7 @@ public class WarrantServiceImpl implements WarrantService { messagePushTextFormDTO.setWeChatCreateTime(date); messagePushTextDao.insertMessageText(messagePushTextFormDTO); } + log.info("消息与事件接收URL【代码审核结果】结束......"); return ModuleConstant.SUCCESS; } } From 1282e16cce17c81b119cf426514f3b0b24ccb643 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Jul 2020 10:29:49 +0800 Subject: [PATCH 02/21] heart+1 --- .../java/com/epmet/dto/form/work/PublishActInfoFormDTO.java | 2 +- .../src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java | 2 +- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java index e1005aa31a..5ded502bb2 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java @@ -121,7 +121,7 @@ public class PublishActInfoFormDTO implements Serializable { * 报名条件 */ @NotBlank(message = "报名条件不能为空", groups = {AddUserShowGroup.class}) - @Length(min=1, max=50,message = "报名条件限200字以内", groups = {AddUserShowGroup.class}) + @Length(min=1, max=500,message = "报名条件限500字以内", groups = {AddUserShowGroup.class}) private String requirement; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java index f3bce130df..d29b3460e2 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java @@ -122,7 +122,7 @@ public class RePublishFormDTO implements Serializable { * 报名条件 */ @NotBlank(message = "报名条件不能为空", groups = {AddUserShowGroup.class}) - @Length(min=1, max=50,message = "报名条件限200字以内", groups = {AddUserShowGroup.class}) + @Length(min=1, max=500,message = "报名条件限500字以内", groups = {AddUserShowGroup.class}) private String requirement; /** 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 cd227183d9..5d14e9d5b4 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.10 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.11 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 5a699202fb..7b03c74811 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.10 + 0.0.11 com.epmet epmet-heart From 09ff1027aa00ea15ba35a39c8d79fe923e051397 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 30 Jul 2020 11:09:09 +0800 Subject: [PATCH 03/21] =?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-=E5=85=AC=E4=BC=97=E5=8F=B7?= =?UTF-8?q?=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/PaCustomerServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index 432066c3da..b7333ae50a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -174,7 +174,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl Date: Thu, 30 Jul 2020 11:11:15 +0800 Subject: [PATCH 04/21] =?UTF-8?q?epmet-third=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=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 c13ef834e2..58be0929b6 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.77 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.78 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 a52498eafc..6c3ab2f9a8 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.77 + 0.0.78 com.epmet From 9cd21a92230d4012f1c46934cda184a106f94cf6 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 30 Jul 2020 11:18:26 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E4=B8=BAnull=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ActUserRelationDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0b98a68f39..b845694873 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 @@ -75,7 +75,7 @@ FROM act_user_relation re WHERE re.DEL_FLAG = '0' AND re.ACT_ID = #{actId} - GROUP BY re.ACT_ID + AND re.`STATUS` != 'refused' AND re.`STATUS` != 'cancele' From 515d978eec0bcfa5e4d7c0d625118c40329e9313 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 30 Jul 2020 12:09:58 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=8F=82=E5=8A=A0?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=8C=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ActInfoServiceImpl.java | 33 ++++++++++--------- .../impl/ActUserRelationServiceImpl.java | 13 +++++--- .../epmet/controller/UserRoleController.java | 2 +- 3 files changed, 28 insertions(+), 20 deletions(-) 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 3afeddf4bb..a7a058164f 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 @@ -128,21 +128,24 @@ public class ActInfoServiceImpl extends BaseServiceImpl> listAct(TokenDto tokenDto, ResiActBaseFormDTO formDto) { List list = new ArrayList<>(); formDto.setUserId(tokenDto.getUserId()); - // 查询活动状态是：报名中 signing_up - List signingUp = baseDao.selectListActSigningUp(formDto); - list.addAll(signingUp); - - // 查询活动状态是：已报满 enough - List enough = baseDao.selectListActQuotaIsEnough(formDto); - list.addAll(enough); - - // 查询活动状态是：截止报名 end_sign_up - List endSignUp = baseDao.selectListActEndSignUp(formDto); - list.addAll(endSignUp); - - // 查询活动状态是：已开始 in_progress - List inProgress = baseDao.selectListActInProgress(formDto); - list.addAll(inProgress); + // 列表第一次查询，不是已结束状态的活动，一次性返回 + if (formDto.getPageNo() == NumConstant.ONE){ + // 查询活动状态是：报名中 signing_up + List signingUp = baseDao.selectListActSigningUp(formDto); + list.addAll(signingUp); + + // 查询活动状态是：已报满 enough + List enough = baseDao.selectListActQuotaIsEnough(formDto); + list.addAll(enough); + + // 查询活动状态是：截止报名 end_sign_up + List endSignUp = baseDao.selectListActEndSignUp(formDto); + list.addAll(endSignUp); + + // 查询活动状态是：已开始 in_progress + List inProgress = baseDao.selectListActInProgress(formDto); + list.addAll(inProgress); + } // 查询活动状态是：已结束 finished int pageIndex = (formDto.getPageNo() - NumConstant.ONE) * formDto.getPageSize(); 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 c84e1efa93..de180d3745 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 @@ -299,12 +299,17 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl> userRoleInfo = epmetUserOpenFeignClient.getUserRoleInfoByUserId(userId); - if (userRoleInfo.success()){ - for (UserRoleResultDTO roleResultDTO :userRoleInfo.getData()){ - if (EpmetRoleKeyConstant.REGISTERED_RESI.equals(roleResultDTO.getRoleKey())){ - satisfy = true; + if (null != userRoleInfo){ + if (userRoleInfo.success()){ + for (UserRoleResultDTO roleResultDTO :userRoleInfo.getData()){ + if (EpmetRoleKeyConstant.REGISTERED_RESI.equals(roleResultDTO.getRoleKey())){ + satisfy = true; + } } } + } else { + logger.info(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg()); + throw new RenException(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode()); } return satisfy; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java index 7a1bbbe99d..90ceb71ea0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java @@ -128,7 +128,7 @@ public class UserRoleController { * @Author zhangyong * @Date 14:24 2020-07-23 **/ - @GetMapping("getuserroleinfobyuserid/{userId}") + @GetMapping(value = "getuserroleinfobyuserid/{userId}") public Result> getUserRoleInfoByUserId(@PathVariable("userId") String userId) { return userRoleService.getUserRoleInfoByUserId(userId); } From a0411ab43d67c1ffcdc0e3f29c260f11936d62b4 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 12:18:19 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=AD=97=E6=AE=B5source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/PaCustomerDTO.java | 5 +++++ .../src/main/java/com/epmet/dto/PaUserDTO.java | 5 +++++ .../src/main/java/com/epmet/dto/PaUserVisitedDTO.java | 5 +++++ .../src/main/java/com/epmet/constant/PaConstant.java | 4 ++++ .../src/main/java/com/epmet/entity/PaCustomerEntity.java | 5 +++++ .../src/main/java/com/epmet/entity/PaUserEntity.java | 5 +++++ .../src/main/java/com/epmet/entity/PaUserVisitedEntity.java | 5 +++++ .../java/com/epmet/service/impl/PaCustomerServiceImpl.java | 4 ++++ 8 files changed, 38 insertions(+) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java index dd175f0747..8beef22698 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java @@ -48,6 +48,11 @@ public class PaCustomerDTO implements Serializable { */ private Integer isInitialize; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + /** * 删除标识：0.未删除 1.已删除 */ diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java index 1a61724055..5961351e0e 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java @@ -53,6 +53,11 @@ public class PaUserDTO implements Serializable { */ private String gender; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + /** * 删除标识 */ diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java index 84f9601199..d39c1a32df 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java @@ -58,6 +58,11 @@ public class PaUserVisitedDTO implements Serializable { */ private String phone; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + /** * 删除标识 */ diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java index c381b4e2f3..7f25762c5e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java @@ -6,6 +6,10 @@ package com.epmet.constant; */ public interface PaConstant { + /** + * 根据userId查询pa_user表失败 + */ + String SELECT_USER_EXCEPTION = "获取用户信息失败"; /** * 更新用户信息失败 */ diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java index 9c32baf589..71a5cf6fc4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java @@ -48,4 +48,9 @@ public class PaCustomerEntity extends BaseEpmetEntity { */ private Integer isInitialize; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserEntity.java index 21565600a6..05ec73a6f2 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserEntity.java @@ -53,4 +53,9 @@ public class PaUserEntity extends BaseEpmetEntity { */ private String gender; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserVisitedEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserVisitedEntity.java index 4eb51375ba..0aae0e2548 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserVisitedEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserVisitedEntity.java @@ -58,4 +58,9 @@ public class PaUserVisitedEntity extends BaseEpmetEntity { */ private String phone; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index b7333ae50a..df6c581a92 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -172,6 +172,10 @@ public class PaCustomerServiceImpl extends BaseServiceImpl"+formDTO.getUserId()); + throw new RenException(PaConstant.SELECT_USER_EXCEPTION); + } //3.手机号不为空说明是同一个微信用户用第二个手机号注册，手机为空说明当前微信用户用第一个手机号注册 if(StringUtils.isNotBlank(paUserEntity.getPhone())){ From d5bf7a3957e9baf16733c2aebcee00028170f152 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 12:22:21 +0800 Subject: [PATCH 08/21] =?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 58be0929b6..ae94d96717 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.78 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.79 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 6c3ab2f9a8..42b6661983 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.78 + 0.0.79 com.epmet From 95986bbd22945a4298abdb9f2841a770c31f0447 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 30 Jul 2020 13:25:33 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E9=9D=9E=E5=B1=85=E6=B0=91=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E6=B4=BB=E5=8A=A8=E5=A4=B1=E8=B4=A5=EF=BC=8C=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=8F=90=E7=A4=BA=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/ActUserRelationServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) 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 de180d3745..3f677f0d5d 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 @@ -307,9 +307,6 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl Date: Thu, 30 Jul 2020 13:25:59 +0800 Subject: [PATCH 10/21] =?UTF-8?q?heart:bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/work/TestGrantFormDTO.java | 63 +++++++++++++++++++ .../epmet/controller/WorkActController.java | 6 ++ .../com/epmet/service/WorkActService.java | 2 + .../service/impl/WorkActServiceImpl.java | 34 ++++++++++ 4 files changed, 105 insertions(+) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/TestGrantFormDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/TestGrantFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/TestGrantFormDTO.java new file mode 100644 index 0000000000..4c6e2fe66b --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/TestGrantFormDTO.java @@ -0,0 +1,63 @@ +package com.epmet.dto.form.work; + +import com.alibaba.fastjson.JSON; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 描述一下 + * + * @author yinzuomei@elink-cn.com + * @date 2020/7/30 12:15 + */ +@Data +public class TestGrantFormDTO implements Serializable { + private static final long serialVersionUID = -2643821406956680381L; + public interface AddUserInternalGroup {} + /** + * 当前客户id + */ + @NotBlank(message = "客户id不能为空",groups = AddUserInternalGroup.class) + private String customerId; + /** + * 居民id + */ + @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) + private String userId; + /** + * 分值 + */ + @NotNull(message = "分值不能为空",groups = AddUserInternalGroup.class) + private Integer reward; + /** + * 业务id eg：活动id + */ + @NotBlank(message = "业务id不能为空",groups = AddUserInternalGroup.class) + private String sourceId; + /** + * 备注 + */ + @NotBlank(message = "备注不能为空",groups = AddUserInternalGroup.class) + private String remark; + + /** + * 加减分标识 plus/minus + */ + @NotBlank(message = "加减分标识 plus/minus不能为空",groups = AddUserInternalGroup.class) + private String actionFlag; + + TestGrantFormDTO(){ + this.customerId=""; + this.userId=""; + this.sourceId="111"; + this.reward=20; + this.remark="test"; + this.actionFlag="plus"; + } + public static void main(String[] args) { + System.out.println(JSON.toJSON(new TestGrantFormDTO())); + } +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java index 67eb62f18d..175e54bdaf 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java @@ -190,6 +190,12 @@ public class WorkActController { return new Result(); } + @PostMapping("testgrantpoint") + public Result testGrantPoint(@RequestBody TestGrantFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,TestGrantFormDTO.AddUserInternalGroup.class); + workActService.testGrantPoint(formDTO); + return new Result(); + } /** * @return com.epmet.commons.tools.utils.Result * @param formDTO diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java index 8aca54049d..bc72cc7d67 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java @@ -146,4 +146,6 @@ public interface WorkActService { * @Date 2020/7/27 13:55 **/ PublishActResultDTO rePublish(RePublishFormDTO rePublishFormDTO); + + void testGrantPoint(TestGrantFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index e93d288699..3d4b26a331 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -873,6 +873,39 @@ public class WorkActServiceImpl implements WorkActService { } } + @Override + public void testGrantPoint(TestGrantFormDTO formDTO) { + //查询当前用户所属组织信息 + Result userResult = govOrgOpenFeignClient.getAgencyByStaff(loginUserUtil.getLoginUserId()); + String opAgencyId = userResult.getData().getId(); + MqBaseMsgDTO mqBaseMsgDTO = new MqBaseMsgDTO(); + //mq的事件类型 + mqBaseMsgDTO.setEventClass(EventEnum.ACTIVE_SEND_POINT.getEventClass()); + //事件code + mqBaseMsgDTO.setEventTag(EventEnum.ACTIVE_SEND_POINT.getEventTag()); + List basePointEventMsgArrayList = new ArrayList<>(); + BasePointEventMsg basePointEventMsg = new BasePointEventMsg(); + basePointEventMsg.setOpAgencyId(opAgencyId); + basePointEventMsg.setCustomerId(formDTO.getCustomerId()); + basePointEventMsg.setUserId(formDTO.getUserId()); + basePointEventMsg.setActionFlag(formDTO.getActionFlag()); + basePointEventMsg.setPoint(formDTO.getReward()); + basePointEventMsg.setIsCommon(true); + basePointEventMsg.setRemark(formDTO.getRemark()); + basePointEventMsg.setSourceId(formDTO.getSourceId()); + basePointEventMsg.setOperatorId(loginUserUtil.getLoginUserId()); + basePointEventMsgArrayList.add(basePointEventMsg); + mqBaseMsgDTO.setMsg(JSON.toJSONString(basePointEventMsgArrayList)); + logger.info("发送消息入参:"+JSON.toJSON(mqBaseMsgDTO)); + Result result = SendMqMsgUtils.sendMsg(mqBaseMsgDTO); + logger.info("发送消息返参:"+JSON.toJSON(result)); + if (!result.success()) { + logger.error("积分发放失败"); + return; + } + logger.info("积分发方成功"); + } + private void updateHeartUserInfo(ActInfoDTO actInfoDTO) { List actUserRelationDTOList=actUserRelationService.getUserList(actInfoDTO.getId(),StrConstant.EPMETY_STR); for(ActUserRelationDTO actUserRelation:actUserRelationDTOList){ @@ -1082,6 +1115,7 @@ public class WorkActServiceImpl implements WorkActService { return publishActResultDTO; } + private void noticePassedPeople(ActInfoDTO originalActInfo, ActInfoEntity newActInfoEntity) { /* List actUserRelationDTOList=actUserRelationDao.selectAuditingAndPassedList(originalActInfo.getId()); if(null==actUserRelationDTOList||actUserRelationDTOList.size()<1){ From 05db6ad2c8881df1b9fc9cd8463038e8dfd12e38 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Jul 2020 13:28:23 +0800 Subject: [PATCH 11/21] heart+1 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 5d14e9d5b4..38669e327f 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.11 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.12 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 7b03c74811..cf61c66028 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.11 + 0.0.12 com.epmet epmet-heart From a2e61fb4b425be2ad62bdf1fef84b11e96ee7e8a Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Jul 2020 13:42:10 +0800 Subject: [PATCH 12/21] =?UTF-8?q?POINT=20=20=20USER=20=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PointVerificationLogServiceImpl.java | 14 +++---- .../com/epmet/redis/UserBaseInfoRedis.java | 26 ++++++------ .../service/impl/GridLatestServiceImpl.java | 2 +- .../main/resources/mapper/UserBaseInfoDao.xml | 40 ++++++++++--------- .../main/resources/mapper/UserWechatDao.xml | 8 ++-- 5 files changed, 48 insertions(+), 42 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index 319b3fa0ce..353751cbc5 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -189,14 +189,14 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl dataList = - baseDao.selectStaffVerificationLog(verificationParam.getStaffId(),getFirstDayDateOfMonth(date),getLastDayOfMonth(date)); - if(NumConstant.ONE < verificationParam.getPageNo()){ + baseDao.selectStaffVerificationLog(verificationParam.getStaffId(),getFirstDayDateOfMonth(date),getLastDayOfMonth(date)); + if(NumConstant.ONE == verificationParam.getPageNo()){ result.setTotalPoint( dataList.stream().mapToInt(o -> o.getPoint()).sum() ); }else{ - int fromIndex = verificationParam.getPageNo() * verificationParam.getPageSize(); - int toIndex = (verificationParam.getPageNo() + 1) * verificationParam.getPageSize(); + int fromIndex = (verificationParam.getPageNo() - 1) * verificationParam.getPageSize(); + int toIndex = verificationParam.getPageNo() * verificationParam.getPageSize(); if(toIndex > dataList.size()) { toIndex = dataList.size(); } @@ -205,17 +205,17 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl userIds = dataList.stream().map(data -> data.getUserId()).collect(Collectors.toList()); Result> userInfo = - epmetUserOpenFeignClient.queryUserBaseInfo(userIds); + epmetUserOpenFeignClient.queryUserBaseInfo(userIds); boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty(); for(int i = NumConstant.ZERO ; i < dataList.size() ; i++){ - WorkPointVerificationDetailResultDTO o = new WorkPointVerificationDetailResultDTO(); + WorkPointVerificationDetailResultDTO o = ConvertUtils.sourceToTarget(dataList.get(i),WorkPointVerificationDetailResultDTO.class); o.setPoint(new StringBuilder("-").append(dataList.get(i).getPoint().toString()).toString()); - o.setRemark(dataList.get(i).getRemark()); if(userRequestCallback) { //如果是陌生人显示微信昵称 o.setUserNickname(userInfo.getData().get(i) == null ? ModuleConstant.EMPTY_STR : (StringUtils.isBlank(userInfo.getData().get(i).getShowName()) ? userInfo.getData().get(i).getNickname() : userInfo.getData().get(i).getShowName())); } + resultObj.add(o); } 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 ac442388ad..40b34099a7 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 @@ -106,18 +106,19 @@ public class UserBaseInfoRedis { baseInfo.setCustomerId(relation.getCustomerId()); BelongGridNameFormDTO gridParam = new BelongGridNameFormDTO(); gridParam.setGridId(relation.getGridId()); + baseInfo.setRegisteredGridId(relation.getGridId()); Result gridResult = - govOrgOpenFeignClient.getGridNameByGridId(gridParam); + govOrgOpenFeignClient.getGridNameByGridId(gridParam); if(gridResult.success() && null != gridResult.getData() && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())){ String gridFullName = gridResult.getData().getBelongsGridName(); baseInfo.setRegisteredGridName(gridFullName); StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(baseInfo.getSurname()); - switch(baseInfo.getGender()){ - case NumConstant.ONE_STR : + switch (baseInfo.getGender()) { + case NumConstant.ONE_STR: buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE); break; - case NumConstant.TWO_STR : + case NumConstant.TWO_STR: buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE); break; default: @@ -125,18 +126,19 @@ public class UserBaseInfoRedis { } baseInfo.setShowName(buffer.toString()); } - }else{ - //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id - LatestGridInfoResultDTO gridLatest = + } + }else{ + //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id + LatestGridInfoResultDTO gridLatest = gridLatestDao.selectLatestGridInfoByUserId(userId); - if(null != gridLatest){ - baseInfo.setCustomerId(gridLatest.getCustomerId()); - } + if(null != gridLatest){ + baseInfo.setCustomerId(gridLatest.getCustomerId()); } - set(baseInfo); - return baseInfo; } + set(baseInfo); + return baseInfo; } + return null; } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java index c6012384ba..71c4005717 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java @@ -197,7 +197,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml index cfacc58191..e96b505b09 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -93,10 +93,10 @@ From c89882fc86d77b94768a52c0aa54a3784ed0b6a4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Jul 2020 14:14:04 +0800 Subject: [PATCH 17/21] heart+1 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 38669e327f..917a45aa95 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.12 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.13 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 cf61c66028..056fdd1f99 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.12 + 0.0.13 com.epmet epmet-heart From ee039c628bb546627e364aa9031f87f9dd74c743 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 30 Jul 2020 14:42:27 +0800 Subject: [PATCH 18/21] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/ResiVolunteerInfoResultDTO.java | 86 +++++++++++++++++++ .../controller/ResiVolunteerController.java | 23 +++++ .../java/com/epmet/dao/VolunteerInfoDao.java | 11 +++ .../epmet/service/VolunteerInfoService.java | 10 +++ .../impl/VolunteerInfoServiceImpl.java | 26 ++++++ .../resources/mapper/VolunteerInfoDao.xml | 10 +++ .../epmet/feign/EpmetUserOpenFeignClient.java | 18 +++- .../EpmetUserOpenFeignClientFallback.java | 6 ++ .../controller/UserBaseInfoController.java | 4 +- 9 files changed, 188 insertions(+), 6 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiVolunteerInfoResultDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiVolunteerInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiVolunteerInfoResultDTO.java new file mode 100644 index 0000000000..20995ac5a4 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiVolunteerInfoResultDTO.java @@ -0,0 +1,86 @@ +package com.epmet.dto.result.resi; +import lombok.Data; + +import java.io.Serializable; + +/** + * 志愿者信息+用户基础信息 返回值 + * @Auther: zhangyong + * @Date: 2020-07-28 14:40 + */ + +@Data +public class ResiVolunteerInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 用户id + */ + private String userId; + + /** + * 手机号(注册手机号) + */ + private String mobile; + + /** + * 姓氏 + */ + private String surname; + + /** + * 名 + */ + private String name; + + /** + * 姓名 + */ + private String realName; + + /** + * 身份证号 + */ + private String idNum; + + /** + * 性别（1男2女0未知） + */ + private String gender; + + /** + * 街道 + */ + private String street; + + /** + * 小区名称 + */ + private String district; + + /** + * 楼栋单元 + */ + private String buildingAddress; + + /** + * 昵称(目前来源于微信昵称，后续系统可支持用户有昵称) + */ + private String nickname; + + /** + * 头像（目前来源于微信，后续系统顾客支持上传头像） + */ + private String headImgUrl; + + /** + * 志愿者签名 + */ + private String volunteerSignature; + + /** + * 志愿者自我介绍 + */ + private String volunteerIntroduce; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java index a2768b99bd..4125f45f5f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java @@ -23,6 +23,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.resi.ResiActUserCancelSignUpFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; +import com.epmet.dto.result.ResiUserBaseInfoResultDTO; +import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO; import com.epmet.service.VolunteerInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -44,9 +46,30 @@ public class ResiVolunteerController { @Autowired private VolunteerInfoService volunteerInfoService; + /** + * 志愿者认证 + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @Author zhangyong + * @Date 13:59 2020-07-30 + **/ @PostMapping("authenticate") public Result authenticate(@LoginUser TokenDto tokenDto, @RequestBody ResiVolunteerAuthenticateFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ResiVolunteerAuthenticateFormDTO.AddUserInternalGroup.class, ResiVolunteerAuthenticateFormDTO.AddUserShowGroup.class); return volunteerInfoService.authenticate(tokenDto, formDTO); } + + /** + * 志愿者认证界面，获取用户基础信息+志愿者信息 + * + * @param tokenDTO + * @return com.epmet.commons.tools.utils.Result + * @Author zhangyong + * @Date 15:20 2020-07-28 + **/ + @PostMapping("selectvolunteerinfo") + public Result selectVolunteerInfo(@LoginUser TokenDto tokenDTO){ + return volunteerInfoService.selecVolunteerInfoByUserId(tokenDTO); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java index 5ceec37857..7b557dbaa1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.VolunteerInfoDTO; import com.epmet.entity.VolunteerInfoEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -52,4 +53,14 @@ public interface VolunteerInfoDao extends BaseDao { * @Date 15:05 2020-07-23 **/ void updateVolunteerInfoByUserId(VolunteerInfoEntity entity); + + /** + * 根据用户id，查询志愿者信息 + * + * @param userId + * @return java.lang.String + * @Author zhangyong + * @Date 14:33 2020-07-23l + **/ + VolunteerInfoDTO selectVolunteerInfoByUserId(@Param("userId") String userId); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java index 6938871d5b..0ca916c51d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.VolunteerInfoDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; +import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO; import com.epmet.entity.VolunteerInfoEntity; import java.util.List; @@ -47,4 +48,13 @@ public interface VolunteerInfoService extends BaseService { **/ Result authenticate(TokenDto tokenDto, ResiVolunteerAuthenticateFormDTO formDTO); + /** + * 志愿者认证界面，获取用户基础信息+志愿者信息 + * + * @param tokenDto + * @return com.epmet.commons.tools.utils.Result + * @Author zhangyong + * @Date 14:05 2020-07-30 + **/ + Result selecVolunteerInfoByUserId(TokenDto tokenDto); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java index 7d219aca27..15b2519c4d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.enums.EventEnum; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -31,8 +32,11 @@ import com.epmet.commons.tools.utils.SendMqMsgUtils; import com.epmet.constant.ActMessageConstant; import com.epmet.dao.VolunteerInfoDao; import com.epmet.dto.HeartUserInfoDTO; +import com.epmet.dto.VolunteerInfoDTO; import com.epmet.dto.form.WxUserInfoFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; +import com.epmet.dto.result.ResiUserBaseInfoResultDTO; +import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO; import com.epmet.entity.VolunteerInfoEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.redis.VolunteerInfoRedis; @@ -134,4 +138,26 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl selecVolunteerInfoByUserId(TokenDto tokenDto) { + ResiVolunteerInfoResultDTO resultDTO = new ResiVolunteerInfoResultDTO(); + // 获取用户基本信息 + Result userBaseInfo = epmetUserOpenFeignClient.selectUserBaseInfo(tokenDto); + if (userBaseInfo.success()){ + resultDTO = ConvertUtils.sourceToTarget(userBaseInfo.getData(), ResiVolunteerInfoResultDTO.class); + // 判断是不是志愿者 + Integer volunteerFlag = baseDao.queryVolunteerFlagByUserId(tokenDto.getUserId()); + if (volunteerFlag > NumConstant.ZERO){ + // 获取志愿者信息 + VolunteerInfoDTO dto = baseDao.selectVolunteerInfoByUserId(tokenDto.getUserId()); + resultDTO.setVolunteerIntroduce(dto.getVolunteerIntroduce()); + resultDTO.setVolunteerSignature(dto.getVolunteerSignature()); + } + } else { + logger.error("获取用户基本信息失败"); + throw new RenException("获取用户基本信息失败!"); + } + return new Result().ok(resultDTO); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml index 3555334a07..13d1cb7660 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -44,4 +44,14 @@ WHERE DEL_FLAG = '0' AND USER_ID = #{userId} + + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 67c3a83204..5aa0a5e9dd 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -1,6 +1,8 @@ package com.epmet.feign; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.GovStaffRoleDTO; @@ -11,10 +13,7 @@ import com.epmet.dto.result.*; import com.epmet.feign.fallback.EpmetUserOpenFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -229,4 +228,15 @@ public interface EpmetUserOpenFeignClient { **/ @GetMapping(value = "epmetuser/customerstaff/getCustsomerStaffByIdAndPhone") Result> getCustsomerStaffByIdAndPhone(@RequestBody ThirdCustomerStaffFormDTO formDTO); + + /** + * 获取用户基础信息 + * + * @param tokenDTO + * @return com.epmet.commons.tools.utils.Result + * @Author zhangyong + * @Date 14:10 2020-07-30 + **/ + @PostMapping("/epmetuser/userbaseinfo/selectuserbaseinfo") + Result selectUserBaseInfo(@RequestBody TokenDto tokenDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 0637ffc307..9c3fc1d0ba 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -1,6 +1,7 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerStaffDTO; @@ -167,4 +168,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result> getCustsomerStaffByIdAndPhone(ThirdCustomerStaffFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustsomerStaffByIdAndPhone", formDTO); } + + @Override + public Result selectUserBaseInfo(TokenDto tokenDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectUserBaseInfo", tokenDTO); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java index 2273048c93..26c6cf8c3c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java @@ -158,8 +158,8 @@ public class UserBaseInfoController { * @Author zhangyong * @Date 15:20 2020-07-28 **/ - @PostMapping("selecuserbaseinfo") - public Result selecUserBaseInfo(@LoginUser TokenDto tokenDTO){ + @PostMapping("selectuserbaseinfo") + public Result selectUserBaseInfo(@LoginUser TokenDto tokenDTO){ return userBaseInfoService.selecUserBaseInfoByUserId(tokenDTO.getUserId()); } } From 3c233719ff548c011346e2d3fc6e3ef0448bd143 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 30 Jul 2020 14:44:14 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/ResiVolunteerController.java | 2 +- .../src/main/java/com/epmet/service/VolunteerInfoService.java | 2 +- .../java/com/epmet/service/impl/VolunteerInfoServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java index 4125f45f5f..bd6dcd48bb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiVolunteerController.java @@ -70,6 +70,6 @@ public class ResiVolunteerController { **/ @PostMapping("selectvolunteerinfo") public Result selectVolunteerInfo(@LoginUser TokenDto tokenDTO){ - return volunteerInfoService.selecVolunteerInfoByUserId(tokenDTO); + return volunteerInfoService.selectVolunteerInfoByUserId(tokenDTO); } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java index 0ca916c51d..224da29b05 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/VolunteerInfoService.java @@ -56,5 +56,5 @@ public interface VolunteerInfoService extends BaseService { * @Author zhangyong * @Date 14:05 2020-07-30 **/ - Result selecVolunteerInfoByUserId(TokenDto tokenDto); + Result selectVolunteerInfoByUserId(TokenDto tokenDto); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java index 15b2519c4d..06cd0afafd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java @@ -140,7 +140,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl selecVolunteerInfoByUserId(TokenDto tokenDto) { + public Result selectVolunteerInfoByUserId(TokenDto tokenDto) { ResiVolunteerInfoResultDTO resultDTO = new ResiVolunteerInfoResultDTO(); // 获取用户基本信息 Result userBaseInfo = epmetUserOpenFeignClient.selectUserBaseInfo(tokenDto); From ce730717011309a436629817c2c40eed4fa8b112 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Jul 2020 15:03:16 +0800 Subject: [PATCH 20/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96role=E6=97=B6=E6=B7=BB=E5=8A=A0app=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 37c52c4583..061b9148ef 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 @@ -150,8 +150,9 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Thu, 30 Jul 2020 15:05:58 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=E9=83=A8=E7=BD=B2user?= 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 d7a3ab5278..075306db4f 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.92 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.93 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 d0ba44872e..8581bc4f18 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.92 + 0.3.93 com.epmet epmet-user