hasan 3 years ago
parent
commit
ba1edb8a48

+ 17 - 0
src/main/java/com/szls/nstths/entity/ReData.java

@@ -0,0 +1,17 @@
1
+package com.szls.nstths.entity;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
5
+import com.baomidou.mybatisplus.annotation.TableName;
6
+import lombok.Data;
7
+
8
+
9
+@Data
10
+@TableName("re_data")
11
+public class ReData {
12
+    @TableId(type = IdType.AUTO, value = "id")
13
+    private Long id;
14
+    String code;
15
+    String msg;
16
+    String data;
17
+}

+ 19 - 0
src/main/java/com/szls/nstths/entity/STask.java

@@ -0,0 +1,19 @@
1
+package com.szls.nstths.entity;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
5
+import com.baomidou.mybatisplus.annotation.TableName;
6
+import com.fasterxml.jackson.annotation.JsonFormat;
7
+import lombok.Data;
8
+
9
+import java.util.Date;
10
+
11
+@Data
12
+@TableName("t_stask")
13
+public class STask {
14
+    @TableId(type = IdType.AUTO)
15
+    private Long id;
16
+    private String describe;
17
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
18
+    private Date ctime;
19
+}

+ 11 - 0
src/main/java/com/szls/nstths/mapper/STaskMapper.java

@@ -0,0 +1,11 @@
1
+package com.szls.nstths.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.szls.nstths.entity.STask;
5
+import com.szls.nstths.entity.TeData;
6
+import org.springframework.stereotype.Component;
7
+
8
+@Component(value = "sTaskMapper")
9
+public interface STaskMapper extends BaseMapper<STask> {
10
+
11
+}

+ 19 - 0
src/main/java/com/szls/nstths/service/TeDataService.java

@@ -0,0 +1,19 @@
1
+package com.szls.nstths.service;
2
+
3
+import org.springframework.stereotype.Service;
4
+
5
+@Service(value = "teDataService")
6
+public interface TeDataService {
7
+
8
+
9
+    /**
10
+     * todo
11
+     * http://local.wxlxit.com:61001/
12
+     * 1. equipmentTestingIsReady
13
+     * 2. equipmentTestingStart
14
+     * 3. equipmentTestingEnd
15
+     */
16
+
17
+    public void scanTask(String xy_str);
18
+
19
+}

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

@@ -0,0 +1,54 @@
1
+package com.szls.nstths.service.impl;
2
+
3
+import com.szls.nstths.entity.ReData;
4
+import com.szls.nstths.entity.STask;
5
+import com.szls.nstths.entity.TeData;
6
+import com.szls.nstths.mapper.STaskMapper;
7
+import com.szls.nstths.service.TeDataService;
8
+import org.springframework.beans.factory.annotation.Autowired;
9
+import org.springframework.web.client.RestTemplate;
10
+
11
+import java.util.Date;
12
+
13
+public class TeDataServiceImpl implements TeDataService {
14
+
15
+    static String base_url = "http://local.wxlxit.com:61001/";
16
+
17
+    private STaskMapper sTaskMapper;
18
+
19
+    @Autowired
20
+    public void setsTaskMapper(STaskMapper sTaskMapper) {
21
+        this.sTaskMapper = sTaskMapper;
22
+    }
23
+
24
+    /**
25
+     * todo
26
+     * http://local.wxlxit.com:61001/
27
+     * 1. equipmentTestingIsReady
28
+     * 2. equipmentTestingStart
29
+     * 3. equipmentTestingEnd
30
+     */
31
+
32
+    @Override
33
+    public void scanTask(String xy_str) {
34
+        STask task = new STask();
35
+        task.setCtime(new Date());
36
+        task.setDescribe("test");
37
+        sTaskMapper.insert(task);
38
+
39
+        TeData teData = new TeData();
40
+        teData.setEquipmentID("hljcbk1001");
41
+        teData.setTaskID("t01");
42
+        teData.setStime(new Date());
43
+        teData.setRotationxy(xy_str);
44
+
45
+        RestTemplate restTemplate = new RestTemplate();
46
+        ReData reData1 = restTemplate.postForObject(base_url + "equipmentTestingIsReady", teData, ReData.class);
47
+        if(reData1!=null){
48
+            if(reData1.getCode()=="?"){
49
+                ReData reData2 = restTemplate.postForObject(base_url + "equipmentTestingStart", teData, ReData.class);
50
+            }
51
+        }
52
+
53
+    }
54
+}

+ 2 - 2
src/main/resources/application.yml

@@ -6,8 +6,8 @@ spring:
6 6
     driver-class-name: com.mysql.cj.jdbc.Driver
7 7
     username: root
8 8
     password: 123456
9
-    #url: jdbc:mysql://36.134.100.155:3306/nstths?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
10
-    url: jdbc:mysql://192.168.1.123:3306/nstths?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
9
+    url: jdbc:mysql://36.134.100.155:3306/nstths?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
10
+    #url: jdbc:mysql://192.168.1.123:3306/nstths?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
11 11
     hikari:
12 12
       minimum-idle: 5
13 13
       maximum-pool-size: 10