Browse Source

fix bug

master
刘力 3 years ago
parent
commit
617bb7dc81
  1. 3
      storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java
  2. 19
      storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java
  3. 2
      storeroom/src/main/java/com/storeroom/modules/device/controller/OutsideDevicesController.java
  4. 6
      storeroom/src/main/java/com/storeroom/modules/device/controller/RotaryCabinetController.java
  5. 88
      storeroom/src/main/java/com/storeroom/modules/device/domain/DeseCabinet.java
  6. 5
      storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java
  7. 4
      storeroom/src/main/java/com/storeroom/modules/device/domain/OperatingState.java
  8. 79
      storeroom/src/main/java/com/storeroom/modules/device/domain/RotaryCabinet.java
  9. 22
      storeroom/src/main/java/com/storeroom/modules/device/repository/OperatingStateRepository.java
  10. 17
      storeroom/src/main/java/com/storeroom/modules/device/repository/RotaryCabinetRepository.java
  11. 9
      storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java
  12. 9
      storeroom/src/main/java/com/storeroom/modules/device/service/OperatingStateService.java
  13. 2
      storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceSpecParamDto.java
  14. 29
      storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceTypeDto.java
  15. 4
      storeroom/src/main/java/com/storeroom/modules/device/service/dto/OperatingStateDto.java
  16. 10
      storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java
  17. 18
      storeroom/src/main/java/com/storeroom/modules/device/service/impl/OperatingStateImpl.java
  18. 11
      storeroom/src/main/java/com/storeroom/modules/device/service/mapstruct/DeviceTypeMapper.java
  19. 11
      storeroom/src/main/java/com/storeroom/modules/device/service/mapstruct/OperatingStateMapper.java

3
storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java

