修改监盘接口

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayGenerateMapper">
 
-    <select id="getDayGenerateph" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DayPowerDto">
+    <select id="getDayGenerateph" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate">
         SELECT
         *
         FROM house_pv_data.td_hygf_station_day_generate
@@ -17,8 +17,13 @@
                 day_time = #{dateTime}
             </if>
         </where>
-         ORDER by fullhour #{sort} limit 10
-
+        <if test="sort=='desc'">
+            ORDER by fullhour desc
+        </if>
+        <if test="sort=='asc'">
+            ORDER by fullhour asc
+        </if>
+        limit 10
     </select>
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -569,7 +569,7 @@ public class JpStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "日满发小时排行",   notes = "日满发小时排行")
     @GetMapping(value = "/getDayGenerateph")
-    public ResponseModel< List<Map<String,Object>>> getDayGenerateph(JpStationDto reviewDto,String type,String dateTime ) {
+    public ResponseModel< Page< Map<String,Object>>> getDayGenerateph(JpStationDto reviewDto,String type,String dateTime ) {
 
         List<JpStation> list=  jpStationServiceImpl.getJpStation(reviewDto);
         List<Map<String,Object>> li=new ArrayList<>();
@@ -584,15 +584,18 @@ public class JpStationController extends BaseController {
                         map.put("name",jpStation.getName());
                         map.put("address",jpStation.getName());
                         map.put("fullhour",dayGenerate.getFullhour());
+                        li.add(map);
                         break;
                     }
                 }
-                if(!map.isEmpty()){
-                    li.add(map);
-                }
+
             }
         }
-        return ResponseHelper.buildResponse(li);
+        Page< Map<String,Object>> result =new Page<>();
+        result.setCurrent(1);
+        result.setTotal(10);
+        result.setRecords(li);
+        return ResponseHelper.buildResponse(result);
     }