许愿树分页

wishing-admin/src/api/wishing/tree.js

@@ -0,0 +1,26 @@
+import { fetch, post } from '@api/api';
+
+/**
+ * 查询角色
+ * @param params 请求参数
+ * @param headers 请求头
+ */
+export function queryTreePage(params = {}, headers = {}) {
+  return fetch({
+    url: '/admin/tree/page',
+    params: params,
+    headers: headers
+  });
+}
+/**
+ * 新增角色
+ * @param params 请求参数
+ * @param headers 请求头
+ */
+export function createRole(params = {}, headers = {}) {
+  return post({
+    url: '/admin/tree/create',
+    params: params,
+    headers: headers
+  });
+}

wishing-admin/src/views/wishing/tree/list.vue

@@ -1,22 +1,127 @@
 <template>
-  <div class="dashboard">
-    wishingtree list
+  <div class='main-content'>
+    <baseTable
+      ref='WishingTree'
+      :tableHeader='tableHeader'
+      :tableData='tableData'
+      :searchParams='searchParams'
+      @searchFn='searchFn'
+      @resetFn='resetFn'
+      :moreOperation='false'
+      :addBtn='true'
+    >
+      <template slot='search'>
+        <el-form-item label='手机号'>
+          <el-input v-model.trim='searchParams.mobile' />
+        </el-form-item>
+        <el-form-item label='内容关键字'>
+          <el-input v-model.trim='searchParams.name' />
+        </el-form-item>
+      </template>
+    </baseTable>
   </div>
 </template>
 
 <script>
+import { queryTreePage } from '@api/wishing/tree';
+
 export default {
   name: 'WishingTree',
   data() {
-    return {};
+    return {
+      tableHeader: [
+        {
+          label: '许愿树名称',
+          prop: 'name',
+          align: 'center'
+        },
+        {
+          label: '经度',
+          prop: 'longitude',
+          align: 'center'
+        },
+        {
+          label: '维度',
+          prop: 'latitude',
+          align: 'center'
+        },
+        {
+          label: '地址',
+          prop: 'address',
+          align: 'center'
+        },
+        {
+          label: '封面图片',
+          prop: 'coverImage',
+          align: 'center'
+        },
+        {
+          label: '是否启动',
+          prop: 'isActive',
+          align: 'center'
+        },
+        {
+          label: '可许愿半径',
+          prop: 'radius',
+          align: 'center'
+        },
+        {
+          label: '许愿次数',
+          prop: 'totalWishes',
+          align: 'center',
+          type: 'render',
+          render: (h, params) => {
+            return h('span', params.row.totalWishes || 0);
+          }
+        },
+        {
+          label: '创建时间',
+          prop: 'createdAt',
+          align: 'center'
+        },
+        {
+          label: '修改时间',
+          prop: 'createdAt',
+          align: 'center'
+        }
+      ],
+      tableData: [],
+      defaultSearch: {},
+      searchParams: Object.assign({}, this.$search),
+      uploadParams: {}
+    };
   },
   created() {
-
+    this.searchFn();
   },
   mounted() {
 
   },
-  methods: {}
+  methods: {
+    searchFn(isReset = false) {
+      let vm = this;
+      if (isReset) {
+        vm.searchParams = Object.assign(vm.searchParams, vm.$search);
+      }
+      queryTreePage(vm.searchParams).then(
+        (res) => {
+          vm.tableData = res.data.records;
+          vm.searchParams.total = res.data.total;
+        },
+        (error) => {
+          vm.$notify.error({
+            title: error.data.msg,
+            message: error.data.data
+          });
+        }
+      );
+    },
+    resetFn() {
+      let vm = this;
+      vm.searchParams = Object.assign({}, vm.defaultSearch, this.$search);
+      vm.searchFn();
+    }
+  }
 };
 </script>
 

wishing-platform/platform-service/platform-service-admin/src/main/java/cn/qinys/platform/admin/service/impl/WishTreeServiceImpl.java

@@ -37,7 +37,8 @@ public class WishTreeServiceImpl implements WishTreeService {
         Page<WishingTree> page = new Page<>(req.getCurrent(), req.getSize());
         QueryWrapper<WishingTree> wrapper = new QueryWrapper<>();
         wrapper.eq("is_deleted", 0)
-                .like(StringUtils.hasText(req.getName()), "name", req.getName());
+                .like(StringUtils.hasText(req.getName()), "name", req.getName())
+                .orderByDesc("id");
         return wishingTreeMapper.selectTreePage(page, wrapper);
     }
 }