`fix`

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

@@ -45,7 +45,7 @@ import static org.dromara.util.CabinetUtil.CABINET_INFO;
 @RestController
 @Slf4j
 @RequestMapping("/system/common")
-public class CommonController extends BaseController {
+public class CommonController extends TblBaseController {
 
     @Value("${yingshi.appkey}")
     String appkey;
@@ -133,14 +133,16 @@ public class CommonController extends BaseController {
     public Object playlistInfo() throws Exception {
 
         List<Map<String,String>> data = new ArrayList<>();
+
         for (Object key :   CacheUtils.keys("playlist")) {
             data.add((Map<String,String>) CacheUtils.get("playlist",key));
         }
+
         if(data.size()<1) return data;
         try {
             data.sort((o1, o2) -> {
                 try {
-                    return Math.toIntExact(DateUtil.parseDateTime(o2.get("time")).getTime() - DateUtil.parseDateTime(o1.get("time")).getTime());
+                    return (DateUtil.parseDateTime(o2.get("time")).getTime() - DateUtil.parseDateTime(o1.get("time")).getTime())>0?1:-1;
                 } catch (Exception e) {
                     log.error(e.getMessage());
                     log.error(o1.get("time"));

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

@@ -3,14 +3,22 @@ package org.dromara.system.controller;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.CountData;
+import org.dromara.system.domain.bo.TblCarInfoBo;
 import org.dromara.system.domain.vo.CountDataVo;
+import org.dromara.system.domain.vo.TblCarInfoVo;
+import org.dromara.system.service.ISysDataScopeService;
+import org.dromara.system.service.ITblCarInfoService;
 import org.dromara.system.service.ITblCountDataService;
 import org.dromara.system.service.ITblGoodsOrderService;
 import org.dromara.util.MessageUtils;
@@ -21,17 +29,20 @@ import org.springframework.web.bind.annotation.*;
 
 import java.time.Duration;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Validated
 @RequiredArgsConstructor
 @RestController
 @Slf4j
 @RequestMapping("/statistic")
-public class StatisticController extends BaseController {
+public class StatisticController extends TblBaseController {
     private final ITblCountDataService countDataService;
 
     private final ITblGoodsOrderService goodsOrderService;
+    private final ISysDataScopeService dataScopeService;
 
+    private final ITblCarInfoService carInfoService;
 
 
     @PostMapping("/passenger/flow")
@@ -73,4 +84,43 @@ public class StatisticController extends BaseController {
 
         return R.ok(qs);
     }
+    @PostMapping("/passenger/flow1")
+    public Object sitesFlow1(@RequestBody(required = false) Map<String,Object> data) {
+        if(data==null) data=new HashMap<>();
+        if(data.get("start")==null || data.get("end")==null ){
+           return R.fail("参数不对");
+        }
+
+
+
+        Map<String,Object> temp = new HashMap<>();
+        try{
+            TblCarInfoBo bo = new TblCarInfoBo();
+            getDepts(dataScopeService,bo);
+            if(bo.getParams().get("depts")!=null){
+                List<String> allcodes = new ArrayList<>();
+               List<TblCarInfoVo> carInfos =  carInfoService.queryList(bo);
+
+                carInfos.forEach(carInfo->{
+                    try{
+                        JSONUtil.parseArray(carInfo.getDeviceInfos()).toList(JSONObject.class).forEach(deviceInfo -> {
+                          if(deviceInfo.getStr("type").equals("people_count")){
+                              allcodes.add(StrUtil.format("'{}'",deviceInfo.getStr("code")));
+                           }
+                        });
+                    }catch (Exception e){}
+                });
+                temp.put("devicecodes",allcodes.stream().collect(Collectors.joining(",")));
+            }
+        }catch (Exception e){}
+
+        temp.put("start",data.get("start"));
+        temp.put("end",data.get("end"));
+        CountDataVo countDataVo = countDataService.queryByDate(temp);
+        if(countDataVo==null){
+            countDataVo = new CountDataVo();countDataVo.setOutcount(0);countDataVo.setIncount(0);
+        }
+        temp.put("flowCount",countDataVo);
+        return R.ok(temp);
+    }
 }

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

@@ -0,0 +1,26 @@
+package org.dromara.system.controller;
+
+import cn.hutool.core.util.StrUtil;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.service.ISysDataScopeService;
+
+public class TblBaseController extends BaseController {
+
+
+
+
+    public void getDepts( ISysDataScopeService dataScopeService,BaseEntity  entity)
+    {
+        if(entity!=null &&entity.getParams()!=null && LoginHelper.getLoginUser()!=null && LoginHelper.getLoginUser().getDeptId()!=null){
+          String depts =   dataScopeService.getDeptAndChild(LoginHelper.getLoginUser().getDeptId());
+          if(LoginHelper.isSuperAdmin()||LoginHelper.isTenantAdmin()||LoginHelper.getLoginUser().getDeptId().equals(100L)|| StrUtil.isEmptyIfStr(depts)){
+
+          }else{
+              entity.getParams().put("depts",depts);
+          }
+
+        }
+    }
+}

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

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.system.service.ISysDataScopeService;
 import org.dromara.util.MessageUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -33,16 +34,19 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/carInfo")
-public class TblCarInfoController extends BaseController {
+public class TblCarInfoController extends TblBaseController {
 
     private final ITblCarInfoService tblCarInfoService;
 
+    private final ISysDataScopeService dataScopeService;
+
     /**
      * 查询车辆信息列表
      */
     ////@SaCheckPermission("system:carInfo:list")
     @GetMapping("/list")
     public TableDataInfo<TblCarInfoVo> list(TblCarInfoBo bo, PageQuery pageQuery) {
+        getDepts(dataScopeService,bo);
         return tblCarInfoService.queryPageList(bo, pageQuery);
     }
 
@@ -51,6 +55,7 @@ public class TblCarInfoController extends BaseController {
      */
     @GetMapping("/liststaticFlow")
     public TableDataInfo<TblCarInfoVo> liststaticFlow(TblCarInfoBo bo, PageQuery pageQuery) {
+        getDepts(dataScopeService,bo);
         return tblCarInfoService.queryFlowList(bo, pageQuery);
     }
 

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

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.system.service.ISysDataScopeService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -32,10 +33,11 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/carPath")
-public class TblCarPathController extends BaseController {
+public class TblCarPathController extends TblBaseController {
 
     private final ITblCarPathService tblCarPathService;
 
+    private final ISysDataScopeService dataScopeService;
     /**
      * 查询车辆路线列表
      */

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

@@ -6,6 +6,9 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.system.domain.bo.TblCarInfoBo;
+import org.dromara.system.service.ISysDataScopeService;
+import org.dromara.system.service.ITblCarInfoService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -32,16 +35,19 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/carSchedule")
-public class TblCarScheduleController extends BaseController {
+public class TblCarScheduleController extends TblBaseController {
 
     private final ITblCarScheduleService tblCarScheduleService;
 
+    private final ISysDataScopeService dataScopeService;
+
     /**
      * 查询车及人员排班列表
      */
     //@SaCheckPermission("system:carSchedule:list")
     @GetMapping("/list")
     public TableDataInfo<TblCarScheduleVo> list(TblCarScheduleBo bo, PageQuery pageQuery) {
+        getDepts(dataScopeService,bo);
         return tblCarScheduleService.queryPageList(bo, pageQuery);
     }
 

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

@@ -3,11 +3,16 @@ package org.dromara.system.controller;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.GpsData;
+import org.dromara.system.domain.TblCarInfo;
 import org.dromara.system.domain.bo.*;
 import org.dromara.system.domain.vo.*;
 import org.dromara.system.service.*;
@@ -56,6 +61,30 @@ public class TblGpsDataController extends BaseController {
      */
     @GetMapping("/peoplecount/list")
     public Object list(CountDataBo bo) {
+        if(bo.getCarNum()!=null){
+            try {
+                TblCarInfoBo carbo = new TblCarInfoBo();
+                carbo.setCarNum(bo.getCarNum());
+                List<TblCarInfoVo> list= carInfoService.queryList(carbo);
+                if(list.size()>0){
+                    JSONUtil.parseArray( list.get(0).getDeviceInfos()).toList(JSONObject.class).forEach(deviceInfo -> {
+                        if (deviceInfo.getStr("type").equals("people_count")) {
+                            bo.setDevicecode(deviceInfo.getStr("code"));
+                            bo.setCarNum(null);
+                        }
+                    });
+                }
+                if(bo.getDevicecode()==null){
+                    List<Map> ret = new ArrayList<>();
+                    Map<String,Object> data = new HashMap<>();
+                    data.put("totalin",0);
+                    data.put("totalout",0);
+                    ret.add(data);
+
+                    return R.ok(ret);
+                }
+            }catch (Exception e){}
+        }
         if(bo.getParams()!=null && bo.getParams().get("times")!=null){
             List<Map> ret = new ArrayList<>();
            String [] times = bo.getParams().get("times").toString().split("\\$");
@@ -132,14 +161,19 @@ public class TblGpsDataController extends BaseController {
         List<TblCarInfoVo> carInfoVos =  carInfoService.queryList(bo3);
         //  站点        设备     时间范围
         Map<String,Map<String,List<Map<String,String>>>> sitesMap = new HashMap<>();
+
         //车牌设备
         Map<String,List<String>> deviceMap = new HashMap<>();
         carInfoVos.forEach(item->{
             JSONUtil.parseArray(item.getDeviceInfos()).toList(JSONObject.class).forEach(deviceInfo -> {
-                if(deviceInfo.getStr("type").contains("people_count")){
-                    if(deviceMap.get(item.getCarNum())==null) deviceMap.put(item.getCarNum(),new ArrayList<>());
-                    deviceMap.get(item.getCarNum()).add(deviceInfo.getStr("code"));
-                }
+                try {
+                    if(deviceInfo.getStr("type").contains("people_count")){
+                       if(deviceMap.get(item.getCarNum())==null) deviceMap.put(item.getCarNum(),new ArrayList<>());
+                       deviceMap.get(item.getCarNum()).add(deviceInfo.getStr("code"));
+                    }
+
+                }catch (Exception e){}
+
             });
         });
         //{

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

@@ -17,4 +17,5 @@ public class CountDataBo extends BaseEntity {
     private Integer incount;
     private Integer outcount;
     private Date ts;
+    private String carNum;
 }

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblCarInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.system.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import org.dromara.common.core.utils.MapstructUtils;
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.CountData;
 import org.dromara.system.domain.GpsData;
 import org.dromara.system.domain.TblCarSchedule;
@@ -31,6 +33,7 @@ import org.dromara.system.mapper.TblCarInfoMapper;
 import org.dromara.system.service.ITblCarInfoService;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 车辆信息Service业务层处理
@@ -191,8 +194,19 @@ public class TblCarInfoServiceImpl implements ITblCarInfoService {
         lqw.eq(StringUtils.isNotBlank(bo.getChangeInfo()), TblCarInfo::getChangeInfo, bo.getChangeInfo());
 
         if(bo.getParams()!=null && bo.getParams().get("carNums")!=null){
-            lqw.in(TblCarInfo::getCarNum,String.join(",",(List) bo.getParams().get("carNums")));
+            String carNums = (String) ((List)bo.getParams().get("carNums")).stream().map(carnum->{return StrUtil.format("'{}'",carnum); }).collect(Collectors.joining(","));
+
+            lqw.apply(StringUtils.format("car_num in ({})",carNums));
+
+        }
+
+        if(bo.getParams()!=null && bo.getParams().size()>0){
+            if(bo.getParams().get("depts")!=null&& StrUtil.isNotEmpty(bo.getParams().get("depts").toString())){
+                String deptids = Arrays.stream(bo.getParams().get("depts").toString().split(",")).map(deptId->{return StrUtil.format("'{}'",deptId); }).collect(Collectors.joining(","));
+                lqw.apply(StringUtils.format("ext1->'$.{}' in ({})","deptId",deptids));
+            }
         }
+//        if(LoginHelper.getDeptId())
 
         //lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblCarInfo::getExt1, bo.getExt1());
         //lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblCarInfo::getExt2, bo.getExt2());

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblCarPathServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.system.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -15,9 +16,11 @@ import org.dromara.system.domain.TblCarPath;
 import org.dromara.system.mapper.TblCarPathMapper;
 import org.dromara.system.service.ITblCarPathService;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * 车辆路线Service业务层处理
@@ -70,6 +73,9 @@ public class TblCarPathServiceImpl implements ITblCarPathService {
         if(bo.getParams()!=null && bo.getParams().get("station")!=null){
             lqw.like(TblCarPath::getStationList, bo.getParams().get("station"));
         }
+
+
+
         return lqw;
     }
 

ruoyi-modules/ruoyi-khy/src/main/resources/mapper/system/TblCountDataMapper.xml

@@ -12,6 +12,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <![CDATA[
         SELECT sum(incount) as incount,sum(outcount) as outcount FROM count_data WHERE ts > #{start} AND ts < #{end}
         ]]>
+        <if test="devicecodes != null and devicecodes != ''">
+        <![CDATA[
+        AND devicecode in (${devicecodes})
+        ]]>
+        </if>
     </select>
 
 </mapper>