`fix`

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/controller/TblGpsDataController.java

@@ -15,18 +15,24 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.CountData;
 import org.dromara.system.domain.GpsData;
+import org.dromara.system.domain.bo.CountDataBo;
 import org.dromara.system.domain.bo.GpsDataBo;
 import org.dromara.system.domain.bo.TblCarInfoBo;
+import org.dromara.system.domain.vo.CountDataVo;
 import org.dromara.system.domain.vo.GpsDataVo;
 import org.dromara.system.domain.vo.TblCarInfoVo;
 import org.dromara.system.service.ITblCarInfoService;
+import org.dromara.system.service.ITblCountDataService;
 import org.dromara.system.service.ITblGpsDataService;
 import org.dromara.util.MessageUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 车辆信息
@@ -37,19 +43,36 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/gpsdata")
+@RequestMapping("/system")
 public class TblGpsDataController extends BaseController {
 
     private final ITblGpsDataService gpsDataService;
 
+    private final ITblCountDataService countDataService;
+
     /**
      * 查询车辆信息列表
      */
     //@SaCheckPermission("system:carInfo:list")
-    @GetMapping("/list")
+    @GetMapping("/gpsdata/list")
     public TableDataInfo<GpsDataVo> list(GpsDataBo bo, PageQuery pageQuery) {
         return gpsDataService.queryPageList(bo, pageQuery);
     }
 
 
+    @GetMapping("/peoplecount/list")
+    public Object list(CountDataBo bo) {
+        List<CountDataVo> dataVos = countDataService.queryList(bo);
+        Map<String,Object> data = new HashMap<>();
+        int totalin = 0;
+        int totalout = 0;
+        for (int i = 0; i < dataVos.size(); i++) {
+            totalin+=dataVos.get(i).getIncount();
+            totalout+=dataVos.get(i).getOutcount();
+        }
+        data.put("totalin",totalin);
+        data.put("totalout",totalout);
+        return R.ok(data);
+    }
+
 }

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/CountData.java

@@ -1,5 +1,6 @@
 package org.dromara.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -17,5 +18,7 @@ public class CountData implements Serializable {
     private Integer incount;
     private Integer outcount;
     private Date ts;
+
+    @TableField(exist = false)
     private Long tslong;
 }