四川省网关接口相关8

jiazx0107@163.com

2023-10-26 57ce50108ffe8d85f9508529dbffea0c064c44a2

四川省网关接口相关8

 src/main/java/com/fzzy/gateway/GatewayRunner.java

@@ -23,10 +23,6 @@
    @Override
    public void run(String... args) throws Exception {
        log.info("网关接口随系统启动------------");


        //四川网关接口，启动默认获取鉴权信息，长期有效
        apiInitService.init();
    }

}

 src/main/java/com/fzzy/gateway/GatewayUtils.java

@@ -11,7 +11,6 @@
public class GatewayUtils {



    /**
     * è®¾å¤‡åœ¨çº¿æ ‡è®°ï¼Œé’ˆå¯¹WEBSocket请求，控制设备是否在线，key = deviceId，Value=Y/N
     */
@@ -47,8 +46,6 @@
        cacheMapDeviceId.remove(data.getDeviceId());
        cacheMapDeviceSn.remove(data.getDeviceSn());
    }



    public static void updateOnline(String deviceId) {
        contextOnlineMap.put(deviceId, "Y");

 src/main/java/com/fzzy/gateway/hx2023/ScConstant.java

@@ -8,5 +8,7 @@
    public static String API_URL_AUTH = "${auth}/authorize/login";


    public static String MESSAGE_TYPE_REPORT_PROPERTY = "REPORT_PROPERTY";


}

 src/main/java/com/fzzy/gateway/hx2023/data/WeightInfo.java

@@ -8,10 +8,7 @@
@Data
public class WeightInfo {


    private String deviceId;

    private boolean exceed;
    private boolean exceed = false;

    private Double grossWeight;


 src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java

@@ -1,11 +1,14 @@
package com.fzzy.gateway.hx2023.service;

import com.alibaba.fastjson2.JSONObject;
import com.fzzy.api.data.GatewayProtocol;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.WebSocketPacket;
import com.fzzy.gateway.hx2023.data.WebSocketPacketHeader;
import com.fzzy.gateway.hx2023.data.WeightInfo;
import com.fzzy.gateway.hx2023.websocket.WebSocketDeviceReport;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -38,17 +41,32 @@

            WebSocketPacket packet = new WebSocketPacket();

            //productId的值在webSocket执行发送方法中补充
            WebSocketPacketHeader header = new WebSocketPacketHeader();
            header.setDeviceName(device.getDeviceName());
            packet.setHeaders(header);
            packet.setMessageType("");
            packet.setMessageType(ScConstant.MESSAGE_TYPE_REPORT_PROPERTY);
            packet.setDeviceId(device.getDeviceId());
            packet.setProperties(null);

            //设置信息主体
            WeightInfo weightInfo = new WeightInfo();
            weightInfo.setGrossWeight(weigh);
            weightInfo.setNetWeight(weigh);
            weightInfo.setNetWeight(weigh);

            JSONObject jsonObject = new JSONObject();
            jsonObject.put("weightInfo", JSONObject.toJSONString(weightInfo));

            packet.setProperties(jsonObject);

            packet.setTimestamp(System.currentTimeMillis());


            webSocketDeviceReport.sendByPacket(packet);
        }

        if (GatewayProtocol.GATE_MQTT.equals(device.getPushProtocol())) {
            //TODO ---->>>后期添加支持
        }

        return null;

 src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLprImpl1.java

@@ -1,6 +1,5 @@
package com.fzzy.gateway.hx2023.service;

import com.fzzy.gateway.api.GatewaySyncLedService;
import com.fzzy.gateway.api.GatewaySyncLprService;
import com.fzzy.gateway.hx2023.data.LprData;
import com.fzzy.gateway.hx2023.data.SyncReqData;

 src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java

ÎļþÒÑɾ³ý

 src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceLed.java

@@ -13,8 +13,9 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;


/**
 *
 * ç½‘关接受系统发送的报文信息
 */
@Slf4j
@Component
@@ -113,6 +114,4 @@
            }
        }
    }


}

 src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceReport.java

@@ -2,7 +2,6 @@

import com.alibaba.fastjson.JSONObject;
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.WebSocketPacket;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -15,7 +14,7 @@
import java.util.concurrent.ConcurrentHashMap;

/**
 *
 * è®¾å¤‡æ¢å¤ä¿¡æ¯çš„WEBSOCKET
 */
@Slf4j
@Component
@@ -103,7 +102,6 @@
            return;
        }


        String tag = packet.getDeviceId();

        // éåŽ†æŽ¨é€
@@ -115,10 +113,12 @@

            packet.getHeaders().setProductId(productId);


            log.debug("----------返回信息-----{}", packet);

            if (key.indexOf(tag) != -1) {
                session = sessionPool.get(key);
                session.getAsyncRemote().sendText(
                        JSONObject.toJSONString(packet));
                session.getAsyncRemote().sendText(JSONObject.toJSONString(packet));
            }
        }
    }

 src/main/java/com/fzzy/gateway/service/DeviceWeightServiceTest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
package com.fzzy.gateway.service;


import com.fzzy.api.data.GatewayDeviceProtocol;
import com.fzzy.gateway.api.GatewaySyncWeightService;
import com.fzzy.gateway.hx2023.data.SyncReqData;
import com.fzzy.gateway.hx2023.data.WeightInfo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;


/**
 * è®¾å¤‡é»˜è®¤åè®®ï¼Œä»€ä¹ˆéƒ½ä¸åš
 */
@Slf4j
@Component
public class DeviceWeightServiceTest implements GatewaySyncWeightService {


    @Override
    public String getWeightProtocol() {
        return GatewayDeviceProtocol.DEVICE_TEST.getCode();
    }

    @Override
    public WeightInfo syncWeightInfo(SyncReqData reqData) {

        log.info("----------DO NOTHING---------");
        return null;
    }
}

 src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml

@@ -270,7 +270,11 @@
              <Property name="property">password</Property>
              <Editor/>
            </AutoFormElement>
            <Control/>
            <AutoFormElement>
              <Property name="name">provinceProtocol</Property>
              <Property name="property">provinceProtocol</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">pushProtocol</Property>
              <Property name="property">pushProtocol</Property>

 src/main/java/com/fzzy/order/OrderServer.java

@@ -27,7 +27,6 @@
     * @param req
     * @return
     */
    @SuppressWarnings("unchecked")
    @ResponseBody
    @RequestMapping("/order")
    public OrderResp order(@RequestBody OrderReq<JSONObject> req){

 src/main/java/com/fzzy/protocol/sdkhk/package-info.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
/**
 * é€šè¿‡SDK获取海康摄像头信息
 */
package com.fzzy.protocol.sdkhk;

 src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java

@@ -3,10 +3,8 @@
import com.fzzy.api.utils.BytesUtil;
import com.fzzy.api.utils.SpringUtil;
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.service.HxGatewaySyncWeightImpl1;
import com.ld.io.api.IoMsgConsumer;
import com.ld.io.api.IoSession;
import lombok.extern.slf4j.Slf4j;
@@ -48,7 +46,7 @@
        timeTag = System.currentTimeMillis();

        String temp = strMsg.substring(2, 4);
        String symbol = HexASCIIToConvert(temp);
        //String symbol = HexASCIIToConvert(temp);
        temp = strMsg.substring(4, 16);
        String w = HexASCIIToConvert(temp);
        temp = strMsg.substring(16, 18);

 src/main/java/com/fzzy/protocol/weightyh/package-info.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
/**
 * å½“前包为耀华协议相关的地磅通过TCP-IP的通讯方式获取地磅重量信的Server服务
 */
package com.fzzy.protocol.weightyh;