shi'sen'yuan 3 jaren geleden
bovenliggende
commit
96634bc403

+ 12 - 0
master/src/main/java/com/ruoyi/project/aspen/controller/TDashboarddataController.java

@@ -44,6 +44,18 @@ public class TDashboarddataController extends BaseController
         return list;
     }
 
+    /**
+     * 查询最后一条dashboard抓取数据
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:query')")
+    @GetMapping("/selectLast")
+    public AjaxResult selectLast(TDashboarddata tDashboarddata)
+    {
+        TDashboarddata dashboarddata = tDashboarddataService.selectLast(tDashboarddata);
+        logger.info("dashboarddata:" + dashboarddata);
+        return AjaxResult.success(dashboarddata);
+    }
+
     /**
      * 导出dashboard抓取数据列表
      */

+ 8 - 0
master/src/main/java/com/ruoyi/project/aspen/mapper/TDashboarddataMapper.java

@@ -20,6 +20,14 @@ public interface TDashboarddataMapper
      */
     public TDashboarddata selectTDashboarddataById(Long id);
 
+    /**
+     * 查询最后一条dashboard抓取数据
+     *
+     * @param tDashboarddata dashboard抓取数据
+     * @return dashboard抓取数据
+     */
+    public TDashboarddata selectLast(TDashboarddata tDashboarddata);
+
     /**
      * 查询dashboard抓取数据列表
      * 

+ 8 - 0
master/src/main/java/com/ruoyi/project/aspen/service/ITDashboarddataService.java

@@ -19,6 +19,14 @@ public interface ITDashboarddataService
      */
     public TDashboarddata selectTDashboarddataById(Long id);
 
+    /**
+     * 查询最后一条dashboard抓取数据
+     *
+     * @param tDashboarddata dashboard抓取数据
+     * @return dashboard抓取数据
+     */
+    public TDashboarddata selectLast(TDashboarddata tDashboarddata);
+
     /**
      * 查询dashboard抓取数据列表
      * 

+ 11 - 0
master/src/main/java/com/ruoyi/project/aspen/service/impl/TDashboarddataServiceImpl.java

@@ -33,6 +33,17 @@ public class TDashboarddataServiceImpl implements ITDashboarddataService
         return tDashboarddataMapper.selectTDashboarddataById(id);
     }
 
+    /**
+     * 查询最后一条dashboard抓取数据
+     *
+     * @param tDashboarddata dashboard抓取数据
+     * @return dashboard抓取数据
+     */
+    @Override
+    public TDashboarddata selectLast(TDashboarddata tDashboarddata) {
+        return tDashboarddataMapper.selectLast(tDashboarddata);
+    }
+
     /**
      * 查询dashboard抓取数据列表
      *

+ 4 - 0
master/src/main/resources/mybatis/aspen/TDashboarddataMapper.xml

@@ -70,6 +70,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by id
     </select>
+
+    <select id="selectLast" parameterType="TDashboarddata" resultMap="TDashboarddataResult">
+        select * from ( select * from t_dashboarddata where del_flag = 0 order by id desc ) WHERE ROWNUM = 1
+    </select>
     
     <select id="selectTDashboarddataById" parameterType="Long" resultMap="TDashboarddataResult">
         <include refid="selectTDashboarddataVo"/>

+ 10 - 1
ui/src/api/aspen/dashboarddata.js

@@ -9,6 +9,15 @@ export function listDashboarddata(query) {
   })
 }
 
+// 查询最后一条dashboard抓取数据
+export function selectLast(query) {
+  return request({
+    url: '/aspen/dashboarddata/selectLast',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询dashboard抓取数据详细
 export function getDashboarddata(id) {
   return request({
@@ -50,4 +59,4 @@ export function exportDashboarddata(query) {
     method: 'get',
     params: query
   })
-}
+}

+ 4 - 4
ui/src/views/front/materialBalance.vue

@@ -351,7 +351,7 @@
 </template>
 
 <script>
-  import { listDashboarddata } from "@/api/aspen/dashboarddata";
+  import { selectLast } from "@/api/aspen/dashboarddata";
 
   export default {
     name: "materialBalance",
@@ -400,9 +400,9 @@
       /** 查询dashboard抓取数据列表 */
       getList()
       {
-        listDashboarddata(this.queryParams).then(response => {
-          this.dashboarddata = response[response.length - 1];
-          console.info("刷新数据")
+        selectLast(this.queryParams).then(response => {
+          this.dashboarddata = response.data;
+          console.info("刷新数据" + response.data)
         });
       }
     }