配置Modbus协议：增加能耗信息

CZT

2023-08-30 178c71496d5508dae69110f4d988cf128723d740

 igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java

@@ -1,14 +1,18 @@
package com.ld.igds.protocol.weight;

import com.alibaba.fastjson.JSONObject;
import com.ld.igds.inout.dto.InoutApiData;
import com.ld.igds.io.InoutApiService;
import com.ld.igds.inout.dto.ApiInoutData;
import com.ld.igds.inout.ApiInoutService;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.util.HttpUtils;

import lombok.extern.slf4j.Slf4j;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.stereotype.Component;

import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.FutureTask;
@@ -20,7 +24,7 @@
 */
@Slf4j
@Component
public class FzzyWeightServiceImpl implements InoutApiService {
public class FzzyWeightServiceImpl implements ApiInoutService {


    @Override
@@ -33,7 +37,7 @@
     * @return
     */
    @Override
    public InoutApiData getPlateNum(InoutApiData param) {
    public ApiInoutData getPlateNum(ApiInoutData param) {


        if (null == param.getSn()) {
@@ -87,19 +91,13 @@
     * @return
     */
    @Override
    public String reConnectLpr(InoutApiData param) {
        return "当前模式无需重置车牌识别";
    public String initLpr(ApiInoutData param) {
        return "当前模式无需初始化车牌识别";
    }

    /**
     * 不需要实现
     *
     * @param param
     * @return
     */
    @Override
    public String initLpr(InoutApiData param) {
        return "当前模式无需初始化车牌识别";
    public String lightControl(ApiInoutData param) {
        return null;
    }


@@ -110,7 +108,7 @@
     * @return
     */
    @Override
    public String gateControl(InoutApiData param) {
    public String gateControl(ApiInoutData param) {
        return null;
    }

@@ -120,8 +118,7 @@
     * @param param deviceId和actionCode 不可为空
     * @return
     */
    @Override
    public String addWhitePlate(InoutApiData param) {
    public String addWhitePlate(ApiInoutData param) {

        FutureTask<String> futureTask = new FutureTask<>(new WeightGatewayRemoteTask(param, new String[]{WeightUtil.ACTION_CODE_10}));
        ExecutorService executorService = Executors.newCachedThreadPool();
@@ -137,8 +134,7 @@
     * @param param
     * @return
     */
    @Override
    public String delWhitePlate(InoutApiData param) {
    public String delWhitePlate(ApiInoutData param) {
        FutureTask<String> futureTask = new FutureTask<>(new WeightGatewayRemoteTask(param, new String[]{WeightUtil.ACTION_CODE_11}));
        ExecutorService executorService = Executors.newCachedThreadPool();
        executorService.submit(futureTask);
@@ -154,7 +150,7 @@
     * @return
     */
    @Override
    public String noticeRadio(InoutApiData param) {
    public String noticeRadio(ApiInoutData param, InoutData data) {

        FutureTask<String> futureTask = new FutureTask<>(new WeightGatewayRemoteTask(param, new String[]{WeightUtil.ACTION_CODE_30}));
        ExecutorService executorService = Executors.newCachedThreadPool();
@@ -164,10 +160,6 @@
        return "SUCCESS";
    }

    @Override
    public String gatewayStatus(InoutApiData param) {
        return null;
    }

    /**
     * 称重完成 --调用子线程实现
@@ -175,9 +167,7 @@
     * @param param
     * @return
     */
    @Override
    public String noticeWeightDone(InoutApiData param) {

    public String noticeWeightDone(ApiInoutData param) {
        FutureTask<String> futureTask = new FutureTask<>(new WeightGatewayRemoteTask(param, new String[]{WeightUtil.ACTION_CODE_60, WeightUtil.ACTION_CODE_30}));
        ExecutorService executorService = Executors.newCachedThreadPool();
        executorService.submit(futureTask);
@@ -191,7 +181,7 @@
     * @return
     */
    @Override
    public InoutApiData getIcCardNum(InoutApiData param) {
    public ApiInoutData getIcCardNum(ApiInoutData param) {

        try {

@@ -230,4 +220,10 @@

        return param;
    }

   @Override
   public String noticeLed(ApiInoutData param, InoutData data) {
      // TODO Auto-generated method stub
      return null;
   }
}