From 66675bcc8771a0e8261eaa6c6e34e8e69b7a9ac9 Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Thu, 20 Jan 2022 21:12:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A8=A1=E5=9D=97=E8=8A=82=E5=81=87=E6=97=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0=202=E3=80=81=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=B7=A5=E5=85=B7=E6=A8=A1=E5=9D=97?= =?UTF-8?q?mm=E5=9B=BE=E7=89=87=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/business/openapi/apitools.js | 27 ++ .../views/business/tools/apitools/index.vue | 283 +++++++++++++++++- .../controller/ApiToolsController.java | 8 + .../xjs/apitools/domain/ApiHistoryToday.java | 2 +- .../com/xjs/apitools/domain/ApiHoliday.java | 6 + .../service/impl/ApiToolsServiceImpl.java | 11 + 6 files changed, 335 insertions(+), 2 deletions(-) create mode 100644 ruoyi-ui/src/api/business/openapi/apitools.js diff --git a/ruoyi-ui/src/api/business/openapi/apitools.js b/ruoyi-ui/src/api/business/openapi/apitools.js new file mode 100644 index 00000000..04b4a7bb --- /dev/null +++ b/ruoyi-ui/src/api/business/openapi/apitools.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +//获取节假日信息 +export function getHoliday() { + return request({ + url: '/openapi/apitools/holiday', + method: 'get', + }) +} + + +//获取mm图片信息 +export function getBeautyPicture() { + return request({ + url: '/openapi/apitools/beautypicture', + method: 'get', + }) +} + + +//获取历史今天信息 +export function getHistoryToday() { + return request({ + url: '/openapi/apitools/historytoday', + method: 'get', + }) +} diff --git a/ruoyi-ui/src/views/business/tools/apitools/index.vue b/ruoyi-ui/src/views/business/tools/apitools/index.vue index 4a41c48b..a4ac5ae4 100644 --- a/ruoyi-ui/src/views/business/tools/apitools/index.vue +++ b/ruoyi-ui/src/views/business/tools/apitools/index.vue @@ -1,13 +1,294 @@ diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/controller/ApiToolsController.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/controller/ApiToolsController.java index 120df19e..d5dd7006 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/controller/ApiToolsController.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/controller/ApiToolsController.java @@ -58,6 +58,7 @@ public class ApiToolsController { @GetMapping("nowweather/{city}") @ApiOperation("获取实时天气信息") @Log(title = "获取实时天气") + @RequiresPermissions("open:apitools:nowweather") public R getNowWeatherApiData(@PathVariable("city") String city) { return R.ok(apiToolsService.getNowWeather(city)); } @@ -65,6 +66,7 @@ public class ApiToolsController { @GetMapping("forecastweather/{city}") @ApiOperation("获取预报天气信息") @Log(title = "获取预报天气") + @RequiresPermissions("open:apitools:forecastweather") public R getForecastWeatherApiData(@PathVariable("city") String city) { return R.ok(apiToolsService.getForecastWeather(city)); } @@ -73,6 +75,7 @@ public class ApiToolsController { @GetMapping("garbagesorting/{name}") @ApiOperation("获取垃圾分类信息") @Log(title = "获取垃圾分类") + @RequiresPermissions("open:apitools:garbagesorting") public R getGarbageSortingApiData(@PathVariable("name") String name) { return R.ok(apiToolsService.getGarbageSorting(name)); } @@ -80,6 +83,7 @@ public class ApiToolsController { @GetMapping("beautypicture") @ApiOperation("获取mm图片信息") @Log(title = "获取mm图片分类") + @RequiresPermissions("open:apitools:beautypicture") public R> getBeautyPictureApiData() { return R.ok(apiToolsService.getBeautyPictureList()); } @@ -87,6 +91,7 @@ public class ApiToolsController { @GetMapping("historytoday") @ApiOperation("获取历史今天信息") @Log(title = "获取历史今天") + @RequiresPermissions("open:apitools:historytoday") public R> getHistoryTodayApiData() { return R.ok(apiToolsService.getHistoryTodayList()); } @@ -94,6 +99,7 @@ public class ApiToolsController { @GetMapping("simplecomplex/{content}") @ApiOperation("获取简繁转换信息") @Log(title = "获取简繁转换") + @RequiresPermissions("open:apitools:simplecomplex") public R getSimpleComplexApiData(@PathVariable("content") String content) { boolean b = ChineseUtils.checkNameChese(content); if (b) { @@ -107,6 +113,7 @@ public class ApiToolsController { @GetMapping("chinesedict/{content}") @ApiOperation("获取汉语字典信息") @Log(title = "获取汉语字典") + @RequiresPermissions("open:apitools:chinesedict") public R getChineseDictApiData(@PathVariable("content") String content) { boolean b1 = ChineseUtils.checkNameChese(content); if (b1 && content.length() == 1) { @@ -120,6 +127,7 @@ public class ApiToolsController { @GetMapping("idcardquery/{idcard}") @ApiOperation("获取身份证信息") @Log(title = "获取身份证信息") + @RequiresPermissions("open:apitools:idcardquery") public R getIdcardQueryApiData(@PathVariable("idcard") String idcard) { boolean id15 = Pattern.matches(IDCARD_15_REGEX, idcard); boolean id18 = Pattern.matches(IDCARD_18_REGEX, idcard); diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/domain/ApiHistoryToday.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/domain/ApiHistoryToday.java index a47440e6..730d5368 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/domain/ApiHistoryToday.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/domain/ApiHistoryToday.java @@ -59,7 +59,7 @@ public class ApiHistoryToday implements Serializable { } catch (NumberFormatException e) { e.printStackTrace(); } - return this.year + "-" + m + "-" + this.day; + return this.year + "年" + m + "月" + this.day+"日"; } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/domain/ApiHoliday.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/domain/ApiHoliday.java index 01ce4ad3..960cb1c1 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/domain/ApiHoliday.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/domain/ApiHoliday.java @@ -39,4 +39,10 @@ public class ApiHoliday implements Serializable { * 是否是农历节日 */ private Boolean lunarHoliday; + + + /** + * 最后返回的日期(可能是公历可能是农历) + */ + private String returnDate; } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/service/impl/ApiToolsServiceImpl.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/service/impl/ApiToolsServiceImpl.java index 709a66dd..540cb019 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/service/impl/ApiToolsServiceImpl.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/service/impl/ApiToolsServiceImpl.java @@ -1,6 +1,9 @@ package com.xjs.apitools.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.ChineseDate; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.ruoyi.common.core.utils.StringUtils; import com.xjs.apitools.domain.*; import com.xjs.apitools.factory.ApiToolsFactory; @@ -94,6 +97,14 @@ public class ApiToolsServiceImpl implements ApiToolsService { Optional.ofNullable(apiHolidayList).orElseThrow(ApiException::new); List collect = apiHolidayList.stream().map(holidayFactory -> { if (holidayFactory.getResidueDays() >= 0) { + if (holidayFactory.getLunarHoliday()) { + //是农历 + DateTime lunarDate = DateUtil.parseDate(holidayFactory.getLunarDate()); + ChineseDate chineseDate = new ChineseDate(lunarDate.toJdkDate()); + holidayFactory.setReturnDate(chineseDate.toString()); + }else { + holidayFactory.setReturnDate(holidayFactory.getDate()); + } return holidayFactory; } else { return null;