修改监盘统计接口参数

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/DayGenerateMapper.xml

@@ -58,7 +58,7 @@
             #{item}
         </foreach>
         and year = #{date}
-        GROUP BY `hour`
+        GROUP BY `year`
     </select>
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java

@@ -189,10 +189,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
     }
 
     @Override
+    @UserLimits
     public Map<String, List<Object>> getGenerateqx(String date, String type, JpStationDto reviewDto) {
 
         List<String> statioId=new ArrayList();
-        List<JpStation> dataJpStation= this.getJpStation(reviewDto);
+        List<JpStation> dataJpStation=jpStationMapper.getJpStation(reviewDto);
         for (JpStation jpStation : dataJpStation) {
             statioId.add(jpStation.getThirdStationId());
         }
@@ -201,6 +202,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
         List<Object> listx =new  ArrayList<>();
         List<Object> listy =new ArrayList<>();
         Map<String, List<Object>> map =new HashMap<>();
+        Map<String, List<Object>> map1 =new HashMap<>();
         try {
 
             if(type.equals("month")){
@@ -233,14 +235,14 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
 
                 listx=     listx.stream().map(e-> String.valueOf(e).substring(String.valueOf(e).length()-2)).collect(Collectors.toList());
             }
-            map.put("x",listx);
-            map.put("y",listy);
+            map1.put("axisData",listx);
+            map1.put("seriesData",listy);
         } catch (Exception e) {
             e.printStackTrace();
             throw  new BadRequest("系统异常！");
         }
 
-        return map;
+        return map1;
     }
 
     @Override