Преглед изворни кода

修改指令接口参数调用方式

fanxiongwei пре 3 година
родитељ
комит
1c354e6e12

+ 22 - 20
src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/TemperatureRecordController.java

@@ -1,36 +1,38 @@
1 1
 package com.chinaitop.depot.intelligent.grainsituation.controller;
2 2
 
3
+import java.util.ArrayList;
4
+import java.util.HashMap;
5
+import java.util.List;
6
+import java.util.Map;
7
+
8
+import javax.annotation.Resource;
9
+import javax.validation.constraints.NotNull;
10
+
11
+import org.apache.commons.lang.StringUtils;
12
+import org.springframework.beans.factory.annotation.Autowired;
13
+import org.springframework.http.MediaType;
14
+import org.springframework.util.LinkedMultiValueMap;
15
+import org.springframework.util.MultiValueMap;
16
+import org.springframework.web.bind.annotation.RequestMapping;
17
+import org.springframework.web.bind.annotation.RequestMethod;
18
+import org.springframework.web.bind.annotation.RequestParam;
19
+import org.springframework.web.bind.annotation.RestController;
20
+
3 21
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdata;
4 22
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdataLayer;
5 23
 import com.chinaitop.depot.intelligent.grainsituation.service.TPointsService;
6 24
 import com.chinaitop.depot.intelligent.grainsituation.service.TemperatureRecordService;
7 25
 import com.chinaitop.depot.intelligent.socket.SocketClient;
8 26
 import com.chinaitop.depot.intelligent.utils.ConstUtils;
9
-import com.chinaitop.depot.intelligent.utils.HexConvertUtils;
10 27
 import com.chinaitop.depot.intelligent.utils.RemoteControlUtil;
11 28
 import com.github.pagehelper.PageHelper;
12 29
 import com.github.pagehelper.PageInfo;
13 30
 import com.unissoft.model.ResponseEntity;
14
-import com.unissoft.model.TypeEnum;
31
+
15 32
 import io.swagger.annotations.Api;
16 33
 import io.swagger.annotations.ApiImplicitParam;
17 34
 import io.swagger.annotations.ApiImplicitParams;
18 35
 import io.swagger.annotations.ApiOperation;
19
-import org.apache.commons.lang.StringUtils;
20
-import org.springframework.beans.factory.annotation.Autowired;
21
-import org.springframework.beans.factory.annotation.Value;
22
-import org.springframework.http.MediaType;
23
-import org.springframework.util.LinkedMultiValueMap;
24
-import org.springframework.util.MultiValueMap;
25
-import org.springframework.validation.annotation.Validated;
26
-import org.springframework.web.bind.annotation.*;
27
-import org.springframework.web.client.RestTemplate;
28
-
29
-import javax.annotation.Resource;
30
-import javax.validation.constraints.NotBlank;
31
-import javax.validation.constraints.NotEmpty;
32
-import javax.validation.constraints.NotNull;
33
-import java.util.*;
34 36
 
35 37
 @RestController
36 38
 @RequestMapping(value = "/intelligents/temperatureRecord")
@@ -254,7 +256,7 @@ public class TemperatureRecordController {
254 256
         MultiValueMap<String, String> requestEntity = new LinkedMultiValueMap<>();
255 257
         requestEntity.add("storeCode", storeCode);
256 258
         return remoteControlUtil.remoteScan(
257
-                String.format("%s%s", url, remoteControlUtil.chooseCFCode),
259
+                String.format("%s%s", url, RemoteControlUtil.chooseCFCode),
258 260
                 requestEntity
259 261
         );
260 262
     }
@@ -273,7 +275,7 @@ public class TemperatureRecordController {
273 275
         Map<String, String> requestEntity = new HashMap<>();
274 276
         requestEntity.put("tType", tType);
275 277
         return remoteControlUtil.remoteScan(
276
-                String.format("%s%s", url, remoteControlUtil.foodAll),
278
+                String.format("%s%s", url, RemoteControlUtil.foodAll),
277 279
                 requestEntity
278 280
         );
279 281
     }
@@ -300,7 +302,7 @@ public class TemperatureRecordController {
300 302
         requestEntity.add("storeCode", storeCode);
301 303
         requestEntity.add("tType", tType);
302 304
         return remoteControlUtil.remoteScan(
303
-                String.format("%s%s", url, remoteControlUtil.foodOnly),
305
+                String.format("%s%s", url, RemoteControlUtil.foodOnly),
304 306
                 requestEntity
305 307
         );
306 308
     }

+ 1 - 9
src/main/java/com/chinaitop/depot/intelligent/ventilation/controller/AerationRecordController.java

@@ -1,6 +1,5 @@
1 1
 package com.chinaitop.depot.intelligent.ventilation.controller;
2 2
 
3
-import java.text.SimpleDateFormat;
4 3
 import java.util.List;
5 4
 
6 5
 import javax.annotation.Resource;
@@ -17,20 +16,13 @@ import org.springframework.web.bind.annotation.RestController;
17 16
 
18 17
 import com.chinaitop.depot.intelligent.grainsituation.service.TemperatureRecordService;
19 18
 import com.chinaitop.depot.intelligent.socket.SocketClient;
20
-import com.chinaitop.depot.intelligent.utils.ConstUtils;
21
-import com.chinaitop.depot.intelligent.utils.HexConvertUtils;
22
-import com.chinaitop.depot.intelligent.utils.ParameterUtil;
23 19
 import com.chinaitop.depot.intelligent.utils.RemoteControlUtil;
24
-import com.chinaitop.depot.intelligent.ventilation.model.TCtldevinfo;
25 20
 import com.chinaitop.depot.intelligent.ventilation.model.TVentilation;
26 21
 import com.chinaitop.depot.intelligent.ventilation.service.AerationParameterService;
27 22
 import com.chinaitop.depot.intelligent.ventilation.service.AerationRecordService;
28
-import com.fasterxml.jackson.core.type.TypeReference;
29
-import com.fasterxml.jackson.databind.ObjectMapper;
30 23
 import com.github.pagehelper.PageHelper;
31 24
 import com.github.pagehelper.PageInfo;
32 25
 import com.unissoft.model.ResponseEntity;
33
-import com.unissoft.model.TypeEnum;
34 26
 
35 27
 import io.swagger.annotations.Api;
36 28
 import io.swagger.annotations.ApiImplicitParam;
@@ -105,7 +97,7 @@ public class AerationRecordController {
105 97
         requestEntity.add("orgId", orgId);
106 98
         requestEntity.add("saveType", saveType);
107 99
         return remoteControlUtil.remoteScan(
108
-                String.format("%s%s", url, remoteControlUtil.xzSave),
100
+                String.format("%s%s", url, RemoteControlUtil.xzSave),
109 101
                 requestEntity, "POST", null
110 102
         );
111 103