From 7fca8d806cffd8451e88b86cecc29107b6cc5a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Mon, 25 Jul 2022 14:47:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E5=90=88=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/DeviceController.java | 31 ++++++++ .../device/domain/AlarmDeseCaBinetLog.java | 73 +++++++++++++++++++ .../AlarmDeseCaBinetLogRepository.java | 8 ++ .../modules/device/service/DeviceService.java | 9 +++ .../device/service/impl/DeviceImpl.java | 9 ++- 5 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 storeroom/src/main/java/com/storeroom/modules/device/domain/AlarmDeseCaBinetLog.java create mode 100644 storeroom/src/main/java/com/storeroom/modules/device/repository/AlarmDeseCaBinetLogRepository.java diff --git a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java index c5809f1..ac3736c 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java @@ -1,9 +1,12 @@ package com.storeroom.modules.device.controller; +import com.fasterxml.jackson.annotation.JsonProperty; import com.storeroom.annotaion.rest.AnonymousDeleteMapping; import com.storeroom.annotaion.rest.AnonymousGetMapping; +import com.storeroom.annotaion.rest.AnonymousPostMapping; import com.storeroom.exception.BaseException; +import com.storeroom.modules.device.domain.AlarmDeseCaBinetLog; import com.storeroom.modules.device.service.ArchivesCasesService; import com.storeroom.modules.device.service.DeviceService; import com.storeroom.modules.device.service.OperatingStateService; @@ -20,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.HashMap; +import java.util.Map; import java.util.Set; @RestController @@ -81,4 +86,30 @@ public class DeviceController { deviceService.Delete(deviceInfoId); return ApiResponse.success(ResponseStatus.SUCCESS); } + + //第三方文档功能：平台是否跟密集架连接 + @ApiOperation("第三方对接-返回通信状态") + @AnonymousPostMapping("getdDevStatus") + public Object getdDevStatus(@RequestBody String id) { + Map objectMap = new HashMap<>(); + objectMap.put("ret", "true"); + objectMap.put("data", ""); + objectMap.put("msg", "success"); + return objectMap; + } + + @ApiOperation("第三方对接-上传密集架报警信息") + @AnonymousPostMapping("log") + public Object deseCabinetAlarmLog(@RequestBody AlarmDeseCaBinetLog alarmDeseCaBinetLog) { + + deviceService.upLoadAlarmLog(alarmDeseCaBinetLog); + Map objectMap = new HashMap<>(); + objectMap.put("code", ""); + objectMap.put("errorinfo", ""); + objectMap.put("protocal", 1004); + objectMap.put("result", ""); + return objectMap; + } + + } diff --git a/storeroom/src/main/java/com/storeroom/modules/device/domain/AlarmDeseCaBinetLog.java b/storeroom/src/main/java/com/storeroom/modules/device/domain/AlarmDeseCaBinetLog.java new file mode 100644 index 0000000..d479b16 --- /dev/null +++ b/storeroom/src/main/java/com/storeroom/modules/device/domain/AlarmDeseCaBinetLog.java @@ -0,0 +1,73 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Objects; + +@Entity +@Getter +@Setter +@Table(name = "alarm_desecabinet_log") +public class AlarmDeseCaBinetLog implements Serializable { + @Id + @Column(name = "id") + @NotNull(groups = BaseEntity.Update.class) + @ApiModelProperty(value = "报警信息id", hidden = true) + private String id; + + @Column(name = "store_code") + @ApiModelProperty(value = "库房代码") + private String storeCode; + + @Column(name = "qu_No") + @ApiModelProperty(value = "区号") + private String QuNo; + + @Column(name = "ui_log_id") + @ApiModelProperty(value = "0") + private String uiLogID; + + + @Column(name = "us_log_type") + @ApiModelProperty(value = "1") + private String usLogType; + + @Column(name = "us_level") + @ApiModelProperty(value = "等级：0为操作 1 为报警") + private String usLevel; + + @Column(name = "i64Ts") + @ApiModelProperty(value = "时间戳") + private String i64Ts; + + @Column(name = "c_context") + @ApiModelProperty(value = "日志信息") + private String cContext; + + @Column(name = "ipicturedata") + @ApiModelProperty(value = "图片路径") + private String iPicturedata; + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + AlarmDeseCaBinetLog that = (AlarmDeseCaBinetLog) o; + return Objects.equals(id, that.id) && Objects.equals(storeCode, that.storeCode) && Objects.equals(QuNo, that.QuNo) && Objects.equals(uiLogID, that.uiLogID) && Objects.equals(usLogType, that.usLogType); + } + + @Override + public int hashCode() { + return Objects.hash(id, storeCode, QuNo, uiLogID, usLogType); + } +} diff --git a/storeroom/src/main/java/com/storeroom/modules/device/repository/AlarmDeseCaBinetLogRepository.java b/storeroom/src/main/java/com/storeroom/modules/device/repository/AlarmDeseCaBinetLogRepository.java new file mode 100644 index 0000000..7b354f3 --- /dev/null +++ b/storeroom/src/main/java/com/storeroom/modules/device/repository/AlarmDeseCaBinetLogRepository.java @@ -0,0 +1,8 @@ +package com.storeroom.modules.device.repository; + +import com.storeroom.modules.device.domain.AlarmDeseCaBinetLog; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +public interface AlarmDeseCaBinetLogRepository extends JpaRepository, JpaSpecificationExecutor { +} 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 343da27..75dd537 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 @@ -1,6 +1,7 @@ package com.storeroom.modules.device.service; +import com.storeroom.modules.device.domain.AlarmDeseCaBinetLog; import com.storeroom.modules.device.domain.DeviceInfo; import com.storeroom.modules.device.service.dto.DeviceInfoDto; import com.storeroom.modules.device.service.dto.DeviceTypeDto; @@ -157,4 +158,12 @@ public interface DeviceService { */ DeviceInfoDto findByDeseCabinetAndRotary(String deviceInfoId); + + /** + * 第三方对接-上传报警以及操作日志接口 + * @param alarmDeseCaBinetLog / + * @return / + */ + void upLoadAlarmLog(AlarmDeseCaBinetLog alarmDeseCaBinetLog); + } 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 c38162d..d2748cd 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 @@ -33,7 +33,7 @@ public class DeviceImpl implements DeviceService { private final DeviceArchivesTagRepository deviceArchivesTagRepository; private final DeviceTypeReposityory deviceTypeReposityory; private final DeviceTypeMapper deviceTypeMapper; - private final ApiService apiService; + private final AlarmDeseCaBinetLogRepository alarmDeseCaBinetLogRepository; @Override public Object queryStoreroomAndDevice(String storeroomId, String deviceTypeId, Pageable pageable) { @@ -450,6 +450,13 @@ public class DeviceImpl implements DeviceService { return deviceInfoDto; } + @Override + @Transactional(rollbackFor = Exception.class) + public void upLoadAlarmLog(AlarmDeseCaBinetLog alarmDeseCaBinetLog) { + alarmDeseCaBinetLog.setId(NanoIdUtils.randomNanoId()); + alarmDeseCaBinetLogRepository.save(alarmDeseCaBinetLog); + } + /** * 生成架位左右位置