From bfd206a0b2b269762a246cdee7b941e559aa6e54 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Tue, 23 Jan 2024 09:32:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/utils/DateTimeHelper.java     |  2 +-
 .../sgzb/common/core/utils/StringHelper.java  |  3 ++-
 .../sgzb/largeScreen/util/CommonUtil.java     | 26 ++++++++++++++-----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java
index 3c0d1165..1072d27e 100644
--- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java
+++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java
@@ -562,7 +562,7 @@ public class DateTimeHelper {
             long hours = time / 60 / 1000;
             return hours;
         } catch (Exception e) {
-            return 0l;
+            return 0L;
         }
     }
 
diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/StringHelper.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/StringHelper.java
index 9313b2c2..d7152f16 100644
--- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/StringHelper.java
+++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/StringHelper.java
@@ -189,8 +189,9 @@ public class StringHelper {
 	public static String decode(String bytes) {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream(bytes.length() / 2);
 		// 将每2位16进制整数组装成一个字节
-		for (int i = 0; i < bytes.length(); i += 2)
+		for (int i = 0; i < bytes.length(); i += 2){
 			baos.write((hexString.indexOf(bytes.charAt(i)) << 4 | hexString.indexOf(bytes.charAt(i + 1))));
+		}
 		return new String(baos.toByteArray());
 	}
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java
index 73d6f2f7..9f3d3733 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java
@@ -49,7 +49,9 @@ public class CommonUtil {
      * @date 2023/12/14 18:54
      */
     public Integer totalValue(List<Map<String, String>> list, String maType) {
-        if (CollectionUtils.isEmpty(list) || StringUtils.isEmpty(maType)) return 0;
+        if (CollectionUtils.isEmpty(list) || StringUtils.isEmpty(maType)) {
+            return 0;
+        }
         BigDecimal value = new BigDecimal(new Double(0).toString());
         for (int i = 0; i < list.size(); i++) {
             Map<String, String> map = list.get(i);
@@ -113,7 +115,7 @@ public class CommonUtil {
         BigDecimal jjValue = new BigDecimal(new Double(0).toString());
         BigDecimal tsValue = new BigDecimal(new Double(0).toString());
         for (int i = 0; i < list.size(); i++) {
-            if(Objects.isNull(list.get(i))){
+            if (Objects.isNull(list.get(i))) {
                 continue;
             }
             if (Objects.equals(list.get(i).getCompanyName(), CommonConstants.JJ)) {
@@ -246,7 +248,9 @@ public class CommonUtil {
      * @date 2023/12/15 19:21
      */
     public Integer setZKData(List<ScrapAnalysisVo> list) {
-        if (CollectionUtils.isEmpty(list)) return 0;
+        if (CollectionUtils.isEmpty(list)) {
+            return 0;
+        }
         BigDecimal totalValue = new BigDecimal(new Double(0).toString());
         for (int i = 0; i < list.size(); i++) {
             ScrapAnalysisVo vo = list.get(i);
@@ -265,7 +269,9 @@ public class CommonUtil {
      * @date 2023/12/16 13:20
      */
     public Integer setDRKData(List<ScrapAnalysisVo> list) {
-        if (CollectionUtils.isEmpty(list)) return 0;
+        if (CollectionUtils.isEmpty(list)) {
+            return 0;
+        }
         BigDecimal finalValue = new BigDecimal(new Double(0).toString());
         BigDecimal totalValue = new BigDecimal(new Double(0).toString());
         BigDecimal totalValue2 = new BigDecimal(new Double(0).toString());
@@ -289,7 +295,9 @@ public class CommonUtil {
      * @date 2023/12/16 14:01
      */
     public Integer setUSEData(List<ScrapAnalysisVo> list) {
-        if (CollectionUtils.isEmpty(list)) return 0;
+        if (CollectionUtils.isEmpty(list)) {
+            return 0;
+        }
         BigDecimal finalValue = new BigDecimal(new Double(0).toString());
         BigDecimal totalValue = new BigDecimal(new Double(0).toString());
         BigDecimal totalValue2 = new BigDecimal(new Double(0).toString());
@@ -316,7 +324,9 @@ public class CommonUtil {
      * @date 2023/12/16 14:07
      */
     public Integer setZXData(List<ScrapAnalysisVo> list) {
-        if (CollectionUtils.isEmpty(list)) return 0;
+        if (CollectionUtils.isEmpty(list)){
+            return 0;
+        }
         /*维修总量/维修合格数量/维修报废数量/待维修数量*/
         BigDecimal repairValue = new BigDecimal(new Double(0).toString());
         BigDecimal repairedValue = new BigDecimal(new Double(0).toString());
@@ -344,7 +354,9 @@ public class CommonUtil {
      * @date 2023/12/16 14:22
      */
     public Integer setBFData(List<ScrapAnalysisVo> list) {
-        if (CollectionUtils.isEmpty(list)) return 0;
+        if (CollectionUtils.isEmpty(list)){
+            return 0;
+        }
         BigDecimal totalValue = new BigDecimal(new Double(0).toString());
         for (int i = 0; i < list.size(); i++) {
             ScrapAnalysisVo vo = list.get(i);