@ -1,6 +1,7 @@
package com.storeroom.modules.device.controller; package com.storeroom.modules.device.controller;
import com.storeroom.annotaion.rest.AnonymousGetMapping;
import com.storeroom.annotaion.rest.AnonymousPostMapping; import com.storeroom.annotaion.rest.AnonymousPostMapping;
import com.storeroom.annotaion.rest.AnonymousPutMapping; import com.storeroom.annotaion.rest.AnonymousPutMapping;
import com.storeroom.exception.BaseException; import com.storeroom.exception.BaseException;
@ -15,6 +16,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@ -50,6 +52,7 @@ public class DeseCabinetController {
} }
/** /**
* 必填字段验证 * 必填字段验证
* *

19
storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java

@ -2,7 +2,9 @@ package com.storeroom.modules.device.controller;
import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotaion.rest.AnonymousGetMapping;
import com.storeroom.exception.BaseException;
import com.storeroom.modules.device.service.DeviceService; import com.storeroom.modules.device.service.DeviceService;
import com.storeroom.modules.device.service.OperatingStateService;
import com.storeroom.utils.ApiResponse; import com.storeroom.utils.ApiResponse;
import com.storeroom.utils.StringUtils; import com.storeroom.utils.StringUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -10,6 +12,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@ -19,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
public class DeviceController { public class DeviceController {
private final DeviceService deviceService; private final DeviceService deviceService;
private final OperatingStateService operatingStateService;
@ApiOperation("通过id获取设备列表") @ApiOperation("通过id获取设备列表")
@ -36,9 +40,24 @@ public class DeviceController {
return ApiResponse.success(deviceService.queryAll(pageable)); return ApiResponse.success(deviceService.queryAll(pageable));
} }
@ApiOperation("新增获取下拉设备列表所有类型")
@AnonymousGetMapping("type")
public ApiResponse<Object> type() {
return ApiResponse.success(deviceService.getDeviceTypeAll());
}
@ApiOperation("获取储存设备列表") @ApiOperation("获取储存设备列表")
@AnonymousGetMapping("storageDevice") @AnonymousGetMapping("storageDevice")
public ApiResponse<Object> storageDevice(Pageable pageable) { public ApiResponse<Object> storageDevice(Pageable pageable) {
return ApiResponse.success(deviceService.queryStorageDeviceAll(pageable)); return ApiResponse.success(deviceService.queryStorageDeviceAll(pageable));
} }
@ApiOperation("通过id查询联动状态")
@AnonymousGetMapping("state")
public ApiResponse<Object> queryState(@RequestParam String deviceInfoId) {
if (StringUtils.isEmpty(deviceInfoId)) {
throw new BaseException("id不能为空");
}
return ApiResponse.success(operatingStateService.findById(deviceInfoId));
}
} }

2
storeroom/src/main/java/com/storeroom/modules/device/controller/OutsideDevicesController.java

@ -50,6 +50,8 @@ public class OutsideDevicesController {
} }
/** /**
* 验证必填值 * 验证必填值
* @param deviceInfoDto / * @param deviceInfoDto /

6
storeroom/src/main/java/com/storeroom/modules/device/controller/RotaryCabinetController.java

@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@ -47,7 +48,10 @@ public class RotaryCabinetController {
return ApiResponse.success(ResponseStatus.SUCCESS); return ApiResponse.success(ResponseStatus.SUCCESS);
} }
@ApiOperation("")
public ApiResponse<Object> queryState(@RequestParam String deviceInfoId){
return null;
}
/** /**
* 必填字段验证 * 必填字段验证

88
storeroom/src/main/java/com/storeroom/modules/device/domain/DeseCabinet.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);
}
}

5
storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java

@ -47,6 +47,7 @@ public class DeviceInfo extends BaseEntity implements Serializable {
@ApiModelProperty(value = "设备参数id") @ApiModelProperty(value = "设备参数id")
private DeviceSpecParam deviceSpecParamId; private DeviceSpecParam deviceSpecParamId;
@Column(name = "device_id") @Column(name = "device_id")
@ApiModelProperty(value = "第三方设备id") @ApiModelProperty(value = "第三方设备id")
private String deviceId; private String deviceId;
@ -133,11 +134,11 @@ public class DeviceInfo extends BaseEntity implements Serializable {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
DeviceInfo that = (DeviceInfo) o; 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(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(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(deviceAccount, that.deviceAccount) && Objects.equals(devicePassword, that.devicePassword) && 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);
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(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(deviceAccount, that.deviceAccount) && Objects.equals(devicePassword, that.devicePassword) && 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 @Override
public int hashCode() { public int hashCode() {
return Objects.hash(id, supplierId, storeroomId, deviceTypeId, deviceId, deviceName, deviceIp, devicePort, deviceState, rowNo, areaNo, sumColumnNo, firstColumnNo, partNo, storeroomCode, columnRowNo, deviceAccount, devicePassword, cupboardNo, videoRoute, isNotice, sequence, isLinkage, isCallback);
return Objects.hash(id, supplierId, storeroomId, deviceTypeId, deviceSpecParamId, deviceId, deviceName, deviceIp, devicePort, deviceState, rowNo, areaNo, sumColumnNo, firstColumnNo, partNo, storeroomCode, columnRowNo, deviceAccount, devicePassword, cupboardNo, videoRoute, isNotice, sequence, isLinkage, isCallback);
} }
} }

4
storeroom/src/main/java/com/storeroom/modules/device/domain/OperatingState.java

@ -53,11 +53,11 @@ public class OperatingState implements Serializable {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
OperatingState that = (OperatingState) o; OperatingState that = (OperatingState) o;
return Objects.equals(id, that.id) && Objects.equals(deviceId, that.deviceId) && Objects.equals(lend, that.lend) && Objects.equals(borrow, that.borrow) && Objects.equals(inBound, that.inBound) && Objects.equals(outBound, that.outBound);
return Objects.equals(id, that.id) && Objects.equals(deviceId, that.deviceId) && Objects.equals(stateType, that.stateType) && Objects.equals(lend, that.lend) && Objects.equals(borrow, that.borrow) && Objects.equals(inBound, that.inBound) && Objects.equals(outBound, that.outBound);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(id, deviceId, lend, borrow, inBound, outBound);
return Objects.hash(id, deviceId, stateType, lend, borrow, inBound, outBound);
} }
} }

79
storeroom/src/main/java/com/storeroom/modules/device/domain/RotaryCabinet.java

@ -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);
}
}

22
storeroom/src/main/java/com/storeroom/modules/device/repository/OperatingStateRepository.java

@ -3,9 +3,27 @@ package com.storeroom.modules.device.repository;
import com.storeroom.modules.device.domain.OperatingState; import com.storeroom.modules.device.domain.OperatingState;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
public interface OperatingStateRepository extends JpaRepository<OperatingState,String>, JpaSpecificationExecutor<OperatingState> {
import java.util.List;
OperatingState findByDeviceIdAndStateType(String deviceId,Integer stateType);
public interface OperatingStateRepository extends JpaRepository<OperatingState, String>, JpaSpecificationExecutor<OperatingState> {
/**
* 根据设备id 和状态查询
*
* @param deviceId
* @param stateType
* @return
*/
OperatingState findByDeviceIdAndStateType(String deviceId, Integer stateType);
/**
* 根据设备id查询
* @param deviceInfoId
* @return
*/
List<OperatingState> findByDeviceId(String deviceInfoId);
} }

