From 9fb1e00ca73b0494811f7efd8c0d391e42ee0777 Mon Sep 17 00:00:00 2001 From: PQZ Date: Tue, 18 Nov 2025 19:52:15 +0800 Subject: [PATCH] 11111 --- .../BaseCalendarEventController.java | 58 +++-- .../base/service/IBaseCalendarService.java | 20 +- .../service/impl/BaseCalendarServiceImpl.java | 19 ++ .../mapper/base/BaseCalendarEventMapper.xml | 5 +- dl_vue/src/views/base/country/index.vue | 14 +- dl_vue/src/views/base/event/index.vue | 200 +++++++++--------- dl_vue/src/views/base/zone/index.vue | 4 +- 7 files changed, 179 insertions(+), 141 deletions(-) diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCalendarEventController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCalendarEventController.java index 99725df..33481cc 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCalendarEventController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCalendarEventController.java @@ -4,8 +4,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletResponse; + import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.base.domain.BaseCalendar; +import com.ruoyi.base.service.IBaseCalendarService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,16 +31,17 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 节日Controller - * + * * @author pqz * @date 2025-10-31 */ @RestController @RequestMapping("/base/event") -public class BaseCalendarEventController extends BaseController -{ +public class BaseCalendarEventController extends BaseController { @Autowired private IBaseCalendarEventService baseCalendarEventService; + @Autowired + private IBaseCalendarService baseCalendarService; /** * 查询节日列表 @@ -45,11 +49,10 @@ public class BaseCalendarEventController extends BaseController @PreAuthorize("@ss.hasPermi('base:event:list')") @GetMapping("/list") public AjaxResult list(BaseCalendarEvent baseCalendarEvent, - @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) - { + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - IPage list = baseCalendarEventService.queryListPage(baseCalendarEvent,page); + IPage list = baseCalendarEventService.queryListPage(baseCalendarEvent, page); return success(list); } @@ -60,8 +63,7 @@ public class BaseCalendarEventController extends BaseController @PreAuthorize("@ss.hasPermi('base:event:export')") @Log(title = "节日", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, BaseCalendarEvent baseCalendarEvent) - { + public void export(HttpServletResponse response, BaseCalendarEvent baseCalendarEvent) { List list = baseCalendarEventService.list(); ExcelUtil util = new ExcelUtil(BaseCalendarEvent.class); util.exportExcel(response, list, "节日数据"); @@ -72,30 +74,43 @@ public class BaseCalendarEventController extends BaseController */ @PreAuthorize("@ss.hasPermi('base:event:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") String id) - { + public AjaxResult getInfo(@PathVariable("id") String id) { return success(baseCalendarEventService.getById(id)); } /** - * 新增节日 - */ + * 修改节日 + * + * @param baseCalendarEvent TODO + * @return com.ruoyi.common.core.domain.AjaxResult + * @author PQZ + * @date 19:12 2025/11/18 + **/ @PreAuthorize("@ss.hasPermi('base:event:add')") @Log(title = "节日", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody BaseCalendarEvent baseCalendarEvent) - { + public AjaxResult add(@RequestBody BaseCalendarEvent baseCalendarEvent) { + //查询日历id + BaseCalendar calendar = baseCalendarService.getByYearMonthDay(baseCalendarEvent.getYear(), baseCalendarEvent.getMonth(), baseCalendarEvent.getDay()); + baseCalendarEvent.setDateId(calendar.getId()); return toAjax(baseCalendarEventService.save(baseCalendarEvent)); } /** - * 修改节日 - */ + * 修改节假日 + * + * @param baseCalendarEvent TODO + * @return com.ruoyi.common.core.domain.AjaxResult + * @author PQZ + * @date 19:13 2025/11/18 + **/ @PreAuthorize("@ss.hasPermi('base:event:edit')") @Log(title = "节日", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody BaseCalendarEvent baseCalendarEvent) - { + public AjaxResult edit(@RequestBody BaseCalendarEvent baseCalendarEvent) { + //查询日历id + BaseCalendar calendar = baseCalendarService.getByYearMonthDay(baseCalendarEvent.getYear(), baseCalendarEvent.getMonth(), baseCalendarEvent.getDay()); + baseCalendarEvent.setDateId(calendar.getId()); return toAjax(baseCalendarEventService.updateById(baseCalendarEvent)); } @@ -104,9 +119,8 @@ public class BaseCalendarEventController extends BaseController */ @PreAuthorize("@ss.hasPermi('base:event:remove')") @Log(title = "节日", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable String[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { List list = new ArrayList<>(Arrays.asList(ids)); return toAjax(baseCalendarEventService.removeByIds(list)); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseCalendarService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseCalendarService.java index 2461f9b..722bbe8 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseCalendarService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseCalendarService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.base.domain.BaseCalendar; import com.ruoyi.base.vo.BaseCalendarVO; +import io.swagger.models.auth.In; /** * 日历Service接口 @@ -48,9 +49,22 @@ public interface IBaseCalendarService extends IService { /** * 获取已经生成日历的年份以及生成中国节假日的年份 + * + * @return java.util.Map> * @author PQZ * @date 15:26 2025/11/12 - * @return java.util.Map> - **/ - Map> getGeneraYear(); + **/ + Map> getGeneraYear(); + + /** + * 通过年月日精确锁定日期 + * + * @param year 年 + * @param month 月 + * @param day 日 + * @return com.ruoyi.base.domain.BaseCalendar + * @author PQZ + * @date 19:10 2025/11/18 + **/ + BaseCalendar getByYearMonthDay(Integer year, Integer month, Integer day); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseCalendarServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseCalendarServiceImpl.java index 40fc497..17888aa 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseCalendarServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseCalendarServiceImpl.java @@ -142,6 +142,25 @@ public class BaseCalendarServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(BaseCalendar::getYear,year) + .eq(BaseCalendar::getMonth,month) + .eq(BaseCalendar::getDay,day); + return getOne(lambdaQueryWrapper); + } + /** * 使用Hutool计算农历日期 * diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseCalendarEventMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseCalendarEventMapper.xml index e18d674..cd144dc 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseCalendarEventMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseCalendarEventMapper.xml @@ -9,10 +9,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - select id, date_id, country, event_name from base_calendar_event + select id, date_id, country, event_name,year ,month,day from base_calendar_event