提交

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

@@ -1,16 +1,11 @@
 package com.gyee.runeconomy.service.auto.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.runeconomy.mapper.auto.ProEconTargetdataMapper;
 import com.gyee.runeconomy.model.auto.ProEconTargetdata;
 import com.gyee.runeconomy.service.auto.IProEconTargetdataService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,29 +18,28 @@ import java.util.List;
  */
 @Service
 public class ProEconTargetdataServiceImpl extends ServiceImpl<ProEconTargetdataMapper, ProEconTargetdata> implements IProEconTargetdataService {
-@Resource
-private IProEconTargetdataService proEconTargetdataService;
+
     @Override
     public List<ProEconTargetdata> qwtlist() {
 
-        List<String> windpowerstationIds = Arrays.asList("MLJ_FDC", "GJY_FDC", "QYRG_GDC", "CZXY_GDC", "YQCX", "HJFA_GDC", "WXYX_GDC", "WXYL_GDC", "PSSX_GDC", "HGFD_GDC", "YX_GDC", "JK_GDC", "TZ_GDC", "YQ_GDC", "YLZ_GDC", "LHS_GDC", "FS_GDC", "ZK_FDC", "SY_GDC", "BHB_FDC", "HSM_FDC", "YTY_FDC", "BHB3_FDC", "JR_GDC", "PDL_FDC", "NJL_FDC", "YLZ_FDC", "YF_FDC", "PTZ_FDC", "XWT_FDC", "DJY_FDC", "HR_GDC", "YY_GDC", "PL_GDC", "TL_GDC", "YG_GDC");
-
-        List<ProEconTargetdata> qwt = new ArrayList<>();
-        Date current = com.gyee.common.util.DateUtils.getCurrentDate();
-
-        for (String windpowerstationId : windpowerstationIds) {
-            QueryWrapper<ProEconTargetdata> qw = new QueryWrapper<>();
-            qw.like("windpowerstation_id", windpowerstationId);
-            qw.ge("record_date", current);
-            qw.orderByDesc("operation_time");
-            qw.last("LIMIT 1");
-            List<ProEconTargetdata> qwtList = proEconTargetdataService.list(qw);
-            if (qwtList != null) {
-                qwt.addAll(qwtList);
-            }
-        }
-
-
-        return qwt;
+//        List<String> windpowerstationIds = Arrays.asList("MLJ_FDC", "GJY_FDC", "QYRG_GDC", "CZXY_GDC", "YQCX", "HJFA_GDC", "WXYX_GDC", "WXYL_GDC", "PSSX_GDC", "HGFD_GDC", "YX_GDC", "JK_GDC", "TZ_GDC", "YQ_GDC", "YLZ_GDC", "LHS_GDC", "FS_GDC", "ZK_FDC", "SY_GDC", "BHB_FDC", "HSM_FDC", "YTY_FDC", "BHB3_FDC", "JR_GDC", "PDL_FDC", "NJL_FDC", "YLZ_FDC", "YF_FDC", "PTZ_FDC", "XWT_FDC", "DJY_FDC", "HR_GDC", "YY_GDC", "PL_GDC", "TL_GDC", "YG_GDC");
+//
+//        List<ProEconTargetdata> qwt = new ArrayList<>();
+//        Date current = com.gyee.common.util.DateUtils.getCurrentDate();
+//
+//        for (String windpowerstationId : windpowerstationIds) {
+//            QueryWrapper<ProEconTargetdata> qw = new QueryWrapper<>();
+//            qw.like("windpowerstation_id", windpowerstationId);
+//            qw.ge("record_date", current);
+//            qw.orderByDesc("operation_time");
+//            qw.last("LIMIT 1");
+//            List<ProEconTargetdata> qwtList = proEconTargetdataService.list(qw);
+//            if (qwtList != null) {
+//                qwt.addAll(qwtList);
+//            }
+//        }
+
+
+        return null;
     }
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -507,7 +507,24 @@ public class MonitorService {
 
             double gflr = 0.0;
             double fdlr = 0.0;
-            List<ProEconTargetdata> qwt = proEconTargetdataService.qwtlist();
+            List<String> windpowerstationIds = Arrays.asList("MLJ_FDC", "GJY_FDC", "QYRG_GDC", "CZXY_GDC", "YQCX", "HJFA_GDC", "WXYX_GDC", "WXYL_GDC", "PSSX_GDC", "HGFD_GDC", "YX_GDC", "JK_GDC", "TZ_GDC", "YQ_GDC", "YLZ_GDC", "LHS_GDC", "FS_GDC", "ZK_FDC", "SY_GDC", "BHB_FDC", "HSM_FDC", "YTY_FDC", "BHB3_FDC", "JR_GDC", "PDL_FDC", "NJL_FDC", "YLZ_FDC", "YF_FDC", "PTZ_FDC", "XWT_FDC", "DJY_FDC", "HR_GDC", "YY_GDC", "PL_GDC", "TL_GDC", "YG_GDC");
+
+            List<ProEconTargetdata> qwt = new ArrayList<>();
+//            Date current = com.gyee.common.util.DateUtils.getCurrentDate();
+
+            for (String windpowerstationId : windpowerstationIds) {
+                QueryWrapper<ProEconTargetdata> qw = new QueryWrapper<>();
+                qw.like("windpowerstation_id", windpowerstationId);
+                qw.ge("record_date", current);
+                qw.orderByDesc("operation_time");
+                qw.last("LIMIT 1");
+                List<ProEconTargetdata> qwtList = proEconTargetdataService.list(qw);
+                if (qwtList != null) {
+                    qwt.addAll(qwtList);
+                }
+            }
+
+//            List<ProEconTargetdata> qwt = proEconTargetdataService.qwtlist();