17
storeroom/src/main/java/com/storeroom/modules/device/repository/RotaryCabinetRepository.java

@ -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 );
}

9
storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java

@ -3,6 +3,7 @@ package com.storeroom.modules.device.service;
import com.storeroom.modules.device.service.dto.DeviceInfoDto; import com.storeroom.modules.device.service.dto.DeviceInfoDto;
import com.storeroom.modules.device.service.dto.DeviceQueryCriteria; import com.storeroom.modules.device.service.dto.DeviceQueryCriteria;
import com.storeroom.modules.device.service.dto.DeviceTypeDto;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import java.util.List; import java.util.List;
@ -125,4 +126,12 @@ public interface DeviceService {
//获取储存设备列表 //获取储存设备列表
Object queryStorageDeviceAll(Pageable pageable); Object queryStorageDeviceAll(Pageable pageable);
/**
* 获取所有设备类型
* @return
*/
List<DeviceTypeDto> getDeviceTypeAll();
} }

9
storeroom/src/main/java/com/storeroom/modules/device/service/OperatingStateService.java

@ -3,6 +3,7 @@ package com.storeroom.modules.device.service;
import com.storeroom.modules.device.domain.OperatingState; import com.storeroom.modules.device.domain.OperatingState;
import com.storeroom.modules.device.service.dto.DeviceInfoDto; import com.storeroom.modules.device.service.dto.DeviceInfoDto;
import com.storeroom.modules.device.service.dto.OperatingStateDto;
import java.util.List; import java.util.List;
@ -10,4 +11,12 @@ public interface OperatingStateService {
//根据设备id和操作状态获取详细操作信息 //根据设备id和操作状态获取详细操作信息
OperatingState findByDeviceIdAndStateType(String deviceId,Integer stateType); OperatingState findByDeviceIdAndStateType(String deviceId,Integer stateType);
/**
* 根据设备id 查询设备联动状态
* @param deviceInfoId /
* @return
*/
List<Object> findById(String deviceInfoId);
} }

2
storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceSpecParamDto.java

@ -14,7 +14,7 @@ public class DeviceSpecParamDto extends BaseDTO implements Serializable {
private String id; private String id;
private DeviceInfo deviceInfoId;
private String deviceInfoId;
private String paramId; private String paramId;

29
storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceTypeDto.java

@ -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);
}
}

4
storeroom/src/main/java/com/storeroom/modules/device/service/dto/OperatingStateDto.java

