测温接口开发初步完成

src/main/java/com/chinaitop/depot/api/constant/Constant.java

@@ -18,6 +18,11 @@ public class Constant {
     public static final String SUCCESS = "上传成功";
 
     /**
+     * json格式错误
+     */
+    public static final String JSON_FAILED = "json格式错误";
+
+    /**
      * 判断标识
      */
     public static final int ZERO = 0;

src/main/java/com/chinaitop/depot/api/mapper/TTestdataMapper.xml

@@ -493,7 +493,7 @@
       <if test="ilqYq != null" >
         iLq_yq,
       </if>
-      <if test="tPoints != null" >
+      <if test="points != null" >
         t_points,
       </if>
     </trim>
@@ -543,8 +543,8 @@
       <if test="ilqYq != null" >
         #{ilqYq,jdbcType=VARCHAR},
       </if>
-      <if test="tPoints != null" >
-        #{tPoints,jdbcType=LONGVARCHAR},
+      <if test="points != null" >
+        #{points,jdbcType=LONGVARCHAR},
       </if>
     </trim>
   </insert>

src/main/java/com/chinaitop/depot/api/model/TPoints.java

@@ -0,0 +1,78 @@
+package com.chinaitop.depot.api.model;
+
+import java.math.BigDecimal;
+
+public class TPoints {
+    private BigDecimal temp;
+
+    private String x;
+
+    private String y;
+
+    private String z;
+
+    /**
+     * 温度值 单位：摄氏度；坏点值以250表示；精确到小数点后1位；
+     * @return temp 温度值 单位：摄氏度；坏点值以250表示；精确到小数点后1位；
+     */
+    public BigDecimal getTemp() {
+        return temp;
+    }
+
+    /**
+     * 温度值 单位：摄氏度；坏点值以250表示；精确到小数点后1位；
+     * @param temp 温度值 单位：摄氏度；坏点值以250表示；精确到小数点后1位；
+     */
+    public void setTemp(BigDecimal temp) {
+        this.temp = temp;
+    }
+
+    /**
+     * 测温点在仓内的X坐标代表长度 代表列
+     * @return X 测温点在仓内的X坐标代表长度 代表列
+     */
+    public String getX() {
+        return x;
+    }
+
+    /**
+     * 测温点在仓内的X坐标代表长度 代表列
+     * @param x 测温点在仓内的X坐标代表长度 代表列
+     */
+    public void setX(String x) {
+        this.x = x == null ? null : x.trim();
+    }
+
+    /**
+     * 测温点在仓内的Y坐标宽度方向 代表行
+     * @return Y 测温点在仓内的Y坐标宽度方向 代表行
+     */
+    public String getY() {
+        return y;
+    }
+
+    /**
+     * 测温点在仓内的Y坐标宽度方向 代表行
+     * @param y 测温点在仓内的Y坐标宽度方向 代表行
+     */
+    public void setY(String y) {
+        this.y = y == null ? null : y.trim();
+    }
+
+    /**
+     * 测温点在仓内的Z坐标高度
+     * @return Z 测温点在仓内的Z坐标高度
+     */
+    public String getZ() {
+        return z;
+    }
+
+    /**
+     * 测温点在仓内的Z坐标高度
+     * @param z 测温点在仓内的Z坐标高度
+     */
+    public void setZ(String z) {
+        this.z = z == null ? null : z.trim();
+    }
+
+}

src/main/java/com/chinaitop/depot/api/model/TestdataDO.java

@@ -37,10 +37,28 @@ public class TestdataDO {
 
     private String ilqYq;
 
-    private String tPoints;
+    public String getPoints() {
+        return points;
+    }
+
+    public void setPoints(String points) {
+        this.points = points;
+    }
+
+    private String points;
+
+    private List<TPoints> tPoints = Lists.newArrayList();
 
     private List<TTestdataLayer> layerLists = Lists.newArrayList();
 
+    public List<TPoints> gettPoints() {
+        return tPoints;
+    }
+
+    public void settPoints(List<TPoints> tPoints) {
+        this.tPoints = tPoints;
+    }
+
     public String getId() {
         return id;
     }
@@ -161,14 +179,6 @@ public class TestdataDO {
         this.ilqYq = ilqYq;
     }
 
-    public String gettPoints() {
-        return tPoints;
-    }
-
-    public void settPoints(String tPoints) {
-        this.tPoints = tPoints;
-    }
-
     public List<TTestdataLayer> getLayerLists() {
         return layerLists;
     }

src/main/java/com/chinaitop/depot/api/service/impl/GrainApiServiceImpl.java

@@ -3,9 +3,9 @@ package com.chinaitop.depot.api.service.impl;
 import com.chinaitop.depot.api.constant.Constant;
 import com.chinaitop.depot.api.mapper.TTestdataLayerMapper;
 import com.chinaitop.depot.api.mapper.TTestdataMapper;
+import com.chinaitop.depot.api.model.TPoints;
 import com.chinaitop.depot.api.model.TTestdata;
 import com.chinaitop.depot.api.model.TTestdataLayer;
-import com.chinaitop.depot.api.model.TTestdataLayerExample;
 import com.chinaitop.depot.api.model.TestdataDO;
 import com.chinaitop.depot.api.service.GrainApiService;
 import com.chinaitop.depot.api.utils.JsonToObjectUtils;
@@ -54,6 +54,9 @@ public class GrainApiServiceImpl implements GrainApiService {
     @Override
     public String save(String grainJson) throws Exception {
         TestdataDO testdataDO = JsonToObjectUtils.jsonToTestdataDO(grainJson);
+        List<TPoints> tPoints = testdataDO.gettPoints();
+        String s = JsonToObjectUtils.listToString(tPoints);
+        testdataDO.setPoints(s);
         TTestdata tTestdata = testdataMapper.selectByPrimaryKey(testdataDO.getId());
         if (tTestdata != null) {
             return Constant.REPEAT_UPLOAD;

src/main/java/com/chinaitop/depot/api/utils/JsonToObjectUtils.java

@@ -1,11 +1,13 @@
 package com.chinaitop.depot.api.utils;
 
+import com.chinaitop.depot.api.model.TPoints;
 import com.chinaitop.depot.api.model.TestdataDO;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
 import java.text.SimpleDateFormat;
+import java.util.List;
 
 public class JsonToObjectUtils {
 
@@ -37,4 +39,13 @@ public class JsonToObjectUtils {
         String jsonStr = mapper.writeValueAsString(testdataDO);
         return jsonStr;
     }
+
+    /**
+     * list转换字符串
+     * @param points list参数
+     * @return
+     */
+    public static String listToString(List<TPoints> points) throws Exception{
+            return mapper.writeValueAsString(points);
+    }
 }

src/main/resources/bootstrap.yml

@@ -10,6 +10,10 @@ eureka:
     lease-renewal-interval-in-seconds: 10
     lease-expiration-duration-in-seconds: 30
 
+max-http-header-size: 4048576
+tomcat:
+  max-http-post-size: 1000MB  #请求参数长度
+
 spring:
   application:
     name: depot-api
@@ -37,4 +41,7 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
+  servlet:
+    multipart:
+      max-request-size: 1000MB