ZHOUTD 1 年間 前
コミット
e69fe61c47

+ 4 - 3
xzl-admin/src/main/java/com/xzl/web/controller/DataGovernanceController.java

@@ -4,6 +4,7 @@ import com.xzl.web.model.common.Result;
 import com.xzl.web.model.dataGovernance.dto.CreateTableDTO;
 import com.xzl.web.model.dataGovernance.dto.DataReplicationParam;
 import com.xzl.web.model.dataGovernance.dto.SysDataLogQueryParam;
+import com.xzl.web.model.dataGovernance.dto.TableDataQueryParam;
 import com.xzl.web.model.dataGovernance.entity.DatabaseInfo;
 import com.xzl.web.model.dataGovernance.entity.SysDataLog;
 import com.xzl.web.model.dataGovernance.entity.TableInfo;
@@ -75,9 +76,9 @@ public class DataGovernanceController {
         return dataGovernanceService.getTableTitleList(tableName);
     }
 
-    @RequestMapping(value = "/getTableData", method = RequestMethod.GET)
-    public List<Map> getTableData(String tableName){
-        return dataGovernanceService.getTableData(tableName);
+    @RequestMapping(value = "/getTableData", method = RequestMethod.POST)
+    public Result<Map> getTableData(@RequestBody TableDataQueryParam param){
+        return dataGovernanceService.getTableData(param);
     }
 
     @RequestMapping(value = "/dataReplication", method = RequestMethod.POST)

+ 3 - 1
xzl-admin/src/main/java/com/xzl/web/mapper/DataGovernanceMapper.java

@@ -27,7 +27,7 @@ public interface DataGovernanceMapper {
 
     List<String> getTableTitleListByTableName(Map<String,String> param);
 
-    List<Map> getTableDataByTableName(String tableName);
+    List<Map> getTableData(Map<String,String> param);
 
     List<TableStructure> getTableStructure(Map<String,String> param);
 
@@ -39,4 +39,6 @@ public interface DataGovernanceMapper {
 
     Map<String, String> getCreateTableSql(String tableName);
 
+    Integer getDataCount(String tableName);
+
 }

+ 10 - 0
xzl-admin/src/main/java/com/xzl/web/model/dataGovernance/dto/TableDataQueryParam.java

@@ -0,0 +1,10 @@
+package com.xzl.web.model.dataGovernance.dto;
+
+import com.xzl.web.model.common.PageParam;
+import lombok.Data;
+
+@Data
+public class TableDataQueryParam {
+    private PageParam pageParam;
+    private String tableName;
+}

+ 2 - 1
xzl-admin/src/main/java/com/xzl/web/service/DataGovernanceService.java

@@ -4,6 +4,7 @@ import com.xzl.web.model.common.Result;
 import com.xzl.web.model.dataGovernance.dto.CreateTableDTO;
 import com.xzl.web.model.dataGovernance.dto.DataReplicationParam;
 import com.xzl.web.model.dataGovernance.dto.SysDataLogQueryParam;
+import com.xzl.web.model.dataGovernance.dto.TableDataQueryParam;
 import com.xzl.web.model.dataGovernance.entity.DatabaseInfo;
 import com.xzl.web.model.dataGovernance.entity.SysDataLog;
 import com.xzl.web.model.dataGovernance.entity.TableInfo;
@@ -29,7 +30,7 @@ public interface DataGovernanceService {
 
     List<String> getTableTitleList(String tableName);
 
-    List<Map> getTableData(String tableName);
+    Result<Map> getTableData(TableDataQueryParam param);
 
     Map<String, String> dataReplication(DataReplicationParam param);
 

+ 23 - 3
xzl-admin/src/main/java/com/xzl/web/service/impl/DataGovernanceServiceImpl.java

@@ -7,6 +7,7 @@ import com.xzl.web.model.common.Result;
 import com.xzl.web.model.dataGovernance.dto.CreateTableDTO;
 import com.xzl.web.model.dataGovernance.dto.DataReplicationParam;
 import com.xzl.web.model.dataGovernance.dto.SysDataLogQueryParam;
+import com.xzl.web.model.dataGovernance.dto.TableDataQueryParam;
 import com.xzl.web.model.dataGovernance.entity.*;
 import com.xzl.web.service.DataGovernanceService;
 import org.apache.ibatis.io.Resources;
@@ -181,8 +182,25 @@ public class DataGovernanceServiceImpl implements DataGovernanceService {
     }
 
     @Override
-    public List<Map> getTableData(String tableName) {
-        return dataGovernanceMapper.getTableDataByTableName(tableName);
+    public Result<Map> getTableData(TableDataQueryParam param) {
+        Result<Map> result = new Result<>();
+        PageParam pageParam = param.getPageParam();
+        result.setPageParam(pageParam);
+        Map<String, String> queryParam = new HashMap<>();
+        Integer page = null;
+        if (pageParam.getPageNum() == 1) {
+            page = 0;
+        } else {
+            page = (pageParam.getPageNum() - 1) * pageParam.getPageSize();
+        }
+        queryParam.put("page", String.valueOf(page));
+        queryParam.put("pageSize", String.valueOf(pageParam.getPageSize()));
+        queryParam.put("tableName", param.getTableName());
+        Integer count = dataGovernanceMapper.getDataCount(param.getTableName());
+        result.setCount(count);
+        List<Map> tableData = dataGovernanceMapper.getTableData(queryParam);
+        result.setTableData(tableData);
+        return result;
     }
 
     @Override
@@ -282,8 +300,10 @@ public class DataGovernanceServiceImpl implements DataGovernanceService {
     public File exportTable(String databaseName, String tableName) throws Exception {
         String table = databaseName + "." + tableName;
         Map<String, String> createTableSql = dataGovernanceMapper.getCreateTableSql(table);
-        List<Map> tableData = dataGovernanceMapper.getTableDataByTableName(table);
         Map<String, String> param = new HashMap<>();
+        param.put("tableName",table);
+        List<Map> tableData = dataGovernanceMapper.getTableData(param);
+        param=new HashMap<>();
         param.put("dataBaseName", databaseName);
         param.put("tableName", tableName);
         List<String> tableTitle = dataGovernanceMapper.getTableTitleListByTableName(param);

+ 7 - 1
xzl-admin/src/main/resources/mapper/DataGovernanceMapper.xml

@@ -27,8 +27,9 @@
         order by ORDINAL_POSITION
     </select>
 
-    <select id="getTableDataByTableName" resultType="map" parameterType="string">
+    <select id="getTableData" resultType="map" parameterType="string">
         select * from ${tableName}
+        <if test="page!=null">LIMIT ${page},${pageSize}</if>
     </select>
 
     <select id="getCreateTableSql" resultType="map" parameterType="string">
@@ -64,6 +65,11 @@
         </where>
     </select>
 
+    <select id="getDataCount" resultType="int" parameterType="string">
+        select count(1)
+        from ${tableName}
+    </select>
+
     <select id="getSysDataLogList" resultType="com.xzl.web.model.dataGovernance.entity.SysDataLog" parameterType="map">
         SELECT
                LOG_ID AS "id",

+ 14 - 0
xzl-ui/src/views/dataGovernance/dataFlowDirectionRecord.vue

@@ -26,6 +26,7 @@
       <el-table-column
         align="center"
         type="index"
+        :index="getIndex"
         label="序号"
         width="100">
       </el-table-column>
@@ -110,15 +111,28 @@ export default {
     this.queryData();
   },
   methods: {
+    getIndex(index) {
+      // 当前页数 - 1 * 每页数据条数 + 1
+      const page = this.data.pageParam.pageNum // 当前页码
+      const pageSize = this.data.pageParam.pageSize // 每页条数
+      return index + 1 + (page - 1) * pageSize
+    },
     queryData() {
       const t=this;
       t.queryParams.pageParam=t.data.pageParam;
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
       request({
         url: '/dataGovernance/getDataLog',
         method: 'post',
         data: t.queryParams
       }).then(function (res) {
         t.data=res;
+        loading.close()
       })
     },
     handleSizeChange(val){

+ 43 - 22
xzl-ui/src/views/dataGovernance/tableData.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-table
-      :data="tableData"
+      :data="data.tableData"
       :height="height"
       border
       stripe
@@ -11,16 +11,19 @@
       element-loading-spinner="el-icon-loading"
       element-loading-background="rgba(0, 0, 0, 0.8)"
     >
-      <el-table-column v-for="(item,index) in  titleData" :key="index" :prop="item.name" :label="item.name" show-overflow-tooltip></el-table-column>
+      <el-table-column v-for="(item,index) in  titleData" :key="index" :prop="item.name" :label="item.name"
+                       show-overflow-tooltip></el-table-column>
     </el-table>
     <el-pagination
       @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
+      @current-change="handlePageChange"
+      :current-page="data.pageParam.pageNum"
       :page-sizes="[10, 20, 50, 100]"
-      :page-size="10"
+      :page-size="data.pageParam.pageSize"
       layout="total, sizes, prev, pager, next, jumper"
-      :total="400">
+      :total="data.count"
+      style="margin-left: 20px"
+    >
     </el-pagination>
   </div>
 </template>
@@ -30,11 +33,24 @@ import request from '@/utils/request'
 export default {
   data() {
     return {
-      titleData:[],
-      tableData: [],
-      loading:true,
-      height:window.outerHeight*0.7,
-      currentPage:1
+      queryParams: {
+        pageParam:{
+          pageNum: 1,
+          pageSize: 10
+        },
+        tableName: ""
+      },
+      titleData: [],
+      data: {
+        tableData: [],
+        pageParam:{
+          pageNum: 1,
+          pageSize: 10
+        },
+        count:0
+      },
+      loading: true,
+      height: window.outerHeight * 0.7,
     }
   },
   mounted() {
@@ -42,34 +58,39 @@ export default {
     this.initData();
   },
   methods: {
-    initTitle(){
+    initTitle() {
       const t = this;
       request({
-        url: "/dataGovernance/getTableTitleList?tableName=" + this.$route.query.databaseName+"."+this.$route.query.tableName,
+        url: "/dataGovernance/getTableTitleList?tableName=" + this.$route.query.databaseName + "." + this.$route.query.tableName,
         method: "get"
       }).then(rs => {
-        var titles=[];
+        var titles = [];
         for (let title in rs) {
           titles.push({name: rs[title]});
         }
-        t.titleData=titles;
+        t.titleData = titles;
       })
     },
     initData() {
       const t = this;
+      t.queryParams.pageParam=t.data.pageParam;
+      t.queryParams.tableName=this.$route.query.databaseName + "." + this.$route.query.tableName
       request({
-        url: "/dataGovernance/getTableData?tableName=" + this.$route.query.databaseName+"."+this.$route.query.tableName,
-        method: "get"
+        url: "/dataGovernance/getTableData",
+        method: "post",
+        data:t.queryParams
       }).then(rs => {
-        t.tableData = rs;
-        t.loading=false;
+        t.data = rs;
+        t.loading = false;
       })
     },
     handleSizeChange(val){
-      console.log(val)
+      this.data.pageParam.pageSize=val;
+      this.initData()
     },
-    handleCurrentChange(val){
-      console.log(val)
+    handlePageChange(val){
+      this.data.pageParam.pageNum=val;
+      this.initData()
     }
   }
 }

+ 0 - 7
xzl-ui/src/views/dataGovernance/tableManage.vue

@@ -173,13 +173,6 @@ export default {
     },
     exportTable(index, tableData) {
       const t = this;
-      // request({
-      //   url: "/dataGovernance/exportTable?databaseName=" + this.$route.query.databaseName + "&tableName="+tableData[index].tableName,
-      //   method: "get"
-      // }).then(rs => {
-      //   console.log(rs)
-      // })
-
       var params={
         databaseName: this.$route.query.databaseName,
         tableName: tableData[index].tableName

+ 7 - 1
xzl-ui/src/views/monitor/map/customerPositionBmap.vue

@@ -43,7 +43,7 @@
       <h3>区域许可证办理情况</h3>
       <div class="scroll-item-Position">
         <vue-seamless-scroll :data="areaOptions" class="warp" :class-option="defaultOption">
-          <div v-for="c in areaOptions" class="customer-info">
+          <div v-for="c in areaOptions" class="customer-info-Position">
             <table align="center" width="98%" cellpadding="0">
               <tr>
                 <td width="50%">区域名:</td>
@@ -316,4 +316,10 @@ export default {
   margin-top: 20px;
   padding: 2px;
 }
+
+.customer-info-Position {
+  font-size: 12px;
+  margin-top: 20px;
+  padding: 2px;
+}
 </style>