修正数据显示列表

src/main/java/io/xtfs/jwebfs/mapper/WbFileMapper.java

@@ -23,7 +23,7 @@ public interface WbFileMapper {
      * @param limit
      * @return
      */
-    List<WbFile> getWbFileByMap(@Param("map") Map map, int start, int limit);
+    List<WbFile> getWbFileByMap(@Param("gmap") Map map, @Param("start") int start, @Param("limit") int limit);
 
     /**
      * 详情

src/main/java/io/xtfs/jwebfs/service/WbFileService.java

@@ -12,7 +12,7 @@ public interface WbFileService {
      * @param page
      * @return
      */
-    List<WbFile> getWbfileByMap(Map map, int page);
+    List<WbFile> getWbfileByMap(Map map, int page,int limit);
 
     /**
      * 新增
@@ -20,4 +20,11 @@ public interface WbFileService {
      * @return
      */
     int add(WbFile wbFile);
+
+    /**
+     * 统计
+     * @param map
+     * @return
+     */
+    int count(Map map);
 }

src/main/java/io/xtfs/jwebfs/service/impl/WbFileServiceImpl.java

@@ -17,13 +17,21 @@ public class WbFileServiceImpl implements WbFileService {
     private WbFileMapper wbFileMapper;
 
     @Override
-    public List<WbFile> getWbfileByMap(Map map, int page) {
+    public List<WbFile> getWbfileByMap(Map map, int page,int limit) {
         int start = PageBean.calcStartRs(page);
-        return wbFileMapper.getWbFileByMap(map,start, ChConstant.PAGESIZE);
+        if(limit==0){
+            limit = ChConstant.PAGESIZE;
+        }
+        return wbFileMapper.getWbFileByMap(map,start,limit);
     }
 
     @Override
     public int add(WbFile wbFile) {
         return wbFileMapper.addRs(wbFile);
     }
+
+    @Override
+    public int count(Map map) {
+        return wbFileMapper.countRs(map);
+    }
 }

src/main/java/io/xtfs/jwebfs/utils/AjaxResult.java

@@ -22,14 +22,16 @@ public class AjaxResult {
 
     /**
      * 传入list
-     * @param msg
+     * @param msg 消息
-     * @param dlist
+     * @param dlist 列表
+     * @param total 总数
      * @return
      */
-    public static JSONObject success(String msg, List dlist){
+    public static JSONObject success(String msg, List dlist,int total){
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("code",0);
         jsonObject.put("msg",msg);
+        jsonObject.put("count",total);
         jsonObject.put("data",dlist);
         return jsonObject;
     }

src/main/java/io/xtfs/jwebfs/web/WbFileController.java

@@ -1,13 +1,21 @@
 package io.xtfs.jwebfs.web;
 
 
+import com.alibaba.fastjson.JSONObject;
+import io.xtfs.jwebfs.bean.WbFile;
+import io.xtfs.jwebfs.service.WbFileService;
+import io.xtfs.jwebfs.utils.AjaxResult;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * webfile 文件管理
@@ -16,6 +24,8 @@ import org.springframework.web.servlet.ModelAndView;
 @RequestMapping("/wbfs")
 public class WbFileController {
     private static final Log log = LogFactory.getLog(WbFileController.class);
+    @Autowired
+    private WbFileService wbFileService;
 
     /**
      * webfs home
@@ -30,6 +40,24 @@ public class WbFileController {
         mv.setViewName("/wbfs/list");
         return mv;
     }
+
+    /**
+     * 输出的格式为json
+     * @param page 当前页面
+     * @param limit 每页大小
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/wflsit.json")
+    public JSONObject flist(@RequestParam(value = "page",defaultValue = "1")int page,
+                            @RequestParam(value = "limit",defaultValue = "0") int limit){
+        Map somap = new HashMap();
+        List<WbFile> wbFileList = wbFileService.getWbfileByMap(somap,page,limit);
+        // 符合条件的数量
+        int total = wbFileService.count(somap);
+        return AjaxResult.success("success",wbFileList,total);
+    }
+
     /**
      * 监视文件夹信息，如果有变动 发送变动的信息给
      * @param reqstr

src/main/resources/mapper/webfs/WbFileMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.xtfs.jwebfs.mapper.WbFileMapper">
 
-    <sql id="column">id.filename,filehash</sql>
+    <sql id="column">id,filename,filehash</sql>
     <sql id="tbName">wbfile</sql>
 
     <!-- 查询详情 -->

src/main/resources/templates/wbfs/list.html

@@ -1,36 +1,41 @@
-
 <!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8">
+    <title>BI&copy;FS</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>BIFS</title>
+    <link href="/static/layui/css/layui.css" rel="stylesheet">
-    <link rel="stylesheet" href="../static/layui/css/layui.css">
+    <style>
-    <script href="/static/layui/layui.js"></script>
+        .layui-table-view .layui-table {
+            width: 100% !importa;
+        }
+
+        .layui-table th {
+            text-align: -webkit-center !important;
+        }
+    </style>
+
 </head>
 <body>
-${tstr}
+<!-- 
+本「综合演示」包含：自定义头部工具栏、获取表格数据、表格重载、自定义模板、单双行显示、单元格编辑、自定义底部分页栏、表格相关事件与操作、与其他组件的结合等相对常用的功能，以便快速掌握 table 组件的使用。
+-->
 <div style="padding: 16px;">
     <table class="layui-hide" id="test" lay-filter="test"></table>
 </div>
-<script type="text/html" id="toolbarDemo">
+
-    <div class="layui-btn-container">
+<script type="text/html" id="barDemo">
-        <button class="layui-btn layui-btn-sm" lay-event="getCheckData">获取选中行数据</button>
+    <div class="layui-clear-space">
-        <button class="layui-btn layui-btn-sm" lay-event="getData">获取当前页数据</button>
+        <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
-        <button class="layui-btn layui-btn-sm" id="dropdownButton">
+        <a class="layui-btn layui-btn-xs" lay-event="more">
-            下拉按钮
+            更多
-            <i class="layui-icon layui-icon-down layui-font-12"></i>
+            <i class="layui-icon layui-icon-down"></i>
-        </button>
+        </a>
-        <button class="layui-btn layui-btn-sm layui-bg-blue" id="reloadTest">
-            重载测试
-            <i class="layui-icon layui-icon-down layui-font-12"></i>
-        </button>
-        <button class="layui-btn layui-btn-sm layui-btn-primary" id="rowMode">
-            <span>{{= d.lineStyle ? '多行' : '单行' }}模式</span>
-            <i class="layui-icon layui-icon-down layui-font-12"></i>
-        </button>
     </div>
 </script>
+<script src="/static/layui/layui.js"></script>
 <script>
     layui.use(['table', 'dropdown'], function(){
         var table = layui.table;
@@ -39,13 +44,9 @@ ${tstr}
         // 创建渲染实例
         table.render({
             elem: '#test',
-            url: '/static/json/2/table/demo1.json', // 此处为静态模拟数据，实际使用时需换成真实接口
+            url: '/wbfs/wflsit.json', // json
-            toolbar: '#toolbarDemo',
+
-            defaultToolbar: ['filter', 'exports', 'print', {
+
-                title: '提示',
-                layEvent: 'LAYTABLE_TIPS',
-                icon: 'layui-icon-tips'
-            }],
             height: 'full-35', // 最大高度减去其他容器已占有的高度差
             css: [ // 重设当前表格样式
                 '.layui-table-tool-temp{padding-right: 145px;}'
@@ -56,14 +57,9 @@ ${tstr}
             cols: [[
                 {type: 'checkbox', fixed: 'left'},
                 {field:'id', fixed: 'left', width:80, title: 'ID', sort: true, totalRowText: '合计：'},
-                {field:'username', width:80, title: '用户'},
+                {field:'filename', width:280, title: '文件名'},
-                {field:'email', title:'邮箱 <i class="layui-icon layui-icon-tips layui-font-14" lay-event="email-tips" title="该字段开启了编辑功能" style="margin-left: 5px;"></i>', fieldTitle: '邮箱', hide: 0, width:150, expandedMode: 'tips', edit: 'text'},
+                {field:'filehash', title:'文件路径', width:480, expandedMode: 'tips', edit: 'text'},
-                {field:'sex', width:80, title: '性别', sort: true},
+
-                {field:'sign', title: '签名', edit: 'textarea', minWidth: 260, expandedWidth: 260, totalRow: '人物：<span class="layui-badge-rim">唐代：{{= d.TOTAL_ROW.era.tang }} </span> <span class="layui-badge-rim">宋代：{{= d.TOTAL_ROW.era.song }}</span> <span class="layui-badge-rim">现代：{{= d.TOTAL_ROW.era.xian }}</span>'},
-                {field:'experience', width: 100, title: '积分', sort: true, totalRow: '{{= d.TOTAL_NUMS }} 😊'},
-                {field:'checkin', title:'打卡', width: 100, sort: true, totalRow: '{{= parseInt(d.TOTAL_NUMS) }} 次'},
-                {field:'ip', title:'IP', width: 120},
-                {field:'joinTime', title:'加入时间', width: 120},
                 {fixed: 'right', title:'操作', width: 134, minWidth: 125, toolbar: '#barDemo'}
             ]],
             done: function(){
@@ -140,16 +136,6 @@ ${tstr}
                                         //test: '新的 test2',
                                         //token: '新的 token2'
                                     },
-                                    /*
-                                    cols: [[ // 重置表头
-                                      {type: 'checkbox', fixed: 'left'},
-                                      {field:'id', title:'ID', width:80, fixed: 'left', unresize: true, sort: true, totalRowText: '合计：'},
-                                      {field:'sex', title:'性别', width:80, edit: 'text', sort: true},
-                                      {field:'experience', title:'积分', width:80, sort: true, totalRow: true, templet: '<div>{{= d.experience }} 分</div>'},
-                                      {field:'logins', title:'登入次数', width:100, sort: true, totalRow: true},
-                                      {field:'joinTime', title:'加入时间', width:120}
-                                    ]]
-                                    */
                                 });
                                 break;
                             case 'reload-deep':
@@ -227,123 +213,7 @@ ${tstr}
                 console.log(res, msg)
             }
         });
