From b6184e2ddf3db37a94f7efb3b619bbc64642a292 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 27 一月 2026 18:12:48 +0800
Subject: [PATCH] Z四
---
service-fee/src/main/java/com/java110/fee/smo/impl/MeterWaterInnerServiceSMOImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/smo/impl/MeterWaterInnerServiceSMOImpl.java b/service-fee/src/main/java/com/java110/fee/smo/impl/MeterWaterInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index 6773bcb..03b58ab
--- a/service-fee/src/main/java/com/java110/fee/smo/impl/MeterWaterInnerServiceSMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/smo/impl/MeterWaterInnerServiceSMOImpl.java
@@ -2,19 +2,22 @@
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.fee.IMeterWaterInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.intf.fee.IMeterWaterInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
-import com.java110.dto.meterWater.MeterWaterDto;
+import com.java110.dto.meter.MeterWaterDto;
import com.java110.dto.user.UserDto;
import com.java110.fee.dao.IMeterWaterServiceDao;
+import com.java110.po.meter.MeterWaterPo;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @ClassName FloorInnerServiceSMOImpl
@@ -60,6 +63,25 @@
return meterWaters;
}
+
+ @Override
+ public List<MeterWaterPo> queryMeterWaters(@RequestBody MeterWaterPo meterWaterDto) {
+ List<MeterWaterPo> meterWaters = BeanConvertUtil.covertBeanList(meterWaterServiceDaoImpl.getMeterWaterInfo(BeanConvertUtil.beanCovertMap(meterWaterDto)), MeterWaterPo.class);
+
+ if (meterWaters == null || meterWaters.size() == 0) {
+ return meterWaters;
+ }
+
+ String[] userIds = getUserIdsToPo(meterWaters);
+ //鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
+ List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+
+ for (MeterWaterPo meterWater : meterWaters) {
+ refreshMeterWater(meterWater, users);
+ }
+ return meterWaters;
+ }
+
/**
* 浠庣敤鎴峰垪琛ㄤ腑鏌ヨ鐢ㄦ埛锛屽皢鐢ㄦ埛涓殑淇℃伅 鍒锋柊鍒� floor瀵硅薄涓�
*
@@ -67,6 +89,13 @@
* @param users 鐢ㄦ埛鍒楄〃
*/
private void refreshMeterWater(MeterWaterDto meterWater, List<UserDto> users) {
+ for (UserDto user : users) {
+ if (meterWater.getWaterId().equals(user.getUserId())) {
+ BeanConvertUtil.covertBean(user, meterWater);
+ }
+ }
+ }
+ private void refreshMeterWater(MeterWaterPo meterWater, List<UserDto> users) {
for (UserDto user : users) {
if (meterWater.getWaterId().equals(user.getUserId())) {
BeanConvertUtil.covertBean(user, meterWater);
@@ -88,12 +117,32 @@
return userIds.toArray(new String[userIds.size()]);
}
+ private String[] getUserIdsToPo(List<MeterWaterPo> meterWaters) {
+ List<String> userIds = new ArrayList<String>();
+ for (MeterWaterPo meterWater : meterWaters) {
+ userIds.add(meterWater.getWaterId());
+ }
+
+ return userIds.toArray(new String[userIds.size()]);
+ }
@Override
public int queryMeterWatersCount(@RequestBody MeterWaterDto meterWaterDto) {
return meterWaterServiceDaoImpl.queryMeterWatersCount(BeanConvertUtil.beanCovertMap(meterWaterDto));
}
+ @Override
+ public int saveMeterWaters(@RequestBody List<MeterWaterPo> meterWaterPos) {
+ List<Map> fees = new ArrayList<>();
+ for (MeterWaterPo payFeePo : meterWaterPos) {
+ fees.add(BeanConvertUtil.beanCovertMap(payFeePo));
+ }
+
+ Map info = new HashMap();
+ info.put("meterWaterPos", fees);
+ return meterWaterServiceDaoImpl.insertMeterWaters(info);
+ }
+
public IMeterWaterServiceDao getMeterWaterServiceDaoImpl() {
return meterWaterServiceDaoImpl;
}
--
Gitblit v1.8.0