From 54ca6c347c1c2bd7621dd843160827ffb87b84d1 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Tue, 23 Apr 2024 11:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/index-topnav.html     |  4 +-
 .../src/main/resources/templates/login.html   |  2 +-
 .../src/main/resources/templates/main.html    | 61 ++++++++++---------
 .../api/controller/BroadApiController.java    | 25 ++++++++
 .../com/ruoyi/api/mapper/BroadApiMapper.java  | 12 ++++
 .../api/service/impl/BroadApiService.java     | 19 ++++++
 .../main/resources/mapper/BroadApiMapper.xml  | 21 +++++++
 ruoyi-manage/pom.xml                          | 17 ++++--
 .../controller/LedgerRfidController.java      | 12 +++-
 .../RecordStoreCheckInfoController.java       |  2 +-
 .../templates/manage/ledger_rfid/add.html     |  2 +-
 .../templates/manage/ledger_rfid/edit.html    |  2 +-
 .../manage/ledger_rfid/ledger_rfid.html       |  2 +
 13 files changed, 139 insertions(+), 42 deletions(-)
 create mode 100644 ruoyi-api/src/main/java/com/ruoyi/api/controller/BroadApiController.java
 create mode 100644 ruoyi-api/src/main/java/com/ruoyi/api/mapper/BroadApiMapper.java
 create mode 100644 ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BroadApiService.java
 create mode 100644 ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml

diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html
index 7f94f19..f02fb23 100644
--- a/ruoyi-admin/src/main/resources/templates/index-topnav.html
+++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html
@@ -4,10 +4,10 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
-    <title>首页</title>
+    <title>首页1</title>
     <!-- 避免IE使用兼容模式 -->
  	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<!--    <link th:href="@{favicon.ico}" rel="shortcut icon"/>-->
+    <link th:href="@{favicon.ico}" rel="shortcut icon"/>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/jquery.contextMenu.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html
index 6ff800b..f1c2524 100644
--- a/ruoyi-admin/src/main/resources/templates/login.html
+++ b/ruoyi-admin/src/main/resources/templates/login.html
@@ -14,7 +14,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<!--    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>-->
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};
diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html
index d0c3a02..425122b 100644
--- a/ruoyi-admin/src/main/resources/templates/main.html
+++ b/ruoyi-admin/src/main/resources/templates/main.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!--360浏览器优先以webkit内核解析-->
     <title></title>
-<!--    <link rel="shortcut icon" href="favicon.ico">-->
+    <!--    <link rel="shortcut icon" href="favicon.ico">-->
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
@@ -18,58 +18,61 @@
 <!--    <div class="text-center">-->
 <!--        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">打开示例窗口</button>-->
 <!--    </div>-->
-    <div class="modal inmodal" id="myModal" tabindex="-1" role="dialog" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content animated bounceInRight">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" onclick="test()"><span
-                            aria-hidden="true">&times;</span><span class="sr-only">关闭</span>
-                    </button>
-                    <i class="fa fa-laptop modal-icon"></i>
-                    <h4 class="modal-title">报废轮挡处理提醒</h4>
+<div class="modal inmodal" id="myModal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content animated bounceInRight">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" onclick="test()"><span
+                        aria-hidden="true">&times;</span><span class="sr-only">关闭</span>
+                </button>
+                <i class="fa fa-laptop modal-icon"></i>
+                <h4 class="modal-title">报废轮挡处理提醒</h4>
 
