From 99367ea1c11a68b420936e7f7db5fa7367da4f44 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 一月 2025 11:44:54 +0800
Subject: [PATCH] 全部代码、数据库提交

---
 xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HomeController.java |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HomeController.java b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HomeController.java
index be5ecfe..00b076f 100644
--- a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HomeController.java
+++ b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HomeController.java
@@ -11,6 +11,8 @@
 import com.xinquan.common.core.utils.page.BeanUtils;
 import com.xinquan.common.core.utils.page.PageDTO;
 import com.xinquan.common.core.web.domain.BaseModel;
+import com.xinquan.common.log.annotation.Log;
+import com.xinquan.common.log.enums.BusinessType;
 import com.xinquan.common.redis.service.RedisService;
 import com.xinquan.common.security.utils.SecurityUtils;
 import com.xinquan.course.api.domain.Course;
@@ -95,6 +97,8 @@
 
     @GetMapping("/updatePassword")
     @ApiOperation(value = "管理后台-修改密码", tags = "管理后台-修改密码")
+    @Log(title = "【修改密码】修改密码", businessType = BusinessType.UPDATE)
+
     public R updatePassword(String userName,String password) {
         SysUser one = sysUserService.lambdaQuery()
                 .eq(SysUser::getUserType, "00")
@@ -179,7 +183,7 @@
         Map<String, Object> x = new HashMap<>();
         Map<String, Object> x1 = new HashMap<>();
         Map<String, Object> x2 = new HashMap<>();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("d");
         SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
         Calendar calendar = Calendar.getInstance();
         switch (homeDto.getTimeType()){
@@ -273,7 +277,7 @@
                     List<LocalDate> localDates = new ArrayList<>();
                     while (!startLocalDate.isAfter(endLocalDate)) {
                         // 将startLocalDate转化为格式为yyyy-MM-dd格式字符串
-                        String format1 = startLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                        String format1 = startLocalDate.format(DateTimeFormatter.ofPattern("d"));
                         x.put(format1,0);
                         x1.put(format1,0);
                         x2.put(format1,0);
@@ -285,15 +289,15 @@
 
                 break;
         }
-        if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
-            List<LocalDate> localDates = generateDateList(homeDto.getTime());
-            for (LocalDate localDate : localDates) {
-                x.put(localDate+"",0);
-                x1.put(localDate+"",0);
-                x2.put(localDate+"",0);
-            }
-
-        }
+//        if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
+//            List<LocalDate> localDates = generateDateList(homeDto.getTime());
+//            for (LocalDate localDate : localDates) {
+//                x.put(localDate+"",0);
+//                x1.put(localDate+"",0);
+//                x2.put(localDate+"",0);
+//            }
+//
+//        }
         for (Order order : data6) {
             int value = order.getCreateTime().getMonth().getValue();
             int value1 = order.getCreateTime().getDayOfMonth();
@@ -553,6 +557,8 @@
     @ApiImplicitParams({
             @ApiImplicitParam(value = "ids", name = "ids", required = true, dataType = "String"),
     })
+    @Log(title = "【banner】批量删除banner", businessType = BusinessType.DELETE)
+
     public R deleteBatch(
             @RequestParam(value = "ids") String ids)
     {
@@ -562,6 +568,7 @@
     }
     @PostMapping("/addBanner")
     @ApiOperation(value = "添加banner",tags = "管理后台banner")
+    @Log(title = "【banner】添加", businessType = BusinessType.INSERT)
 
     public R addBanner(@RequestBody Banner banner)
     {
@@ -570,6 +577,7 @@
     }
     @PostMapping("/updateBanner")
     @ApiOperation(value = "修改banner",tags = "管理后台banner")
+    @Log(title = "【banner】修改", businessType = BusinessType.UPDATE)
 
     public R updateBanner(@RequestBody Banner banner)
     {

--
Gitblit v1.7.1