fix: 线程池bug

lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java

@@ -41,10 +41,14 @@ public class Searcher {
         Analyzer analyzer = new IKAnalyzer(true);
 
         // 实际上Lucene本身不支持分页。因此我们需要自己进行逻辑分页。我们要准备分页参数：
-        int pageSize = Integer.parseInt(whereJson.get("size").toString());// 每页条数
+        // 每页条数
-        int pageNum = Integer.parseInt(whereJson.get("page").toString()) - 1;// 当前页码
+        int pageSize = Integer.parseInt(whereJson.get("size").toString());
-        int start = pageNum * pageSize;// 当前页的起始条数
+        // 当前页码
-        int end = start + pageSize;// 当前页的结束条数（不能包含）
+        int pageNum = Integer.parseInt(whereJson.get("page").toString()) - 1;
+        // 当前页的起始条数
+        int start = pageNum * pageSize;
+        // 当前页的结束条数（不能包含）
+        int end = start + pageSize;
         // 创建排序对象,需要排序字段SortField，参数：字段的名称、字段的类型、是否反转如果是false，升序。true降序
         Sort sort = new Sort(new SortField(LogMessageConstant.SORT_NAME, SortField.Type.LONG,true));
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java

@@ -24,9 +24,10 @@ import java.util.concurrent.ThreadPoolExecutor;
 public class CockpitServiceImpl implements CockpitService {
     @Autowired
     private CockPitMapper cockPitMapper;
-    private ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll();
+
     @Override
     public ConcurrentHashMap<String, Object> PressedMonitor() {
+        ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll();
         ConcurrentHashMap<String, Object> map = new ConcurrentHashMap<>();
         // 1、当前班次、计划生产、已生产、不合格产品数
         // 白班、晚班

lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import Logo from '@/assets/images/logo.png'
+import Logo from '@/assets/images/logo2.png'
 import variables from '@/assets/styles/variables.scss'
 export default {
   name: 'SidebarLogo',