Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/khyznh

ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java

@@ -1,10 +1,12 @@
 package org.dromara;
 
 import com.dtflys.forest.springboot.annotation.ForestScan;
+import org.dromara.util.DistanceCalculator;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 启动程序
@@ -13,6 +15,7 @@ import org.springframework.context.annotation.ComponentScan;
  */
 
 @SpringBootApplication
+@EnableScheduling
 public class DromaraApplication {
 
     public static void main(String[] args) {

ruoyi-admin/src/main/resources/router/t.xml

@@ -8,7 +8,7 @@
     <!--同步服务配置-->
 
     <route>
-        <from uri="paho:/dev/gps/#?brokerUrl=tcp://xt.wenhq.top:8581&amp;userName=iot2yun&amp;password=123456&amp;clientId=khy_redclient"></from>
+        <from uri="paho:/dev/gps/#?brokerUrl=tcp://xt.wenhq.top:8581&amp;userName=iot2yun&amp;password=123456&amp;clientId=khy1_redclient"></from>
         <to uri="bean:org.dromara.util.CamelDataUtil?method=ReciveData(${body})"></to>
     </route>
 
@@ -22,7 +22,7 @@
     <route>
         <from uri="direct:sendMessage"/>
         <to uri="bean:org.dromara.util.CamelDataUtil?method=processdata(${body})"></to>
-        <to uri="paho:/dev/?brokerUrl=tcp://xt.wenhq.top:8581&amp;userName=iot2yun&amp;password=123456&amp;clientId=khy_writeclient"/>
+        <to uri="paho:/dev/?brokerUrl=tcp://xt.wenhq.top:8581&amp;userName=iot2yun&amp;password=123456&amp;clientId=khy1_writeclient"/>
     </route>
 
 

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

@@ -1,6 +1,10 @@
 package org.dromara.system.controller;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.dtflys.forest.backend.okhttp3.OkHttp3;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
@@ -8,13 +12,19 @@ import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.redis.utils.CacheUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysDictDataBo;
 import org.dromara.system.domain.bo.TblCarInfoBo;
+import org.dromara.system.domain.vo.SysDictDataVo;
 import org.dromara.system.domain.vo.TblCarInfoVo;
+import org.dromara.system.service.ISysDictDataService;
 import org.dromara.system.service.ITblCarDriveWarningService;
+import org.dromara.util.CabinetUtil;
 import org.dromara.util.MessageUtils;
 import org.dromara.util.YingshiHttp;
 import org.springframework.beans.factory.annotation.Value;
@@ -27,6 +37,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static org.dromara.util.CabinetUtil.CABINET_BOXS;
+import static org.dromara.util.CabinetUtil.CABINET_INFO;
+
 @Validated
 @RequiredArgsConstructor
 @RestController
@@ -79,6 +92,11 @@ public class CommonController extends BaseController {
 
     }
 
+    /**
+     * 语音及LED播放
+     * @param data
+     * @return
+     */
     @PostMapping("/play")
     public Object playtts(@RequestBody Map<String,Object> data) {
 
@@ -110,4 +128,218 @@ public class CommonController extends BaseController {
 
 
     }
+
+    @PostMapping("/playlist/static")
+    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));
+        }
+        data.sort((o1, o2) -> {
+            return Math.toIntExact(DateUtil.parseDateTime(o2.get("time")).getTime() - DateUtil.parseDateTime(o1.get("time")).getTime());
+        });
+        if(data.size()<10) return data;
+        return data.subList(0,10);
+    }
+
+
+
+    /**
+     * 获取柜子统计信息
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/cabinet/boxstatic")
+    public Object cabinetInfo() throws Exception {
+        Map<String,Object> data = new HashMap<>();
+        CacheUtils.keys(CABINET_INFO).forEach(item->{
+            if(item.toString().contains("box")){
+                data.put(item.toString(),CacheUtils.get(CABINET_INFO,item));
+            }
+        });
+
+        return data;
+    }
+
+    @PostMapping("/devicemsg")
+    public Object devicemsg() throws Exception {
+        Map<String,Object> data = new HashMap<>();
+        CacheUtils.keys("offline").forEach(item->{
+            Map<String,Object> c = new HashMap<>();
+            if(CacheUtils.get("offline",item) instanceof  String){
+                CacheUtils.put("offline",item,new HashMap<>());
+            }else{
+                c = CacheUtils.get("offline",item);
+                if(c.keySet().size()>0){
+                    data.put(item.toString(),c);
+                }
+            }
+        });
+        return data;
+    }
+
+
+
+    @PostMapping("/station/devs")
+    public Object stationDevs() throws Exception {
+        Map<String,Map<String,String>> devMap = new HashMap<>();
+        SysDictDataBo bo =new SysDictDataBo();
+        bo.setDictType("tbl_sites");
+        List<SysDictDataVo> list = SpringUtils.getBean(ISysDictDataService.class).selectDictDataList(bo);
+        try {
+            list.forEach(item->{
+                if(StrUtil.isNotEmpty(item.getRemark())){
+                    JSONArray jsonArray = JSONUtil.parseArray(item.getRemark());
+                    jsonArray.forEach(item2->{
+                        Map<String,String> c =new HashMap<>();
+                        c.put("name",((JSONObject)item2).getStr("name"));
+                        c.put("offline","0");
+                        if(((JSONObject)item2).getStr("type").equals("cabinet")){
+                           Map offline = CacheUtils.get("offline",((JSONObject)item2).getStr("code"));
+                           if(offline.keySet().size()>0){
+                               c.put("offline","1");
+                           }
+                        }
+                        devMap.put(((JSONObject)item2).getStr("type")+((JSONObject)item2).getStr("code"),c);
+                    });
+                }
+            });
+        }catch (Exception e){
+
+        }
+        return devMap;
+    }
+
+    /**
+     * 通过POST请求获取指定柜子的信息。
+     *
+     * 此方法处理来自客户端的POST请求，旨在根据柜子代码获取特定柜子的详细信息。
+     * 使用路径参数{@code code}来指定具体的柜子。
+     *
+     * @param code 柜子的唯一标识代码，作为路径参数传递。
+     * @return 返回包含柜子信息的对象。具体结构取决于实现。
+     * @throws Exception 如果获取柜子信息过程中发生错误。
+     */
+    @PostMapping("/cabinet/{code}/info")
+    public Object cabinetInfo(@PathVariable String code) throws Exception {
+        return CacheUtils.get(CABINET_INFO,code);
+    }
+
+    /**
+     * 通过POST请求获取指定柜子的所有箱子的信息。
+     *
+     * 此方法处理来自客户端的POST请求，旨在根据柜子代码获取特定柜子的所有箱子的信息。
+     * 使用路径参数{@code code}来指定具体的柜子。
+     *
+     * @param code 柜子的唯一标识代码，作为路径参数传递。
+     * @return 返回包含柜子箱子信息的对象。具体结构取决于实现。
+     * @throws Exception 如果获取柜子箱子信息过程中发生错误。
+     */
+    @PostMapping("/cabinet/{code}/allbox/info")
+    public Object cabinetBoxInfo(@PathVariable String code) throws Exception {
+        return CacheUtils.get(CABINET_BOXS,code);
+    }
+
+    /**
+     * 根据时间范围获取柜子统计（body需传{"startTime":"xxx","endTime":"xxx"} xxx为日期）。
+     *
+     * 此方法处理来自客户端的POST请求，旨在根据柜子代码获取特定柜子的统计信息。
+     * 使用路径参数{@code code}来指定具体的柜子。
+     *
+     * @param code 柜子的唯一标识代码，作为路径参数传递。
+     * @return 返回包含柜子统计信息的对象。具体结构取决于实现。
+     * @throws Exception 如果获取柜子统计信息过程中发生错误。
+     */
+    @PostMapping("/cabinet/{code}/statistic")
+    public Object cabinetBoxInfo(@PathVariable String code,@RequestBody Map<String,String> data) throws Exception {
+        data = data == null?new HashMap<>():data;
+        String startTime = data.get("startTime");
+        String endTime = data.get("endTime");
+        if(startTime == null || endTime == null){
+            return R.fail("参数不完整");
+        }
+        return  CabinetUtil.getCabinetStatistics(code,startTime,endTime);
+    }
+
+    /**
+     * 打开柜子指定格子。
+     *
+     * 此方法处理来自客户端的POST请求，旨在根据柜子代码获取特定柜子的统计信息。
+     * 使用路径参数{@code code}来指定具体的柜子。
+     *
+     * @param code 柜子的唯一标识代码，作为路径参数传递。
+     * @return 返回包含柜子统计信息的对象。具体结构取决于实现。
+     * @throws Exception 如果获取柜子统计信息过程中发生错误。
+     */
+    @PostMapping("/cabinet/{code}/openlock/{lockAddress}")
+    public Object openCabinetBox(@PathVariable String code,@PathVariable String lockAddress) throws Exception {
+        return  CabinetUtil.openCabinetBoxs(code,lockAddress);
+    }
+
+    /**
+     * 打开柜子所有格子。
+     *
+     * 此方法处理来自客户端的POST请求，旨在根据柜子代码获取特定柜子的统计信息。
+     * 使用路径参数{@code code}来指定具体的柜子。
+     *
+     * @param code 柜子的唯一标识代码，作为路径参数传递。
+     * @return 返回包含柜子统计信息的对象。具体结构取决于实现。
+     * @throws Exception 如果获取柜子统计信息过程中发生错误。
+     */
+    @PostMapping("/cabinet/{code}/lock/openall")
+    public Object openCabinetAllBox(@PathVariable String code) throws Exception {
+        return  CabinetUtil.openCabinetBoxAll(code);
+    }
+
+    /**
+     * 清理柜子的格子（不打开）。
+     *
+     * 此方法处理来自客户端的POST请求，旨在根据柜子代码获取特定柜子的统计信息。
+     * 使用路径参数{@code code}来指定具体的柜子。
+     *
+     * @param code 柜子的唯一标识代码，作为路径参数传递。
+     * @return 返回包含柜子统计信息的对象。具体结构取决于实现。
+     * @throws Exception 如果获取柜子统计信息过程中发生错误。
+     */
+    @PostMapping("/cabinet/{code}/box/{boxuuid}/clear")
+    public Object clearCabinetAllBox(@PathVariable String code,@PathVariable String boxuuid) throws Exception {
+        return  CabinetUtil.clearCabinetBox(code,boxuuid);
+    }
+
+    /**
+     * 清理柜子的格子（打开）。
+     *
+     * 此方法处理来自客户端的POST请求，旨在根据柜子代码获取特定柜子的统计信息。
+     * 使用路径参数{@code code}来指定具体的柜子。
+     *
+     * @param code 柜子的唯一标识代码，作为路径参数传递。
+     * @return 返回包含柜子统计信息的对象。具体结构取决于实现。
+     * @throws Exception 如果获取柜子统计信息过程中发生错误。
+     */
+    @PostMapping("/cabinet/{code}/box/{boxuuid}/openclear")
+    public Object clearOpenCabinetAllBox(@PathVariable String code,@PathVariable String boxuuid) throws Exception {
+        return  CabinetUtil.clearCabinetBoxOpen(code,boxuuid);
+    }
+
+    /**
+     * 获取取件码。
+     *
+     * 此方法处理来自客户端的POST请求，旨在根据柜子代码获取特定柜子的统计信息。
+     * 使用路径参数{@code code}来指定具体的柜子。
+     *
+     * @param phone 手机号，作为路径参数传递。
+     * @return 返回包含柜子统计信息的对象。具体结构取决于实现。
+     * @throws Exception 如果获取柜子统计信息过程中发生错误。
+     */
+    @PostMapping("/cabinet/mobile/{phone}")
+    public Object cabinetQJM(@PathVariable String phone) throws Exception {
+        return  CabinetUtil.getQJM(phone);
+    }
+
+
+
+
+
+
 }

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

