From 9f9495790916e7c1e1dbb349b1641edd7aa9c9db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9F=922012?= <345849402@qq.com>
Date: Sat, 5 Sep 2020 12:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=98=91=E8=8F=87=E9=92=89=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/app/service/AppDingLogService.java |   2 +-
 .../service/impl/AppDingLogServiceImpl.java   |   7 +-
 .../tools/module/app/web/DingController.java  |  21 +++
 .../sys/service/impl/SysMenuServiceImpl.java  |   2 +-
 .../resources/templates/app/moguding/log.html | 138 ++++++++++++++++++
 .../resources/templates/app/task/list.html    |  14 +-
 6 files changed, 171 insertions(+), 13 deletions(-)
 create mode 100644 src/main/resources/templates/app/moguding/log.html

diff --git a/src/main/java/com/tools/module/app/service/AppDingLogService.java b/src/main/java/com/tools/module/app/service/AppDingLogService.java
index 831a068..f0f6889 100644
--- a/src/main/java/com/tools/module/app/service/AppDingLogService.java
+++ b/src/main/java/com/tools/module/app/service/AppDingLogService.java
@@ -15,7 +15,7 @@ public interface AppDingLogService {
      */
     Result listSignInLog(AppDingSignInLog log);
 
-    Result delete(AppDingSignInLog signInLog);
+    Result delete(Integer logId);
 
     void save(AppDingSignInLog signInLog);
 
diff --git a/src/main/java/com/tools/module/app/service/impl/AppDingLogServiceImpl.java b/src/main/java/com/tools/module/app/service/impl/AppDingLogServiceImpl.java
index 4bde558..c8cd547 100644
--- a/src/main/java/com/tools/module/app/service/impl/AppDingLogServiceImpl.java
+++ b/src/main/java/com/tools/module/app/service/impl/AppDingLogServiceImpl.java
@@ -38,8 +38,7 @@ public class AppDingLogServiceImpl implements AppDingLogService {
                 nativeSql.append("WHERE username = ?");
                 params = new Object[]{log.getUsername()};
             }
-            nativeSql.append(" order by logId desc");
-            Pageable pageable = PageRequest.of(log.getPageNo() - 1, log.getPageSize());
+            Pageable pageable = PageRequest.of(log.getPageNo(), log.getPageSize());
             List<AppDingSignInLog> list = dynamicQuery.nativeQueryPagingList(AppDingSignInLog.class, pageable, nativeSql.toString(), params);
             data = new PageBean<>(list, totalCount);
         }
