pom.xml

@@ -89,12 +89,12 @@
             <id>prod</id>
             <properties>
                 <profiles.active>prod</profiles.active>
-                <nacos.server>10.129.221.10:8848</nacos.server>
+                <nacos.server>53.176.146.99:8848</nacos.server>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                 <nacos.username>nacos</nacos.username>
-                <nacos.password>Ycgis!2509</nacos.password>
+                <nacos.password>nacos</nacos.password>
-                <logstash.address>10.129.221.10:4560</logstash.address>
+                <logstash.address>53.176.146.99:4560</logstash.address>
             </properties>
         </profile>
     </profiles>

stwzhj-auth/src/main/resources/logback-plus.xml

@@ -1,49 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs" />
+    <property name="log.path" value="logs/${project.artifactId}" />
-    <property name="log.file" value="auth" />
+    <property name="log.file" value="${project.artifactId}" />
-    <property name="MAX_FILE_SIZE" value="10MB" />
-    <property name="MAX_HISTORY" value="30" />
     <!-- 日志输出格式 -->
-    <!-- INFO日志Appender -->
+    <property name="console.log.pattern"
-    <appender name="FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-        <file>${log.path}/info.${log.file}.log</file>
+
+    <!-- &lt;!&ndash; 控制台输出 &ndash;&gt;
+     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+         <encoder>
+             <pattern>${console.log.pattern}</pattern>
+             <charset>utf-8</charset>
+         </encoder>
+     </appender>-->
+
+    <include resource="logback-common.xml" />
+
+    <include resource="logback-logstash.xml" />
+
+    <!-- 开启 skywalking 日志收集 -->
+    <include resource="logback-skylog.xml" />
+
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+
+        <!--如果只是想要 Info 级别的日志，只是过滤 info 还是会输出 Error 日志，因为 Error 的级别高，
+            所以我们使用下面的策略，可以避免输出 Error 的日志-->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
+            <!--过滤 Error-->
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
-            <maxHistory>${MAX_HISTORY}</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <!-- ERROR日志Appender -->
-    <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.${log.file}.log</file>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>ERROR</level>
+            <!--匹配到就禁止-->
+            <onMatch>DENY</onMatch>
+            <!--没有匹配到就允许-->
+            <onMismatch>ACCEPT</onMismatch>
         </filter>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+        <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
-            <fileNamePattern>${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+        如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天
-            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
+        的日志改名为今天的日期。即，<File> 的日志都是当天的。
-            <maxHistory>${MAX_HISTORY}</maxHistory>
+        -->
-        </rollingPolicy>
+        <File>${log.path}${log.file}</File>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+            <pattern>%date [%level] [%thread] %logger{60} [%file : %line] %msg%n</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}info/${log.file}.%d{yyyy-MM-dd}.%i.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>20</maxHistory> <!-- 保留180天 -->
+        </rollingPolicy>
+    </appender>
+
+    <!--error log-->
+    <appender name="ERRORFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!--如果只是想要 Error 级别的日志，那么需要过滤一下，默认是 info 级别的，ThresholdFilter-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>Error</level>
+        </filter>
+        <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
+        如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天
+        的日志改名为今天的日期。即，<File> 的日志都是当天的。
+        -->
+        <File>${log.path}error.${log.file}</File>
+        <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
+            <FileNamePattern>${log.path}error/${log.file}.%d{yyyy-MM-dd}.%i.gz</FileNamePattern>
+            <!--只保留最近90天的日志-->
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>180</maxHistory>
+            <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->
+            <!--<totalSizeCap>1GB</totalSizeCap>-->
+        </rollingPolicy>
+        <!--日志输出编码格式化-->
+        <encoder>
+            <charset>UTF-8</charset>
+            <pattern>%date [%level] [%thread] %logger{60} [%file : %line] %msg%n</pattern>
         </encoder>
     </appender>
 
-    <!-- 根Logger配置（禁用控制台输出） -->
-    <root level="INFO">
-        <appender-ref ref="FILE_INFO" />
-        <appender-ref ref="FILE_ERROR" />
-    </root>
 
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="ERRORFILE"/>
+    </root>
 </configuration>

stwzhj-common/stwzhj-common-dubbo/src/main/resources/common-dubbo.yml

@@ -19,31 +19,31 @@ dubbo:
     password: ${spring.cloud.nacos.password}
     parameters:
       namespace: ${spring.profiles.active}
