19 changed files with 153 additions and 195 deletions
-
3storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java
-
19storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java
-
2storeroom/src/main/java/com/storeroom/modules/device/controller/OutsideDevicesController.java
-
6storeroom/src/main/java/com/storeroom/modules/device/controller/RotaryCabinetController.java
-
88storeroom/src/main/java/com/storeroom/modules/device/domain/DeseCabinet.java
-
5storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java
-
4storeroom/src/main/java/com/storeroom/modules/device/domain/OperatingState.java
-
79storeroom/src/main/java/com/storeroom/modules/device/domain/RotaryCabinet.java
-
18storeroom/src/main/java/com/storeroom/modules/device/repository/OperatingStateRepository.java
-
17storeroom/src/main/java/com/storeroom/modules/device/repository/RotaryCabinetRepository.java
-
9storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java
-
9storeroom/src/main/java/com/storeroom/modules/device/service/OperatingStateService.java
-
2storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceSpecParamDto.java
-
29storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceTypeDto.java
-
4storeroom/src/main/java/com/storeroom/modules/device/service/dto/OperatingStateDto.java
-
10storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java
-
16storeroom/src/main/java/com/storeroom/modules/device/service/impl/OperatingStateImpl.java
-
11storeroom/src/main/java/com/storeroom/modules/device/service/mapstruct/DeviceTypeMapper.java
-
11storeroom/src/main/java/com/storeroom/modules/device/service/mapstruct/OperatingStateMapper.java
@ -1,88 +0,0 @@ |
|||||
package com.storeroom.modules.device.domain; |
|
||||
|
|
||||
|
|
||||
import com.storeroom.base.BaseEntity; |
|
||||
import io.swagger.annotations.ApiModelProperty; |
|
||||
import lombok.Getter; |
|
||||
import lombok.Setter; |
|
||||
|
|
||||
import javax.persistence.*; |
|
||||
import javax.validation.constraints.NotNull; |
|
||||
import java.io.Serializable; |
|
||||
import java.util.Objects; |
|
||||
|
|
||||
/** |
|
||||
* 密集架实体 |
|
||||
*/ |
|
||||
@Entity |
|
||||
@Getter |
|
||||
@Setter |
|
||||
@Table(name = "dese_cabinet") |
|
||||
public class DeseCabinet extends BaseEntity implements Serializable { |
|
||||
|
|
||||
|
|
||||
@Id |
|
||||
@Column(name = "id") |
|
||||
@NotNull(groups = Update.class) |
|
||||
@ApiModelProperty(value = "ID", hidden = true) |
|
||||
private String id; |
|
||||
|
|
||||
@OneToOne(cascade = CascadeType.ALL) |
|
||||
@JoinColumn(name = "device_info_id", referencedColumnName = "id") |
|
||||
@ApiModelProperty(value = "设备信息") |
|
||||
private DeviceInfo deviceInfo; |
|
||||
|
|
||||
|
|
||||
@Column(name = "storeroom_code") |
|
||||
@ApiModelProperty(value = "库房代码") |
|
||||
private String storeroomCode; |
|
||||
|
|
||||
|
|
||||
@Column(name = "row_No") |
|
||||
@ApiModelProperty(value = "层数") |
|
||||
private Integer rowNo; |
|
||||
|
|
||||
@Column(name = "area_No") |
|
||||
@ApiModelProperty(value = "区号") |
|
||||
private Integer areaNo; |
|
||||
|
|
||||
@Column(name = "sum_column_No") |
|
||||
@ApiModelProperty(value = "总列数") |
|
||||
private Integer sumColumnNo; |
|
||||
|
|
||||
@Column(name = "first_column_No") |
|
||||
@ApiModelProperty(value = "起始列号") |
|
||||
private Integer firstColumnNo; |
|
||||
|
|
||||
@Column(name = "part_No") |
|
||||
@ApiModelProperty(value = "节数") |
|
||||
private Integer partNo; |
|
||||
|
|
||||
|
|
||||
@Column(name = "is_notice") |
|
||||
@ApiModelProperty(value = "下发通知") |
|
||||
private Boolean isNotice; |
|
||||
|
|
||||
@Transient |
|
||||
@ApiModelProperty(value = "联动操作") |
|
||||
private OperatingState isLinkage; |
|
||||
|
|
||||
@Transient |
|
||||
@ApiModelProperty(value = "是否回调") |
|
||||
private OperatingState isCallback; |
|
||||
|
|
||||
|
|
||||
|
|
||||
@Override |
|
||||
public boolean equals(Object o) { |
|
||||
if (this == o) return true; |
|
||||
if (o == null || getClass() != o.getClass()) return false; |
|
||||
DeseCabinet that = (DeseCabinet) o; |
|
||||
return Objects.equals(id, that.id) && Objects.equals(deviceInfo, that.deviceInfo) && Objects.equals(storeroomCode, that.storeroomCode) && Objects.equals(rowNo, that.rowNo) && Objects.equals(areaNo, that.areaNo) && Objects.equals(sumColumnNo, that.sumColumnNo) && Objects.equals(firstColumnNo, that.firstColumnNo) && Objects.equals(partNo, that.partNo) && Objects.equals(isNotice, that.isNotice); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
public int hashCode() { |
|
||||
return Objects.hash(id, deviceInfo, storeroomCode, rowNo, areaNo, sumColumnNo, firstColumnNo, partNo, isNotice); |
|
||||
} |
|
||||
} |
|
@ -1,79 +0,0 @@ |
|||||
package com.storeroom.modules.device.domain; |
|
||||
|
|
||||
|
|
||||
import com.storeroom.base.BaseEntity; |
|
||||
import io.swagger.annotations.ApiModelProperty; |
|
||||
import lombok.Getter; |
|
||||
import lombok.Setter; |
|
||||
|
|
||||
import javax.persistence.*; |
|
||||
import javax.validation.constraints.NotNull; |
|
||||
import java.io.Serializable; |
|
||||
import java.util.Objects; |
|
||||
|
|
||||
@Entity |
|
||||
@Getter |
|
||||
@Setter |
|
||||
@Table(name = "rotary_cabinet") |
|
||||
public class RotaryCabinet extends BaseEntity implements Serializable { |
|
||||
|
|
||||
@Id |
|
||||
@Column(name = "id") |
|
||||
@NotNull(groups = Update.class) |
|
||||
@ApiModelProperty(value = "ID", hidden = true) |
|
||||
private String id; |
|
||||
|
|
||||
@OneToOne(cascade = CascadeType.ALL) |
|
||||
@JoinColumn(name = "device_info_id", referencedColumnName = "id") |
|
||||
@ApiModelProperty(value = "设备信息") |
|
||||
private DeviceInfo deviceInfo; |
|
||||
|
|
||||
@Column(name = "storeroom_code") |
|
||||
@ApiModelProperty(value = "库房代码") |
|
||||
private String storeroomCode; |
|
||||
|
|
||||
@Column(name = "column_row_No") |
|
||||
@ApiModelProperty(value = "每层列数") |
|
||||
private Integer columnRowNo; |
|
||||
|
|
||||
@Column(name = "device_account") |
|
||||
@ApiModelProperty(value = "设备账号") |
|
||||
private String deviceAccount; |
|
||||
|
|
||||
@Column(name = "device_password") |
|
||||
@ApiModelProperty(value = "设备密码") |
|
||||
private String devicePassword; |
|
||||
|
|
||||
@Column(name = "cupboard_No") |
|
||||
@ApiModelProperty(value = "柜号") |
|
||||
private Integer cupboardNo; |
|
||||
|
|
||||
@Column(name = "row_No") |
|
||||
@ApiModelProperty(value = "层数") |
|
||||
private String rowNo; |
|
||||
|
|
||||
@Column(name = "is_notice") |
|
||||
@ApiModelProperty(value = "下发通知") |
|
||||
private Boolean isNotice; |
|
||||
|
|
||||
@Transient |
|
||||
@ApiModelProperty(value = "联动操作") |
|
||||
private OperatingState isLinkage; |
|
||||
|
|
||||
@Transient |
|
||||
@ApiModelProperty(value = "是否回调") |
|
||||
private OperatingState isCallback; |
|
||||
|
|
||||
@Override |
|
||||
public boolean equals(Object o) { |
|
||||
if (this == o) return true; |
|
||||
if (o == null || getClass() != o.getClass()) return false; |
|
||||
RotaryCabinet that = (RotaryCabinet) o; |
|
||||
return Objects.equals(id, that.id) && Objects.equals(deviceInfo, that.deviceInfo) && Objects.equals(storeroomCode, that.storeroomCode) && Objects.equals(columnRowNo, that.columnRowNo) && Objects.equals(deviceAccount, that.deviceAccount) && Objects.equals(devicePassword, that.devicePassword) && Objects.equals(cupboardNo, that.cupboardNo) && Objects.equals(rowNo, that.rowNo) && Objects.equals(isNotice, that.isNotice) && Objects.equals(isLinkage, that.isLinkage) && Objects.equals(isCallback, that.isCallback); |
|
||||
} |
|
||||
|
|
||||
@Override |
|
||||
public int hashCode() { |
|
||||
return Objects.hash(id, deviceInfo, storeroomCode, columnRowNo, deviceAccount, devicePassword, cupboardNo, rowNo, isNotice, isLinkage, isCallback); |
|
||||
} |
|
||||
} |
|
@ -1,17 +0,0 @@ |
|||||
package com.storeroom.modules.device.repository; |
|
||||
|
|
||||
import com.storeroom.modules.device.domain.RotaryCabinet; |
|
||||
import org.springframework.data.jpa.repository.JpaRepository; |
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; |
|
||||
import org.springframework.data.jpa.repository.Query; |
|
||||
|
|
||||
import java.util.List; |
|
||||
|
|
||||
public interface RotaryCabinetRepository extends JpaRepository<RotaryCabinet,String>, JpaSpecificationExecutor<RotaryCabinet> { |
|
||||
|
|
||||
|
|
||||
@Query(value = "SELECT * FROM rotary_cabinet a JOIN device_info b ON a.device_info_id=b.id WHERE a.cupboard_No=?1 AND b.device_ip=?2 AND b.device_port=?3", nativeQuery = true) |
|
||||
List<RotaryCabinet> findIpAndPortAndAreaNo(Integer cupBoardNo, String ip, Integer port ); |
|
||||
|
|
||||
|
|
||||
} |
|
@ -0,0 +1,29 @@ |
|||||
|
package com.storeroom.modules.device.service.dto; |
||||
|
|
||||
|
|
||||
|
import lombok.Getter; |
||||
|
import lombok.Setter; |
||||
|
|
||||
|
import java.util.Objects; |
||||
|
|
||||
|
@Getter |
||||
|
@Setter |
||||
|
public class DeviceTypeDto { |
||||
|
|
||||
|
private String id; |
||||
|
|
||||
|
private String name; |
||||
|
|
||||
|
@Override |
||||
|
public boolean equals(Object o) { |
||||
|
if (this == o) return true; |
||||
|
if (o == null || getClass() != o.getClass()) return false; |
||||
|
DeviceTypeDto that = (DeviceTypeDto) o; |
||||
|
return Objects.equals(id, that.id) && Objects.equals(name, that.name); |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public int hashCode() { |
||||
|
return Objects.hash(id, name); |
||||
|
} |
||||
|
} |
@ -0,0 +1,11 @@ |
|||||
|
package com.storeroom.modules.device.service.mapstruct; |
||||
|
|
||||
|
import com.storeroom.base.BaseMapper; |
||||
|
import com.storeroom.modules.device.domain.DeviceType; |
||||
|
import com.storeroom.modules.device.service.dto.DeviceTypeDto; |
||||
|
import org.mapstruct.Mapper; |
||||
|
import org.mapstruct.ReportingPolicy; |
||||
|
|
||||
|
@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) |
||||
|
public interface DeviceTypeMapper extends BaseMapper<DeviceTypeDto, DeviceType> { |
||||
|
} |
@ -0,0 +1,11 @@ |
|||||
|
package com.storeroom.modules.device.service.mapstruct; |
||||
|
|
||||
|
import com.storeroom.base.BaseMapper; |
||||
|
import com.storeroom.modules.device.domain.OperatingState; |
||||
|
import com.storeroom.modules.device.service.dto.OperatingStateDto; |
||||
|
import org.mapstruct.Mapper; |
||||
|
import org.mapstruct.ReportingPolicy; |
||||
|
|
||||
|
@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) |
||||
|
public interface OperatingStateMapper extends BaseMapper<OperatingStateDto, OperatingState> { |
||||
|
} |
Write
Preview
Loading…
Cancel
Save
Reference in new issue