From 9cb5139691ba36fe5969e15f28cba4312c7a265f Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 24 Aug 2022 10:04:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E8=A1=A5=E5=85=85=E9=AA=8C=E8=AF=81=E7=A0=81=E3=80=81?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/CustomEnterpriseServiceImpl.java | 2 +- .../elink/esua/epdc/service/impl/ItemServiceImpl.java | 10 +++++++++- .../esua/epdc/dto/item/form/SubmitItemFormDTO.java | 8 ++++++++ .../modules/item/service/impl/ItemServiceImpl.java | 2 ++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java index 32d93f6a2..e040a708f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java @@ -148,7 +148,7 @@ public class CustomEnterpriseServiceImpl implements CustomEnterpriseService { /** * 校验手机验证码 */ - private void checkSmsCode(String mobile, String smsCode) { + public void checkSmsCode(String mobile, String smsCode) { String redisSmsCode = appUserRedis.getSmsCode(mobile); if (StringUtils.isBlank(redisSmsCode) || !redisSmsCode.equals(smsCode)) { throw new RenException("手机验证码错误"); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index 327462772..f92872897 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java @@ -20,6 +20,7 @@ import com.elink.esua.epdc.feign.UserFeignClient; import com.elink.esua.epdc.service.ItemService; import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserMatchTagFormDTO; import com.elink.esua.epdc.utils.UserTagUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,6 +49,9 @@ public class ItemServiceImpl implements ItemService { @Autowired private AdminFeignClient adminFeignClient; + @Autowired + private CustomEnterpriseServiceImpl customEnterpriseServiceImpl; + @Override public Result> listItems(TokenDto userDetail, ItemFormDTO formDto) { if (null == userDetail) { @@ -148,6 +152,10 @@ public class ItemServiceImpl implements ItemService { @Override public Result submitItem(TokenDto userDetail, SubmitItemFormDTO formDto) { + if(StringUtils.isNotBlank(formDto.getSmsCode())){ + // 验证手机号 + customEnterpriseServiceImpl.checkSmsCode(formDto.getMobile(), formDto.getSmsCode()); + } // 获取所有上级机构名称和ID拼接 Result dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId()); ParentAndAllDeptDTO deptDTO = dtoResult.getData(); @@ -169,7 +177,7 @@ public class ItemServiceImpl implements ItemService { } else { formDto.setIsPartyMember(YesOrNoEnum.NO.value()); } - formDto.setMobile(userDetail.getMobile()); +// formDto.setMobile(userDetail.getMobile()); return itemFeignClient.submitItem(formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java index 81155feeb..1565b1ef1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; /** * @program: esua-epdc @@ -35,6 +36,8 @@ public class SubmitItemFormDTO implements Serializable { */ private String mobile; + private String smsCode; + /** * 党员标识 0：否，1：是 */ @@ -100,4 +103,9 @@ public class SubmitItemFormDTO implements Serializable { */ @NotBlank(message = "是否公开不能为空") private String showFlag; + + /** + * 图片 + */ + private List images; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index b0e02e1aa..6fda776f1 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -1949,6 +1949,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem baseDao.insert(entity); //插入项目部门关联表 itemDeptService.savePeopleSubmitInfo(entity); + // 保存图片 + imgService.saveImages(formDto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_EVENTS); return new Result(); }