-#  metadata-report:
-#    address: redis://${spring.data.redis.host}:${spring.data.redis.port}
-#    group: DUBBO_GROUP
-#    username: dubbo
-#    password: Ycgis@2509
-#    # 集群开关
-#    sentinel: false
-#    parameters:
-#      namespace: ${spring.profiles.active}
-#      database: ${spring.data.redis.database}
-#      timeout: ${spring.data.redis.timeout}
-#      backup: 53.176.146.98:26380,53.176.146.99:26380,53.176.146.100:26380
   metadata-report:
     address: redis://${spring.data.redis.host}:${spring.data.redis.port}
     group: DUBBO_GROUP
     username: dubbo
-    password: ${spring.data.redis.password}
+    password: ruoyi123
     # 集群开关
-    cluster: false
+    sentinel: true
     parameters:
       namespace: ${spring.profiles.active}
       database: ${spring.data.redis.database}
       timeout: ${spring.data.redis.timeout}
-      # 集群地址 cluster 为 true 生效
+      backup: 53.176.146.98:26380,53.176.146.99:26380,53.176.146.100:26380
-      backup: 127.0.0.1:6379,127.0.0.1:6381
+#  metadata-report:
+#    address: redis://${spring.data.redis.host}:${spring.data.redis.port}
+#    group: DUBBO_GROUP
+#    username: dubbo
+#    password: ${spring.data.redis.password}
+#    # 集群开关
+#    cluster: false
+#    parameters:
+#      namespace: ${spring.profiles.active}
+#      database: ${spring.data.redis.database}
+#      timeout: ${spring.data.redis.timeout}
+#      # 集群地址 cluster 为 true 生效
+#      backup: 127.0.0.1:6379,127.0.0.1:6381
   # 消费者相关配置
   consumer:
     # 结果缓存(LRU算法)

stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RedisExpireListener.java

