Browse Source

北尚诉办-上报补充验证码、图片

feature/dangjian
Jackwang 3 years ago
parent
commit
9cb5139691
  1. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java
  2. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java
  3. 8
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/SubmitItemFormDTO.java
  4. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

2
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("手机验证码错误");

10
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<List<ItemResultDTO>> 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<ParentAndAllDeptDTO> 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);
}

8
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;
/**
* 党员标识 01
*/
@ -100,4 +103,9 @@ public class SubmitItemFormDTO implements Serializable {
*/
@NotBlank(message = "是否公开不能为空")
private String showFlag;
/**
* 图片
*/
private List<String> images;
}

2
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<ItemDao, ItemEntity> implem
baseDao.insert(entity);
//插入项目部门关联表
itemDeptService.savePeopleSubmitInfo(entity);
// 保存图片
imgService.saveImages(formDto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_EVENTS);
return new Result();
}

Loading…
Cancel
Save