From 767166276e067bc216a8e5231d393af51c30b6f9 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 18 Nov 2024 16:04:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=EF=BC=9B?= =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E5=A4=A9=E6=B0=94=EF=BC=9B=203=E3=80=81=E7=B4=AF?= =?UTF-8?q?=E8=AE=A1=E7=94=A8=E7=94=B5=E9=87=8F=E3=80=81=E4=BA=A7=E5=86=B7?= =?UTF-8?q?=E9=87=8F=E3=80=81COP=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mh/user/job/DealDataJob.java | 2 +- .../com/mh/user/mapper/chillers/ChillersMapper.java | 4 ++-- .../mh/user/mapper/provider/DataResultProvider.java | 6 +++--- .../mh/user/mapper/provider/EnergyDataProvider.java | 10 +++++----- .../service/chillers/impl/DealDataServiceImpl.java | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/user-service/src/main/java/com/mh/user/job/DealDataJob.java b/user-service/src/main/java/com/mh/user/job/DealDataJob.java index abcefb3..73821d6 100644 --- a/user-service/src/main/java/com/mh/user/job/DealDataJob.java +++ b/user-service/src/main/java/com/mh/user/job/DealDataJob.java @@ -92,7 +92,7 @@ public class DealDataJob { /** * 定时处理数据：获取环境温度和湿度,所有项目共有 */ - @Scheduled(cron = "0 0 0/1 * * ?") //1小时保存一次温度、湿度变化值 + @Scheduled(cron = "0 0/30 * * * ?") //1小时保存一次温度、湿度变化值 // @Scheduled(cron = "0 0/1 * * * ?") //1分钟 public void saveTempHumidity() { try { diff --git a/user-service/src/main/java/com/mh/user/mapper/chillers/ChillersMapper.java b/user-service/src/main/java/com/mh/user/mapper/chillers/ChillersMapper.java index 8ddc831..14a2da7 100644 --- a/user-service/src/main/java/com/mh/user/mapper/chillers/ChillersMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/chillers/ChillersMapper.java @@ -183,9 +183,9 @@ public interface ChillersMapper { }) List getStopChillers(); - @Select("select mt_type, cur_value, cur_time from meter_manage " + + @Select("select mt_type, (cur_value-mt_init_value) as cur_value, cur_time from meter_manage " + " where system_id = #{systemId} and project_id = #{proId} and device_id = #{deviceId} and mt_type in (1, 2)" + - " and grade between 40 and 49 group by mt_type, cur_value, cur_time ") + " and grade between 40 and 49 group by mt_type, (cur_value-mt_init_value), cur_time ") List> queryTotalData(@Param("systemId") String systemId, @Param("proId") String proId, @Param("deviceId") String deviceId); diff --git a/user-service/src/main/java/com/mh/user/mapper/provider/DataResultProvider.java b/user-service/src/main/java/com/mh/user/mapper/provider/DataResultProvider.java index ec8634f..41b5b6c 100644 --- a/user-service/src/main/java/com/mh/user/mapper/provider/DataResultProvider.java +++ b/user-service/src/main/java/com/mh/user/mapper/provider/DataResultProvider.java @@ -52,7 +52,7 @@ public class DataResultProvider { //时间显示间隔为1分钟 public String queryDataResultOneMi(String projectId, String startDate,String curDate, int page, int limit){ StringBuffer sql = new StringBuffer(""); - sql.append("select t2.cur_date,t2.cur_value from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " + + sql.append("select t2.cur_date,t2.cur_value,t2.project_id,t3.project_name from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " + " select project_id,cur_date,sum(cast(cur_value as decimal(18,2))) as cur_value from data_result_one_mi " + " where 1=1 "); if (projectId!= null && !projectId.equals("")) { @@ -95,7 +95,7 @@ public class DataResultProvider { //时间显示间隔为5分钟 public String queryDataResultFiveMi(String projectId,String startDate,String curDate, int page, int limit){ StringBuffer sql = new StringBuffer(""); - sql.append("select t2.cur_date,t2.cur_value from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " + + sql.append("select t2.cur_date,t2.cur_value,t2.project_id,t3.project_name from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " + " select project_id,cur_date,sum(cast(cur_value as decimal(18,2))) as cur_value from data_result_five_mi " + " where 1=1 "); if (projectId!= null && !projectId.equals("")) { @@ -136,7 +136,7 @@ public class DataResultProvider { //时间显示间隔为15分钟 public String queryDataResultFifteenMi(String projectId,String startDate,String curDate, int page, int limit){ StringBuffer sql = new StringBuffer(""); - sql.append("select t2.cur_date,t2.cur_value from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " + + sql.append("select t2.cur_date,t2.cur_value,t2.project_id,t3.project_name from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " + " select project_id,cur_date,sum(cast(cur_value as decimal(18,2))) as cur_value from data_result_fifteen_mi " + " where 1=1 "); if (projectId!= null && !projectId.equals("")) { diff --git a/user-service/src/main/java/com/mh/user/mapper/provider/EnergyDataProvider.java b/user-service/src/main/java/com/mh/user/mapper/provider/EnergyDataProvider.java index fc6de0f..01748ae 100644 --- a/user-service/src/main/java/com/mh/user/mapper/provider/EnergyDataProvider.java +++ b/user-service/src/main/java/com/mh/user/mapper/provider/EnergyDataProvider.java @@ -5,7 +5,7 @@ public class EnergyDataProvider { //按十分钟 public String queryEnergyDataMi(String projectId,String curDate,int page, int limit){ StringBuffer sql = new StringBuffer(""); - sql.append("select T.*,t2.* from (" + + sql.append("select T.*,t2.*,T1.project_name from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_mi " + " where 1=1 "); if (projectId != null && !projectId.equals("")){ @@ -59,7 +59,7 @@ public class EnergyDataProvider { //按小时 public String queryEnergyDataHour(String projectId,String curDate,int page, int limit){ StringBuffer sql = new StringBuffer(""); - sql.append("select T.*,t2.* from (" + + sql.append("select T.*,t2.*,T1.project_name from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_hour " + " where 1=1 "); if (projectId != null && !projectId.equals("")){ @@ -116,7 +116,7 @@ public class EnergyDataProvider { //按天 public String queryEnergyDataDay(String projectId,String curDate,int queryType,int page, int limit){ StringBuffer sql = new StringBuffer(""); - sql.append("select T.*,t2.* from (" + + sql.append("select T.*,t2.*,T1.project_name from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_day " + " where 1=1 "); if (projectId != null && !projectId.equals("")){ @@ -178,7 +178,7 @@ public class EnergyDataProvider { //按月 public String queryEnergyDataMonth(String projectId,String curDate,int queryType,int page, int limit){ StringBuffer sql = new StringBuffer(""); - sql.append("select T.* from (" + + sql.append("select T.*,T1.project_name from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_month " + " where 1=1 "); if (projectId != null && !projectId.equals("")){ @@ -239,7 +239,7 @@ public class EnergyDataProvider { public String queryEnergyDataYear(String projectId,String startDate,String endDate,int queryType,int page, int limit){ StringBuffer sql = new StringBuffer(""); - sql.append("select T.* from (" + + sql.append("select T.*,T1.project_name from (" + " select *,ROW_NUMBER() over(order by id) as rn from energy_data_year " + " where 1=1 "); if (projectId != null && !projectId.equals("")){ diff --git a/user-service/src/main/java/com/mh/user/service/chillers/impl/DealDataServiceImpl.java b/user-service/src/main/java/com/mh/user/service/chillers/impl/DealDataServiceImpl.java index 9df302f..19a7973 100644 --- a/user-service/src/main/java/com/mh/user/service/chillers/impl/DealDataServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/chillers/impl/DealDataServiceImpl.java @@ -92,8 +92,8 @@ public class DealDataServiceImpl implements DealDataService { }else{ dealDataMapper.updateDateTempHumidity(strDate,ambTemp,humidity); } - count=dealDataMapper.selectHourTempHumidity(strTime); - if(count==0){ + int hourCount =dealDataMapper.selectHourTempHumidity(strTime); + if(hourCount==0){ dealDataMapper.hourTempHumidity(strTime,ambTemp,humidity); }else{ dealDataMapper.updateHourTempHumidity(strTime,ambTemp,humidity);