修改逻辑代码

bynt 1 year ago
parent 9a548a08dc
commit b42eeef9c8

@ -13,14 +13,12 @@ public interface BdBackDateService {
/** /**
* *
* @param toUpperCase null *
* @param empty ""
* @param imeiTag __imei__
* @param startTime begin time * @param startTime begin time
* @param endTime end time * @param endTime end time
* @param tagList tag * @param tagList tag
* @param flag num or link * @param flag num or link
* @return * @return
*/ */
List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag); List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
} }

@ -13,14 +13,12 @@ public interface GdtBackDateService {
/** /**
* *
* @param toUpperCase null *
* @param empty ""
* @param imeiTag __imei__
* @param startTime begin time * @param startTime begin time
* @param endTime end time * @param endTime end time
* @param tagList tag * @param tagList tag
* @param flag num or link * @param flag num or link
* @return * @return
*/ */
List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag); List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
} }

@ -13,14 +13,12 @@ import java.util.List;
public interface JlV1BackDataService { public interface JlV1BackDataService {
/** /**
* *
* @param toUpperCase null *
* @param empty ""
* @param imeiTag __imei__
* @param startTime begin time * @param startTime begin time
* @param endTime end time * @param endTime end time
* @param tagList tag * @param tagList tag
* @param flag num or link * @param flag num or link
* @return * @return
*/ */
List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag); List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
} }

@ -13,14 +13,12 @@ public interface JlV2BackDataService {
/** /**
* *
* @param toUpperCase null *
* @param empty ""
* @param imeiTag __imei__
* @param startTime begin time * @param startTime begin time
* @param endTime end time * @param endTime end time
* @param tagList tag * @param tagList tag
* @param flag num or link * @param flag num or link
* @return * @return
*/ */
List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag); List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
} }

@ -13,14 +13,12 @@ public interface KsBackDateService {
/** /**
* *
* @param toUpperCase null *
* @param empty ""
* @param imeiTag __imei__
* @param startTime begin time * @param startTime begin time
* @param endTime end time * @param endTime end time
* @param tagList tag * @param tagList tag
* @param flag num or link * @param flag num or link
* @return * @return
*/ */
List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag); List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
} }

@ -13,14 +13,12 @@ public interface UcBackDateService {
/** /**
* *
* @param toUpperCase null *
* @param empty ""
* @param imeiTag __imei__
* @param startTime begin time * @param startTime begin time
* @param endTime end time * @param endTime end time
* @param tagList tag * @param tagList tag
* @param flag num or link * @param flag num or link
* @return * @return
*/ */
List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag); List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
} }

@ -13,14 +13,12 @@ public interface VivoBackDateService {
/** /**
* *
* @param toUpperCase null *
* @param empty ""
* @param imeiTag __imei__
* @param startTime begin time * @param startTime begin time
* @param endTime end time * @param endTime end time
* @param tagList tag * @param tagList tag
* @param flag num or link * @param flag num or link
* @return * @return
*/ */
List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag); List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag(Date startTime, Date endTime, List<String> tagList, Integer flag);
} }

