添加总览信息

src/main/java/com/template/api/WelcomeStudentControllerAPI.java

@@ -65,7 +65,6 @@ public interface WelcomeStudentControllerAPI {
     @ApiOperation(value = "新生报到情况", notes = "新生报到情况", httpMethod = "GET")
     CommonResult studentRegister();
 
-
     @GetMapping(value = "/studentTraffic")
     @ApiOperation(value = "学生交通方式", notes = "学生交通方式", httpMethod = "GET")
     CommonResult studentTraffic();

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -2,6 +2,8 @@ package com.template.controller;
 
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.api.R;
 import com.template.api.WelcomeStudentControllerAPI;
@@ -40,8 +42,11 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -86,6 +91,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     @Autowired
     WelcomeDormitoryService welcomeDormitoryService;
 
+    @Autowired
+    WelcomeVisitorService welcomeVisitorService;
+
 
     private static Logger logger = LoggerFactory.getLogger(WelcomeStudentController.class);
 
@@ -1313,9 +1321,31 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
     @Override
     public CommonResult studentOverview() {
-        return null;
+//        报到总数
+        int studentTotal = welcomeStudentService.count(new QueryWrapper<>());
+//        寝室总数
+        int dormitoryTotal = welcomeDormitoryService.count(new QueryWrapper<>());
+
+//        已入住寝室数
+        LambdaQueryWrapper<WelcomeDormitory> wrapper=new LambdaQueryWrapper<>();
+        wrapper.ne(WelcomeDormitory::getStatus,2);
+        int count = welcomeDormitoryService.count(wrapper);
+
+        LocalDateTime start = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0);
+        LocalDateTime end = start.plusDays(1);
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        Integer visitorTotal=welcomeVisitorService.countTotal(start,end);
+
+        StudentOverviewVo vo = new StudentOverviewVo();
+        vo.setStudentTotal(studentTotal);
+        vo.setDormitoryTotal(dormitoryTotal);
+        vo.setCheckInTotal(count);
+        vo.setVisitorTotal(visitorTotal);
+
+        return CommonResult.ok(vo);
     }
 
+
     @Override
     public CommonResult studentRegister() {
 

src/main/java/com/template/core/JwtlnterceptorConfig.java

@@ -14,7 +14,7 @@ public class JwtlnterceptorConfig implements WebMvcConfigurer {
         //目前测试下来 使用 /**所有的话，response.sendError浏览器获取不到响应的信息
         //默认拦截所有路径
         registry.addInterceptor(authenticationInterceptor())
-                .addPathPatterns("/api/**");
+                .addPathPatterns("/api0/**");
         //endregion
     }
 

src/main/java/com/template/model/vo/StudentOverviewVo.java

@@ -0,0 +1,20 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+@Data
+public class StudentOverviewVo {
+//    学生报到数
+    private Integer studentTotal;
+
+//    寝室总数
+    private Integer dormitoryTotal;
+
+//    入住总数
+    private Integer checkInTotal;
+
+//    当天访客总数
+    private Integer visitorTotal;
+
+
+}

src/main/java/com/template/services/WelcomeVisitorService.java

@@ -7,6 +7,9 @@ import com.template.model.request.WelcomeVisitorRequest;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.WelcomeVisitorVO;
 
+import java.time.LocalDateTime;
+
+
 /**
  * 访客service
  */
@@ -56,4 +59,6 @@ public interface WelcomeVisitorService extends IService<WelcomeVisitor> {
      * 导出访客记录
      */
     void export();
+
+    Integer countTotal(LocalDateTime start, LocalDateTime end);
 }

src/main/java/com/template/services/impl/WelcomeVisitorServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -170,6 +171,15 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
         }
     }
 
+    @Override
+    public Integer countTotal(LocalDateTime start, LocalDateTime end) {
+        LambdaQueryWrapper<WelcomeVisitor> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.ge(WelcomeVisitor::getStartTime, start)
+                        .le(WelcomeVisitor::getEndTime,end);
+        int count = this.count(queryWrapper);
+        return count;
+    }
+
     /**
      * 新增车辆信息
      * @param visitor  访客信息