nacos

electricity/meter/src/main/java/com/gyee/gaia/meter/controller/MeterInfoController.java

@@ -0,0 +1,55 @@
+package com.gyee.gaia.meter.controller;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Author: malijun
+ * Data  : 2023: 05: 24
+ **/
+@RestController
+public class MeterInfoController {
+
+
+//
+//        @GetMapping("/data")
+//        public ResponseEntity<Map<String, Object>> getData(
+//                @RequestParam(required = false) String condition,
+//                @RequestParam(required = false) String startTime,
+//                @RequestParam(required = false) String endTime,
+//                @RequestParam(defaultValue = "1") int page,
+//                @RequestParam(defaultValue = "10") int perPage
+//        ) {
+//            // 在这里处理参数的验证和错误情况
+//
+//            // 过滤数据
+//            List<Item> filteredData = filterData(condition, startTime, endTime);
+//
+//            // 分页数据
+//            List<Item> paginatedData = paginateData(filteredData, page, perPage);
+//
+//            // 构建响应
+//            Map<String, Object> response = new HashMap<>();
+//            response.put("total_results", filteredData.size());
+//            response.put("total_pages", paginatedData.size());
+//            response.put("data", paginatedData);
+//
+//            return ResponseEntity.ok(response);
+//        }
+//
+//        private List<Item> filterData(String condition, String startTime, String endTime) {
+//            // 根据条件和时间段过滤数据
+//            // 实现你的过滤逻辑
+//
+//            return filteredData;
+//        }
+//
+//        private List<Item> paginateData(List<Item> data, int page, int perPage) {
+//            // 根据分页参数对数据进行分页
+//            // 实现你的分页逻辑
+//
+//            return paginatedData;
+//        }
+//
+
+
+}

electricity/meter/src/main/java/com/gyee/gaia/meter/entity/vo/MeterInfoVO.java

