修改device实体类

jinpengyong

2021-09-15 f502917e38fa5817aee2452fa7b1f9331269f0c8

修改device实体类

 screen-api/src/main/java/com/moral/api/entity/Device.java

@@ -78,6 +78,11 @@
    private Integer organizationId;

    /**
     * 国控站/省控站/县控站标示，与gov_monitor_point中guid对应
     */
    private String guid;

    /**
     * 设备型号id
     */
    private Integer deviceVersionId;

 screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java

@@ -48,7 +48,7 @@
        this.mac = mac;
        this.specialDevice = (SpecialDevice) redisTemplate.opsForHash().get(RedisConstants.SPECIAL_DEVICE_INFO, mac);
        //获取设备地区对应的AQI用于补偿使用
        Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
        /*Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
        Map<String, Object> orgInfo = (Map<String, Object>) deviceInfo.get("organization");
        String areaCode = String.valueOf(orgInfo.get("areaCode"));
        String cityCode = String.valueOf(orgInfo.get("cityCode"));
@@ -58,7 +58,7 @@
                this.regionAqi = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
        } catch (Exception e) {
            e.printStackTrace();
        }
        }*/
        sockets.add(this);
    }


 screen-api/src/main/resources/mapper/DeviceMapper.xml

@@ -14,6 +14,7 @@
        <result column="operate_ids" property="operateIds"/>
        <result column="monitor_point_id" property="monitorPointId"/>
        <result column="organization_id" property="organizationId"/>
        <result column="guid" property="guid"/>
        <result column="device_version_id" property="deviceVersionId"/>
        <result column="profession" property="profession"/>
        <result column="tech" property="tech"/>

 screen-job/src/main/java/com/moral/api/entity/Device.java

@@ -75,6 +75,11 @@
    private Integer organizationId;

    /**
     * 国控站/省控站/县控站标示，与gov_monitor_point中guid对应
     */
    private String guid;

    /**
     * 设备型号id
     */
    private Integer deviceVersionId;

 screen-job/src/main/resources/mapper/DeviceMapper.xml

@@ -14,6 +14,7 @@
        <result column="operate_ids" property="operateIds"/>
        <result column="monitor_point_id" property="monitorPointId"/>
        <result column="organization_id" property="organizationId"/>
        <result column="guid" property="guid"/>
        <result column="device_version_id" property="deviceVersionId"/>
        <result column="profession" property="profession"/>
        <result column="tech" property="tech"/>