diff --git a/src/main/java/xuan/controller/ToolController.java b/src/main/java/xuan/controller/ToolController.java index 5d467cc..09a84b5 100644 --- a/src/main/java/xuan/controller/ToolController.java +++ b/src/main/java/xuan/controller/ToolController.java @@ -162,8 +162,7 @@ public class ToolController { int month = Integer.parseInt(params.get("month").toString()); int day = Integer.parseInt(params.get("day").toString()); - Solar solar = Solar.fromYmd(2000, month, day); - String xingZuo = solar.getXingZuo(); + String xingZuo = getXingZuoByDate(month, day); Map data = new HashMap<>(); data.put("month", month); @@ -273,6 +272,34 @@ public class ToolController { } return result; } + + private String getXingZuoByDate(int month, int day) { + if ((month == 3 && day >= 21) || (month == 4 && day <= 19)) { + return "白羊座"; + } else if ((month == 4 && day >= 20) || (month == 5 && day <= 20)) { + return "金牛座"; + } else if ((month == 5 && day >= 21) || (month == 6 && day <= 21)) { + return "双子座"; + } else if ((month == 6 && day >= 22) || (month == 7 && day <= 22)) { + return "巨蟹座"; + } else if ((month == 7 && day >= 23) || (month == 8 && day <= 22)) { + return "狮子座"; + } else if ((month == 8 && day >= 23) || (month == 9 && day <= 22)) { + return "处女座"; + } else if ((month == 9 && day >= 23) || (month == 10 && day <= 23)) { + return "天秤座"; + } else if ((month == 10 && day >= 24) || (month == 11 && day <= 22)) { + return "天蝎座"; + } else if ((month == 11 && day >= 23) || (month == 12 && day <= 21)) { + return "射手座"; + } else if ((month == 12 && day >= 22) || (month == 1 && day <= 19)) { + return "摩羯座"; + } else if ((month == 1 && day >= 20) || (month == 2 && day <= 18)) { + return "水瓶座"; + } else { + return "双鱼座"; + } + } @PostMapping("/wuxing") public Map wuXingQuery(@RequestBody Map params) {