2023-06-29 14:49:36 基本设备用电量、采集温度、电表功率信息数据入库功能!

psdc-business/src/main/java/com/psdc/entity/vo/DeviceStatusVo.java

@@ -37,6 +37,10 @@ public class DeviceStatusVo {
     private Boolean deviceRunstatus ;
     /** 设备模型 */
     private String deviceModel;
+    /**
+     * 所属用户Id
+     */
+    private Long userId;
 
     /** 设备是否可控 */
     private Integer isControl;

psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java

@@ -41,6 +41,9 @@ public interface PsdcDeviceMapper{
     Integer upDevStaUser(@Param(value = "userId") Long userId,
                          @Param(value = "devId") Integer devId);
 
+    Integer upDevStatus(@Param(value = "devStatus") Integer devStatus,
+                        @Param(value = "devId") Integer devId);
+
 
     /**
      * 分页查询指定行数据

psdc-business/src/main/java/com/psdc/mapper/PsdcDevicePowerHdata96Mapper.java

@@ -20,4 +20,22 @@ public interface PsdcDevicePowerHdata96Mapper {
                                      @Param(value = "deviceId") Integer deviceId,
                                      @Param(value = "samDate") String samDate);
 
+    Integer todayPowerCount(@Param(value = "devId") Integer devId,
+                            @Param(value = "samDate") String samDate);
+
+    Integer insertTodayDevPower(PsdcDevicePowerHdata96 powerHt96Data);
+
+    /**
+     * 更新设备功率历史数据
+     * @param valNo
+     * @param powerValue
+     * @param devId
+     * @param samDate
+     * @return
+     */
+    Integer updateTodayDevPower(@Param(value = "valNo") String valNo,
+                                @Param(value = "powerValue") Double powerValue,
+                                @Param(value = "devId") Integer devId,
+                                @Param(value = "samDate") String samDate);
+
 }

psdc-business/src/main/java/com/psdc/mapper/PsdcElectricHtdataMapper.java

@@ -47,6 +47,7 @@ public interface PsdcElectricHtdataMapper{
 
     List<PsdcElectricHtdata> statisticalGroupByTime(String dateTime);
 
+    PsdcElectricHtdata selThisHtDataGroupByTime(@Param(value = "deviceId") Integer deviceId);
 
     /** 
      * 统计总行数

psdc-business/src/main/java/com/psdc/mapper/PsdcElectricRtdataMapper.java

@@ -52,6 +52,11 @@ public interface PsdcElectricRtdataMapper{
      * @return 影响行数
      */
     int update(PsdcElectricRtdata psdcElectricRtdata);
+
+    Integer updateByDevId(@Param(value = "deviceId") Integer deviceId,
+                          @Param(value = "updateTime") String updateTime,
+                          @Param(value = "totp") Double totp,
+                          @Param(value = "totWh") Double totWh);
     /** 
      * 通过主键删除数据
      *

psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java

@@ -32,15 +32,16 @@ public interface PsdcStatisticsDayMapper{
 
     /** 
      * 新增数据
-     *
      * @param psdcStatisticsDay 实例对象
      * @return 影响行数
      */
     int insert(PsdcStatisticsDay psdcStatisticsDay);
 
+    long count(@Param("deviceId") Integer deviceId,
+               @Param("datetime") String datetime);
+
      /**
       * 新增数据
-      *
       * @param psdcStatisticsDay 实例对象
       * @return 影响行数
       */
@@ -48,11 +49,16 @@ public interface PsdcStatisticsDayMapper{
 
     /**
      * 更新数据
-     *
      * @param psdcStatisticsDay 实例对象
      * @return 影响行数
      */
     int update(PsdcStatisticsDay psdcStatisticsDay);
+
+    Integer updateDay(@Param(value = "valNo") String valNo,
+                      @Param(value = "powerValue") Double powerValue,
+                      @Param(value = "devId") Integer devId,
+                      @Param(value = "samDate") String samDate);
+
     /** 
      * 通过主键删除数据
      *

psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsMonthMapper.java

@@ -32,21 +32,22 @@ public interface PsdcStatisticsMonthMapper{
     List<PsdcStatisticsMonth> queryAllByLimit(EnergyStatisticsRequest energyStatisticsRequest);
     /**
      * 新增数据
-     *
      * @param psdcStatisticsMonth 实例对象
      * @return 影响行数
      */
     int insert(PsdcStatisticsMonth psdcStatisticsMonth);
+
+    long count(@Param("deviceId") Integer deviceId,
+               @Param("date") String date);
+
      /**
       * 新增数据
-      *
       * @param psdcStatisticsMonth 实例对象
       * @return 影响行数
       */
      int insertMonth(PsdcStatisticsMonth psdcStatisticsMonth);
     /**
      * 更新数据
-     *
      * @param psdcStatisticsMonth 实例对象
      * @return 影响行数
      */
@@ -62,6 +63,13 @@ public interface PsdcStatisticsMonthMapper{
     int updatePoint(@Param("monthPoint") String monthPoint,
                     @Param("value") Double value,
                     @Param("monthId") Integer monthId);
+
+
+    Integer updateMonth(@Param(value = "valNo") String valNo,
+                      @Param(value = "powerValue") Double powerValue,
+                      @Param(value = "devId") Integer devId,
+                      @Param(value = "samDate") String samDate);
+
     /**
      * 通过主键删除数据
      *

psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsYearMapper.java

@@ -33,14 +33,21 @@ public interface PsdcStatisticsYearMapper{
 
     /** 
      * 新增数据
-     *
      * @param psdcStatisticsYear 实例对象
      * @return 影响行数
      */
     int insert(PsdcStatisticsYear psdcStatisticsYear);
+
+    long count(@Param("deviceId") Integer deviceId,
+               @Param("datetime") String datetime);
+
+     Integer updateYear(@Param(value = "valNo") String valNo,
+                        @Param(value = "powerValue") Double powerValue,
+                        @Param(value = "devId") Integer devId,
+                        @Param(value = "samDate") String samDate);
+
     /**
      * 新增数据
-     *
      * @param psdcStatisticsYear 实例对象
      * @return 影响行数
      */

psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java

@@ -59,6 +59,13 @@ public interface PsdcThermometerRtdataMapper{
      * @return 影响行数
      */
     int update(PsdcThermometerRtdata psdcThermometerRtdata);
+
+    Integer updateByDevId(@Param(value = "deviceId") Integer deviceId,
+                          @Param(value = "updateTime") String updateTime,
+                          @Param(value = "NowTemp") Double NowTemp,
+                          @Param(value = "InTemp") Double InTemp,
+                          @Param(value = "OutTemp") Double OutTemp);
+
     /** 
      * 通过主键删除数据
      *

psdc-business/src/main/java/com/psdc/mqtt/MyMQTTCallback.java

@@ -1,5 +1,9 @@
 package com.psdc.mqtt;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.psdc.mqtt.savedata.DataAndPowerSave;
+import com.psdc.utils.spring.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.mapping.Environment;
 import org.eclipse.paho.client.mqttv3.*;
@@ -63,7 +67,11 @@ public class MyMQTTCallback implements MqttCallback {
     public void messageArrived(String topic, MqttMessage mqttMessage) throws Exception {
         log.info("接收消息主题 : {}，接收消息内容 : {}", topic, new String(mqttMessage.getPayload()));
 
+        // 设备实时数据，设备历史数据，设备，电站，用户功率数据
+        DataAndPowerSave dataAndPowerSaveBean = SpringUtils.getBean(DataAndPowerSave.class);
+        JSONObject jsonObject = JSON.parseObject(new String(mqttMessage.getPayload()));
         try {
+            dataAndPowerSaveBean.saveDevRtData(jsonObject);
 
         } catch (Exception e){
             e.printStackTrace();

psdc-business/src/main/java/com/psdc/mqtt/savedata/DataAndPowerSave.java

@@ -0,0 +1,161 @@
+package com.psdc.mqtt.savedata;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.psdc.entity.*;
+import com.psdc.entity.vo.DeviceStatusVo;
+import com.psdc.mapper.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author：Stone
+ * @Project：psdc
+ * @Filename：DataAndPowerSave
+ * @Slogan 致敬大师，致敬未来的你
+ * @Date：2023/6/26 16:15
+ * @Version 1.0
+ */
+@Slf4j
+@Component
+public class DataAndPowerSave {
+
+    @Resource
+    PsdcDeviceMapper deviceMapper;
+    @Resource
+    PsdcElectricRtdataMapper electricRtDataMapper;
+    @Resource
+    PsdcElectricHtdataMapper electricHtDataMapper;
+    @Resource
+    PsdcDevicePowerHdata96Mapper devicePowerHtData96Mapper;
+    @Resource
+    PsdcThermometerRtdataMapper thermometerRtDataMapper;
+    @Resource
+    PsdcThermometerHtdataMapper thermometerHtDataMapper;
+    @Resource
+    PsdcStatisticsDayMapper statisticsDayMapper;
+    @Resource
+    PsdcStatisticsMonthMapper statisticsMonthMapper;
+    @Resource
+    PsdcStatisticsYearMapper statisticsYearMapper;
+
+    public Boolean saveDevRtData(JSONObject jsonObject){
+        Integer deviceId = jsonObject.getInteger("deviceId");
+        String timestamp = jsonObject.getString("timestamp");
+        JSONObject params = jsonObject.getJSONObject("params");
+
+        // 时间处理
+        String date1 = timestamp.split("T")[0];
+        String samDate = date1.split("-")[0] + date1.split("-")[1] + date1.split("-")[2];
+        String time1 = timestamp.split("T")[1];
+        int hour = Integer.parseInt(time1.substring(0, 8).split(":")[0]);
+        int min = Integer.parseInt(time1.substring(0, 8).split(":")[1]);
+        String upDateTime = date1 + " " + time1.substring(0, 8);
+
+        // 根据设备id获取数据，查看设备库中是否有该设备，若没有该设备，则不对该设备的数据进行实时数据库入库操作
+        DeviceStatusVo deviceStatusVo = deviceMapper.queryDeviceStatusById(deviceId);
+
+        // 计算点位
+        double cardNo = (hour * 60 + min) / 15.0;
+        double ceil = Math.ceil(cardNo);
+        double aa = cardNo - (ceil - 1);
+        if (aa < 0.75) {
+            ceil = Math.floor(cardNo);
+        }
+        int countNo = (int) ceil;
+        log.info("修改点位: " + countNo);
+        String valNo = "val" + countNo;
+
+        if (deviceStatusVo != null) {
+            if (null != params.getFloat("P")){
+                double P = params.getFloat("P");
+                double TotWh = params.getFloat("TotWh");
+                PsdcElectricRtdata pert = new PsdcElectricRtdata();
+                pert.setDeviceId(deviceId);
+                long count1 = electricRtDataMapper.count(pert);
+                if (count1 > 0){
+                    electricRtDataMapper.updateByDevId(deviceId, upDateTime, P, TotWh);
+                } else {
+                    pert.setUpdateTime(upDateTime);
+                    pert.setTotp(P);
+                    pert.setTotwh(TotWh);
+                    electricRtDataMapper.insert(pert);
+                }
+                PsdcElectricHtdata peht = new PsdcElectricHtdata();
+                peht.setDeviceId(deviceId);
+                long count2 = electricHtDataMapper.count(peht);
+                Double useEnergy;
+                if (count2 > 0){
+                    PsdcElectricHtdata htdata = electricHtDataMapper.selThisHtDataGroupByTime(deviceId);
+                    useEnergy = TotWh - htdata.getTotwh();
+                } else {
+                    useEnergy = TotWh;
+                }
+                peht.setUpdateTime(upDateTime);
+                peht.setTotp(P);
+                peht.setTotwh(TotWh);
+                peht.setUseDeiffen(useEnergy);
+                electricHtDataMapper.insert(peht);
+
+                // 根据设备id查询设备功率表中该设备的条数
+                int count3 = devicePowerHtData96Mapper.todayPowerCount(deviceId, samDate);
+                // 设备有功功率入库
+                if (count3 < 1) {
+                    PsdcDevicePowerHdata96 powerHData96 = new PsdcDevicePowerHdata96();
+                    powerHData96.setUserId(Math.toIntExact(deviceStatusVo.getUserId()));
+                    powerHData96.setDeviceId(deviceId);
+                    powerHData96.setSamDate(samDate);
+                    devicePowerHtData96Mapper.insertTodayDevPower(powerHData96);
+                }
+                devicePowerHtData96Mapper.updateTodayDevPower(valNo, P, deviceId, samDate);
+            }
+
+            if (null != params.getFloat("NowTemp")){
+                double InTemp = params.getFloat("InTemp");
+                double OutTemp = params.getFloat("OutTemp");
+                double NowTemp = params.getFloat("NowTemp");
+
+                PsdcThermometerRtdata ptrt = new PsdcThermometerRtdata();
+                ptrt.setDeviceId(deviceId);
+                long count4 = thermometerRtDataMapper.count(ptrt);
+                if (count4 > 0){
+                    thermometerRtDataMapper.updateByDevId(deviceId, upDateTime, NowTemp, InTemp, OutTemp);
+                } else {
+                    ptrt.setUpdateTime(upDateTime);
+                    ptrt.setThermometerValue(NowTemp);
+                    ptrt.setThermometerValueIn(InTemp);
+                    ptrt.setThermometerValueOut(OutTemp);
+                    thermometerRtDataMapper.insert(ptrt);
+                }
+                PsdcThermometerHtdata ptht = new PsdcThermometerHtdata();
+                ptht.setDeviceId(deviceId);
+                ptht.setUpdateTime(upDateTime);
+                ptht.setThermometerValue(NowTemp);
+                ptht.setThermometerValueIn(InTemp);
+                ptht.setThermometerValueOut(OutTemp);
+                thermometerHtDataMapper.insert(ptht);
+            }
+            int devStatus = params.getInteger("Sta");
+
+            deviceMapper.upDevStatus(devStatus(devStatus), deviceId);
+            return true;
+        } else {
+            log.info("不存在该设备id");
+            return false;
+        }
+    }
+
+
+    private Integer devStatus(int i){
+        switch (i){
+            case 0:
+                return 4;
+            case 1:
+                return 3;
+            default:
+                return i;
+        }
+    }
+
+}

psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java

@@ -312,14 +312,17 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
         AtomicInteger atomicInteger = new AtomicInteger(0);
 
         for (HashMap map : data) {
-
+             // 模式策略下属各场景步骤控制指令下发执行日志
             String controlKey = map.get("controlKey").toString();
             String controlValue = map.get("controlValue").toString();
             if (controlValue.equals("1") || controlValue.equals("2")){
                 controlValue = coverStr("r", Integer.parseInt(controlValue));
             }
             String controlContext = ControlKeyEnum.getControlContext(controlKey);
+
             // TODO 发送MQTT指令
+            // MyMQTTClient myMQTTClient = new MyMQTTClient();
+            // myMQTTClient.publish(jsonObject.toJSONString(),"/hwj1/dntd/request/action/command",2,false);
             // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,controlValue,controlMethod,2,"控制成功",controlBy));
             // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,controlValue,controlMethod,3,"等待终端响应超时",controlBy));
             // 发送成功
@@ -337,9 +340,11 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
             Integer sceneCode = jsonObject.getInteger("sceneCode");
             List<JSONObject> sceneControlCommand = jsonObject.getList("sceneControlCommand", JSONObject.class);
             for (JSONObject map : sceneControlCommand) {
+                // 解析到该策略下的每一个步骤
                 Integer deviceId = map.getInteger("deviceId");
                 List<HashMap> data = map.getList("data", HashMap.class);
-                int i = setTemperature(deviceId, data, SecurityUtils.getUsername(), 1);
+                int i = 0;
+                i = setTemperature(deviceId, data, SecurityUtils.getUsername(), 1);
                 if (i > 0) {
                     count++;
                 }

psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java

@@ -150,7 +150,7 @@ public class PsdcElectricHtdataServiceImpl implements IPsdcElectricHtdataService
     /**
      * 每日统计定时任务
      */
-    // @Scheduled(cron = "0 10 0 * * ? ")
+    @Scheduled(cron = "0 10 0 * * ? ")
     @Override
     public void statisticalTask(){
         //获取昨日用电量总和

psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml

@@ -31,6 +31,7 @@
         <result property="deviceSn" column="device_sn" />
         <result property="deviceName" column="device_name" />
         <result property="photoUrl" column="photo_url" />
+        <result property="userId" column="user_id" />
         <result property="deviceRunstatus" column="device_runstatus" />
     </resultMap>
 
@@ -55,7 +56,7 @@
     </resultMap>
 
     <select id="queryDeviceStatusById" resultMap="PsdcDeviceMap2">
-        Select device_id, device_type, device_sn, device_name, device_runstatus, photo_url From psdc_device
+        Select device_id, device_type, device_sn, device_name, device_runstatus, photo_url, user_id From psdc_device
         Where device_id = #{deviceId}
     </select>
 
@@ -353,6 +354,10 @@
         Update psdc_device Set user_id = #{userId} Where device_id = ${devId}
     </update>
 
+    <update id="upDevStatus">
+        Update psdc_device Set device_status = #{devStatus} Where device_id = ${devId}
+    </update>
+
     <!--    根据设备id查询设备名称-->
     <select id="queryDeviceNameByDeviceId" resultType="string">
         select device_name from psdc_device where device_id = #{deviceId}

psdc-business/src/main/resources/mapper/business/PsdcDevicePowerHdata96Mapper.xml

@@ -103,6 +103,28 @@
         <result property="val96" column="val96" jdbcType="DECIMAL"/>
     </resultMap>
 
+    <insert id="insertTodayDevPower">
+        Insert into psdc_device_power_hdata96(user_id, device_id, sam_date, val1, val2, val3, val4, val5, val6, val7, val8, val9, val10,
+                                          val11, val12, val13, val14, val15, val16, val17, val18, val19, val20, val21,
+                                          val22, val23, val24, val25, val26, val27, val28, val29, val30, val31, val32,
+                                          val33, val34, val35, val36, val37, val38, val39, val40, val41, val42, val43,
+                                          val44, val45, val46, val47, val48, val49, val50, val51, val52, val53, val54,
+                                          val55, val56, val57, val58, val59, val60, val61, val62, val63, val64, val65,
+                                          val66, val67, val68, val69, val70, val71, val72, val73, val74, val75, val76,
+                                          val77, val78, val79, val80, val81, val82, val83, val84, val85, val86, val87,
+                                          val88, val89, val90, val91, val92, val93, val94, val95, val96)
+        Values (#{userId}, #{deviceId}, #{samDate}, #{val1}, #{val2}, #{val3}, #{val4}, #{val5}, #{val6}, #{val7}, #{val8}, #{val9},
+        #{val10}, #{val11}, #{val12}, #{val13}, #{val14}, #{val15}, #{val16}, #{val17}, #{val18}, #{val19},
+        #{val20}, #{val21}, #{val22}, #{val23}, #{val24}, #{val25}, #{val26}, #{val27}, #{val28}, #{val29},
+        #{val30}, #{val31}, #{val32}, #{val33}, #{val34}, #{val35}, #{val36}, #{val37}, #{val38}, #{val39},
+        #{val40}, #{val41}, #{val42}, #{val43}, #{val44}, #{val45}, #{val46}, #{val47}, #{val48}, #{val49},
+        #{val50}, #{val51}, #{val52}, #{val53}, #{val54}, #{val55}, #{val56}, #{val57}, #{val58}, #{val59},
+        #{val60}, #{val61}, #{val62}, #{val63}, #{val64}, #{val65}, #{val66}, #{val67}, #{val68}, #{val69},
+        #{val70}, #{val71}, #{val72}, #{val73}, #{val74}, #{val75}, #{val76}, #{val77}, #{val78}, #{val79},
+        #{val80}, #{val81}, #{val82}, #{val83}, #{val84}, #{val85}, #{val86}, #{val87}, #{val88}, #{val89},
+        #{val90}, #{val91}, #{val92}, #{val93}, #{val94}, #{val95}, #{val96})
+    </insert>
+
     <!-- 通过ID查询总电表单条数据 -->
     <select id="queryById" resultMap="PsdcDevicePowerHdata96Map">
         Select
@@ -120,4 +142,16 @@
             </if>
         </where>
     </select>
+
+    <!--    根据设备id和日期查询条数-->
+    <select id="todayPowerCount" resultType="java.lang.Integer">
+        Select count(*) From psdc_device_power_hdata96
+        Where device_id = #{devId} And sam_date = #{samDate}
+    </select>
+
+    <!-- 更新设备功率历史数据 -->
+    <update id="updateTodayDevPower">
+        Update psdc_device_power_hdata96 Set ${valNo} = #{powerValue}
+        Where device_id = #{devId} And sam_date = #{samDate}
+    </update>
 </mapper>

psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml

@@ -244,14 +244,19 @@
         GROUP BY device_id
     </select>
 
+    <select id="selThisHtDataGroupByTime" resultMap="PsdcElectricHtdataMap">
+        SELECT peh.* FROM `psdc_electric_htdata` peh,
+        (Select Max(update_time) As lastBorrowTime From psdc_electric_htdata Where device_id = ${deviceId}) As udt
+         WHERE device_id = ${deviceId} And update_time = udt.lastBorrowTime
+         Order By update_time
+    </select>
+
+
     <!--统计总行数-->
     <select id="count" resultType="java.lang.Long">
         select count(1)
         from psdc_electric_htdata
         <where>
-            <if test="electricRtdataId != null and electricRtdataId != ''">
-                and electric_rtdata_id = #{electricHtdataId}
-            </if>
             <if test="deviceId != null and deviceId != ''">
                 and device_id = #{deviceId}
             </if>

psdc-business/src/main/resources/mapper/business/PsdcElectricRtdataMapper.xml

@@ -482,6 +482,26 @@ totwh},
         where electric_rtdata_id = #{electricRtdataId}
     </update>
 
+    <update id="updateByDevId">
+        Update psdc_electric_rtdata
+        <set>
+            <if test="updateTime != null and updateTime != ''">
+                update_time = #{updateTime},
+            </if>
+            <if test="totp != null and totp != ''">
+                TotP = #{totp},
+            </if>
+            <if test="totWh != null and totWh != ''">
+                TotWh = #{totWh},
+            </if>
+        </set>
+        <where>
+            <if test="deviceId != null and deviceId != ''">
+                And device_id = #{deviceId}
+            </if>
+        </where>
+    </update>
+
     <!--通过主键删除-->
     <delete id="deleteById">
         delete

psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml

@@ -230,4 +230,14 @@
                ifnull(hour_20,0.0) + ifnull(hour_21,0.0) + ifnull(hour_22,0.0) + ifnull(hour_23,0.0)  as total
         from psdc_statistics_day  where device_id = #{deviceId} and date_format(day_date,'%Y-%m-d') = #{datetime}
     </select>
+
+    <select id="count" resultType="java.lang.Long">
+        Select count(1) From psdc_statistics_day
+        Where device_id = #{deviceId} And date_format(day_date,'%Y-%m-d') = #{datetime}
+    </select>
+
+    <update id="updateDay">
+        Update psdc_statistics_day Set ${valNo} = #{powerValue}
+        Where device_id = #{devId} And date_format(day_date,'%Y-%m-d') = #{samDate}
+    </update>
 </mapper>

psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml

@@ -329,4 +329,14 @@
                ifnull(day_26,0.0) + ifnull(day_27,0.0) + ifnull(day_28,0.0) + ifnull(day_29,0.0) + ifnull(day_30,0.0) +
                ifnull(day_31,0.0)  as total from psdc_statistics_month  where device_id = #{deviceId} and date_format(month_date,'%Y-%m') = #{date}
     </select>
+
+    <select id="count" resultType="java.lang.Long">
+        Select count(1) From psdc_statistics_month
+        Where device_id = #{deviceId} and date_format(month_date,'%Y-%m') = #{date}
+    </select>
+
+    <update id="updateMonth">
+        Update psdc_statistics_month Set ${valNo} = #{powerValue}
+        Where device_id = #{devId} And date_format(month_date,'%Y-%m') = #{samDate}
+    </update>
 </mapper>

psdc-business/src/main/resources/mapper/business/PsdcStatisticsYearMapper.xml

@@ -169,4 +169,14 @@
                ifnull(month_11,0.0) + ifnull(month_12,0.0)  as total
         from psdc_statistics_year  where device_id = #{deviceId} and date_format(year_date,'%Y') = #{datetime}
     </select>
+
+    <select id="count" resultType="java.lang.Long">
+        Select COUNT(1) From psdc_statistics_year
+        Where device_id = #{deviceId} And date_format(year_date,'%Y') = #{datetime}
+    </select>
+
+    <update id="updateYear">
+        Update psdc_statistics_year Set ${valNo} = #{powerValue}
+        Where device_id = #{devId} And date_format(year_date,'%Y') = #{samDate}
+    </update>
 </mapper>

psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml

@@ -142,6 +142,29 @@
         where thermometer_rtdata_id = #{thermometerRtdataId}
     </update>
 
+    <update id="updateByDevId">
+        Update psdc_thermometer_rtdata
+        <set>
+            <if test="NowTemp != null and NowTemp != ''">
+                thermometer_value = #{NowTemp},
+            </if>
+            <if test="InTemp != null and InTemp != ''">
+                thermometer_value_in = #{InTemp},
+            </if>
+            <if test="OutTemp != null and OutTemp != ''">
+                thermometer_value_out = #{OutTemp},
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                update_time = #{updateTime},
+            </if>
+        </set>
+        <where>
+            <if test="deviceId != null and deviceId != ''">
+                And device_id = #{deviceId}
+            </if>
+        </where>
+    </update>
+
     <!--通过主键删除-->
     <delete id="deleteById">
         delete from psdc_thermometer_rtdata where thermometer_rtdata_id = #{thermometerRtdataId}