新增道闸数据

src/main/java/cn/com/oa/controller/CommonController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -90,13 +91,15 @@ public class CommonController {
     @GetMapping("/carinrecords")
     public AjaxResult getCarInRecords() {
         CarInoutRecord record = new CarInoutRecord();
-        record.setDirection(1);
-        Map<LocalDateTime, Map<Integer, List<CarInoutRecord>>> map = new HashMap<>();
+        // 入库
+        Integer in = 1;
+        record.setDirection(in);
+        List<List<String>> list = new ArrayList<>();
         for (int i = 0; i < 7; i++) {
             record.setTimeStamp(LocalDateTime.now().minusDays(i));
-            map.put(record.getTimeStamp(), carInoutRecordService.getCarInRecordsByDateGroupByWhiteList(record));
+            list.add(carInoutRecordService.getCarInRecordsByDateGroupByWhiteList(record));
         }
-        return AjaxResult.successData(200, map);
+        return AjaxResult.successData(200, list);
     }
 
 }

src/main/java/cn/com/oa/service/CarInoutRecordService.java

@@ -4,7 +4,6 @@ import cn.com.oa.model.CarInoutRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
-import java.util.Map;
 
 /**
 * @author tianx
@@ -12,5 +11,5 @@ import java.util.Map;
 * @createDate 2025-07-07 16:56:19
 */
 public interface CarInoutRecordService extends IService<CarInoutRecord> {
-    Map<Integer, List<CarInoutRecord>> getCarInRecordsByDateGroupByWhiteList(CarInoutRecord record);
+    List<String> getCarInRecordsByDateGroupByWhiteList(CarInoutRecord record);
 }

src/main/java/cn/com/oa/service/impl/CarInoutRecordServiceImpl.java

@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
 * @author tianx
@@ -24,30 +24,21 @@ public class CarInoutRecordServiceImpl extends ServiceImpl<CarInoutRecordMapper,
     private CarInoutRecordMapper CarInoutRecordMapper;
 
     @Override
-    public Map<Integer, List<CarInoutRecord>> getCarInRecordsByDateGroupByWhiteList(CarInoutRecord record) {
-        HashMap<Integer, List<CarInoutRecord>> map = new HashMap<>();
+    public List<String> getCarInRecordsByDateGroupByWhiteList(CarInoutRecord record) {
+        List<String> carInRecordCount = new ArrayList<>();
+        carInRecordCount.add(record.getTimeStamp().format(DateTimeFormatter.ofPattern("MM-dd")));
         // 免费车
         Integer free = 2;
         // 临时车
         Integer temp = 1;
-        // 入库
-        Integer in = 1;
-//        CarInoutRecord freeRecord = new CarInoutRecord();
-//        freeRecord.setWhitelistType(free);
-//        freeRecord.setDirection(in);
-//        freeRecord.setTimeStamp(record.getTimeStamp());
         record.setWhitelistType(free);
         List<CarInoutRecord> freeList = CarInoutRecordMapper.getCarInRecordsByDateGroupByWhiteList(record);
         System.out.println(freeList.getClass());
-        map.put(free, freeList);
-//        CarInoutRecord tempRecord = new CarInoutRecord();
-//        tempRecord.setWhitelistType(temp);
-//        tempRecord.setDirection(in);
-//        tempRecord.setTimeStamp(record.getTimeStamp());
+        carInRecordCount.add(freeList.size() + "");
         record.setWhitelistType(temp);
         List<CarInoutRecord> tempList = CarInoutRecordMapper.getCarInRecordsByDateGroupByWhiteList(record);
-        map.put(temp, tempList);
-        return map;
+        carInRecordCount.add(tempList.size() + "");
+        return carInRecordCount;
     }
 }
 

src/main/resources/mapper/oa/CarInoutRecordMapper.xml

@@ -32,7 +32,7 @@
         WHERE direction = #{direction}
         AND whitelist_type = #{whitelistType}
         AND DATE(time_stamp) = DATE(#{timeStamp})
-        ORDER BY license_plate
+        GROUP BY license_plate
     </select>
 
 </mapper>