.

src/main/java/com/szls/nstths/controller/DataController.java

@@ -1,16 +1,13 @@
 package com.szls.nstths.controller;
 
 import com.szls.nstths.entity.TeData;
-import com.szls.nstths.mapper.TeDataMapper;
+import com.szls.nstths.service.TeDataService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.Date;
 
 
 @RestController
@@ -18,37 +15,18 @@ public class DataController {
 
     private static final Logger logger = LoggerFactory.getLogger(DataController.class);
 
-    private TeDataMapper teDataMapper;
-
+    private TeDataService teDataService;
     @Autowired
-    public void setTeDataMapper(TeDataMapper teDataMapper) {
-        this.teDataMapper = teDataMapper;
+    public void setTeDataService(TeDataService teDataService) {
+        this.teDataService = teDataService;
     }
 
     @PostMapping("/equipmentTestingEnd")
     public String equipmentTesting(@RequestBody TeData teData) {
         logger.info("{}", teData);
-        int dbi = teDataMapper.insert(teData);
-        if (dbi < 1) {
-            return "fail";
-        }
+        teDataService.scanTask(teData);
         return "success";
     }
 
-    /**
-     * 组装待打点并发送
-     */
-    public void sendTestAgain() {
-        String url = "http://local.wxlxit.com:61001/equipmentTestingStart";
-        TeData teData = new TeData();
-        teData.setEquipmentID("hljcbk1001");
-        teData.setStime(new Date());
-        // TODO: 2022/2/10
-        teData.setRotationxy("根据第一次返回底产生-第二次待打点");
-
-        RestTemplate restTemplate = new RestTemplate();
-        restTemplate.postForObject(url, teData, String.class);
-
-    }
 
 }

src/main/java/com/szls/nstths/service/TeDataService.java

@@ -1,5 +1,7 @@
 package com.szls.nstths.service;
 
+import com.szls.nstths.entity.ReMsg;
+import com.szls.nstths.entity.TeData;
 import org.springframework.stereotype.Service;
 
 @Service(value = "teDataService")
@@ -14,6 +16,8 @@ public interface TeDataService {
      * 3. equipmentTestingEnd
      */
 
-    public void scanTask(String xy_str);
+    public void scanTask();
+
+    public void scanTask(TeData teData);
 
 }

src/main/java/com/szls/nstths/service/impl/TeDataServiceImpl.java

@@ -4,6 +4,7 @@ import com.szls.nstths.entity.ReMsg;
 import com.szls.nstths.entity.STask;
 import com.szls.nstths.entity.TeData;
 import com.szls.nstths.mapper.STaskMapper;
+import com.szls.nstths.mapper.TeDataMapper;
 import com.szls.nstths.service.TeDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.client.RestTemplate;
@@ -13,14 +14,20 @@ import java.util.Date;
 public class TeDataServiceImpl implements TeDataService {
 
     static String base_url = "http://local.wxlxit.com:61001/";
-
+    static boolean flag = true;
     private STaskMapper sTaskMapper;
+    private TeDataMapper teDataMapper;
 
     @Autowired
     public void setsTaskMapper(STaskMapper sTaskMapper) {
         this.sTaskMapper = sTaskMapper;
     }
 
+    @Autowired
+    public void setTeDataMapper(TeDataMapper teDataMapper) {
+        this.teDataMapper = teDataMapper;
+    }
+
     /**
      * todo
      * http://local.wxlxit.com:61001/
@@ -30,25 +37,52 @@ public class TeDataServiceImpl implements TeDataService {
      */
 
     @Override
-    public void scanTask(String xy_str) {
+    public void scanTask() {
+
         STask task = new STask();
-        task.setCtime(new Date());
+        Date date = new Date();
+        task.setCtime(date);
         task.setDescribe("test");
         sTaskMapper.insert(task);
 
         TeData teData = new TeData();
         teData.setEquipmentID("hljcbk1001");
-        teData.setTaskID("t01");
-        teData.setStime(new Date());
-        teData.setRotationxy(xy_str);
+        teData.setTaskID("" + task.getId());
+        teData.setStime(date);
+
+        //todo 第一次待打点
+        teData.setRotationxy("");
+        teDataMapper.insert(teData);
+
+        postHelper(teData);
+        //equipmentTestingEnd
+    }
 
+    @Override
+    public void scanTask(TeData teData) {
+
+        teData.getTaskID();
+
+        //todo 第二次待打点
+        teData.setRotationxy("");
+        teDataMapper.insert(teData);
+
+        //只运行 发送一次。
+        if (flag) {
+            postHelper(teData);
+            flag = false;
+        }
+    }
+
+    public ReMsg postHelper(TeData teData) {
         RestTemplate restTemplate = new RestTemplate();
-        ReMsg reData1 = restTemplate.postForObject(base_url + "equipmentTestingIsReady", teData, ReMsg.class);
-        if(reData1!=null){
-            if(reData1.getCode()=="?"){
-                ReMsg reData2 = restTemplate.postForObject(base_url + "equipmentTestingStart", teData, ReMsg.class);
+        ReMsg reMsg1 = restTemplate.postForObject(base_url + "equipmentTestingIsReady", teData, ReMsg.class);
+        if (reMsg1 != null) {
+            if (reMsg1.getCode() == "0") {
+                ReMsg reMsg2 = restTemplate.postForObject(base_url + "equipmentTestingStart", teData, ReMsg.class);
+                return reMsg2;
             }
         }
-
+        return null;
     }
 }