diff --git a/common/pom.xml b/common/pom.xml index ea5394a..8924963 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -37,6 +37,7 @@ org.apache.httpcomponents httpclient + com.belerweb pinyin4j diff --git a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java index aac402d..122475c 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java @@ -1,6 +1,7 @@ package com.storeroom.modules.device.controller; +import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotaion.rest.AnonymousPostMapping; import com.storeroom.annotaion.rest.AnonymousPutMapping; import com.storeroom.exception.BaseException; @@ -15,6 +16,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @@ -50,6 +52,16 @@ public class DeseCabinetController { } + @ApiOperation("通过id查询密集架") + @AnonymousGetMapping("query") + public ApiResponse query(@RequestParam String deviceInfoId) { + if (StringUtils.isEmpty(deviceInfoId)) { + throw new BaseException("id不能为空"); + } + + return ApiResponse.success(deviceService.findByDeseCabinetAndRotary(deviceInfoId)); + } + /** * 必填字段验证 diff --git a/storeroom/src/main/java/com/storeroom/modules/device/controller/RotaryCabinetController.java b/storeroom/src/main/java/com/storeroom/modules/device/controller/RotaryCabinetController.java index 709936e..977bad6 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/controller/RotaryCabinetController.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/controller/RotaryCabinetController.java @@ -1,6 +1,7 @@ package com.storeroom.modules.device.controller; +import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotaion.rest.AnonymousPostMapping; import com.storeroom.annotaion.rest.AnonymousPutMapping; import com.storeroom.exception.BaseException; @@ -48,6 +49,16 @@ public class RotaryCabinetController { return ApiResponse.success(ResponseStatus.SUCCESS); } + @ApiOperation("通过id查询回转柜") + @AnonymousGetMapping("query") + public ApiResponse query(@RequestParam String deviceInfoId) { + if (StringUtils.isEmpty(deviceInfoId)) { + throw new BaseException("id不能为空"); + } + + return ApiResponse.success(deviceService.findByDeseCabinetAndRotary(deviceInfoId)); + } + @ApiOperation("") public ApiResponse queryState(@RequestParam String deviceInfoId){ return null; diff --git a/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java b/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java index 94f4516..88bba99 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java @@ -79,11 +79,44 @@ public class DeviceInfo extends BaseEntity implements Serializable { @ApiModelProperty(value = "设备密码") private String devicePassword; + @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 = "storeroom_code") + @ApiModelProperty(value = "库房代码") + private String storeroomCode; + + @Column(name = "column_row_No") + @ApiModelProperty(value = "列数") + private Integer columnRowNo; + + @Column(name = "cupboard_No") + @ApiModelProperty(value = "柜号") + private Integer cupboardNo; + @Column(name = "video_route") @ApiModelProperty("视频频道") private String videoRoute; + @Column(name = "is_notice") @ApiModelProperty(value = "下发通知") private Boolean isNotice; @@ -105,11 +138,11 @@ public class DeviceInfo extends BaseEntity implements Serializable { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; DeviceInfo that = (DeviceInfo) o; - return Objects.equals(id, that.id) && Objects.equals(supplierId, that.supplierId) && Objects.equals(storeroomId, that.storeroomId) && Objects.equals(deviceTypeId, that.deviceTypeId) && Objects.equals(deviceSpecParamId, that.deviceSpecParamId) && Objects.equals(deviceId, that.deviceId) && Objects.equals(deviceName, that.deviceName) && Objects.equals(deviceIp, that.deviceIp) && Objects.equals(devicePort, that.devicePort) && Objects.equals(deviceState, that.deviceState) && Objects.equals(deviceAccount, that.deviceAccount) && Objects.equals(devicePassword, that.devicePassword) && Objects.equals(videoRoute, that.videoRoute) && Objects.equals(isNotice, that.isNotice) && Objects.equals(sequence, that.sequence) && Objects.equals(isLinkage, that.isLinkage) && Objects.equals(isCallback, that.isCallback); + return Objects.equals(id, that.id) && Objects.equals(supplierId, that.supplierId) && Objects.equals(storeroomId, that.storeroomId) && Objects.equals(deviceTypeId, that.deviceTypeId) && Objects.equals(deviceSpecParamId, that.deviceSpecParamId) && Objects.equals(deviceId, that.deviceId) && Objects.equals(deviceName, that.deviceName) && Objects.equals(deviceIp, that.deviceIp) && Objects.equals(devicePort, that.devicePort) && Objects.equals(deviceState, that.deviceState) && Objects.equals(deviceAccount, that.deviceAccount) && Objects.equals(devicePassword, that.devicePassword) && 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(storeroomCode, that.storeroomCode) && Objects.equals(columnRowNo, that.columnRowNo) && Objects.equals(cupboardNo, that.cupboardNo) && Objects.equals(videoRoute, that.videoRoute) && Objects.equals(isNotice, that.isNotice) && Objects.equals(sequence, that.sequence) && Objects.equals(isLinkage, that.isLinkage) && Objects.equals(isCallback, that.isCallback); } @Override public int hashCode() { - return Objects.hash(id, supplierId, storeroomId, deviceTypeId, deviceSpecParamId, deviceId, deviceName, deviceIp, devicePort, deviceState, deviceAccount, devicePassword, videoRoute, isNotice, sequence, isLinkage, isCallback); + return Objects.hash(id, supplierId, storeroomId, deviceTypeId, deviceSpecParamId, deviceId, deviceName, deviceIp, devicePort, deviceState, deviceAccount, devicePassword, rowNo, areaNo, sumColumnNo, firstColumnNo, partNo, storeroomCode, columnRowNo, cupboardNo, videoRoute, isNotice, sequence, isLinkage, isCallback); } } diff --git a/storeroom/src/main/java/com/storeroom/modules/device/domain/Storeroom.java b/storeroom/src/main/java/com/storeroom/modules/device/domain/Storeroom.java index c360d06..b612012 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/domain/Storeroom.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/domain/Storeroom.java @@ -20,7 +20,7 @@ import java.util.Objects; @Setter @Table(name = "storeroom") @Accessors(chain = true) -public class Storeroom extends BaseEntity implements Serializable { +public class Storeroom extends BaseEntity implements Serializable{ @Id @Column(name = "id") @@ -67,4 +67,6 @@ public class Storeroom extends BaseEntity implements Serializable { public int hashCode() { return Objects.hash(id, name, pid, remark, sort, children); } + + } diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java b/storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java index 73706d8..343da27 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java @@ -150,4 +150,11 @@ public interface DeviceService { */ List DeviceMenuTree(); + /** + * 查询密集架 + * @param deviceInfoId / + * @return / + */ + DeviceInfoDto findByDeseCabinetAndRotary(String deviceInfoId); + } diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java index 18a2344..c38162d 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java @@ -19,6 +19,7 @@ import org.springframework.util.ObjectUtils; import java.util.*; +import java.util.stream.Collectors; @Service @@ -139,13 +140,6 @@ public class DeviceImpl implements DeviceService { deviceArchivesTag.setPosition(position); deviceArchivesTag.setDeviceInfoId(deviceInfoDto.getId()); deviceArchivesTag.setPosition_name(positionName); - deviceArchivesTag.setAreaNo(deviceInfoDto.getAreaNo()); - deviceArchivesTag.setFirstColumnNo(deviceInfoDto.getFirstColumnNo()); - deviceArchivesTag.setColumnRowNo(i); - deviceArchivesTag.setPartNo(k); - deviceArchivesTag.setRowNo(n); - deviceArchivesTag.setSumColumnNo(deviceInfoDto.getSumColumnNo()); - deviceArchivesTag.setStoreroomCode(deviceInfoDto.getStoreroomCode()); deviceArchivesTagRepository.save(deviceArchivesTag); } } @@ -404,9 +398,56 @@ public class DeviceImpl implements DeviceService { List deviceInfoList2 = new ArrayList<>(); deviceInfoList2.addAll(deviceInfoList); deviceInfoList2.addAll(deviceInfoList1); + deviceInfoList2.sort((o1, o2) -> { + int diff = o1.getStoreroomId().getSort() - o2.getStoreroomId().getSort(); + if (diff > 0) { + return 1; + } else if (diff < 0) { + return -1; + } + return 0; + }); + + return deviceInfoList2.stream().sorted(Comparator.comparing(DeviceInfo::getSequence)).collect(Collectors.toList()); + } + + @Override + public DeviceInfoDto findByDeseCabinetAndRotary(String deviceInfoId) { + DeviceInfo deviceInfo = deviceInfoRepository.findById(deviceInfoId).orElseGet(DeviceInfo::new); + List operatingState = operatingStateRepository.findByDeviceId(deviceInfoId); + DeviceInfoDto deviceInfoDto = new DeviceInfoDto(); + deviceInfoDto.setId(deviceInfo.getId()); + deviceInfoDto.setDeviceName(deviceInfo.getDeviceName()); + deviceInfoDto.setDeviceIp(deviceInfo.getDeviceIp()); + deviceInfoDto.setDevicePort(deviceInfo.getDevicePort()); + deviceInfoDto.setSupplierId(deviceInfo.getSupplierId()); + deviceInfoDto.setStoreroomId(deviceInfo.getStoreroomId()); + deviceInfoDto.setSupplierId(deviceInfo.getSupplierId()); + deviceInfoDto.setDeviceAccount(deviceInfo.getDeviceAccount()); + deviceInfoDto.setDevicePassword(deviceInfo.getDevicePassword()); + deviceInfoDto.setIsNotice(deviceInfo.getIsNotice()); + operatingState.forEach(item -> { + if (item.getStateType() == 1) { + deviceInfoDto.setIsLinkage(item); + } + if (item.getStateType() == 2) { + deviceInfoDto.setIsCallback(item); + } else { + deviceInfoDto.setIsLinkage(null); + deviceInfoDto.setIsCallback(null); + } + }); + deviceInfoDto.setIsCallback(deviceInfo.getIsCallback()); + deviceInfoDto.setAreaNo(deviceInfo.getAreaNo()); + deviceInfoDto.setColumnRowNo(deviceInfo.getColumnRowNo()); + deviceInfoDto.setCupboardNo(deviceInfo.getCupboardNo()); + deviceInfoDto.setSumColumnNo(deviceInfo.getSumColumnNo()); + deviceInfoDto.setFirstColumnNo(deviceInfo.getFirstColumnNo()); + deviceInfoDto.setPartNo(deviceInfo.getPartNo()); + deviceInfoDto.setStoreroomCode(deviceInfo.getStoreroomCode()); - return deviceInfoList2; + return deviceInfoDto; } @@ -426,8 +467,9 @@ public class DeviceImpl implements DeviceService { * @return / */ private Boolean getState() { - String token = apiService.getToken(); - return token != null; +// String token = apiService.getToken(); +// return token != null; + return true; } /**