feat(吉林演示): 松原

1.天气数据接收定时任务,解决代码扫描问题,修改文件读取相关代码,解决资源未关流问题;
2.修改登录验证码生成工具类,解决代码扫描问题,修复随机数不安全问题;
3.删除除主程序启动类外其他启动类模块,解决代码扫描问题;
4.删除自定义httputlis类,解决代码扫描问题,替换部分代码远程调用方法;
5.重构光伏预测模块下载电站实际发电数据导入模板接口,解决代码扫描问题;
6.重构光伏预测模块导入电站实际发电数据接口,解决代码扫描问题;
7.删除公用excel导入导出工具类及poi相关pom依赖,解决代码扫描问题;
8.光伏功率预测模块,增加查询线路列表接口,解决页面接口报错问题;
9.增加测试用历史数据导入接口;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdDataAccessCloudServiceImpl.java

@@ -3,13 +3,16 @@ package pps.core.prediction.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudInput;
 import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
 import pps.cloud.prediction.service.IThirdDataAccessCloudService;
+import pps.core.common.constant.BusinessConstant;
 import pps.core.prediction.constant.ThirdPartyApiConstant;
 import pps.core.prediction.entity.*;
 import pps.core.prediction.mapper.*;
@@ -48,11 +51,36 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
      */
     @Override
     public XServiceResult thirdActivePowerJob(XContext context) {
-        String resultStr = ServiceUtil.doPostFormCq(context,
-                ThirdPartyApiConstant.CQ_WELL_STATION_PV_DATA,
-                new HashMap<>(0));
-        context.getLogger().info("*** CQ_WELL_STATION_PV_DATA : {}", resultStr);
-        List<GetThirdActivePowerViewOutput> outputs = JSON.parseArray(resultStr, GetThirdActivePowerViewOutput.class);
+        List<GetThirdActivePowerViewOutput> outputs;
+        //区分环境
+        String oilFieldCode = ServiceUtil.getOilFieldCode(context);
+        switch (oilFieldCode) {
+            case BusinessConstant.ENV_SY:
+                outputs = new ArrayList<>();
+                //查数据表最新记录数据时间
+                ThirdActivePowerDailyUpdateMapper mapper = context.getBean(ThirdActivePowerDailyUpdateMapper.class);
+                ThirdActivePowerDailyUpdateEnt maxEnt = mapper.selectOne(new QueryWrapper<ThirdActivePowerDailyUpdateEnt>()
+                        .select("MAX( create_date ) AS create_date")
+                );
+                if (ObjectUtil.isNull(maxEnt)) {
+
+                } else {
+
+                }
+                //条件查询实际功率
+//                context.getBean(IThirdActivePowerCloudService)
+                break;
+            case BusinessConstant.ENV_CQ:
+                String resultStr = ServiceUtil.doPostFormCq(context,
+                        ThirdPartyApiConstant.CQ_WELL_STATION_PV_DATA,
+                        new HashMap<>(0));
+                context.getLogger().info("*** CQ_WELL_STATION_PV_DATA : {}", resultStr);
+                outputs = JSON.parseArray(resultStr, GetThirdActivePowerViewOutput.class);
+                break;
+            default:
+                return XServiceResult.OK;
+        }
+        //数据处理
         if (CollUtil.isEmpty(outputs)) {
             return XServiceResult.OK;
         }
@@ -62,7 +90,6 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
         DateTime now = DateTime.now();
         DateTime saveDate = DateUtil.beginOfDay(now);
         DateTime saveHour = DateUtil.beginOfHour(now);
-        String oilFieldCode = ServiceUtil.getOilFieldCode(context);
         LambdaQueryWrapper<ThirdActivePowerEnt> queryWrapper = new LambdaQueryWrapper<ThirdActivePowerEnt>()
                 .select(ThirdActivePowerEnt::getId);
         for (GetThirdActivePowerViewOutput o : outputs) {

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/IThirdActivePowerCloudService.java

+package pps.cloud.middle.service;
+
+import pps.cloud.middle.service.data.third_active_power.GetThirdActivePowerViewInput;
+import pps.cloud.middle.service.data.third_active_power.GetThirdActivePowerViewOutput;
+import xstartup.annotation.XService;
+import xstartup.annotation.XText;
+import xstartup.data.XListResult;
+
+/**
+ * 实际功率
+ *
+ * @author ZWT
+ * @date 2024/10/19 15:15
+ */
+@XText("实际功率Cloud模块")
+@XService
+public interface IThirdActivePowerCloudService {
+
+    /**
+     * 实际功率列表
+     *
+     * @param input 输入
+     * @return {@link XListResult }<{@link GetThirdActivePowerViewOutput }>
+     */
+    @XText("实际功率列表")
+    XListResult<GetThirdActivePowerViewOutput> getThirdActivePowerList(GetThirdActivePowerViewInput input);
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/CreateStationMappingInput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class CreateStationMappingInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/CreateStationMappingOutput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class CreateStationMappingOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/DeleteStationMappingInput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class DeleteStationMappingInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/DeleteStationMappingOutput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class DeleteStationMappingOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/DynamicQueryStationMappingInput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class DynamicQueryStationMappingInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/DynamicQueryStationMappingOutput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class DynamicQueryStationMappingOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/DynamicQueryStationMappingViewOutput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class DynamicQueryStationMappingViewOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/GetStationMappingInput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class GetStationMappingInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/GetStationMappingOutput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class GetStationMappingOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/GetStationMappingViewInput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class GetStationMappingViewInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/GetStationMappingViewOutput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class GetStationMappingViewOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/QueryStationMappingInput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+public class QueryStationMappingInput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/QueryStationMappingOutput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+public class QueryStationMappingOutput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/QueryStationMappingViewInput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+public class QueryStationMappingViewInput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/QueryStationMappingViewOutput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+public class QueryStationMappingViewOutput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/UpdateStationMappingInput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class UpdateStationMappingInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/station_mapping/UpdateStationMappingOutput.java

+package pps.cloud.middle.service.data.station_mapping;
+
+import xstartup.annotation.XText;
+
+public class UpdateStationMappingOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("逆变器ID")
+    private Long inverterId;
+
+    @XText("逆变器名称")
+    private String inverterName;
+
+    @XText("井场ID(吉林光伏电站ID)")
+    private Long wellSiteId;
+
+    @XText("井场名称(吉林光伏电站名称)")
+    private String wellSiteName;
+
+    @XText("光伏安装位置(吉林)")
+    private String installPosition;
+
+    @XText("系统电站名称(零碳系统)")
+    private String systemStationName;
+
+    public Long getID() {
+        return this.id;
+    }
+
+    public void setID(Long value) {
+        this.id = value;
+    }
+
+    public Long getInverterId() {
+        return this.inverterId;
+    }
+
+    public void setInverterId(Long value) {
+        this.inverterId = value;
+    }
+
+    public String getInverterName() {
+        return this.inverterName;
+    }
+
+    public void setInverterName(String value) {
+        this.inverterName = value;
+    }
+
+    public Long getWellSiteId() {
+        return this.wellSiteId;
+    }
+
+    public void setWellSiteId(Long value) {
+        this.wellSiteId = value;
+    }
+
+    public String getWellSiteName() {
+        return this.wellSiteName;
+    }
+
+    public void setWellSiteName(String value) {
+        this.wellSiteName = value;
+    }
+
+    public String getInstallPosition() {
+        return this.installPosition;
+    }
+
+    public void setInstallPosition(String value) {
+        this.installPosition = value;
+    }
+
+    public String getSystemStationName() {
+        return this.systemStationName;
+    }
+
+    public void setSystemStationName(String value) {
+        this.systemStationName = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_active_power/GetThirdActivePowerViewInput.java

+package pps.cloud.middle.service.data.third_active_power;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 实际功率
+ *
+ * @author ZWT
+ * @date 2024/10/19
+ */
+@Data
+public class GetThirdActivePowerViewInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(线路/光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏实际功率(KW)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("电表有功功率(KW)")
+    private BigDecimal meterPower;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("录入时间")
+    private Date inputTime;
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_active_power/GetThirdActivePowerViewOutput.java

+package pps.cloud.middle.service.data.third_active_power;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 实际功率
+ *
+ * @author ZWT
+ * @date 2024/10/19
+ */
+@Data
+public class GetThirdActivePowerViewOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(线路/光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏实际功率(KW)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("电表有功功率(KW)")
+    private BigDecimal meterPower;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("录入时间")
+    private Date inputTime;
+}
\ No newline at end of file

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/CreateThirdCurrentWellConditionInput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class CreateThirdCurrentWellConditionInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/CreateThirdCurrentWellConditionOutput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class CreateThirdCurrentWellConditionOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/DeleteThirdCurrentWellConditionInput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DeleteThirdCurrentWellConditionInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/DeleteThirdCurrentWellConditionOutput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DeleteThirdCurrentWellConditionOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/DynamicQueryThirdCurrentWellConditionInput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DynamicQueryThirdCurrentWellConditionInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/DynamicQueryThirdCurrentWellConditionOutput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DynamicQueryThirdCurrentWellConditionOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/DynamicQueryThirdCurrentWellConditionViewOutput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DynamicQueryThirdCurrentWellConditionViewOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/GetThirdCurrentWellConditionInput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GetThirdCurrentWellConditionInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/GetThirdCurrentWellConditionOutput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GetThirdCurrentWellConditionOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/GetThirdCurrentWellConditionViewInput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GetThirdCurrentWellConditionViewInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/GetThirdCurrentWellConditionViewOutput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GetThirdCurrentWellConditionViewOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/QueryThirdCurrentWellConditionInput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class QueryThirdCurrentWellConditionInput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/QueryThirdCurrentWellConditionOutput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class QueryThirdCurrentWellConditionOutput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/QueryThirdCurrentWellConditionViewInput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class QueryThirdCurrentWellConditionViewInput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/QueryThirdCurrentWellConditionViewOutput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class QueryThirdCurrentWellConditionViewOutput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/UpdateThirdCurrentWellConditionInput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class UpdateThirdCurrentWellConditionInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/UpdateThirdCurrentWellConditionOutput.java

+package pps.cloud.middle.service.data.third_current_well_condition;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class UpdateThirdCurrentWellConditionOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("下次启停时间")
+    private Date nextTime;
+
+    @XText("井口状态(开/停井)")
+    private String wellStatus;
+
+    @XText("累计产液量(m3)")
+    private BigDecimal cumulativeProduction;
+
+    @XText("开井时长(h)")
+    private BigDecimal runningTime;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("更新时间")
+    private Date updateTime;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getWellNumber() {
+        return this.wellNumber;
+    }
+
+    public void setWellNumber(String value) {
+        this.wellNumber = value;
+    }
+
+    public Date getNextTime() {
+        return this.nextTime;
+    }
+
+    public void setNextTime(Date value) {
+        this.nextTime = value;
+    }
+
+    public String getWellStatus() {
+        return this.wellStatus;
+    }
+
+    public void setWellStatus(String value) {
+        this.wellStatus = value;
+    }
+
+    public BigDecimal getCumulativeProduction() {
+        return this.cumulativeProduction;
+    }
+
+    public void setCumulativeProduction(BigDecimal value) {
+        this.cumulativeProduction = value;
+    }
+
+    public BigDecimal getRunningTime() {
+        return this.runningTime;
+    }
+
+    public void setRunningTime(BigDecimal value) {
+        this.runningTime = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public Date getUpdateTime() {
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date value) {
+        this.updateTime = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/CreateThirdDailyAccumulationInput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class CreateThirdDailyAccumulationInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/CreateThirdDailyAccumulationOutput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class CreateThirdDailyAccumulationOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/DeleteThirdDailyAccumulationInput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DeleteThirdDailyAccumulationInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/DeleteThirdDailyAccumulationOutput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DeleteThirdDailyAccumulationOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/DynamicQueryThirdDailyAccumulationInput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DynamicQueryThirdDailyAccumulationInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/DynamicQueryThirdDailyAccumulationOutput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DynamicQueryThirdDailyAccumulationOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/DynamicQueryThirdDailyAccumulationViewOutput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class DynamicQueryThirdDailyAccumulationViewOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/GetThirdDailyAccumulationInput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GetThirdDailyAccumulationInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/GetThirdDailyAccumulationOutput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GetThirdDailyAccumulationOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/GetThirdDailyAccumulationViewInput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GetThirdDailyAccumulationViewInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/GetThirdDailyAccumulationViewOutput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GetThirdDailyAccumulationViewOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/QueryThirdDailyAccumulationInput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class QueryThirdDailyAccumulationInput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/QueryThirdDailyAccumulationOutput.java

+package pps.cloud.middle.service.data.third_daily_accumulation;
+
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class QueryThirdDailyAccumulationOutput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    private String stationId;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累计发电(KWh)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("日累计用电量(KW·h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日累计产液量(m3)")
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("就地消纳电量(KWh)")
+    private BigDecimal inPlaceConsumption;
+
+    @XText("入库日期")
+    private Date saveDate;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    @XText("储能累计放电量(KW·h)")
+    private BigDecimal energyStorageDischarge;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public String getStationId() {
+        return this.stationId;
+    }
+
+    public void setStationId(String value) {
+        this.stationId = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public BigDecimal getDailyElectricityConsumption() {
+        return this.dailyElectricityConsumption;
+    }
+
+    public void setDailyElectricityConsumption(BigDecimal value) {
+        this.dailyElectricityConsumption = value;
+    }
+
+    public BigDecimal getDailyLiquidProduction() {
+        return this.dailyLiquidProduction;
+    }
+
+    public void setDailyLiquidProduction(BigDecimal value) {
+        this.dailyLiquidProduction = value;
+    }
+
+    public BigDecimal getInPlaceConsumption() {
+        return this.inPlaceConsumption;
+    }
+
+    public void setInPlaceConsumption(BigDecimal value) {
+        this.inPlaceConsumption = value;
+    }
+
+    public Date getSaveDate() {
+        return this.saveDate;
+    }
+
+    public void setSaveDate(Date value) {
+        this.saveDate = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+    public BigDecimal getEnergyStorageDischarge() {
+        return this.energyStorageDischarge;
+    }
+
+    public void setEnergyStorageDischarge(BigDecimal value) {
+        this.energyStorageDischarge = value;
+    }
+
+}

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/CreateThirdPhotovoltaicPowerInput.java

+package pps.cloud.middle.service.data.third_photovoltaic_power;
+
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class CreateThirdPhotovoltaicPowerInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    private String stationName;
+
+    @XText("创建时间")
+    private Date createDate;
+
+    @XText("光伏日累积发电量(KW·h)")
+    private BigDecimal photovoltaicPower;
+
+    @XText("来源系统")
+    private String systemSource;
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public void setId(Long value) {
+        this.id = value;
+    }
+
+    public String getStationName() {
+        return this.stationName;
+    }
+
+    public void setStationName(String value) {
+        this.stationName = value;
+    }
+
+    public Date getCreateDate() {
+        return this.createDate;
+    }
+
+    public void setCreateDate(Date value) {
+        this.createDate = value;
+    }
+
+    public BigDecimal getPhotovoltaicPower() {
+        return this.photovoltaicPower;
+    }
+
+    public void setPhotovoltaicPower(BigDecimal value) {
+        this.photovoltaicPower = value;
+    }
+
+    public String getSystemSource() {
+        return this.systemSource;
+    }
+
+    public void setSystemSource(String value) {
+        this.systemSource = value;
+    }
+
+}