Merge remote-tracking branch 'origin/master'

# Conflicts:
#	huimv-test-platform/huimv-ctwing/src/main/java/com/huimv/devicedata/controller/DeviceDataController.java

huimv-test-platform/.gitignore

@@ -31,3 +31,7 @@ build/
 
 ### VS Code ###
 .vscode/
+mvnw
+mvnw.cmd
+.mvn
+.idea

huimv-test-platform/huimv-ctwing/src/main/java/com/huimv/devicedata/controller/DeviceDataController.java

@@ -37,6 +37,7 @@ public class DeviceDataController {
         Date startDate = new Date(startTime);
         java.text.SimpleDateFormat f = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         logger.info("开始接收时间："+f.format(startDate));
+
         StringBuffer resultStr = new StringBuffer("");
         try{
             BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream(),"utf-8"));
@@ -57,6 +58,7 @@ public class DeviceDataController {
             e.printStackTrace();
         }
 //        return resultStr;
+
         return "200";
     }
 }

huimv-test-platform/huimv-ctwing/src/main/java/com/huimv/devicedata/entity/DeviceResponseEntity.java

@@ -0,0 +1,131 @@
+package com.huimv.devicedata.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author yinhao
+ * @Date 2021/3/31 17:51
+ * @Description
+ */
+@Entity
+@Table(name = "device_response")
+public class DeviceResponseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "tenan_id")
+    private String tenanId;
+
+    @Column(name = "product_id")
+    private String productId;
+
+    @Column(name = "message_type")
+    private String messageType;
+
+    @Column(name = "device_id")
+    private String deviceId;
+
+    @Column(name = "task_id")
+    private Integer taskId;
+
+    @Column(name = "result_code")
+    private String resultCode;
+
+    @Column(name = "result_detail_length")
+    private Integer resultDetailLength;
+
+    @Column(name = "result_detail_rsa_data")
+    private String resultDetailRspData;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public String getTenanId() {
+        return tenanId;
+    }
+
+    public void setTenanId(String tenanId) {
+        this.tenanId = tenanId;
+    }
+
+    public String getMessageType() {
+        return messageType;
+    }
+
+    public void setMessageType(String messageType) {
+        this.messageType = messageType;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public Integer getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Integer taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getResultCode() {
+        return resultCode;
+    }
+
+    public void setResultCode(String resultCode) {
+        this.resultCode = resultCode;
+    }
+
+    public Integer getResultDetailLength() {
+        return resultDetailLength;
+    }
+
+    public void setResultDetailLength(Integer resultDetailLength) {
+        this.resultDetailLength = resultDetailLength;
+    }
+
+    public String getResultDetailRspData() {
+        return resultDetailRspData;
+    }
+
+    public void setResultDetailRspData(String resultDetailRspData) {
+        this.resultDetailRspData = resultDetailRspData;
+    }
+
+    @Override
+    public String toString() {
+        return "DeviceResponseEntity{" +
+                "id=" + id +
+                ", tenanId=" + tenanId +
+                ", productId='" + productId + '\'' +
+                ", messageType='" + messageType + '\'' +
+                ", deviceId='" + deviceId + '\'' +
+                ", taskId=" + taskId +
+                ", resultCode='" + resultCode + '\'' +
+                ", resultDetailLength=" + resultDetailLength +
+                ", resultDetailRspData='" + resultDetailRspData + '\'' +
+                '}';
+    }
+}

huimv-test-platform/huimv-ctwing/src/main/java/com/huimv/devicedata/repo/DeviceResponseEntityRepository.java

@@ -0,0 +1,15 @@
+package com.huimv.devicedata.repo;
+
+import com.huimv.devicedata.entity.DeviceResponseEntity;
+import com.huimv.devicedata.entity.DeviceUpdataEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+/**
+ * @Author yinhao
+ * @Date 2021/3/31 18:18
+ * @Description
+ */
+public interface DeviceResponseEntityRepository extends JpaRepository<DeviceResponseEntity, Integer>, JpaSpecificationExecutor<DeviceResponseEntity> {
+
+}

huimv-test-platform/huimv-ctwing/src/main/java/com/huimv/devicedata/service/IDeviceDataService.java

@@ -2,7 +2,19 @@ package com.huimv.devicedata.service;
 
 import com.alibaba.fastjson.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 public interface IDeviceDataService {
 
     void saveDeviceChangedUpData(JSONObject deviceUpDataJson);
+
+
+    /**
+     * 设备命令响应
+     *
+     * @param deviceResponseData
+     */
+    void saveDeviceResponseData(JSONObject deviceResponseData);
+
 }

huimv-test-platform/huimv-ctwing/src/main/java/com/huimv/devicedata/service/impl/DeviceDataServiceImpl.java

@@ -2,13 +2,18 @@ package com.huimv.devicedata.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 
+import com.huimv.devicedata.entity.DeviceResponseEntity;
 import com.huimv.devicedata.entity.DeviceUpdataEntity;
+import com.huimv.devicedata.repo.DeviceResponseEntityRepository;
 import com.huimv.devicedata.repo.DeviceUpdataEntityRepository;
 import com.huimv.devicedata.service.IDeviceDataService;
 import com.huimv.devicedata.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.biosafety.uface.controller
@@ -25,6 +30,9 @@ public class DeviceDataServiceImpl implements IDeviceDataService {
     @Autowired
     private DateUtil dateUtil;
 
+    @Autowired
+    private DeviceResponseEntityRepository deviceResponseEntityRepo;
+
     @Override
     public void saveDeviceChangedUpData(JSONObject deviceUpDataJo) {
         String productId = deviceUpDataJo.getString("productId");
@@ -67,5 +75,40 @@ public class DeviceDataServiceImpl implements IDeviceDataService {
         //
         deviceUpdataEntityRepo.saveAndFlush(deviceUpdataEntity);
     }
+
+    /**
+     * 设备命令响应
+     *
+     * @param deviceResponseData
+     */
+    @Override
+    public void saveDeviceResponseData(JSONObject deviceResponseData) {
+
+        //json中取出数据
+        String tenantId = deviceResponseData.getString("tenantId");
+        String productId = deviceResponseData.getString("productId");
+        String messageType = deviceResponseData.getString("messageType");
+        String deviceId = deviceResponseData.getString("deviceId");
+        Integer taskId = deviceResponseData.getInteger("taskId");
+        JSONObject result = deviceResponseData.getJSONObject("result");
+        String resultCode = result.getString("resultCode");
+        JSONObject resultDetail = result.getJSONObject("resultDetail");
+        Integer length = resultDetail.getInteger("Length");
+        String rspdata = resultDetail.getString("Rspdata");
+
+        //封装到实体类
+        DeviceResponseEntity deviceResponseEntity = new DeviceResponseEntity();
+        deviceResponseEntity.setTenanId(tenantId);
+        deviceResponseEntity.setProductId(productId);
+        deviceResponseEntity.setMessageType(messageType);
+        deviceResponseEntity.setDeviceId(deviceId);
+        deviceResponseEntity.setTaskId(taskId);
+        deviceResponseEntity.setResultCode(resultCode);
+        deviceResponseEntity.setResultDetailLength(length);
+        deviceResponseEntity.setResultDetailRspData(rspdata);
+
+        //保存到数据库
+        deviceResponseEntityRepo.saveAndFlush(deviceResponseEntity);
+    }
 }