将OCR调用统计设为默认首页，修改一些分页问题

src/main/java/com/mailu/ocrCloudPlatformAdmin/OcrCloudPlatformAdminApplication.java

@@ -10,7 +10,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, PageHelperAutoConfiguration.class})
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 @EnableEurekaClient
 @EnableFeignClients
 @MapperScan(basePackages = {"com.mailu.ocrCloudPlatformAdmin.mapper"})

src/main/java/com/mailu/ocrCloudPlatformAdmin/controller/AuthorizationController.java

 package com.mailu.ocrCloudPlatformAdmin.controller;
 
+import cn.hutool.core.util.IdUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.mailu.ocrCloudPlatformAdmin.entity.AuthorizationInfo;
+import com.mailu.ocrCloudPlatformAdmin.entity.Court;
+import com.mailu.ocrCloudPlatformAdmin.mapper.CourtMapper;
 import com.mailu.ocrCloudPlatformAdmin.response.Result;
 import com.mailu.ocrCloudPlatformAdmin.service.AuthorizationService;
 import com.mailu.ocrCloudPlatformAdmin.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Hmb
  * @since 2024/4/3 16:30
@@ -18,6 +26,27 @@ public class AuthorizationController {
     @Autowired
     private AuthorizationService authorizationService;
 
+    @Autowired
+    private CourtMapper courtMapper;
+
+    @RequestMapping("/test")
+    public void get() {
+        List<Court> courtList = courtMapper.selectAll();
+        ArrayList<AuthorizationInfo> list = new ArrayList<>();
+        for (Court court : courtList) {
+            AuthorizationInfo authorizationInfo = new AuthorizationInfo();
+            String courtName = court.getName();
+            String authCode = IdUtil.fastSimpleUUID();
+            authorizationInfo.setEtime(DateUtil.strToDate("2099-12-31"));
+            authorizationInfo.setAuthCode(authCode);
+            authorizationInfo.setStime(DateUtil.strToDate("2020-04-03"));
+            authorizationInfo.setCourtName(courtName);
+            authorizationInfo.setGradingCode(court.getCourtCode() + "");
+            list.add(authorizationInfo);
+        }
+        authorizationService.saveBatch(list);
+    }
+
     /**
      * 获取列表
      *
@@ -28,6 +57,25 @@ public class AuthorizationController {
         return Result.success("成功", authorizationService.list());
     }
 
+    /**
+     * 获取列表
+     *
+     * @return
+     */
+    @PostMapping("/page")
+    public Result page(@RequestBody com.mailu.ocrCloudPlatformAdmin.dto.Page param) {
+        if (param.getPage() == null) {
+            param.setPage(1);
+        }
+        if (param.getLimit() == null) {
+            param.setLimit(10);
+        }
+        PageHelper.startPage(param.getPage(), param.getLimit());
+        List<AuthorizationInfo> list = authorizationService.list();
+        PageInfo<AuthorizationInfo> pageInfo = new PageInfo<>(list);
+        return Result.success("成功", pageInfo.getTotal(), pageInfo.getList());
+    }
+
 
     /**
      * 新增

src/main/resources/application.yml

@@ -17,7 +17,7 @@ eureka:
   client:
     service-url:
       defaultZone: http://localhost:9000/eureka
-      enabled: false
+#    enabled: false
   instance:
     prefer-ip-address: true
     instance-id: ${spring.cloud.client.ip-address}:${spring.application.name}:${server.port}

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

@@ -76,7 +76,7 @@
         form = layui.form;
         authorizationList = table.render({
             elem: "#authorizationList"
-            , url: "authorization/list"
+            , url: "authorization/page"
             , method: "post"
             , contentType: "application/json"
             , title: "统一管理平台_授权信息"
@@ -84,6 +84,7 @@
                 statusCode: 200 //规定成功的状态码，默认：0
             }
             , page: true
+            , limits: [10, 20, 40, 60, 80, 100, 200]
             , toolbar: '#toolbar' //开启头部工具栏，并为其绑定左侧模板
             , defaultToolbar: ['exports', 'filter', 'print']
             , cols: [

src/main/resources/templates/callSupervision/index.html

@@ -310,13 +310,25 @@
                         style: 'color: #3e63cc',
                         templet: function (data) {
                             if (data.active) {
-                                return "<span style='color: #6aaf62;'>活跃</span>"
+                                return "<span style='color: #f2495c;'>活跃</span>"
                             } else {
-                                return "<span style='color: #5b79d6;'>不活跃</span>"
+                                return "<span style='color: #5b79d6;'>空闲</span>"
                             }
                         }
                     },
-                    {field: 'ocrTask', title: 'OCR调用量', align: 'center', style: 'color: #3e63cc'}
+                    {
+                        field: 'ocrTask',
+                        title: '当前识别数',
+                        align: 'center',
+                        style: 'color: #3e63cc',
+                        templet: function (data) {
+                            if (data.active) {
+                                return "<span style='color: #f2495c;'>" + data.ocrTask + "</span>";
+                            } else {
+                                return "<span style='color: #5b79d6;'>" + data.ocrTask + "</span>";
+                            }
+                        }
+                    }
                 ]
             ],
             // res: 返回信息 curr: 当前页码 count: 数据总量

src/main/resources/templates/configAppView/configAppList.html

@@ -76,7 +76,6 @@
         var tableIns = table.render({
             elem: '#configAppInfo',
             id: "configApp",
-            height: 500,
             url: gatewayUrl + '/configApp/configApplicationPage',
             title: '应用表',
             page: true,

src/main/resources/templates/court/courtList.html

@@ -72,7 +72,6 @@
         var tableIns = table.render({
             elem: '#courtInfo',
             id: "court",
-            height: 500,
             url: gatewayUrl + '/court/courtPage',
             title: '法院信息表',
             page: true,

src/main/resources/templates/index.html

@@ -69,10 +69,10 @@
                 <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu"
                     lay-filter="layadmin-system-side-menu">
                     <!--/*@thymesVar id="menu" type=""*/-->
-                    <li th:each="menu : ${menuList}" data-name="home" th:class="${menu.name == '角色管理'? 'layui-nav-item layui-nav-itemed layui-this': 'layui-nav-item'}">
+                    <li th:each="menu : ${menuList}" data-name="home" th:class="${menu.name == 'OCR调用统计'? 'layui-nav-item layui-nav-itemed layui-this': 'layui-nav-item'}">
                         <a th:href="${menu.name == '控制台'?'console':'javascript:;'}" th:lay-href="${menu.path}" th:lay-tips="${menu.name}" lay-direction="2">
-                            <i th:if="menu.path eq 'role/'" class="layui-icon layui-icon-home"></i>
-                            <i th:if="menu.path ne 'role/'" class="layui-icon layui-icon-auz"></i>
+                            <i th:if="menu.path eq 'callSupervision'" class="layui-icon layui-icon-home"></i>
+                            <i th:if="menu.path ne 'callSupervision'" class="layui-icon layui-icon-auz"></i>
                             <cite th:text="${menu.name}">客户端管理</cite>
                         </a>
                     </li>
@@ -98,7 +98,7 @@
             </div>
             <div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
                 <ul class="layui-tab-title" id="LAY_app_tabsheader">
-                    <li  lay-id="role/" lay-attr="role/" class="layui-this">
+                    <li  lay-id="callSupervision" lay-attr="callSupervision" class="layui-this">
                         <i class="layui-icon layui-icon-home"></i>
                     </li>
                 </ul>
@@ -114,7 +114,7 @@
                 <iframe th:if="${user.id !=18937}" th:src="${menuList[0].path}" frameborder="0" class="layadmin-iframe">
 
                 </iframe> -->
-                <iframe th:if="${isAdmin}" src="role/" frameborder="0" class="layadmin-iframe"></iframe>
+                <iframe th:if="${isAdmin}" src="callSupervision" frameborder="0" class="layadmin-iframe"></iframe>
                 <iframe th:if="${!isAdmin}" th:src="${menuList[1].path}" frameborder="0" class="layadmin-iframe"></iframe>
             </div>
         </div>