jiazx0107@163.com
2023-10-25 f01dc4edbe2c8689483787ea8e8d5ee2c54195df
四川省网关接口相关6
已修改6个文件
已添加1个文件
114 ■■■■■ 文件已修改
src/main/java/com/fzzy/api/data/GatewayDeviceProtocol.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/data/GatewayDeviceType.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/utils/RedisConst.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/gateway/entity/GatewayConf.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/gateway/entity/GatewayDevice.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/data/GatewayDeviceProtocol.java
@@ -8,9 +8,10 @@
    GRAIN_FZZY_ZH_2023("GRAIN_FZZY_ZH_2023", "粮情-风正致远控制柜协议2023"),
    DEVICE_WEIGHT_HTTP("DEVICE_WEIGHT_HTTP", "地磅-HTTP协议"),
    DEVICE_WEIGHT_TCP_YH("DEVICE_WEIGHT_TCP_YH", "地磅-耀华TCP协议"),
    DEVICE_IDCARD_HTTP("DEVICE_IDCARD_HTTP", "身份证-HTTP协议"),
    DEVICE_LED_HTTP("DEVICE_LED_HTTP", "LED-HTTP协议"),
    DEVICE_LPR_HTTP("DEVICE_LPR_HTTP", "车牌识别-HTTP协议"),
    DEVICE_LPR_SDK_HK("DEVICE_LPR_SDK_HK", "车牌识别-SDK海康"),
    DEVICE_TEST("DEVICE_TEST", "测试协议");
src/main/java/com/fzzy/api/data/GatewayDeviceType.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
package com.fzzy.api.data;
/**
 * ç½‘关设备类型
 */
public enum GatewayDeviceType {
    GRAIN_FZZY_ZH_2023("GRAIN_FZZY_ZH_2023", "粮情-风正致远控制柜协议2023"),
    DEVICE_WEIGHT_HTTP("DEVICE_WEIGHT_HTTP", "地磅-HTTP协议"),
    DEVICE_WEIGHT_TCP_YH("DEVICE_WEIGHT_TCP_YH", "地磅-耀华TCP协议"),
    DEVICE_IDCARD_HTTP("DEVICE_IDCARD_HTTP", "身份证-HTTP协议"),
    DEVICE_LED_HTTP("DEVICE_LED_HTTP", "LED-HTTP协议"),
    DEVICE_LPR_SDK_HK("DEVICE_LPR_SDK_HK", "车牌识别-SDK海康"),
    DEVICE_TEST("DEVICE_TEST", "测试协议");
    private String code;
    private String name;
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    GatewayDeviceType(String code, String name) {
        this.code = code;
        this.name = name;
    }
}
src/main/java/com/fzzy/api/utils/RedisConst.java
@@ -15,6 +15,12 @@
    /**
     * è®¾å¤‡ç¼“å­˜
     */
    public static String KYE_GATE_DEVICE = "G_DEVICE";
    /**
     * æŽ¥å£é…ç½®-单个数据单个KEY
     */
    public static String KYE_CONF = "CONF";
src/main/java/com/fzzy/gateway/entity/GatewayConf.java
@@ -52,11 +52,19 @@
    @Column(name = "gatewayHardDisk", length = 50)
    private String gatewayHardDisk;
    @PropertyDef(label = "用户名")
    @PropertyDef(label = "网关用户名")
    @Column(name = "gatewayUsername", length = 50)
    private String gatewayUsername;
    @PropertyDef(label = "网关密码")
    @Column(name = "gatewayPassword", length = 50)
    private String gatewayPassword;
    @PropertyDef(label = "省平台用户名")
    @Column(name = "username", length = 50)
    private String userName;
    @PropertyDef(label = "密码")
    @PropertyDef(label = "省平台密码")
    @Column(name = "password", length = 50)
    private String password;
src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
@@ -23,7 +23,6 @@
    @PropertyDef(label = "系统ID")
    private String id;
    @Column(name = "DEVICE_SN_", length = 50)
    @PropertyDef(label = "设备序列号")
    private String deviceSn;
@@ -65,13 +64,17 @@
    private String httpUrl;
    @PropertyDef(label = "上行协议")
    @Column(name = "pushProtocol", length = 20)
    @Column(name = "PUSH_PROTOCOL_", length = 20)
    private String pushProtocol;
    @PropertyDef(label = "同步协议")
    @Column(name = "syncProtocol", length = 20)
    @Column(name = "SYNC_PROTOCOL_", length = 20)
    private String syncProtocol;
    @PropertyDef(label = "TCP服务端口", description = "针对网关作为TCP服务时候端口")
    @Column(name = "SER_PORT_")
    private int serPort;
    @Column(name = "ORG_ID_", length = 40)
    @PropertyDef(label = "组织编码")
    private String orgId;
src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java
@@ -21,14 +21,13 @@
    @Override
    public String getWeightProtocol() {
        return GatewayDeviceProtocol.DEVICE_WEIGHT_HTTP.getCode();
        return GatewayDeviceProtocol.DEVICE_WEIGHT_TCP_YH.getCode();
    }
    @Override
    public WeightInfo syncWeightInfo(SyncReqData reqData) {
        return null;
    }
}
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -4,6 +4,8 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.RedisConst;
import com.fzzy.api.utils.RedisUtil;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;
import org.springframework.beans.BeanUtils;
@@ -17,6 +19,8 @@
    @Resource
    private GatewayDeviceRep gatewayDeviceRep;
    @Resource
    private RedisUtil redisUtil;
    /**
@@ -45,7 +49,10 @@
        if (null == data.getId()) {
            data.setId(ContextUtil.getUUID());
        }
        gatewayDeviceRep.save(data);
        flushCache();
    }
    /**
@@ -58,6 +65,36 @@
        GatewayDevice data2 = new GatewayDevice();
        BeanUtils.copyProperties(data, data2);
        gatewayDeviceRep.delete(data2);
        flushCache();
        return null;
    }
    /**
     * gatewayDeviceService#flushCache
     */
    @Expose
    public void flushCache() {
        List<GatewayDevice> list = listAll();
        if (null == list || list.isEmpty()) return;
        String key;
        for (GatewayDevice device : list) {
            key = RedisConst.buildKey(RedisConst.KYE_GATE_DEVICE, device.getDeviceId());
            redisUtil.set(key, device);
        }
    }
    /**
     * ç¼“存获取设备信息
     *
     * @param deviceId
     * @return
     */
    public GatewayDevice getCacheDevice(String deviceId) {
        String key = RedisConst.buildKey(RedisConst.KYE_GATE_DEVICE, deviceId);
        return (GatewayDevice) redisUtil.get(key);
    }
}