【盛威尔-华润微】

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -8,11 +8,14 @@ import com.uas.eis.dao.*;
 import com.uas.eis.service.CommonService;
 import com.uas.eis.service.ERPService;
 import com.uas.eis.utils.HttpUtil;
+import com.uas.eis.utils.JSONUtil;
+import com.uas.eis.utils.StringUtil;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import java.io.OutputStream;
@@ -66,13 +69,30 @@ public class ERPServiceImpl implements ERPService {
         System.out.println("ssdp:"+ssdp);
         String url=API_URL+"?ssdp="+ssdp;
         HttpUtil.Response response = HttpUtil.doPost(url, reqData, false, null);
-        String res=response.getResponseText();
-        System.out.println("res:"+res);
-        //{"returnCode":0,"returnMsg":"SECCUSS"}
-        String logSql="insert into dockProdIOLog(id_,date_,keyvalue,action_,time_Stamp,sign,ssdp,reqData,res) " +
-                " values(DOCKPRODIOLOG_SEQ.nextval,sysdate,"+id+",'"+action+"','"+time_Stamp+"','"+sign+"','"+ssdp+"','"+reqData+"','"+res+"')";
-        baseDao.execute(logSql);
-        return Collections.emptyMap();
+        if (response.getStatusCode() == HttpStatus.OK.value()){
+            String res=response.getResponseText();
+            if(StringUtil.hasText(res)){
+                Map<Object, Object> resMap = JSONUtil.toMap(res);
+                String logSql="insert into dockProdIOLog(id_,date_,keyvalue,action_,time_Stamp,sign,ssdp,reqData,res) " +
+                        " values(DOCKPRODIOLOG_SEQ.nextval,sysdate,"+id+",'"+action+"','"+time_Stamp+"','"+sign+"','"+ssdp+"','"+reqData+"','"+res+"')";
+                baseDao.execute(logSql);
+                modelMap.put("code",resMap.get("returnCode"));
+                modelMap.put("message",resMap.get("returnMsg"));
+                modelMap.put("success", true);
+            }else{
+                String logSql="insert into dockProdIOLog(id_,date_,keyvalue,action_,time_Stamp,sign,ssdp,reqData) " +
+                        " values(DOCKPRODIOLOG_SEQ.nextval,sysdate,"+id+",'"+action+"','"+time_Stamp+"','"+sign+"','"+ssdp+"','"+reqData+"')";
+                baseDao.execute(logSql);
+                modelMap.put("success", true);
+            }
+        }else{
+            String logSql="insert into dockProdIOLog(id_,date_,keyvalue,action_,time_Stamp,sign,ssdp,reqData) " +
+                    " values(DOCKPRODIOLOG_SEQ.nextval,sysdate,"+id+",'"+action+"','"+time_Stamp+"','"+sign+"','"+ssdp+"','"+reqData+"')";
+            baseDao.execute(logSql);
+            modelMap.put("code",response.getStatusCode());
+            modelMap.put("success", false);
+        }
+        return modelMap;
     }
 
     /**