1、优化公众号数查询sql；

user-service/src/main/java/com/mh/user/entity/DeviceInfoEntity.java

@@ -16,5 +16,6 @@ public class DeviceInfoEntity {
     private String motorBrand;  //机电品牌
     private String projectId;   //项目ID
     private String systemId;    //系统ID
+    private String cop;         // 额定能效
 
 }

user-service/src/main/java/com/mh/user/mapper/DeviceInfoMapper.java

@@ -24,7 +24,8 @@ public interface DeviceInfoMapper {
             @Result(property="isFc",column="is_fc"),
             @Result(property="motorBrand",column="motor_brand"),
             @Result(property="projectId",column="project_id"),
-            @Result(property="systemId",column="system_id")
+            @Result(property="systemId",column="system_id"),
+            @Result(property="cop",column="cop")
     })
     List<DeviceInfoEntity> queryDeviceInfo(@Param("systemID") String systemID,
                                            @Param("projectId") String projectId,

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 * from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " +
+        sql.append("select t2.cur_date,t2.cur_value 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 * from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " +
+        sql.append("select t2.cur_date,t2.cur_value 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 * from (select *,ROW_NUMBER() over(order by cur_date) as rn from ( " +
+        sql.append("select t2.cur_date,t2.cur_value 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("")) {

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 * from (" +
+        sql.append("select T.*,t2.* 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 * from (" +
+        sql.append("select T.*,t2.* 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 * from (" +
+        sql.append("select T.*,t2.* 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 * from (" +
+        sql.append("select T.* 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 * from (" +
+        sql.append("select T.* from (" +
                 " select *,ROW_NUMBER() over(order by id) as rn from energy_data_year  " +
                 " where 1=1 ");
         if (projectId != null && !projectId.equals("")){