From ed9dc632459a35f1fc21102359303a323b605013 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 10 Nov 2023 09:05:25 +0800 Subject: [PATCH] bug --- .../com/peanut/common/utils/MyCalendar.java | 381 ++++++++++++++++++ src/main/java/com/peanut/config/TGDZ.java | 8 + .../book/controller/PointController.java | 16 + .../modules/book/service/PointService.java | 3 + .../book/service/impl/PointServiceImpl.java | 122 +++++- 5 files changed, 527 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/peanut/common/utils/MyCalendar.java create mode 100644 src/main/java/com/peanut/config/TGDZ.java diff --git a/src/main/java/com/peanut/common/utils/MyCalendar.java b/src/main/java/com/peanut/common/utils/MyCalendar.java new file mode 100644 index 00000000..ca56e61e --- /dev/null +++ b/src/main/java/com/peanut/common/utils/MyCalendar.java @@ -0,0 +1,381 @@ +package com.peanut.common.utils; + +import java.util.*; +public class MyCalendar { + private int year = 0; + private int month = 0; + + public void setyear(int year) { + this.year = year; + } + + public void setmonth(int month) { + this.month = month; + } + + public int getyear() { + return year; + } + + public int getmonth() { + return month; + } + + private int chineseyear;// 农历年份 + private int chinesemonth;// 农历月份 + private int chineseday;// 农历日 + private boolean leap;// 判断闰月 + // 1-4: 表示当年有无闰年，有的话，为闰月的月份，没有的话，为0。 + // 5-16：为除了闰月外的正常月份是大月还是小月，1为30天，0为29天。 + // 注意：从1月到12月对应的是第16位到第5位。 + // 17-20： 表示闰月是大月还是小月，仅当存在闰月的情况下有意义。 + // 举例： + // 1980年的数据是： 0x095b0 + // 二进制：0000 1001 0101 1011 0000 + // 表示1980年没有闰月，从1月到12月的天数依次为：30、29、29、30 、29、30、29、30、 30、29、30、30。 + // 1982年的数据是：0x0a974 + // 0000 1010 0 1001 0111 0100 + // 表示1982年的4月为闰月，即有第二个4月，且是闰小月。 + // 从1月到13月的天数依次为：30、29、30、29、 29(闰月)、 30、29、29、30、 29、30、30、30。 + long[] lunarInfo = { 0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, + 0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, 0x04970, 0x0a4b0, + 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, 0x06566, 0x0d4a0, 0x0ea50, 0x06e95, + 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, 0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, + 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, 0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5d0, 0x14573, 0x052d0, 0x0a9a8, + 0x0e950, 0x06aa0, 0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, + 0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b5a0, 0x195a6, 0x095b0, 0x049b0, + 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, 0x04af5, 0x04970, 0x064b0, 0x074a3, + 0x0ea50, 0x06b58, 0x055c0, 0x0ab60, 0x096d5, 0x092e0, 0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, + 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, 0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, + 0x052b0, 0x0a930, 0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, + 0x05aa0, 0x076a3, 0x096d0, 0x04bd7, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, 0x0b5a0, 0x056d0, + 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0 }; + String[] Gan = { "甲", "乙", "丙", "丁", "戊", "己", "庚", "辛", "壬", "癸" }; + String[] Zhi = { "子", "丑", "寅", "卯", "辰", "巳", "午", "未", "申", "酉", "戌", "亥" }; + String[] chineseMonth = { "正", "二", "三", "四", "五", "六", "七", "八", "九", "十", "冬", "腊" }; + String[] chineseDay = { "初一", "初二", "初三", "初四", "初五", "初六", "初七", "初八", "初九", "初十", "十一", "十二", "十三", "十四", "十五", + "十六", "十七", "十八", "十九", "二十", "廿一", "廿二", "廿三", "廿四", "廿五", "廿六", "廿七", "廿八", "廿九", "三十", }; + String[] solarTerm = { "小寒", "大寒", "立春", "雨水", "惊蛰", "春分", "清明", "谷雨", "立夏", "小满", "芒种", "夏至", "小暑", "大暑", "立秋", + "处暑", "白露", "秋分", "寒露", "霜降", "立冬", "小雪", "大雪", "冬至" }; + + // 传回农历 y年的总天数 + public int yearDays(int y) { + int i, sum = 348; + for (i = 0x8000; i > 0x8; i >>= 1) { + if ((lunarInfo[y - 1900] & i) != 0) { + sum += 1; + } + } + return (sum + leapDays(y)); + } + + // 传回农历 y年闰月的天数 + public int leapDays(int y) { + if (leapMonth(y) != 0) { + if ((lunarInfo[y - 1900] & 0x10000) != 0) { + return 30; + } else { + return 29; + } + } else { + return 0; + } + } + + // 传回农历 y年闰哪个月 1-12 , 没闰传回 0 + public int leapMonth(int y) { + return (int) (lunarInfo[y - 1900] & 0xf); + } + + // 传回农历 y年m月的总天数 + public int monthDays(int y, int m) { + if ((lunarInfo[y - 1900] & (0x10000 >> m)) == 0) { + return 29; + } else { + return 30; + } + } + + // 传回农历年 + public String getChinaYearString() { + int num = chineseyear - 1900 + 36; + return (Gan[num % 10] + Zhi[num % 12]); + } + + // 传回农历月 + public String getChinaMonthString() { + if (leap == true) { + return "闰" + chineseMonth[chinesemonth - 1]; + } else { + return chineseMonth[chinesemonth - 1] + "月"; + } + } + + // 传回农历日 + public String getChinaDayString() { + return chineseDay[chineseday]; + } + + // 计算当年当月day日所对应的农历：chineseyear,chinesemonth,chineseday + public void getfirstday(int day) { + Calendar cal = Calendar.getInstance(); + cal.set(year, month - 1, day); + int leapMonth = 0; + Calendar basedate = Calendar.getInstance(); + basedate.set(1900, 1 - 1, 31); + // 求出和1900年1月31日相差的天数 + int offset = (int) ((cal.getTimeInMillis() - basedate.getTimeInMillis()) / (1000 * 60 * 60 * 24)); + // 用offset减去每农历年的天数 + // 计算当天是农历第几天 + // i最终结果是农历的年份 + // offset是当年的第几天 + int lyear, daysOfYear = 0; + for (lyear = 1900; lyear < 2050 && offset > 0; lyear++) { + daysOfYear = yearDays(lyear); + offset = offset - daysOfYear; + } + if (offset < 0) { + offset = offset + daysOfYear; + lyear--; + } + this.chineseyear = lyear;// 农历年份 + leapMonth = leapMonth(lyear); // 闰哪个月,1-12 + leap = false; + // 用当年的天数offset,逐个减去每月（农历）的天数，求出当天是本月的第几天 + int lmonth, daysOfMonth = 0; + for (lmonth = 1; lmonth < 13 && offset > 0; lmonth++) { + // 闰月 + if (leapMonth > 0 && lmonth == (leapMonth + 1) && !leap) { + --lmonth; + leap = true; + daysOfMonth = leapDays(lyear); + } else { + daysOfMonth = monthDays(lyear, lmonth); + } + offset = offset - daysOfMonth; + // 解除闰月 + if (leap && lmonth == (leapMonth + 1)) { + leap = false; + } + } + // offset为0时，并且刚才计算的月份是闰月，要校正 + if (offset == 0 && leapMonth > 0 && lmonth == leapMonth + 1) { + if (leap) { + leap = false; + } else { + leap = true; + --lmonth; + } + } + // offset小于0时，也要校正 + if (offset < 0) { + offset = offset + daysOfMonth; + lmonth--; + } + this.chinesemonth = lmonth; + this.chineseday = offset; + } + + // 返回日期数组的空数据个数，即1号所在行中有多少个空位置 + // 1号不一定是在该月日历中的第一个位置 + public int getweekDay() { + Calendar calendar = Calendar.getInstance(); + calendar.set(year, month - 1, 1); + return calendar.get(Calendar.DAY_OF_WEEK) - 1; + } + + // 当月有多少天 + public int getday() { + Calendar calendar = Calendar.getInstance(); + calendar.set(year, month - 1, 1); + int day = 0; + if (month == 1 || month == 3 || month == 5 || month == 7 || month == 8 || month == 10 || month == 12) { + day = 31; + } + if (month == 4 || month == 6 || month == 9 || month == 11) { + day = 30; + } + if (month == 2) { + if ((year % 4 == 0) && (year % 100 != 0) || (year % 400 == 0)) { + day = 29; + } else { + day = 28; + } + } + return day; + } + + // 返回阳历日期数组 + public String[] getCalendar() { + int weekDay = getweekDay(); + int day = getday(); + String[] days = new String[weekDay + day];// 空数据个数加当月天数，即为日期数组的长度 + for (int i = 0; i < weekDay; i++) { + days[i] = ""; + } + for (int i = weekDay, n = 1; i < weekDay + day; i++) { + days[i] = String.valueOf(n); + n++; + } + return days; + } + + // 返回农历日期数组 + public String[] getchineseCalendar() { + getfirstday(1); + int weekDay = getweekDay(); + int day = getday(); + String[] days = new String[weekDay + day]; + for (int i = 0; i < weekDay; i++) { + days[i] = ""; + } + System.arraycopy(chineseDay, chineseday, days, weekDay, monthDays(chineseyear, chinesemonth) - chineseday); + System.arraycopy(chineseDay, 0, days, monthDays(chineseyear, chinesemonth) - chineseday + weekDay, + day - (monthDays(chineseyear, chinesemonth) - chineseday)); + + return days; + } + + // 返回包含节日的农历日期数组 + public String[] getchineseCalendar_festival() { + String[] days = getchineseCalendar(); + int weekDay = getweekDay(); + for (int i = 0; i < days.length; i++) { + if ("初一".equals(days[i])) { + getfirstday(i); + days[i] = getChinaMonthString(); + } + if ("正月".equals(days[i])) { + days[i] = "春节"; + } + if ("正月".equals(getChinaMonthString()) && "十五".equals(days[i])) { + days[i] = "元宵"; + } + if ("五月".equals(getChinaMonthString()) && "初五".equals(days[i])) { + days[i] = "端午"; + } + if ("七月".equals(getChinaMonthString()) && "初七".equals(days[i])) { + days[i] = "七夕"; + } + if ("七月".equals(getChinaMonthString()) && "十五".equals(days[i])) { + days[i] = "中元"; + } + if ("八月".equals(getChinaMonthString()) && "十五".equals(days[i])) { + days[i] = "中秋"; + } + if ("九月".equals(getChinaMonthString()) && "初九".equals(days[i])) { + days[i] = "重阳"; + } + if ("腊月".equals(getChinaMonthString()) && "初八".equals(days[i])) { + days[i] = "腊八"; + } + if ("腊月".equals(getChinaMonthString()) && "三十".equals(days[i])) { + days[i] = "除夕"; + } + if (getmonth() == 1 && i == (weekDay + 0)) { + days[i] = "元旦"; + } + if (getmonth() == 2 && i == (weekDay + 13)) { + days[i] = "情人"; + } + if (getmonth() == 3 && i == (weekDay + 7)) { + days[i] = "妇女"; + } + if (getmonth() == 3 && i == (weekDay + 11)) { + days[i] = "植树"; + } + if (getmonth() == 5 && i == (weekDay + 0)) { + days[i] = "劳动"; + } + if (getmonth() == 5 && i == (weekDay + 3)) { + days[i] = "青年"; + } + if (getmonth() == 6 && i == (weekDay + 0)) { + days[i] = "儿童"; + } + if (getmonth() == 7 && i == (weekDay + 0)) { + days[i] = "建党"; + } + if (getmonth() == 8 && i == (weekDay + 0)) { + days[i] = "建军"; + } + if (getmonth() == 9 && i == (weekDay + 9)) { + days[i] = "教师"; + } + if (getmonth() == 10 && i == (weekDay + 0)) { + days[i] = "国庆"; + } + if (getmonth() == 12 && i == (weekDay + 24)) { + days[i] = "圣诞"; + } + } + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.YEAR, year); + cal.set(Calendar.MONTH, 5 - 1); + int sundays = 0; + for (int i = 1; i <= getday(); i++) { + cal.set(Calendar.DATE, i); + if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { + sundays++; + if (sundays == 2) { + if (getmonth() == 5) { + days[weekDay + i - 1] = "母亲"; + } + break; + } + } + } + cal.set(Calendar.MONTH, 6 - 1); + sundays = 0; + for (int i = 1; i <= getday(); i++) { + cal.set(Calendar.DATE, i); + if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) { + sundays++; + if (sundays == 3) { + if (getmonth() == 6) { + days[weekDay + i - 1] = "父亲"; + } + break; + } + } + } + return days; + } + + // 返回包含节日和节气的农历日期数组 + public String[] getchineseCalendar_festival_solarterms() { + String days[] = getchineseCalendar_festival(); + int weekDay = getweekDay(); + // num =[Y*D+C]-L 寿星通用公式 + double D = 0.2422; + // "小寒", "大寒", "立春", "雨水", "惊蛰", "春分", "清明", "谷雨", + // "立夏", "小满", "芒种", "夏至", "小暑", "大暑", "立秋", "处暑", + // "白露", "秋分", "寒露", "霜降", "立冬", "小雪", "大雪", "冬至" + // 定义数组，存储的是20世纪和21世纪的节气C值 + double[] SolarTerms_C_20thcentury = { 6.11, 20.84, 4.6295, 19.4599, 6.3826, 21.4155, 5.59, 20.888, 6.318, 21.86, + 6.5, 22.2, 7.928, 23.65, 8.35, 23.95, 8.44, 23.822, 9.098, 24.218, 8.218, 23.08, 7.9, 22.6 }; + double[] SolarTerms_C_21stcentury = { 5.4055, 20.12, 3.87, 18.73, 5.63, 20.646, 4.81, 20.1, 5.52, 21.04, 5.678, + 21.37, 7.108, 22.83, 7.5, 23.13, 7.646, 23.042, 8.318, 23.438, 7.438, 22.36, 7.18, 21.94 }; + double[] SolarTerms_C = null; + if (year >= 1901 && year <= 2000) {// 20世纪 + SolarTerms_C = SolarTerms_C_20thcentury; + } else if (year >= 2001 && year <= 2100) {// 21世纪 + SolarTerms_C = SolarTerms_C_21stcentury; + } + double C1 = SolarTerms_C[(month) * 2 - 1 - 1]; + double C2 = SolarTerms_C[month * 2 - 1]; + int Y = year % 100; + int L = (Y) / 4; + if (year % 4 == 0 && year % 100 != 0 || year % 400 == 0) { + // 注意：凡闰年3月1日前闰年数要减一，即：L=[(Y-1)/4],因为小寒、大寒、立春、雨水这两个节气都小于3月1日 + if (C1 == 5.4055 || C1 == 3.87) { + L = (Y - 1) / 4; + } + } + int num1 = (int) ((Y * D + C1) - L); + int num2 = (int) ((Y * D + C2) - L); + days[num1 + weekDay - 1] = solarTerm[(month) * 2 - 1 - 1]; + days[num2 + weekDay - 1] = solarTerm[(month) * 2 - 1]; + return days; + } +} diff --git a/src/main/java/com/peanut/config/TGDZ.java b/src/main/java/com/peanut/config/TGDZ.java new file mode 100644 index 00000000..8a057219 --- /dev/null +++ b/src/main/java/com/peanut/config/TGDZ.java @@ -0,0 +1,8 @@ +package com.peanut.config; + +public class TGDZ { + + public static final String[] tg = {"甲","乙","丙","丁","戊","己","庚","辛","壬","癸"}; + + public static final String[] dz = {"寅","卯","辰","巳","午","未","申","酉","戌","亥","子","丑"}; +} diff --git a/src/main/java/com/peanut/modules/book/controller/PointController.java b/src/main/java/com/peanut/modules/book/controller/PointController.java index d946db98..406ac19d 100644 --- a/src/main/java/com/peanut/modules/book/controller/PointController.java +++ b/src/main/java/com/peanut/modules/book/controller/PointController.java @@ -13,6 +13,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import java.util.Map; @@ -168,4 +171,17 @@ public class PointController { return R.ok().put("points",pointEntities); } + + @RequestMapping("/TGDZForYear") + public R TGDZForYear(@RequestBody Map map) throws ParseException { + String date = map.get("date").toString(); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(); + simpleDateFormat.applyPattern("yyyy-MM-dd hh:mm:ss"); + Date parse = simpleDateFormat.parse(date); + + + String[] strings = pointService.TGDZForYear(parse); + return R.ok().put("tgdz",strings); + } + } diff --git a/src/main/java/com/peanut/modules/book/service/PointService.java b/src/main/java/com/peanut/modules/book/service/PointService.java index 620d054a..7c4739d1 100644 --- a/src/main/java/com/peanut/modules/book/service/PointService.java +++ b/src/main/java/com/peanut/modules/book/service/PointService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.modules.book.entity.PointEntity; +import java.util.Date; import java.util.List; import java.util.Map; @@ -15,4 +16,6 @@ public interface PointService extends IService { List getPoints(Integer pointCategoryId); List searchPoint(String keywords); + + String[] TGDZForYear(Date year); } diff --git a/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java index ef13be1c..38613f7d 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java @@ -1,11 +1,14 @@ package com.peanut.modules.book.service.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.peanut.common.utils.MyCalendar; +import com.peanut.config.TGDZ; import com.peanut.modules.book.dao.PointCategoryDao; import com.peanut.modules.book.dao.PointDao; import com.peanut.modules.book.entity.PointCategoryEntity; @@ -14,9 +17,7 @@ import com.peanut.modules.book.service.PointService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; @Service("pointService") public class PointServiceImpl extends ServiceImpl implements PointService { @@ -64,6 +65,121 @@ public class PointServiceImpl extends ServiceImpl impleme return list; } + @Override + public String[] TGDZForYear(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + Integer year = calendar.get(Calendar.YEAR); + int kkk = calendar.get(Calendar.MONTH); + Integer month = kkk + 1; + Integer day = calendar.get(Calendar.DAY_OF_MONTH); + MyCalendar mc = new MyCalendar(); + mc.setyear(year); + mc.setmonth(month); + mc.getfirstday(day); + + System.out.println(mc.getChinaYearString()); + System.out.println(mc.getChinaMonthString()); + System.out.println(mc.getCalendar().toString()); + + +// String[] day = mc.getCalendar();// 阳历日期 +// String[] chineseday = mc.getchineseCalendar_festival_solarterms();// 农历日期 + + // 以下为输出 +// System.out.println(mc.getyear() + "年" + mc.getmonth() + "月"); +// System.out.println(); +// String[] week = {"日", "一", "二", "三", "四", "五", "六"}; +// for (String str : week) { +// System.out.printf("%-7s", " " + str); +// } +// System.out.println(); +// ArrayList listYl = new ArrayList<>(); +// ArrayList listNl = new ArrayList<>(); +// boolean bool = false; +// int n = 0; +// for (int i = 0; i < day.length; i++) { +// System.out.printf("%-5s", " " + day[i]); +// listYl.add(day[i]); +// n++; +// if (n == 7) { +// System.out.println(); +// int k = mc.getweekDay(); +// for (int j = 0; j < k; j++) { +// System.out.printf("%9s", ""); +// listNl.add(""); +// } +// for (int j = k; j < 7; j++) { +// System.out.printf("%4s", chineseday[j]); +// listNl.add(chineseday[j]); +// } +// System.out.println(); +// } +// +// +// if (n % 7 == 0 && n != 7) { +// System.out.println(); +// bool = true; +// } +// if (bool == true) { +// for (int j = (n - 7); j < n; j++) { +// System.out.printf("%4s", chineseday[j]); +// listNl.add(chineseday[j]); +// } +// if (n != day.length) { +// System.out.println(); +// } +// bool = false; +// } +// if (n == day.length && n % 7 != 0) { +// System.out.println(); +// for (int j = (n - n % 7); j < n; j++) { +// System.out.printf("%4s", chineseday[j]); +// listNl.add(chineseday[j]); +// } +// } +// } +// System.out.println(); +// System.out.println(listYl); +// System.out.println(listNl); +// ArrayList list = new ArrayList<>(); +// for (int k = 0; k < listYl.size(); k++) { +// JSONObject jsonObject = new JSONObject(); +// if (listYl.get(k) == "") { +// jsonObject.put("yl", ""); +// jsonObject.put("nl", ""); +// } else { +// jsonObject.put("yl", listYl.get(k)); +// jsonObject.put("nl", listNl.get(k)); +// } +// list.add(jsonObject); +// } +// System.out.println(list); + + + + String[] strings = mc.getchineseCalendar_festival_solarterms(); + return strings; +// Integer day = calendar.get(Calendar.DAY_OF_MONTH); +// String[] tg = TGDZ.tg; +// String[] dz = TGDZ.dz; +// Integer y = year % 10; +// if(y<=3){ +// y += 10; +// } +// String s = tg[y-3-1]; +// Integer d = (year+7)%12; +// if(d==0){ +// d=12; +// } +// String s1 = dz[d - 1]; +// //月干 +// String y_s = tg[(((y - 3) * 2 + month)%10) - 1]; +// String y_d = dz[month-1]; +// +// return s+s1+"年 "+y_s+y_d+"月 "; + } + private void createIds(Integer id, List list){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PointCategoryEntity::getPid,id);