@ -1,7 +1,7 @@
package com.storeroom.modules.device.service.dto; package com.storeroom.modules.device.service.dto;
import com.storeroom.modules.device.domain.DeseCabinet;
import com.storeroom.modules.device.domain.DeviceInfo;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -13,7 +13,7 @@ public class OperatingStateDto {
private String id; private String id;
private DeseCabinet deviceId;
private String deviceId;
private Integer stateType; private Integer stateType;

10
storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java

@ -5,7 +5,9 @@ import com.storeroom.modules.device.domain.*;
import com.storeroom.modules.device.repository.*; import com.storeroom.modules.device.repository.*;
import com.storeroom.modules.device.service.DeviceService; import com.storeroom.modules.device.service.DeviceService;
import com.storeroom.modules.device.service.dto.DeviceInfoDto; import com.storeroom.modules.device.service.dto.DeviceInfoDto;
import com.storeroom.modules.device.service.dto.DeviceTypeDto;
import com.storeroom.modules.device.service.mapstruct.DeviceInfoMapper; import com.storeroom.modules.device.service.mapstruct.DeviceInfoMapper;
import com.storeroom.modules.device.service.mapstruct.DeviceTypeMapper;
import com.storeroom.service.ApiService; import com.storeroom.service.ApiService;
import com.storeroom.utils.*; import com.storeroom.utils.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -29,6 +31,8 @@ public class DeviceImpl implements DeviceService {
private final DeviceInfoMapper deviceInfoMapper; private final DeviceInfoMapper deviceInfoMapper;
private final OperatingStateRepository operatingStateRepository; private final OperatingStateRepository operatingStateRepository;
private final DeviceArchivesTagRepository deviceArchivesTagRepository; private final DeviceArchivesTagRepository deviceArchivesTagRepository;
private final DeviceTypeReposityory deviceTypeReposityory;
private final DeviceTypeMapper deviceTypeMapper;
private final ApiService apiService; private final ApiService apiService;
@Override @Override
@ -351,6 +355,12 @@ public class DeviceImpl implements DeviceService {
return PageUtil.toPage(page.map(deviceInfoMapper::toDto)); return PageUtil.toPage(page.map(deviceInfoMapper::toDto));
} }
@Override
public List<DeviceTypeDto> getDeviceTypeAll() {
List<DeviceType> deviceTypeList = deviceTypeReposityory.findAll();
return deviceTypeMapper.toDto(deviceTypeList);
}
/** /**
* 生成架位左右位置 * 生成架位左右位置

18
storeroom/src/main/java/com/storeroom/modules/device/service/impl/OperatingStateImpl.java

@ -2,11 +2,17 @@ package com.storeroom.modules.device.service.impl;
import com.storeroom.modules.device.domain.OperatingState; import com.storeroom.modules.device.domain.OperatingState;
import com.storeroom.modules.device.repository.DeviceInfoRepository;
import com.storeroom.modules.device.repository.DeviceTypeReposityory;
import com.storeroom.modules.device.repository.OperatingStateRepository; import com.storeroom.modules.device.repository.OperatingStateRepository;
import com.storeroom.modules.device.service.OperatingStateService; import com.storeroom.modules.device.service.OperatingStateService;
import com.storeroom.modules.device.service.mapstruct.OperatingStateMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service @Service
@ -14,9 +20,19 @@ import org.springframework.stereotype.Service;
public class OperatingStateImpl implements OperatingStateService { public class OperatingStateImpl implements OperatingStateService {
private final OperatingStateRepository operatingStateRepository; private final OperatingStateRepository operatingStateRepository;
private final DeviceInfoRepository deviceInfoRepository;
@Override @Override
public OperatingState findByDeviceIdAndStateType(String deviceId, Integer stateType) { public OperatingState findByDeviceIdAndStateType(String deviceId, Integer stateType) {
return operatingStateRepository.findByDeviceIdAndStateType(deviceId,stateType);
return operatingStateRepository.findByDeviceIdAndStateType(deviceId, stateType);
}
@Override
public List<Object> findById(String deviceInfoId) {
List<OperatingState> operatingStateList = operatingStateRepository.findByDeviceId(deviceInfoId);
List<Object> list = new ArrayList<>(operatingStateList);
list.add(deviceInfoRepository.findById(deviceInfoId));
return list;
} }
} }

11
storeroom/src/main/java/com/storeroom/modules/device/service/mapstruct/DeviceTypeMapper.java

@ -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> {
}

11
storeroom/src/main/java/com/storeroom/modules/device/service/mapstruct/OperatingStateMapper.java

@ -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> {
}
Loading…
Cancel
Save