diff --git a/psdc-business/src/main/java/com/psdc/entity/vo/DeviceStatusVo.java b/psdc-business/src/main/java/com/psdc/entity/vo/DeviceStatusVo.java index 64e4627..c5192a0 100644 --- a/psdc-business/src/main/java/com/psdc/entity/vo/DeviceStatusVo.java +++ b/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; diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java index 5ce08cd..9ef115c 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java +++ b/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); + /** * 分页查询指定行数据 diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcDevicePowerHdata96Mapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcDevicePowerHdata96Mapper.java index be59595..59633e6 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcDevicePowerHdata96Mapper.java +++ b/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); + } diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcElectricHtdataMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcElectricHtdataMapper.java index 71bb2e1..84f80f8 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcElectricHtdataMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcElectricHtdataMapper.java @@ -47,6 +47,7 @@ public interface PsdcElectricHtdataMapper{ List statisticalGroupByTime(String dateTime); + PsdcElectricHtdata selThisHtDataGroupByTime(@Param(value = "deviceId") Integer deviceId); /** * 统计总行数 diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcElectricRtdataMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcElectricRtdataMapper.java index 02c8689..f7e3dd0 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcElectricRtdataMapper.java +++ b/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); /** * 通过主键删除数据 * diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java index b5be0b9..24a8595 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java +++ b/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); + /** * 通过主键删除数据 * diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsMonthMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsMonthMapper.java index 793df34..713f9ce 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsMonthMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsMonthMapper.java @@ -32,21 +32,22 @@ public interface PsdcStatisticsMonthMapper{ List 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); + /** * 通过主键删除数据 * diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsYearMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsYearMapper.java index 25614a1..b199dbd 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsYearMapper.java +++ b/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 影响行数 */ diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java index 805548c..953d3a6 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java +++ b/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); + /** * 通过主键删除数据 * diff --git a/psdc-common/src/main/java/com/psdc/mqtt/MqttMsg.java b/psdc-business/src/main/java/com/psdc/mqtt/MqttMsg.java similarity index 100% rename from psdc-common/src/main/java/com/psdc/mqtt/MqttMsg.java rename to psdc-business/src/main/java/com/psdc/mqtt/MqttMsg.java diff --git a/psdc-common/src/main/java/com/psdc/mqtt/MqttProviderConfig.java b/psdc-business/src/main/java/com/psdc/mqtt/MqttProviderConfig.java similarity index 100% rename from psdc-common/src/main/java/com/psdc/mqtt/MqttProviderConfig.java rename to psdc-business/src/main/java/com/psdc/mqtt/MqttProviderConfig.java diff --git a/psdc-common/src/main/java/com/psdc/mqtt/MyMQTTCallback.java b/psdc-business/src/main/java/com/psdc/mqtt/MyMQTTCallback.java similarity index 83% rename from psdc-common/src/main/java/com/psdc/mqtt/MyMQTTCallback.java rename to psdc-business/src/main/java/com/psdc/mqtt/MyMQTTCallback.java index 16989db..828220f 100644 --- a/psdc-common/src/main/java/com/psdc/mqtt/MyMQTTCallback.java +++ b/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(); diff --git a/psdc-common/src/main/java/com/psdc/mqtt/MyMQTTClient.java b/psdc-business/src/main/java/com/psdc/mqtt/MyMQTTClient.java similarity index 100% rename from psdc-common/src/main/java/com/psdc/mqtt/MyMQTTClient.java rename to psdc-business/src/main/java/com/psdc/mqtt/MyMQTTClient.java diff --git a/psdc-business/src/main/java/com/psdc/mqtt/savedata/DataAndPowerSave.java b/psdc-business/src/main/java/com/psdc/mqtt/savedata/DataAndPowerSave.java new file mode 100644 index 0000000..5973fcb --- /dev/null +++ b/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; + } + } + +} diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java index 7d0c1c5..16043a9 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java +++ b/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 sceneControlCommand = jsonObject.getList("sceneControlCommand", JSONObject.class); for (JSONObject map : sceneControlCommand) { + // 解析到该策略下的每一个步骤 Integer deviceId = map.getInteger("deviceId"); List 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++; } diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java index 3da4071..d1a9c6a 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java +++ b/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(){ //获取昨日用电量总和 diff --git a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml index 6aae0a9..5d6e5e1 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml @@ -31,6 +31,7 @@ + @@ -55,7 +56,7 @@ @@ -353,6 +354,10 @@ Update psdc_device Set user_id = #{userId} Where device_id = ${devId} + + Update psdc_device Set device_status = #{devStatus} Where device_id = ${devId} + + Select @@ -120,4 +142,16 @@ + + + + + + + Update psdc_device_power_hdata96 Set ${valNo} = #{powerValue} + Where device_id = #{devId} And sam_date = #{samDate} + \ No newline at end of file diff --git a/psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml index 6d9080d..0211c0f 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml @@ -244,14 +244,19 @@ GROUP BY device_id + + + + + + + + Update psdc_statistics_day Set ${valNo} = #{powerValue} + Where device_id = #{devId} And date_format(day_date,'%Y-%m-d') = #{samDate} + \ No newline at end of file diff --git a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml index 6fbb8fb..de539a0 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml +++ b/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} + + + + + Update psdc_statistics_month Set ${valNo} = #{powerValue} + Where device_id = #{devId} And date_format(month_date,'%Y-%m') = #{samDate} + \ No newline at end of file diff --git a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsYearMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsYearMapper.xml index 8642460..5999008 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsYearMapper.xml +++ b/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} + + + + + Update psdc_statistics_year Set ${valNo} = #{powerValue} + Where device_id = #{devId} And date_format(year_date,'%Y') = #{samDate} + \ No newline at end of file diff --git a/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml index ccb8899..46447b3 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml @@ -142,6 +142,29 @@ where thermometer_rtdata_id = #{thermometerRtdataId} + + Update psdc_thermometer_rtdata + + + thermometer_value = #{NowTemp}, + + + thermometer_value_in = #{InTemp}, + + + thermometer_value_out = #{OutTemp}, + + + update_time = #{updateTime}, + + + + + And device_id = #{deviceId} + + + + delete from psdc_thermometer_rtdata where thermometer_rtdata_id = #{thermometerRtdataId}