hasan vor 4 Jahren
Ursprung
Commit
1f5a14331f

+ 8 - 2
src/main/java/com/szls/nstths/entity/ReData.java

@@ -7,10 +7,16 @@ import lombok.Data;
7
 
7
 
8
 
8
 
9
 @Data
9
 @Data
10
-@TableName("re_data")
11
-public class ReData {
10
+@TableName("re_msg")
11
+public class ReMsg {
12
     @TableId(type = IdType.AUTO, value = "id")
12
     @TableId(type = IdType.AUTO, value = "id")
13
     private Long id;
13
     private Long id;
14
+    /**
15
+     * code=0, msg='操作成功'
16
+     * code=1, msg='设备正忙'
17
+     * code=2, msg='测点参数异常'
18
+     * code=10, msg='有未上传的检测结果'
19
+     */
14
     String code;
20
     String code;
15
     String msg;
21
     String msg;
16
     String data;
22
     String data;

+ 3 - 3
src/main/java/com/szls/nstths/service/impl/TeDataServiceImpl.java

@@ -1,6 +1,6 @@
1
 package com.szls.nstths.service.impl;
1
 package com.szls.nstths.service.impl;
2
 
2
 
3
-import com.szls.nstths.entity.ReData;
3
+import com.szls.nstths.entity.ReMsg;
4
 import com.szls.nstths.entity.STask;
4
 import com.szls.nstths.entity.STask;
5
 import com.szls.nstths.entity.TeData;
5
 import com.szls.nstths.entity.TeData;
6
 import com.szls.nstths.mapper.STaskMapper;
6
 import com.szls.nstths.mapper.STaskMapper;
@@ -43,10 +43,10 @@ public class TeDataServiceImpl implements TeDataService {
43
         teData.setRotationxy(xy_str);
43
         teData.setRotationxy(xy_str);
44
 
44
 
45
         RestTemplate restTemplate = new RestTemplate();
45
         RestTemplate restTemplate = new RestTemplate();
46
-        ReData reData1 = restTemplate.postForObject(base_url + "equipmentTestingIsReady", teData, ReData.class);
46
+        ReMsg reData1 = restTemplate.postForObject(base_url + "equipmentTestingIsReady", teData, ReMsg.class);
47
         if(reData1!=null){
47
         if(reData1!=null){
48
             if(reData1.getCode()=="?"){
48
             if(reData1.getCode()=="?"){
49
-                ReData reData2 = restTemplate.postForObject(base_url + "equipmentTestingStart", teData, ReData.class);
49
+                ReMsg reData2 = restTemplate.postForObject(base_url + "equipmentTestingStart", teData, ReMsg.class);
50
             }
50
             }
51
         }
51
         }
52
 
52