@@ -27,11 +27,15 @@ public class MeterInfoVO {
     public BigDecimal speed;
 
     //总风场日发电量
-    public BigDecimal dayFDL;
+    public BigDecimal rfdl;
     //总风场月发电量
-    public BigDecimal monthFDL;
+    public BigDecimal yfdl;
     //总风场年发电量
-    public BigDecimal yearFDL;
+    public BigDecimal nfdl;
+
+    public BigDecimal swdl;
+
+
 
     //装机容量
     public BigDecimal zjrl;

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meterinfo/GetLineInfoById.java

@@ -137,10 +137,10 @@ public class GetLineInfoById {
 
 
         MeterInfoVO meterInfoVO = new MeterInfoVO();
-        meterInfoVO.setDayFDL(rfdl.divide(BigDecimal.valueOf(10000),4,RoundingMode.HALF_EVEN));
-        meterInfoVO.setMonthFDL(yfdl);
-        meterInfoVO.setYearFDL(nfdl);
-        meterInfoVO.setValue2(BigDecimal.valueOf(0));
+        meterInfoVO.setRfdl(rfdl.divide(BigDecimal.valueOf(10000),4,RoundingMode.HALF_EVEN));
+        meterInfoVO.setYfdl(yfdl);
+        meterInfoVO.setNfdl(nfdl);
+        meterInfoVO.setSwdl(BigDecimal.valueOf(0));
         meterInfoVO.setZjrl(zjrl.divide(BigDecimal.valueOf(10000),2, RoundingMode.HALF_EVEN));
         return meterInfoVO;
 

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meterinfo/GetPowerStationInfoById.java

@@ -135,10 +135,10 @@ public class GetPowerStationInfoById {
 
 
         MeterInfoVO meterInfoVO = new MeterInfoVO();
-        meterInfoVO.setDayFDL(rfdl);
-        meterInfoVO.setMonthFDL(yfdl);
-        meterInfoVO.setYearFDL(nfdl);
-        meterInfoVO.setValue2(rswdl);
+        meterInfoVO.setRfdl(rfdl);
+        meterInfoVO.setYfdl(yfdl);
+        meterInfoVO.setNfdl(nfdl);
+        meterInfoVO.setSwdl(rswdl);
         meterInfoVO.setZjrl(zjrl);
         return meterInfoVO;
 

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meterinfo/GetProjectInfoById.java

@@ -157,10 +157,10 @@ public class GetProjectInfoById {
 
 
         MeterInfoVO meterInfoVO = new MeterInfoVO();
-        meterInfoVO.setDayFDL(rfdl);
-        meterInfoVO.setMonthFDL(yfdl);
-        meterInfoVO.setYearFDL(nfdl);
-        meterInfoVO.setValue2(rswdl);
+        meterInfoVO.setRfdl(rfdl);
+        meterInfoVO.setYfdl(yfdl);
+        meterInfoVO.setNfdl(nfdl);
+        meterInfoVO.setSwdl(rswdl);
         meterInfoVO.setZjrl(zjrl.divide(BigDecimal.valueOf(10000), 2,RoundingMode.HALF_EVEN));
         return meterInfoVO;
 

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meterinfo/GetWindStationInfo.java

@@ -132,10 +132,10 @@ public class GetWindStationInfo {
 
         //VO对象属性设置值
         MeterInfoVO meterInfoVO = new MeterInfoVO();
-        meterInfoVO.setDayFDL(rfdl);
-        meterInfoVO.setMonthFDL(yfdl);
-        meterInfoVO.setYearFDL(nfdl);
-        meterInfoVO.setValue2(rswdl);
+        meterInfoVO.setRfdl(rfdl);
+        meterInfoVO.setYfdl(yfdl);
+        meterInfoVO.setNfdl(nfdl);
+        meterInfoVO.setSwdl(rswdl);
         meterInfoVO.setZjrl(zjrl);
 
         return meterInfoVO;

electricity/meter/src/main/resources/application.properties

@@ -1,16 +0,0 @@
-##需要动态配置的属性##
-
-#动态配置适配器的地址
-#adapter.url=http://192.168.10.18:8011/ts
-#adapter.url=http://192.168.10.18:8013/ts
-adapter.url=http://192.168.1.67:8011/ts
-
-#动态配置开始日期
-start.time=2023-03-27
-#动态配置结束日期
-end.time=2023-03-27
-
-meter.stations=MHS_FDC,NSS_FDC
-
-test.abcd=123456
-

electricity/meter/src/main/resources/bootstrap.yaml

@@ -1,6 +1,3 @@
-server:
-  port: 8021
-
 spring:
   application:
     name: meter
@@ -11,86 +8,19 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 192.168.10.18:8848
+        server-addr: 192.168.1.67:8848
+        group: meter
       config:
         # 配置中心地址
-        server-addr: 192.168.10.18:8848
+        server-addr: 192.168.1.67:8848
         # 配置文件格式
         file-extension: yml
+        #开发环境配置命名空间
+        namespace: fe339fbd-7113-405f-8d2a-70659c5d53e4
+        #生产环境配置命名空间
+        #namespace: d148acca-95e7-4e07-a566-9a69012bcf01
+        group: meter
+        refresh-enabled: true
         # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-  cache:
-    type: SIMPLE
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://192.168.10.18:5432/nx_dev
-    username: gdprod
-    password: gyee123
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      max-active: 20
-      initial-size: 1
-      min-idle: 3
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-    default-property-inclusion: always
-
-
-
-mybatis-plus:
-  typeAliasesPackage: com.gyee.gaia.meter.entity
-  mapper-locations: classpath:mappers-postgresql/*.xml
-  global-config:
-    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-    id-type: 3
-    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-    field-strategy: 2
-    #驼峰下划线转换
-    db-column-underline: true
-    #mp2.3+ 全局表前缀 mp_
-    #table-prefix: mp_
-    #刷新mapper 调试神器
-    #refresh-mapper: true
-    #数据库大写下划线转换
-    #capital-mode: true
-    # Sequence序列接口实现类配置
-    key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
-    #逻辑删除配置（下面3个配置）
-    logic-delete-value: 1
-    logic-not-delete-value: 0
-    #sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-    #自定义填充策略接口实现
-    #meta-object-handler: com.baomidou.springboot.MyMetaObjectHandler
-  configuration:
-    #配置返回数据库(column下划线命名&&返回java实体是驼峰命名)，自动匹配无需as（没开启这个，SQL需要写as： select user_id as userId）
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-    #配置JdbcTypeForNull, oracle数据库必须配置
-    jdbc-type-for-null: 'null'
-    callSettersOnNulls: true
-
-xxl:
-  job:
-    admin:
-      addresses: http://192.168.10.18:8080/xxl-job-admin
-    accessToken:
-    executor:
-      appname: meter
-      address:
-      ip:
-      port: 9999
-      logpath: c:/xxl-job/meter/logs
-      logretentiondays: 30
-
-
-
-test:
-  abcd:
+#        shared-configs:
+#          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}