正式环境参数修改

core/src/main/java/com/hand/app/pingAn/controllers/PingAnController.java

@@ -45,9 +45,10 @@ public class PingAnController extends BaseController {
     @ApiModelProperty("明细通知接口(BEDL_ZNA001)")
     @RequestMapping("/api/public/pingAn/notify")
     @ResponseBody
-    public ResponseData DetailsNotify(HttpServletRequest request, JSONObject data){
+    public String DetailsNotify(HttpServletRequest request, JSONObject data){
         IRequest iRequest = createRequestContext(request);
-        return pingAnService.detailNotify(iRequest,data);
+        pingAnService.detailNotify(iRequest,data);
+        return "A001010101009010800000099910000000001939ZNA001123450120120620151810201206180000011037  000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
     }
 
     @ApiModelProperty("清分台账明细下载(BEDL_F0P101)")

core/src/main/java/com/hand/app/pingAn/service/impl/PingAnServiceImpl.java

@@ -87,6 +87,7 @@ public class PingAnServiceImpl implements PingAnService {
         /*插入接口日志表*/
         HlsWsRequests hlsWsRequests = new HlsWsRequests();
         hlsWsRequests = createRequestLog(pro.getProperty("baseUrl") + "/V1.0/" + interfaceName, requestBody.toJSONString(), 1L);
+        logger.info("发送接口:" + interfaceName + "请求,请求参数: {}", requestBody.toString());
         try {
             HttpResult result = ApiUtils.invoke(interfaceName, requestBody);
             if (Objects.nonNull(result)) {
@@ -106,11 +107,11 @@ public class PingAnServiceImpl implements PingAnService {
                     }
                     responseData.put("data", res);
                     // 具体业务是否请求成功判定,目前观察成功请求可能没有Code值
-                    if ("000000".equals(res.getString("Code")) || Objects.isNull(res.getString("Code"))) {
+                    if (Objects.isNull(res.getString("Code")) || "000000".equals(res.getString("Code"))) {
                         if ("bedl/DetailReportQueryNew".equals(interfaceName)) {
                             dowloadDetailFile(res);
                         }
-                        hlsWsRequests.setReturnStatus("s");
+                        hlsWsRequests.setReturnStatus("S");
                         responseData.put(Constants.RESP_CODE, "0000");
                         responseData.put("respMsg", "请求成功");
                     } else {
@@ -125,7 +126,7 @@ public class PingAnServiceImpl implements PingAnService {
                     }
                 } else {
                     //请求失败
-                    hlsWsRequests.setReturnStatus("f");
+                    hlsWsRequests.setReturnStatus("E");
                     JSONObject errRes = JSONObject.parseObject(result.getData());
                     responseData.put(Constants.RESP_CODE, result.getCode());
                     responseData.put(Constants.RESP_MSG, "请求失败");
@@ -189,6 +190,7 @@ public class PingAnServiceImpl implements PingAnService {
             headInfo.put("Content-Type", "application/x-www-form-urlencoded");
             JSONObject requestData = new JSONObject();
             requestData.put("requestData", params);
+            logger.info("发送接口:writeOffLd016请求,请求参数: {}", requestData.toString());
             //发送http请求
             SignHclcUtils signHclcUtils1 = new SignHclcUtils();
             String stringResult = signHclcUtils1.postString(url, requestData, headInfo, SignHclcUtils.APPLICATION_FORM_URLENCODED);

core/src/main/resources/logback.xml

@@ -85,6 +85,25 @@
         </sift>
     </appender>
 
+    <appender name="PAB-FILE" class="ch.qos.logback.classic.sift.SiftingAppender">
+        <discriminator>
+            <key>logName</key>
+            <defaultValue>default</defaultValue>
+        </discriminator>
+        <sift>
+            <appender name="REQ-${logName}" class="ch.qos.logback.core.rolling.RollingFileAppender">
+                <encoder>
+                    <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%X{userId}] [%X{requestId}] %logger - %msg%n
+                    </pattern>
+                </encoder>
+                <file>${catalina.base}/logs/hls-pab-${logName}.log</file>
+                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+                    <fileNamePattern>${catalina.base}/logs/%d{yyyy-MM-dd}/hls-pab-${logName}.log</fileNamePattern>
+                </rollingPolicy>
+            </appender>
+        </sift>
+    </appender>
+
 
     <root level="ERROR">
         <appender-ref ref="STDOUT"/>
@@ -143,4 +162,7 @@
     <logger name="com.hand.app.cmb.service.impl.HclcCmbPolyServiceImpl" level="INFO" additivity="false">
         <appender-ref ref="CMB-FILE"/>
     </logger>
+    <logger name="com.hand.app.pingAn.service.impl.PingAnServiceImpl" level="INFO" additivity="false">
+        <appender-ref ref="PAB-FILE"/>
+    </logger>
 </configuration>
\ No newline at end of file

core/src/main/resources/pingAn.properties

@@ -7,3 +7,5 @@ fileUploadUrl=https://my-st1.orangebank.com.cn:567/fat7/openapi/file/boapFile/up
 fileDownLoadUrl=https://my-st1.orangebank.com.cn:567/fat7/openapi/file/boapFile/download
 queryOrderFileUrl=https://my-st1.orangebank.com.cn:567/fat7/openapi/file/boapFile/queryOrderFile
 fileDownLoadOrderFileUrl=https://my-st1.orangebank.com.cn:567/fat7/openapi/file/boapFile/downloadOrderFile
+MrchCode=0090108040000KTAR000
+AcctNo=15000101414037
\ No newline at end of file