yaozhixue il y a 1 an
Parent
commit
abbd9ec858

+ 3 - 0
src/main/java/com/zfire/jiasm/syncdata/service/impl/BaseDownServiceImpl.java

@@ -2,6 +2,7 @@ package com.zfire.jiasm.syncdata.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.InterFaceTypeEnum;
 import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
@@ -317,6 +318,8 @@ public class BaseDownServiceImpl implements BaseDownService {
         if (jsonArray != null) {
             log.info("格力品牌安装销售类型下载了{}条数据",jsonArray.size());
 
+            log.info("格力品牌安装销售类型下载了{}", JSONObject.toJSONString(jsonArray));
+
             try{
                 glppxslxDownloadService.extractedXSLX(jsonArray);
                 jsonArray.clear();

+ 5 - 2
src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPXSLXDownloadServiceImpl.java

@@ -47,6 +47,7 @@ public class GLPPXSLXDownloadServiceImpl implements GLPPXSLXDownloadService {
     private void extractedLocalXSLXAddOrUpdate(List<ItfTblAzAssignXslxDowload> addRec, List<ItfTblAzAssignXslxDowload> updateRec) {
         List<SysDict> addSysDict = new ArrayList<>();
         List<SysDict> updateSysDict = new ArrayList<>();
+        List<Long> sxlxids = new ArrayList<>();
 
         // 提取大类字典数据  sysDictService
         List<SysDict> oldSysDictRec =  sysDictService.lambdaQuery().eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_SALE_TYPE.getCode()).list();
@@ -57,9 +58,10 @@ public class GLPPXSLXDownloadServiceImpl implements GLPPXSLXDownloadService {
         // 获取新增的
         if (addRec.size()>0){
             for (ItfTblAzAssignXslxDowload item : addRec){
-                if (!oldSysDictRecMap.containsKey(String.valueOf(item.getXslxid()))){
+                if (!oldSysDictRecMap.containsKey(String.valueOf(item.getXslxid())) && !sxlxids.contains(item.getXslxid())){
                     // 新增
                     addXslx(addSysDict, item);
+                    sxlxids.add(item.getXslxid());
                 } else {
                     // 修改
                     upXslx(updateSysDict, oldSysDictRecMap, item);
@@ -69,12 +71,13 @@ public class GLPPXSLXDownloadServiceImpl implements GLPPXSLXDownloadService {
         // 获取修改的
         if (updateRec.size()>0){
             for (ItfTblAzAssignXslxDowload item : updateRec){
-                // 修改
                 if (oldSysDictRecMap.containsKey(String.valueOf(item.getXslxid()))){
+                    // 修改
                     upXslx(updateSysDict, oldSysDictRecMap, item);
                 } else {
                     // 新增
                     addXslx(addSysDict, item);
+                    sxlxids.add(item.getXslxid());
                 }
             }
         }

+ 1 - 1
src/main/resources/bootstrap-prd.properties

@@ -195,7 +195,7 @@ masterdownloadrate=60000
 masterrate=10000
 guzdm=7200000
 #网点 佛山销售网点|售后网点、广州销售网点|售后网点
-netfsx=600000
+netfsx=60000
 netfss=600000
 netgzx=600000
 netgzs=600000