Commit 72116cdb authored by data爬虫-冯 军凯's avatar data爬虫-冯 军凯

test

parent 8d65ad12
Pipeline #165 failed with stages
...@@ -6,14 +6,10 @@ ...@@ -6,14 +6,10 @@
<groupId>cn.quantgroup</groupId> <groupId>cn.quantgroup</groupId>
<artifactId>qg-data-service</artifactId> <artifactId>qg-data-service</artifactId>
<!--<version>1.0.0-qa-SNAPSHOT</version>--> <!--<version>1.0.0-qa-SNAPSHOT</version>-->
<version>1.4.6-SNAPSHOT</version> <version>1.6.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>qg-data-service</name> <name>qg-data-service</name>
<properties>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -25,13 +21,15 @@ ...@@ -25,13 +21,15 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.35</version> <!--<version>1.2.35</version>-->
<version>1.2.60</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.lkb.data</groupId> <groupId>com.lkb.data</groupId>
<artifactId>lkb-data-service</artifactId> <artifactId>lkb-data-service</artifactId>
<version>1.7.5.1-3b-SNAPSHOT</version> <!--<version>1.7.5.1-3b-SNAPSHOT</version>-->
<version>1.7.8.4-3c-SNAPSHOT</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
......
...@@ -14,9 +14,9 @@ public class DeviceFingerInfoService { ...@@ -14,9 +14,9 @@ public class DeviceFingerInfoService {
public static void storageDeviceFingerInfo(MobileFingerPrintDataRow mobileFingerPrintDataRow, String uuid, boolean ka, String type) { public static void storageDeviceFingerInfo(MobileFingerPrintDataRow mobileFingerPrintDataRow, String uuid, boolean ka, String type) {
MobileFingerPrintDataService.put(mobileFingerPrintDataRow); // MobileFingerPrintDataService.put(mobileFingerPrintDataRow);
//
DeviceFingerInfoCleaningService.cleanningAndSaveDeviceFingersInfo(mobileFingerPrintDataRow, uuid, ka, type); // DeviceFingerInfoCleaningService.cleanningAndSaveDeviceFingersInfo(mobileFingerPrintDataRow, uuid, ka, type);
} }
......
...@@ -44,12 +44,12 @@ public class OperatorInfoService { ...@@ -44,12 +44,12 @@ public class OperatorInfoService {
*/ */
public static void storageUserInfoItem(SpiderUserItemDataRow spiderUserItemDataRow, String uuid, boolean putAndCheck, boolean ka) { public static void storageUserInfoItem(SpiderUserItemDataRow spiderUserItemDataRow, String uuid, boolean putAndCheck, boolean ka) {
if (putAndCheck) // if (putAndCheck)
SpiderUserItemDataService.putAndCheck(spiderUserItemDataRow); // SpiderUserItemDataService.putAndCheck(spiderUserItemDataRow);
else // else
SpiderUserItemDataService.put(spiderUserItemDataRow); // SpiderUserItemDataService.put(spiderUserItemDataRow);
//
OperatorInfoCleaningService.cleaningAndSaveUserInfo(spiderUserItemDataRow, uuid, ka); // OperatorInfoCleaningService.cleaningAndSaveUserInfo(spiderUserItemDataRow, uuid, ka);
} }
...@@ -61,12 +61,12 @@ public class OperatorInfoService { ...@@ -61,12 +61,12 @@ public class OperatorInfoService {
*/ */
public static void storageMobileCallDetailInfos(List<MobileCallInfoRow> mobileCallInfoRows, String uuid, boolean putAndCheck, boolean ka) { public static void storageMobileCallDetailInfos(List<MobileCallInfoRow> mobileCallInfoRows, String uuid, boolean putAndCheck, boolean ka) {
if (putAndCheck) // if (putAndCheck)
MobileCallInfoDataService.putAndCheck(mobileCallInfoRows); // MobileCallInfoDataService.putAndCheck(mobileCallInfoRows);
else // else
MobileCallInfoDataService.put(mobileCallInfoRows); // MobileCallInfoDataService.put(mobileCallInfoRows);
//
OperatorInfoCleaningService.cleaningAndSaveMobileCallDetailInfo(mobileCallInfoRows, uuid, ka); // OperatorInfoCleaningService.cleaningAndSaveMobileCallDetailInfo(mobileCallInfoRows, uuid, ka);
} }
...@@ -78,12 +78,12 @@ public class OperatorInfoService { ...@@ -78,12 +78,12 @@ public class OperatorInfoService {
*/ */
public static void storageMobileSmsDetail(List<MobileSmsInfoRow> mobileSmsInfoRows, String uuid, boolean putAndCheck, boolean ka) { public static void storageMobileSmsDetail(List<MobileSmsInfoRow> mobileSmsInfoRows, String uuid, boolean putAndCheck, boolean ka) {
if (putAndCheck) // if (putAndCheck)
MobileSmsInfoDataService.putAndCheck(mobileSmsInfoRows); // MobileSmsInfoDataService.putAndCheck(mobileSmsInfoRows);
else // else
MobileSmsInfoDataService.put(mobileSmsInfoRows); // MobileSmsInfoDataService.put(mobileSmsInfoRows);
//
OperatorInfoCleaningService.cleaningAndSaveMobileSmsDetainInfo(mobileSmsInfoRows, uuid, ka); // OperatorInfoCleaningService.cleaningAndSaveMobileSmsDetainInfo(mobileSmsInfoRows, uuid, ka);
} }
...@@ -95,12 +95,12 @@ public class OperatorInfoService { ...@@ -95,12 +95,12 @@ public class OperatorInfoService {
*/ */
public static void storageMobileFlowDetailInfos(List<MobileFlowInfoRow> mobileFlowInfoRows, String uuid, boolean putAndCheck, boolean ka) { public static void storageMobileFlowDetailInfos(List<MobileFlowInfoRow> mobileFlowInfoRows, String uuid, boolean putAndCheck, boolean ka) {
if (putAndCheck) // if (putAndCheck)
MobileFlowInfoDataService.putAndCheck(mobileFlowInfoRows); // MobileFlowInfoDataService.putAndCheck(mobileFlowInfoRows);
else // else
MobileFlowInfoDataService.put(mobileFlowInfoRows); // MobileFlowInfoDataService.put(mobileFlowInfoRows);
//
OperatorInfoCleaningService.cleaningAndSaveMobileFlowDetailInfo(mobileFlowInfoRows, uuid, ka); // OperatorInfoCleaningService.cleaningAndSaveMobileFlowDetailInfo(mobileFlowInfoRows, uuid, ka);
} }
...@@ -112,12 +112,12 @@ public class OperatorInfoService { ...@@ -112,12 +112,12 @@ public class OperatorInfoService {
*/ */
public static void storageTelecomCallDetailInfos(List<TelecomCallInfoRow> telecomCallInfoRows, String uuid, boolean putAndCheck, boolean ka) { public static void storageTelecomCallDetailInfos(List<TelecomCallInfoRow> telecomCallInfoRows, String uuid, boolean putAndCheck, boolean ka) {
if (putAndCheck) // if (putAndCheck)
TelecomCallInfoDataService.putAndCheck(telecomCallInfoRows); // TelecomCallInfoDataService.putAndCheck(telecomCallInfoRows);
else // else
TelecomCallInfoDataService.put(telecomCallInfoRows); // TelecomCallInfoDataService.put(telecomCallInfoRows);
//
OperatorInfoCleaningService.cleaningAndSaveTelecomCallDetailInfo(telecomCallInfoRows, uuid, ka); // OperatorInfoCleaningService.cleaningAndSaveTelecomCallDetailInfo(telecomCallInfoRows, uuid, ka);
} }
...@@ -129,12 +129,12 @@ public class OperatorInfoService { ...@@ -129,12 +129,12 @@ public class OperatorInfoService {
*/ */
public static void storageTelecomSmsDetailInfos(List<TelecomSmsInfoRow> telecomSmsInfoRows, String uuid, boolean putAndCheck, boolean ka) { public static void storageTelecomSmsDetailInfos(List<TelecomSmsInfoRow> telecomSmsInfoRows, String uuid, boolean putAndCheck, boolean ka) {
if (putAndCheck) // if (putAndCheck)
TelecomSmsInfoDataService.putAndCheck(telecomSmsInfoRows); // TelecomSmsInfoDataService.putAndCheck(telecomSmsInfoRows);
else // else
TelecomSmsInfoDataService.put(telecomSmsInfoRows); // TelecomSmsInfoDataService.put(telecomSmsInfoRows);
//
OperatorInfoCleaningService.cleaningAndSaveTelecomSmsDetailInfo(telecomSmsInfoRows, uuid, ka); // OperatorInfoCleaningService.cleaningAndSaveTelecomSmsDetailInfo(telecomSmsInfoRows, uuid, ka);
} }
...@@ -146,12 +146,12 @@ public class OperatorInfoService { ...@@ -146,12 +146,12 @@ public class OperatorInfoService {
*/ */
public static void storageTelecomFlowDetailInfos(List<TelecomFlowInfoRow> telecomFlowInfoRows, String uuid, boolean putAndCheck, boolean ka) { public static void storageTelecomFlowDetailInfos(List<TelecomFlowInfoRow> telecomFlowInfoRows, String uuid, boolean putAndCheck, boolean ka) {
if (putAndCheck) // if (putAndCheck)
TelecomFlowInfoDataService.putAndCheck(telecomFlowInfoRows); // TelecomFlowInfoDataService.putAndCheck(telecomFlowInfoRows);
else // else
TelecomFlowInfoDataService.put(telecomFlowInfoRows); // TelecomFlowInfoDataService.put(telecomFlowInfoRows);
//
OperatorInfoCleaningService.cleaningAndSaveTelecomFlowDetailInfo(telecomFlowInfoRows, uuid, ka); // OperatorInfoCleaningService.cleaningAndSaveTelecomFlowDetailInfo(telecomFlowInfoRows, uuid, ka);
} }
...@@ -163,12 +163,12 @@ public class OperatorInfoService { ...@@ -163,12 +163,12 @@ public class OperatorInfoService {
*/ */
public static void storageUnicomCallDetailInfos(List<UnicomCallInfoRow> unicomCallInfoRows, String uuid, boolean putAndCheck, boolean ka) { public static void storageUnicomCallDetailInfos(List<UnicomCallInfoRow> unicomCallInfoRows, String uuid, boolean putAndCheck, boolean ka) {
if (putAndCheck) // if (putAndCheck)
UnicomCallInfoDataService.putAndCheck(unicomCallInfoRows); // UnicomCallInfoDataService.putAndCheck(unicomCallInfoRows);
else // else
UnicomCallInfoDataService.put(unicomCallInfoRows); // UnicomCallInfoDataService.put(unicomCallInfoRows);
//
OperatorInfoCleaningService.cleaningAndSaveUnicomCallDetailInfo(unicomCallInfoRows, uuid, ka); // OperatorInfoCleaningService.cleaningAndSaveUnicomCallDetailInfo(unicomCallInfoRows, uuid, ka);
} }
...@@ -180,12 +180,12 @@ public class OperatorInfoService { ...@@ -180,12 +180,12 @@ public class OperatorInfoService {
*/ */
public static void storageUnicomSmsDetailInfos(List<UnicomSmsInfoRow> unicomSmsInfoRows, String uuid, boolean putAndCheck, boolean ka) { public static void storageUnicomSmsDetailInfos(List<UnicomSmsInfoRow> unicomSmsInfoRows, String uuid, boolean putAndCheck, boolean ka) {
if (putAndCheck) // if (putAndCheck)
UnicomSmsInfoDataService.putAndCheck(unicomSmsInfoRows); // UnicomSmsInfoDataService.putAndCheck(unicomSmsInfoRows);
else // else
UnicomSmsInfoDataService.put(unicomSmsInfoRows); // UnicomSmsInfoDataService.put(unicomSmsInfoRows);
//
OperatorInfoCleaningService.cleaningAndSaveUnicomSmsDetailInfo(unicomSmsInfoRows, uuid, ka); // OperatorInfoCleaningService.cleaningAndSaveUnicomSmsDetailInfo(unicomSmsInfoRows, uuid, ka);
} }
...@@ -197,12 +197,12 @@ public class OperatorInfoService { ...@@ -197,12 +197,12 @@ public class OperatorInfoService {
*/ */
public static void storageUnicomFlowDetailInfos(List<UnicomFlowInfoRow> unicomFlowInfoRows, String uuid, boolean putAndCheck, boolean ka) { public static void storageUnicomFlowDetailInfos(List<UnicomFlowInfoRow> unicomFlowInfoRows, String uuid, boolean putAndCheck, boolean ka) {
if (putAndCheck) // if (putAndCheck)
UnicomFlowInfoDataService.putAndCheck(unicomFlowInfoRows); // UnicomFlowInfoDataService.putAndCheck(unicomFlowInfoRows);
else // else
UnicomFlowInfoDataService.put(unicomFlowInfoRows); // UnicomFlowInfoDataService.put(unicomFlowInfoRows);
//
OperatorInfoCleaningService.cleaningAndSaveUnicomFlowDetailInfo(unicomFlowInfoRows, uuid, ka); // OperatorInfoCleaningService.cleaningAndSaveUnicomFlowDetailInfo(unicomFlowInfoRows, uuid, ka);
} }
...@@ -214,12 +214,12 @@ public class OperatorInfoService { ...@@ -214,12 +214,12 @@ public class OperatorInfoService {
*/ */
public static void storageBillInfos(PhoneBillDataRow phoneBillDataRow, String uuid, boolean putAndCheck, boolean ka) { public static void storageBillInfos(PhoneBillDataRow phoneBillDataRow, String uuid, boolean putAndCheck, boolean ka) {
if (putAndCheck) // if (putAndCheck)
PhoneBillDataService.putAndCheck(phoneBillDataRow); // PhoneBillDataService.putAndCheck(phoneBillDataRow);
else // else
PhoneBillDataService.put(phoneBillDataRow); // PhoneBillDataService.put(phoneBillDataRow);
//
OperatorInfoCleaningService.cleaningAndSavePhoneBillInfo(phoneBillDataRow, uuid, ka); // OperatorInfoCleaningService.cleaningAndSavePhoneBillInfo(phoneBillDataRow, uuid, ka);
} }
...@@ -231,9 +231,9 @@ public class OperatorInfoService { ...@@ -231,9 +231,9 @@ public class OperatorInfoService {
*/ */
public static void storageRechargeInfos(PhonePaymentDataRow phonePaymentDataRow, String uuid, boolean putAndCheck, boolean ka) { public static void storageRechargeInfos(PhonePaymentDataRow phonePaymentDataRow, String uuid, boolean putAndCheck, boolean ka) {
PhonePaymentDataService.put(phonePaymentDataRow); // PhonePaymentDataService.put(phonePaymentDataRow);
//
OperatorInfoCleaningService.cleaningAndSaveRechargeInfo(phonePaymentDataRow, uuid, ka); // OperatorInfoCleaningService.cleaningAndSaveRechargeInfo(phonePaymentDataRow, uuid, ka);
} }
......
...@@ -15,19 +15,20 @@ public class ThirdPartyInfoService { ...@@ -15,19 +15,20 @@ public class ThirdPartyInfoService {
public static void storageVccInfoItem(List<KeyPartnerDataRow> keyPartnerDataRows){ public static void storageVccInfoItem(List<KeyPartnerDataRow> keyPartnerDataRows){
KeyPartnerDataService.put(keyPartnerDataRows); // KeyPartnerDataService.put(keyPartnerDataRows);
} }
public static List<KeyPartnerDataRow> get(String uuid, String type){ public static List<KeyPartnerDataRow> get(String uuid, String type){
return KeyPartnerDataService.get(uuid, type); // return KeyPartnerDataService.get(uuid, type);
return null;
} }
public static KeyPartnerDataRow getLast(String uuid, String type){ public static KeyPartnerDataRow getLast(String uuid, String type){
return KeyPartnerDataService.getLast(uuid, type); // return KeyPartnerDataService.getLast(uuid, type);
return null;
} }
......
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