dc

docker-compose-server.yml

@@ -20,5 +20,5 @@ services:
       - /data/config:/sosssystem/config
       - /data/storage:/sosssystem/storage
     ports:
-      - 80:8090
+      - 8090:8090
 

src/main/java/com/santos/iost/controller/WebApi.java

@@ -47,7 +47,7 @@ public class WebApi {
         Result result = new Result();
         try {
             if (null==soSsRequestVo.getObjAPIName()) {
-                return Result.fail("操作失败", "apiName不可为空", "500");
+                return Result.fail("操作失败", "objAPIName不可为空", "500");
             } else if (soSsRequestVo.getObjAPIName().equals(SoSsMaterialServer.apiName)) {
                 result = materialServer.getData(soSsRequestVo);
             } else if (soSsRequestVo.getObjAPIName().equals(SpSsSalesOrderService.apiName)) {

src/main/java/com/santos/iost/service/impl/SpSsSalesOrderServiceImpl.java

@@ -167,7 +167,12 @@ public class SpSsSalesOrderServiceImpl implements SpSsSalesOrderService {
                     i++;
                 }
             } else {
-
+                Map<String,Object> map = new LinkedHashMap();
+                map.put("message",soSsResponseDate.getMessage());
+                map.put("data",soSsResponseDate.getData());
+                returnDate.put("error", new ArrayList<Map>() {{
+                    add(map);
+                }});
             }
         } catch (Exception e) {
             e.printStackTrace();

src/test/java/com/santos/iost/JintaiDomeApplicationTests.java

@@ -45,7 +45,7 @@ class JintaiDomeApplicationTests {
         String D = map.get("Data").toString();
         Map mapDate = JSON.parseObject(D, Map.class);
         token = mapDate.get("Token").toString();
-        System.out.println(token);
+//        System.out.println(token);
         Map paramsMap = new HashMap();
         Map Data = new LinkedHashMap();
         Data.put("Top", "100");
@@ -60,7 +60,7 @@ class JintaiDomeApplicationTests {
         hreader.put("Content-Type", "application/json");
 
         String post = HttpUtil.post(getGetMaterialUrl + token, JsonUtil.Mapjson(paramsMap), hreader);
-        System.out.println(post);
+//        System.out.println(post);
     }
 
     @Test
@@ -71,7 +71,7 @@ class JintaiDomeApplicationTests {
         String D = map.get("Data").toString();
         Map mapDate = JSON.parseObject(D, Map.class);
         token = mapDate.get("Token").toString();
-        System.out.println(token);
+//        System.out.println(token);
         Map paramsMap = new HashMap();
         Map Data = new LinkedHashMap();
         Data.put("FBillNo", "1220200102001");
@@ -79,21 +79,21 @@ class JintaiDomeApplicationTests {
 
         Map<String, String> hreader = new HashMap<>();
         hreader.put("Content-Type", "application/json");
-        System.out.println(JsonUtil.Mapjson(paramsMap));
+//        System.out.println(JsonUtil.Mapjson(paramsMap));
         String post = HttpUtil.post(includeDetailUrl + token, JsonUtil.Mapjson(paramsMap), hreader);
 //        SoSsResponseDate soSsResponseDate = JSON.parseObject(post, SoSsResponseDate.class, Feature.OrderedField);//转换数据类型
 //        System.out.println(soSsResponseDate);
         SoSsResponseDate soSsResponseDate = JSON.parseObject(post, SoSsResponseDate.class, Feature.OrderedField);//转换数据类型
         String statusCode = soSsResponseDate.getStatusCode();
-        System.out.println(soSsResponseDate.getStatusCode().equals("200"));
-        System.out.println(soSsResponseDate);
+//        System.out.println(soSsResponseDate.getStatusCode().equals("200"));
+//        System.out.println(soSsResponseDate);
         if (null != soSsResponseDate.getStatusCode() && soSsResponseDate.getStatusCode().equals("200")) {
             Map Datas = JSON.parseObject(soSsResponseDate.getData().toString(), Map.class, Feature.OrderedField);//转换数据类型
             List list = JSON.parseObject(Datas.get("Page2").toString(), List.class, Feature.OrderedField);
             int i = 1;
             for (Object o : list) {
                 Map listDateMap = JSON.parseObject(o.toString(), Map.class, Feature.OrderedField);
-                System.out.println(listDateMap);
+//                System.out.println(listDateMap);
 //                returnDate.put(apiName + i, new ArrayList<Map>() {{
 //                    add(listDateMap);
 //                }});
@@ -104,10 +104,10 @@ class JintaiDomeApplicationTests {
 
     @Test
     void asd() throws Exception {
-        System.out.println(SoSsDao.token);
-        System.out.println(StringUtil.isNumber("1473048265"));
-        System.out.println(TimeStamp2Date("1609499999", "yyyy-MM-dd HH:mm:ss"));
-        System.out.println(TimeStamp2Date("1609999999", "yyyy-MM-dd HH:mm:ss"));
+//        System.out.println(SoSsDao.token);
+//        System.out.println(StringUtil.isNumber("1473048265"));
+//        System.out.println(TimeStamp2Date("1609499999", "yyyy-MM-dd HH:mm:ss"));
+//        System.out.println(TimeStamp2Date("1609999999", "yyyy-MM-dd HH:mm:ss"));
     }
 
     public static String TimeStamp2Date(String timestampString, String formats) {