From 146bd184f86648f21603d7d6698cdbe0a2df7cff Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 18 八月 2022 14:50:52 +0800
Subject: [PATCH] 优化报修，采购，缴费bug
---
service-community/src/main/java/com/java110/community/cmd/parkingSpace/QueryParkingSpacesCmd.java | 30 +++++++-----------------------
1 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/parkingSpace/QueryParkingSpacesCmd.java b/service-community/src/main/java/com/java110/community/cmd/parkingSpace/QueryParkingSpacesCmd.java
index 2d47d51..b51a67e 100644
--- a/service-community/src/main/java/com/java110/community/cmd/parkingSpace/QueryParkingSpacesCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/parkingSpace/QueryParkingSpacesCmd.java
@@ -23,8 +23,7 @@
import java.util.List;
@Java110Cmd(serviceCode = "parkingSpace.queryParkingSpaces")
-public class QueryParkingSpacesCmd extends Cmd {
-
+public class QueryParkingSpacesCmd extends Cmd {
@Autowired
private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
@@ -45,26 +44,20 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
//鏍规嵁杞︾墝鍙峰幓鏌ヨ 杞︿綅淇℃伅
if (reqJson.containsKey("carNum") && !StringUtil.isEmpty(reqJson.getString("carNum"))) {
-
queryParkingSpaceByCarNum(reqJson, cmdDataFlowContext);
return;
}
-
-
int row = reqJson.getInteger("row");
-
ApiParkingSpaceVo apiParkingSpaceVo = new ApiParkingSpaceVo();
-
+ ParkingSpaceDto parkingSpaceDto = BeanConvertUtil.covertBean(reqJson, ParkingSpaceDto.class);
//鏌ヨ鎬昏褰曟暟
- int total = parkingSpaceInnerServiceSMOImpl.queryParkingSpacesCount(BeanConvertUtil.covertBean(reqJson, ParkingSpaceDto.class));
+ int total = parkingSpaceInnerServiceSMOImpl.queryParkingSpacesCount(parkingSpaceDto);
apiParkingSpaceVo.setTotal(total);
if (total > 0) {
List<ParkingSpaceDto> parkingSpaceDtoList = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(BeanConvertUtil.covertBean(reqJson, ParkingSpaceDto.class));
apiParkingSpaceVo.setParkingSpaces(BeanConvertUtil.covertBeanList(parkingSpaceDtoList, ApiParkingSpaceDataVo.class));
}
-
apiParkingSpaceVo.setRecords((int) Math.ceil((double) total / (double) row));
-
ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiParkingSpaceVo), HttpStatus.OK);
cmdDataFlowContext.setResponseEntity(responseEntity);
}
@@ -72,45 +65,38 @@
/**
* 鏍规嵁杞︾墝鍙� 鏌ヨ 鍋滆溅浣�
*
- * @param reqJson 璇锋眰鎶ユ枃
+ * @param reqJson 璇锋眰鎶ユ枃
* @param cmdDataFlowContext 涓婄嚎鏂囧璞�
*/
private void queryParkingSpaceByCarNum(JSONObject reqJson, ICmdDataFlowContext cmdDataFlowContext) {
-
-
ApiParkingSpaceVo apiParkingSpaceVo = new ApiParkingSpaceVo();
-
int row = reqJson.getInteger("row");
//鏌ヨ鎬昏褰曟暟
OwnerCarDto ownerCarDto = BeanConvertUtil.covertBean(reqJson, OwnerCarDto.class);
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
apiParkingSpaceVo.setTotal(ownerCarDtos.size());
-
if (ownerCarDtos.size() > 0) {
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
parkingSpaceDto.setPsIds(getPsIds(ownerCarDtos));
List<ParkingSpaceDto> parkingSpaceDtoList = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
apiParkingSpaceVo.setParkingSpaces(BeanConvertUtil.covertBeanList(parkingSpaceDtoList, ApiParkingSpaceDataVo.class));
}
-
apiParkingSpaceVo.setRecords((int) Math.ceil((double) ownerCarDtos.size() / (double) row));
-
ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiParkingSpaceVo), HttpStatus.OK);
cmdDataFlowContext.setResponseEntity(responseEntity);
-
}
/**
* 鑾峰彇 鍋滆溅浣岻ds
+ *
* @param ownerCarDtos 涓氫富杞︿綅
* @return 鍋滆溅浣岻ds
*/
- private String[] getPsIds(List<OwnerCarDto> ownerCarDtos){
+ private String[] getPsIds(List<OwnerCarDto> ownerCarDtos) {
List<String> psIds = new ArrayList<String>();
- for (OwnerCarDto ownerCarDto : ownerCarDtos){
+ for (OwnerCarDto ownerCarDto : ownerCarDtos) {
psIds.add(ownerCarDto.getPsId());
}
-
return psIds.toArray(new String[psIds.size()]);
}
@@ -120,11 +106,9 @@
* @param reqJson 璇锋眰鏁版嵁瀵硅薄
*/
private void refreshReqJson(JSONObject reqJson) {
-
if (!reqJson.containsKey("state")) {
return;
}
-
if ("SH".equals(reqJson.getString("state"))) {
reqJson.put("states", new String[]{"S", "H"});
reqJson.remove("state");
--
Gitblit v1.8.0