1.0.5修复风能利用率整数

electricity/wind/src/main/java/com/gyee/gaia/electricity/wind/controller/UserMarkController.java

@@ -86,6 +86,7 @@ public class UserMarkController {
         }
     }
 
+
     @GetMapping("/info")
     private R getInfo(@RequestParam(value = "station") String station,
                       @RequestParam(value = "windturbines", required = false) String windturbines,
@@ -117,12 +118,12 @@ public class UserMarkController {
     }
 
     @DeleteMapping("/{id}")
-    private R deleteInfo(@PathVariable String id) {
+    private R deleteInfo1(@PathVariable String id) {
         QueryWrapper<LossCapacityUserMark> lcumWrapper = new QueryWrapper<>();
         lcumWrapper.eq("id", id);
+        LossCapacityUserMark byId = lossCapacityUserMarkService.getById(id);
         boolean b = lossCapacityUserMarkService.removeById(id);
 
-        LossCapacityUserMark byId = lossCapacityUserMarkService.getById(id);
         String equipment = byId.getEquipment();
         //同时删除五损时间用户标记
         QueryWrapper<StateCause> scWrapper = new QueryWrapper<>();
@@ -138,7 +139,7 @@ public class UserMarkController {
         List<StateCause> scList = stateCauseService.list(scWrapper);
         scList = scList.stream().peek(sc -> sc.setUserFlag("")).collect(Collectors.toList());
         //更新user_flag
-        stateCauseService.saveBatch(scList);
+         stateCauseService.saveBatch(scList);
 
         calcEquipPowerGenDay.recalculationGeneratingCapacity(DateTime.of(byId.getStartTime()));
         if (b) {
@@ -147,4 +148,6 @@ public class UserMarkController {
             return R.error();
         }
     }
+
+
 }

electricity/wind/src/main/java/com/gyee/gaia/electricity/wind/serviceimpl/EquipPowerGenDayServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.gaia.electricity.wind.entity.EquipPowerGenDay;
-import com.gyee.gaia.electricity.wind.entity.R;
 import com.gyee.gaia.electricity.wind.init.CacheContext;
 import com.gyee.gaia.electricity.wind.iservice.IEquipPowerGenDayService;
 import com.gyee.gaia.electricity.wind.mapper.EquipPowerGenDayMapper;
@@ -94,7 +93,7 @@ public class EquipPowerGenDayServiceImpl extends ServiceImpl<EquipPowerGenDayMap
                     l.setTheoryGeneration(l.getGeneratingCapacity());
                 }
             }
-            l.setCategory(String.valueOf(l.getGeneratingCapacity().divide(l.getTheoryGeneration(),2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100))));
+            l.setCategory(String.valueOf(l.getGeneratingCapacity().divide(l.getTheoryGeneration(),4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100))));
         }).collect(Collectors.toList());
         return list;
     }