diff --git a/src/main/java/com/zg/project/information/domain/DeviceInfo.java b/src/main/java/com/zg/project/information/domain/DeviceInfo.java index 3ee8495..92debfd 100644 --- a/src/main/java/com/zg/project/information/domain/DeviceInfo.java +++ b/src/main/java/com/zg/project/information/domain/DeviceInfo.java @@ -8,6 +8,10 @@ import com.zg.framework.web.domain.BaseEntity; /** * 设备信息对象 device_info * + * ✅ 大小仓模型： + * - device_info 只落库：warehouse_code（小仓编码） + * - parentWarehouseCode / parentWarehouseName 仅联查展示 & 查询过滤，不落库 + * * @author zg * @date 2025-04-14 */ @@ -25,19 +29,26 @@ public class DeviceInfo extends BaseEntity { @Excel(name = "设备端口") private Long port; - /** 所属仓库ID */ -// @Excel(name = "所属仓库ID") - private String warehouseId; + /** ✅ 所属小仓编码（落库字段） */ + private String warehouseCode; - /** 所属场景ID */ -// @Excel(name = "所属场景ID") + /** 所属场景编码（落库字段） */ private String sceneId; - /** 仓库名称（非数据库字段） */ - @Excel(name = "仓库名称") + /** ======= 非数据库字段 ======= */ + + /** ✅ 所属大仓编码（仅查询过滤/展示，不落库） */ + private String parentWarehouseCode; + + /** 大仓名称（联查字段） */ + @Excel(name = "大仓名称") + private String parentWarehouseName; + + /** 小仓名称（联查字段） */ + @Excel(name = "小仓名称") private String warehouseName; - /** 场景名称（非数据库字段） */ + /** 场景名称（联查字段） */ @Excel(name = "场景名称") private String sceneName; @@ -45,70 +56,37 @@ public class DeviceInfo extends BaseEntity { @Excel(name = "是否删除", readConverterExp = "0=否,1=是") private String isDelete; - // Getter & Setter - public void setDeviceId(Long deviceId) { - this.deviceId = deviceId; - } + // ===== Getter & Setter ===== - public Long getDeviceId() { - return deviceId; - } + public Long getDeviceId() { return deviceId; } + public void setDeviceId(Long deviceId) { this.deviceId = deviceId; } - public void setIpAddress(String ipAddress) { - this.ipAddress = ipAddress; - } + public String getIpAddress() { return ipAddress; } + public void setIpAddress(String ipAddress) { this.ipAddress = ipAddress; } - public String getIpAddress() { - return ipAddress; - } + public Long getPort() { return port; } + public void setPort(Long port) { this.port = port; } - public void setPort(Long port) { - this.port = port; - } + public String getWarehouseCode() { return warehouseCode; } + public void setWarehouseCode(String warehouseCode) { this.warehouseCode = warehouseCode; } - public Long getPort() { - return port; - } + public String getSceneId() { return sceneId; } + public void setSceneId(String sceneId) { this.sceneId = sceneId; } - public void setWarehouseId(String warehouseId) { - this.warehouseId = warehouseId; - } + public String getParentWarehouseCode() { return parentWarehouseCode; } + public void setParentWarehouseCode(String parentWarehouseCode) { this.parentWarehouseCode = parentWarehouseCode; } - public String getWarehouseId() { - return warehouseId; - } + public String getParentWarehouseName() { return parentWarehouseName; } + public void setParentWarehouseName(String parentWarehouseName) { this.parentWarehouseName = parentWarehouseName; } - public void setSceneId(String sceneId) { - this.sceneId = sceneId; - } + public String getWarehouseName() { return warehouseName; } + public void setWarehouseName(String warehouseName) { this.warehouseName = warehouseName; } - public String getSceneId() { - return sceneId; - } + public String getSceneName() { return sceneName; } + public void setSceneName(String sceneName) { this.sceneName = sceneName; } - public void setWarehouseName(String warehouseName) { - this.warehouseName = warehouseName; - } - - public String getWarehouseName() { - return warehouseName; - } - - public void setSceneName(String sceneName) { - this.sceneName = sceneName; - } - - public String getSceneName() { - return sceneName; - } - - public void setIsDelete(String isDelete) { - this.isDelete = isDelete; - } - - public String getIsDelete() { - return isDelete; - } + public String getIsDelete() { return isDelete; } + public void setIsDelete(String isDelete) { this.isDelete = isDelete; } @Override public String toString() { @@ -116,9 +94,11 @@ public class DeviceInfo extends BaseEntity { .append("deviceId", getDeviceId()) .append("ipAddress", getIpAddress()) .append("port", getPort()) - .append("warehouseId", getWarehouseId()) - .append("sceneId", getSceneId()) + .append("warehouseCode", getWarehouseCode()) + .append("parentWarehouseCode", getParentWarehouseCode()) + .append("parentWarehouseName", getParentWarehouseName()) .append("warehouseName", getWarehouseName()) + .append("sceneId", getSceneId()) .append("sceneName", getSceneName()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) diff --git a/src/main/resources/mybatis/information/DeviceInfoMapper.xml b/src/main/resources/mybatis/information/DeviceInfoMapper.xml index fc01374..4aea779 100644 --- a/src/main/resources/mybatis/information/DeviceInfoMapper.xml +++ b/src/main/resources/mybatis/information/DeviceInfoMapper.xml @@ -2,21 +2,25 @@ + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -24,88 +28,129 @@ d.device_id, d.ip_address, d.port, - d.warehouse_id, + d.warehouse_code, d.scene_id, - w.warehouse_name AS warehouse_name, - s.scene_name AS scene_name, + + w.warehouse_name, + w.parent_warehouse_code, + w.parent_warehouse_name, + + s.scene_name, + d.create_by, d.create_time, d.update_by, d.update_time, d.is_delete FROM device_info d - LEFT JOIN warehouse_info w ON d.warehouse_id = w.warehouse_code - LEFT JOIN scene_mapping s ON d.scene_id = s.scene_code + LEFT JOIN warehouse_info w + ON d.warehouse_code = w.warehouse_code + LEFT JOIN scene_mapping_bak s + ON d.scene_id = s.scene_code - + + - and d.ip_address = #{ipAddress} - and d.port = #{port} - and d.warehouse_id = #{warehouseId} - and d.scene_id = #{sceneId} - and d.is_delete = #{isDelete} + + + + AND d.is_delete = #{isDelete} + + + AND d.is_delete = '0' + + + + + AND d.ip_address = #{ipAddress} + + + + AND d.port = #{port} + + + AND d.warehouse_code = #{warehouseCode} + + + + AND w.parent_warehouse_code = #{parentWarehouseCode} + + + + AND d.scene_id = #{sceneId} + + + ORDER BY d.device_id DESC - WHERE d.device_id = #{deviceId} - - insert into device_info - - device_id, - ip_address, - port, - warehouse_id, - scene_id, - create_by, - create_time, - update_by, - update_time, - is_delete, - - - #{deviceId}, - #{ipAddress}, - #{port}, - #{warehouseId}, - #{sceneId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{isDelete}, - + + + INSERT INTO device_info ( + ip_address, + port, + warehouse_code, + scene_id, + create_by, + create_time, + update_by, + update_time, + is_delete + ) VALUES ( + #{ipAddress}, + #{port}, + #{warehouseCode}, + #{sceneId}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + #{isDelete} + '0' + + ) - - update device_info + + + UPDATE device_info - ip_address = #{ipAddress}, + ip_address = #{ipAddress}, port = #{port}, - warehouse_id = #{warehouseId}, - scene_id = #{sceneId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, + warehouse_code = #{warehouseCode}, + scene_id = #{sceneId}, + update_by = #{updateBy}, update_time = #{updateTime}, - is_delete = #{isDelete}, + is_delete = #{isDelete}, - where device_id = #{deviceId} + WHERE device_id = #{deviceId} - - delete from device_info where device_id = #{deviceId} + + DELETE FROM device_info WHERE device_id = #{deviceId} - - delete from device_info where device_id in + + DELETE FROM device_info + WHERE device_id IN #{deviceId} + diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml index c8f9e36..e1879c9 100644 --- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml @@ -1052,7 +1052,9 @@ AND ri.cangku = #{warehouseCode} - + + AND wh.parent_warehouse_code = #{parentWarehouseCode} + AND ri.rk_time = ]]> #{startTime}