add

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPLeiBieServiceImpl.java

@@ -140,21 +140,29 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
         Map<String, List<SysDict>> oldSysDictRecXMap = new HashMap<>();
         Map<String, List<ProductSeries>> oldpsMap = new HashMap<>();
 
+        log.info("格力产品系列 a");
+
         // 提取大类字典数据
         oldSysDictRec =  sysDictService.lambdaQuery()
                 .eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_MAIN_TYPE.getCode())
                 .list();
         if (CollectionUtils.isNotEmpty(oldSysDictRec)){
             oldSysDictRecMap = oldSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictCode));
+            oldSysDictRec.clear();
         }
 
+        log.info("格力产品系列 b");
+
         // 提取小类字典数据  sysDictService
         oldSysDictXRec =  sysDictService.lambdaQuery()
                 .eq(SysDict::getDictType,DictTypeEnum.DICT_TYPE_SMALL_TYPE.getCode()).list();
         if (CollectionUtils.isNotEmpty(oldSysDictXRec)){
             oldSysDictRecXMap = oldSysDictXRec.stream().collect(Collectors.groupingBy(SysDict::getDictCode));
+            oldSysDictXRec.clear();
         }
 
+        log.info("格力产品系列 c");
+
         // 提取现有数据防重使用
         List<ProductSeries> oldps =  productSeriesService.lambdaQuery().list();
         if (CollectionUtils.isNotEmpty(oldps)){
@@ -162,10 +170,15 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
                 xlid.add(en.getXlId());
             });
             oldpsMap = oldps.stream().collect(Collectors.groupingBy(ProductSeries::getXlId));
+            oldps.clear();
         }
 
+        log.info("格力产品系列 d");
+
         // 获取新增的
         if (addRec.size()>0){
+            log.info("格力产品系列 e");
+
             for (ItfTblSplbXilieDownload item : addRec){
                 if (xlid.contains(item.getId())){
                     upProductSeries(brandRec, upps, oldSysDictRecMap, oldSysDictRecXMap, oldpsMap, item);
@@ -177,6 +190,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
         }
         // 获取修改的
         if (updateRec.size()>0){
+            log.info("格力产品系列 f");
             for (ItfTblSplbXilieDownload item : updateRec){
                 if (xlid.contains(item.getId())){
                     upProductSeries(brandRec, upps, oldSysDictRecMap, oldSysDictRecXMap, oldpsMap, item);
@@ -187,6 +201,8 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
             }
         }
 
+        log.info("格力产品系列 g {}-{}",addps.size(),upps.size());
+
         // 新增的插入到表
         if (addps.size()>0){
             productSeriesService.saveBatch(addps);
@@ -199,6 +215,10 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
             log.info("本地系列信息表更新修改了{}条数据", upps.size());
             upps.clear();
         }
+        oldSysDictRecMap.clear();
+        oldSysDictRecXMap.clear();
+        oldpsMap.clear();
+        xlid.clear();
     }
 
     private void upProductSeries(Brand brandRec, List<ProductSeries> upps, Map<String, List<SysDict>> oldSysDictRecMap, Map<String, List<SysDict>> oldSysDictRecXMap, Map<String, List<ProductSeries>> oldpsMap, ItfTblSplbXilieDownload item) {
@@ -1269,6 +1289,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
                 .eq(SysDict::getDictType,DictTypeEnum.DICT_TYPE_SERIES.getCode()).list();
         if (CollectionUtils.isNotEmpty(oldSysDictRec)){
             oldSysDictRecMap = oldSysDictRec.stream().collect(Collectors.groupingBy(SysDict::getDictCode));
+            oldSysDictRec.clear();
         }
 
         // 获取新增的
@@ -1309,6 +1330,7 @@ public class GLPPLeiBieServiceImpl implements GLPPLeiBieService {
             log.info("本地字典信息表更新修改了{}条数据", updateSysDict.size());
         }
         xiids.clear();
+        oldSysDictRecMap.clear();
     }
 
     private void addSysDict(List<SysDict> addSysDict, ItfTblSplbXilieDownload item) {

src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceDataUploadServiceImpl.java

@@ -186,10 +186,10 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
 
                 // 数据上传任务表提取对应的任务类型数据
                 ojtutls = outJiasmToGreeUploadTaskListService.lambdaQuery()
-                        .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
+                        // .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
 
-                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,1051L) // 测试用
+                        .eq(OutJiasmToGreeUploadTaskList::getSynReqId,1699L) // 测试用
                         // .eq(OutJiasmToGreeUploadTaskList::getOrderNo,"A1691659257781723138") // 测试用
                         // .eq(OutJiasmToGreeUploadTaskList::getTableName,"order_base") // 测试用
 

src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceUploadListServiceImpl.java

@@ -274,16 +274,20 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode()) ||
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G10.getCode())){
             if (orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G6.getCode())){
-                OutJiasmToGreeUploadTaskList addo = publicService.getUploadTaskList(orderNo, orderBase.getId(), updateTime, itemTableName, itemOrderType, 221);
+                OutJiasmToGreeUploadTaskList addo = publicService.getUploadTaskList(orderNo, orderBase.getId(),
+                        updateTime, itemTableName, itemOrderType, 221);
                 ojtgutls.add(addo);
             } else if (orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G7.getCode()) ||
                     orderBase.getOrderStatus().equals(GDOrderStatusEnum.INSTALL_STATUS_G9.getCode())){
-                OutJiasmToGreeUploadTaskList addt = publicService.getUploadTaskList(orderNo, orderBase.getId(), updateTime, itemTableName, itemOrderType, 221);
+                OutJiasmToGreeUploadTaskList addt = publicService.getUploadTaskList(orderNo, orderBase.getId(),
+                        updateTime, itemTableName, itemOrderType, 221);
                 ojtgutls.add(addt);
-                OutJiasmToGreeUploadTaskList addtt = publicService.getUploadTaskList(orderNo, orderBase.getId(), orderBase.getUpdateTime(), itemTableName, itemOrderType, 222);
+                OutJiasmToGreeUploadTaskList addtt = publicService.getUploadTaskList(orderNo, orderBase.getId(),
+                        orderBase.getUpdateTime(), itemTableName, itemOrderType, 222);
                 ojtgutls.add(addtt);
             } else {
-                OutJiasmToGreeUploadTaskList addttt = publicService.getUploadTaskList(orderNo, orderBase.getId(), updateTime, itemTableName, itemOrderType, 222);
+                OutJiasmToGreeUploadTaskList addttt = publicService.getUploadTaskList(orderNo, orderBase.getId(),
+                        updateTime, itemTableName, itemOrderType, 222);
                 ojtgutls.add(addttt);
             }
         }