@ -35,7 +35,7 @@ import java.util.List;
public class BdBackDataServiceImpl extends AbstractService<TbBdNewBackdataEntity, Long> implements BdBackDateService { public class BdBackDataServiceImpl extends AbstractService<TbBdNewBackdataEntity, Long> implements BdBackDateService {
@Override @Override
public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag
(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag) { (Date startTime, Date endTime, List<String> tagList, Integer flag) {
return this.applyJPA(query -> { return this.applyJPA(query -> {
StringPath t3 = Expressions.stringPath("t3"); StringPath t3 = Expressions.stringPath("t3");

@ -101,38 +101,31 @@ public class DmpMonitorV2ServiceImpl implements DmpMonitorV2Service {
List<String> tagList = entry.getValue(); List<String> tagList = entry.getValue();
switch (index) { switch (index) {
case 1: case 1:
voList.addAll(jlV1BackDataService.queryByTagAndTimeAndFlag voList.addAll(jlV1BackDataService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
(CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag));
break; break;
case 7: case 7:
// v2 // v2
voList.addAll(jlV2BackDataService.queryByTagAndTimeAndFlag voList.addAll(jlV2BackDataService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
(CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag));
break; break;
case 2: case 2:
// 快手 // 快手
voList.addAll(ksBackDateService.queryByTagAndTimeAndFlag voList.addAll(ksBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
(CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag));
break; break;
case 3: case 3:
// UC // UC
voList.addAll(ucBackDateService.queryByTagAndTimeAndFlag voList.addAll(ucBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
(CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag));
break; break;
case 4: case 4:
// VIVO // VIVO
voList.addAll(vivoBackDateService.queryByTagAndTimeAndFlag voList.addAll(vivoBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
(CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag));
break; break;
case 5: case 5:
//百度 //百度
voList.addAll(bdBackDateService.queryByTagAndTimeAndFlag voList.addAll(bdBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
(CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag));
break; break;
case 6: case 6:
//广点通 //广点通
voList.addAll(gdtBackDateService.queryByTagAndTimeAndFlag voList.addAll(gdtBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
(CharSequenceUtil.NULL.toUpperCase(), CharSequenceUtil.EMPTY, DataConstant.IMEI_TAG, startTime, endTime, tagList, flag));
break; break;
default: default:
break; break;

@ -36,7 +36,7 @@ public class GdtBackDataServiceImpl extends AbstractService<TbGdtNewBackdataEnti
@Override @Override
public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag
(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag) { (Date startTime, Date endTime, List<String> tagList, Integer flag) {
return this.applyJPA(query -> { return this.applyJPA(query -> {
StringPath t3 = Expressions.stringPath("t3"); StringPath t3 = Expressions.stringPath("t3");

@ -35,8 +35,7 @@ public class JlV1BackDataServiceImpl extends AbstractService<TbJLBackDataV1Entit
@Override @Override
public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag
(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag) { (Date startTime, Date endTime, List<String> tagList, Integer flag) {
return this.applyJPA(query -> { return this.applyJPA(query -> {
StringPath t3 = Expressions.stringPath("t3"); StringPath t3 = Expressions.stringPath("t3");
StringTemplate dateExpr; StringTemplate dateExpr;

@ -35,7 +35,7 @@ public class JlV2BackDataServiceImpl extends AbstractService<TbJLBackDataV2Entit
@Override @Override
public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag
(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag) { (Date startTime, Date endTime, List<String> tagList, Integer flag) {
return this.applyJPA(query -> { return this.applyJPA(query -> {
StringPath t3 = Expressions.stringPath("t3"); StringPath t3 = Expressions.stringPath("t3");

@ -36,7 +36,7 @@ public class KsBackDataServiceImpl extends AbstractService<TbKSNewBackdataEntity
@Override @Override
public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag
(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag) { (Date startTime, Date endTime, List<String> tagList, Integer flag) {
return this.applyJPA(query -> { return this.applyJPA(query -> {
StringPath t3 = Expressions.stringPath("t3"); StringPath t3 = Expressions.stringPath("t3");

@ -36,7 +36,7 @@ public class UcBackDataServiceImpl extends AbstractService<TbUcBackdataEntity,Lo
@Override @Override
public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag
(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag) { (Date startTime, Date endTime, List<String> tagList, Integer flag) {
return this.applyJPA(query -> { return this.applyJPA(query -> {
StringPath t3 = Expressions.stringPath("t3"); StringPath t3 = Expressions.stringPath("t3");

@ -36,7 +36,7 @@ public class VivoBackDataServiceImpl extends AbstractService<TbVivoBackdataEntit
@Override @Override
public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag public List<DmpMonitorJpaDto> queryByTagAndTimeAndFlag
(String toUpperCase, String empty, String imeiTag, Date startTime, Date endTime, List<String> tagList, Integer flag) { (Date startTime, Date endTime, List<String> tagList, Integer flag) {
return this.applyJPA(query -> { return this.applyJPA(query -> {
StringPath t3 = Expressions.stringPath("t3"); StringPath t3 = Expressions.stringPath("t3");

Loading…
Cancel
Save