diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java index 8039759..5510f62 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java @@ -132,6 +132,19 @@ @Transactional public Boolean bindDevice(Integer doorId, List inDeviceIds, List outDeviceIds) { Door door = this.selectById(doorId); + // 删除原有绑定关系 + EntityWrapper query = new EntityWrapper(); + query.eq("DOOR_CODE",door.getDoorCode()); + List oldBindList = deviceService.selectList(query); + if(ToolUtil.isNotEmpty(oldBindList)) { + for (Device device : oldBindList) { + device.setDoorCode(null); + device.setInoutType(null); + } + deviceService.updateBatchById(oldBindList); + } + + //进门设备 if(ToolUtil.isNotEmpty(inDeviceIds)){ for (Integer inDeviceId : inDeviceIds) { diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java index 8039759..5510f62 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java @@ -132,6 +132,19 @@ @Transactional public Boolean bindDevice(Integer doorId, List inDeviceIds, List outDeviceIds) { Door door = this.selectById(doorId); + // 删除原有绑定关系 + EntityWrapper query = new EntityWrapper(); + query.eq("DOOR_CODE",door.getDoorCode()); + List oldBindList = deviceService.selectList(query); + if(ToolUtil.isNotEmpty(oldBindList)) { + for (Device device : oldBindList) { + device.setDoorCode(null); + device.setInoutType(null); + } + deviceService.updateBatchById(oldBindList); + } + + //进门设备 if(ToolUtil.isNotEmpty(inDeviceIds)){ for (Integer inDeviceId : inDeviceIds) { diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java index 0326b9f..92f0b13 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -2,6 +2,7 @@ import java.io.Serializable; +import com.baomidou.mybatisplus.enums.FieldStrategy; import com.baomidou.mybatisplus.enums.IdType; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; @@ -16,7 +17,7 @@ /** *

- * + * *

* * @author 123 @@ -57,12 +58,12 @@ /** * 门编号 */ - @TableField("DOOR_CODE") + @TableField(value = "DOOR_CODE", strategy = FieldStrategy.IGNORED) private String doorCode; /** * 进出类型(1:进门;0:出门) */ - @TableField("INOUT_TYPE") + @TableField(value = "INOUT_TYPE", strategy = FieldStrategy.IGNORED) private String inoutType; /** diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java index 8039759..5510f62 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/DoorServiceImpl.java @@ -132,6 +132,19 @@ @Transactional public Boolean bindDevice(Integer doorId, List inDeviceIds, List outDeviceIds) { Door door = this.selectById(doorId); + // 删除原有绑定关系 + EntityWrapper query = new EntityWrapper(); + query.eq("DOOR_CODE",door.getDoorCode()); + List oldBindList = deviceService.selectList(query); + if(ToolUtil.isNotEmpty(oldBindList)) { + for (Device device : oldBindList) { + device.setDoorCode(null); + device.setInoutType(null); + } + deviceService.updateBatchById(oldBindList); + } + + //进门设备 if(ToolUtil.isNotEmpty(inDeviceIds)){ for (Integer inDeviceId : inDeviceIds) { diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java index 0326b9f..92f0b13 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -2,6 +2,7 @@ import java.io.Serializable; +import com.baomidou.mybatisplus.enums.FieldStrategy; import com.baomidou.mybatisplus.enums.IdType; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; @@ -16,7 +17,7 @@ /** *

- * + * *

* * @author 123 @@ -57,12 +58,12 @@ /** * 门编号 */ - @TableField("DOOR_CODE") + @TableField(value = "DOOR_CODE", strategy = FieldStrategy.IGNORED) private String doorCode; /** * 进出类型(1:进门;0:出门) */ - @TableField("INOUT_TYPE") + @TableField(value = "INOUT_TYPE", strategy = FieldStrategy.IGNORED) private String inoutType; /** diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 2ea44e2..4860ee4 100644 --- a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.FieldStrategy; import com.baomidou.mybatisplus.enums.IdType; import lombok.Data; @@ -53,12 +54,12 @@ /** * 门编号 */ - @TableField("DOOR_CODE") + @TableField(value = "DOOR_CODE", strategy = FieldStrategy.IGNORED) private String doorCode; /** * 进出类型(1:进门;0:出门) */ - @TableField("INOUT_TYPE") + @TableField(value = "INOUT_TYPE", strategy = FieldStrategy.IGNORED) private String inoutType; /**