粮情协议优化

vince

2024-04-26 b1c572949997a5d82d9b609163ff280a1c49627d

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

@@ -5,6 +5,7 @@
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiCommonDevice;
import com.fzzy.api.data.DepotType;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.gateway.GatewayUtils;
@@ -70,9 +71,11 @@

        if (null == data2.getStatus()) {
            data.setStatus(Constant.YN_Y);

            if (GatewayDeviceType.TYPE_07.equals(data2.getType())) {
                data.setStatus(Constant.YN_N);
            }

        }

        if (null == data2.getDeviceSn()) {
@@ -83,6 +86,10 @@
            }
        }

        if (null == data2.getDepotType()) {
            data2.setDepotType(DepotType.TYPE_01.getCode());
        }

        if (null == data2.getId()) {
            data2.setId(ContextUtil.getUUID());
            gatewayDeviceRep.save(data2);
@@ -91,6 +98,15 @@
        }
        flushCache();
    }

    public void updateData(GatewayDevice device) {
        device.setStatus(Constant.YN_Y);

        gatewayDeviceRep.save(device);

        flushCacheOne(device);
    }


    /**
     * gatewayDeviceService#delData
@@ -117,6 +133,10 @@
        }
    }

    private void flushCacheOne(GatewayDevice device) {
        GatewayUtils.add2Cache(device);
    }


    @Expose
    public String test() {
@@ -138,7 +158,7 @@
            device.setPort(commonDevice.getPort());
            device.setOnlineTime(new Date());
            device.setStatus(Constant.YN_Y);

            device.setDeviceSn(commonDevice.getSn());
            GatewayUtils.add2Cache(device);
        }
    }
@@ -154,4 +174,6 @@
            GatewayUtils.add2Cache(device);
        }
    }


}