@@ -0,0 +1,76 @@
+package org.dromara.system.controller;
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
+import org.dromara.common.core.domain.R;
+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.vo.CountDataVo;
+import org.dromara.system.service.ITblCountDataService;
+import org.dromara.system.service.ITblGoodsOrderService;
+import org.dromara.util.MessageUtils;
+import org.dromara.util.YingshiHttp;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.Duration;
+import java.util.*;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@Slf4j
+@RequestMapping("/statistic")
+public class StatisticController extends BaseController {
+    private final ITblCountDataService countDataService;
+
+    private final ITblGoodsOrderService goodsOrderService;
+
+
+
+    @PostMapping("/passenger/flow")
+    public Object sitesFlow(@RequestBody(required = false) Map<String,Object> data) {
+        if(data==null) data=new HashMap<>();
+        if(data.get("start")==null){
+            data.put("start", DateUtil.format(DateUtil.offsetDay(DateUtil.yesterday(), -7),"yyyy-MM-dd"));
+        }
+        if(data.get("end")==null){
+            data.put("end", DateUtil.format(DateUtil.yesterday(),"yyyy-MM-dd"));
+        }
+
+       List<DateTime> dateList= DateUtil.rangeToList(DateUtil.parse(data.get("start").toString()), DateUtil.parse(data.get("end").toString()), DateField.DAY_OF_YEAR);
+
+        List<Object> qs = new ArrayList<>();
+        dateList.forEach(date->{
+            Map<String,Object> temp = new HashMap<>();
+            temp.put("start",DateUtil.format(date,"yyyy-MM-dd"));
+            temp.put("end",DateUtil.format(DateUtil.offsetDay(date,1),"yyyy-MM-dd"));
+
+
+            Map<String,Object> d = goodsOrderService.queryByDate(temp);
+            if(d==null){
+                d=new HashMap<>();
+                d.put("ordercount",0);
+            }
+
+
+            CountDataVo countDataVo = countDataService.queryByDate(temp);
+            if(countDataVo==null){
+                countDataVo = new CountDataVo();countDataVo.setOutcount(0);countDataVo.setIncount(0);
+            }
+            temp.put("flowCount",countDataVo);
+            temp.put("goodsOrderCount",d);
+            qs.add(temp);
+        });
+
+
+
+        return R.ok(qs);
+    }
+}

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

@@ -0,0 +1,105 @@
+package org.dromara.system.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.domain.vo.TblArticleVo;
+import org.dromara.system.domain.bo.TblArticleBo;
+import org.dromara.system.service.ITblArticleService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 文章
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/Article")
+public class TblArticleController extends BaseController {
+
+    private final ITblArticleService tblArticleService;
+
+    /**
+     * 查询文章列表
+     */
+//    @SaCheckPermission("system:Article:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblArticleVo> list(TblArticleBo bo, PageQuery pageQuery) {
+        return tblArticleService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出文章列表
+     */
+//    @SaCheckPermission("system:Article:export")
+    @Log(title = "文章", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblArticleBo bo, HttpServletResponse response) {
+        List<TblArticleVo> list = tblArticleService.queryList(bo);
+        ExcelUtil.exportExcel(list, "文章", TblArticleVo.class, response);
+    }
+
+    /**
+     * 获取文章详细信息
+     *
+     * @param id 主键
+     */
+//    @SaCheckPermission("system:Article:query")
+    @GetMapping("/{id}")
+    public R<TblArticleVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(tblArticleService.queryById(id));
+    }
+
+    /**
+     * 新增文章
+     */
+//    @SaCheckPermission("system:Article:add")
+    @Log(title = "文章", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void>Add(@Validated(AddGroup.class) @RequestBody TblArticleBo bo) {
+        return toAjax(tblArticleService.insertByBo(bo));
+    }
+
+    /**
+     * 修改文章
+     */
+//    @SaCheckPermission("system:Article:edit")
+    @Log(title = "文章", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblArticleBo bo) {
+        return toAjax(tblArticleService.updateByBo(bo));
+    }
+
+    /**
+     * 删除文章
+     *
+     * @param ids 主键串
+     */
+//    @SaCheckPermission("system:Article:remove")
+    @Log(title = "文章", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(tblArticleService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -47,6 +47,15 @@ public class TblCarInfoController extends BaseController {
     }
 
     /**
+     * 查询车辆人流量列表
+     */
+    @GetMapping("/liststaticFlow")
+    public TableDataInfo<TblCarInfoVo> liststaticFlow(TblCarInfoBo bo, PageQuery pageQuery) {
+        return tblCarInfoService.queryFlowList(bo, pageQuery);
+    }
+
+
+    /**
      * 导出车辆信息列表
      */
     //@SaCheckPermission("system:carInfo:export")

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

@@ -1,32 +1,16 @@
 package org.dromara.system.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-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.dromara.system.domain.bo.*;
+import org.dromara.system.domain.vo.*;
+import org.dromara.system.service.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,6 +18,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * 车辆信息
@@ -51,6 +36,11 @@ public class TblGpsDataController extends BaseController {
 
     private final ITblCountDataService countDataService;
 
+    private final ISysDictDataService sysDictDataService;
+
+    private final ITblCarScheduleService carScheduleService;
+    private final ITblCarInfoService carInfoService;
+
     /**
      * 查询车辆信息列表
      */
@@ -61,6 +51,9 @@ public class TblGpsDataController extends BaseController {
     }
 
 
+    /**
+     * 查询设备人流量
+     */
     @GetMapping("/peoplecount/list")
     public Object list(CountDataBo bo) {
         if(bo.getParams()!=null && bo.getParams().get("times")!=null){
@@ -104,4 +97,130 @@ public class TblGpsDataController extends BaseController {
 
     }
 
+
+    /**
+     * 查询站点人流量列表
+     */
+    @GetMapping("/sites/flow")
+    public TableDataInfo<SysDictDataVo> listFalow(SysDictDataBo bo, PageQuery pageQuery) {
+
+        bo.setDictType("tbl_sites");
+        //查询站点
+        TableDataInfo<SysDictDataVo>  sites = sysDictDataService.selectPageDictDataList(bo, pageQuery);
+
+
+        List<TblCarScheduleVo> usedSchedule = new ArrayList<>();
+        //查询时间段内包含上述站点的排班
+        TblCarScheduleBo bo1 = new TblCarScheduleBo();
+        bo1.setParams(bo.getParams());
+        List<TblCarScheduleVo> scheduleVos =  carScheduleService.queryList(bo1);
+        scheduleVos.forEach(item->{
+            if(!StrUtil.isEmptyIfStr(item.getExt1())){
+                for (int i = 0; i < sites.getRows().size(); i++) {
+                    SysDictDataVo site = sites.getRows().get(i);
+                    if(item.getExt1().contains(site.getDictLabel())){
+                        usedSchedule.add(item);
+                        break;
+                    }
+                }
+            }
+        });
+        if(usedSchedule.size()<1) return sites;
+        //获取车牌
+        TblCarInfoBo bo3 = new TblCarInfoBo();
+        bo3.getParams().put("carNums",usedSchedule.stream().map(TblCarScheduleVo::getCarNum).toList());
+        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"));
+                }
+            });
+        });
+        //{
+        //    "程家垄": {
+        //        "intime": "2024-05-07 10:48:34",
+        //        "outtime": "2024-05-07 10:48:39"
+        //    },
+        //    "福安客运站": {
+        //        "intime": "2024-05-07 10:47:42",
+        //        "outtime": "2024-05-07 10:48:01"
+        //    }
+        //}
+        usedSchedule.forEach(item->{
+            if(deviceMap.get(item.getCarNum())!=null) {
+                JSONObject ext1 = JSONUtil.parseObj(item.getExt1());
+                for (String key : ext1.keySet()) {
+                    if (sitesMap.get(key) == null) {
+                        sitesMap.put(key, new HashMap<>());
+                    }
+                    Map<String, List<Map<String, String>>> ideviceMap = sitesMap.get(key);
+                    deviceMap.get(item.getCarNum()).forEach(deviceCode->{
+                        if(ideviceMap.get(deviceCode)==null) ideviceMap.put(deviceCode,new ArrayList<>());
+                        ideviceMap.get(deviceCode).add(ext1.get(key, Map.class));
+                    });
+                }
+            }
+        });
+        Map<String,Map<String,Object>> sitesc = new HashMap<>();
+        sitesMap.forEach((key,value)->{
+            AtomicReference<Integer> incount = new AtomicReference<>(0);
+            AtomicReference<Integer> outcount = new AtomicReference<>(0);
+            value.forEach((deviceCode,times)->{
+                times.forEach(time->{
+                    CountDataBo bo2 = new CountDataBo();
+                    bo2.getParams().put("starttime",time.get("intime"));
+                    bo2.getParams().put("endtime",time.get("outtime"));
+                    bo2.setDevicecode(deviceCode);
+                    List<CountDataVo> countDataVos = countDataService.queryList(bo2);
+                    countDataVos.forEach(item1->{
+                        incount.updateAndGet(v -> v + item1.getIncount());
+                        outcount.updateAndGet(v -> v + item1.getOutcount());
+                    });
+                });
+            });
+            sitesc.put(key,Map.of("incount",incount.get(),"outcount",outcount.get()));
+        });
+
+        sites.getRows().forEach(item->{
+            item.setOthers(new HashMap<>());
+            if(sitesc.get(item.getDictLabel())!=null){
+                item.setOthers(sitesc.get(item.getDictLabel()));
+            }else{
+                item.getOthers().put("incount",0);
+                item.getOthers().put("outcount",0);
+            }
+        });
+
+
+//        //查询人流量数据
+//        CountDataBo bo2 = new CountDataBo();
+//        bo2.getParams().put("starttime",bo.getParams().get("starttime"));
+//        bo2.getParams().put("endtime",bo.getParams().get("endtime"));
+//        bo2.getParams().put("deviceCodes",);
+//        countDataService.queryList(bo2)
+//
+//
+//
+//        //根据排班查询车辆在站点时间
+//        for (TblCarScheduleVo scheduleVo : usedSchedule) {
+//
+//        }
+
+
+        //根据车辆查人流量数据
+
+        //统计
+
+        return sites;
+
+//        return gpsDataService.queryPageList(bo, pageQuery);
+    }
+
+
 }

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