@@ -48,9 +47,9 @@ public class AppDingLogServiceImpl implements AppDingLogService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result delete(AppDingSignInLog signInLog) {
+    public Result delete(Integer logId) {
         String nativeSql = "DELETE FROM app_ding_signIn_log WHERE id=?";
-        dynamicQuery.nativeExecuteUpdate(nativeSql,new Object[]{signInLog.getLogId()});
+        dynamicQuery.nativeExecuteUpdate(nativeSql,new Object[]{logId});
         return Result.ok();
     }
 
diff --git a/src/main/java/com/tools/module/app/web/DingController.java b/src/main/java/com/tools/module/app/web/DingController.java
index 5ce0f7a..700f17e 100644
--- a/src/main/java/com/tools/module/app/web/DingController.java
+++ b/src/main/java/com/tools/module/app/web/DingController.java
@@ -4,7 +4,9 @@ import com.tools.common.config.AbstractController;
 import com.tools.common.model.Result;
 import com.tools.common.util.BaiDuMapUtils;
 import com.tools.common.util.CommonUtils;
+import com.tools.module.app.entity.AppDingSignInLog;
 import com.tools.module.app.entity.AppDingUser;
+import com.tools.module.app.service.AppDingLogService;
 import com.tools.module.app.service.AppDingService;
 import com.tools.module.app.service.AppDingUserService;
 import io.swagger.annotations.Api;
@@ -32,6 +34,9 @@ public class DingController extends AbstractController {
     @Autowired
     private AppDingUserService dingUserService;
 
+    @Autowired
+    private AppDingLogService dingLogService;
+
     /**
      * 列表
      */
@@ -84,6 +89,22 @@ public class DingController extends AbstractController {
         return BaiDuMapUtils.getCoordinate(address);
     }
 
+    /**
+     * 签到日志
+     */
+    @PostMapping("log")
+    public Result log(AppDingSignInLog log){
+        return  dingLogService.listSignInLog(log);
+    }
+
+    /**
+     * 删除日志
+     */
+    @PostMapping("log/delete")
+    public Result deleteLog(Integer logId){
+        return  dingLogService.delete(logId);
+    }
+
     /**
      * 列表
      */
diff --git a/src/main/java/com/tools/module/sys/service/impl/SysMenuServiceImpl.java b/src/main/java/com/tools/module/sys/service/impl/SysMenuServiceImpl.java
index 1cbd5f1..dd49e2e 100644
--- a/src/main/java/com/tools/module/sys/service/impl/SysMenuServiceImpl.java
+++ b/src/main/java/com/tools/module/sys/service/impl/SysMenuServiceImpl.java
@@ -84,7 +84,7 @@ public class SysMenuServiceImpl implements SysMenuService {
             subSql +="LEFT JOIN sys_role_menu rm ON m.menu_id = rm.menu_id ";
             subSql +="LEFT JOIN sys_role r ON r.role_id = rm.role_id ";
             subSql +="WHERE r.role_id IN (SELECT role_id FROM sys_user_role WHERE user_id=?) ";
-            subSql +="AND m.parent_id = ?";
+            subSql +="AND m.parent_id = ? ORDER BY m.order_num";
             List<SysMenu> subList
                     = dynamicQuery.query(SysMenu.class,subSql,new Object[]{userId,menu.getMenuId()});
             menu.setList(subList);
diff --git a/src/main/resources/templates/app/moguding/log.html b/src/main/resources/templates/app/moguding/log.html
new file mode 100644
index 0000000..793b465
--- /dev/null
+++ b/src/main/resources/templates/app/moguding/log.html
@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common/head :: head(link)"/>
+<body>
+<div id="app" class="ok-body" v-cloak>
+    <template>
+        <div style="margin-bottom: 8px;margin-top: 8px;">
+            <i-input placeholder="输入内容"  v-model="log.description"  style="width: 300px"></i-input>
+            <i-button type="primary"  icon="ios-search" @click="load()">搜索</i-button>
+            <i-button type="primary"  icon="ios-redo" @click="reload()" >重置</i-button>
+        </div>
+    </template>
+    <template>
+        <i-table size="small" :columns="tableTitle"  :data="tableData">
+        </i-table>
+        <br>
+        <Page  style="float: right;" :current="log.pageNo" :total="tableSize" :page-size="log.pageSize"  @on-change="changePage" @on-page-size-change="changePageSize" show-elevator show-sizer show-total></Page>
+    </template>
+</div>
+<div th:replace="common/foot :: foot(script)"></div>
+<script th:inline="none">
+layui.use(["okUtils", "okLayer"], function () {
+    var okUtils = layui.okUtils;
+    var okLayer = layui.okLayer;
+    var vm = new Vue({
+        el: '#app',
+        data: function(){
+        var that = this;
+		return {
+            tableTitle : [{
+                title: '序号',
+                width : 70,
+                render: function(h, params) {
+                    return h('span', params.index + (that.log.pageNo- 1) * that.log.pageSize + 1);
+                }
+            },{
+                key : "username",
+                title : "用户名",
+                width:200
+            },{
+                key : "address",
+                title : "地址",
+                minWidth:100
+            },{
+                key : "gmtCreate",
+                title : "创建时间",
+                minWidth:150
+            },{
+                key : "status",
+                title : "状态",
+                width:100,
+                render : function(h, params) {
+                    var type = params.row.status==1?"成功":"失败";
+                    return h('div', type);
+                }
+            },{
+                title : '操作',
+                key : 'action',
+                width : 100,
+                align : 'center',
+                render : function(h, params) {
+                    var functionList = [];
+                    var remove = h('Button', {
+                        props : {
+                            type : 'primary',
+                            size : 'small',
+                            icon : 'md-trash'
+                        },
+                        style : {
+                            marginRight : '8px'
+                        },
+                        on : {
+                            click : function() {
+                                vm.remove(params.row);
+                            }
+                        }
+                    }, '删除');
+                    functionList.push(remove);
+                    return h('div', functionList);
+                }
+            } ],
+            tableData : [],
+            log : {
+                pageSize : 10,
+                pageNo : 1,
+                description:''
+            },
+            tableSize : 50,
+          }
+        },
+        methods: {
+            load : function() {
+                var that = this;
+                okUtils.ajaxCloud({
+                    url:"/app/ding/log",
+                    param : that.log,
+                    success : function(result) {
+                         that.tableData = result.msg.pageData;
+                         that.tableSize = result.msg.totalCount;
+                    }
+                });
+            },
+            reload : function(){
+                vm.log.pageSize = 10;
+                vm.log.pageNo = 1;
+                vm.log.description = '';
+                this.load();
+            },
+            changePage : function(pageNo) {
+                vm.log.pageNo = pageNo;
+                vm.load();
+            },
+            changePageSize : function(pageSize) {
+                vm.log.pageSize = pageSize;
+                vm.load();
+            },
+            remove:function(log) {
+                 okLayer.confirm("确定要删除吗？", function () {
+                    okUtils.ajaxCloud({
+                        url:"/app/ding/log/delete",
+                        param : {logId: log.logId},
+                        success : function(result) {
+                            okLayer.msg.greenTick(result.msg, function () {
+                                  vm.load();
+                            });
+                        }
+                    });
+                 })
+            }
+        },
+        created: function() {
+            this.load()
+        }
+    })
+  });
+</script>
+</body>
+</html>
diff --git a/src/main/resources/templates/app/task/list.html b/src/main/resources/templates/app/task/list.html
index 3d1ef0c..e68ab4f 100644
--- a/src/main/resources/templates/app/task/list.html
+++ b/src/main/resources/templates/app/task/list.html
@@ -34,25 +34,25 @@ layui.use(["okUtils", "okLayer"], function () {
                 render: function(h, params) {
                     return h('span', params.index + (that.task.pageNo- 1) * that.task.pageSize + 1);
                 }
-            },{
-                key : "name",
-                title : "任务名称",
-                minWidth:100
             },{
                 key : "group",
                 title : "任务分组",
                 minWidth:100
+            },{
+                key : "name",
+                title : "任务名称",
+                minWidth:100
             },{
                 key : "taskClassName",
-                title : "执行类",
+                title : "类",
                 minWidth:260
             },{
                 key : "methodName",
-                title : "执行方法",
+                title : "方法",
                 width:80
             },{
                 key : "cronExpression",
-                title : "执行时间",
+                title : "时间",
                 width:150
             },{
                 key : "gmtCreate",
-- 
GitLab