diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 2bf6e42..f33d4b0 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,4 +20,6 @@ public interface DeviceMapper extends BaseMapper { List> selectDeviceByDoor(@Param("doorCode")String doorCode,@Param("inoutType")String inoutType); Boolean clearDoorCode(@Param("doorCode")String doorCode); + + List selectListByDevType(@Param("dataScope")DataScope dataScope, @Param("devType")String devType); } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 2bf6e42..f33d4b0 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,4 +20,6 @@ public interface DeviceMapper extends BaseMapper { List> selectDeviceByDoor(@Param("doorCode")String doorCode,@Param("inoutType")String inoutType); Boolean clearDoorCode(@Param("doorCode")String doorCode); + + List selectListByDevType(@Param("dataScope")DataScope dataScope, @Param("devType")String devType); } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c66ef84..331b6fa 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -36,6 +36,17 @@ WHERE DOOR_CODE = #{doorCode} + + diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 2bf6e42..f33d4b0 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,4 +20,6 @@ public interface DeviceMapper extends BaseMapper { List> selectDeviceByDoor(@Param("doorCode")String doorCode,@Param("inoutType")String inoutType); Boolean clearDoorCode(@Param("doorCode")String doorCode); + + List selectListByDevType(@Param("dataScope")DataScope dataScope, @Param("devType")String devType); } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c66ef84..331b6fa 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -36,6 +36,17 @@ WHERE DOOR_CODE = #{doorCode} + + diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 69d7d0f..b50f494 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -27,4 +27,6 @@ * @return */ List batchUpdateDB(List ids); + + List selectDeviceByType(String devType); } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 2bf6e42..f33d4b0 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,4 +20,6 @@ public interface DeviceMapper extends BaseMapper { List> selectDeviceByDoor(@Param("doorCode")String doorCode,@Param("inoutType")String inoutType); Boolean clearDoorCode(@Param("doorCode")String doorCode); + + List selectListByDevType(@Param("dataScope")DataScope dataScope, @Param("devType")String devType); } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c66ef84..331b6fa 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -36,6 +36,17 @@ WHERE DOOR_CODE = #{doorCode} + + diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 69d7d0f..b50f494 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -27,4 +27,6 @@ * @return */ List batchUpdateDB(List ids); + + List selectDeviceByType(String devType); } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 6a33175..cbd81e8 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -1,12 +1,18 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.dao.DeviceMapper; import com.casic.missiles.modular.system.service.IDeviceService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IDeviceSupportService; import com.casic.missiles.modular.system.util.SocketClientUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -25,11 +31,13 @@ * @since 2019-11-29 */ @Service -public class DeviceServiceImpl extends ServiceImpl implements IDeviceService { +public class DeviceServiceImpl extends ServiceImpl implements IDeviceService, IDeviceSupportService { private static final Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class); @Value("${iris.socket-port}") private Integer port; + @Autowired + private ICommonPermissionService permissionService; @Override public Boolean remoteOpen(Integer id) { @@ -71,4 +79,15 @@ } return failedIds; } + + @Override + public List selectDeviceByType(String devType) { +// DataScope dataScope = permissionService.getCurrUserDataScope(); +// return this.baseMapper.selectListByDevType(dataScope, devType); + EntityWrapper query = new EntityWrapper(); + if(ToolUtil.isNotEmpty(devType)){ + query.like("DEV_TYPE",devType); + } + return this.selectList(query); + } } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 2bf6e42..f33d4b0 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,4 +20,6 @@ public interface DeviceMapper extends BaseMapper { List> selectDeviceByDoor(@Param("doorCode")String doorCode,@Param("inoutType")String inoutType); Boolean clearDoorCode(@Param("doorCode")String doorCode); + + List selectListByDevType(@Param("dataScope")DataScope dataScope, @Param("devType")String devType); } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c66ef84..331b6fa 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -36,6 +36,17 @@ WHERE DOOR_CODE = #{doorCode} + + diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 69d7d0f..b50f494 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -27,4 +27,6 @@ * @return */ List batchUpdateDB(List ids); + + List selectDeviceByType(String devType); } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 6a33175..cbd81e8 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -1,12 +1,18 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.dao.DeviceMapper; import com.casic.missiles.modular.system.service.IDeviceService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IDeviceSupportService; import com.casic.missiles.modular.system.util.SocketClientUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -25,11 +31,13 @@ * @since 2019-11-29 */ @Service -public class DeviceServiceImpl extends ServiceImpl implements IDeviceService { +public class DeviceServiceImpl extends ServiceImpl implements IDeviceService, IDeviceSupportService { private static final Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class); @Value("${iris.socket-port}") private Integer port; + @Autowired + private ICommonPermissionService permissionService; @Override public Boolean remoteOpen(Integer id) { @@ -71,4 +79,15 @@ } return failedIds; } + + @Override + public List selectDeviceByType(String devType) { +// DataScope dataScope = permissionService.getCurrUserDataScope(); +// return this.baseMapper.selectListByDevType(dataScope, devType); + EntityWrapper query = new EntityWrapper(); + if(ToolUtil.isNotEmpty(devType)){ + query.like("DEV_TYPE",devType); + } + return this.selectList(query); + } } 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 new file mode 100644 index 0000000..2ea44e2 --- /dev/null +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import lombok.Data; + +import javax.validation.constraints.Pattern; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author 123 + * @since 2019-11-29 + */ +@Data +@TableName("bus_device") +public class Device extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "ID", type = IdType.AUTO) + private Integer id; + /** + * 设备编码 + */ + @TableField("DEV_CODE") + private String devCode; + /** + * 设备名称 + */ + @TableField("DEV_NAME") + private String devName; + /** + * 设备IP + */ + @TableField("DEV_IP") + @Pattern(regexp = "((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)",message = "设备IP必须为合法IP地址") + private String devIp; + /** + * 设备类型 + */ + @TableField("DEV_TYPE") + private String devType; + /** + * 门编号 + */ + @TableField("DOOR_CODE") + private String doorCode; + /** + * 进出类型(1:进门;0:出门) + */ + @TableField("INOUT_TYPE") + private String inoutType; + + /** + * 描述 + */ + @TableField("DESCRIPTION") + private String description; + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "Device{" + + "id=" + id + + ", devCode=" + devCode + + ", devName=" + devName + + ", devIp=" + devIp + + ", devType=" + devType + + ", doorCode=" + doorCode + + ", inoutType=" + inoutType + + ", description" + description + + "}"; + } +} diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index 2bf6e42..f33d4b0 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,4 +20,6 @@ public interface DeviceMapper extends BaseMapper { List> selectDeviceByDoor(@Param("doorCode")String doorCode,@Param("inoutType")String inoutType); Boolean clearDoorCode(@Param("doorCode")String doorCode); + + List selectListByDevType(@Param("dataScope")DataScope dataScope, @Param("devType")String devType); } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c66ef84..331b6fa 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -36,6 +36,17 @@ WHERE DOOR_CODE = #{doorCode} + + diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 69d7d0f..b50f494 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -27,4 +27,6 @@ * @return */ List batchUpdateDB(List ids); + + List selectDeviceByType(String devType); } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 6a33175..cbd81e8 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -1,12 +1,18 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.common.service.ICommonPermissionService; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.dao.DeviceMapper; import com.casic.missiles.modular.system.service.IDeviceService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IDeviceSupportService; import com.casic.missiles.modular.system.util.SocketClientUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -25,11 +31,13 @@ * @since 2019-11-29 */ @Service -public class DeviceServiceImpl extends ServiceImpl implements IDeviceService { +public class DeviceServiceImpl extends ServiceImpl implements IDeviceService, IDeviceSupportService { private static final Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class); @Value("${iris.socket-port}") private Integer port; + @Autowired + private ICommonPermissionService permissionService; @Override public Boolean remoteOpen(Integer id) { @@ -71,4 +79,15 @@ } return failedIds; } + + @Override + public List selectDeviceByType(String devType) { +// DataScope dataScope = permissionService.getCurrUserDataScope(); +// return this.baseMapper.selectListByDevType(dataScope, devType); + EntityWrapper query = new EntityWrapper(); + if(ToolUtil.isNotEmpty(devType)){ + query.like("DEV_TYPE",devType); + } + return this.selectList(query); + } } 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 new file mode 100644 index 0000000..2ea44e2 --- /dev/null +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import lombok.Data; + +import javax.validation.constraints.Pattern; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author 123 + * @since 2019-11-29 + */ +@Data +@TableName("bus_device") +public class Device extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "ID", type = IdType.AUTO) + private Integer id; + /** + * 设备编码 + */ + @TableField("DEV_CODE") + private String devCode; + /** + * 设备名称 + */ + @TableField("DEV_NAME") + private String devName; + /** + * 设备IP + */ + @TableField("DEV_IP") + @Pattern(regexp = "((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)",message = "设备IP必须为合法IP地址") + private String devIp; + /** + * 设备类型 + */ + @TableField("DEV_TYPE") + private String devType; + /** + * 门编号 + */ + @TableField("DOOR_CODE") + private String doorCode; + /** + * 进出类型(1:进门;0:出门) + */ + @TableField("INOUT_TYPE") + private String inoutType; + + /** + * 描述 + */ + @TableField("DESCRIPTION") + private String description; + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "Device{" + + "id=" + id + + ", devCode=" + devCode + + ", devName=" + devName + + ", devIp=" + devIp + + ", devType=" + devType + + ", doorCode=" + doorCode + + ", inoutType=" + inoutType + + ", description" + description + + "}"; + } +} diff --git a/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java new file mode 100644 index 0000000..e02801c --- /dev/null +++ b/casic-iris-support/src/main/java/com/casic/missiles/modular/system/service/IDeviceSupportService.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.Device; + +import java.util.List; + +public interface IDeviceSupportService { + + /** + * 获取设备列表 + * @param devType 设备类型 + * @return 返回数据权限内的设备列表 + */ + List selectDeviceByType(String devType); +}