配合第三方接口

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<String, Object> 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<String, Object> objectMap = new HashMap<>();
+        objectMap.put("code", "");
+        objectMap.put("errorinfo", "");
+        objectMap.put("protocal", 1004);
+        objectMap.put("result", "");
+        return objectMap;
+    }
+
+
 }

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

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<AlarmDeseCaBinetLog, String>, JpaSpecificationExecutor<AlarmDeseCaBinetLog> {
+}

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

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);
+    }
+
 
     /**
      * 生成架位左右位置