无关风月
2025-01-22 99367ea1c11a68b420936e7f7db5fa7367da4f44
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()){
@@ -236,14 +240,14 @@
                // 周
                // 获取本周7天 格式为dd
                calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
                calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
                for (int i = 1; i <= 7; i++) {
                    Date time = calendar.getTime();
                    String format1 = simpleDateFormat.format(time);
                    x.put(format1,0);
                    x1.put(format1,0);
                    x2.put(format1,0);
                    calendar.add(Calendar.DAY_OF_MONTH, 1);
                    calendar.add(Calendar.DAY_OF_WEEK, 1);
                }
                break;
            case 4:
@@ -259,16 +263,41 @@
                    calendar.add(Calendar.DAY_OF_MONTH, 1);
                }
                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);
            }
            case 5:
                String startTime = null;
                String endTime = null;
                if (org.springframework.util.StringUtils.hasLength(homeDto.getTime())){
                    String[] split = homeDto.getTime().split(" - ");
                    startTime = split[0];
                    endTime = split[1];
                    // 将其转化为LocalDate
                    LocalDate startLocalDate = LocalDate.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
                    LocalDate endLocalDate = LocalDate.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
                    // 将startLocalDate到endLocalDate之间的每一天的日期,包括startLocalDate和endLocalDate
                    List<LocalDate> localDates = new ArrayList<>();
                    while (!startLocalDate.isAfter(endLocalDate)) {
                        // 将startLocalDate转化为格式为yyyy-MM-dd格式字符串
                        String format1 = startLocalDate.format(DateTimeFormatter.ofPattern("d"));
                        x.put(format1,0);
                        x1.put(format1,0);
                        x2.put(format1,0);
                        localDates.add(startLocalDate);
                        startLocalDate = startLocalDate.plusDays(1);
                    }
                }
                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);
