diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureService.java
index 71df015..748f1c8 100644
--- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureService.java
+++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureService.java
@@ -1,13 +1,9 @@
 package com.fastbee.deviceData.api.devlink.service;
 
-import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSON;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.fastbee.deviceData.api.renke.service.RenkeMetDeviceService;
-import com.fastbee.deviceData.mapper.DeviceRealtimedataMeteorologyMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,7 +18,7 @@ public class DevLinkMoistureService {
     private DevLinkAuthorizationService authorizationService;
 
     @Autowired
-    private DeviceRealtimedataMeteorologyMapper deviceRealtimedataMeteorologyMapper;
+    private DeviceRealtimedataPhotovoltaicMapper deviceRealtimedataPhotovoltaicMapper;
 
     /**
      * 获取设备列表
@@ -62,7 +58,7 @@ public class DevLinkMoistureService {
             //TODO 属性值历史数据，是否需要
             Object list = JSONUtil.parseObj(p).get("list");
             //TODO 封装所需数据
-            deviceRealtimedataMeteorologyMapper.insertDeviceRealtimedataMeteorology(null);
+            deviceRealtimedataPhotovoltaicMapper.insertDeviceRealtimedataMeteorology(null);
 
         });
 
diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMeteorology.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMeteorology.java
deleted file mode 100644
index a6a87fa..0000000
--- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMeteorology.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.fastbee.deviceData.domain;
-
-import java.math.BigDecimal;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fastbee.common.annotation.Excel;
-import com.fastbee.common.core.domain.BaseEntity;
-
-/**
- * 气象设备实时数据对象 iot_device_realtimedata_meteorology
- *
- * @author kerwincui
- * @date 2024-11-13
- */
-@ApiModel(value = "DeviceRealtimedataMeteorology",description = "气象设备实时数据 iot_device_realtimedata_meteorology")
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class DeviceRealtimedataMeteorology extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    private Long id;
-
-    /** 设备id */
-    @Excel(name = "设备id")
-    @ApiModelProperty("设备id")
-    private Long deviceId;
-
-    /** 空气温度 */
-    @Excel(name = "空气温度")
-    @ApiModelProperty("空气温度")
-    private BigDecimal airTemp;
-
-    /** 空气湿度 */
-    @Excel(name = "空气湿度")
-    @ApiModelProperty("空气湿度")
-    private BigDecimal airHumi;
-
-    /** 风速 */
-    @Excel(name = "风速")
-    @ApiModelProperty("风速")
-    private BigDecimal windSpeed;
-
-    /** 风向 */
-    @Excel(name = "风向")
-    @ApiModelProperty("风向")
-    private Long windDir;
-
-    /** 大气压力 */
-    @Excel(name = "大气压力")
-    @ApiModelProperty("大气压力")
-    private BigDecimal airPre;
-
-    /** 光照度 */
-    @Excel(name = "光照度")
-    @ApiModelProperty("光照度")
-    private Long guangzhao;
-
-    /** 光合有效辐射 */
-    @Excel(name = "光合有效辐射")
-    @ApiModelProperty("光合有效辐射")
-    private BigDecimal fushe;
-
-    /** 累积雨量 */
-    @Excel(name = "累积雨量")
-    @ApiModelProperty("累积雨量")
-    private BigDecimal sumRain;
-
-    /** 瞬时雨量 */
-    @Excel(name = "瞬时雨量")
-    @ApiModelProperty("瞬时雨量")
-    private BigDecimal insRain;
-
-    /** 日雨量 */
-    @Excel(name = "日雨量")
-    @ApiModelProperty("日雨量")
-    private BigDecimal dayRain;
-
-    /** 蒸发量 */
-    @Excel(name = "蒸发量")
-    @ApiModelProperty("蒸发量")
-    private BigDecimal zhengfa;
-
-    /** 土壤温度 */
-    @Excel(name = "土壤温度")
-    @ApiModelProperty("土壤温度")
-    private BigDecimal soilTemp;
-
-    /** 土壤湿度 */
-    @Excel(name = "土壤湿度")
-    @ApiModelProperty("土壤湿度")
-    private BigDecimal soilHumi;
-
-    /** 删除标志（0代表存在，2代表删除） */
-    private Integer delFlag;
-
-}
diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataPhotovoltaic.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataPhotovoltaic.java
new file mode 100644
index 0000000..32e170d
--- /dev/null
+++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataPhotovoltaic.java
@@ -0,0 +1,262 @@
+package com.fastbee.deviceData.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fastbee.common.annotation.Excel;
+import com.fastbee.common.core.domain.BaseEntity;
+
+/**
+ * 光伏设备实时数据对象 iot_device_realtimedata_photovoltaic
+ *
+ * @author kerwincui
+ * @date 2024-11-14
+ */
+@ApiModel(value = "DeviceRealtimedataPhotovoltaic",description = "光伏设备实时数据 iot_device_realtimedata_photovoltaic")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DeviceRealtimedataPhotovoltaic extends BaseEntity
+        {
+private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 设备id */
+            @Excel(name = "设备id")
+            @ApiModelProperty("设备id")
+    private Long deviceId;
+
+    /** 1#环境温度 */
+            @Excel(name = "1#环境温度")
+            @ApiModelProperty("1#环境温度")
+    private BigDecimal airTemp;
+
+    /** 1#设备温度 */
+            @Excel(name = "1#设备温度")
+            @ApiModelProperty("1#设备温度")
+    private BigDecimal mppTemp;
+
+    /** 1#电池电量 */
+            @Excel(name = "1#电池电量")
+            @ApiModelProperty("1#电池电量")
+    private Long batteryCap;
+
+    /** 1#电池电压 */
+            @Excel(name = "1#电池电压")
+            @ApiModelProperty("1#电池电压")
+    private BigDecimal batteryVolt;
+
+    /** 1#电池电流 */
+            @Excel(name = "1#电池电流")
+            @ApiModelProperty("1#电池电流")
+    private BigDecimal batteryCur;
+
+    /** 1#电池功率 */
+            @Excel(name = "1#电池功率")
+            @ApiModelProperty("1#电池功率")
+    private BigDecimal batteryPower;
+
+    /** 1#负载电压 */
+            @Excel(name = "1#负载电压")
+            @ApiModelProperty("1#负载电压")
+    private BigDecimal loadVolt;
+
+    /** 1#负载电流 */
+            @Excel(name = "1#负载电流")
+            @ApiModelProperty("1#负载电流")
+    private BigDecimal loadCur;
+
+    /** 1#负载功率 */
+            @Excel(name = "1#负载功率")
+            @ApiModelProperty("1#负载功率")
+    private BigDecimal loadPower;
+
+    /** 1#光伏电压 */
+            @Excel(name = "1#光伏电压")
+            @ApiModelProperty("1#光伏电压")
+    private BigDecimal photVolt;
+
+    /** 1#光伏电流 */
+            @Excel(name = "1#光伏电流")
+            @ApiModelProperty("1#光伏电流")
+    private BigDecimal photCur;
+
+    /** 1#光伏功率 */
+            @Excel(name = "1#光伏功率")
+            @ApiModelProperty("1#光伏功率")
+    private BigDecimal photPower;
+
+    /** 1#当日累计充电量 */
+            @Excel(name = "1#当日累计充电量")
+            @ApiModelProperty("1#当日累计充电量")
+    private BigDecimal cumChargeDay;
+
+    /** 1#当月累计充电量 */
+            @Excel(name = "1#当月累计充电量")
+            @ApiModelProperty("1#当月累计充电量")
+    private BigDecimal cumChargeMon;
+
+    /** 1#当年累积充电量 */
+            @Excel(name = "1#当年累积充电量")
+            @ApiModelProperty("1#当年累积充电量")
+    private BigDecimal cumChargeYear;
+
+    /** 1#总累计充电量 */
+            @Excel(name = "1#总累计充电量")
+            @ApiModelProperty("1#总累计充电量")
+    private BigDecimal cumChargeAll;
+
+    /** 1#当日累计用电量 */
+            @Excel(name = "1#当日累计用电量")
+            @ApiModelProperty("1#当日累计用电量")
+    private BigDecimal cumEleDay;
+
+    /** 1#当月累积用电量 */
+            @Excel(name = "1#当月累积用电量")
+            @ApiModelProperty("1#当月累积用电量")
+    private BigDecimal cumEleMon;
+
+    /** 1#当年累计用电量 */
+            @Excel(name = "1#当年累计用电量")
+            @ApiModelProperty("1#当年累计用电量")
+    private BigDecimal cumEleYear;
+
+    /** 1#总累积用电量 */
+            @Excel(name = "1#总累积用电量")
+            @ApiModelProperty("1#总累积用电量")
+    private BigDecimal cumEleAll;
+
+    /** 1#手动控制模式 */
+            @Excel(name = "1#手动控制模式")
+            @ApiModelProperty("1#手动控制模式")
+    private Long shoudong;
+
+    /** 1#远程通断电 */
+            @Excel(name = "1#远程通断电")
+            @ApiModelProperty("1#远程通断电")
+    private Long control;
+
+    /** 2#环境温度 */
+            @Excel(name = "2#环境温度")
+            @ApiModelProperty("2#环境温度")
+    private BigDecimal airTemp2;
+
+    /** 2#设备温度 */
+            @Excel(name = "2#设备温度")
+            @ApiModelProperty("2#设备温度")
+    private BigDecimal mppTemp2;
+
+    /** 2#电池电量 */
+            @Excel(name = "2#电池电量")
+            @ApiModelProperty("2#电池电量")
+    private Long batteryCap2;
+
+    /** 2#电池电压 */
+            @Excel(name = "2#电池电压")
+            @ApiModelProperty("2#电池电压")
+    private BigDecimal batteryVolt2;
+
+    /** 2#电池电流 */
+            @Excel(name = "2#电池电流")
+            @ApiModelProperty("2#电池电流")
+    private BigDecimal batteryCur2;
+
+    /** 2#电池功率 */
+            @Excel(name = "2#电池功率")
+            @ApiModelProperty("2#电池功率")
+    private BigDecimal batteryPower2;
+
+    /** 2#负载电压 */
+            @Excel(name = "2#负载电压")
+            @ApiModelProperty("2#负载电压")
+    private BigDecimal loadVolt2;
+
+    /** 2#负载电流 */
+            @Excel(name = "2#负载电流")
+            @ApiModelProperty("2#负载电流")
+    private BigDecimal loadCur2;
+
+    /** 2#负载功率 */
+            @Excel(name = "2#负载功率")
+            @ApiModelProperty("2#负载功率")
+    private BigDecimal loadPower2;
+
+    /** 2#光伏电压 */
+            @Excel(name = "2#光伏电压")
+            @ApiModelProperty("2#光伏电压")
+    private BigDecimal photVolt2;
+
+    /** 2#光伏电流 */
+            @Excel(name = "2#光伏电流")
+            @ApiModelProperty("2#光伏电流")
+    private BigDecimal photCur2;
+
+    /** 2#光伏功率 */
+            @Excel(name = "2#光伏功率")
+            @ApiModelProperty("2#光伏功率")
+    private BigDecimal photPower2;
+
+    /** 2#当日累计充电量 */
+            @Excel(name = "2#当日累计充电量")
+            @ApiModelProperty("2#当日累计充电量")
+    private BigDecimal cumChargeDay2;
+
+    /** 2#当月累计充电量 */
+            @Excel(name = "2#当月累计充电量")
+            @ApiModelProperty("2#当月累计充电量")
+    private BigDecimal cumChargeMon2;
+
+    /** 2#当年累积充电量 */
+            @Excel(name = "2#当年累积充电量")
+            @ApiModelProperty("2#当年累积充电量")
+    private BigDecimal cumChargeYear2;
+
+    /** 2#总累计充电量 */
+            @Excel(name = "2#总累计充电量")
+            @ApiModelProperty("2#总累计充电量")
+    private BigDecimal cumChargeAll2;
+
+    /** 2#当日累计用电量 */
+            @Excel(name = "2#当日累计用电量")
+            @ApiModelProperty("2#当日累计用电量")
+    private BigDecimal cumEleDay2;
+
+    /** 2#当年累计用电量 */
+            @Excel(name = "2#当年累计用电量")
+            @ApiModelProperty("2#当年累计用电量")
+    private BigDecimal cumEleYear2;
+
+    /** 2#总累积用电量 */
+            @Excel(name = "2#总累积用电量")
+            @ApiModelProperty("2#总累积用电量")
+    private BigDecimal cumEleAll2;
+
+    /** 2#手动控制模式 */
+            @Excel(name = "2#手动控制模式")
+            @ApiModelProperty("2#手动控制模式")
+    private Long shoudong2;
+
+    /** 2#远程通断电 */
+            @Excel(name = "2#远程通断电")
+            @ApiModelProperty("2#远程通断电")
+    private Long control2;
+
+    /** 2#当月累计用电量 */
+            @Excel(name = "2#当月累计用电量")
+            @ApiModelProperty("2#当月累计用电量")
+    private BigDecimal cumEleMon2;
+
+    /** 实时时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd")
+            @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd")
+            @ApiModelProperty("实时时间")
+    private Date realTime;
+
+}
diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMeteorologyMapper.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMeteorologyMapper.java
deleted file mode 100644
index a1735ea..0000000
--- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMeteorologyMapper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.fastbee.deviceData.mapper;
-
-import java.util.List;
-import com.fastbee.deviceData.domain.DeviceRealtimedataMeteorology;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 气象设备实时数据Mapper接口
- *
- * @author kerwincui
- * @date 2024-11-13
- */
-@Mapper
-public interface DeviceRealtimedataMeteorologyMapper
-{
-    /**
-     * 查询气象设备实时数据
-     *
-     * @param id 气象设备实时数据主键
-     * @return 气象设备实时数据
-     */
-    public DeviceRealtimedataMeteorology selectDeviceRealtimedataMeteorologyById(Long id);
-
-    /**
-     * 查询气象设备实时数据列表
-     *
-     * @param deviceRealtimedataMeteorology 气象设备实时数据
-     * @return 气象设备实时数据集合
-     */
-    public List<DeviceRealtimedataMeteorology> selectDeviceRealtimedataMeteorologyList(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology);
-
-    /**
-     * 新增气象设备实时数据
-     *
-     * @param deviceRealtimedataMeteorology 气象设备实时数据
-     * @return 结果
-     */
-    public int insertDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology);
-
-    /**
-     * 修改气象设备实时数据
-     *
-     * @param deviceRealtimedataMeteorology 气象设备实时数据
-     * @return 结果
-     */
-    public int updateDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology);
-
-    /**
-     * 删除气象设备实时数据
-     *
-     * @param id 气象设备实时数据主键
-     * @return 结果
-     */
-    public int deleteDeviceRealtimedataMeteorologyById(Long id);
-
-    /**
-     * 批量删除气象设备实时数据
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteDeviceRealtimedataMeteorologyByIds(Long[] ids);
-}
diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataPhotovoltaicMapper.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataPhotovoltaicMapper.java
new file mode 100644
index 0000000..4d92b84
--- /dev/null
+++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataPhotovoltaicMapper.java
@@ -0,0 +1,61 @@
+package com.fastbee.deviceData.mapper;
+
+import java.util.List;
+import com.fastbee.deviceData.domain.DeviceRealtimedataPhotovoltaic;
+
+/**
+ * 光伏设备实时数据Mapper接口
+ *
+ * @author kerwincui
+ * @date 2024-11-14
+ */
+public interface DeviceRealtimedataPhotovoltaicMapper
+{
+    /**
+     * 查询光伏设备实时数据
+     *
+     * @param id 光伏设备实时数据主键
+     * @return 光伏设备实时数据
+     */
+    public DeviceRealtimedataPhotovoltaic selectDeviceRealtimedataPhotovoltaicById(Long id);
+
+    /**
+     * 查询光伏设备实时数据列表
+     *
+     * @param deviceRealtimedataPhotovoltaic 光伏设备实时数据
+     * @return 光伏设备实时数据集合
+     */
+    public List<DeviceRealtimedataPhotovoltaic> selectDeviceRealtimedataPhotovoltaicList(DeviceRealtimedataPhotovoltaic deviceRealtimedataPhotovoltaic);
+
+    /**
+     * 新增光伏设备实时数据
+     *
+     * @param deviceRealtimedataPhotovoltaic 光伏设备实时数据
+     * @return 结果
+     */
+    public int insertDeviceRealtimedataPhotovoltaic(DeviceRealtimedataPhotovoltaic deviceRealtimedataPhotovoltaic);
+
+    /**
+     * 修改光伏设备实时数据
+     *
+     * @param deviceRealtimedataPhotovoltaic 光伏设备实时数据
+     * @return 结果
+     */
+    public int updateDeviceRealtimedataPhotovoltaic(DeviceRealtimedataPhotovoltaic deviceRealtimedataPhotovoltaic);
+
+    /**
+     * 删除光伏设备实时数据
+     *
+     * @param id 光伏设备实时数据主键
+     * @return 结果
+     */
+    public int deleteDeviceRealtimedataPhotovoltaicById(Long id);
+
+    /**
+     * 批量删除光伏设备实时数据
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDeviceRealtimedataPhotovoltaicByIds(Long[] ids);
+}
diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMeteorologyService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMeteorologyService.java
deleted file mode 100644
index 3c985ef..0000000
--- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMeteorologyService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.fastbee.deviceData.service;
-
-import java.util.List;
-import com.fastbee.deviceData.domain.DeviceRealtimedataMeteorology;
-
-/**
- * 气象设备实时数据Service接口
- * 
- * @author kerwincui
- * @date 2024-11-13
- */
-public interface IDeviceRealtimedataMeteorologyService 
-{
-    /**
-     * 查询气象设备实时数据
-     * 
-     * @param id 气象设备实时数据主键
-     * @return 气象设备实时数据
-     */
-    public DeviceRealtimedataMeteorology selectDeviceRealtimedataMeteorologyById(Long id);
-
-    /**
-     * 查询气象设备实时数据列表
-     * 
-     * @param deviceRealtimedataMeteorology 气象设备实时数据
-     * @return 气象设备实时数据集合
-     */
-    public List<DeviceRealtimedataMeteorology> selectDeviceRealtimedataMeteorologyList(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology);
-
-    /**
-     * 新增气象设备实时数据
-     * 
-     * @param deviceRealtimedataMeteorology 气象设备实时数据
-     * @return 结果
-     */
-    public int insertDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology);
-
-    /**
-     * 修改气象设备实时数据
-     * 
-     * @param deviceRealtimedataMeteorology 气象设备实时数据
-     * @return 结果
-     */
-    public int updateDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology);
-
-    /**
-     * 批量删除气象设备实时数据
-     * 
-     * @param ids 需要删除的气象设备实时数据主键集合
-     * @return 结果
-     */
-    public int deleteDeviceRealtimedataMeteorologyByIds(Long[] ids);
-
-    /**
-     * 删除气象设备实时数据信息
-     * 
-     * @param id 气象设备实时数据主键
-     * @return 结果
-     */
-    public int deleteDeviceRealtimedataMeteorologyById(Long id);
-}
diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataPhotovoltaicService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataPhotovoltaicService.java
new file mode 100644
index 0000000..e9620ad
--- /dev/null
+++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataPhotovoltaicService.java
@@ -0,0 +1,61 @@
+package com.fastbee.deviceData.service;
+
+import java.util.List;
+import com.fastbee.deviceData.domain.DeviceRealtimedataPhotovoltaic;
+
+/**
+ * 光伏设备实时数据Service接口
+ * 
+ * @author kerwincui
+ * @date 2024-11-14
+ */
+public interface IDeviceRealtimedataPhotovoltaicService 
+{
+    /**
+     * 查询光伏设备实时数据
+     * 
+     * @param id 光伏设备实时数据主键
+     * @return 光伏设备实时数据
+     */
+    public DeviceRealtimedataPhotovoltaic selectDeviceRealtimedataPhotovoltaicById(Long id);
+
+    /**
+     * 查询光伏设备实时数据列表
+     * 
+     * @param deviceRealtimedataPhotovoltaic 光伏设备实时数据
+     * @return 光伏设备实时数据集合
+     */
+    public List<DeviceRealtimedataPhotovoltaic> selectDeviceRealtimedataPhotovoltaicList(DeviceRealtimedataPhotovoltaic deviceRealtimedataPhotovoltaic);
+
+    /**
+     * 新增光伏设备实时数据
+     * 
+     * @param deviceRealtimedataPhotovoltaic 光伏设备实时数据
+     * @return 结果
+     */
+    public int insertDeviceRealtimedataPhotovoltaic(DeviceRealtimedataPhotovoltaic deviceRealtimedataPhotovoltaic);
+
+    /**
+     * 修改光伏设备实时数据
+     * 
+     * @param deviceRealtimedataPhotovoltaic 光伏设备实时数据
+     * @return 结果
+     */
+    public int updateDeviceRealtimedataPhotovoltaic(DeviceRealtimedataPhotovoltaic deviceRealtimedataPhotovoltaic);
+
+    /**
+     * 批量删除光伏设备实时数据
+     * 
+     * @param ids 需要删除的光伏设备实时数据主键集合
+     * @return 结果
+     */
+    public int deleteDeviceRealtimedataPhotovoltaicByIds(Long[] ids);
+
+    /**
+     * 删除光伏设备实时数据信息
+     * 
+     * @param id 光伏设备实时数据主键
+     * @return 结果
+     */
+    public int deleteDeviceRealtimedataPhotovoltaicById(Long id);
+}
diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java
deleted file mode 100644
index 6b87e4a..0000000
--- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.fastbee.deviceData.service.impl;
-
-import java.util.List;
-import com.fastbee.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.fastbee.deviceData.mapper.DeviceRealtimedataMeteorologyMapper;
-import com.fastbee.deviceData.domain.DeviceRealtimedataMeteorology;
-import com.fastbee.deviceData.service.IDeviceRealtimedataMeteorologyService;
-
-/**
- * 气象设备实时数据Service业务层处理
- * 
- * @author kerwincui
- * @date 2024-11-13
- */
-@Service
-public class DeviceRealtimedataMeteorologyServiceImpl implements IDeviceRealtimedataMeteorologyService 
-{
-    @Autowired
-    private DeviceRealtimedataMeteorologyMapper deviceRealtimedataMeteorologyMapper;
-
-    /**
-     * 查询气象设备实时数据
-     * 
-     * @param id 气象设备实时数据主键
-     * @return 气象设备实时数据
-     */
-    @Override
-    public DeviceRealtimedataMeteorology selectDeviceRealtimedataMeteorologyById(Long id)
-    {
-        return deviceRealtimedataMeteorologyMapper.selectDeviceRealtimedataMeteorologyById(id);
-    }
-
-    /**
-     * 查询气象设备实时数据列表
-     * 
-     * @param deviceRealtimedataMeteorology 气象设备实时数据
-     * @return 气象设备实时数据
-     */
-    @Override
-    public List<DeviceRealtimedataMeteorology> selectDeviceRealtimedataMeteorologyList(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology)
-    {
-        return deviceRealtimedataMeteorologyMapper.selectDeviceRealtimedataMeteorologyList(deviceRealtimedataMeteorology);
-    }
-
-    /**
-     * 新增气象设备实时数据
-     * 
-     * @param deviceRealtimedataMeteorology 气象设备实时数据
-     * @return 结果
-     */
-    @Override
-    public int insertDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology)
-    {
-        deviceRealtimedataMeteorology.setCreateTime(DateUtils.getNowDate());
-        return deviceRealtimedataMeteorologyMapper.insertDeviceRealtimedataMeteorology(deviceRealtimedataMeteorology);
-    }
-
-    /**
-     * 修改气象设备实时数据
-     * 
-     * @param deviceRealtimedataMeteorology 气象设备实时数据
-     * @return 结果
-     */
-    @Override
-    public int updateDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology)
-    {
-        deviceRealtimedataMeteorology.setUpdateTime(DateUtils.getNowDate());
-        return deviceRealtimedataMeteorologyMapper.updateDeviceRealtimedataMeteorology(deviceRealtimedataMeteorology);
-    }
-
-    /**
-     * 批量删除气象设备实时数据
-     * 
-     * @param ids 需要删除的气象设备实时数据主键
-     * @return 结果
-     */
-    @Override
-    public int deleteDeviceRealtimedataMeteorologyByIds(Long[] ids)
-    {
-        return deviceRealtimedataMeteorologyMapper.deleteDeviceRealtimedataMeteorologyByIds(ids);
-    }
-
-    /**
-     * 删除气象设备实时数据信息
-     * 
-     * @param id 气象设备实时数据主键
-     * @return 结果
-     */
-    @Override
-    public int deleteDeviceRealtimedataMeteorologyById(Long id)
-    {
-        return deviceRealtimedataMeteorologyMapper.deleteDeviceRealtimedataMeteorologyById(id);
-    }
-}
diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataPhotovoltaicServiceImpl.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataPhotovoltaicServiceImpl.java
new file mode 100644
index 0000000..3ef84d5
--- /dev/null
+++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataPhotovoltaicServiceImpl.java
@@ -0,0 +1,95 @@
+package com.fastbee.deviceData.service.impl;
+
+import java.util.List;
+import com.fastbee.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fastbee.deviceData.mapper.DeviceRealtimedataPhotovoltaicMapper;
+import com.fastbee.deviceData.domain.DeviceRealtimedataPhotovoltaic;
+import com.fastbee.deviceData.service.IDeviceRealtimedataPhotovoltaicService;
+
+/**
+ * 光伏设备实时数据Service业务层处理
+ * 
+ * @author kerwincui
+ * @date 2024-11-14
+ */
+@Service
+public class DeviceRealtimedataPhotovoltaicServiceImpl implements IDeviceRealtimedataPhotovoltaicService 
+{
+    @Autowired
+    private DeviceRealtimedataPhotovoltaicMapper deviceRealtimedataPhotovoltaicMapper;
+
+    /**
+     * 查询光伏设备实时数据
+     * 
+     * @param id 光伏设备实时数据主键
+     * @return 光伏设备实时数据
+     */
+    @Override
+    public DeviceRealtimedataPhotovoltaic selectDeviceRealtimedataPhotovoltaicById(Long id)
+    {
+        return deviceRealtimedataPhotovoltaicMapper.selectDeviceRealtimedataPhotovoltaicById(id);
+    }
+
+    /**
+     * 查询光伏设备实时数据列表
+     * 
+     * @param deviceRealtimedataPhotovoltaic 光伏设备实时数据
+     * @return 光伏设备实时数据
+     */
+    @Override
+    public List<DeviceRealtimedataPhotovoltaic> selectDeviceRealtimedataPhotovoltaicList(DeviceRealtimedataPhotovoltaic deviceRealtimedataPhotovoltaic)
+    {
+        return deviceRealtimedataPhotovoltaicMapper.selectDeviceRealtimedataPhotovoltaicList(deviceRealtimedataPhotovoltaic);
+    }
+
+    /**
+     * 新增光伏设备实时数据
+     * 
+     * @param deviceRealtimedataPhotovoltaic 光伏设备实时数据
+     * @return 结果
+     */
+    @Override
+    public int insertDeviceRealtimedataPhotovoltaic(DeviceRealtimedataPhotovoltaic deviceRealtimedataPhotovoltaic)
+    {
+        deviceRealtimedataPhotovoltaic.setCreateTime(DateUtils.getNowDate());
+        return deviceRealtimedataPhotovoltaicMapper.insertDeviceRealtimedataPhotovoltaic(deviceRealtimedataPhotovoltaic);
+    }
+
+    /**
+     * 修改光伏设备实时数据
+     * 
+     * @param deviceRealtimedataPhotovoltaic 光伏设备实时数据
+     * @return 结果
+     */
+    @Override
+    public int updateDeviceRealtimedataPhotovoltaic(DeviceRealtimedataPhotovoltaic deviceRealtimedataPhotovoltaic)
+    {
+        return deviceRealtimedataPhotovoltaicMapper.updateDeviceRealtimedataPhotovoltaic(deviceRealtimedataPhotovoltaic);
+    }
+
+    /**
+     * 批量删除光伏设备实时数据
+     * 
+     * @param ids 需要删除的光伏设备实时数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDeviceRealtimedataPhotovoltaicByIds(Long[] ids)
+    {
+        return deviceRealtimedataPhotovoltaicMapper.deleteDeviceRealtimedataPhotovoltaicByIds(ids);
+    }
+
+    /**
+     * 删除光伏设备实时数据信息
+     * 
+     * @param id 光伏设备实时数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDeviceRealtimedataPhotovoltaicById(Long id)
+    {
+        return deviceRealtimedataPhotovoltaicMapper.deleteDeviceRealtimedataPhotovoltaicById(id);
+    }
+}
diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMeteorologyMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMeteorologyMapper.xml
deleted file mode 100644
index 250e8bb..0000000
--- a/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMeteorologyMapper.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fastbee.deviceData.mapper.DeviceRealtimedataMeteorologyMapper">
-
-    <resultMap type="DeviceRealtimedataMeteorology" id="DeviceRealtimedataMeteorologyResult">
-        <result property="id"    column="id"    />
-        <result property="deviceId"    column="device_id"    />
-        <result property="airTemp"    column="air_temp"    />
-        <result property="airHumi"    column="air_humi"    />
-        <result property="windSpeed"    column="wind_speed"    />
-        <result property="windDir"    column="wind_dir"    />
-        <result property="airPre"    column="air_pre"    />
-        <result property="guangzhao"    column="guangzhao"    />
-        <result property="fushe"    column="fushe"    />
-        <result property="sumRain"    column="sum_rain"    />
-        <result property="insRain"    column="ins_rain"    />
-        <result property="dayRain"    column="day_rain"    />
-        <result property="zhengfa"    column="zhengfa"    />
-        <result property="soilTemp"    column="soil_temp"    />
-        <result property="soilHumi"    column="soil_humi"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-    </resultMap>
-
-    <sql id="selectDeviceRealtimedataMeteorologyVo">
-        select id, device_id, air_temp, air_humi, wind_speed, wind_dir, air_pre, guangzhao, fushe, sum_rain, ins_rain, day_rain, zhengfa, soil_temp, soil_humi, del_flag, create_time, create_by, update_time, update_by from iot_device_realtimedata_meteorology
-    </sql>
-
-    <select id="selectDeviceRealtimedataMeteorologyList" parameterType="DeviceRealtimedataMeteorology" resultMap="DeviceRealtimedataMeteorologyResult">
-        <include refid="selectDeviceRealtimedataMeteorologyVo"/>
-        <where>
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
-            <if test="airTemp != null "> and air_temp = #{airTemp}</if>
-            <if test="airHumi != null "> and air_humi = #{airHumi}</if>
-            <if test="windSpeed != null "> and wind_speed = #{windSpeed}</if>
-            <if test="windDir != null "> and wind_dir = #{windDir}</if>
-            <if test="airPre != null "> and air_pre = #{airPre}</if>
-            <if test="guangzhao != null "> and guangzhao = #{guangzhao}</if>
-            <if test="fushe != null "> and fushe = #{fushe}</if>
-            <if test="sumRain != null "> and sum_rain = #{sumRain}</if>
-            <if test="insRain != null "> and ins_rain = #{insRain}</if>
-            <if test="dayRain != null "> and day_rain = #{dayRain}</if>
-            <if test="zhengfa != null "> and zhengfa = #{zhengfa}</if>
-            <if test="soilTemp != null "> and soil_temp = #{soilTemp}</if>
-            <if test="soilHumi != null "> and soil_humi = #{soilHumi}</if>
-        </where>
-    </select>
-
-    <select id="selectDeviceRealtimedataMeteorologyById" parameterType="Long" resultMap="DeviceRealtimedataMeteorologyResult">
-        <include refid="selectDeviceRealtimedataMeteorologyVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertDeviceRealtimedataMeteorology" parameterType="DeviceRealtimedataMeteorology" useGeneratedKeys="true" keyProperty="id">
-        insert into iot_device_realtimedata_meteorology
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="deviceId != null">device_id,</if>
-            <if test="airTemp != null">air_temp,</if>
-            <if test="airHumi != null">air_humi,</if>
-            <if test="windSpeed != null">wind_speed,</if>
-            <if test="windDir != null">wind_dir,</if>
-            <if test="airPre != null">air_pre,</if>
-            <if test="guangzhao != null">guangzhao,</if>
-            <if test="fushe != null">fushe,</if>
-            <if test="sumRain != null">sum_rain,</if>
-            <if test="insRain != null">ins_rain,</if>
-            <if test="dayRain != null">day_rain,</if>
-            <if test="zhengfa != null">zhengfa,</if>
-            <if test="soilTemp != null">soil_temp,</if>
-            <if test="soilHumi != null">soil_humi,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="updateBy != null">update_by,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="deviceId != null">#{deviceId},</if>
-            <if test="airTemp != null">#{airTemp},</if>
-            <if test="airHumi != null">#{airHumi},</if>
-            <if test="windSpeed != null">#{windSpeed},</if>
-            <if test="windDir != null">#{windDir},</if>
-            <if test="airPre != null">#{airPre},</if>
-            <if test="guangzhao != null">#{guangzhao},</if>
-            <if test="fushe != null">#{fushe},</if>
-            <if test="sumRain != null">#{sumRain},</if>
-            <if test="insRain != null">#{insRain},</if>
-            <if test="dayRain != null">#{dayRain},</if>
-            <if test="zhengfa != null">#{zhengfa},</if>
-            <if test="soilTemp != null">#{soilTemp},</if>
-            <if test="soilHumi != null">#{soilHumi},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-        </trim>
-    </insert>
-
-    <update id="updateDeviceRealtimedataMeteorology" parameterType="DeviceRealtimedataMeteorology">
-        update iot_device_realtimedata_meteorology
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="deviceId != null">device_id = #{deviceId},</if>
-            <if test="airTemp != null">air_temp = #{airTemp},</if>
-            <if test="airHumi != null">air_humi = #{airHumi},</if>
-            <if test="windSpeed != null">wind_speed = #{windSpeed},</if>
-            <if test="windDir != null">wind_dir = #{windDir},</if>
-            <if test="airPre != null">air_pre = #{airPre},</if>
-            <if test="guangzhao != null">guangzhao = #{guangzhao},</if>
-            <if test="fushe != null">fushe = #{fushe},</if>
-            <if test="sumRain != null">sum_rain = #{sumRain},</if>
-            <if test="insRain != null">ins_rain = #{insRain},</if>
-            <if test="dayRain != null">day_rain = #{dayRain},</if>
-            <if test="zhengfa != null">zhengfa = #{zhengfa},</if>
-            <if test="soilTemp != null">soil_temp = #{soilTemp},</if>
-            <if test="soilHumi != null">soil_humi = #{soilHumi},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteDeviceRealtimedataMeteorologyById" parameterType="Long">
-        delete from iot_device_realtimedata_meteorology where id = #{id}
-    </delete>
-
-    <delete id="deleteDeviceRealtimedataMeteorologyByIds" parameterType="String">
-        delete from iot_device_realtimedata_meteorology where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
\ No newline at end of file
diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataPhotovoltaicMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataPhotovoltaicMapper.xml
new file mode 100644
index 0000000..44904ea
--- /dev/null
+++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataPhotovoltaicMapper.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fastbee.deviceData.mapper.DeviceRealtimedataPhotovoltaicMapper">
+
+    <resultMap type="DeviceRealtimedataPhotovoltaic" id="DeviceRealtimedataPhotovoltaicResult">
+        <result property="id"    column="id"    />
+        <result property="deviceId"    column="device_id"    />
+        <result property="airTemp"    column="air_temp"    />
+        <result property="mppTemp"    column="mpp_temp"    />
+        <result property="batteryCap"    column="battery_cap"    />
+        <result property="batteryVolt"    column="battery_volt"    />
+        <result property="batteryCur"    column="battery_cur"    />
+        <result property="batteryPower"    column="battery_power"    />
+        <result property="loadVolt"    column="load_volt"    />
+        <result property="loadCur"    column="load_cur"    />
+        <result property="loadPower"    column="load_power"    />
+        <result property="photVolt"    column="phot_volt"    />
+        <result property="photCur"    column="phot_cur"    />
+        <result property="photPower"    column="phot_power"    />
+        <result property="cumChargeDay"    column="cum_charge_day"    />
+        <result property="cumChargeMon"    column="cum_charge_mon"    />
+        <result property="cumChargeYear"    column="cum_charge_year"    />
+        <result property="cumChargeAll"    column="cum_charge_all"    />
+        <result property="cumEleDay"    column="cum_ele_day"    />
+        <result property="cumEleMon"    column="cum_ele_mon"    />
+        <result property="cumEleYear"    column="cum_ele_year"    />
+        <result property="cumEleAll"    column="cum_ele_all"    />
+        <result property="shoudong"    column="shoudong"    />
+        <result property="control"    column="control"    />
+        <result property="airTemp2"    column="air_temp_2"    />
+        <result property="mppTemp2"    column="mpp_temp_2"    />
+        <result property="batteryCap2"    column="battery_cap_2"    />
+        <result property="batteryVolt2"    column="battery_volt_2"    />
+        <result property="batteryCur2"    column="battery_cur_2"    />
+        <result property="batteryPower2"    column="battery_power_2"    />
+        <result property="loadVolt2"    column="load_volt_2"    />
+        <result property="loadCur2"    column="load_cur_2"    />
+        <result property="loadPower2"    column="load_power_2"    />
+        <result property="photVolt2"    column="phot_volt_2"    />
+        <result property="photCur2"    column="phot_cur_2"    />
+        <result property="photPower2"    column="phot_power_2"    />
+        <result property="cumChargeDay2"    column="cum_charge_day_2"    />
+        <result property="cumChargeMon2"    column="cum_charge_mon_2"    />
+        <result property="cumChargeYear2"    column="cum_charge_year_2"    />
+        <result property="cumChargeAll2"    column="cum_charge_all_2"    />
+        <result property="cumEleDay2"    column="cum_ele_day_2"    />
+        <result property="cumEleYear2"    column="cum_ele_year_2"    />
+        <result property="cumEleAll2"    column="cum_ele_all_2"    />
+        <result property="shoudong2"    column="shoudong_2"    />
+        <result property="control2"    column="control_2"    />
+        <result property="cumEleMon2"    column="cum_ele_mon_2"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="realTime"    column="real_time"    />
+    </resultMap>
+
+    <sql id="selectDeviceRealtimedataPhotovoltaicVo">
+        select id, device_id, air_temp, mpp_temp, battery_cap, battery_volt, battery_cur, battery_power, load_volt, load_cur, load_power, phot_volt, phot_cur, phot_power, cum_charge_day, cum_charge_mon, cum_charge_year, cum_charge_all, cum_ele_day, cum_ele_mon, cum_ele_year, cum_ele_all, shoudong, control, air_temp_2, mpp_temp_2, battery_cap_2, battery_volt_2, battery_cur_2, battery_power_2, load_volt_2, load_cur_2, load_power_2, phot_volt_2, phot_cur_2, phot_power_2, cum_charge_day_2, cum_charge_mon_2, cum_charge_year_2, cum_charge_all_2, cum_ele_day_2, cum_ele_year_2, cum_ele_all_2, shoudong_2, control_2, cum_ele_mon_2, create_time, real_time from iot_device_realtimedata_photovoltaic
+    </sql>
+
+    <select id="selectDeviceRealtimedataPhotovoltaicList" parameterType="DeviceRealtimedataPhotovoltaic" resultMap="DeviceRealtimedataPhotovoltaicResult">
+        <include refid="selectDeviceRealtimedataPhotovoltaicVo"/>
+        <where>
+            <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="airTemp != null "> and air_temp = #{airTemp}</if>
+            <if test="mppTemp != null "> and mpp_temp = #{mppTemp}</if>
+            <if test="batteryCap != null "> and battery_cap = #{batteryCap}</if>
+            <if test="batteryVolt != null "> and battery_volt = #{batteryVolt}</if>
+            <if test="batteryCur != null "> and battery_cur = #{batteryCur}</if>
+            <if test="batteryPower != null "> and battery_power = #{batteryPower}</if>
+            <if test="loadVolt != null "> and load_volt = #{loadVolt}</if>
+            <if test="loadCur != null "> and load_cur = #{loadCur}</if>
+            <if test="loadPower != null "> and load_power = #{loadPower}</if>
+            <if test="photVolt != null "> and phot_volt = #{photVolt}</if>
+            <if test="photCur != null "> and phot_cur = #{photCur}</if>
+            <if test="photPower != null "> and phot_power = #{photPower}</if>
+            <if test="cumChargeDay != null "> and cum_charge_day = #{cumChargeDay}</if>
+            <if test="cumChargeMon != null "> and cum_charge_mon = #{cumChargeMon}</if>
+            <if test="cumChargeYear != null "> and cum_charge_year = #{cumChargeYear}</if>
+            <if test="cumChargeAll != null "> and cum_charge_all = #{cumChargeAll}</if>
+            <if test="cumEleDay != null "> and cum_ele_day = #{cumEleDay}</if>
+            <if test="cumEleMon != null "> and cum_ele_mon = #{cumEleMon}</if>
+            <if test="cumEleYear != null "> and cum_ele_year = #{cumEleYear}</if>
+            <if test="cumEleAll != null "> and cum_ele_all = #{cumEleAll}</if>
+            <if test="shoudong != null "> and shoudong = #{shoudong}</if>
+            <if test="control != null "> and control = #{control}</if>
+            <if test="airTemp2 != null "> and air_temp_2 = #{airTemp2}</if>
+            <if test="mppTemp2 != null "> and mpp_temp_2 = #{mppTemp2}</if>
+            <if test="batteryCap2 != null "> and battery_cap_2 = #{batteryCap2}</if>
+            <if test="batteryVolt2 != null "> and battery_volt_2 = #{batteryVolt2}</if>
+            <if test="batteryCur2 != null "> and battery_cur_2 = #{batteryCur2}</if>
+            <if test="batteryPower2 != null "> and battery_power_2 = #{batteryPower2}</if>
+            <if test="loadVolt2 != null "> and load_volt_2 = #{loadVolt2}</if>
+            <if test="loadCur2 != null "> and load_cur_2 = #{loadCur2}</if>
+            <if test="loadPower2 != null "> and load_power_2 = #{loadPower2}</if>
+            <if test="photVolt2 != null "> and phot_volt_2 = #{photVolt2}</if>
+            <if test="photCur2 != null "> and phot_cur_2 = #{photCur2}</if>
+            <if test="photPower2 != null "> and phot_power_2 = #{photPower2}</if>
+            <if test="cumChargeDay2 != null "> and cum_charge_day_2 = #{cumChargeDay2}</if>
+            <if test="cumChargeMon2 != null "> and cum_charge_mon_2 = #{cumChargeMon2}</if>
+            <if test="cumChargeYear2 != null "> and cum_charge_year_2 = #{cumChargeYear2}</if>
+            <if test="cumChargeAll2 != null "> and cum_charge_all_2 = #{cumChargeAll2}</if>
+            <if test="cumEleDay2 != null "> and cum_ele_day_2 = #{cumEleDay2}</if>
+            <if test="cumEleYear2 != null "> and cum_ele_year_2 = #{cumEleYear2}</if>
+            <if test="cumEleAll2 != null "> and cum_ele_all_2 = #{cumEleAll2}</if>
+            <if test="shoudong2 != null "> and shoudong_2 = #{shoudong2}</if>
+            <if test="control2 != null "> and control_2 = #{control2}</if>
+            <if test="cumEleMon2 != null "> and cum_ele_mon_2 = #{cumEleMon2}</if>
+            <if test="realTime != null "> and real_time = #{realTime}</if>
+        </where>
+    </select>
+
+    <select id="selectDeviceRealtimedataPhotovoltaicById" parameterType="Long" resultMap="DeviceRealtimedataPhotovoltaicResult">
+        <include refid="selectDeviceRealtimedataPhotovoltaicVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertDeviceRealtimedataPhotovoltaic" parameterType="DeviceRealtimedataPhotovoltaic" useGeneratedKeys="true" keyProperty="id">
+        insert into iot_device_realtimedata_photovoltaic
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceId != null">device_id,</if>
+            <if test="airTemp != null">air_temp,</if>
+            <if test="mppTemp != null">mpp_temp,</if>
+            <if test="batteryCap != null">battery_cap,</if>
+            <if test="batteryVolt != null">battery_volt,</if>
+            <if test="batteryCur != null">battery_cur,</if>
+            <if test="batteryPower != null">battery_power,</if>
+            <if test="loadVolt != null">load_volt,</if>
+            <if test="loadCur != null">load_cur,</if>
+            <if test="loadPower != null">load_power,</if>
+            <if test="photVolt != null">phot_volt,</if>
+            <if test="photCur != null">phot_cur,</if>
+            <if test="photPower != null">phot_power,</if>
+            <if test="cumChargeDay != null">cum_charge_day,</if>
+            <if test="cumChargeMon != null">cum_charge_mon,</if>
+            <if test="cumChargeYear != null">cum_charge_year,</if>
+            <if test="cumChargeAll != null">cum_charge_all,</if>
+            <if test="cumEleDay != null">cum_ele_day,</if>
+            <if test="cumEleMon != null">cum_ele_mon,</if>
+            <if test="cumEleYear != null">cum_ele_year,</if>
+            <if test="cumEleAll != null">cum_ele_all,</if>
+            <if test="shoudong != null">shoudong,</if>
+            <if test="control != null">control,</if>
+            <if test="airTemp2 != null">air_temp_2,</if>
+            <if test="mppTemp2 != null">mpp_temp_2,</if>
+            <if test="batteryCap2 != null">battery_cap_2,</if>
+            <if test="batteryVolt2 != null">battery_volt_2,</if>
+            <if test="batteryCur2 != null">battery_cur_2,</if>
+            <if test="batteryPower2 != null">battery_power_2,</if>
+            <if test="loadVolt2 != null">load_volt_2,</if>
+            <if test="loadCur2 != null">load_cur_2,</if>
+            <if test="loadPower2 != null">load_power_2,</if>
+            <if test="photVolt2 != null">phot_volt_2,</if>
+            <if test="photCur2 != null">phot_cur_2,</if>
+            <if test="photPower2 != null">phot_power_2,</if>
+            <if test="cumChargeDay2 != null">cum_charge_day_2,</if>
+            <if test="cumChargeMon2 != null">cum_charge_mon_2,</if>
+            <if test="cumChargeYear2 != null">cum_charge_year_2,</if>
+            <if test="cumChargeAll2 != null">cum_charge_all_2,</if>
+            <if test="cumEleDay2 != null">cum_ele_day_2,</if>
+            <if test="cumEleYear2 != null">cum_ele_year_2,</if>
+            <if test="cumEleAll2 != null">cum_ele_all_2,</if>
+            <if test="shoudong2 != null">shoudong_2,</if>
+            <if test="control2 != null">control_2,</if>
+            <if test="cumEleMon2 != null">cum_ele_mon_2,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="realTime != null">real_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceId != null">#{deviceId},</if>
+            <if test="airTemp != null">#{airTemp},</if>
+            <if test="mppTemp != null">#{mppTemp},</if>
+            <if test="batteryCap != null">#{batteryCap},</if>
+            <if test="batteryVolt != null">#{batteryVolt},</if>
+            <if test="batteryCur != null">#{batteryCur},</if>
+            <if test="batteryPower != null">#{batteryPower},</if>
+            <if test="loadVolt != null">#{loadVolt},</if>
+            <if test="loadCur != null">#{loadCur},</if>
+            <if test="loadPower != null">#{loadPower},</if>
+            <if test="photVolt != null">#{photVolt},</if>
+            <if test="photCur != null">#{photCur},</if>
+            <if test="photPower != null">#{photPower},</if>
+            <if test="cumChargeDay != null">#{cumChargeDay},</if>
+            <if test="cumChargeMon != null">#{cumChargeMon},</if>
+            <if test="cumChargeYear != null">#{cumChargeYear},</if>
+            <if test="cumChargeAll != null">#{cumChargeAll},</if>
+            <if test="cumEleDay != null">#{cumEleDay},</if>
+            <if test="cumEleMon != null">#{cumEleMon},</if>
+            <if test="cumEleYear != null">#{cumEleYear},</if>
+            <if test="cumEleAll != null">#{cumEleAll},</if>
+            <if test="shoudong != null">#{shoudong},</if>
+            <if test="control != null">#{control},</if>
+            <if test="airTemp2 != null">#{airTemp2},</if>
+            <if test="mppTemp2 != null">#{mppTemp2},</if>
+            <if test="batteryCap2 != null">#{batteryCap2},</if>
+            <if test="batteryVolt2 != null">#{batteryVolt2},</if>
+            <if test="batteryCur2 != null">#{batteryCur2},</if>
+            <if test="batteryPower2 != null">#{batteryPower2},</if>
+            <if test="loadVolt2 != null">#{loadVolt2},</if>
+            <if test="loadCur2 != null">#{loadCur2},</if>
+            <if test="loadPower2 != null">#{loadPower2},</if>
+            <if test="photVolt2 != null">#{photVolt2},</if>
+            <if test="photCur2 != null">#{photCur2},</if>
+            <if test="photPower2 != null">#{photPower2},</if>
+            <if test="cumChargeDay2 != null">#{cumChargeDay2},</if>
+            <if test="cumChargeMon2 != null">#{cumChargeMon2},</if>
+            <if test="cumChargeYear2 != null">#{cumChargeYear2},</if>
+            <if test="cumChargeAll2 != null">#{cumChargeAll2},</if>
+            <if test="cumEleDay2 != null">#{cumEleDay2},</if>
+            <if test="cumEleYear2 != null">#{cumEleYear2},</if>
+            <if test="cumEleAll2 != null">#{cumEleAll2},</if>
+            <if test="shoudong2 != null">#{shoudong2},</if>
+            <if test="control2 != null">#{control2},</if>
+            <if test="cumEleMon2 != null">#{cumEleMon2},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="realTime != null">#{realTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateDeviceRealtimedataPhotovoltaic" parameterType="DeviceRealtimedataPhotovoltaic">
+        update iot_device_realtimedata_photovoltaic
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="airTemp != null">air_temp = #{airTemp},</if>
+            <if test="mppTemp != null">mpp_temp = #{mppTemp},</if>
+            <if test="batteryCap != null">battery_cap = #{batteryCap},</if>
+            <if test="batteryVolt != null">battery_volt = #{batteryVolt},</if>
+            <if test="batteryCur != null">battery_cur = #{batteryCur},</if>
+            <if test="batteryPower != null">battery_power = #{batteryPower},</if>
+            <if test="loadVolt != null">load_volt = #{loadVolt},</if>
+            <if test="loadCur != null">load_cur = #{loadCur},</if>
+            <if test="loadPower != null">load_power = #{loadPower},</if>
+            <if test="photVolt != null">phot_volt = #{photVolt},</if>
+            <if test="photCur != null">phot_cur = #{photCur},</if>
+            <if test="photPower != null">phot_power = #{photPower},</if>
+            <if test="cumChargeDay != null">cum_charge_day = #{cumChargeDay},</if>
+            <if test="cumChargeMon != null">cum_charge_mon = #{cumChargeMon},</if>
+            <if test="cumChargeYear != null">cum_charge_year = #{cumChargeYear},</if>
+            <if test="cumChargeAll != null">cum_charge_all = #{cumChargeAll},</if>
+            <if test="cumEleDay != null">cum_ele_day = #{cumEleDay},</if>
+            <if test="cumEleMon != null">cum_ele_mon = #{cumEleMon},</if>
+            <if test="cumEleYear != null">cum_ele_year = #{cumEleYear},</if>
+            <if test="cumEleAll != null">cum_ele_all = #{cumEleAll},</if>
+            <if test="shoudong != null">shoudong = #{shoudong},</if>
+            <if test="control != null">control = #{control},</if>
+            <if test="airTemp2 != null">air_temp_2 = #{airTemp2},</if>
+            <if test="mppTemp2 != null">mpp_temp_2 = #{mppTemp2},</if>
+            <if test="batteryCap2 != null">battery_cap_2 = #{batteryCap2},</if>
+            <if test="batteryVolt2 != null">battery_volt_2 = #{batteryVolt2},</if>
+            <if test="batteryCur2 != null">battery_cur_2 = #{batteryCur2},</if>
+            <if test="batteryPower2 != null">battery_power_2 = #{batteryPower2},</if>
+            <if test="loadVolt2 != null">load_volt_2 = #{loadVolt2},</if>
+            <if test="loadCur2 != null">load_cur_2 = #{loadCur2},</if>
+            <if test="loadPower2 != null">load_power_2 = #{loadPower2},</if>
+            <if test="photVolt2 != null">phot_volt_2 = #{photVolt2},</if>
+            <if test="photCur2 != null">phot_cur_2 = #{photCur2},</if>
+            <if test="photPower2 != null">phot_power_2 = #{photPower2},</if>
+            <if test="cumChargeDay2 != null">cum_charge_day_2 = #{cumChargeDay2},</if>
+            <if test="cumChargeMon2 != null">cum_charge_mon_2 = #{cumChargeMon2},</if>
+            <if test="cumChargeYear2 != null">cum_charge_year_2 = #{cumChargeYear2},</if>
+            <if test="cumChargeAll2 != null">cum_charge_all_2 = #{cumChargeAll2},</if>
+            <if test="cumEleDay2 != null">cum_ele_day_2 = #{cumEleDay2},</if>
+            <if test="cumEleYear2 != null">cum_ele_year_2 = #{cumEleYear2},</if>
+            <if test="cumEleAll2 != null">cum_ele_all_2 = #{cumEleAll2},</if>
+            <if test="shoudong2 != null">shoudong_2 = #{shoudong2},</if>
+            <if test="control2 != null">control_2 = #{control2},</if>
+            <if test="cumEleMon2 != null">cum_ele_mon_2 = #{cumEleMon2},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="realTime != null">real_time = #{realTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDeviceRealtimedataPhotovoltaicById" parameterType="Long">
+        delete from iot_device_realtimedata_photovoltaic where id = #{id}
+    </delete>
+
+    <delete id="deleteDeviceRealtimedataPhotovoltaicByIds" parameterType="String">
+        delete from iot_device_realtimedata_photovoltaic where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file