@@ -0,0 +1,105 @@
+package org.dromara.system.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.domain.vo.TblMiniprogramVo;
+import org.dromara.system.domain.bo.TblMiniprogramBo;
+import org.dromara.system.service.ITblMiniprogramService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 小程序信息
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/miniprogram")
+public class TblMiniprogramController extends BaseController {
+
+    private final ITblMiniprogramService tblMiniprogramService;
+
+    /**
+     * 查询小程序信息列表
+     */
+//    @SaCheckPermission("system:miniprogram:list")
+    @GetMapping("/list")
+    public TableDataInfo<TblMiniprogramVo> list(TblMiniprogramBo bo, PageQuery pageQuery) {
+        return tblMiniprogramService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出小程序信息列表
+     */
+//    @SaCheckPermission("system:miniprogram:export")
+    @Log(title = "小程序信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TblMiniprogramBo bo, HttpServletResponse response) {
+        List<TblMiniprogramVo> list = tblMiniprogramService.queryList(bo);
+        ExcelUtil.exportExcel(list, "小程序信息", TblMiniprogramVo.class, response);
+    }
+
+    /**
+     * 获取小程序信息详细信息
+     *
+     * @param id 主键
+     */
+//    @SaCheckPermission("system:miniprogram:query")
+    @GetMapping("/{id}")
+    public R<TblMiniprogramVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(tblMiniprogramService.queryById(id));
+    }
+
+    /**
+     * 新增小程序信息
+     */
+//    @SaCheckPermission("system:miniprogram:add")
+    @Log(title = "小程序信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TblMiniprogramBo bo) {
+        return toAjax(tblMiniprogramService.insertByBo(bo));
+    }
+
+    /**
+     * 修改小程序信息
+     */
+//    @SaCheckPermission("system:miniprogram:edit")
+    @Log(title = "小程序信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TblMiniprogramBo bo) {
+        return toAjax(tblMiniprogramService.updateByBo(bo));
+    }
+
+    /**
+     * 删除小程序信息
+     *
+     * @param ids 主键串
+     */
+//    @SaCheckPermission("system:miniprogram:remove")
+    @Log(title = "小程序信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(tblMiniprogramService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,61 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 文章对象 tbl_ article
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_article")
+public class TblArticle extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 副标题
+     */
+    private String subTitle;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 状态
+     */
+    private Long status;
+
+    /**
+     * 扩展1
+     */
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    private String ext2;
+
+
+}

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

@@ -90,4 +90,5 @@ public class TblGoodsOrder extends BaseEntity {
     private String ext2;
 
 
+
 }

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

@@ -0,0 +1,66 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 小程序信息对象 tbl_miniprogram
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_miniprogram")
+public class TblMiniprogram extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 图标地址
+     */
+    private String logo;
+
+    /**
+     * 链接
+     */
+    private String url;
+
+    /**
+     * 状态
+     */
+    private Long status;
+
+    /**
+     * 描述
+     */
+    private String remark;
+
+    /**
+     * 扩展1
+     */
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    private String ext2;
+
+
+}

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

@@ -0,0 +1,64 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.TblArticle;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import org.dromara.system.domain.TblArticle;
+
+/**
+ * 文章业务对象 tbl_ article
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TblArticle.class, reverseConvertGenerate = false)
+public class TblArticleBo extends BaseEntity {
+
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 副标题
+     */
+    private String subTitle;
+
+    /**
+     * 内容
+     */
+
+    private String content;
+
+    /**
+     * 状态
+     */
+
+    private Long status;
+
+    /**
+     * 扩展1
+     */
+
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+
+    private String ext2;
+
+
+}

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

@@ -0,0 +1,64 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.TblMiniprogram;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 小程序信息业务对象 tbl_miniprogram
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TblMiniprogram.class, reverseConvertGenerate = false)
+public class TblMiniprogramBo extends BaseEntity {
+
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 图标地址
+     */
+    private String logo;
+
+    /**
+     * 链接
+     */
+    private String url;
+
+    /**
+     * 状态
+     */
+    private Long status;
+
+    /**
+     * 描述
+     */
+    private String remark;
+
+    /**
+     * 扩展1
+     */
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    private String ext2;
+
+
+}

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

@@ -0,0 +1,71 @@
+package org.dromara.system.domain.vo;
+
+import org.dromara.system.domain.TblArticle;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.TblArticle;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 文章视图对象 tbl_ article
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TblArticle.class)
+public class TblArticleVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    /**
+     * 标题
+     */
+    @ExcelProperty(value = "标题")
+    private String title;
+
+    /**
+     * 副标题
+     */
+    @ExcelProperty(value = "副标题")
+    private String subTitle;
+
+    /**
+     * 内容
+     */
+    @ExcelProperty(value = "内容")
+    private String content;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态")
+    private Long status;
+
+    /**
+     * 扩展1
+     */
+    @ExcelProperty(value = "扩展1")
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    @ExcelProperty(value = "扩展2")
+    private String ext2;
+
+
+}

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

