记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 5a17300f authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge branch 'dev' into test

parents 0ab66c6a d391a743
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 40 deletions
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties
View file @ 5a17300f
adam_user.add=INSERT INTO adam_user (`uid`, mobile, `state`, is_complete, created_at) VALUES (?,?,?,?,?)
adam_user.complete=UPDATE adam_user SET is_complete=?, updated_at=? WHERE `uid`=?
adam_user.edit.mobile=UPDATE adam_user SET mobile=?, updated_at=? WHERE `uid`=?
adam_user.close=UPDATE adam_user SET `state`=2, updated_at=?, closed_at=? WHERE `uid`=?
adam_user.close=UPDATE adam_user SET `state`=2, mobile=concat(mobile,curdate()), updated_at=?, closed_at=? WHERE `uid`=?
# ----------------------------------------------------
adam_user_info.add=INSERT INTO adam_user_info (`uid`, nickname, avatar, qr_code) VALUES (?,?,?,?)
......@@ -13,7 +13,7 @@ adam_real_name.add=INSERT INTO adam_real_name (real_name_id, `uid`, `type`, `nam
# ----------------------------------------------------
adam_third_party.add=INSERT INTO adam_third_party (`uid`, open_id, avatar, nickname, platform, `state`, created_at) values (?,?,?,?,?,?,?)
adam_third_party.unbind=UPDATE adam_third_party SET `state`=2, updated_at=? WHERE `uid`=? AND platform=?
adam_third_party.close=UPDATE adam_third_party SET `state`=2, updated_at=?, comment='close' WHERE `uid`=?
adam_third_party.close=UPDATE adam_third_party SET `state`=2, open_id=concat(open_id, curdate()), updated_at=?, comment='close' WHERE `uid`=?
# ----------------------------------------------------
adam_addresses.add=INSERT INTO adam_addresses (addresses_id, `uid`, `name`, phone, province, city, county, address, is_default, `state`, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?)
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/BannersServiceImpl.java
View file @ 5a17300f
......@@ -63,20 +63,20 @@ public class BannersServiceImpl implements IKylinBannersService {
}
// list
if (bannerInfo.getPromotionType() != 1) {
List<String> pList = bannerInfo.getPositionList();
Boolean pis = false;
if (null != pList) {
for (String positionName : pList) {
if (positionName.equals(position)) {
pis = true;
}
List<String> pList = bannerInfo.getPositionList();
Boolean pis = false;
if (null != pList) {
for (String positionName : pList) {
if (positionName.equals(position)) {
pis = true;
}
}
if (!pis || null == pList) {
itBannerList.remove();
}
}
if (!pis || null == pList) {
itBannerList.remove();
}
if (bannerInfo.getPromotionType() != 1) {
List<String> proList = bannerInfo.getProvincesList();
Boolean prois = false;
if (null != proList) {
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/express/shunfeng/PerformancesExpressCallbackServiceImpl.java
View file @ 5a17300f
......@@ -122,7 +122,7 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
public boolean orderRoute(@RequestBody String params) {
boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
if (true) {
if (res) {
PerformanceExpressPushRouteParam performanceExpressPushRouteParam = JsonUtils.fromJson(params, PerformanceExpressPushRouteParam.class);
KylinOrderExpressRoute kylinOrderExpressRoute = new KylinOrderExpressRoute();
String orderExpressRouteId = IDGenerator.nextSnowId();
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMAddressesProcessor.java
View file @ 5a17300f
......@@ -96,7 +96,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
dmRdmService.addAddressesVoByUid(uid, dmRdmService.getAddressesVoByUid(uid), vo);
}
if (addressesList.size() == 1000 || (addressesList.size() > 0 && smFlg) || ct < 1000) {
if (addressesList.size() == 1000 || (addressesList.size() > 0 && smFlg) || ct <= 1000) {
tl += addressesList.size();
// mongoTemplate.insert(vos, AdamAddressesVo.class.getSimpleName());
log.info("DM.execute.limit.result:{}", dmAddressesService.saveBatch(addressesList));
......@@ -104,7 +104,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
addressesList.clear();
}
}
if (addressesList.size() > 0 && ct > 1000) {
if (addressesList.size() > 0) {
tl += addressesList.size();
log.info("DM.execute.limit.result:{}", dmAddressesService.saveBatch(addressesList));
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMCollectionProcessor.java
View file @ 5a17300f
......@@ -87,7 +87,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
collectionList.add(collection);
vos.add(AdamCollectBaseVo.getNew().copy(collection));
}
if (collectionList.size() == 1000 || (collectionList.size() > 0 && smFlg) || ct < 1000) {
if (collectionList.size() == 1000 || (collectionList.size() > 0 && smFlg) || ct <= 1000) {
tl += collectionList.size();
// mongoTemplate.insert(vos, AdamCollectBaseVo.class.getSimpleName());
log.info("DM.execute.limit.result:{}", dmCollectionService.saveBatch(collectionList));
......@@ -95,7 +95,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
collectionList.clear();
}
}
if (collectionList.size() > 0 && ct > 1000) {
if (collectionList.size() > 0) {
tl += collectionList.size();
log.info("DM.execute.limit.result:{}", dmCollectionService.saveBatch(collectionList));
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMEntersProcessor.java
View file @ 5a17300f
......@@ -60,7 +60,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
statement = connection.prepareStatement(sqlCount);
row = (ResultSetImpl) statement.executeQuery();
row.first();
int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
int ct = row.getInt(1), pSize = 3000, num = 0, tl = 0, pl = ct;
log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start.sql:{}", pl, num, pSize, tl, sql);
row.close();
......@@ -100,7 +100,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
}
dmRdmService.addEntersVoByUid(uid, dmRdmService.getEntersVoByUid(uid), vo);
}
if (entersList.size() == 1000 || (entersList.size() > 0 && smFlg) || ct < 1000) {
if (entersList.size() == 1000 || (entersList.size() > 0 && smFlg) || ct <= 1000) {
tl += entersList.size();
// mongoTemplate.insert(vos, AdamEntersVo.class.getSimpleName());
log.info("DM.execute.limit.result:{}", dmEntersService.saveBatch(entersList));
......@@ -108,7 +108,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
entersList.clear();
}
}
if (entersList.size() > 0 && ct > 1000) {
if (entersList.size() > 0) {
tl += entersList.size();
log.info("DM.execute.limit.result:{}", dmEntersService.saveBatch(entersList));
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMMemberCodeProcessor.java
View file @ 5a17300f
......@@ -251,7 +251,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
dmRdmService.setMemberCodeVoByCode(memberCode.getCode(), vo);
}
// }
if (memberCodeList.size() == 1000 || ct < 1000) {
if (memberCodeList.size() == 1000 || ct <= 1000) {
tl += memberCodeList.size();
// mongoTemplate.insert(vos, AdamMemberCodeVo.class.getSimpleName());
log.info("DM.execute.limit.result:{}", dmMemberCodeService.saveBatch(memberCodeList));
......@@ -259,7 +259,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
memberCodeList.clear();
}
}
if (memberCodeList.size() > 0 && ct > 1000) {
if (memberCodeList.size() > 0) {
tl += memberCodeList.size();
log.info("DM.execute.limit.result:{}", dmMemberCodeService.saveBatch(memberCodeList));
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMMemberOrderProcessor.java
View file @ 5a17300f
......@@ -132,7 +132,7 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
dmRdmService.addMemberOrderVoByUid(uid, dmRdmService.getMemberOrderVosByUid(uid), vo);
}
if (memberOrderList.size() == 1000 || (memberOrderList.size() > 0 && smFlg) || ct < 1000) {
if (memberOrderList.size() == 1000 || (memberOrderList.size() > 0 && smFlg) || ct <= 1000) {
tl += memberOrderList.size();
// mongoTemplate.insert(vos, AdamMemberOrderVo.class.getSimpleName());
log.info("DM.execute.limit.result:{}", dmMemberOrderService.saveBatch(memberOrderList));
......@@ -140,7 +140,7 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
memberOrderList.clear();
}
}
if (memberOrderList.size() > 0 && ct > 1000) {
if (memberOrderList.size() > 0) {
tl += memberOrderList.size();
log.info("DM.execute.limit.result:{}", dmMemberOrderService.saveBatch(memberOrderList));
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMRealNameProcessor.java
View file @ 5a17300f
......@@ -99,7 +99,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
dmRdmService.setRealInfoVoByUid(uid, vo);
dmRdmService.setCertification(1, realName.getIdCard(), realName.getName());
}
if (realNameList.size() == 1000 || (realNameList.size() > 0 && smFlg) || ct < 1000) {
if (realNameList.size() == 1000 || (realNameList.size() > 0 && smFlg) || ct <= 1000) {
tl += realNameList.size();
// mongoTemplate.insert(vos, AdamRealInfoVo.class.getSimpleName());
log.info("DM.execute.limit.result:{}", dmRealNameService.saveBatch(realNameList));
......@@ -107,7 +107,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
realNameList.clear();
}
}
if (realNameList.size() > 0 && ct > 1000) {
if (realNameList.size() > 0) {
tl += realNameList.size();
log.info("DM.execute.limit.result:{}", dmRealNameService.saveBatch(realNameList));
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMThirdPartsProcessor.java
View file @ 5a17300f
......@@ -63,7 +63,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
statement = connection.prepareStatement(sqlCount);
row = (ResultSetImpl) statement.executeQuery();
row.first();
int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
int ct = row.getInt(1), pSize = 2000, num = 0, tl = 0, pl = ct;
log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start.sql:{}", pl, num, pSize, tl, sql);
row.close();
......@@ -108,7 +108,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
dmRdmService.setUidByPlatformOpenId(thirdParty.getPlatform(), thirdParty.getOpenId(), uid);
dmRdmService.addThirdPartVoListByUid(uid, dmRdmService.getThirdPartVoListByUid(uid), vo);
}
if (thirdPartyList.size() == 1000 || (thirdPartyList.size() > 0 && smFlg) || ct < 1000) {
if (thirdPartyList.size() == 1000 || (thirdPartyList.size() > 0 && smFlg) || ct <= 1000) {
tl += thirdPartyList.size();
// mongoTemplate.insert(vos, AdamThirdPartInfoVo.class.getSimpleName());
log.info("DM.execute.limit.result:{}", dmThirdPartyService.saveBatch(thirdPartyList));
......@@ -116,7 +116,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
thirdPartyList.clear();
}
}
if (thirdPartyList.size() > 0 && ct > 1000) {
if (thirdPartyList.size() > 0) {
tl += thirdPartyList.size();
log.info("DM.execute.limit.result:{}", dmThirdPartyService.saveBatch(thirdPartyList));
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserInformationProcessor.java
View file @ 5a17300f
......@@ -147,7 +147,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
dmRdmService.setUserInfoVoByUid(uid, vo);
}
}
if (userList.size() == 1000 || (userList.size() > 0 && smFlg) || ct < 1000) {
if (userList.size() == 1000 || (userList.size() > 0 && smFlg) || ct <= 1000) {
tl += userList.size();
// mongoTemplate.insert(vos, AdamUserInfoVo.class.getSimpleName());
log.info("DM.execute.result:{} - {}", dmUserService.saveBatch(userList), dmUserInfoService.saveBatch(userInfoList));
......@@ -156,7 +156,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
userInfoList.clear();
}
}
if (userList.size() > 0 && ct > 1000) {
if (userList.size() > 0) {
tl += userList.size();
log.info("DM.execute.result:{} - {}", dmUserService.saveBatch(userList), dmUserInfoService.saveBatch(userInfoList));
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserMemberProcessor.java
View file @ 5a17300f
......@@ -99,7 +99,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
dmRdmService.setUserMemberVoByUid(uid, vo);
}
if (userMemberList.size() == 1000 || (userMemberList.size() > 0 && smFlg) || ct < 1000) {
if (userMemberList.size() == 1000 || (userMemberList.size() > 0 && smFlg) || ct <= 1000) {
tl += userMemberList.size();
// mongoTemplate.insert(vos, AdamUserMemberVo.class.getSimpleName());
log.info("DM.execute.limit.result:{}", dmUserMemberService.saveBatch(userMemberList));
......@@ -107,7 +107,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
userMemberList.clear();
}
}
if (userMemberList.size() > 0 && ct > 1000) {
if (userMemberList.size() > 0) {
tl += userMemberList.size();
log.info("DM.execute.limit.result:{}", dmUserMemberService.saveBatch(userMemberList));
}
......@@ -120,12 +120,6 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, tl);
}
log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
AdamUserMember max = dmUserMemberService.getOne(Wrappers.lambdaQuery(AdamUserMember.class).orderByDesc(AdamUserMember::getMemberNo));
log.info("DM.execute.setMaxMemberNo:{} ----------------------------> end", JsonUtils.toJson(max));
if (null != max) {
dmRdmService.setMaxMemberNo(Integer.parseInt(max.getMemberNo()));
}
} catch (Exception e) {
log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment