1、添加能耗服务模块，并新增推送数据到能耗平台逻辑；

2、分别将data-transfer、data-tsdb两个服务模块更名为service-transfer、service-tsdb，然后整理迁移到usky-modules工程中；

pom.xml

@@ -97,6 +97,12 @@
 
     <module>service-ids</module>
 
+    <module>service-ems</module>
+
+    <module>service-transfer</module>
+
+    <module>service-tsdb</module>
+
   </modules>
           
   

service-eg/service-eg-biz/pom.xml

@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>data-transfer-api</artifactId>
+            <artifactId>service-transfer-api</artifactId>
             <version>0.0.1</version>
         </dependency>
         <dependency>

service-ems/service-ems-api/src/main/java/com/usky/ems/RemoteEmsTaskService.java

@@ -0,0 +1,17 @@
+package com.usky.ems;
+
+
+import com.usky.ems.factory.RemoteEmsTaskFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(contextId = "remoteEmsTaskService", value = "service-ems" , fallbackFactory = RemoteEmsTaskFactory.class)
+public interface RemoteEmsTaskService {
+
+    @GetMapping("/sendEnergyData")
+    void sendEnergyData();
+
+    @GetMapping("/sendEnergyHeartbeat")
+    void sendEnergyHeartbeat();
+}

service-ems/service-ems-api/src/main/java/com/usky/ems/factory/RemoteEmsTaskFactory.java

