From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/meterWater/ListMeterWaterCmd.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/meterWater/ListMeterWaterCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/meterWater/ListMeterWaterCmd.java
index 0df8282..072031f 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/meterWater/ListMeterWaterCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/meterWater/ListMeterWaterCmd.java
@@ -18,18 +18,15 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.RoomDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IMeterWaterInnerServiceSMO;
import com.java110.intf.fee.IMeterWaterV1InnerServiceSMO;
-import com.java110.po.meterWater.MeterWaterPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -37,13 +34,14 @@
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import com.java110.dto.meterWater.MeterWaterDto;
+
import java.util.List;
import java.util.ArrayList;
+
import org.springframework.http.ResponseEntity;
import org.springframework.http.HttpStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* 绫昏〃杩帮細鏌ヨ
@@ -58,7 +56,8 @@
@Java110Cmd(serviceCode = "meterWater.listMeterWaters")
public class ListMeterWaterCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(ListMeterWaterCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(ListMeterWaterCmd.class);
+
@Autowired
private IMeterWaterV1InnerServiceSMO meterWaterV1InnerServiceSMOImpl;
@@ -79,7 +78,6 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-
MeterWaterDto meterWaterDto = BeanConvertUtil.covertBean(reqJson, MeterWaterDto.class);
ResultVo resultVo = null;
if (!freshFeeDtoParam(meterWaterDto, reqJson)) {
@@ -126,7 +124,7 @@
}
if (MeterWaterDto.PAYER_OBJ_TYPE_ROOM.equals(meterWaterDto.getObjType())) {
- String[] nums = roomNum.split("-");
+ String[] nums = roomNum.split("-", 3);
if (nums.length != 3) {
return false;
}
@@ -143,7 +141,7 @@
meterWaterDto.setObjId(roomDtos.get(0).getRoomId());
} else {
- String[] nums = roomNum.split("-");
+ String[] nums = roomNum.split("-", 2);
if (nums.length != 2) {
return false;
}
--
Gitblit v1.8.0