.

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

@@ -2,15 +2,12 @@ package com.szls.nstths.controller;
 
 import com.szls.nstths.entity.TeData;
 import com.szls.nstths.mapper.TeDataMapper;
-import com.szls.nstths.mapper.UserMapper;
 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.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.Date;
@@ -32,14 +29,17 @@ public class DataController {
     public String equipmentTesting(@RequestBody TeData teData) {
         logger.info("{}", teData);
         int dbi = teDataMapper.insert(teData);
-        return dbi+" success";
+        if (dbi < 1) {
+            return "fail";
+        }
+        return "success";
     }
 
     /**
      * 组装待打点并发送
      */
-    public void sendTestAgain(){
-        String url ="http://local.wxlxit.com:61001/equipmentTestingStart";
+    public void sendTestAgain() {
+        String url = "http://local.wxlxit.com:61001/equipmentTestingStart";
         TeData teData = new TeData();
         teData.setEquipmentID("hljcbk1001");
         teData.setStime(new Date());

src/main/java/com/szls/nstths/entity/TeData.java

@@ -17,6 +17,8 @@ public class TeData {
     private Long id;
     @TableField("equipmentID")
     private String equipmentID;
+    @TableField("taskID")
+    private String taskID;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date stime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

src/main/resources/application.yml

@@ -6,6 +6,16 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: 123456
-    url: jdbc:mysql://36.134.100.155:3306/nstths?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
+    #url: jdbc:mysql://36.134.100.155:3306/nstths?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
+    url: jdbc:mysql://192.168.1.123:3306/nstths?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
+    hikari:
+      minimum-idle: 5
+      maximum-pool-size: 10
+      idle-timeout: 30000
+      max-lifetime: 0
+      connection-timeout: 60000
+      validation-timeout: 3000
+      connection-test-query: select 1
+      auto-commit: true
   thymeleaf:
     check-template-location: false

src/test/java/com/szls/nstths/SampleTest.java

@@ -14,7 +14,7 @@ public class SampleTest {
     @Resource
     private UserMapper userMapper;
 
-    @Test
+    //@Test
     public void testSelect() {
         System.out.println(("----- selectAll method test ------"));
         List<User> userList = userMapper.selectList(null);