update

liujie

2025-09-09 d52d4796208241c1a36b11b4e6c823a10ce4592a

update

 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/RuoYiDataInterchangeApplication.java

@@ -26,7 +26,12 @@
    
    
    public static void main(String[] args) {
        SpringApplication.run(RuoYiDataInterchangeApplication.class, args);
        System.out.println("\n(♥◠‿◠)ﾉﾞ  数据交互模块启动成功   ლ(´ڡ`ლ)ﾞ \n");
        try {
            SpringApplication.run(RuoYiDataInterchangeApplication.class, args);
            System.out.println("\n(♥◠‿◠)ﾉﾞ  数据交互模块启动成功   ლ(´ڡ`ლ)ﾞ \n");
        }catch (Exception e){
            e.printStackTrace();
        }

    }
}

 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/netty/server/NettyHandle.java

@@ -108,7 +108,6 @@
     */
    public void serviceRouting(DataType dataType, ChannelHandlerContext ctx, OuterPacket out) {
        log.debug("主链路信息交换响应({})：{}", dataType.getCode(), out);
        log.info("主链路信息交换响应({})：{}", dataType.getCode(), out);
        switch (dataType) {
            case UP_CONNECT_REQ:
                log.debug("主链路登录请求({})：{}", DataType.UP_CONNECT_REQ.getCode(), out);

 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java

@@ -155,7 +155,7 @@
     * @param warnMsg
     */
    public void up_warn_msg_adpt_info(ChannelHandlerContext ctx, int inferiorPlatformId, WarnMsg warnMsg) {
        log.info("上报报警信息cz0({})：{}",inferiorPlatformId,warnMsg);
//        log.info("上报报警信息cz0({})：{}",inferiorPlatformId,warnMsg);
        UPWarnMsgAdptInfo upWarnMsgAdptInfo = enterprise.contains(inferiorPlatformId) ? new UPWarnMsgAdptInfo().decode2(warnMsg) : new UPWarnMsgAdptInfo().decode1(warnMsg);
        upWarnMsgAdptInfo.setResult(0x00);
        upWarnMsgAdptInfo.setInferiorPlatformId(inferiorPlatformId);
@@ -179,16 +179,16 @@
                }
                break;
            case 17235341:
                log.info("上报报警信息cz88888({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
//                log.info("上报报警信息cz88888({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
                if(!cz_warnType.contains(upWarnMsgAdptInfo.getWarnType())){
                    log.info("上报报警信息czcontains({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
//                    log.info("上报报警信息czcontains({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
                    return;
                }
                break;
            case 82296583:
                log.info("上报报警信息cz88888({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
//                log.info("上报报警信息cz88888({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
                if(!cz_warnType.contains(upWarnMsgAdptInfo.getWarnType())){
                    log.info("上报报警信息czcontains({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
//                    log.info("上报报警信息czcontains({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());

                    return;
                }
@@ -204,10 +204,10 @@
                }
                break;
        }
        log.info("上报报警信息555555({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
//        log.info("上报报警信息555555({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
        try {
        if(0 == upWarnMsgAdptInfo.getLongitude()){
            log.info("上报报警信息6666666({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
//            log.info("上报报警信息6666666({})：{}:{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo),upWarnMsgAdptInfo.getWarnType());
            UPExgMsgRealLocation upExgMsgRealLocation = upExgMsgRealLocationDao.findByVehicleNoOrderByCreateTimeDesc(upWarnMsgAdptInfo.getVehicleNo());
            if (null != upExgMsgRealLocation) {
                GnssData gnssData = upExgMsgRealLocation.getGnssData();
@@ -216,7 +216,7 @@
                upWarnMsgAdptInfo.setLatitude(gnssData.getLat());
            }
        }
        log.info("上报报警信息333333");
//        log.info("上报报警信息333333");

            upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo);
        }catch (Exception e){
@@ -224,8 +224,8 @@
            log.info("上报报警信息保存失败{}",e.getMessage());
        }

        log.info("上报报警信息2({})：{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo));
		
//        log.info("上报报警信息2({})：{}", DataType.UP_WARN_MSG_ADPT_INFO.getCode(), JSON.toJSONString(upWarnMsgAdptInfo));

        //请求报警附件（川标协议）
        if(enterprise.contains(inferiorPlatformId)){
            DOWNWarnMsgFileListReq downWarnMsgFileListReq = new DOWNWarnMsgFileListReq();

 ruoyi-service/ruoyi-dataInterchange/src/main/resources/logback.xml

@@ -211,11 +211,11 @@
    <springProfile name="prod">
        <root level="info">
            <!-- 生产环境最好不配置console写文件 -->
            <appender-ref ref="DEBUG_FILE" />
            <appender-ref ref="INFO_FILE" />
            <appender-ref ref="WARN_FILE" />
            <appender-ref ref="ERROR_FILE" />
            <appender-ref ref="ALL_FILE" />
<!--            <appender-ref ref="DEBUG_FILE" />-->
<!--            <appender-ref ref="INFO_FILE" />-->
<!--            <appender-ref ref="WARN_FILE" />-->
<!--            <appender-ref ref="ERROR_FILE" />-->
<!--            <appender-ref ref="ALL_FILE" />-->
        </root>
    </springProfile>