From 457cb730ea1ace70f36782358f330e2682636fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=AD=94=E4=BB=99=7E?=
 <13068499+willowhh@user.noreply.gitee.com>
Date: Thu, 19 Dec 2024 14:09:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E6=B0=B4=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NgInformationWaterUserController.java      |  1 +
 .../domain/NgInformationWaterIntake.java       |  2 +-
 .../domain/NgInformationWaterUser.java         |  2 --
 .../NgInformationWaterUserServiceImpl.java     | 18 +++++++++++++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgInformationWaterUserController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgInformationWaterUserController.java
index eeac9bb..178bb70 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgInformationWaterUserController.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgInformationWaterUserController.java
@@ -77,6 +77,7 @@ public class NgInformationWaterUserController extends BaseController
     @ApiOperation("新增用水户信息")
     public AjaxResult add(@RequestBody NgInformationWaterUser ngInformationWaterUser)
     {
+
         return toAjax(ngInformationWaterUserService.insertNgInformationWaterUser(ngInformationWaterUser));
     }
 
diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgInformationWaterIntake.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgInformationWaterIntake.java
index e023bf1..a99c288 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgInformationWaterIntake.java
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgInformationWaterIntake.java
@@ -73,7 +73,7 @@ private static final long serialVersionUID = 1L;
     /** 类型 */
             @Excel(name = "类型")
             @ApiModelProperty("类型")
-    private Long type;
+    private String type;
 
     /** 负责人 */
             @Excel(name = "负责人")
diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgInformationWaterUser.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgInformationWaterUser.java
index c25c50b..220f803 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgInformationWaterUser.java
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgInformationWaterUser.java
@@ -5,8 +5,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fastbee.common.annotation.Excel;
 import com.fastbee.common.core.domain.BaseEntity;
 
diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgInformationWaterUserServiceImpl.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgInformationWaterUserServiceImpl.java
index 5f82c4e..aa19c23 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgInformationWaterUserServiceImpl.java
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgInformationWaterUserServiceImpl.java
@@ -5,9 +5,13 @@ import com.fastbee.common.utils.DateUtils;
 import com.fastbee.rechargecard.domain.NgInformationWaterUser;
 import com.fastbee.rechargecard.mapper.NgInformationWaterUserMapper;
 import com.fastbee.rechargecard.service.INgInformationWaterUserService;
+import net.bytebuddy.utility.JavaConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
 import java.util.List;
 
 /**
@@ -55,7 +59,19 @@ public class NgInformationWaterUserServiceImpl implements INgInformationWaterUse
     @Override
     public int insertNgInformationWaterUser(NgInformationWaterUser ngInformationWaterUser)
     {
-        ngInformationWaterUser.setCreateTime(DateUtils.getNowDate());
+        BigDecimal waterConsumption = ngInformationWaterUser.getWaterConsumption();
+        BigDecimal waterConsumptionIndex = ngInformationWaterUser.getWaterConsumptionindex();
+        // 使用 divide 方法进行除法运算，并指定精度和舍入模式
+        BigDecimal ngInformationWater = waterConsumption.divide(waterConsumptionIndex, new MathContext(10, RoundingMode.HALF_UP));
+        BigDecimal green = new BigDecimal("0.9");
+        BigDecimal yellow = new BigDecimal("1.0");;
+        if (ngInformationWater.compareTo(green) < 0){
+            ngInformationWaterUser.setWarningStatus(1L);
+        } else if (ngInformationWater.compareTo(yellow)<0) {
+            ngInformationWaterUser.setWarningStatus(2L);
+        }else {
+            ngInformationWaterUser.setWarningStatus(3L);
+        }
         return ngInformationWaterUserMapper.insertNgInformationWaterUser(ngInformationWaterUser);
     }