-                </div>
-                <div class="modal-body" >
-                    <p  >轮挡报废数量：<strong id="tt1"></strong>  ,超过仓库设定存储数量  </p>
-<!--                    <div class="form-group">-->
-<!--                        <label>Email</label>-->
-<!--                        <input type="email" placeholder="请输入您的Email" class="form-control">-->
-<!--                    </div>-->
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-white" data-dismiss="modal" onclick="test()">关闭</button>
-<!--                    <button type="button" class="btn btn-primary">保存</button>-->
-                </div>
+            </div>
+            <div class="modal-body">
+                    <p style="font-size: 2rem; text-align: center">当前轮挡报废数量：<strong id="tt1" style="color:red"></strong>   ,超过仓库设定存储数量 </p>
+                <!--                    <div class="form-group">-->
+                <!--                        <label>Email</label>-->
+                <!--                        <input type="email" placeholder="请输入您的Email" class="form-control">-->
+                <!--                    </div>-->
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-white" data-dismiss="modal" onclick="test()">关闭</button>
+                <!--                    <button type="button" class="btn btn-primary">保存</button>-->
             </div>
         </div>
     </div>
+</div>
 
 <!--</div>-->
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
     // $(document).ready(function() {
-        // 页面加载完成后执行的操作
+    // 页面加载完成后执行的操作
     var data;
     $(function () {
         $.ajax({
-            url:  '/manage/ledger_rfid/selectWasteNumber',
+            url: '/manage/ledger_rfid/selectWasteNumber',
             method: 'POST',
             dataType: 'json',
-            success: function(response) {
+            success: function (response) {
                 console.log(response)
-                data  = response.data;
-                if (data>1){
-                    // document.getElementById("tt1").innerText=data
+                if (response.code==0){
+                    data = response.data;
                     $("#tt1").text(data)
                     $("#myModal").show();
                 }
+
+
+
             },
-            error: function(xhr, status, error) {
+            error: function (xhr, status, error) {
                 // 请求出错，可以在这里处理错误信息
                 console.error('请求出错');
             }
         });
     });
+
     function test() {
         console.log("关闭")
         $("#myModal").hide();
diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/BroadApiController.java b/ruoyi-api/src/main/java/com/ruoyi/api/controller/BroadApiController.java
new file mode 100644
index 0000000..56ea3a6
--- /dev/null
+++ b/ruoyi-api/src/main/java/com/ruoyi/api/controller/BroadApiController.java
@@ -0,0 +1,25 @@
+package com.ruoyi.api.controller;
+
+import com.ruoyi.api.service.impl.BroadApiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wanghao
+ * @date 2024/3/1  13:29
+ */
+@RestController
+@RequestMapping("/api")
+public class BroadApiController {
+
+    @Autowired
+    private BroadApiService service;
+
+
+    @PostMapping("/selectCountNumber")
+    private String selectCountNumber(){
+        return service.selectCountNumber();
+    }
+}
diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/BroadApiMapper.java b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/BroadApiMapper.java
new file mode 100644
index 0000000..16062e8
--- /dev/null
+++ b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/BroadApiMapper.java
@@ -0,0 +1,12 @@
+package com.ruoyi.api.mapper;
+
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author wanghao
+ * @date 2024/3/1  13:30
+ */
+@Repository
+public interface BroadApiMapper {
+    String selectCountNumber();
+}
diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BroadApiService.java b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BroadApiService.java
new file mode 100644
index 0000000..fd4c97d
--- /dev/null
+++ b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BroadApiService.java
@@ -0,0 +1,19 @@
+package com.ruoyi.api.service.impl;
+
+import com.ruoyi.api.mapper.BroadApiMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author wanghao
+ * @date 2024/3/1  13:30
+ */
+@Service
+public class BroadApiService {
+@Autowired
+private BroadApiMapper mapper;
+
+    public String selectCountNumber() {
+        return mapper.selectCountNumber();
+    }
+}
diff --git a/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml b/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml
new file mode 100644
index 0000000..53c20c3
--- /dev/null
+++ b/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.api.mapper.BroadApiMapper">
+
+
+
+    <select id="selectCountNumber" resultType="com.ruoyi.manage.domain.ResultBeen">
+        select count(inspection_id) as t, '巡检次数' as name
+        from record_inspection
+        where DATE(inspection_time) = CURDATE()
+        union
+        select count(DISTINCT location_code) as t, '巡检机位' as name
+        from record_inspection_info
+        where DATE(create_time) = CURDATE()
+        union
+        select count(inspection_state) as t, '巡检结果' as name
+        from record_inspection_info
+        where DATE(create_time) = CURDATE() and inspection_state !='正常'
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-manage/pom.xml b/ruoyi-manage/pom.xml
index 10f9192..e882b10 100644
--- a/ruoyi-manage/pom.xml
+++ b/ruoyi-manage/pom.xml
@@ -10,11 +10,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ruoyi-manage</artifactId>
- <dependencies>
-     <dependency>
-         <groupId>com.ruoyi</groupId>
-         <artifactId>ruoyi-common</artifactId>
-     </dependency>
- </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
+    </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/LedgerRfidController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/LedgerRfidController.java
index 77604a5..f13096e 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/LedgerRfidController.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/LedgerRfidController.java
@@ -3,6 +3,7 @@ package com.ruoyi.manage.controller;
 import java.util.List;
 
 import com.ruoyi.manage.domain.ResultBeen;
+import com.ruoyi.system.service.ISysConfigService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -35,6 +36,9 @@ public class LedgerRfidController extends BaseController {
     @Autowired
     private ILedgerRfidService ledgerRfidService;
 
+    @Autowired
+    private ISysConfigService configService;
+
     @RequiresPermissions("manage:ledger_rfid:view")
     @GetMapping()
     public String ledger_rfid() {
@@ -123,11 +127,17 @@ public class LedgerRfidController extends BaseController {
         return toAjax(ledgerRfidService.deleteLedgerRfidByObjids(ids));
     }
 
+    @RequiresPermissions("manage:ledger_rfid:list")
     @PostMapping("/selectWasteNumber")
     @ResponseBody
     public AjaxResult selectWasteNumber() {
         int number = ledgerRfidService.countWasteNumber();
-        return success(number);
+        int s = Integer.parseInt(configService.selectConfigByKey("manage.selectWasteNumber"));
+        System.out.println("设定数量="+configService.selectConfigByKey("manage.selectWasteNumber"));
+        if (number>=s){
+            return success(number);
+        }
+        return error();
     }
 
   @PostMapping("/countRfid")
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordStoreCheckInfoController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordStoreCheckInfoController.java
index 4a85877..2d49dee 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordStoreCheckInfoController.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordStoreCheckInfoController.java
@@ -49,7 +49,7 @@ public class RecordStoreCheckInfoController extends BaseController
     @ResponseBody
     public TableDataInfo list(RecordStoreCheckInfo recordStoreCheckInfo)
     {
-        startPage();
+        // startPage();
         List<RecordStoreCheckInfo> list = recordStoreCheckInfoService.selectRecordStoreCheckInfoList(recordStoreCheckInfo);
         return getDataTable(list);
     }
diff --git a/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/add.html b/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/add.html
index 3bcf40e..f1f3089 100644
--- a/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/add.html
+++ b/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/add.html
@@ -35,7 +35,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">是否报废：</label>
                 <div class="col-sm-8">
-                    <select name="isScrap" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                    <select name="isScrap" class="form-control m-b" th:with="type=${@dict.getType('bf_y_n')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
diff --git a/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/edit.html b/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/edit.html
index 5e5acee..f8b39cc 100644
--- a/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/edit.html
+++ b/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/edit.html
@@ -36,7 +36,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">是否报废：</label>
                 <div class="col-sm-8">
-                    <select name="isScrap" class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                    <select name="isScrap" class="form-control m-b" th:with="type=${@dict.getType('bf_y_n')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{isScrap}"></option>
                     </select>
                 </div>
diff --git a/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/ledger_rfid.html b/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/ledger_rfid.html
index 2b3a779..90621ba 100644
--- a/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/ledger_rfid.html
+++ b/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/ledger_rfid.html
@@ -86,6 +86,8 @@
             removeUrl: prefix + "/remove",
             exportUrl: prefix + "/export",
             modalName: "轮挡台账",
+            sortName:"createTime",
+            sortOrder:"desc",
             columns: [{
                 checkbox: true
             },