wangb@gyee-china.com пре 1 година
родитељ
комит
c4efb5c3d5

+ 4 - 2
web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconTargetdataCopyServiceImpl.java

@@ -33,8 +33,10 @@ public class ProEconTargetdataCopyServiceImpl extends ServiceImpl<ProEconTargetd
             qw.eq("windpowerstation_id",windpowerstationid);
         }
 
-        if (StringUtils.isNotEmpty(windpowerstationName)){
-            qw.like("windpowerstation_name",windpowerstationName);
+        if (StringUtils.isNotEmpty(windpowerstationName) && windpowerstationName.equals("qb")){
+
+        } else if (StringUtils.isNotEmpty(windpowerstationName)) {
+            qw.like("windpowerstation_name", windpowerstationName);
         }
 
         if (StringUtils.isNotEmpty(recorddate)){

+ 128 - 1
web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconTargetdataServiceImpl.java

@@ -70,7 +70,7 @@ private IProEconTargetdataService proEconTargetdataService;
         }
 
         QueryWrapper<ProEconTargetdata> qw5 = new QueryWrapper<>();
-        qw5.like("windpowerstation_id", "YQXC");
+        qw5.like("windpowerstation_id", "YQCX");
         qw5.ge("record_date",current);
         qw5.orderByDesc("operation_time");
         qw5.last("LIMIT 1");
@@ -260,6 +260,133 @@ private IProEconTargetdataService proEconTargetdataService;
         if (qwt23 != null) {
             qwt.addAll(qwt23);
         }
+        QueryWrapper<ProEconTargetdata> qw24 = new QueryWrapper<>();
+        qw24.like("windpowerstation_id", "JR_GDC");
+        qw24.ge("record_date",current);
+        qw24.orderByDesc("operation_time");
+        qw24.last("LIMIT 1");
+        List<ProEconTargetdata> qwt24 = proEconTargetdataService.list(qw24);
+        if (qwt24 != null) {
+            qwt.addAll(qwt24);
+        }
+
+        QueryWrapper<ProEconTargetdata> qw25 = new QueryWrapper<>();
+        qw25.like("windpowerstation_id", "PDL_FDC");
+        qw25.ge("record_date",current);
+        qw25.orderByDesc("operation_time");
+        qw25.last("LIMIT 1");
+        List<ProEconTargetdata> qwt25 = proEconTargetdataService.list(qw25);
+        if (qwt25 != null) {
+            qwt.addAll(qwt25);
+        }
+        QueryWrapper<ProEconTargetdata> qw26 = new QueryWrapper<>();
+        qw26.like("windpowerstation_id", "NJL_FDC");
+        qw26.ge("record_date",current);
+        qw26.orderByDesc("operation_time");
+        qw26.last("LIMIT 1");
+        List<ProEconTargetdata> qwt26 = proEconTargetdataService.list(qw26);
+        if (qwt26 != null) {
+            qwt.addAll(qwt26);
+        }
+        QueryWrapper<ProEconTargetdata> qw27 = new QueryWrapper<>();
+        qw27.like("windpowerstation_id", "YLZ_FDC");
+        qw27.ge("record_date",current);
+        qw27.orderByDesc("operation_time");
+        qw27.last("LIMIT 1");
+        List<ProEconTargetdata> qwt27 = proEconTargetdataService.list(qw27);
+        if (qwt27 != null) {
+            qwt.addAll(qwt27);
+        }
+        QueryWrapper<ProEconTargetdata> qw28 = new QueryWrapper<>();
+        qw28.like("windpowerstation_id", "YF_FDC");
+        qw28.ge("record_date",current);
+        qw28.orderByDesc("operation_time");
+        qw28.last("LIMIT 1");
+        List<ProEconTargetdata> qwt28 = proEconTargetdataService.list(qw28);
+        if (qwt28 != null) {
+            qwt.addAll(qwt28);
+        }
+
+        QueryWrapper<ProEconTargetdata> qw29 = new QueryWrapper<>();
+        qw29.like("windpowerstation_id", "PTZ_FDC");
+        qw29.ge("record_date",current);
+        qw29.orderByDesc("operation_time");
+        qw29.last("LIMIT 1");
+        List<ProEconTargetdata> qwt29 = proEconTargetdataService.list(qw29);
+        if (qwt29 != null) {
+            qwt.addAll(qwt29);
+        }
+
+        QueryWrapper<ProEconTargetdata> qw30 = new QueryWrapper<>();
+        qw30.like("windpowerstation_id", "XWT_FDC");
+        qw30.ge("record_date",current);
+        qw30.orderByDesc("operation_time");
+        qw30.last("LIMIT 1");
+        List<ProEconTargetdata> qwt30 = proEconTargetdataService.list(qw30);
+        if (qwt30 != null) {
+            qwt.addAll(qwt30);
+        }
+        QueryWrapper<ProEconTargetdata> qw31 = new QueryWrapper<>();
+        qw31.like("windpowerstation_id", "DJY_FDC");
+        qw31.ge("record_date",current);
+        qw31.orderByDesc("operation_time");
+        qw31.last("LIMIT 1");
+        List<ProEconTargetdata> qwt31 = proEconTargetdataService.list(qw31);
+        if (qwt31 != null) {
+            qwt.addAll(qwt31);
+        }
+
+        QueryWrapper<ProEconTargetdata> qw32 = new QueryWrapper<>();
+        qw32.like("windpowerstation_id", "HR_GDC");
+        qw32.ge("record_date",current);
+        qw32.orderByDesc("operation_time");
+        qw32.last("LIMIT 1");
+        List<ProEconTargetdata> qwt32 = proEconTargetdataService.list(qw32);
+        if (qwt32 != null) {
+            qwt.addAll(qwt32);
+        }
+
+        QueryWrapper<ProEconTargetdata> qw33 = new QueryWrapper<>();
+        qw33.like("windpowerstation_id", "YY_GDC");
+        qw33.ge("record_date",current);
+        qw33.orderByDesc("operation_time");
+        qw33.last("LIMIT 1");
+        List<ProEconTargetdata> qwt33 = proEconTargetdataService.list(qw33);
+        if (qwt33 != null) {
+            qwt.addAll(qwt33);
+        }
+
+        QueryWrapper<ProEconTargetdata> qw34 = new QueryWrapper<>();
+        qw34.like("windpowerstation_id", "PL_GDC");
+        qw34.ge("record_date",current);
+        qw34.orderByDesc("operation_time");
+        qw34.last("LIMIT 1");
+        List<ProEconTargetdata> qwt34 = proEconTargetdataService.list(qw34);
+        if (qwt34 != null) {
+            qwt.addAll(qwt34);
+        }
+
+        QueryWrapper<ProEconTargetdata> qw35 = new QueryWrapper<>();
+        qw35.like("windpowerstation_id", "TL_GDC");
+        qw35.ge("record_date",current);
+        qw35.orderByDesc("operation_time");
+        qw35.last("LIMIT 1");
+        List<ProEconTargetdata> qwt35 = proEconTargetdataService.list(qw35);
+        if (qwt35 != null) {
+            qwt.addAll(qwt35);
+        }
+
+        QueryWrapper<ProEconTargetdata> qw36 = new QueryWrapper<>();
+        qw36.like("windpowerstation_id", "YG_GDC");
+        qw36.ge("record_date",current);
+        qw36.orderByDesc("operation_time");
+        qw36.last("LIMIT 1");
+        List<ProEconTargetdata> qwt36 = proEconTargetdataService.list(qw36);
+        if (qwt36 != null) {
+            qwt.addAll(qwt36);
+        }
+
+
         return qwt;
     }
 }