@@ -11,7 +11,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.Map;
 
 
 /**
@@ -109,5 +109,7 @@ public class TblCarInfoVo implements Serializable {
 
     private Object location;
 
+    private Map<String,Object> others;
+
 
 }

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

@@ -109,4 +109,7 @@ public class TblGoodsOrderVo implements Serializable {
     private String ext2;
 
 
+    private Date createTime;
+
+
 }

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

@@ -0,0 +1,80 @@
+package org.dromara.system.domain.vo;
+
+import org.dromara.system.domain.TblMiniprogram;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 小程序信息视图对象 tbl_miniprogram
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TblMiniprogram.class)
+public class TblMiniprogramVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ExcelProperty(value = "编号")
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @ExcelProperty(value = "名称")
+    private String name;
+
+    /**
+     * 图标地址
+     */
+    @ExcelProperty(value = "图标地址")
+    private String logo;
+
+    /**
+     * 链接
+     */
+    @ExcelProperty(value = "链接")
+    private String url;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态")
+    private Long status;
+
+    /**
+     * 描述
+     */
+    @ExcelProperty(value = "描述")
+    private String remark;
+
+    /**
+     * 扩展1
+     */
+    @ExcelProperty(value = "扩展1")
+    private String ext1;
+
+    /**
+     * 扩展2
+     */
+    @ExcelProperty(value = "扩展2")
+    private String ext2;
+
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/mapper/TblArticleMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.TblArticle;
+import org.dromara.system.domain.vo.TblArticleVo;
+
+/**
+ * 文章Mapper接口
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+public interface TblArticleMapper extends BaseMapperPlus<TblArticle, TblArticleVo> {
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/mapper/TblCountDataMapper.java

@@ -4,6 +4,8 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.system.domain.CountData;
 import org.dromara.system.domain.vo.CountDataVo;
 
+import java.util.Map;
+
 /**
  * 人员请假Mapper接口
  *
@@ -14,4 +16,6 @@ public interface TblCountDataMapper extends BaseMapperPlus<CountData,CountDataVo
 
     public void insertdata(CountData data);
 
+    public CountDataVo selectdatabydate(Map data);
+
 }

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/mapper/TblGoodsOrderMapper.java

@@ -1,9 +1,12 @@
 package org.dromara.system.mapper;
 
 import org.dromara.system.domain.TblGoodsOrder;
+import org.dromara.system.domain.vo.CountDataVo;
 import org.dromara.system.domain.vo.TblGoodsOrderVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.Map;
+
 /**
  * 寄货订单Mapper接口
  *
@@ -12,4 +15,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface TblGoodsOrderMapper extends BaseMapperPlus<TblGoodsOrder, TblGoodsOrderVo> {
 
+    public Map<String, Object> selectdatabydate(Map data);
+
 }

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/mapper/TblMiniprogramMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.TblMiniprogram;
+import org.dromara.system.domain.vo.TblMiniprogramVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 小程序信息Mapper接口
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+public interface TblMiniprogramMapper extends BaseMapperPlus<TblMiniprogram, TblMiniprogramVo> {
+
+}

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

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.TblArticle;
+import org.dromara.system.domain.vo.TblArticleVo;
+import org.dromara.system.domain.bo.TblArticleBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 文章Service接口
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+public interface ITblArticleService {
+
+    /**
+     * 查询文章
+     */
+    TblArticleVo queryById(Long id);
+
+    /**
+     * 查询文章列表
+     */
+    TableDataInfo<TblArticleVo> queryPageList(TblArticleBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询文章列表
+     */
+    List<TblArticleVo> queryList(TblArticleBo bo);
+
+    /**
+     * 新增文章
+     */
+    Boolean insertByBo(TblArticleBo bo);
+
+    /**
+     * 修改文章
+     */
+    Boolean updateByBo(TblArticleBo bo);
+
+    /**
+     * 校验并批量删除文章信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -32,6 +32,8 @@ public interface ITblCarInfoService {
      */
     List<TblCarInfoVo> queryList(TblCarInfoBo bo);
 
+    TableDataInfo<TblCarInfoVo> queryFlowList(TblCarInfoBo bo, PageQuery pageQuery);
+
     /**
      * 新增车辆信息
      */

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

@@ -8,6 +8,7 @@ import org.dromara.system.domain.vo.CountDataVo;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * CountService接口
@@ -22,6 +23,7 @@ public interface ITblCountDataService {
      */
     CountDataVo queryById(Long id);
 
+    CountDataVo queryByDate(Map<String, Object> bo);
     /**
      * 查询丢失货物列表
      */

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

@@ -1,6 +1,7 @@
 package org.dromara.system.service;
 
 import org.dromara.system.domain.TblGoodsOrder;
+import org.dromara.system.domain.vo.CountDataVo;
 import org.dromara.system.domain.vo.TblGoodsOrderVo;
 import org.dromara.system.domain.bo.TblGoodsOrderBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -8,6 +9,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 寄货订单Service接口
@@ -46,4 +48,7 @@ public interface ITblGoodsOrderService {
      * 校验并批量删除寄货订单信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+
+    Map<String,Object> queryByDate(Map<String, Object> bo);
 }

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

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.TblMiniprogram;
+import org.dromara.system.domain.vo.TblMiniprogramVo;
+import org.dromara.system.domain.bo.TblMiniprogramBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 小程序信息Service接口
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+public interface ITblMiniprogramService {
+
+    /**
+     * 查询小程序信息
+     */
+    TblMiniprogramVo queryById(Long id);
+
+    /**
+     * 查询小程序信息列表
+     */
+    TableDataInfo<TblMiniprogramVo> queryPageList(TblMiniprogramBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询小程序信息列表
+     */
+    List<TblMiniprogramVo> queryList(TblMiniprogramBo bo);
+
+    /**
+     * 新增小程序信息
+     */
+    Boolean insertByBo(TblMiniprogramBo bo);
+
+    /**
+     * 修改小程序信息
+     */
+    Boolean updateByBo(TblMiniprogramBo bo);
+
+    /**
+     * 校验并批量删除小程序信息信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,114 @@
+package org.dromara.system.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.TblArticleBo;
+import org.dromara.system.domain.vo.TblArticleVo;
+import org.dromara.system.domain.TblArticle;
+import org.dromara.system.mapper.TblArticleMapper;
+import org.dromara.system.service.ITblArticleService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 文章Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@RequiredArgsConstructor
+@Service
+public class TblArticleServiceImpl implements ITblArticleService {
+
+    private final TblArticleMapper baseMapper;
+
+    /**
+     * 查询文章
+     */
+    @Override
+    public TblArticleVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询文章列表
+     */
+    @Override
+    public TableDataInfo<TblArticleVo> queryPageList(TblArticleBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TblArticle> lqw = buildQueryWrapper(bo);
+        Page<TblArticleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询文章列表
+     */
+    @Override
+    public List<TblArticleVo> queryList(TblArticleBo bo) {
+        LambdaQueryWrapper<TblArticle> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TblArticle> buildQueryWrapper(TblArticleBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TblArticle> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getTitle()), TblArticle::getTitle, bo.getTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getSubTitle()), TblArticle::getSubTitle, bo.getSubTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getContent()), TblArticle::getContent, bo.getContent());
+        lqw.eq(bo.getStatus() != null, TblArticle::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblArticle::getExt1, bo.getExt1());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblArticle::getExt2, bo.getExt2());
+        return lqw;
+    }
+
+    /**
+     * 新增文章
+     */
+    @Override
+    public Boolean insertByBo(TblArticleBo bo) {
+        TblArticle add = MapstructUtils.convert(bo, TblArticle.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改文章
+     */
+    @Override
+    public Boolean updateByBo(TblArticleBo bo) {
+        TblArticle update = MapstructUtils.convert(bo, TblArticle.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TblArticle entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除文章
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

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

@@ -11,9 +11,14 @@ 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.system.domain.CountData;
 import org.dromara.system.domain.GpsData;
 import org.dromara.system.domain.TblCarSchedule;
+import org.dromara.system.domain.bo.CountDataBo;
+import org.dromara.system.domain.vo.CountDataVo;
+import org.dromara.system.mapper.TblCountDataMapper;
 import org.dromara.system.mapper.TblGpsDataMapper;
+import org.dromara.system.service.ITblCountDataService;
 import org.dromara.util.CamelDataUtil;
 import org.dromara.util.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,10 +29,7 @@ import org.dromara.system.domain.TblCarInfo;
 import org.dromara.system.mapper.TblCarInfoMapper;
 import org.dromara.system.service.ITblCarInfoService;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * 车辆信息Service业务层处理
@@ -43,6 +45,8 @@ public class TblCarInfoServiceImpl implements ITblCarInfoService {
 
 
     private final TblGpsDataMapper gpsDataMapper;
+
+    private final ITblCountDataService countDataMapper;
     /**
      * 查询车辆信息
      */
@@ -92,9 +96,69 @@ public class TblCarInfoServiceImpl implements ITblCarInfoService {
         return list;
     }
 
+    @Override
+    public TableDataInfo<TblCarInfoVo> queryFlowList(TblCarInfoBo bo, PageQuery pageQuery){
+        LambdaQueryWrapper<TblCarInfo> lqw = buildQueryWrapper(bo);
+        Page<TblCarInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        List<String> codes = new ArrayList<>();
+        result.getRecords().forEach(carInfoVo -> {
+            JSONUtil.parseArray(carInfoVo.getDeviceInfos()).toList(JSONObject.class).forEach(deviceInfo -> {
+                if(deviceInfo.getStr("type").equals("people_count")){
+                    codes.add( deviceInfo.getStr("code"));
+                }
+            });
+        });
+        Map<String,List<CountDataVo>> countDataMap = new HashMap<>();
+        //查流量
+        if(codes.size()>0){
+            codes.forEach(code->{
+                CountDataBo q = new CountDataBo();
+                q.setParams(bo.getParams());
+                q.getParams().put("deviceCodes",code);
+                List<CountDataVo> countDataList = countDataMapper.queryList(q);
+                if(countDataList.size()>0){
+                    countDataList.forEach(countData -> {
+                        if(countDataMap.get(countData.getDevicecode())==null){
+                            List<CountDataVo> countDataList1 = new ArrayList<>();
+                            countDataList1.add(countData);
+                            countDataMap.put(countData.getDevicecode(),countDataList1);
+                        }else{
+                            countDataMap.get(countData.getDevicecode()).add(countData);
+                        }
+                    });
+                }
+
+            });
+
+        }
+        try {
+
+            result.getRecords().forEach(carInfoVo -> {
+                carInfoVo.setOthers(new HashMap<>());
+                carInfoVo.getOthers().put("incount",0);
+                carInfoVo.getOthers().put("outcount",0);
+                JSONUtil.parseArray(carInfoVo.getDeviceInfos()).toList(JSONObject.class).forEach(deviceInfo -> {
+                    if(deviceInfo.getStr("type").equals("people_count")){
+                        if(countDataMap.get(deviceInfo.getStr("code"))!=null && countDataMap.get(deviceInfo.getStr("code")).size()>0){
+                            List<CountDataVo> countDataList = countDataMap.get(deviceInfo.getStr("code"));
+                            if(countDataList.size()>0){
+                                countDataList.stream().reduce((a,b)->{a.setIncount(a.getIncount()+b.getIncount());a.setOutcount(a.getOutcount()+b.getOutcount());return a;});
+                                carInfoVo.getOthers().put("incount",countDataList.get(0).getIncount());
+                                carInfoVo.getOthers().put("outcount",countDataList.get(0).getOutcount());
+                            }
+                        }
+                    }
+                });
+            });
+        }catch (Exception e){}
+
+        return TableDataInfo.build(result);
+    }
+
     private LambdaQueryWrapper<TblCarInfo> buildQueryWrapper(TblCarInfoBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TblCarInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getId()!=null, TblCarInfo::getId, bo.getId());
         lqw.eq(StringUtils.isNotBlank(bo.getCarNum()), TblCarInfo::getCarNum, bo.getCarNum());
         lqw.eq(StringUtils.isNotBlank(bo.getCarType()), TblCarInfo::getCarType, bo.getCarType());
         lqw.like(StringUtils.isNotBlank(bo.getDeviceInfos()), TblCarInfo::getDeviceInfos, bo.getDeviceInfos());
@@ -106,10 +170,27 @@ public class TblCarInfoServiceImpl implements ITblCarInfoService {
         lqw.eq(StringUtils.isNotBlank(bo.getTrafficAccidentInfo()), TblCarInfo::getTrafficAccidentInfo, bo.getTrafficAccidentInfo());
         lqw.eq(StringUtils.isNotBlank(bo.getViolationInfo()), TblCarInfo::getViolationInfo, bo.getViolationInfo());
         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")));
+        }
+
         //lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblCarInfo::getExt1, bo.getExt1());
         //lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblCarInfo::getExt2, bo.getExt2());
+        if(bo.getParams()!=null){
+            if(bo.getParams().keySet().size()>0){
+                for (String key:bo.getParams().keySet()) {
+                    if(key.contains("ext1")){
+                        lqw.apply(StringUtils.format("ext1->'$.{}'='{}'",key.split("\\$")[1],bo.getParams().get(key)));
+                    }
+                    if(key.contains("ext2")){
+                        lqw.apply(StringUtils.format("ext2->'$.{}'='{}'",key.split("\\$")[1],bo.getParams().get(key)));
+                    }
+                }
+            }
+        }
 
-        if(bo.getParams().get("driverInfo")!=null && bo.getParams().get("driverInfo")!=null){
+        if(bo.getParams()!=null && bo.getParams().get("driverInfo")!=null){
             lqw.apply(StringUtils.format("ext2->'$.driverInfo'={}",bo.getParams().get("driverInfo")));
 //            lqw.like(bo.getParams().get("driverInfo")!=null, TblCarInfo::getExt2, bo.getParams().get("driverInfo"));
         }

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

@@ -74,7 +74,7 @@ public class TblCarScheduleServiceImpl implements ITblCarScheduleService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TblCarSchedule> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getPathInfo()), TblCarSchedule::getPathInfo, bo.getPathInfo());
-        lqw.eq(StringUtils.isNotBlank(bo.getCarNum()), TblCarSchedule::getCarNum, bo.getCarNum());
+        lqw.like(StringUtils.isNotBlank(bo.getCarNum()), TblCarSchedule::getCarNum, bo.getCarNum());
         lqw.eq(bo.getScheduleDate() != null, TblCarSchedule::getScheduleDate, bo.getScheduleDate());
         if(bo.getParams()!=null && bo.getParams().keySet().size()>0){
             if(bo.getParams().get("station")!=null){
@@ -82,10 +82,16 @@ public class TblCarScheduleServiceImpl implements ITblCarScheduleService {
             }
             if(bo.getParams().get("scheduleDate")!=null){
                 try{
-                    String start= bo.getParams().get("scheduleDate").toString()+" 00:00:00";
-                    String end= bo.getParams().get("scheduleDate").toString()+" 23:59:59";
-                    lqw.gt(bo.getParams().get("scheduleDate")!=null, TblCarSchedule::getScheduleDate, start);
-                    lqw.lt(bo.getParams().get("scheduleDate")!=null, TblCarSchedule::getScheduleDate, end);
+                    String start= bo.getParams().get("scheduleDate").toString();
+                    String end= bo.getParams().get("scheduleDate").toString();
+                    if(bo.getParams().get("scheduleDate").toString().contains(" ")){
+
+                    }else{
+                        start+=" 00:00:00";
+                        end+=" 23:59:59";
+                    }
+                    lqw.ge(bo.getParams().get("scheduleDate")!=null, TblCarSchedule::getScheduleDate, start);
+                    lqw.le(bo.getParams().get("scheduleDate")!=null, TblCarSchedule::getScheduleDate, end);
 
                 }catch (Exception e){}
             }

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

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 丢失货物Service业务层处理
@@ -41,6 +42,11 @@ public class TblCountDataServiceImpl implements ITblCountDataService {
         return baseMapper.selectVoById(id);
     }
 
+    @Override
+    public CountDataVo queryByDate(Map<String, Object> bo) {
+        return baseMapper.selectdatabydate(bo);
+    }
+
     /**
      * 查询丢失货物列表
      */
@@ -69,7 +75,15 @@ public class TblCountDataServiceImpl implements ITblCountDataService {
                 lqw.gt(bo.getParams().get("starttime") != null, CountData::getTs, bo.getParams().get("starttime"));
                 lqw.lt(bo.getParams().get("endtime") != null, CountData::getTs, bo.getParams().get("endtime"));
             }
+            if(bo.getParams().get("deviceCodes")!=null){
+                if(bo.getParams().get("deviceCodes") instanceof List){
+                    lqw.in(CountData::getDevicecode, String.join(",",(List) bo.getParams().get("deviceCodes")));
+                }else{
+                    lqw.eq(CountData::getDevicecode, bo.getParams().get("deviceCodes"));
+                }
+            }
         }
+
         return lqw;
     }
 

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

@@ -80,6 +80,8 @@ public class TblGoodsOrderServiceImpl implements ITblGoodsOrderService {
         }
 
 
+
+
         lqw.eq(StringUtils.isNotBlank(bo.getGoodsWeight()), TblGoodsOrder::getGoodsWeight, bo.getGoodsWeight());
         lqw.eq(StringUtils.isNotBlank(bo.getToAddr()), TblGoodsOrder::getToAddr, bo.getToAddr());
         lqw.eq(StringUtils.isNotBlank(bo.getPayType()), TblGoodsOrder::getPayType, bo.getPayType());
@@ -96,6 +98,21 @@ public class TblGoodsOrderServiceImpl implements ITblGoodsOrderService {
                 lqw.apply(StringUtils.format(" ext1->'$.schedule_id' in {}", datasql));
 
             }
+
+            if(bo.getParams().get("start")!=null&&bo.getParams().get("end")!=null){
+                String start= bo.getParams().get("start").toString();
+                String end= bo.getParams().get("end").toString();
+                lqw.gt( TblGoodsOrder::getCreateTime, start);
+                lqw.lt( TblGoodsOrder::getCreateTime, end);
+            }
+            if(bo.getParams().get("phone")!=null){
+                String datasql = "( select user_id from sys_user where phonenumber like '%"+bo.getParams().get("phone").toString()+"%')";
+                lqw.apply(StringUtils.format(" from_user_id in {}", datasql));
+            }
+            if(bo.getParams().get("username")!=null){
+                String datasql = "( select user_id from sys_user where nick_name like '%"+bo.getParams().get("username").toString()+"%')";
+                lqw.apply(StringUtils.format(" from_user_id in {}", datasql));
+            }
         }
         return lqw;
     }
@@ -141,4 +158,9 @@ public class TblGoodsOrderServiceImpl implements ITblGoodsOrderService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public Map<String, Object> queryByDate(Map<String, Object> bo) {
+        return baseMapper.selectdatabydate(bo);
+    }
 }

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

@@ -0,0 +1,115 @@
+package org.dromara.system.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.TblMiniprogramBo;
+import org.dromara.system.domain.vo.TblMiniprogramVo;
+import org.dromara.system.domain.TblMiniprogram;
+import org.dromara.system.mapper.TblMiniprogramMapper;
+import org.dromara.system.service.ITblMiniprogramService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 小程序信息Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2024-07-18
+ */
+@RequiredArgsConstructor
+@Service
+public class TblMiniprogramServiceImpl implements ITblMiniprogramService {
+
+    private final TblMiniprogramMapper baseMapper;
+
+    /**
+     * 查询小程序信息
+     */
+    @Override
+    public TblMiniprogramVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询小程序信息列表
+     */
+    @Override
+    public TableDataInfo<TblMiniprogramVo> queryPageList(TblMiniprogramBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TblMiniprogram> lqw = buildQueryWrapper(bo);
+        Page<TblMiniprogramVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询小程序信息列表
+     */
+    @Override
+    public List<TblMiniprogramVo> queryList(TblMiniprogramBo bo) {
+        LambdaQueryWrapper<TblMiniprogram> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TblMiniprogram> buildQueryWrapper(TblMiniprogramBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TblMiniprogram> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), TblMiniprogram::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getLogo()), TblMiniprogram::getLogo, bo.getLogo());
+        lqw.eq(StringUtils.isNotBlank(bo.getUrl()), TblMiniprogram::getUrl, bo.getUrl());
+        lqw.eq(bo.getStatus() != null, TblMiniprogram::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getRemark()), TblMiniprogram::getRemark, bo.getRemark());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblMiniprogram::getExt1, bo.getExt1());
+        lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblMiniprogram::getExt2, bo.getExt2());
+        return lqw;
+    }
+
+    /**
+     * 新增小程序信息
+     */
+    @Override
+    public Boolean insertByBo(TblMiniprogramBo bo) {
+        TblMiniprogram add = MapstructUtils.convert(bo, TblMiniprogram.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改小程序信息
+     */
+    @Override
+    public Boolean updateByBo(TblMiniprogramBo bo) {
+        TblMiniprogram update = MapstructUtils.convert(bo, TblMiniprogram.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TblMiniprogram entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除小程序信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/util/CabinetUtil.java

@@ -0,0 +1,357 @@
+package org.dromara.util;
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.redis.utils.CacheUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.system.domain.GpsData;
+import org.dromara.system.domain.TblCarInfo;
+import org.dromara.system.domain.bo.SysDictDataBo;
+import org.dromara.system.domain.bo.TblCarInfoBo;
+import org.dromara.system.domain.bo.TblCarScheduleBo;
+import org.dromara.system.domain.vo.SysDictDataVo;
+import org.dromara.system.domain.vo.TblCarInfoVo;
+import org.dromara.system.domain.vo.TblCarScheduleVo;
+import org.dromara.system.service.ISysDictDataService;
+import org.dromara.system.service.impl.TblCarInfoServiceImpl;
+import org.dromara.system.service.impl.TblCarScheduleServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.crypto.Cipher;
+import java.security.Key;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class CabinetUtil {
+
+    private  final static String appid = "bw_open_express_A8C848769E5C04E0";
+    private  final static String appkey = "5AFC6E07CFCF4A359B775D1416A9799A";
+
+    private  final static String hosts = "https://open.bestwond.com";
+
+    public final static String CABINET_INFO = "cabinet_info";
+    public final static String CABINET_BOXS = "cabinet_boxs";
+    private static final Logger log = LoggerFactory.getLogger(CabinetUtil.class);
+
+    private static String byteArr2HexStr(byte[] arrB) throws Exception {
+        int iLen = arrB.length;
+        // 每个byte用两个字符才能表示，所以字符串的长度是数组长度的两倍
+        StringBuffer sb = new StringBuffer(iLen * 2);
+        for (int i = 0; i < iLen; i++) {
+            int intTmp = arrB[i];
+            // 把负数转换为正数
+            while (intTmp < 0) {
+                intTmp = intTmp + 256;
+            }
+            // 小于0F的数需要在前面补0
+            if (intTmp < 16) {
+                sb.append("0");
+            }
+            sb.append(Integer.toString(intTmp, 16));
+        }
+        return sb.toString();
+    }
+
+    private static String encrypt(String strIn) throws Exception {
+        return byteArr2HexStr(encrypt(strIn.getBytes("UTF-8")));
+    }
+
+    private static byte[] encrypt(byte[] arrB) throws Exception {
+        Key key = getKey(appkey.getBytes("UTF-8"));
+        Cipher encryptCipher = Cipher.getInstance("DES");
+        encryptCipher.init(Cipher.ENCRYPT_MODE, key);
+        return encryptCipher.doFinal(arrB);
+    }
+
+    private static Key getKey(byte[] arrBTmp) throws Exception {
+        // 创建一个空的8位字节数组（默认值为0）
+        byte[] arrB = new byte[8];
+        // 将原始字节数组转换为8位
+        for (int i = 0; i < arrBTmp.length && i < arrB.length; i++) {
+            arrB[i] = arrBTmp[i];
+        }
+        // 生成密钥
+        Key key = new javax.crypto.spec.SecretKeySpec(arrB, "DES");
+        return key;
+    }
+
+//    private static String getQJM(String phone) throws Exception {
+//        String text = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.cabinet.account");
+//
+//    }
+
+
+    @Scheduled(fixedRate = 5*60*1000)
+    private void genScheduleList(){
+
+        TblCarScheduleBo bo =new TblCarScheduleBo();
+        bo.getParams().put("scheduleDate",DateUtil.format(DateUtil.date(),"yyyy-MM-dd"));
+        List<TblCarScheduleVo> scheduleVos = SpringUtils.getBean(TblCarScheduleServiceImpl.class).queryList(bo);
+        TblCarScheduleBo bo2 =new TblCarScheduleBo();
+        bo2.getParams().put("scheduleDate",DateUtil.format(DateUtil.date().offset(DateField.DAY_OF_MONTH,1),"yyyy-MM-dd"));
+        List<TblCarScheduleVo> scheduleVos2 = SpringUtils.getBean(TblCarScheduleServiceImpl.class).queryList(bo2);
+        Map<String,Object> map=new HashMap<>();
+        scheduleVos2.forEach(scheduleVo2->{
+            map.put(scheduleVo2.getCarNum()+DateUtil.format(scheduleVo2.getScheduleDate(),DatePattern.NORM_DATETIME_PATTERN),scheduleVo2);
+        });
+
+        for (TblCarScheduleVo scheduleVo : scheduleVos) {
+            if(StrUtil.isNotEmpty(scheduleVo.getExt2())){
+                try{
+                    if(JSONUtil.parseObj(scheduleVo.getExt2()).getBool("isauto") && map.get(scheduleVo.getCarNum()+DateUtil.format( DateUtil.date(scheduleVo.getScheduleDate()).offset(DateField.DAY_OF_MONTH,1),DatePattern.NORM_DATETIME_PATTERN))==null){
+                        //copy
+                        TblCarScheduleBo bo1 =new TblCarScheduleBo();
+                        bo1.setCarNum(scheduleVo.getCarNum());
+                        bo1.setScheduleDate(DateUtil.offset(scheduleVo.getScheduleDate(),DateField.DAY_OF_MONTH,1));
+                        bo1.setPathInfo(scheduleVo.getPathInfo());
+                        bo1.setCreateTime(DateUtil.date());
+                        bo1.setExt2(scheduleVo.getExt2());
+                        bo1.setCreateDept(103100L);
+                        SpringUtils.getBean(TblCarScheduleServiceImpl.class).insertByBo(bo1);
+                    }
+                }catch (Exception e){
+
+                }
+            }
+        }
+
+    }
+     @Scheduled(fixedRate = 5*60*1000)
+     private void getGpsList(){
+         List<TblCarInfoVo> carInfoVos = SpringUtils.getBean(TblCarInfoServiceImpl.class).queryList(new TblCarInfoBo());
+         for (TblCarInfoVo car : carInfoVos) {
+             if(StrUtil.isNotEmpty(car.getDeviceInfos())){
+                 JSONUtil.parseArray(car.getDeviceInfos()).forEach(item->{
+                     JSONObject c = (JSONObject)item;
+                     if(c.getStr("type").equals("gps")){
+                        GpsData gpsData = RedisUtils.getCacheObject(StringUtils.format("gps_{}", c.getStr("code")));
+                        //1小时就离线
+                         Map<String,Object> map=new HashMap<>();
+                         if(gpsData.getTs()==null){
+                             gpsData.setTs(DateUtil.date());
+                         }
+
+                        if(DateUtil.current() - gpsData.getTs().getTime()> 1000*60*60){
+                            map.put("code",c.getStr("code"));
+                            map.put("time", DatePattern.NORM_DATETIME_FORMAT.format(gpsData.getTs()));
+                            map.put("station",car.getCarNum());
+                            CacheUtils.put("offline",c.getStr("code"),map);
+                        }else{
+                            CacheUtils.put("offline",c.getStr("code"),map);
+                        }
+                     }
+
+                 });
+             }
+         }
+
+     }
+
+
+
+    @Scheduled(fixedRate = 5*60*1000)
+    private void getList(){
+        //获取所有gps 判断是否离线
+        List<List<String>> cabinetList = new ArrayList<>();
+        SysDictDataBo bo =new SysDictDataBo();
+        bo.setDictType("tbl_sites");
+        List<SysDictDataVo> list = SpringUtils.getBean(ISysDictDataService.class).selectDictDataList(bo);
+        try {
+            list.forEach(item->{
+                if(StrUtil.isNotEmpty(item.getRemark())){
+                    JSONArray jsonArray = JSONUtil.parseArray(item.getRemark());
+                    jsonArray.forEach(item2->{
+                        if(((JSONObject)item2).getStr("type").equals("cabinet")){
+                            cabinetList.add( List.of(item.getDictLabel(),((JSONObject)item2).getStr("code")));
+                        }
+                    });
+                }
+            });
+        }catch (Exception e){
+
+        }
+
+
+        if(cabinetList.size()>0){
+            cabinetList.forEach(item->{
+                try {
+                    Thread.sleep(1000);
+                   String details= CabinetUtil.getCabinetInfo(item.get(1));
+                   CacheUtils.put(CABINET_INFO,item.get(1),details);
+                   log.info(StrUtil.format("获取到柜子信息：{},{}",item.get(1),details));
+                    Thread.sleep(1000);
+                   //获取柜子状态
+                    String boxs= CabinetUtil.getCabinetBoxs(item.get(1));
+                    CacheUtils.put(CABINET_BOXS,item.get(1),boxs);
+                    log.info(StrUtil.format("获取到柜子箱子信息：{},{}",item.get(1),boxs));
+
+
+                    try{
+                        Integer obline = JSONUtil.parseObj(details).getJSONObject("data").getInt("device_line");
+                        Map<String,Object> map=new HashMap<>();
+                        if(obline==0){
+                            map.put("code",item.get(1));
+                            map.put("time",DateUtil.now());
+                            map.put("station",item.get(0));
+                            //离线告警
+                            CacheUtils.put("offline",item.get(1),map);
+                        }else{
+                            CacheUtils.put("offline",item.get(1),map);
+                        }
+                    }catch(Exception e){
+                       log.error("快递柜信息解析错误");
+                    }
+
+                    try{
+                        Map<String,Integer> map=new HashMap<>();
+                        map.put("total",JSONUtil.parseObj(boxs).getJSONObject("data").getJSONObject("page").getInt("total_count"));
+                        JSONUtil.parseObj(boxs).getJSONObject("data").getJSONArray("list").forEach(item2->{
+                            if(((JSONObject)item2).getInt("box_use_status")==1){
+                                map.put("used",map.get("used")==null?1:map.get("used")+1);
+                            }else{
+                                map.put("unuse",map.get("unuse")==null?1:map.get("unuse")+1);
+                            }
+                        });
+                        if(map.get("used")==null) map.put("used",0);
+                        if(map.get("unuse")==null) map.put("unuse",0);
+                        CacheUtils.put(CABINET_INFO,item.get(1)+"_box",map);
+                    }catch(Exception e){
+                        log.error("快递柜box解析错误");
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+
+    }
+
+
+
+
+
+    // 获取柜子信息
+    public static  String getCabinetInfo(String cabinetCode) throws Exception {
+        int times = (int) (DateUtil.date().getTime()/1000);
+        String str_sign = appid + "=" + times + "=" + appid;
+        str_sign = encrypt(str_sign);
+
+        String result3= HttpRequest.post(hosts+"/kd/api/v2/action/device_info/").body(JSON.toJSONString(Map.of("device_number",cabinetCode)))
+            .addHeaders(Map.of("timestamp",times+"","Content-Type","application/json","appid",appid,"sign",str_sign))
+            .execute().body();
+        return result3;
+    }
+
+    // 获取柜子统计
+    public static String getCabinetStatistics(String cabinetCode,String startTime,String endTime) throws Exception {
+        int times = (int) (DateUtil.date().getTime()/1000);
+        String str_sign = appid + "=" + times + "=" + appid;
+        str_sign = encrypt(str_sign);
+
+        String result3= HttpRequest.post(hosts + "/kd/api/v2/action/deliver_statistics/").body(JSON.toJSONString(Map.of("device_number",cabinetCode,"strat_time",startTime,"end_time",endTime)))
+            .addHeaders(Map.of("timestamp",times+"","Content-Type","application/json","appid",appid,"sign",str_sign))
+            .execute().body();
+        return result3;
+
+    }
+
+    // 获取柜子盒子
+    public static String getCabinetBoxs(String cabinetCode) throws Exception {
+        int times = (int) (DateUtil.date().getTime()/1000);
+        String str_sign = appid + "=" + times + "=" + appid;
+        str_sign = encrypt(str_sign);
+
+        String result3= HttpRequest.post(hosts + "/kd/api/v2/action/box_info_list/").body(JSON.toJSONString(Map.of("device_number",cabinetCode,"page_size",1000)))
+            .addHeaders(Map.of("timestamp",times+"","Content-Type","application/json","appid",appid,"sign",str_sign))
+            .execute().body();
+        return result3;
+
+    }
+
+    // 开柜
+    public static String openCabinetBoxs(String cabinetCode,String lookAddr) throws Exception {
+        int times = (int) (DateUtil.date().getTime()/1000);
+        String str_sign = appid + "=" + times + "=" + appid;
+        str_sign = encrypt(str_sign);
+
+        String result3= HttpRequest.post(hosts + "/kd/api/v2/action/open_box/").body(JSON.toJSONString(Map.of("device_number",cabinetCode,"lock_address",lookAddr)))
+            .addHeaders(Map.of("timestamp",times+"","Content-Type","application/json","appid",appid,"sign",str_sign))
+            .execute().body();
+        return result3;
+
+    }
+
+    // 开所有柜
+    public static String openCabinetBoxAll(String cabinetCode) throws Exception {
+        int times = (int) (DateUtil.date().getTime()/1000);
+        String str_sign = appid + "=" + times + "=" + appid;
+        str_sign = encrypt(str_sign);
+
+        String result3= HttpRequest.post(hosts + "/kd/api/v2/action/open_box_all/").body(JSON.toJSONString(Map.of("device_number",cabinetCode)))
+            .addHeaders(Map.of("timestamp",times+"","Content-Type","application/json","appid",appid,"sign",str_sign))
+            .execute().body();
+        return result3;
+
+    }
+
+    //清理格子(不开启)
+    public static String clearCabinetBox(String cabinetCode,String boxUUId) throws Exception {
+        int times = (int) (DateUtil.date().getTime()/1000);
+        String str_sign = appid + "=" + times + "=" + appid;
+        str_sign = encrypt(str_sign);
+
+        String result3= HttpRequest.post(hosts + "/kd/api/v2/action/clear_box/").body(JSON.toJSONString(Map.of("device_number",cabinetCode,"box_uid",boxUUId)))
+            .addHeaders(Map.of("timestamp",times+"","Content-Type","application/json","appid",appid,"sign",str_sign))
+            .execute().body();
+        return result3;
+    }
+
+    //清理格子(开启)
+    public static String clearCabinetBoxOpen(String cabinetCode,String boxUUId) throws Exception {
+        int times = (int) (DateUtil.date().getTime()/1000);
+        String str_sign = appid + "=" + times + "=" + appid;
+        str_sign = encrypt(str_sign);
+
+        String result3= HttpRequest.post(hosts + "/kd/api/v2/action/clear_box_open/").body(JSON.toJSONString(Map.of("device_number",cabinetCode,"box_uid",boxUUId)))
+            .addHeaders(Map.of("timestamp",times+"","Content-Type","application/json","appid",appid,"sign",str_sign))
+            .execute().body();
+        return result3;
+
+    }
+
+    // 获取取件码
+    public static String getQJM(String phone) throws Exception {
+        int times = (int) (DateUtil.date().getTime()/1000);
+        String str_sign = appid + "=" + times + "=" + appid;
+        str_sign = encrypt(str_sign);
+
+        String result3= HttpRequest.post(hosts + "/kd/api/v2/query/pick_code_by_user_mobile/").body(JSON.toJSONString(Map.of("get_user_mobile",phone)))
+            .addHeaders(Map.of("timestamp",times+"","Content-Type","application/json","appid",appid,"sign",str_sign))
+            .execute().body();
+        return result3;
+
+    }
+
+
+
+
+
+
+}

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/util/CamelDataUtil.java

@@ -19,6 +19,7 @@ import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.CacheUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.netty.pojo.NettyChannelHandlerContext;
 import org.dromara.sms4j.api.universal.RedisUtil;
@@ -78,17 +79,31 @@ public class CamelDataUtil {
 
     public void processdata(String body, Exchange exchange) throws UnsupportedEncodingException {
         Map<String,String> o = exchange.getMessage().getHeader("mqheader", Map.class);
-        exchange.getMessage().setHeader("CamelPahoOverrideTopic","/dev/"+o.get("devtype")+"/"+o.get("devcode")+"/");
+        exchange.getMessage().setHeader("CamelPahoOverrideTopic","/dev/"+o.get("devtype")+"/0001/");
         exchange.getMessage().setBody(body.getBytes(Charset.forName("utf8")));
 //        exchange.getMessage().setBody(body);
     }
 
+    public static void setPlayList(String carNum,Object data)
+    {
+        try{
+            CacheUtils.put("playlist",carNum,data);
+        }catch (Exception e){}
+
+    }
+
 
     public void processGpsData(GpsData gpsData){
 
-        log.info("body:{}",JSONUtil.toJsonStr(gpsData));
+        try{
+            this.SendData("direct:senddev", JSONUtil.toJsonStr(gpsData), "devtype","-");
+
+        }catch (Exception e){
+
+        }
         gpsDataService.insertData(gpsData);
 
+        gpsData.setTs(DateUtils.getNowDate());
         //缓存最新数据到redis
         RedisUtils.setCacheObject(StringUtils.format("gps_{}", gpsData.getDevicecode()), gpsData);
 
@@ -136,10 +151,12 @@ public class CamelDataUtil {
                                     try{
                                         JSONArray lines = JSONUtil.parseObj(scheduleVo.getPathInfo()).getJSONArray("pathLine");
                                         List<JSONObject> lines1 = new ArrayList<>();
+                                        String text = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.car.text");
                                         RedisUtils.setCacheObject(StringUtils.format("car_{}_{}_current_station",carInfoVo1.getCarNum(),DateFormatUtils.format( scheduleVo.getScheduleDate(),DateUtils.YYYYMMDDHHMMSS)),"");
                                         for (JSONObject jsonObject : lines.toList(JSONObject.class)) {
                                             double distance =  DistanceCalculator.calculateDistance(jsonObject.getStr("location"),StringUtils.format("{},{}", gpsData.getLng(),gpsData.getLat()));
                                             String configdistance = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.car.distance");
+
                                             if(Double.parseDouble(configdistance)>distance){
                                                 String stations = RedisUtils.getCacheObject(StringUtils.format("car_{}_{}_current_station",carInfoVo1.getCarNum(),DateFormatUtils.format( scheduleVo.getScheduleDate(),DateUtils.YYYYMMDDHHMMSS)));
                                                 RedisUtils.setCacheObject(StringUtils.format("car_{}_{}_current_station",carInfoVo1.getCarNum(),DateFormatUtils.format( scheduleVo.getScheduleDate(),DateUtils.YYYYMMDDHHMMSS)),stations+","+jsonObject.getStr("stationName"));
@@ -210,9 +227,16 @@ public class CamelDataUtil {
 
 
                                                 //满足条件播报（led or 广播）
-                                                String message = StringUtils.format("{}即将到达{}，即将到达，请准备接货。", carInfoVo1.getCarNum(),stations.get(0).getDictLabel());
+                                                String message = StringUtils.format(text, carInfoVo1.getCarNum(),stations.get(0).getDictLabel());
                                                 if(StringUtils.isNotEmpty(stations.get(0).getRemark())){
                                                     List<JSONObject> devicedatas = JSONUtil.parseArray( stations.get(0).getRemark()).toList(JSONObject.class);
+                                                    Map<String,String> o = new HashMap<>();
+                                                    o.put("station",stations.get(0).getDictLabel());
+                                                    o.put("time",DateUtil.now());
+                                                    o.put("type",carInfoVo1.getCarType());
+                                                    o.put("carNum",carInfoVo1.getCarNum());
+                                                    o.put("msg",message);
+                                                    CamelDataUtil.setPlayList(carInfoVo1.getCarNum(),o);
                                                     for (JSONObject i :devicedatas) {
                                                         if(i.getStr("type").equals("led")){
                                                             MessageUtils.sendLed(i.getStr("code"), message);
@@ -237,6 +261,87 @@ public class CamelDataUtil {
                                         log.error("---------------------");
                                     }
                                 }
+                            }else{
+                                //无路线无排班车辆
+
+                                String configdistance = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.car5.distance");
+                                String configtime = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.car5.time");
+                                String text = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.car5.text");
+                                if(StrUtil.isEmptyIfStr(configdistance)) configdistance="500";
+                                if(StrUtil.isEmptyIfStr(configtime)) configtime="180000";
+                                //查询所有站点经纬
+                                SysDictDataBo bo =new SysDictDataBo();
+                                bo.setDictType("tbl_sites");
+                                List<SysDictDataVo> allstations = sysDictDataService.selectDictDataList(bo);
+                                //循环计算站点与车的距离
+                                for (SysDictDataVo station : allstations){
+                                    if(station.getDictValue()!=null && StrUtil.isNotEmpty(station.getDictValue()) && station.getDictValue().contains(",")){
+                                        try{
+                                            if(DistanceCalculator.calculateDistance(station.getDictValue(),StringUtils.format("{},{}", gpsData.getLng(),gpsData.getLat()))<Integer.parseInt(configdistance)){
+                                                //在范围内
+                                                //查看是否在单位时间内播报过
+                                                Long time = RedisUtils.getCacheObject(StringUtils.format("car_{}_{}_station",carInfoVo1.getCarNum(),station.getDictCode()));
+                                                boolean canbobao = false;
+                                                if(time==null){
+                                                    //未报过
+                                                    canbobao = true;
+                                                }else{
+                                                    if(System.currentTimeMillis()-time<Integer.parseInt(configtime)){
+                                                        //在单位时间内播报过
+                                                        continue;
+                                                    }else{
+                                                        //在单位时间内未播报过
+                                                        canbobao = true;
+                                                    }
+                                                }
+                                                if(canbobao){
+                                                   String lastStationCode =  RedisUtils.getCacheObject(StringUtils.format("car_{}_last_bb_station",carInfoVo1.getCarNum()));
+                                                   if(lastStationCode!=null && lastStationCode.equals(station.getDictCode().toString())){
+                                                       canbobao = false;
+                                                   }
+                                                }
+                                                if(canbobao){
+
+                                                    //设置播报站播报时间
+                                                    RedisUtils.setCacheObject(StringUtils.format("car_{}_{}_station",carInfoVo1.getCarNum(),station.getDictCode()),DateUtil.current());
+                                                    //设置播报站
+                                                    RedisUtils.setCacheObject(StringUtils.format("car_{}_last_bb_station",carInfoVo1.getCarNum()),station.getDictCode().toString());
+
+                                                    //满足条件播报（led or 广播）
+                                                    String message = StringUtils.format(text, carInfoVo1.getCarNum(),station.getDictLabel());
+                                                    if(StringUtils.isNotEmpty(station.getRemark())){
+                                                        List<JSONObject> devicedatas = JSONUtil.parseArray( station.getRemark()).toList(JSONObject.class);
+                                                        Map<String,String> o = new HashMap<>();
+                                                        o.put("station",station.getDictLabel());
+                                                        o.put("time",DateUtil.now());
+                                                        o.put("carNum",carInfoVo1.getCarNum());
+                                                        o.put("type",carInfoVo1.getCarType());
+                                                        o.put("msg",message);
+                                                        CamelDataUtil.setPlayList(carInfoVo1.getCarNum(),o);
+                                                        for (JSONObject i :devicedatas) {
+                                                            if(i.getStr("type").equals("led")){
+                                                                MessageUtils.sendLed(i.getStr("code"), message);
+                                                            }
+                                                            if(i.getStr("type").equals("tts")){
+                                                                MessageUtils.sendTTs(i.getStr("code"), message);
+                                                            }
+                                                        }
+                                                    }
+                                                }
+
+                                            }else{
+                                                continue;
+                                            }
+
+                                        }catch (Exception e){
+                                            log.error("--------5座车计算经纬错误-------------");
+                                            log.error(e.getMessage());
+                                            log.error("-------5座车计算经纬错误--------------");
+                                        }
+                                    }
+
+                                }
+
                             }
                         }
                     }
@@ -259,7 +364,6 @@ public class CamelDataUtil {
             }
         }
 
-
         log.info("body:{}",body);
     }
 
@@ -274,8 +378,14 @@ public class CamelDataUtil {
             }
         }
         if(StrUtil.isNotEmpty(countdatastr.toString())){
-            log.info("body:{}",countdatastr);
+            try{
+                this.SendData("direct:senddev", countdatastr.toString(), "devtype","-");
+
+            }catch (Exception e){
+
+            }
             JSONObject countdata = JsonUtils.parseObject(countdatastr.toString(), JSONObject.class);
+
             String sn = countdata.getStr("sn");
             String type = countdata.getStr("type");
             Long time = countdata.getLong("time");

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/util/MessageUtils.java

@@ -1,23 +1,29 @@
 package org.dromara.util;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.system.service.ISysConfigService;
 import org.springframework.context.annotation.Import;
 
+import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Map;
 
 @Import(cn.hutool.extra.spring.SpringUtil.class)
 @Slf4j
 public class MessageUtils {
-    public static void sendLed(String devicecode,String message){
+    public static void sendLed(String devicecode,String message) throws UnsupportedEncodingException {
         if(StringUtils.isNotEmpty(devicecode)&&StringUtils.isNotEmpty(message)) {
             Map<String, String> data = new HashMap<>();
             data.put("devtype", "led");
             data.put("devcode", devicecode);
             final CamelDataUtil camelDataUtil = SpringUtil.getBean("camelDataUtil");
-            camelDataUtil.SendData("direct:sendMessage", StringUtils.format("{\"val\":\"{}\"}", message), "mqheader", data);
+            camelDataUtil.SendData("direct:sendMessage", StringUtils.format("{\"val\":\"{}\",\"id\":\"{}\"}", message,devicecode), "mqheader", data);
         }else {
             log.error("------------------");
             log.error("devicecode:"+devicecode.toString()+"     message:"+message.toString());
@@ -30,8 +36,16 @@ public class MessageUtils {
             Map<String, String> data = new HashMap<>();
             data.put("devtype", "tts");
             data.put("devcode", devicecode);
+            int vol = 1;
+            try {
+                String vols = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.tts.vol");
+                JSONObject volso =JSONUtil.parseObj(vols);
+                int hour = DateUtil.date().hour(true);
+                vol = volso.getInt(hour<10?"0"+hour:hour+"");
+            }catch (Exception e){}
+
             final CamelDataUtil camelDataUtil = SpringUtil.getBean("camelDataUtil");
-            camelDataUtil.SendData("direct:sendMessage", StringUtils.format("{\"val\":\"{}\",\"vol\":7}", message), "mqheader", data);
+            camelDataUtil.SendData("direct:sendMessage", StringUtils.format("{\"val\":\"{}\",\"vol\":"+vol+",\"id\":\"{}\"}", message,devicecode), "mqheader", data);
         }else{
             log.error("------------------");
             log.error("devicecode:"+devicecode.toString()+"     message:"+message.toString());

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.TblArticleMapper">
+
+</mapper>

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

@@ -8,6 +8,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertdata" parameterType="org.dromara.system.domain.CountData">
         INSERT INTO "${devicecode}" USING count_data TAGS (#{devicecode}, 1) VALUES (#{tslong}, #{incount}, #{outcount});
     </insert>
-
+    <select id="selectdatabydate" parameterType="java.util.Map" resultType="org.dromara.system.domain.vo.CountDataVo">
+        <![CDATA[
+        SELECT sum(incount) as incount,sum(outcount) as outcount FROM count_data WHERE ts > #{start} AND ts < #{end}
+        ]]>
+    </select>
 
 </mapper>

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

@@ -4,4 +4,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.TblGoodsOrderMapper">
 
+    <select id="selectdatabydate" parameterType="java.util.Map" resultType="java.util.Map">
+        <![CDATA[
+        SELECT count(*) as ordercount FROM tbl_goods_order WHERE create_time > #{start} AND create_time < #{end}
+        ]]>
+    </select>
 </mapper>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.TblMiniprogramMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java

@@ -11,6 +11,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Map;
 
 
 /**
@@ -85,4 +86,6 @@ public class SysDictDataVo implements Serializable {
     @ExcelProperty(value = "创建时间")
     private Date createTime;
 
+    private Map<String,Object> others;
+
 }

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

@@ -58,6 +58,9 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
         lqw.eq(StringUtils.isNotBlank(bo.getDictType()), SysDictData::getDictType, bo.getDictType());
         lqw.orderByAsc(SysDictData::getDictSort);
         lqw.orderByAsc(SysDictData::getCreateTime);
+        if(bo.getParams()!=null && bo.getParams().get("sites")!=null){
+            lqw.in(SysDictData::getDictLabel, bo.getParams().get("sites").toString().split(","));
+        }
         return lqw;
     }