亳州位置汇聚

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.248.2.142: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>
-                <logstash.address>10.129.221.10:4560</logstash.address>
+                <logstash.address>53.248.2.142:4560</logstash.address>
             </properties>
         </profile>
     </profiles>

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

@@ -151,7 +151,7 @@ public class RequestHandler {
 
             long betweenS = DateUtil.between(gpsTime, new Date(), DateUnit.SECOND);
             //过期时间应该是20分钟减去设备定位时间与当前时间的差值，比如设备已经比当前时间晚15分钟了，那么设备的过期时间应该只剩5分钟了
-            long onlineTime = 60*10 - betweenS;
+            long onlineTime = 60*15 - betweenS;
 
             String deviceCode = esGpsInfoVo2.getDeviceCode();
             String deviceType = esGpsInfoVo2.getDeviceType();

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

@@ -34,9 +34,9 @@ public class RedisOnlineUserSchedule {
         List<EsGpsInfoVO2> gpsInfoVO2s = new ArrayList<>();
         for (JSONObject job : jlist) {
             String deviceType = job.getStr("deviceType");
-            if ("05".equals(deviceType)){
+            /*if ("05".equals(deviceType)){
                 continue;
-            }
+            }*/
             Integer online = job.getInt("online");
             if (0 == online){
                 continue;

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

@@ -49,4 +49,9 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
 
     List<SysDeptVo> jzDept(String updateTime);
 
+    int insertDept(SysDept dept);
+
+    int updateDept(SysDept dept);
+
+
 }

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

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.system.domain.SysDept;
 import org.dromara.system.domain.vo.SysDeptVo;
 import org.dromara.system.service.ISysDeptService;
@@ -21,6 +22,7 @@ import java.util.List;
 
 @RequiredArgsConstructor
 @RestController
+@Slf4j
 public class JzDeptSchedule {
 
     private final ISysDeptService deptService;
@@ -108,6 +110,7 @@ public class JzDeptSchedule {
     public void jzDeptNew(){
         Date time = DateUtil.offsetHour(new Date(),-1);
         List<SysDeptVo> list =  deptService.jzDpet(DateUtil.formatDateTime(time));
+        log.error("要同步警综的机构:"+list.toString());
         List<SysDeptVo> sysList =  new ArrayList<>();
         for (SysDeptVo dept : list) {
             if ("1".equals(dept.getStatus())){
@@ -115,7 +118,6 @@ public class JzDeptSchedule {
             }else {
                 dept.setStatus("1");
             }
-            dept.setShortName(dept.getDeptName());
             sysList.add(dept);
         }
         deptService.insertORUpdate(BeanUtil.copyToList(sysList, SysDept.class));

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

@@ -402,7 +402,16 @@ public class SysDeptServiceImpl implements ISysDeptService {
 
     @Override
     public boolean insertORUpdate(List<SysDept> list) {
-        List<BatchResult> batchResults = baseMapper.insertOrUpdate(list);
+        for (SysDept dept : list) {
+            SysDept d = baseMapper.selectOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getDeptId,dept.getDeptId()).last("limit 1"));
+            if(null != d){
+                dept.setDeptId(d.getDeptId());
+                baseMapper.updateDept(dept);
+            }else {
+                baseMapper.insertDept(dept);
+            }
+        }
+//        List<BatchResult> batchResults = baseMapper.insertOrUpdate(list);
         return true;
     }
 

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

@@ -70,7 +70,7 @@
         </if>
         group by SUBSTRING(zzjgdm,1,8)) a
         on SUBSTRING(d.dept_id,1,8) = SUBSTRING(a.zzjgdm,1,8)
-        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '341300000000' and dept_id like '341300%'
+        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '341600000000' and dept_id like '341600%'
 
         union
 
@@ -92,7 +92,7 @@
         </if>
         group by SUBSTRING(zzjgdm,1,6)) a
         on SUBSTRING(d.dept_id,1,6) = SUBSTRING(a.zzjgdm,1,6)
-        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '341300000000' and dept_id not like '341300%'
+        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '341600000000' and dept_id not like '341600%'
 
         union
         <!--派出所等三级四级机构-->
@@ -113,7 +113,7 @@
         </if>
         group by SUBSTRING(zzjgdm,1,8)) a
         on SUBSTRING(d.dept_id,1,8) = SUBSTRING(a.zzjgdm,1,8)
-        where `status` = '0' and del_flag =0 and is_visible = '1' and  parent_id != '341300000000' and parent_id != '0' and dept_id like '%0000'
+        where `status` = '0' and del_flag =0 and is_visible = '1' and  parent_id != '341600000000' and parent_id != '0' and dept_id like '%0000'
         <!--大队等三级四级机构-->
         UNION
         select dept_id as deptId,short_name as deptName,parent_id as parentId,IFNULL(onlineCount,0) as onlineCount,IFNULL(allCount,0) as allCount from sys_dept d
@@ -133,7 +133,7 @@
         </if>
         group by SUBSTRING(zzjgdm,1,10)) a
         on SUBSTRING(d.dept_id,1,10) = SUBSTRING(a.zzjgdm,1,10)
-        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '341300000000'  and parent_id != '0' and dept_id not like '%0000' and dept_id  like '%00'
+        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '341600000000'  and parent_id != '0' and dept_id not like '%0000' and dept_id  like '%00'
 
         union
         <!--四级机构-->
@@ -175,7 +175,7 @@
         LEFT JOIN
         (select substring(zzjgdm,1,8) as zzjgdm ,count(*) as allCount from t_device where device_type = #{deviceType} and valid =1 group by SUBSTRING(zzjgdm,1,8)) a
         on SUBSTRING(d.dept_id,1,8) = SUBSTRING(a.zzjgdm,1,8)
-        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '341300000000' and dept_id like '341300%'
+        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '341600000000' and dept_id like '341600%'
 
         union
 
@@ -187,7 +187,7 @@
         LEFT JOIN
         (select substring(zzjgdm,1,6) as zzjgdm ,count(*) as allCount from t_device where device_type = #{deviceType} and valid =1 group by SUBSTRING(zzjgdm,1,6)) a
         on SUBSTRING(d.dept_id,1,6) = SUBSTRING(a.zzjgdm,1,6)
-        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '341300000000' and dept_id not like '341300%'
+        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '341600000000' and dept_id not like '341600%'
 
         union
         <!--派出所等三级四级机构-->
@@ -198,7 +198,7 @@
         LEFT JOIN
         (select substring(zzjgdm,1,8) as zzjgdm ,count(*) as allCount from t_device where device_type = #{deviceType} and valid = 1 group by SUBSTRING(zzjgdm,1,8)) a
         on SUBSTRING(d.dept_id,1,8) = SUBSTRING(a.zzjgdm,1,8)
-        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '341300000000'  and parent_id != '0'  and dept_id like '%0000'
+        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '341600000000'  and parent_id != '0'  and dept_id like '%0000'
         <!--大队等三级四级机构-->
         UNION
         select dept_id as deptId,short_name as deptName,parent_id as parentId,IFNULL(onlineCount,0) as onlineCount,IFNULL(allCount,0) as allCount from sys_dept d
@@ -208,7 +208,7 @@
         LEFT JOIN
         (select substring(zzjgdm,1,10) as zzjgdm ,count(*) as allCount from t_device where device_type = #{deviceType} and valid = 1 group by SUBSTRING(zzjgdm,1,10)) a
         on SUBSTRING(d.dept_id,1,10) = SUBSTRING(a.zzjgdm,1,10)
-        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '341300000000'  and parent_id != '0' and dept_id not like '%0000' and dept_id  like '%00'
+        where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '341600000000'  and parent_id != '0' and dept_id not like '%0000' and dept_id  like '%00'
 
         union
         <!--四级机构-->
@@ -230,11 +230,47 @@
     </select>
 
     <select id="jzDept" resultMap="SysDeptResult">
-        select dept_id,parent_id,ancestors,dept_name,order_num,status from sys_dept
+        select dept_id,parent_id,ancestors,dept_name,short_name,order_num,status from sys_dept
         where  ancestors like '%341600000000%'
         <if test="updateTime != null and '' != updateTime ">
             and update_time >= #{updateTime}
         </if>
     </select>
 
+    <insert id="insertDept" parameterType="org.dromara.system.domain.SysDept">
+        insert into sys_dept(
+        <if test="deptId != null and deptId != ''">dept_id,</if>
+        <if test="parentId != null and parentId != ''">parent_id,</if>
+        <if test="deptName != null and deptName != ''">dept_name,</if>
+        <if test="shortName != null and shortName != ''">short_name,</if>
+        <if test="ancestors != null and ancestors != ''">ancestors,</if>
+        <if test="orderNum != null and orderNum != ''">order_num,</if>
+        <if test="status != null">status,</if>
+        create_time
+        )values(
+        <if test="deptId != null and deptId != ''">#{deptId},</if>
+        <if test="parentId != null and parentId != ''">#{parentId},</if>
+        <if test="deptName != null and deptName != ''">#{deptName},</if>
+        <if test="shortName != null and shortName != ''">#{shortName},</if>
+        <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
+        <if test="orderNum != null and orderNum != ''">#{orderNum},</if>
+        <if test="status != null">#{status},</if>
+        #{createTime}
+        )
+    </insert>
+
+    <update id="updateDept" parameterType="org.dromara.system.domain.SysDept">
+        update sys_dept
+        <set>
+            <if test="parentId != null and parentId != ''">parent_id = #{parentId},</if>
+            <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+            <if test="shortName != null and shortName != ''">short_name = #{shortName},</if>
+            <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
+            <if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            update_time = #{updateTime}
+        </set>
+        where dept_id = #{deptId}
+    </update>
+
 </mapper>

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

@@ -55,7 +55,15 @@ public class AsyncUtils {
             esGpsInfo = parseBytes(bytes);
             esGpsInfo.setDeviceType(deviceType);
             //和redis过期监听时间一定要一致
-            if (DateUtil.between(new Date(),esGpsInfo.getGpsTime(),DateUnit.MINUTE)> 10){
+            // 计算15分钟后的时间点
+            Date fifteenMinutesLater = DateUtil.offsetMinute(new Date(), 15);
+
+            if (esGpsInfo.getGpsTime().after(fifteenMinutesLater)) {
+                // GPS时间在15分钟后，属于超前数据
+                logger.error("GPS时间超前15分钟以上");
+                return;
+            }
+            if (DateUtil.between(new Date(),esGpsInfo.getGpsTime(),DateUnit.MINUTE)> 15){
                 esGpsInfo.setOnline(0);
             }else {
                 esGpsInfo.setOnline(1);
@@ -126,7 +134,7 @@ public class AsyncUtils {
         logger.error("year={},time2={}",year,time2);
         logger.error("time:"+time);
 
-        return BuilderEsGpsInfo(gpsId, lonD, latD, speed, angle, height, jingdu, (yearBE + time2));
+        return BuilderEsGpsInfo(gpsId, lonD, latD, speed, angle, height, jingdu, (year + time2));
 
 
     }
@@ -162,6 +170,7 @@ public class AsyncUtils {
         if(StringUtils.isEmpty(time)){
             logger.error("时间为空");
         }
+        logger.error("gpstime={}",time);
         Date date = null;
         try {
             date = DateUtils.parseDate(time, new String[]{"yyyy-MM-dd HH:mm:ss", "yyyyMMddHHmmss"});

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

@@ -73,8 +73,8 @@ 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.248.2.143",Integer.parseInt("10033")));
-//            Executors.newSingleThreadExecutor().execute(new UDPProcess("10.129.221.10",Integer.parseInt("10034")));
+            Executors.newSingleThreadExecutor().execute(new UDPProcess("53.248.2.143",Integer.parseInt("10034")));
         } catch (SocketException e) {
             e.printStackTrace();
         }
@@ -103,7 +103,7 @@ public class OriginalUdpReceiver implements ApplicationListener<ApplicationReady
                     String unSendData = new String(buffer,0,data.length);
                     //String sendData = bytes2hexStr(data);
                     logger.error("接收到了数据"+data);
-                    asyncUtils.saveData(data,"2");
+                    asyncUtils.saveData(data,"3");
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

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

@@ -41,10 +41,10 @@ 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.248.2.141: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=root
-db.password.0=Ycgis@2509
+db.password.0=Ycgi!2509
 
 ### the maximum retry times for push
 nacos.config.push.maxRetryTime=50