diff --git a/client/src/main/java/com/small/client/controller/WebController.java b/client/src/main/java/com/small/client/controller/WebController.java index bcb6f051..9f8a53cc 100644 --- a/client/src/main/java/com/small/client/controller/WebController.java +++ b/client/src/main/java/com/small/client/controller/WebController.java @@ -31,7 +31,16 @@ public class WebController { public void synBrand(){ log.info("synBrand"); // sxDataService.getAppSign(); - sxDataService.SyncBranchList(new DataBaseInfo(),sxDataService.getCommentModel()); + CommentModel commentModel= sxDataService.getCommentModel(); + DataBaseInfo dataBaseInfo=sxDataService.getDataBaseInfo(commentModel); + if(dataBaseInfo==null){ + log.error("syncGoods dataBaseInfo is null"); + return; + } + if(ObjectUtil.isNotEmpty(dataBaseInfo.getRefreshTime())){ + commentModel.setSyncTime(DateUtil.formatDateTime(dataBaseInfo.getRefreshTime())); + } + sxDataService.SyncBranchList(dataBaseInfo,sxDataService.getCommentModel()); } @RequestMapping("/syncCategory") diff --git a/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java b/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java index da867c12..4c997889 100644 --- a/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java +++ b/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java @@ -75,7 +75,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService */ @Override public void SyncCategory(DataBaseInfo dataBaseInfo, CommentModel commentModel) { - dataBaseInfo= getDataBaseInfo(commentModel); + // dataBaseInfo= getDataBaseInfo(commentModel); // 记录总数 Integer total = sxDataDao.getTBdItemClsTotal(dataBaseInfo); if(total==0){ @@ -100,7 +100,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService } catch (Exception e) { throw new RuntimeException(e); } - String sign=CommonUtil.generateOpenSign(jsonString,commentModel.getAppId(),commentModel.getAppKey()); + String sign=CommonUtil.generateOpenSign(jsonString,commentModel.getAppKey(),commentModel.getAppId()); log.info("sign:{}",sign); String code= HttpUtils.postData(restTemplate,remoteIp+HttpUtils.URL_SYNC_CATEGORY +"?appKey="+commentModel.getAppKey() @@ -150,7 +150,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService */ @Override public void SyncBranchList(DataBaseInfo dataBaseInfo, CommentModel commentModel) { - dataBaseInfo= getDataBaseInfo(commentModel); + // dataBaseInfo= getDataBaseInfo(commentModel); List brandModels= sxDataDao.getBdBrandList(dataBaseInfo); if(brandModels!=null&&brandModels.size()>0){ String jsonString =""; @@ -163,7 +163,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService } catch (Exception e) { throw new RuntimeException(e); } - String sign=CommonUtil.generateOpenSign(jsonArray.toString(),commentModel.getAppId(),commentModel.getAppKey()); + String sign=CommonUtil.generateOpenSign(jsonString,commentModel.getAppKey(),commentModel.getAppId()); log.info("sign={}",sign); String code= HttpUtils.postData(restTemplate,remoteIp+HttpUtils.URL_SYNC_BRAND +"?appKey="+commentModel.getAppKey() @@ -184,7 +184,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService */ @Override public void SyncVipList(DataBaseInfo dataBaseInfo, CommentModel commentModel) { - dataBaseInfo= getDataBaseInfo(commentModel); + // dataBaseInfo= getDataBaseInfo(commentModel); String where="where mobile is not null and mobile <>'' "; if(StringUtils.isNotEmpty(commentModel.getSyncTime())){ where+="and oper_date > '"+commentModel.getSyncTime()+"'"; @@ -207,7 +207,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService memberList=ConverList(sxSyncVipList); Gson gson=new Gson(); String jsonString = gson.toJson(memberList); - String sign=CommonUtil.generateOpenSign(jsonString,commentModel.getAppId(),commentModel.getAppKey()); + String sign=CommonUtil.generateOpenSign(jsonString,commentModel.getAppKey(),commentModel.getAppId()); String code= HttpUtils.postData(restTemplate,remoteIp+HttpUtils.URL_SYNC_MEMBER +"?appKey="+commentModel.getAppKey() +"&sign="+sign,memberList);//todo 后期改为文件传输 @@ -386,7 +386,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService String fileName=fileUtils.getFileName(syncType,page,FileUtils.txtEnd); String filePath=file.getAbsolutePath(); fileUtils.writeFile(filePath,fileName,content); - String sign=CommonUtil.generateOpenSign(content,commentModel.getAppId(),commentModel.getAppKey()); + String sign=CommonUtil.generateOpenSign(content,commentModel.getAppKey(),commentModel.getAppId()); commentModel.setSign(sign); return webClientService.uploudSxData(filePath+FileUtils.pathSeparator+fileName,commentModel,page.toString(),syncType); } @@ -729,7 +729,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService .create(); String jsonString= gson.toJson(activeDtos); JSONArray jsonArray = JSONUtil.parseArray(jsonString); - String sign=CommonUtil.generateOpenSign(jsonString,commentModel.getAppId(),commentModel.getAppKey()); + String sign=CommonUtil.generateOpenSign(jsonString,commentModel.getAppKey(),commentModel.getAppId()); String code= HttpUtils.postData(restTemplate,remoteIp+HttpUtils.URL_SYNC_ACTIVE +"?appKey="+commentModel.getAppKey() +"&sign="+sign, jsonArray); @@ -771,7 +771,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService .create(); String jsonString=gson.toJson(activeDtos); JSONArray jsonArray = JSONUtil.parseArray(jsonString); - String sign=CommonUtil.generateOpenSign(jsonString,commentModel.getAppId(),commentModel.getAppKey()); + String sign=CommonUtil.generateOpenSign(jsonString,commentModel.getAppKey(),commentModel.getAppId()); String code= HttpUtils.postData(restTemplate,remoteIp+HttpUtils.URL_SYNC_ACTIVE_SHOP +"?appKey="+commentModel.getAppKey() +"&sign="+sign, jsonArray);