Browse Source

bug修改

dev
yinzuomei 5 years ago
parent
commit
52d9334daf
  1. 6
      epmet-module/epmet-demo/epmet-demo-server/pom.xml
  2. 4
      epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java
  3. 8
      epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java
  4. 19
      epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java
  5. 4
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
  6. 2
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

6
epmet-module/epmet-demo/epmet-demo-server/pom.xml

@ -72,6 +72,12 @@
<artifactId>epmet-user-server</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-message-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

4
epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java

@ -181,4 +181,8 @@ public class DemoController {
return demoService.getSysUserInfoById(id);
}
@GetMapping("sendSmsCaptcha/{mobile}")
public Result sendSmsCaptcha(@PathVariable("mobile") String mobile) {
return demoService.sendSmsCaptcha(mobile);
}
}

8
epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java

@ -155,4 +155,12 @@ public interface DemoService extends BaseService<DemoEntity> {
**/
Result<UserDetail> getSysUserInfoById(Long id);
/**
* @return com.epmet.commons.tools.utils.Result
* @param mobile
* @Author yinzuomei
* @Description 测试发送验证码
* @Date 2020/4/3 13:41
**/
Result sendSmsCaptcha(String mobile);
}

19
epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java

@ -34,6 +34,7 @@ import com.epmet.dto.result.ValidCustomerResultDTO;
import com.epmet.entity.DemoEntity;
import com.epmet.feign.AdminFeignClient;
import com.epmet.feign.GovOrgFeignClient;
import com.epmet.feign.MessageFeignClient;
import com.epmet.feign.OperCrmFeignClient;
import com.epmet.redis.DemoRedis;
import com.epmet.service.DemoService;
@ -65,6 +66,9 @@ public class DemoServiceImpl extends BaseServiceImpl<DemoDao, DemoEntity> implem
private GovOrgFeignClient govOrgFeignClient;
@Autowired
private AdminFeignClient adminFeignClient;
@Autowired
private MessageFeignClient messageFeignClient;
@Override
public PageData<DemoDTO> page(Map<String, Object> params) {
IPage<DemoEntity> page = baseDao.selectPage(
@ -168,4 +172,19 @@ public class DemoServiceImpl extends BaseServiceImpl<DemoDao, DemoEntity> implem
public Result<UserDetail> getSysUserInfoById(Long id) {
return adminFeignClient.getById(id);
}
/**
* @param mobile
* @return com.epmet.commons.tools.utils.Result
* @Author yinzuomei
* @Description 测试发送验证码
* @Date 2020/4/3 13:41
**/
@Override
public Result sendSmsCaptcha(String mobile) {
if(StringUtils.isBlank(mobile)){
return new Result().error("手机号不能为空");
}
return messageFeignClient.sendSmsCaptcha(mobile);
}
}

4
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@ -5,7 +5,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.ListCustomerGridFormDTO;
import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
import com.epmet.feign.fallback.GovOrgFeignFallBack;
import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -20,7 +20,7 @@ import java.util.List;
* @Author wangc
* @date 2020.03.17 14:29
*/
@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignFallBack.class)
@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
public interface GovOrgFeignClient {
/**

2
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java → epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@ -18,7 +18,7 @@ import java.util.List;
* @date 2020.03.17 14:29
*/
@Component
public class GovOrgFeignFallBack implements GovOrgFeignClient {
public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
/**
* 根据地区编码获取附近网格数据
Loading…
Cancel
Save