fix:调试bug修改

dxhy-consumer/pom.xml

@@ -18,6 +18,16 @@
     </properties>
     <dependencies>
 
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+            <version>2.7.0</version>
+        </dependency>
 
         <!-- Spring Boot Web引用-->
         <dependency>

dxhy-consumer/src/main/resources/bootstrap.yaml

@@ -6,7 +6,7 @@ spring:
     name: sims-api
   profiles:
     # Spring 配置文件读取
-    active: @deployType@
+    active: std
     #active: test
   jackson:
     # jackson 日期格式化
@@ -92,4 +92,4 @@ logging:
     name: ${spring.application.name}
     path: /data/logs
   level:
-    root: info
+    root: debug

order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderMapper.java

@@ -14,7 +14,7 @@ public interface YyOrderMapper {
     List<YyOrderInfo> findOrderHeadList(ReqParam reqParam);
 
     //订单明细读取
-    List<YyOrderItemInfo> findOrderDetailList(String cdlcode);
+    List<YyOrderItemInfo> findOrderDetailList(String cpznum);
 
     //插入回写信息
     int insertBackMsg(NewTable newTable);

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/config/FtpProperties.java

@@ -2,8 +2,10 @@ package com.dxhy.order.consumer.modules.bespoke.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 
 @Data
+@Component
 @ConfigurationProperties(prefix = "ftp")
 public class FtpProperties {
 

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/config/ServiceConfig.java

@@ -16,6 +16,10 @@ public class ServiceConfig {
         return choose.get(nsrsbh);
     }
 
+    public Map<String,String> getChoose(){
+        return choose;
+    }
+
 
     public void setService(Map<String,String> choose){
         this.choose = choose;

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/controller/OrderHandleController.java

@@ -18,10 +18,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
+
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
@@ -258,5 +256,10 @@ public class OrderHandleController {
 
     }
 
+    @GetMapping("/test")
+    public boolean test(){
+        return orderHandleService.test();
+    }
+
 
 }

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderHandleService.java

@@ -65,4 +65,5 @@ public interface OrderHandleService {
      */
     R backMsg(String msg);
 
+    boolean test();
 }

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/DefaultFtpProcessor.java

@@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.pool2.ObjectPool;
+import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 import java.io.*;
 import java.util.ArrayList;

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson2.JSON;
 import com.dxhy.base.common.constant.ConfigureConstant;
 import com.dxhy.base.common.constant.OrderInfoEnum;
 import com.dxhy.base.common.model.OrderInfo;
@@ -382,6 +383,14 @@ public class OrderHandleServiceImpl implements OrderHandleService {
         return r;
     }
 
+    @Override
+    public boolean test() {
+        ByteArrayInputStream utf8Stream = IoUtil.toUtf8Stream("独有英雄驱虎豹，更无豪杰怕熊罴");
+
+        boolean flag = ftpProcessor.uploadFile(ftpProperties.getBasePath()+"/test", "poem.txt", utf8Stream);
+        return flag;
+    }
+
     private void updatePushErrorMsgToDb(String fpqqlsh, String errorMessage, List<String> shList) {
         if (StringUtils.isNotBlank(fpqqlsh) && CollUtil.isNotEmpty(shList)) {
             OrderInvoiceInfo orderQuery = new OrderInvoiceInfo();

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java

@@ -77,27 +77,33 @@ public class YyOrderServiceImpl implements OrderService {
     //订单读入
     @Override
     public R orderRead(ReqParam reqParam) {
-
         int count = ConfigureConstant.INT_0;
 
-        DynamicContextHolder.push(reqParam.getNsrsbh());
+        try {
-        List<YyOrderInfo> yyOrderInfoList = yyOrderMapper.findOrderHeadList(reqParam);
+            DynamicContextHolder.push(reqParam.getNsrsbh());
-        log.debug("查询到订单数据:{}", JSON.toJSONString(yyOrderInfoList));
+            List<YyOrderInfo> yyOrderInfoList = yyOrderMapper.findOrderHeadList(reqParam);
+            log.debug("查询到订单数据:{}", JSON.toJSONString(yyOrderInfoList));
 
-        if (CollectionUtils.isNotEmpty(yyOrderInfoList)) {
+            if (CollectionUtils.isNotEmpty(yyOrderInfoList)) {
 
-            for (YyOrderInfo yyOrderInfo : yyOrderInfoList) {
+                for (YyOrderInfo yyOrderInfo : yyOrderInfoList) {
 
-                DynamicContextHolder.push(reqParam.getNsrsbh());
+                    DynamicContextHolder.push(reqParam.getNsrsbh());
-                List<YyOrderItemInfo> yyOrderItemInfoList = yyOrderMapper.findOrderDetailList(yyOrderInfo.getCdlcode());
+                    List<YyOrderItemInfo> yyOrderItemInfoList = yyOrderMapper.findOrderDetailList(yyOrderInfo.getCpznum());
-                log.debug("查询到订单明细数据:{}", JSON.toJSONString(yyOrderItemInfoList));
+                    log.debug("查询到订单明细数据:{}", JSON.toJSONString(yyOrderItemInfoList));
 
-                if (CollectionUtils.isNotEmpty(yyOrderItemInfoList)) {
+                    if (CollectionUtils.isNotEmpty(yyOrderItemInfoList)) {
-                    DynamicContextHolder.push(ConfigureConstant.MAIN);
+                        DynamicContextHolder.push(ConfigureConstant.MAIN);
-                    count += saveOrder(yyOrderInfo, yyOrderItemInfoList, reqParam);
+                        count += saveOrder(yyOrderInfo, yyOrderItemInfoList, reqParam);
 
+                    }
                 }
             }
+        }catch (Exception e){
+            log.error("订单读取异常",e);
+            return R.error("订单读取异常");
+        }finally {
+            DynamicContextHolder.push(ConfigureConstant.MAIN);
         }
         return R.ok("成功读取" + count + "条订单数据");
     }

order-management-order/src/main/resources/mybatis/mapper/YyOrderItemInfoMapper.xml

@@ -63,6 +63,9 @@
             <if test="updateTime != null">
                 update_time,
             </if>
+            <if test="yyItemId != null">
+                yy_item_id,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -104,6 +107,9 @@
             <if test="updateTime != null">
                 #{updateTime},
             </if>
+            <if test="yyItemId != null">
+                #{yyItemId},
+            </if>
         </trim>
     </insert>
 

order-management-order/src/main/resources/mybatis/mapper/YyOrderMapper.xml

@@ -27,7 +27,7 @@
 
     <select id="findOrderDetailList" resultType="com.dxhy.order.consumer.modules.bespoke.model.yy.YyOrderItemInfo"
             parameterType="java.lang.String">
-        select id as yyItemId,
+        select sbvid as yyItemId,
                cinvname,
                cinvstd,
                ccomunitname,
@@ -37,7 +37,7 @@
                itaxrate,
                itax
         from v_invoice_detail
-        where cdlcode = #{xsddm}
+        where cpznum = #{cpznum}
     </select>
 
     <insert id="insertBackMsg" parameterType="com.dxhy.order.consumer.modules.bespoke.model.yy.NewTable">

sims-base-service/src/main/java/com/dxhy/base/service/module/thirdservice/user/model/oldusercenter/SsoUser.java

@@ -2,7 +2,6 @@ package com.dxhy.base.service.module.thirdservice.user.model.oldusercenter;
 
 import lombok.Getter;
 import lombok.Setter;
-
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;