修正

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerDisplayServiceImpl.java

@@ -4,13 +4,11 @@ import com.ruoyi.system.mapper.PowerDisplayMapper;
 import com.ruoyi.system.model.power.dao.PowerClassificationQueryDao;
 import com.ruoyi.system.model.power.dto.PowerDisplayDto;
 import com.ruoyi.system.service.PowerDisplayService;
-import org.springframework.beans.BeanUtils;
+import com.ruoyi.system.service.impl.saveOnTheLargeScreenPower.LinXi;
+import com.ruoyi.system.service.impl.saveOnTheLargeScreenPower.SaveOnTheLargeScreenImpl;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 2024/7/30
@@ -27,32 +25,11 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
     public void peek(List<PowerDisplayDto> powerDisplayDtoList) {
         String mindId = powerDisplayDtoList.get(0).getMindId();
         List<PowerClassificationQueryDao> dao = powerDisplayMapper.selectClassificationToMid(mindId);
-        List<PowerDisplayDto> list = new ArrayList<>();
-        for (PowerDisplayDto powerDisplayDto : powerDisplayDtoList) {
-            List<PowerClassificationQueryDao> collect = dao.parallelStream()
-                    .filter(a -> a.getClassificationName().equals(powerDisplayDto.getClassificationName()))
-                    .collect(Collectors.toList());
-            if (collect.size() != 0) {
-                for (PowerClassificationQueryDao queryDao : collect) {
-                    PowerDisplayDto dto = new PowerDisplayDto();
-                    BeanUtils.copyProperties(powerDisplayDto, dto);
-                    dto.setLevelOneClassification(queryDao.getLevelOneClassification());
-                    dto.setLevelTwoClassification(queryDao.getLevelTwoClassification());
-                    list.add(dto);
-                }
-            } else {
-                powerDisplayDto.setLevelOneClassification("其他");
-                list.add(powerDisplayDto);
-            }
+        SaveOnTheLargeScreenImpl saveOnTheLargeScreen = null;
+        if (mindId.equals("011704")) {
+            saveOnTheLargeScreen = new SaveOnTheLargeScreenImpl(new LinXi());
         }
-        list.parallelStream()
-                .forEach(v -> {
-                    v.setElectricityTip(v.getElectricityPriceTip() == null || "".equals(v.getElectricityPriceTip()) ? null : new BigDecimal(v.getPowerTip() == null || v.getPowerTip().equals("") ? "0" : v.getPowerTip()).multiply(new BigDecimal(v.getElectricityPriceTip())) + "");
-                    v.setElectricityPeak(v.getElectricityPricePeak() == null || "".equals(v.getElectricityPricePeak()) ? null : new BigDecimal(v.getPowerPeak() == null || v.getPowerPeak().equals("") ? "0" : v.getPowerPeak()).multiply(new BigDecimal(v.getElectricityPricePeak())) + "");
-                    v.setElectricityFlat(v.getElectricityPriceFlat() == null || "".equals(v.getElectricityPriceFlat()) ? null : new BigDecimal(v.getPowerFlat() == null || v.getPowerFlat().equals("") ? "0" : v.getPowerFlat()).multiply(new BigDecimal(v.getElectricityPriceFlat())) + "");
-                    v.setElectricityValley(v.getElectricityPriceValley() == null || "".equals(v.getElectricityPriceValley()) ? null : new BigDecimal(v.getPowerValley() == null || v.getPowerValley().equals("") ? "0" : v.getPowerValley()).multiply(new BigDecimal(v.getElectricityPriceValley())) + "");
-                    v.setElectricityTotal(new BigDecimal(v.getElectricityTip() == null || v.getElectricityTip().equals("") ? "0" : v.getElectricityTip()).add(new BigDecimal(v.getElectricityPeak() == null || v.getElectricityPeak().equals("") ? "0" : v.getElectricityPeak())).add(new BigDecimal(v.getElectricityFlat() == null || v.getElectricityFlat().equals("") ? "0" : v.getElectricityFlat())).add(new BigDecimal(v.getElectricityValley() == null || v.getElectricityValley().equals("") ? "0" : v.getElectricityValley())) + "");
-                });
+        List<PowerDisplayDto> list = saveOnTheLargeScreen.save(mindId, powerDisplayDtoList, dao);
         powerDisplayMapper.insert(list);
     }
 }

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerVoucherConversionServiceImpl.java

@@ -8,7 +8,6 @@ import com.ruoyi.system.service.PowerVoucherConversionService;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/saveOnTheLargeScreenPower/LinXi.java