-
-        // 工具栏事件
-        table.on('toolbar(test)', function(obj){
-            var id = obj.config.id;
-            var checkStatus = table.checkStatus(id);
-            var othis = lay(this);
-            switch(obj.event){
-                case 'getCheckData':
-                    var data = checkStatus.data;
-                    layer.alert(layui.util.escape(JSON.stringify(data)));
-                    break;
-                case 'getData':
-                    var getData = table.getData(id);
-                    console.log(getData);
-                    layer.alert(layui.util.escape(JSON.stringify(getData)));
-                    break;
-                case 'LAYTABLE_TIPS':
-                    layer.alert('自定义工具栏图标按钮');
-                    break;
-            };
-        });
-        // 表头自定义元素工具事件 --- 2.8.8+
-        table.on('colTool(test)', function(obj){
-            var event = obj.event;
-            console.log(obj);
-            if(event === 'email-tips'){
-                layer.alert(layui.util.escape(JSON.stringify(obj.col)), {
-                    title: '当前列属性配置项'
-                });
-            }
-        });
-
-        // 触发单元格工具事件
-        table.on('tool(test)', function(obj){ // 双击 toolDouble
-            var data = obj.data; // 获得当前行数据
-            // console.log(obj)
-            if(obj.event === 'edit'){
-                layer.open({
-                    title: '编辑 - id:'+ data.id,
-                    type: 1,
-                    area: ['80%','80%'],
-                    content: '<div style="padding: 16px;">自定义表单元素</div>'
-                });
-            } else if(obj.event === 'more'){
-                // 更多 - 下拉菜单
-                dropdown.render({
-                    elem: this, // 触发事件的 DOM 对象
-                    show: true, // 外部事件触发即显示
-                    data: [{
-                        title: '查看',
-                        id: 'detail'
-                    },{
-                        title: '删除',
-                        id: 'del'
-                    }],
-                    click: function(menudata){
-                        if(menudata.id === 'detail'){
-                            layer.msg('查看操作，当前行 ID:'+ data.id);
-                        } else if(menudata.id === 'del'){
-                            layer.confirm('真的删除行 [id: '+ data.id +'] 么', function(index){
-                                obj.del(); // 删除对应行（tr）的DOM结构
-                                layer.close(index);
-                                // 向服务端发送删除指令
-                            });
-                        }
-                    },
-                    align: 'right', // 右对齐弹出
-                    style: 'box-shadow: 1px 1px 10px rgb(0 0 0 / 12%);' // 设置额外样式
-                })
-            }
-        });
-
-        // 触发表格复选框选择
-        table.on('checkbox(test)', function(obj){
-            console.log(obj)
-        });
-
-        // 触发表格单选框选择
-        table.on('radio(test)', function(obj){
-            console.log(obj)
-        });
-
-        // 行单击事件
-        table.on('row(test)', function(obj){
-            //console.log(obj);
-            //layer.closeAll('tips');
-        });
-        // 行双击事件
-        table.on('rowDouble(test)', function(obj){
-            console.log(obj);
-        });
-
-        // 单元格编辑事件
-        table.on('edit(test)', function(obj){
-            var field = obj.field; // 得到字段
-            var value = obj.value; // 得到修改后的值
-            var data = obj.data; // 得到所在行所有键值
-            // 值的校验
-            if(field === 'email'){
-                if(!/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/.test(obj.value)){
-                    layer.tips('输入的邮箱格式不正确，请重新编辑', this, {tips: 1});
-                    return obj.reedit(); // 重新编辑 -- v2.8.0 新增
-                }
-            }
-            // 编辑后续操作，如提交更新请求，以完成真实的数据更新
-            // …
-            layer.msg('编辑成功', {icon: 1});
-
-            // 其他更新操作
-            var update = {};
-            update[field] = value;
-            obj.update(update);
-        });
     });
 </script>
-
-</body>
-</html>
 </body>
-</html>
+</html>