From 659913fd1d5cb4c2724b430977a577526800feb4 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 31 May 2024 11:20:28 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=B0=B4=E8=A1=A8?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mh/user/mapper/DeviceInstallMapper.java | 4 ++-- .../com/mh/user/service/impl/DeviceInstallServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java b/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java index 1226275..d3583d4 100644 --- a/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java @@ -312,11 +312,11 @@ public interface DeviceInstallMapper extends BaseMapper { @Select("select seat from device_install where device_type=#{deviceType} and device_addr=#{deviceAddr} and building_id=#{buildingId} ") String selectSeat(@Param("deviceType") String deviceType,@Param("deviceAddr") String deviceAddr,@Param("buildingId") String buildingId); - @Update("update device_install set deviation_value = #{dataValue} where device_type = #{deviceType} and building_id = #{buildingId}") + @Update("update device_install set deviation_value = #{realValue}-isnull(last_value,0) where device_type = #{deviceType} and building_id = #{buildingId}") void updateDeviation(@Param("buildingId") Integer buildingId, @Param("deviceType") String deviceType, @Param("param") Integer param, - @Param("dataValue") String dataValue); + @Param("realValue") String realValue); @Select("select isnull(deviation_value,0) from device_install where device_addr = #{deviceAddr} and device_type = #{deviceType} and building_id = #{buildingId}") Double selectDeviceDeviation(@Param("deviceAddr") String deviceAddr, diff --git a/user-service/src/main/java/com/mh/user/service/impl/DeviceInstallServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/DeviceInstallServiceImpl.java index e750a16..b69a8dc 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/DeviceInstallServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/DeviceInstallServiceImpl.java @@ -387,9 +387,9 @@ public class DeviceInstallServiceImpl implements DeviceInstallService { // 更新电表 deviceTypeStr = "电表"; } - String dataValue = new BigDecimal(realValue).subtract(new BigDecimal(readValue)).toString(); +// String dataValue = new BigDecimal(realValue).subtract(new BigDecimal(readValue)).toString(); try { - deviceInstallMapper.updateDeviation(buildingId, deviceTypeStr, param, dataValue); + deviceInstallMapper.updateDeviation(buildingId, deviceTypeStr, param, realValue); return true; } catch (Exception e) { throw new RuntimeException(e);