决策优化

slibra-admin/src/main/java/com/slibra/web/controller/business/GRPCController.java

@@ -249,14 +249,17 @@ public class GRPCController extends BaseController {
         //2024年5月21日15:23:07 这里不能用关联查询处理，日报要获取最新的一条而不是今日的数据。
         List<DecisionReq> decisionReqs = this.xinyiIndustryMapper.selectLast10RecordsForDecisionOnlyIndustry();
         if(!CollectionUtils.isEmpty(decisionReqs)){
+            //处理日报数据
+            TXinyiDaily daily = this.xinyiDailyMapper.selectNewestData();
             for (DecisionReq decisionReq : decisionReqs) {
-                //处理日报数据
-                TXinyiDaily daily = this.xinyiDailyMapper.selectNewestData();
                 if(!Objects.isNull(daily)){
                     decisionReq.setT(daily.getJsSw());
                     decisionReq.setSVI(daily.getWntjzsAll());
                     decisionReq.setSV(daily.getWncjbAll());
                     decisionReq.setMlvss(daily.getHfxwnndAll());
+                    //2024年7月2日17:20:12  mlss和DO_O也要从日报获取
+                    decisionReq.setMlss(daily.getHycWnndAll());
+                    decisionReq.setDoO(daily.getHycRjyAll());
                     decisionReq.setDoAna(daily.getYycRjyAll());
                     decisionReq.setDoQue(daily.getQycRjyAll());
                     //2024年5月26日11:59:02 干污泥量数据做了同步

slibra-common/src/main/java/com/slibra/common/utils/SecurityUtils.java

@@ -117,4 +117,9 @@ public class SecurityUtils
     {
         return userId != null && 1L == userId;
     }
+
+
+    public static void main(String[] args) {
+        System.out.println(matchesPassword("admin123","$2a$10$OUgsPsl5XOeeScKDrqmEQuT7Evbk6dZ4SGBEevgjC4jw3vCJv/MSC"));
+    }
 }

slibra-framework/pom.xml

@@ -62,6 +62,11 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+            <version>5.5.8</version>
+        </dependency>
 
     </dependencies>
 

slibra-framework/src/main/java/com/slibra/framework/config/SpringSecurityCustomConfig.java

@@ -0,0 +1,27 @@
+package com.slibra.framework.config;
+
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.web.firewall.HttpFirewall;
+import org.springframework.security.web.firewall.StrictHttpFirewall;
+
+/**
+ * redis配置
+ * 
+ *
+ */
+@Configuration
+@EnableCaching
+public class SpringSecurityCustomConfig extends CachingConfigurerSupport
+{
+    @Bean
+    public HttpFirewall allowDoubleSlashHttpFirewall() {
+        StrictHttpFirewall firewall = new StrictHttpFirewall();
+        // 允许双//
+        firewall.setAllowUrlEncodedDoubleSlash(true);
+        return firewall;
+    }
+
+}

slibra-quartz/src/main/java/com/slibra/quartz/task/AsyncTask.java

@@ -968,14 +968,17 @@ public class AsyncTask {
         //2024年5月21日15:23:07 这里不能用关联查询处理，日报要获取最新的一条而不是今日的数据。
         List<DecisionReq> decisionReqs = this.xinyiIndustryMapper.selectLast10RecordsForDecisionOnlyIndustry();
         if(!CollectionUtils.isEmpty(decisionReqs)){
+            //处理日报数据
+            TXinyiDaily daily = this.xinyiDailyMapper.selectNewestData();
             for (DecisionReq decisionReq : decisionReqs) {
-                //处理日报数据
-                TXinyiDaily daily = this.xinyiDailyMapper.selectNewestData();
                 if(!Objects.isNull(daily)){
                     decisionReq.setT(daily.getJsSw());
                     decisionReq.setSVI(daily.getWntjzsAll());
                     decisionReq.setSV(daily.getWncjbAll());
                     decisionReq.setMlvss(daily.getHfxwnndAll());
+                    //2024年7月2日17:20:12  mlss和DO_O也要从日报获取
+                    decisionReq.setMlss(daily.getHycWnndAll());
+                    decisionReq.setDoO(daily.getHycRjyAll());
                     decisionReq.setDoAna(daily.getYycRjyAll());
                     decisionReq.setDoQue(daily.getQycRjyAll());
                     //2024年5月26日11:59:02 干污泥量数据做了同步

slibra-system/src/main/resources/mapper/business/TXinyiIndustryMapper.xml

@@ -465,30 +465,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.JS_PH pH,
             a.JS_SLQ qIn,
             b.JSSL_SJZ qInName,
-            '' continuity,
-            '' checkRise,
-            '' timeTips,
-            '' csContinuity,
             b.WNTJZS_GKZ sviCon,
             b.WNCJB_GKZ svCon,
-            a.HYC_WNND_ALL mlss,
-            '' mlvssWentai,
-            '' mlssWentai,
-            a.HYC_RJY_ALL doO,
-            '' doQueWentai,
-            '' doAnaWentai,
-            '' doOWentai,
-            '' btpWending,
-            '' jsTnWentai,
             a.CL_P04_YCZ clP04YCZ,
             ( a.JS_TP - a.CL_P04_YCZ )/ a.JS_TP tpLv,
-            '' tpLvContinuity,
             a.SJTYJLY tyjyl,
             a.CLJYSSLL cltjl,
             c.HYCXSY_ALL hycxsyAll,
             c.QYAN_ALL qyanAll,
             c.QYCKXSY_ALL qyckxsyAll,
-            '' gwnl,
             c.TP_RCC_JQR eccZl,
             c.HYZLSY_ALL hyzlsyAll
         FROM