From d234f3f91393d6f2ea458fd875edc054526cf38c Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 17 Nov 2021 16:55:48 +0800 Subject: [PATCH] =?UTF-8?q?20211117=E4=BF=AE=E6=94=B9=E4=B8=8D=E7=94=A8?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E7=BB=91=E5=AE=9A=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloudutil/bean/tall/dto/HolidaysDto.java | 15 ++++++++ .../cloudutil/bean/tall/vo/HolidaysVo.java | 18 ++++++++++ .../cloudutil/feign/Tall3FeignClient.java | 12 +++++++ .../signin/service/RelevanceUserService.java | 2 ++ .../ccsens/signin/service/UserService.java | 2 +- .../test/java/com/ccsens/util/OtherTest.java | 34 ++++++++++++------- 6 files changed, 69 insertions(+), 14 deletions(-) create mode 100644 cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/HolidaysDto.java create mode 100644 cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/HolidaysVo.java diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/HolidaysDto.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/HolidaysDto.java new file mode 100644 index 00000000..00807ba2 --- /dev/null +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/HolidaysDto.java @@ -0,0 +1,15 @@ +package com.ccsens.cloudutil.bean.tall.dto; + +import lombok.Data; + +/** + * @author 逗 + */ +@Data +public class HolidaysDto { + @Data + public static class GetHolidays{ + private Long startTime; + private Long endTime; + } +} diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/HolidaysVo.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/HolidaysVo.java new file mode 100644 index 00000000..71d78bc6 --- /dev/null +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/HolidaysVo.java @@ -0,0 +1,18 @@ +package com.ccsens.cloudutil.bean.tall.vo; + +import lombok.Data; + +import java.util.List; + +/** + * @author 逗 + */ +@Data +public class HolidaysVo { + + @Data + public static class Holidays{ + private List workday; + private List nonWorkday; + } +} diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/Tall3FeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/Tall3FeignClient.java index 4ee42a33..100d801d 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/Tall3FeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/Tall3FeignClient.java @@ -1,7 +1,9 @@ package com.ccsens.cloudutil.feign; +import com.ccsens.cloudutil.bean.tall.dto.HolidaysDto; import com.ccsens.cloudutil.bean.tall.dto.LogDto; import com.ccsens.cloudutil.bean.tall.dto.ProjectDto; +import com.ccsens.cloudutil.bean.tall.vo.HolidaysVo; import com.ccsens.cloudutil.config.FeignTokenConfig; import com.ccsens.util.JsonResponse; import feign.hystrix.FallbackFactory; @@ -46,6 +48,12 @@ public interface Tall3FeignClient { */ @RequestMapping("project/saveUserProject") JsonResponse saveUserProject(ProjectDto.SaveUserProject projectDto); + + /** + * tall3内保存用户项目列表 + */ + @RequestMapping("holidays") + JsonResponse getHolidays(HolidaysDto.GetHolidays getHolidays); } @Slf4j @@ -75,6 +83,10 @@ class Tall3FeignClientFallBack implements FallbackFactory { return null; } + @Override + public JsonResponse getHolidays(HolidaysDto.GetHolidays getHolidays) { + return JsonResponse.newInstance().fail(); + } }; } diff --git a/signin/src/main/java/com/ccsens/signin/service/RelevanceUserService.java b/signin/src/main/java/com/ccsens/signin/service/RelevanceUserService.java index 254022d7..4413c721 100644 --- a/signin/src/main/java/com/ccsens/signin/service/RelevanceUserService.java +++ b/signin/src/main/java/com/ccsens/signin/service/RelevanceUserService.java @@ -42,6 +42,7 @@ public class RelevanceUserService implements IRelevanceUserService { UserDto.PhoneAndUserId phoneAndUserId = new UserDto.PhoneAndUserId(phone, userId); log.info("调用业务系统的接口关联成员：{}--{}",url,phoneAndUserId); RestTemplateUtil.postBody(url, phoneAndUserId); + //TODO 异常处理 }catch (Exception e){ log.error("接口调用异常",e); } @@ -63,6 +64,7 @@ public class RelevanceUserService implements IRelevanceUserService { UserDto.MergeUser mergeUser = new UserDto.MergeUser(oldUserId, newUserId); log.info("调用业务系统的接口合并用户：{}--{}",url,mergeUser); RestTemplateUtil.postBody(url, mergeUser); + //TODO 异常处理 }catch (Exception e){ log.error("接口调用异常",e); } diff --git a/signin/src/main/java/com/ccsens/signin/service/UserService.java b/signin/src/main/java/com/ccsens/signin/service/UserService.java index dfef1479..d4300c7e 100644 --- a/signin/src/main/java/com/ccsens/signin/service/UserService.java +++ b/signin/src/main/java/com/ccsens/signin/service/UserService.java @@ -859,7 +859,7 @@ public class UserService implements IUserService { authDao.insertSelective(auth); //TODO 给所有手机号一样的角色添加userId -// relevanceUserService.relevancePhone(phone, currentUserId); + relevanceUserService.relevancePhone(phone, currentUserId); //返回值 userSignVo = new UserVo.UserSign(); userSignVo.setAuthId(auth.getId()); diff --git a/util/src/test/java/com/ccsens/util/OtherTest.java b/util/src/test/java/com/ccsens/util/OtherTest.java index 2bc25475..fea42f01 100644 --- a/util/src/test/java/com/ccsens/util/OtherTest.java +++ b/util/src/test/java/com/ccsens/util/OtherTest.java @@ -236,21 +236,29 @@ public class OtherTest { @Test public void test11() { - System.out.println(DateUtil.today()); - DateUtil.today(); - System.out.println(DateUtil.parse(DateUtil.today()).getTime()); - - List s = new ArrayList<>(); - s.add("11"); - s.add("22"); - - List x = new ArrayList<>(); - x.add("33"); - x.add("44"); +// System.out.println(DateUtil.today()); +// DateUtil.today(); +// System.out.println(DateUtil.parse(DateUtil.today()).getTime()); +// +// List s = new ArrayList<>(); +// s.add("11"); +// s.add("22"); +// +// List x = new ArrayList<>(); +// x.add("33"); +// x.add("44"); +// +// s.addAll(x); +// - s.addAll(x); +// Random random = new Random(); +// for (int i = 0; i < 10; i++) { +// System.out.println(random.nextInt(40) + 40); +// } - System.out.println(s); + int max=100,min=1; + double ran2 = (Math.random()*(max-min)); + System.out.println(ran2); } @Test