二沉池固体负荷计算调整 日报填写接口允许匿名访问

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

@@ -124,7 +124,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/login", "/register", "/captchaImage","/sendSmsCode/*","/smsLogin","/test/**", "/demo/**").permitAll()
                 .antMatchers("/websocket/**").permitAll()//websocket的
 //                .antMatchers("/front/**","/grpc/**").permitAll()//临时测试的
-                .antMatchers("/qiniuyun/**", "/out/**").permitAll()//文件上传相关
+                .antMatchers("/qiniuyun/**", "/out/**", "/business/daily").permitAll()//文件上传相关 外部接口等
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

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

@@ -476,15 +476,17 @@ public class AsyncTask {
         BigDecimal avgMlvss = null;
         if(!Objects.isNull(oneMlvss) && !Objects.isNull(twoMlvss))
             avgMlvss = ((oneMlvss.add(twoMlvss)).divide(new BigDecimal(2),4, RoundingMode.HALF_UP));
+        BigDecimal oneMlss = tXinyiDaily.getShcHyOneMlss();
+        BigDecimal twoMlss = tXinyiDaily.getShcHyTwoMlss();
+        BigDecimal avgMlss = null;
+        if(!Objects.isNull(oneMlss) && !Objects.isNull(twoMlss))
+            avgMlss = ((oneMlss.add(twoMlss)).divide(new BigDecimal(NUMBER_2),NUMBER_SCALE_4, RoundingMode.HALF_UP));
+
+        //工业库的指标
         BigDecimal jsTn = tXinyiIndustry.getJsTn();
         BigDecimal jsTp = tXinyiIndustry.getJsTp();
         BigDecimal jsCod = tXinyiIndustry.getJsCod();
         BigDecimal jsSlq = tXinyiIndustry.getJsSlq();
-        BigDecimal oneMlss = tXinyiIndustry.getOneMlss();
-        BigDecimal twoMlss = tXinyiIndustry.getTwoMlss();
-        BigDecimal avgMlss = null;
-        if(!Objects.isNull(oneMlss) && !Objects.isNull(twoMlss))
-            avgMlss = ((oneMlss.add(twoMlss)).divide(new BigDecimal(NUMBER_2),NUMBER_SCALE_4, RoundingMode.HALF_UP));
         //计算
         if(!Objects.isNull(jsBod5)){
             if(!Objects.isNull(jsTn) && jsTn.compareTo(BigDecimal.ZERO) > 0)
@@ -514,7 +516,8 @@ public class AsyncTask {
             tXinyiCalculate.setCccdcHrt(CCCDCHRT_LAST.divide(jsSlq, NUMBER_SCALE_4, RoundingMode.HALF_UP));
             tXinyiCalculate.setEccBmfh(jsSlq.divide(ECCBMFH_LAST, NUMBER_SCALE_4, RoundingMode.HALF_UP));
             tXinyiCalculate.setEccHrt(ECCHRT_LAST.divide(jsSlq, NUMBER_SCALE_4, RoundingMode.HALF_UP));
-            tXinyiCalculate.setEccGtfh((new BigDecimal(1).add(whlR)).multiply(jsSlq).multiply(new BigDecimal(NUMBER_24)).multiply(avgMlss).divide(ECCGTFH_LAST, NUMBER_SCALE_4, RoundingMode.HALF_UP));
+            //2024年7月1日17:16:16 计算逻辑调整
+            tXinyiCalculate.setEccGtfh((new BigDecimal(1).add(whlR.divide(BigDecimal_100, NUMBER_SCALE_4, RoundingMode.HALF_UP))).multiply(jsSlq).multiply(new BigDecimal(NUMBER_24)).multiply(avgMlss).divide(ECCGTFH_LAST, NUMBER_SCALE_4, RoundingMode.HALF_UP));
             tXinyiCalculate.setClsnJcsj(CLSNJCSJ_LAST.divide(jsSlq, NUMBER_SCALE_4, RoundingMode.HALF_UP));
             tXinyiCalculate.setXgcdcQsqSsls(jsSlq.multiply(XGCDCQSQSSLS_LAST));
             //2024年6月29日15:18:01 增加几个新的计算指标