diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 618f499..26d0d55 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -41,15 +41,6 @@ CONCAT('%',#{keywords},'%') - - ${paramStr} - - - CONCAT(${paramStr}) - - - CONCAT(${paramStr}) - @@ -84,10 +69,7 @@ b.CONCENCODE as "concenCode" FROM bus_concentrator b RIGHT JOIN bus_device_concentrator c ON b.id=c.CONCEN_ID where c.ACTIVE='1' and b.VALID='1' - and c.DEVICE_ID = - - - + and c.DEVICE_ID =#{devID} limit 1 @@ -96,10 +78,7 @@ w.DEEP as "depth" FROM bus_well_info w RIGHT JOIN bus_device_well c ON w.id=c.WELL_ID WHERE c.VALID='1' AND w.VALID='1' - and c.DEVICE_ID = - - - + and c.DEVICE_ID =#{devID} limit 1 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 618f499..26d0d55 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -41,15 +41,6 @@ CONCAT('%',#{keywords},'%') - - ${paramStr} - - - CONCAT(${paramStr}) - - - CONCAT(${paramStr}) - @@ -84,10 +69,7 @@ b.CONCENCODE as "concenCode" FROM bus_concentrator b RIGHT JOIN bus_device_concentrator c ON b.id=c.CONCEN_ID where c.ACTIVE='1' and b.VALID='1' - and c.DEVICE_ID = - - - + and c.DEVICE_ID =#{devID} limit 1 @@ -96,10 +78,7 @@ w.DEEP as "depth" FROM bus_well_info w RIGHT JOIN bus_device_well c ON w.id=c.WELL_ID WHERE c.VALID='1' AND w.VALID='1' - and c.DEVICE_ID = - - - + and c.DEVICE_ID =#{devID} limit 1 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConfig.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConfig.java index 4f496c4..245f54c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConfig.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConfig.java @@ -27,7 +27,7 @@ /** * 主键 */ - @TableId(value = "ID", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 设备主键