From 074bcb8394fab66ce531c219e1e7de7c142ff2d5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 29 五月 2026 11:07:10 +0800
Subject: [PATCH] 新增智能电表、空调管理
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwElectricalServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwElectricalServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwElectricalServiceImpl.java
index 911f9ce..da8d93c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwElectricalServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwElectricalServiceImpl.java
@@ -37,6 +37,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.doumee.core.model.LoginUserInfo;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -360,7 +361,6 @@
model.setName(door.getDescription());
model.setCId(door.getCid());
model.setDId(door.getId());
- model.setAccountStatus(Constants.TWO);
model.setPriceid(door.getPriceid());
model.setParamId(door.getParam_id());
model.setDeviceType(door.getDevice_type());
@@ -370,9 +370,23 @@
model.setType(door.getType());
model.setRelayStatus(door.getRelay_state());
model.setCsq(door.getCsq());
+ model.setAccountStatus(resolveAccountStatusByPurchaseCount(door.getCount()));
model.setRemark(JSONObject.toJSONString(device));
return model;
}
+
+ /** 璐拱娆℃暟澶т簬 0 瑙嗕负宸插紑鎴� */
+ private Integer resolveAccountStatusByPurchaseCount(String purchaseCount) {
+ if (StringUtils.isBlank(purchaseCount)) {
+ return Constants.ZERO;
+ }
+ try {
+ return new BigDecimal(purchaseCount.trim()).compareTo(BigDecimal.ZERO) > 0
+ ? Constants.ONE : Constants.ZERO;
+ } catch (NumberFormatException e) {
+ return Constants.ZERO;
+ }
+ }
private MeterInfoResponse getDeviceByid(String indexCode, List<MeterInfoResponse> allHkList ) {
if(allHkList!=null && allHkList.size()>0){
for(MeterInfoResponse info : allHkList){
--
Gitblit v1.9.3