From 91948ce28c381ba1f7bdeb926ab09ae154262a59 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 3 Apr 2020 09:49:50 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B0=86messa?= =?UTF-8?q?ge-server=E6=A8=A1=E5=9D=97=E7=9A=84feign=20client=E6=8C=AA?= =?UTF-8?q?=E5=88=B0=E4=BA=86message-client=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/feign/MessageFeignClient.java | 2 +- .../com/epmet/feign/fallback/MessageFeignClientFallback.java | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename epmet-module/epmet-message/{epmet-message-server => epmet-message-client}/src/main/java/com/epmet/feign/MessageFeignClient.java (91%) rename epmet-module/epmet-message/{epmet-message-server => epmet-message-client}/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java (100%) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java similarity index 91% rename from epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java rename to epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java index 82a9516e7a..cfa79bf8cc 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java @@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class, url = "http://localhost:8085") +@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class) public interface MessageFeignClient { /** diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java similarity index 100% rename from epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java rename to epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java From cb5aae62ae9fe888d576f1bc20d106ebfe785bd3 Mon Sep 17 00:00:00 2001 From: hosinokamui Date: Fri, 3 Apr 2020 09:52:08 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PartyMemberConfirmServiceImpl.java | 13 +++++++++---- .../com/epmet/service/impl/UserRoleServiceImpl.java | 1 - 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 63c36c221c..e5cb397981 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -140,20 +140,24 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService PartymemberInfoEntity.class); if (confirmAutoDTO == null || confirmAutoDTO.getResult().compareTo(PartyMemberConstant.BENCHMARK) < 0) { + //将访问记录更新到热心居民申请行为记录表 + saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); + //自动认证失败 partyMemberInfoEntity.setConfirmResult("1"); partymemberInfoService.insert(partyMemberInfoEntity); - //将访问记录更新到热心居民申请行为记录表 - saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); + //TODO code待定 result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getValue()); result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getName()); } else { + //将访问记录更新到热心居民申请行为记录表 + saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS); + //自动认证成功 partyMemberInfoEntity.setConfirmResult("0"); partymemberInfoService.insert(partyMemberInfoEntity); - //将访问记录更新到热心居民申请行为记录表 - saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS); + //添加用户党员角色关系 UserRoleDTO userRole = new UserRoleDTO(); userRole.setCustomerId(partyMemberInfoDTO.getCustomerId()); @@ -243,6 +247,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService * @param operate 操作 * @return String */ + @Transactional(rollbackFor = Exception.class) private String saveOrUpdateVisit(String visitId, PartyMemberInitFromDTO fromDTO, String operate) { PartymemberVisitEntity partymemberVisitEntity = new PartymemberVisitEntity(); if (null == visitId) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java index 26ff34860b..3650de51fc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java @@ -121,7 +121,6 @@ public class UserRoleServiceImpl extends BaseServiceImpl Date: Fri, 3 Apr 2020 10:19:09 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=BAurl=E4=BC=A0=E5=8F=82=E3=80=82=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=9A=84feign=20client?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/MessageFeignClient.java | 9 +++++++-- .../epmet/feign/fallback/MessageFeignClientFallback.java | 6 ++++++ .../main/java/com/epmet/controller/SmsController.java | 5 ++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java index cfa79bf8cc..3098601d8e 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.SysSmsDTO; import com.epmet.feign.fallback.MessageFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -18,7 +19,11 @@ public interface MessageFeignClient { @PostMapping(value = "message/sms/send") Result send(@RequestBody SysSmsDTO smsDTO); - //@PostMapping(value = "message/sms/send", consumes = "application/x-www-form-urlencoded") - //Result send(Map entityBody); + /** + * 发送短信验证码 + * @return + */ + @GetMapping(value = "message/sms/captcha/{mobile}") + Result sendSmsCaptcha(String mobile); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java index 3010195b34..d9ba149f15 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java @@ -18,4 +18,10 @@ public class MessageFeignClientFallback implements MessageFeignClient { public Result send(SysSmsDTO smsDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "send", smsDTO); } + + @Override + public Result sendSmsCaptcha(String mobile) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendSmsCaptcha", mobile); + } + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java index ea698fa6e5..f2eabce66e 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java @@ -119,14 +119,13 @@ public class SmsController { * 发送短信验证码 * @return */ - @PostMapping("captcha") + @GetMapping("captcha/{mobile}") @ApiOperation("发送短信验证码") //@LogOperation("发送短信验证码") @ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", paramType = "query", required = true, dataType="String") }) - public Result sendSmsCaptcha(@RequestBody SysSmsDTO sysSmsDTO) { - String mobile = sysSmsDTO.getMobile(); + public Result sendSmsCaptcha(@PathVariable("mobile") String mobile) { String captcha = sysSmsService.sendSmsCaptcha(mobile); HashMap map = new HashMap<>(); map.put("code", captcha); From b3eb5fc2712bf23d4f94e21251080af13eb982de Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 3 Apr 2020 10:33:06 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E6=B3=A8=E5=86=8C=E3=80=81=E7=83=AD=E5=BF=83=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=A8=A1=E5=9D=97insert=E8=AF=AD=E5=8F=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E4=BD=BF=E7=94=A8=E7=B3=BB=E7=BB=9Finsert=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/ResiWarmheartedApplyDao.java | 1 - .../dao/ResiWarmheartedVisitDao.java | 1 - .../impl/ResiWarmheartedApplyServiceImpl.java | 26 ++++--------- .../impl/ResiWarmheartedVisitServiceImpl.java | 29 +++++--------- .../warmhearted/ResiWarmheartedApplyDao.xml | 34 ----------------- .../warmhearted/ResiWarmheartedVisitDao.xml | 32 ---------------- .../com/epmet/dao/RegisterRelationDao.java | 3 +- .../java/com/epmet/dao/UserResiInfoDao.java | 6 --- .../epmet/dao/UserResiRegisterVisitDao.java | 2 - .../impl/RegisterRelationServiceImpl.java | 26 +++++-------- .../service/impl/UserResiInfoServiceImpl.java | 11 +----- .../UserResiRegisterVisitServiceImpl.java | 28 ++++++-------- .../resources/mapper/RegisterRelationDao.xml | 35 ----------------- .../main/resources/mapper/UserResiInfoDao.xml | 38 ------------------- .../mapper/UserResiRegisterVisitDao.xml | 31 --------------- 15 files changed, 41 insertions(+), 262 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java index de03c5259e..843eac1b54 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java @@ -40,5 +40,4 @@ public interface ResiWarmheartedApplyDao extends BaseDao { - boolean saveResiWarmheartedVisit(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO); boolean updateResiWarmVisitById(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index f3ce755213..9096be4679 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -155,24 +155,14 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO) { - Date date = new Date(); - ResiWarmheartedVisitDTO resiWarmheartedVisitDTO = new ResiWarmheartedVisitDTO(); - resiWarmheartedVisitDTO.setCustomerId(formDTO.getCustomerId()); - resiWarmheartedVisitDTO.setGridId(formDTO.getGridId()); - resiWarmheartedVisitDTO.setUserId(formDTO.getUserId()); - resiWarmheartedVisitDTO.setVisitFrom(formDTO.getVisitFrom()); + ResiWarmheartedVisitEntity entity = new ResiWarmheartedVisitEntity(); + entity.setCustomerId(formDTO.getCustomerId()); + entity.setGridId(formDTO.getGridId()); + entity.setUserId(formDTO.getUserId()); + entity.setVisitFrom(formDTO.getVisitFrom()); //最后一次操作行为（initialize:初始化 sms_code:获取验证码 success:提交成功 faild:提交失败） - resiWarmheartedVisitDTO.setOperateVisit(ResiWarmheartedVisitConstant.INITIALIZE); - resiWarmheartedVisitDTO.setVisitTime(date); - //UUID - resiWarmheartedVisitDTO.setId(IdWorker.get32UUID()); - resiWarmheartedVisitDTO.setDelFlag(NumConstant.ZERO); - resiWarmheartedVisitDTO.setRevision(NumConstant.ZERO); - resiWarmheartedVisitDTO.setCreatedBy(formDTO.getUserId()); - resiWarmheartedVisitDTO.setCreatedTime(date); - resiWarmheartedVisitDTO.setUpdatedBy(formDTO.getUserId()); - resiWarmheartedVisitDTO.setUpdatedTime(date); - if(!resiWarmheartedVisitDao.saveResiWarmheartedVisit(resiWarmheartedVisitDTO)){ - log.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION); - } + entity.setOperateVisit(ResiWarmheartedVisitConstant.INITIALIZE); + entity.setVisitTime(new Date()); + baseDao.insert(entity); ResiWarmheartedResultDTO resiWarmheartedResultDTO = new ResiWarmheartedResultDTO(); - resiWarmheartedResultDTO.setResiWarmVisitId(resiWarmheartedVisitDTO.getId()); + resiWarmheartedResultDTO.setResiWarmVisitId(entity.getId()); return new Result().ok(resiWarmheartedResultDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml index 3947be348a..e4f87e4f27 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml @@ -37,40 +37,6 @@ rw.updated_time AS "updatedtime" - - INSERT INTO resi_warmhearted_apply ( - id, - customer_id, - grid_id, - user_id, - reason, - audit_status, - refuse_reason, - resi_warm_visit_id, - del_flag, - revision, - created_by, - created_time, - updated_by, - updated_time - )VALUES( - #{id}, - #{customerId}, - #{gridId}, - #{userId}, - #{reason}, - #{auditStatus}, - #{refuseReason}, - #{resiWarmVisitId}, - #{delFlag}, - #{revision}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime} - ) - - SELECT * 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 5db6fd0047..5d68dcef31 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 @@ -38,44 +38,6 @@ uri.updated_time AS "updatedtime" - - INSERT INTO user_resi_info ( - id, - user_id, - reg_mobile, - surname, - `name`, - street, - district, - building_address, - resi_visit_id, - del_flag, - revision, - created_by, - created_time, - updated_by, - updated_time - ) - VALUES - ( - #{id}, - #{userId}, - #{regMobile}, - #{surname}, - #{name}, - #{street}, - #{district}, - #{buildingAddress}, - #{resiVisitId}, - #{delFlag}, - #{revision}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime} - ) - -