+package com.ruoyi.system.service.impl.saveOnTheLargeScreenPower;
+
+import com.ruoyi.system.model.power.dao.PowerClassificationQueryDao;
+import com.ruoyi.system.model.power.dto.PowerDisplayDto;
+import org.springframework.beans.BeanUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 2024/8/5
+ */
+public class LinXi implements SaveOnTheLargeScreen {
+    @Override
+    public List<PowerDisplayDto> save(String mindId, List<PowerDisplayDto> powerDisplayDtoList, List<PowerClassificationQueryDao> dao) {
+        List<PowerDisplayDto> list = new ArrayList<>();
+        for (PowerDisplayDto powerDisplayDto : powerDisplayDtoList) {
+            List<PowerClassificationQueryDao> collect = dao.parallelStream()
+                    .filter(a -> a.getClassificationName().equals(powerDisplayDto.getClassificationName()))
+                    .collect(Collectors.toList());
+            if (collect.size() != 0) {
+                for (PowerClassificationQueryDao queryDao : collect) {
+                    PowerDisplayDto dto = new PowerDisplayDto();
+                    BeanUtils.copyProperties(powerDisplayDto, dto);
+                    dto.setLevelOneClassification(queryDao.getLevelOneClassification());
+                    dto.setLevelTwoClassification(queryDao.getLevelTwoClassification());
+                    list.add(dto);
+                }
+            } else {
+                powerDisplayDto.setLevelOneClassification("其他");
+                list.add(powerDisplayDto);
+            }
+        }
+        list.parallelStream()
+                .forEach(v -> {
+                    v.setElectricityTip(v.getElectricityPriceTip() == null || "".equals(v.getElectricityPriceTip()) ? null : new BigDecimal(v.getPowerTip() == null || v.getPowerTip().equals("") ? "0" : v.getPowerTip()).multiply(new BigDecimal(v.getElectricityPriceTip())) + "");
+                    v.setElectricityPeak(v.getElectricityPricePeak() == null || "".equals(v.getElectricityPricePeak()) ? null : new BigDecimal(v.getPowerPeak() == null || v.getPowerPeak().equals("") ? "0" : v.getPowerPeak()).multiply(new BigDecimal(v.getElectricityPricePeak())) + "");
+                    v.setElectricityFlat(v.getElectricityPriceFlat() == null || "".equals(v.getElectricityPriceFlat()) ? null : new BigDecimal(v.getPowerFlat() == null || v.getPowerFlat().equals("") ? "0" : v.getPowerFlat()).multiply(new BigDecimal(v.getElectricityPriceFlat())) + "");
+                    v.setElectricityValley(v.getElectricityPriceValley() == null || "".equals(v.getElectricityPriceValley()) ? null : new BigDecimal(v.getPowerValley() == null || v.getPowerValley().equals("") ? "0" : v.getPowerValley()).multiply(new BigDecimal(v.getElectricityPriceValley())) + "");
+                    v.setElectricityTotal(new BigDecimal(v.getElectricityTip() == null || v.getElectricityTip().equals("") ? "0" : v.getElectricityTip()).add(new BigDecimal(v.getElectricityPeak() == null || v.getElectricityPeak().equals("") ? "0" : v.getElectricityPeak())).add(new BigDecimal(v.getElectricityFlat() == null || v.getElectricityFlat().equals("") ? "0" : v.getElectricityFlat())).add(new BigDecimal(v.getElectricityValley() == null || v.getElectricityValley().equals("") ? "0" : v.getElectricityValley())) + "");
+                });
+        return list;
+    }
+}

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/saveOnTheLargeScreenPower/SaveOnTheLargeScreen.java

+package com.ruoyi.system.service.impl.saveOnTheLargeScreenPower;
+
+import com.ruoyi.system.model.power.dao.PowerClassificationQueryDao;
+import com.ruoyi.system.model.power.dto.PowerDisplayDto;
+
+import java.util.List;
+
+/**
+ * 2024/8/5
+ * 大屏保存接口
+ */
+public interface SaveOnTheLargeScreen {
+    List<PowerDisplayDto> save(String mindId, List<PowerDisplayDto> powerDisplayDtoList, List<PowerClassificationQueryDao> dao);
+}

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/saveOnTheLargeScreenPower/SaveOnTheLargeScreenImpl.java

+package com.ruoyi.system.service.impl.saveOnTheLargeScreenPower;
+
+import com.ruoyi.system.model.power.dao.PowerClassificationQueryDao;
+import com.ruoyi.system.model.power.dto.PowerDisplayDto;
+
+import java.util.List;
+
+/**
+ * 2024/8/5
+ */
+public class SaveOnTheLargeScreenImpl {
+    private SaveOnTheLargeScreen saveOnTheLargeScreen;
+
+    public SaveOnTheLargeScreenImpl(SaveOnTheLargeScreen saveOnTheLargeScreen) {
+        this.saveOnTheLargeScreen = saveOnTheLargeScreen;
+    }
+
+    public List<PowerDisplayDto> save(String mindId, List<PowerDisplayDto> powerDisplayDtoList, List<PowerClassificationQueryDao> dao) {
+        return saveOnTheLargeScreen.save(mindId, powerDisplayDtoList, dao);
+    }
+}