Просмотр исходного кода

修改了商学院-创客学堂一级分类isUpdate字段childCount字段的返回

Pota1ovO 2 лет назад
Родитель
Сommit
06d7fd7ef3

+ 1 - 1
kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/kxsapp/school/SchoolFirstMenuVO.java

@@ -103,6 +103,6 @@ public class SchoolFirstMenuVO {
      */
      */
     @Schema(description = "起始交易额查看权限")
     @Schema(description = "起始交易额查看权限")
     private BigDecimal startAmount;
     private BigDecimal startAmount;
-    private int childCount;
+    private long childCount;
     private int isUpdate;
     private int isUpdate;
 }
 }

+ 1 - 1
kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/SchoolController.java

@@ -41,7 +41,7 @@ public class SchoolController {
     @GetMapping("/firstMenu")
     @GetMapping("/firstMenu")
     public R firstMenu() {
     public R firstMenu() {
 
 
-        return R.ok(kxsSchoolMenuService.list(Wrappers.emptyWrapper()));
+        return R.ok(kxsSchoolMenuService.firstMenu());
     }
     }
 
 
 
 

+ 1 - 6
kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/ServiceCenterController.java

@@ -1,23 +1,18 @@
 package com.kxs.system.biz.controller.kxsapp;
 package com.kxs.system.biz.controller.kxsapp;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
 import com.kxs.common.core.util.R;
 import com.kxs.common.core.util.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kxs.common.security.annotation.Inner;
 import com.kxs.system.api.vo.kxsapp.serviceCenter.ServiceCenterListVO;
 import com.kxs.system.api.vo.kxsapp.serviceCenter.ServiceCenterListVO;
-import com.kxs.system.api.vo.kxsapp.serviceCenter.ServiceCenterMenuListVO;
 import com.kxs.system.biz.service.KxsServiceMenuService;
 import com.kxs.system.biz.service.KxsServiceMenuService;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springdoc.core.annotations.ParameterObject;
 import com.kxs.system.api.model.KxsServiceMenu;
 import com.kxs.system.api.model.KxsServiceMenu;
-import com.kxs.system.api.model.KxsServiceCenter;
 
 
 
 
 import com.kxs.system.biz.service.KxsServiceCenterService;
 import com.kxs.system.biz.service.KxsServiceCenterService;
 
 
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 
 
 /**
 /**

+ 2 - 0
kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsSchoolMenuService.java

@@ -11,5 +11,7 @@ import com.kxs.system.api.model.KxsSchoolMenu;
  */
  */
 public interface KxsSchoolMenuService extends IService<KxsSchoolMenu> {
 public interface KxsSchoolMenuService extends IService<KxsSchoolMenu> {
 
 
+    Object firstMenu();
+
 }
 }
 
 

+ 40 - 1
kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsSchoolMenuServiceImpl.java

@@ -1,11 +1,23 @@
 package com.kxs.system.biz.service.impl;
 package com.kxs.system.biz.service.impl;
 
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.api.model.KxsSchoolStudy;
+import com.kxs.system.api.vo.kxsapp.school.SchoolFirstMenuVO;
 import com.kxs.system.biz.mapper.KxsSchoolMenuMapper;
 import com.kxs.system.biz.mapper.KxsSchoolMenuMapper;
 import com.kxs.system.api.model.KxsSchoolMenu;
 import com.kxs.system.api.model.KxsSchoolMenu;
+import com.kxs.system.biz.mapper.KxsSchoolStudyMapper;
 import com.kxs.system.biz.service.KxsSchoolMenuService;
 import com.kxs.system.biz.service.KxsSchoolMenuService;
+import com.kxs.system.biz.service.KxsSchoolStudyService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
 /**
  * 商学院创客学堂分类(KxsSchoolMenu)表服务实现类
  * 商学院创客学堂分类(KxsSchoolMenu)表服务实现类
  *
  *
@@ -13,7 +25,34 @@ import org.springframework.stereotype.Service;
  * @since 2023-12-15 12:16:31
  * @since 2023-12-15 12:16:31
  */
  */
 @Service("kxsSchoolMenuService")
 @Service("kxsSchoolMenuService")
+@RequiredArgsConstructor
 public class KxsSchoolMenuServiceImpl extends ServiceImpl<KxsSchoolMenuMapper, KxsSchoolMenu> implements KxsSchoolMenuService {
 public class KxsSchoolMenuServiceImpl extends ServiceImpl<KxsSchoolMenuMapper, KxsSchoolMenu> implements KxsSchoolMenuService {
-
+    private final KxsSchoolMenuMapper kxsSchoolMenuMapper;
+    private final KxsSchoolStudyMapper kxsSchoolStudyMapper;
+    @Override
+    public Object firstMenu() {
+        List<KxsSchoolMenu> list = list(Wrappers.emptyWrapper());
+        ArrayList<SchoolFirstMenuVO> schoolFirstMenuVOS = new ArrayList<>();
+        for (KxsSchoolMenu kxsSchoolMenu : list) {
+            SchoolFirstMenuVO schoolFirstMenuVO = new SchoolFirstMenuVO();
+            BeanUtil.copyProperties(kxsSchoolMenu,schoolFirstMenuVO);
+            //获取pid为当前类型id的类型
+            long count = count(Wrappers.<KxsSchoolMenu>query().lambda().eq(KxsSchoolMenu::getPid, kxsSchoolMenu.getId()));
+            schoolFirstMenuVO.setChildCount(count);//下级数量
+            //获取当前时间
+            LocalDateTime now = LocalDateTime.now();
+            // 获取当前时间之前三天的时间
+            LocalDateTime threeDaysBefore = now.minusDays(3);
+            List<KxsSchoolStudy> kxsSchoolStudies = kxsSchoolStudyMapper.selectList(Wrappers.<KxsSchoolStudy>query().lambda().eq(KxsSchoolStudy::getMenuId,kxsSchoolMenu.getId()).between(KxsSchoolStudy::getCreateTime, threeDaysBefore, now));
+            //三天内存在数据则返回有更新
+            if (kxsSchoolStudies != null && kxsSchoolStudies.size() != 0){
+                schoolFirstMenuVO.setIsUpdate(1);//是否更新
+            }else {
+                schoolFirstMenuVO.setIsUpdate(0);//是否更新
+            }
+            schoolFirstMenuVOS.add(schoolFirstMenuVO);
+        }
+        return schoolFirstMenuVOS;
+    }
 }
 }