@@ -68,9 +68,9 @@ public class RedisExpireListener extends KeyExpirationEventMessageListener {
 
                 String deviceType = split[2];
                 String deviceCode = split[3];
-                /*if ("5".equals(deviceType) || "9".equals(deviceType) || "8".equals(deviceType) || "7".equals(deviceType)){
+                if ("5".equals(deviceType) || "9".equals(deviceType) || "8".equals(deviceType) || "7".equals(deviceType)){
                     return;
-                }*/
+                }
                 log.error("redis key expired:key={}",expiredKey);
                 JSONObject object = RedisUtils.getBucket(RedisConstants.ONLINE_USERS + deviceType+":"+deviceCode);
                 if (Objects.isNull(object)) {

stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/schedule/BaseDataSchedule.java

@@ -33,13 +33,13 @@ public class BaseDataSchedule {
     @Autowired
     DSQinwuService dsQinwuService;
 
-//    @Value("${ruansi.ruansi-kafka.send-to-third-enabled}")
+    @Value("${ruansi.ruansi-kafka.send-to-third-enabled}")
     private boolean sendToThirdEnabled;
 
-//    @Value("${ruansi.ruansi-kafka.start-update-time}")
+    @Value("${ruansi.ruansi-kafka.start-update-time}")
     private String startUpdateTime;
 
-//    @Value("${ruansi.ruansi-kafka.ds-preurl}")
+    @Value("${ruansi.ruansi-kafka.ds-preurl}")
     private String dsPreurl;
     /**
      * 娱特单位抽取

stwzhj-modules/wzhj-extract/src/main/java/org/dromara/extract/controller/DeviceGPSController.java

@@ -8,7 +8,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.data2es.api.RemoteDataToEsService;
 import org.dromara.data2es.api.domain.RemoteGpsInfo;
-import org.dromara.extract.WzhjExtractApplication;
 import org.dromara.extract.domain.EsGpsInfo;
 import org.dromara.extract.exception.MyBusinessException;
 import org.dromara.extract.service.ITDeviceGpsService;
@@ -17,8 +16,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -45,7 +42,6 @@ public class DeviceGPSController {
     @Value("${ruansi.start_update_time}")
     private String startUpdateTime;
 
-    @Value("${ruansi.jly_update_time}")
     private String jlyUpdateTime;
 
     @Value("${ruansi.last_update_time}")
@@ -64,8 +60,8 @@ public class DeviceGPSController {
         return DateUtil.formatDateTime(info.getGpsTime());
     }
 
-//    @Scheduled(cron = "0/10 * * * * ?")
+    @Scheduled(cron = "0/10 * * * * ?")
-//    @Async
+    @Async
     public void bdgcGps(){
         if(StringUtils.isBlank(lastUpdateTime)){
             try {
@@ -110,8 +106,8 @@ public class DeviceGPSController {
 
     }
 
-    @Scheduled(cron = "0/5 * * * * ?")
+    @Scheduled(cron = "0/8 * * * * ?")
-//    @Async
+    @Async
     public void jlyGps(){
         if(StringUtils.isBlank(jlyUpdateTime)){
             jlyUpdateTime = startUpdateTime;
@@ -145,7 +141,7 @@ public class DeviceGPSController {
 
     }
 
-//    @Scheduled(cron = "0/30 * * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     public void jlyGpsStatus(){
         if(StringUtils.isBlank(jlyUpdateTime)){
             jlyUpdateTime = startUpdateTime;
@@ -197,12 +193,4 @@ public class DeviceGPSController {
         }
     }
 
-
-    /*public static void main(String[] args) {
-        String time = "2025-07-10T10:25:40";
-        EsGpsInfo gpsInfo = new EsGpsInfo();
-        gpsInfo.setGpsTime(DateUtil.parse(time));
-        System.out.println(gpsInfo.toString());
-    }
-*/
 }

stwzhj-modules/wzhj-extract/src/main/java/org/dromara/extract/schedule/JJDeviceSchedule.java

@@ -29,13 +29,13 @@ public class JJDeviceSchedule {
     @DubboReference
     RemoteDeviceService remoteDeviceService;
 
-//    @Value("${ruansi.start_jlyupdate_time}")
+    @Value("${ruansi.start_jlyupdate_time}")
     private String startUpdateTime;
 
     private String lastUpdateTime = "";
 
 
-//    @Scheduled(cron = "0 0/10 * * * ?")
+    @Scheduled(cron = "0 0/10 * * * ?")
     public void saveORUpdateJly(){
         if(StringUtils.isBlank(lastUpdateTime)){
             lastUpdateTime = startUpdateTime;

stwzhj-modules/wzhj-extract/src/main/java/org/dromara/extract/service/impl/TDeviceGpsServiceImpl.java

@@ -25,7 +25,6 @@ public class TDeviceGpsServiceImpl implements ITDeviceGpsService {
     }
 
     @Override
-    @DS("zfjly")
     public List<EsGpsInfo> selectJlyGPS(EsGpsInfo esGpsInfo) {
         return deviceMapper.selectJlyGPS(esGpsInfo);
     }

stwzhj-modules/wzhj-extract/src/main/resources/mapper/DeviceGpsMapper.xml

@@ -49,11 +49,11 @@
     </select>
 
     <select id="selectJlyGPS" parameterType="org.dromara.extract.domain.EsGpsInfo" resultMap="DeviceResult">
-        select indexcode deviceCode,'5' deviceType, longitude lng, latitude lat,to_timestamp(updatatime, 'YYYY-MM-DD HH24:MI:SS') gpsTime from public.mobileposition_view
+        select zdbh deviceCode,'5' deviceType, longitude lng, latitude lat,gpstime gpsTime,speed from bas_police_gps
         <where>
-            <if test="gpsTime != null "> and to_timestamp(updatatime, 'YYYY-MM-DD HH24:MI:SS') > #{gpsTime}  </if>
+            <if test="gpsTime != null "> and gpstime >= #{gpsTime}</if>
         </where>
-        order by updatatime desc
+        order by gpstime desc
     </select>
 
     <select id="selectJlyStatus" parameterType="org.dromara.extract.domain.EsGpsInfo" resultMap="DeviceResult">

stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java

@@ -252,7 +252,7 @@ public class LocationController {
         if (null != params.get("deviceType")){
             device.setDeviceType(params.get("deviceType").toString());
         }
-        if (null != params.get("zzjgdm") && !"341600000000".equals(params.get("zzjgdm").toString())){
+        if (null != params.get("zzjgdm") && !"341800000000".equals(params.get("zzjgdm").toString())){
             String[] zzjgdms = params.get("zzjgdm").toString().split(",");
             device.setZzjgdms(zzjgdms);
         }

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java

@@ -112,26 +112,32 @@ public class IndexStaticsController extends BaseController {
     * 各地市总数和在线数
     * */
     @PostMapping("/onLineBar")
-    public R onLineBar(@RequestBody TDeviceBo bo){
+    public R onLineBar(){
-        SysDeptBo deptBo = new SysDeptBo();
+        List<SysDeptVo> deptVoList = deptService.getDsList();
-        deptBo.setIsVisible("1");
+        List<DeviceStaticsVo> staticsVoList = deviceService.countByDs();
-        deptBo.setParentId(bo.getZzjgdm());
-        List<SysDeptVo> deptVoList = deptService.selectDeptList(deptBo);
         List<DeviceStaticsVo> list = new ArrayList<>(); //用来接收处理后的统计结果
         for (SysDeptVo deptVo : deptVoList) {
-            DeviceStaticsVo staticsVo = new DeviceStaticsVo();
+            boolean bl = false; //用来统计结果是否有当前这个机构
-            TDeviceBo deviceBo = new TDeviceBo();
+            for (DeviceStaticsVo staticsVo : staticsVoList) {
-            deviceBo.setZzjgdm(deptVo.getDeptId());
+                String deptId = staticsVo.getZzjgdm()+"00000000";
-            deviceBo.setValid(1);
+                if (deptId.equals(deptVo.getDeptId())){
-            DeviceRedis redis = new DeviceRedis();
+                    staticsVo.setZzjgdm(deptId);
-            redis.setZzjgdm(deptVo.getDeptId());
+                    staticsVo.setZzjgmc(deptVo.getDeptName().replaceAll("公安局",""));
-            Long co = deviceService.countByCondition(deviceBo);
+                    int onlineCo = RedisUtils.searchKeys("org_code:"+staticsVo.getZzjgdm()+"*");
-            Long online = redisService.countByZzjgdm(redis);
+                    staticsVo.setOnlineCo(onlineCo);
-            staticsVo.setZzjgdm(deptVo.getDeptId());
+                    list.add(staticsVo);
-            staticsVo.setZzjgmc(deptVo.getShortName());
+                    bl = true;
-            staticsVo.setCo(co);
+                    break;
-            staticsVo.setOnlineCo(online);
+                }
-            list.add(staticsVo);
+            }
+            if (!bl){
+                DeviceStaticsVo staticsVo = new DeviceStaticsVo();
+                staticsVo.setZzjgdm(deptVo.getDeptId());
+                staticsVo.setZzjgmc(deptVo.getDeptName().replaceAll("公安局",""));
+                staticsVo.setCo(0);
+                staticsVo.setOnlineCo(0);
+                list.add(staticsVo);
+            }
         }
         return R.ok(list);
     }

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java

@@ -15,8 +15,8 @@ public class DeviceStaticsVo implements Serializable {
 
     private String zzjgdm;
 
-    private Long co;
+    private Integer co;
 
-    private Long onlineCo;
+    private Integer onlineCo;
 
 }

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java

@@ -1,8 +1,5 @@
 package org.dromara.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.system.domain.DeviceRedis;
 import org.dromara.system.domain.vo.DeviceRedisVo;
@@ -14,6 +11,4 @@ public interface DeviceRedisMapper extends BaseMapperPlus<DeviceRedis,DeviceRedi
     int insertBatch(List<DeviceRedis> list);
 
     List<DeviceRedisVo> countByCondition(DeviceRedis redis);
-
-    Long countByzzjgdm(@Param(Constants.WRAPPER) Wrapper<DeviceRedis> queryWrapper);
 }

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java

@@ -69,21 +69,4 @@ public class DeviceRedisSchedule {
         RedisUtils.batchInsert(deviceInfoDataMap,-1);
     }
 
-    /*
-     * 定时处理记录仪基本数据 10天没有更新的设备设置为删除状态
-     * */
-//    @Scheduled(cron = "0 0 0/1  * * ?")
-    public void deleteZfjly(){
-        deviceService.deleteZfjly();
-    }
-
-
-    /*
-     * 定时删除设备状态为删除的定位信息和在线表
-     * */
-//    @Scheduled(cron = "0 0 0/1  * * ?")
-    public void removeRedis(){
-        deviceService.deleteRedis();
-    }
-
 }

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/IDeviceRedisService.java

@@ -9,6 +9,4 @@ public interface IDeviceRedisService {
     int insertBatch(List<DeviceRedis> list);
 
     List<DeviceRedisVo> countByCondition(DeviceRedis redis);
-
-    Long countByZzjgdm(DeviceRedis deviceRedis);
 }

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java

@@ -85,8 +85,4 @@ public interface ITDeviceService {
     TDeviceVo queryByDeviceCode(String deviceCode);
 
     List<TDeviceExportVo> selectDeviceExportList(TDeviceBo bo);
-
-    int deleteZfjly();
-
-    int deleteRedis();
 }

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java

@@ -1,20 +1,15 @@
 package org.dromara.system.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.dromara.system.api.RemoteDataScopeService;
 import org.dromara.system.domain.DeviceRedis;
-import org.dromara.system.domain.TDevice;
 import org.dromara.system.domain.vo.DeviceRedisVo;
 import org.dromara.system.mapper.DeviceRedisMapper;
 import org.dromara.system.service.IDeviceRedisService;
-import org.dromara.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,9 +23,6 @@ public class DeviceRedisServiceImpl implements IDeviceRedisService {
 
     private final DeviceRedisMapper baseMapper;
 
-    @DubboReference
-    private RemoteDataScopeService remoteDataScopeService;
-
     @Autowired
     SqlSessionFactory sqlSessionFactory;
 
@@ -69,13 +61,4 @@ public class DeviceRedisServiceImpl implements IDeviceRedisService {
     public List<DeviceRedisVo> countByCondition(DeviceRedis redis) {
         return baseMapper.countByCondition(redis);
     }
-
-    @Override
-    public Long countByZzjgdm(DeviceRedis deviceRedis) {
-        LambdaQueryWrapper<DeviceRedis> lqw = new LambdaQueryWrapper<>();
-        lqw.ne(DeviceRedis::getDeviceType,"9");
-        String depts = remoteDataScopeService.getDeptAndChild(deviceRedis.getZzjgdm());
-        lqw.inSql(DeviceRedis::getZzjgdm,depts);
-        return baseMapper.countByzzjgdm(lqw);
-    }
 }

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@@ -82,8 +82,8 @@ public class SysDeptServiceImpl implements ISysDeptService {
         lqw.eq(StringUtils.isNotBlank(bo.getParentId()), SysDept::getParentId, bo.getParentId());
         lqw.like(StringUtils.isNotBlank(bo.getDeptName()), SysDept::getDeptName, bo.getDeptName());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus());
-        lqw.eq(StringUtils.isNotBlank(bo.getFullName()), SysDept::getFullName, bo.getFullName());
         lqw.eq(StringUtils.isNotBlank(bo.getIsVisible()),SysDept::getIsVisible,bo.getIsVisible());
+        lqw.eq(StringUtils.isNotBlank(bo.getFullName()), SysDept::getFullName, bo.getFullName());
         lqw.orderByAsc(SysDept::getAncestors);
         lqw.orderByAsc(SysDept::getParentId);
         lqw.orderByAsc(SysDept::getOrderNum);
@@ -369,7 +369,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
 
     @Override
     public List<SysDeptVo> deviceStatics(String deviceType,String manageDeptId) {
-        if(!manageDeptId.equals("341600000000")){
+        if(!manageDeptId.equals("341300000000")){
             String subManageId = manageDeptId.substring(0,findLastNonZeroIndex(manageDeptId) + 1);
             return baseMapper.deviceStaticsByDeptId(deviceType,subManageId);
 

stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java

@@ -14,14 +14,9 @@ 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.dromara.common.redis.utils.RedisUtils;
 import org.dromara.system.api.RemoteDataScopeService;
-import org.dromara.system.domain.DeviceRedis;
 import org.dromara.system.domain.vo.DeviceStaticsVo;
 import org.dromara.system.domain.vo.TDeviceExportVo;
-import org.dromara.system.mapper.DeviceRedisMapper;
-import org.dromara.system.mapper.SysConfigMapper;
-import org.dromara.system.service.ISysConfigService;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.TDeviceBo;
 import org.dromara.system.domain.vo.TDeviceVo;
@@ -48,12 +43,6 @@ public class TDeviceServiceImpl implements ITDeviceService {
     private final TDeviceMapper baseMapper;
 
 
-    private final ISysConfigService configService;
-
-    private final DeviceRedisMapper redisMapper;
-
-    private String lastRemoveTime;
-
     @DubboReference
     private RemoteDataScopeService remoteDataScopeService;
 
@@ -131,53 +120,6 @@ public class TDeviceServiceImpl implements ITDeviceService {
         return baseMapper.selectDeviceExportList(lqw);
     }
 
-
-    /*
-    * 删除长时间未更新的执法记录仪
-    * */
-    @Override
-    public int deleteZfjly() {
-        String day = configService.selectConfigByKey("device.remove.day");
-        LambdaQueryWrapper<TDevice> lqw = new LambdaQueryWrapper<>();
-        lqw.inSql(TDevice::getDeviceType,"'5','7','8'");
-        lqw.eq(TDevice::getValid,"1");
-        lqw.le(TDevice::getUpdateTime,DateUtil.offsetDay(new Date(),Integer.getInteger(day)));
-        List<TDevice> list = baseMapper.selectList(lqw);
-        for (TDevice device : list) {
-            device.setValid(0);
-            device.setUpdateTime(DateUtil.now());
-            baseMapper.updateById(device);
-        }
-        return 0;
-    }
-
-    /*
-    * 删除状态为删除的设备定位信息和存在t_device_redis的数据
-    * */
-
-    @Override
-    public int deleteRedis() {
-        LambdaQueryWrapper<TDevice> lqw = new LambdaQueryWrapper<>();
-        lqw.gt(StringUtils.isNotBlank(lastRemoveTime),TDevice::getUpdateTime,lastRemoveTime);
-        lqw.eq(TDevice::getValid,0);
-        lqw.orderByDesc(TDevice::getUpdateTime);
-        List<TDeviceVo> list = baseMapper.selectVoList(lqw);
-        try {
-            if (list.size()>0){
-                lastRemoveTime = list.get(0).getUpdateTime();
-                for (TDeviceVo deviceVo : list) {
-                    RedisUtils.del("online_users:"+deviceVo.getDeviceType()+":"+deviceVo.getDeviceCode());
-                    LambdaQueryWrapper<DeviceRedis> dqw = new LambdaQueryWrapper<>();
-                    dqw.eq(DeviceRedis::getDeviceCode,deviceVo.getDeviceCode());
-                    redisMapper.delete(dqw);
-                }
-            }
-        }catch (Exception e){
-
-        }
-        return 0;
-    }
-
     @Override
     public TDeviceVo queryOne(TDeviceBo bo) {
         LambdaQueryWrapper<TDevice> lqw = buildQueryWrapper(bo);

stwzhj-modules/wzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml

@@ -46,9 +46,4 @@
         WHERE d.dict_type = 'zd_device_type'
     </select>
 
-    <select id="countByzzjgdm" resultType="Long">
-        select count(*) from t_device_redis
-         ${ew.getCustomSqlSegment}
-    </select>
-
 </mapper>

stwzhj-modules/wzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml

@@ -49,8 +49,8 @@
                 #{remark1},#{remark2},#{cardNum},#{createTime},#{updateTime})
         ON DUPLICATE KEY UPDATE
         police_no = values(police_no),police_name = values(police_name),phone_num = values(phone_num),
-        car_num = values(car_num),valid = '1',remark1 = values(remark1),remark2 = values(remark2),card_num = values(card_num),
+        car_num = values(car_num),valid = values(valid),remark1 = values(remark1),remark2 = values(remark2),card_num = values(card_num),
-        update_time = values(update_time)
+        update_time = now()
     </insert>
 
 </mapper>

stwzhj-modules/wzhj-udp/src/main/java/org/dromara/udp/config/AsyncUtils.java

@@ -47,25 +47,18 @@ public class AsyncUtils {
      * @throws ParseException
      */
     @Async(value = "taskExecutor")
-    public void saveData(byte[] bytes, String deviceType) {
+    public void saveData(byte[] bytes) throws Exception {
         //logger.info("当前线程名={}",Thread.currentThread().getName());
-        RemoteGpsInfo esGpsInfo = null;
+        RemoteGpsInfo esGpsInfo = parseBytes(bytes);
-        try {
+        esGpsInfo.setDeviceType("3");
-            logger.error("接收类型={}",deviceType);
+        //和redis过期监听时间一定要一致
-            esGpsInfo = parseBytes(bytes);
+        if (DateUtil.between(new Date(),esGpsInfo.getGpsTime(),DateUnit.MINUTE)> 10){
-            esGpsInfo.setDeviceType(deviceType);
+            esGpsInfo.setOnline(0);
-            //和redis过期监听时间一定要一致
+        }else {
-            if (DateUtil.between(new Date(),esGpsInfo.getGpsTime(),DateUnit.MINUTE)> 10){
+            esGpsInfo.setOnline(1);
-                esGpsInfo.setOnline(0);
-            }else {
-                esGpsInfo.setOnline(1);
-            }
-            logger.error("转换后的实体类={}",esGpsInfo.toString());
-            R response = dataEsService.saveData(esGpsInfo);
-        } catch (Exception e) {
-            e.printStackTrace();
         }
-
+        logger.error(esGpsInfo.toString());
+        R response = dataEsService.saveData(esGpsInfo);
         //logger.error("位置信息接口={},失败信息={},失败设备={}",response.getCode(),response.getMessage(),esGpsInfo.getDeviceId());
 
     }
@@ -74,7 +67,7 @@ public class AsyncUtils {
      * AA--10101010 10101010  2^15+2^13+2^11+2^9 + 170=
      * @param bytes 待解析的字节数组
      */
-    private RemoteGpsInfo parseBytes(byte[] bytes)  {
+    private RemoteGpsInfo parseBytes(byte[] bytes) throws ParseException {
 
         checkHeaderByte(bytes);
 
@@ -108,6 +101,7 @@ public class AsyncUtils {
         logger.error("jingdu:"+jingdu);
 
         long year = BitConverter.byteArrayToShort(Arrays.copyOfRange(copyByte, 44, 46), true);
+        logger.error("year:"+year);
         //月日时分秒
         byte[] sfm = Arrays.copyOfRange(copyByte, 46, 51);
         String time = singleByteToString2(sfm);
@@ -132,7 +126,7 @@ public class AsyncUtils {
      * @param time 20210616123208
      */
     private RemoteGpsInfo BuilderEsGpsInfo(String gpsId, double lonD, double latD, long speed,
-                                       long angle, long height, long jingdu, String time)  {
+                                       long angle, long height, long jingdu, String time) throws ParseException {
         RemoteGpsInfo gpsInfo = new RemoteGpsInfo();
         gpsInfo.setDeviceCode(parseGpsId(gpsId));
         gpsInfo.setDeviceType(parseDeviceType(gpsId));
@@ -147,16 +141,11 @@ public class AsyncUtils {
         return gpsInfo;
     }
 
-    private Date parseGpsTime(String time)  {
+    private Date parseGpsTime(String time) throws ParseException {
         if(StringUtils.isEmpty(time)){
-            logger.error("时间为空");
+            throw new MyBusinessException("时间为空");
-        }
-        Date date = null;
-        try {
-            date = DateUtils.parseDate(time, new String[]{"yyyy-MM-dd HH:mm:ss", "yyyyMMddHHmmss"});
-        } catch (ParseException e) {
-            e.printStackTrace();
         }
+        Date date = DateUtils.parseDate(time, new String[]{"yyyy-MM-dd HH:mm:ss", "yyyyMMddHHmmss"});
         return date;
 
     }
@@ -177,7 +166,7 @@ public class AsyncUtils {
      * @return
      */
     private String parseDeviceType(String gpsId) {
-//        checkGpsId(gpsId);
+        checkGpsId(gpsId);
         return gpsId;
     }
 
@@ -196,13 +185,12 @@ public class AsyncUtils {
      * @return gpsId
      */
     private String parseGpsId(String gpsId) {
-//        checkGpsId(gpsId); 公车的id长度大于8
+        checkGpsId(gpsId);
         return gpsId;
     }
 
     private void checkGpsId(String gpsId) {
         if(gpsId.length() != 8){
-            logger.error("gpsId为空");
             throw new MyBusinessException("gpsId为空");
         }
     }

stwzhj-modules/wzhj-udp/src/main/java/org/dromara/udp/controller/OriginalUdpReceiver.java

@@ -23,7 +23,10 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.net.*;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetSocketAddress;
+import java.net.SocketException;
 import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Date;
@@ -73,16 +76,14 @@ public class OriginalUdpReceiver implements ApplicationListener<ApplicationReady
     public void onApplicationEvent(ApplicationReadyEvent event) {
         logger.info("原生方式启动");
         try {
-//            Executors.newSingleThreadExecutor().execute(new UDPProcess("10.129.221.10",Integer.parseInt("10033")));
+//            Executors.newSingleThreadExecutor().execute(new UDPProcess("53.238.79.4",Integer.parseInt("10013")));
-            Executors.newSingleThreadExecutor().execute(new UDPProcess("10.129.221.10",Integer.parseInt("10034")));
+            Executors.newSingleThreadExecutor().execute(new UDPProcess("53.176.146.100",Integer.parseInt("10013")));
         } catch (SocketException e) {
             e.printStackTrace();
         }
-
     }
 
 
-
     class UDPProcess implements Runnable {
         DatagramSocket socket = null;
 
@@ -100,10 +101,18 @@ public class OriginalUdpReceiver implements ApplicationListener<ApplicationReady
                 try {
                     socket.receive(packet);
                     byte[] data = packet.getData();
+
                     String unSendData = new String(buffer,0,data.length);
                     //String sendData = bytes2hexStr(data);
-                    logger.error("接收到了数据"+data);
+                    logger.error("接收到了数据："+data);
-                    asyncUtils.saveData(data,"3");
+                    asyncUtils.saveData(data);
+                    /*taskExecutor.execute(() -> {
+                        try {
+                            saveData(data);
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    });*/
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceSchedule.java

@@ -85,8 +85,8 @@ public class DeviceSchedule {
                 Timestamp updateTime = originDevice.getUpdateTime();
 //                DateTime dateTime = DateUtil.offsetHour(updateTime, 13);
                 newDevice.setUpdateTime(DateUtil.formatDateTime(updateTime) );
-                newDevice.setZzjgdm("341600000000");
+                newDevice.setZzjgdm("341300000000");
-                newDevice.setZzjgmc("亳州市公安局");
+                newDevice.setZzjgmc("宿州市公安局");
 //                setZzjgdm(newDevice,originDevice);
 
             }

stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties

@@ -41,9 +41,9 @@ db.num=1
 
 ### Connect URL of DB:
 #db.url.0=jdbc:mysql://127.0.0.1:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
-db.url.0=jdbc:mysql://10.129.221.10:3306/wzhj-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+db.url.0=jdbc:mysql://53.176.146.102:3306/wzhj-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
 db.user.0=root
-db.password.0=Ycgis@2509
+db.password.0=Ycgis!2509
 
 ### the maximum retry times for push
 nacos.config.push.maxRetryTime=50

wzhj-gateway/src/main/resources/logback-plus.xml

@@ -1,49 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs" />
+    <property name="log.path" value="logs/${project.artifactId}" />
-    <property name="log.file" value="gateway" />
+    <property name="log.file" value="${project.artifactId}" />
-    <property name="MAX_FILE_SIZE" value="10MB" />
-    <property name="MAX_HISTORY" value="30" />
     <!-- 日志输出格式 -->
-    <!-- INFO日志Appender -->
+    <property name="console.log.pattern"
-    <appender name="FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-        <file>${log.path}/info.${log.file}.log</file>
+
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+
-            <level>INFO</level>
+    <!-- 控制台输出 -->
-            <onMatch>ACCEPT</onMatch>
+    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <onMismatch>DENY</onMismatch>
+        <file>${log.path}/console.log</file>
-        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
+            <!-- 日志最大 1天 -->
-            <maxHistory>${MAX_HISTORY}</maxHistory>
+            <maxHistory>1</maxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>${log.pattern}</pattern>
+            <charset>utf-8</charset>
         </encoder>
-    </appender>
-
-    <!-- ERROR日志Appender -->
-    <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.${log.file}.log</file>
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>ERROR</level>
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
         </filter>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+    </appender>
-            <fileNamePattern>${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+
-            <maxFileSize>${MAX_FILE_SIZE}</maxFileSize>
+
-            <maxHistory>${MAX_HISTORY}</maxHistory>
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        </rollingPolicy>
+
+        <!--如果只是想要 Info 级别的日志，只是过滤 info 还是会输出 Error 日志，因为 Error 的级别高，
+            所以我们使用下面的策略，可以避免输出 Error 的日志-->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!--过滤 Error-->
+            <level>ERROR</level>
+            <!--匹配到就禁止-->
+            <onMatch>DENY</onMatch>
+            <!--没有匹配到就允许-->
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
+        <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
+        如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天
+        的日志改名为今天的日期。即，<File> 的日志都是当天的。
+        -->
+        <File>${log.path}${log.file}</File>
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+            <pattern>%date [%level] [%thread] %logger{60} [%file : %line] %msg%n</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}info/${log.file}.%d{yyyy-MM-dd}.%i.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>20</maxHistory> <!-- 保留180天 -->
+        </rollingPolicy>
+    </appender>
+
+    <!--error log-->
+    <appender name="ERRORFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!--如果只是想要 Error 级别的日志，那么需要过滤一下，默认是 info 级别的，ThresholdFilter-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>Error</level>
+        </filter>
+        <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
+        如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天
+        的日志改名为今天的日期。即，<File> 的日志都是当天的。
+        -->
+        <File>${log.path}error.${log.file}</File>
+        <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
+            <FileNamePattern>${log.path}error/${log.file}.%d{yyyy-MM-dd}.%i.gz</FileNamePattern>
+            <!--只保留最近90天的日志-->
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>180</maxHistory>
+            <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->
+            <!--<totalSizeCap>1GB</totalSizeCap>-->
+        </rollingPolicy>
+        <!--日志输出编码格式化-->
+        <encoder>
+            <charset>UTF-8</charset>
+            <pattern>%date [%level] [%thread] %logger{60} [%file : %line] %msg%n</pattern>
         </encoder>
     </appender>
 
-    <!-- 根Logger配置（禁用控制台输出） -->
-    <root level="INFO">
-        <appender-ref ref="FILE_INFO" />
-        <appender-ref ref="FILE_ERROR" />
-    </root>
 
+    <include resource="logback-logstash.xml" />
+
+    <!-- 开启 skywalking 日志收集 -->
+    <include resource="logback-skylog.xml" />
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="ERRORFILE"/>
+        <appender-ref ref="file_console"/>
+    </root>
 </configuration>