|
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.validation.constraints.Null;
|
|
import javax.validation.constraints.Null;
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
|
|
+import java.nio.charset.StandardCharsets;
|
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
@@ -214,8 +215,15 @@ public class GEServiceImpl implements GEService {
|
|
|
HttpResultResponse resultResponse = null;
|
|
HttpResultResponse resultResponse = null;
|
|
|
//头部请求参数
|
|
//头部请求参数
|
|
|
Map<String,String> headerMap = new HashMap<>();
|
|
Map<String,String> headerMap = new HashMap<>();
|
|
|
- headerMap.put("user","WD");
|
|
|
|
|
- headerMap.put("password","WD@test+1");
|
|
|
|
|
|
|
+ /*headerMap.put("user","WD");
|
|
|
|
|
+ headerMap.put("password","WD@test+1");*/
|
|
|
|
|
+ String username = "WD";
|
|
|
|
|
+ String password = "WD@test+1";
|
|
|
|
|
+ String auth = username + ":" + password;
|
|
|
|
|
+ String encodedAuth = Base64.getEncoder()
|
|
|
|
|
+ .encodeToString(auth.getBytes(StandardCharsets.UTF_8));
|
|
|
|
|
+ headerMap.put("Authorization", "Basic " + encodedAuth);
|
|
|
|
|
+ headerMap.put("Content-Type", "application/json; charset=UTF-8");
|
|
|
AsnDetDTO asnDetDTO = new AsnDetDTO();
|
|
AsnDetDTO asnDetDTO = new AsnDetDTO();
|
|
|
AsnDTO aAsnDTO = new AsnDTO();
|
|
AsnDTO aAsnDTO = new AsnDTO();
|
|
|
SqlRowList rs = baseDao.queryForRowSet("select as_transid,as_asnno,TO_CHAR(as_recorddate, 'yyyy-MM-dd hh24:mi:ss') as_recorddate,TO_CHAR(asd_senddate, 'yyyy-MM-dd hh24:mi:ss') asd_senddate, " +
|
|
SqlRowList rs = baseDao.queryForRowSet("select as_transid,as_asnno,TO_CHAR(as_recorddate, 'yyyy-MM-dd hh24:mi:ss') as_recorddate,TO_CHAR(asd_senddate, 'yyyy-MM-dd hh24:mi:ss') asd_senddate, " +
|