src/main/java/com/zfire/jiasm/syncdata/service/impl/OrderBaseInstallCjOrWgServiceImpl.java

@@ -1025,10 +1025,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                     if ((detail.getStatus().equals(1) || detail.getStatus().equals(2)) &&
                             (("cj".equals(cjOrWg) && detail.getIsCjSend().equals("NO")) ||
                                     ("wg".equals(cjOrWg) && detail.getIsWgSend().equals("NO")))) {
-
-                        log.info("测试信息a   id={} ",ojtutl.getSynReqId());
-
-
                         // 生成taskno,pgwcmxid 共用
                         String taskno = IdWorker.getIdStr();
 
@@ -1085,11 +1081,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         List<ItfTblazwgmxqita> qts =  itfTblazwgmxqitaService.lambdaQuery()
                 .eq(ItfTblazwgmxqita::getSynTaskNo,taskno).list();
         // 状态:3=临时保存;2=作废,1=已采集,0=未采集
-
-        log.info("测试信息b   id={}",ojtutl.getSynReqId());
-
         if (CollectionUtils.isNotEmpty(jys) || CollectionUtils.isNotEmpty(sys) || CollectionUtils.isNotEmpty(qts)){
-            log.info("测试信息 " );
             if ("cj".equals(cjOrWg)){
                 itemStatus = 1;
                 if (detail.getStatus().equals(1)){
@@ -1908,9 +1900,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         } else if (mainName.equals("商用空调")){
             // 商用空调 完工明细数据生成(完工采集数据)
             ItfTblAzWgmxSyktUpload mxup = detailOrderInstallMapper.getSyOrderInstallUploadCj(request);
-
-            log.info("测试信息 xx    id={}",synReqId);
-
             if (mxup != null){
                 // 部分参数单独处理
                 setSyParm(orderBase, lcls, cjstat, mxup, brand);
@@ -2363,10 +2352,10 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         // 网点维修工ID单独处理
         // 先找出网点编号对应的品牌商网点编号
         // 先从售后网点查
-        websitSH = publicService.ptshwdToshshwd(mxup.getCzwd(), orderBase.getMainId());
+        /*websitSH = publicService.ptshwdToshshwd(mxup.getCzwd(), orderBase.getMainId());
         if (StringUtils.isEmpty(websitSH.getWdId())){
             websitSH = publicService.ptxswdToshxswd(lcls.getXsdwno(), orderBase.getMainId());
-        }
+        }*/
     }
 
 

src/main/resources/bootstrap-prdt.properties

@@ -68,16 +68,15 @@ lbs.web.key=b772f8b0ace6bc96c04ae8e48f241e36
 jiasmorderurl=https://fw.gd-jxm.com/gateway/pcapi/order/temp/add
 
 #####################redis 单机版 start################
-spring.redis.port=6379
-spring.redis.host=r-wz9q6138q5rc83qced.redis.rds.aliyuncs.com
+spring.redis.port=6388
+spring.redis.host=121.43.111.127
 #redis密码
-spring.redis.password=Zfire2023$#@!
+spring.redis.password=private123@^
 spring.redis.lettuce.pool.max-active=300
 spring.redis.lettuce.pool.max-wait=1000ms
 spring.redis.lettuce.pool.max-idle=100
 spring.redis.lettuce.pool.min-idle=0
 spring.redis.timeout=100000ms
-
 ####################阿里云配置######################
 ali.access.key.id=LTAI5tQjvbfM1MD11aEEU9YG
 ali.access.key.secert=mvs3mjxYZcGfNSBuoRxgt1Pvq2OmBH
@@ -386,11 +385,11 @@ glscc=FALSE
 #天猫商城
 tmscc=FALSE
 #安装工单上传  生成需要上传的数据、生成上传任务清单列表
-azuploadyscc=FALSE
+azuploadyscc=TRUE
 azuploadscc=FALSE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
 wxuploadyscc=FALSE
-wxuploadscc=TRUE
+wxuploadscc=FALSE
 #以旧换新 鉴定单、生成条码、条码上传
 yjhxjddc=FALSE
 yjhxsctmc=FALSE