shiyue 1 год назад
Родитель
Сommit
11a1de8ba3

+ 36 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/windfield/WindFieldResoucePO.java

@@ -0,0 +1,36 @@
+package com.energy.manage.common.po.windfield;
+
+import com.energy.manage.common.base.NewBaseDomain;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Data
+@Table(name = "wind_field_resouce")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class WindFieldResoucePO extends NewBaseDomain {
+
+
+    /**
+     * 风场编号
+     */
+    private String fieldCode;
+    /**
+     * 上传文件名称
+     */
+    private String fileName;
+    /**
+     * 上传类型
+     */
+    private String type;
+    /**
+     * 上传文件地址
+     */
+    private String resourceUrl;
+
+
+
+}

+ 6 - 6
energy-manage-service/pom.xml

@@ -29,12 +29,12 @@
             <version>${energy-manage-element.version}</version>
         </dependency>
 
-        <!-- xxl-job 分布式任务 -->
-        <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
-            <version>2.3.0</version>
-        </dependency>
+        <!-- xxl-job 分布式任务 (暂时不用) -->
+<!--        <dependency>-->
+<!--            <groupId>com.xuxueli</groupId>-->
+<!--            <artifactId>xxl-job-core</artifactId>-->
+<!--            <version>2.3.0</version>-->
+<!--        </dependency>-->
 
         <!--minio-->
         <dependency>

+ 55 - 55
energy-manage-service/src/main/java/com/energy/manage/service/config/xxl/XxlJobConfig.java

@@ -1,55 +1,55 @@
-package com.energy.manage.service.config.xxl;
-
-import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Description: xxlJob配置
- */
-@Configuration
-@Slf4j
-public class XxlJobConfig {
-
-    @Value("${xxl.job.admin.addresses}")
-    private String adminAddresses;
-
-    @Value("${xxl.job.accessToken}")
-    private String accessToken;
-
-    @Value("${xxl.job.executor.appname}")
-    private String appname;
-
-    @Value("${xxl.job.executor.address}")
-    private String address;
-
-    @Value("${xxl.job.executor.ip}")
-    private String ip;
-
-    @Value("${xxl.job.executor.port}")
-    private int port;
-
-    @Value("${xxl.job.executor.logpath}")
-    private String logPath;
-
-    @Value("${xxl.job.executor.logretentiondays}")
-    private int logRetentionDays;
-
-    @Bean
-    public XxlJobSpringExecutor xxlJobExecutor() {
-        log.info(">>>>>>>>>>> xxl-job config init.");
-        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-        xxlJobSpringExecutor.setAppname(appname);
-        xxlJobSpringExecutor.setAddress(address);
-        xxlJobSpringExecutor.setIp(ip);
-        xxlJobSpringExecutor.setPort(port);
-        xxlJobSpringExecutor.setAccessToken(accessToken);
-        xxlJobSpringExecutor.setLogPath(logPath);
-        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-
-        return xxlJobSpringExecutor;
-    }
-}
+//package com.energy.manage.service.config.xxl;
+//
+//import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+///**
+// * @Description: xxlJob配置
+// */
+//@Configuration
+//@Slf4j
+//public class XxlJobConfig {
+//
+//    @Value("${xxl.job.admin.addresses}")
+//    private String adminAddresses;
+//
+//    @Value("${xxl.job.accessToken}")
+//    private String accessToken;
+//
+//    @Value("${xxl.job.executor.appname}")
+//    private String appname;
+//
+//    @Value("${xxl.job.executor.address}")
+//    private String address;
+//
+//    @Value("${xxl.job.executor.ip}")
+//    private String ip;
+//
+//    @Value("${xxl.job.executor.port}")
+//    private int port;
+//
+//    @Value("${xxl.job.executor.logpath}")
+//    private String logPath;
+//
+//    @Value("${xxl.job.executor.logretentiondays}")
+//    private int logRetentionDays;
+//
+//    @Bean
+//    public XxlJobSpringExecutor xxlJobExecutor() {
+//        log.info(">>>>>>>>>>> xxl-job config init.");
+//        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+//        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+//        xxlJobSpringExecutor.setAppname(appname);
+//        xxlJobSpringExecutor.setAddress(address);
+//        xxlJobSpringExecutor.setIp(ip);
+//        xxlJobSpringExecutor.setPort(port);
+//        xxlJobSpringExecutor.setAccessToken(accessToken);
+//        xxlJobSpringExecutor.setLogPath(logPath);
+//        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+//
+//        return xxlJobSpringExecutor;
+//    }
+//}

+ 20 - 20
energy-manage-service/src/main/java/com/energy/manage/service/task/EnergyDataTask.java

@@ -1,20 +1,20 @@
-package com.energy.manage.service.task;
-
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class EnergyDataTask {
-
-    /**
-     * 开始定时器
-     */
-    @XxlJob(value = "demoJobHandler")
-    public void demoJobHandler() {
-        log.info(" xxl-job >>>> test ");
-        return;
-    }
-
-}
+//package com.energy.manage.service.task;
+//
+//import com.xxl.job.core.handler.annotation.XxlJob;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Component;
+//
+//@Slf4j
+//@Component
+//public class EnergyDataTask {
+//
+//    /**
+//     * 开始定时器
+//     */
+//    @XxlJob(value = "demoJobHandler")
+//    public void demoJobHandler() {
+//        log.info(" xxl-job >>>> test ");
+//        return;
+//    }
+//
+//}