@@ -0,0 +1,39 @@
+package com.usky.ems.factory;
+
+import com.usky.common.core.exception.FeignBadRequestException;
+import com.usky.ems.RemoteEmsTaskService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 用户服务降级处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class RemoteEmsTaskFactory implements FallbackFactory<RemoteEmsTaskService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteEmsTaskFactory.class);
+
+    @Override
+    public RemoteEmsTaskService create(Throwable throwable)
+    {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteEmsTaskService()
+        {
+            @Override
+            public void sendEnergyData() {
+                throw new FeignBadRequestException(500,"定时推送能耗数据到能耗平台"+throwable.getMessage());
+            }
+
+            @Override
+            public void sendEnergyHeartbeat() {
+                throw new FeignBadRequestException(500,"定时推送能耗心跳到能耗平台"+throwable.getMessage());
+            }
+
+        };
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/MybatisGenerator.java

@@ -0,0 +1,107 @@
+package com.usky.ems;//package com.usky.demo.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
+
+
+
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ */
+public class MybatisGenerator {
+    public static void main(String[] args) {
+
+            shell("service-ems","service-ems-biz");
+    }
+
+    private static void shell(String parentName,String model) {
+
+        AutoGenerator mpg = new AutoGenerator();
+        //1、全局配置
+        GlobalConfig gc = new GlobalConfig();
+//        File file = new File(model);
+//        String path = file.getAbsolutePath();
+        String projectPath = System.getProperty("user.dir");
+        projectPath+="/"+parentName;
+        projectPath+="/"+model;
+        gc.setOutputDir(projectPath+ "/src/main/java");  //生成路径(一般都是生成在此项目的src/main/java下面)
+        //修改为自己的名字
+        gc.setAuthor("ya"); //设置作者
+        gc.setOpen(false);
+        gc.setFileOverride(true); //第二次生成会把第一次生成的覆盖掉
+        gc.setServiceName("%sService"); //生成的service接口名字首字母是否为I，这样设置就没有
+        gc.setBaseResultMap(true); //生成resultMap
+        mpg.setGlobalConfig(gc);
+
+        //2、数据源配置
+        //修改数据源
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl("jdbc:mysql://192.168.10.165:3306/usky-cloud?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setUsername("root");
+        dsc.setPassword("yt123456");
+        mpg.setDataSource(dsc);
+
+        // 3、包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setParent("com.usky.ems");
+        pc.setController("controller.web");
+        pc.setEntity("domain");
+        pc.setMapper("mapper");
+        pc.setService("service");
+        pc.setServiceImpl("service.impl");
+//        pc.setXml("mapper.demo");
+        //pc.setModuleName("test");
+        mpg.setPackageInfo(pc);
+
+        // 4、策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setSuperMapperClass("com.usky.common.mybatis.core.CrudMapper");
+        strategy.setSuperServiceClass("com.usky.common.mybatis.core.CrudService");
+        strategy.setSuperServiceImplClass("com.usky.common.mybatis.core.AbstractCrudService");
+        // strategy.setTablePrefix("t_"); // 表名前缀
+        strategy.setEntityLombokModel(true); //使用lombok
+        //修改自己想要生成的表
+        strategy.setInclude("ems_cons_platform_config");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        mpg.setStrategy(strategy);
+
+        // 关闭默认 xml 生成，调整生成 至 根目录
+        //修改对应的模块名称
+        TemplateConfig tc = new TemplateConfig();
+        // 自定义配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                // to do nothing
+            }
+        };
+        //如果模板引擎是 velocity
+        String templatePath = "/templates/mapper.xml.vm";
+        // 自定义输出配置
+        List<FileOutConfig> focList = new ArrayList<>();
+        // 自定义配置会被优先输出
+        String finalProjectPath = projectPath;
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+                return finalProjectPath + "/src/main/resources/mapper/ems" + "/"
+                        + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+        tc.setXml(null);
+        mpg.setTemplate(tc);
+        //5、执行
+        mpg.execute();
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/controller/api/ServiceEmsTaskApi.java

@@ -0,0 +1,23 @@
+package com.usky.ems.controller.api;
+
+import com.usky.ems.RemoteEmsTaskService;
+import com.usky.ems.service.EnergyDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ServiceEmsTaskApi implements RemoteEmsTaskService {
+    @Autowired
+    private EnergyDataService energyDatabaseService;
+
+    @Override
+    public void sendEnergyData(){
+        energyDatabaseService.sendEnergyData();
+    }
+
+    @Override
+    public void sendEnergyHeartbeat(){
+        energyDatabaseService.sendEnergyHeartbeat();
+    }
+
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/controller/web/EnergyDataController.java

@@ -0,0 +1,23 @@
+package com.usky.ems.controller.web;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.ems.service.EnergyDataService;
+import com.usky.ems.service.vo.EnergyDataRequestVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/energy-data")
+public class EnergyDataController {
+
+    @Autowired
+    private EnergyDataService energyDataService;
+
+
+    @GetMapping("sendEnergyData")
+    public ApiResult<Void> sendData() {
+        energyDataService.sendEnergyData();
+        return ApiResult.success();
+
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/service/vo/EnergyDataRequestVO.java

@@ -0,0 +1,11 @@
+package com.usky.ems.service.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class EnergyDataRequestVO implements Serializable {
+
+    private String gatewayId;
+}

service-iot/service-iot-biz/pom.xml

@@ -21,12 +21,12 @@
         </dependency>
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>data-tsdb-proxy-api</artifactId>
+            <artifactId>service-tsdb-api</artifactId>
             <version>0.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>data-transfer-api</artifactId>
+            <artifactId>service-transfer-api</artifactId>
             <version>0.0.1</version>
         </dependency>
 

service-job/pom.xml

@@ -76,6 +76,12 @@
             <version>0.0.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-ems-api</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

service-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -2,6 +2,7 @@ package com.ruoyi.job.task;
 
 import com.usky.common.core.utils.StringUtils;
 import com.usky.demo.RemoteMeetingService;
+import com.usky.ems.RemoteEmsTaskService;
 import com.usky.fire.RemoteFireService;
 import com.usky.iot.RemoteIotTaskService;
 import com.usky.pm.RemotePmService;
@@ -27,6 +28,9 @@ public class RyTask {
     @Autowired
     private RemoteMeetingService remoteMeetingService;
 
+    @Autowired
+    private RemoteEmsTaskService remoteEmsTaskService;
+
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
     }
@@ -81,4 +85,16 @@ public class RyTask {
         remoteIotService.reportSubmissionReminder();
     }
 
+    // 推送设备数据到能耗平台
+    public void sendEnergyData(){
+        System.out.println("sendEnergyData start......");
+        remoteEmsTaskService.sendEnergyData();
+    }
+
+    // 推送设备心跳到能耗平台
+    public void sendEnergyHeartbeat(){
+        System.out.println("sendEnergyHeartbeat start......");
+        remoteEmsTaskService.sendEnergyHeartbeat();
+    }
+
 }

service-meeting/service-meeting-biz/pom.xml

@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>data-transfer-api</artifactId>
+            <artifactId>service-transfer-api</artifactId>
             <version>0.0.1</version>
         </dependency>
         <dependency>