From 8f5cd72dea41a9e0f4e4fecf5f19e68e9f228401 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Fri, 16 Sep 2022 15:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3get=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/service/impl/GoodsServiceImpl.java   | 163 +++++++++---------
 .../szwh/service/impl/LoginServiceImpl.java   |   2 +-
 .../szwh/service/impl/UserServiceImpl.java    |   2 +-
 .../cn/chjyj/szwh/utils/RequestUtils.java     |  18 +-
 .../cn/chjyj/szwh/utils/SzwhApiUtils.java     |   6 +-
 src/test/java/cn/chjyj/szwh/ApiTest.java      |   2 +-
 6 files changed, 99 insertions(+), 94 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
index 1401dc1..d7ac127 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
@@ -84,95 +84,96 @@ public class GoodsServiceImpl implements GoodsService {
         Map<String, Object> hmap = new HashMap();
         hmap.put("entrust_token", sign);
         // get 方式获取
-        JSONObject jsonObject = RequestUtils.GetData(apiurl, hmap);
-        // json的data节点
-        JSONArray jsonArray = jsonObject.getJSONArray("data");
+        JSONObject jsonObject = RequestUtils.GetData(apiurl, hmap,true);
         // 产品详情地址
         String gdurl = host + "/consign/exchange/v1/selectEntrustDetails";
         // 循环查询商品的详情
-        for(int i=0;i<jsonArray.size();i++){
-            // 获取到sourceData字段信息
-            JSONObject sdjson  = (JSONObject) jsonArray.get(i);
-            String nsdstr = sdjson.getString("sourceData");
-            if(nsdstr==null){
-                continue;
-            }else {
-                JSONObject nsdjson = JSONObject.parseObject(nsdstr);
-                // 从sourcedata节点中提取商品唯一编号
-                String goodsId = nsdjson.getString("identifier");
-                // 以identifier为主键查询详情
-                String gdetailUrl = gdurl + "/" + goodsId;
-                // 请求商品的详情
-                JSONObject gdJson = RequestUtils.GetData(gdetailUrl, hmap);
-                log.info(goodsId + "详情:" + gdJson);
-                //处理返回的结果
-                JSONArray gdArr = gdJson.getJSONArray("data");
-                // 如果goods表中存在记录，不进行操作
-                Goods tgoods = goodsMapper.getGoodsByIsli(goodsId);
-                if (tgoods != null) {
+        if(jsonObject!=null && jsonObject.containsKey("data") ) {
+            // json的data节点
+            JSONArray jsonArray = jsonObject.getJSONArray("data");
+            for (int i = 0; i < jsonArray.size(); i++) {
+                // 获取到sourceData字段信息
+                JSONObject sdjson = (JSONObject) jsonArray.get(i);
+                String nsdstr = sdjson.getString("sourceData");
+                if (nsdstr == null) {
                     continue;
-                }
-                // add goodsSource,循环插入 商品资源
-                for (int x = 0; x < gdArr.size(); x++) {
-                    JSONObject gditem = (JSONObject) gdArr.get(x);
-                    GoodsSource goodsSource = ApiGoodsUtils.jsonToGoodsSource(gditem, goodsId);
-                    goodsSourceMapper.add(goodsSource);
-                }
-                // insertGoodsDetail
-                GoodsDetail goodsDetail = ApiGoodsUtils.jsonToGoodsDetail(nsdjson, sdjson);
-                // 返回商品详情
-                int gdid = goodsDetailMapper.add(goodsDetail);
-
-                //抽取target 字段中的json，转为jsonobject
-                JSONObject targetJson = nsdjson.getJSONObject("targetData");
-                //处理状态
-                int istatus = 0;
-                if (sdjson.getInteger("status") == 1 || sdjson.getInteger("status") == 4 ||
-                        sdjson.getInteger("status") == 5) {
-                    istatus = 1;
-                } else if (sdjson.getInteger("status") == 2) {
-                    istatus = 2;
                 } else {
-                    istatus = 4;
+                    JSONObject nsdjson = JSONObject.parseObject(nsdstr);
+                    // 从sourcedata节点中提取商品唯一编号
+                    String goodsId = nsdjson.getString("identifier");
+                    // 以identifier为主键查询详情
+                    String gdetailUrl = gdurl + "/" + goodsId;
+                    // 请求商品的详情
+                    JSONObject gdJson = RequestUtils.GetData(gdetailUrl, hmap,true);
+                    log.info(goodsId + "详情:" + gdJson);
+                    //处理返回的结果
+                    JSONArray gdArr = gdJson.getJSONArray("data");
+                    // 如果goods表中存在记录，不进行操作
+                    Goods tgoods = goodsMapper.getGoodsByIsli(goodsId);
+                    if (tgoods != null) {
+                        continue;
+                    }
+                    // add goodsSource,循环插入 商品资源
+                    for (int x = 0; x < gdArr.size(); x++) {
+                        JSONObject gditem = (JSONObject) gdArr.get(x);
+                        GoodsSource goodsSource = ApiGoodsUtils.jsonToGoodsSource(gditem, goodsId);
+                        goodsSourceMapper.add(goodsSource);
+                    }
+                    // insertGoodsDetail
+                    GoodsDetail goodsDetail = ApiGoodsUtils.jsonToGoodsDetail(nsdjson, sdjson);
+                    // 返回商品详情
+                    int gdid = goodsDetailMapper.add(goodsDetail);
+
+                    //抽取target 字段中的json，转为jsonobject
+                    JSONObject targetJson = nsdjson.getJSONObject("targetData");
+                    //处理状态
+                    int istatus = 0;
+                    if (sdjson.getInteger("status") == 1 || sdjson.getInteger("status") == 4 ||
+                            sdjson.getInteger("status") == 5) {
+                        istatus = 1;
+                    } else if (sdjson.getInteger("status") == 2) {
+                        istatus = 2;
+                    } else {
+                        istatus = 4;
+                    }
+                    //商品起止时间
+                    String cstart = sdjson.getString("contractualPeriodStart");
+                    String curTime = new SimpleDateFormat("HH:mm:ss").format(new Date());
+                    String ncstart = cstart + " " + curTime;
+                    //
+                    String cend = nsdjson.getString("contractualPeriodEnd");
+                    String ncend = cend + " 23:59:59";
+                    Goods goods = new Goods();
+                    //起止时间转为timestamp
+                    goods.setContractualStartTime(Timestamp.valueOf(ncstart));
+                    goods.setContractualtimeEndTime(Timestamp.valueOf(ncend));
+                    goods.setGoodsDetailId(gdid);
+                    goods.setContractStatus(nsdjson.getInteger("contractStatus"));
+                    goods.setGoodsStatus(istatus);
+                    goods.setOldStatus(0); // 默认为0
+                    goods.setEntrustStatus(sdjson.getInteger("status"));
+                    //
+                    goods.setUserIslicode(targetJson.getString("identifier"));
+                    goods.setUsername(targetJson.getString("titleName"));
+                    goods.setIsLicode(sdjson.getString("isliCode"));
+                    goods.setGoodsIslicode(nsdjson.getString("identifier"));
+                    goods.setRecommendSort(1); // 默认排序1
+                    // 添加,返回当前的编号
+                    int ret_gid = goodsMapper.addGoods(goods);
+                    //添加操作日志
+                    OperationLog oplog = new OperationLog();
+                    oplog.setLogid(goods.getId());
+                    String nowStr = sdf.format(new Date());
+                    String message = nowStr + " 发布标的成功";
+                    oplog.setMessage(message);
+                    oplog.setType("goods");
+                    // 日志入库
+                    operationLogMapper.addLog(oplog);
                 }
-                //商品起止时间
-                String cstart = sdjson.getString("contractualPeriodStart");
-                String curTime = new SimpleDateFormat("HH:mm:ss").format(new Date());
-                String ncstart = cstart + " " + curTime;
-                //
-                String cend = nsdjson.getString("contractualPeriodEnd");
-                String ncend = cend + " 23:59:59";
-                Goods goods = new Goods();
-                //起止时间转为timestamp
-                goods.setContractualStartTime(Timestamp.valueOf(ncstart));
-                goods.setContractualtimeEndTime(Timestamp.valueOf(ncend));
-                goods.setGoodsDetailId(gdid);
-                goods.setContractStatus(nsdjson.getInteger("contractStatus"));
-                goods.setGoodsStatus(istatus);
-                goods.setOldStatus(0); // 默认为0
-                goods.setEntrustStatus(sdjson.getInteger("status"));
-                //
-                goods.setUserIslicode(targetJson.getString("identifier"));
-                goods.setUsername(targetJson.getString("titleName"));
-                goods.setIsLicode(sdjson.getString("isliCode"));
-                goods.setGoodsIslicode(nsdjson.getString("identifier"));
-                goods.setRecommendSort(1); // 默认排序1
-                // 添加,返回当前的编号
-                int ret_gid = goodsMapper.addGoods(goods);
-                //添加操作日志
-                OperationLog oplog = new OperationLog();
-                oplog.setLogid(goods.getId());
-                String nowStr = sdf.format(new Date());
-                String message = nowStr + " 发布标的成功";
-                oplog.setMessage(message);
-                oplog.setType("goods");
-                // 日志入库
-                operationLogMapper.addLog(oplog);
+                // 计算器增加1
+                count++;
             }
-            // 计算器增加1
-            count++;
         }
-
         return count;
     }
 
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/LoginServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/LoginServiceImpl.java
index 7f646ae..d90d39f 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/LoginServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/LoginServiceImpl.java
@@ -45,7 +45,7 @@ public class LoginServiceImpl implements LoginService {
         hmap.put("Content-Type","application/json");
 
         //执行请求
-        JSONObject jsonObject = RequestUtils.GetData(path,hmap);
+        JSONObject jsonObject = RequestUtils.GetData(path,hmap,true);
         log.debug("request result:"+jsonObject.toString());
 
         String code = jsonObject.getString("resultCode");
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java
index 31a05d3..43dc87a 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java
@@ -68,7 +68,7 @@ public class UserServiceImpl implements UserService {
         //hmap.put("Content-Type","application/json");
 
         //执行请求
-        JSONObject json = RequestUtils.GetData(userUrl,hmap);
+        JSONObject json = RequestUtils.GetData(userUrl,hmap,true);
         log.info("request result:"+json);
         // json 内容转为map
         Map rmap = JSONObject.parseObject(json.getString("data"));
diff --git a/src/main/java/cn/chjyj/szwh/utils/RequestUtils.java b/src/main/java/cn/chjyj/szwh/utils/RequestUtils.java
index fd5cae0..924ae7d 100644
--- a/src/main/java/cn/chjyj/szwh/utils/RequestUtils.java
+++ b/src/main/java/cn/chjyj/szwh/utils/RequestUtils.java
@@ -31,9 +31,10 @@ public class RequestUtils {
      * 能设置请求头的get方式
      * @param surl
      * @param map
+     * @param wflag 是否写入json文件
      * @return
      */
-    public static JSONObject GetData(String surl, Map<String,Object> map){
+    public static JSONObject GetData(String surl, Map<String,Object> map,boolean wflag){
         JSONObject jsonObject = new JSONObject();
         try{
             URL url = new URL(surl);
@@ -51,13 +52,16 @@ public class RequestUtils {
             InputStream inputStream = httpcon.getInputStream();
             //请求结果写入
             String filename =String.valueOf(Calendar.getInstance().getTimeInMillis());
-            SzFileUtils.createFile(inputStream,filename);
-            //字节转为utf-8
-            String message=SzFileUtils.readJson(filename);
-            if(message!=null){
-                jsonObject = JSONObject.parseObject(message);
+            if(wflag){
+                SzFileUtils.createFile(inputStream,filename);
+                //字节转为utf-8
+                String message=SzFileUtils.readJson(filename);
+                if(message!=null){
+                    jsonObject = JSONObject.parseObject(message);
+                    logger.info("respone message :"+message);
+                }
+                logger.info("respone message is null");
             }
-            logger.info("respone message :"+message);
         }catch (IOException ex){
             // 罗列出明细错误
             logger.error("请求错误:"+ex);
diff --git a/src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java b/src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java
index 718e2be..145cc52 100644
--- a/src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java
+++ b/src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java
@@ -37,7 +37,7 @@ public class SzwhApiUtils {
         hmap.put("token",sign);
         hmap.put("Content-Type","application/json");
         //执行请求
-        JSONObject json = RequestUtils.GetData(userUrl,hmap);
+        JSONObject json = RequestUtils.GetData(userUrl,hmap,false);
         log.info("request result:"+json);
         return json;
     }
@@ -78,7 +78,7 @@ public class SzwhApiUtils {
         System.out.println("token :"+sign);
         Map hmap = new HashMap();
         hmap.put("entrust_token",sign);
-        JSONObject json = RequestUtils.GetData(url,hmap);
+        JSONObject json = RequestUtils.GetData(url,hmap,false);
         return json;
     }
 
@@ -94,7 +94,7 @@ public class SzwhApiUtils {
         String sign=SignUtils.createSign("entrust");
         Map hmap = new HashMap();
         hmap.put("entrust_token",sign);
-        JSONObject json = RequestUtils.GetData(url,hmap);
+        JSONObject json = RequestUtils.GetData(url,hmap,true);
         return json;
     }
     /**
diff --git a/src/test/java/cn/chjyj/szwh/ApiTest.java b/src/test/java/cn/chjyj/szwh/ApiTest.java
index 322621c..8957a5d 100644
--- a/src/test/java/cn/chjyj/szwh/ApiTest.java
+++ b/src/test/java/cn/chjyj/szwh/ApiTest.java
@@ -64,7 +64,7 @@ public class ApiTest {
         // 请求头
         Map<String, Object> hmap = new HashMap();
         hmap.put("entrust_token", sign);
-        JSONObject jsonObject = RequestUtils.GetData(url, hmap);
+        JSONObject jsonObject = RequestUtils.GetData(url, hmap,true);
         // 抽取data
        // String data = jsonObject.getString("data");
         JSONArray jsonArray = jsonObject.getJSONArray("data");