//            }
//
//        }
        for (Order order : data6) {
            int value = order.getCreateTime().getMonth().getValue();
            int value1 = order.getCreateTime().getDayOfMonth();
@@ -279,32 +308,29 @@
                    switch (homeDto.getTimeType()){
                        case 1:
                            // 获取订单月份
                            if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
                                x.put(localDate+"",(int)x.get(value+"")+1);
                            }else{
                            if (StringUtils.hasLength(homeDto.getTime())&&x.get(value+"")!=null){
                                x.put(value+"",(int)x.get(value+"")+1);
                            }
                            break;
                        case 2:
                            Date date = new Date();
                            String format = simpleDateFormat.format(date);
                            if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
                                x.put(localDate+"",(int)x.get(value+"")+1);
                            }else{
                                x.put(format,(int)x.get(format)+1);
                            if (StringUtils.hasLength(homeDto.getTime())&&x.get(value1+"")!=null){
                                x.put(value1+"",(int)x.get(value1+"")+1);
                            }
                            break;
                        case 3:
                            if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
                                x.put(localDate+"",(int)x.get(value+"")+1);
                            }else{
                            if (StringUtils.hasLength(homeDto.getTime())&&x.get(value1+"")!=null){
                                x.put(value1+"",(int)x.get(value1+"")+1);
                            }
                            break;
                        case 4:
                            if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
                                x.put(localDate+"",(int)x.get(value+"")+1);
                            }else{
                            if (StringUtils.hasLength(homeDto.getTime())&&x.get(value1+"")!=null){
                                x.put(value1+"",(int)x.get(value1+"")+1);
                            }
                            break;
                        case 5:
                            if (StringUtils.hasLength(homeDto.getTime())&&x.get(value1+"")!=null){
                                x.put(value1+"",(int)x.get(value1+"")+1);
                            }
                            break;
@@ -314,33 +340,31 @@
                    switch (homeDto.getTimeType()){
                        case 1:
                            // 获取订单月份
                            if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
                                x1.put(localDate+"",(int)x1.get(value+"")+1);
                            }else{
                            if (StringUtils.hasLength(homeDto.getTime())&&x1.get(value+"")!=null){
                                x1.put(value+"",(int)x1.get(value+"")+1);
                            }
                            break;
                        case 2:
                            Date date = new Date();
                            String format = simpleDateFormat.format(date);
                            if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
                                x1.put(localDate+"",(int)x1.get(value+"")+1);
                            }else{
                                x1.put(format,(int)x1.get(format)+1);
                            if (StringUtils.hasLength(homeDto.getTime())&&x1.get(value1+"")!=null){
                                x1.put(value1+"",(int)x1.get(value1+"")+1);
                            }
                            break;
                        case 3:
                            if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
                                x1.put(localDate+"",(int)x1.get(value+"")+1);
                            }else{
                                x1.put(value+"",(int)x1.get(value+"")+1);
                            if (StringUtils.hasLength(homeDto.getTime())&&x1.get(value1+"")!=null){
                                x1.put(value1+"",(int)x1.get(value1+"")+1);
                            }
                            break;
                        case 4:
                            if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
                                x1.put(localDate+"",(int)x1.get(value+"")+1);
                            }else{
                                x1.put(value+"",(int)x1.get(value+"")+1);
                            if (StringUtils.hasLength(homeDto.getTime())&&x1.get(value1+"")!=null){
                                x1.put(value1+"",(int)x1.get(value1+"")+1);
                            }
                            break;
                        case 5:
                            if (StringUtils.hasLength(homeDto.getTime())&&x1.get(value1+"")!=null){
                                x1.put(value1+"",(int)x1.get(value1+"")+1);
                            }
                            break;
                    }
@@ -349,33 +373,33 @@
                    switch (homeDto.getTimeType()){
                        case 1:
                            // 获取订单月份
                            if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
                                x2.put(localDate+"",(int)x2.get(value+"")+1);
                            }else{
                            if (StringUtils.hasLength(homeDto.getTime())&&x2.get(value+"")!=null){
                                x2.put(value+"",(int)x2.get(value+"")+1);
                            }
                            break;
                        case 2:
                            Date date = new Date();
                            String format = simpleDateFormat.format(date);
                            if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
                                x2.put(localDate+"",(int)x2.get(value+"")+1);
                            }else{
                                x2.put(format,(int)x2.get(format)+1);
                            if (StringUtils.hasLength(homeDto.getTime())&&x2.get(value1+"")!=null){
                                x2.put(value1+"",(int)x2.get(value1+"")+1);
                            }
                            break;
                        case 3:
                            if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
                                x2.put(localDate+"",(int)x2.get(value+"")+1);
                            }else{
                                x2.put(value+"",(int)x2.get(value+"")+1);
                            if (StringUtils.hasLength(homeDto.getTime())&&x2.get(value1+"")!=null){
                                x2.put(value1+"",(int)x2.get(value1+"")+1);
                            }
                            break;
                        case 4:
                            if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
                                x2.put(localDate+"",(int)x2.get(value+"")+1);
                            }else{
                                x2.put(value+"",(int)x2.get(value+"")+1);
                            if (StringUtils.hasLength(homeDto.getTime())&&x2.get(value1+"")!=null){
                                x2.put(value1+"",(int)x2.get(value1+"")+1);
                            }
                            break;
                        case 5:
                            if (StringUtils.hasLength(homeDto.getTime())&&x2.get(value1+"")!=null){
                                x2.put(value1+"",(int)x2.get(value1+"")+1);
                            }
                            break;
                    }
@@ -466,7 +490,6 @@
            homeVO.setCourseOffOnline(split[4]);
            Integer i = Integer.valueOf(homeExport.getCourseCount());
            Integer i1 = Integer.valueOf(split[4]);
            homeExport.setCourseCount((i-i1)+"");
        }
        List<HomeExport> homeExports = new ArrayList<>();
        homeExports.add(homeExport);
@@ -534,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)
    {
@@ -543,6 +568,7 @@
    }
    @PostMapping("/addBanner")
    @ApiOperation(value = "添加banner",tags = "管理后台banner")
    @Log(title = "【banner】添加", businessType = BusinessType.INSERT)
    public R addBanner(@RequestBody Banner banner)
    {
@@ -551,6 +577,7 @@
    }
    @PostMapping("/updateBanner")
    @ApiOperation(value = "修改banner",tags = "管理后台banner")
    @Log(title = "【banner】修改", businessType = BusinessType.UPDATE)
    public R updateBanner(@RequestBody Banner banner)
    {