java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml
@@ -271,7 +271,9 @@ WHERE 1 = 1 and t.status_cd = '0' and u.unit_id = #{unitId} and t.community_id = #{communityId} <if test="communityId !=null and communityId != ''"> and t.community_id= #{communityId} </if> order by CONVERT(t.layer, SIGNED), CONVERT(t.room_num, SIGNED) </select> service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
@@ -94,14 +94,10 @@ @Override public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) { Assert.jsonObjectHaveKey(reqJson, "communityId", "请求中未包含communityId信息"); super.validateProperty(cmdDataFlowContext); Assert.hasKeyAndValue(reqJson, "communityId", "请求中未包含communityId信息"); //Assert.jsonObjectHaveKey(reqJson, "floorId", "请求中未包含floorId信息"); Assert.jsonObjectHaveKey(reqJson, "page", "请求报文中未包含page节点"); Assert.jsonObjectHaveKey(reqJson, "row", "请求报文中未包含row节点"); Assert.isInteger(reqJson.getString("page"), "page不是数字"); Assert.isInteger(reqJson.getString("row"), "row不是数字"); Assert.hasLength(reqJson.getString("communityId"), "小区ID不能为空"); super.validatePageInfo(reqJson); int row = Integer.parseInt(reqJson.getString("row")); @@ -137,7 +133,7 @@ //todo 处理状态 String roomState = reqJson.getString("roomState"); if(!StringUtil.isEmpty(roomState)){ if (!StringUtil.isEmpty(roomState)) { roomDto.setStates(roomState.split(",")); } service-fee/src/main/java/com/java110/fee/cmd/fee/QueryAdminFeeDepositCmd.java
New file @@ -0,0 +1,53 @@ package com.java110.fee.cmd.fee; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.fee.FeeDetailDto; import com.java110.intf.fee.IPayFeeDetailV1InnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import java.text.ParseException; import java.util.ArrayList; import java.util.List; /** * 查询押金 */ @Java110Cmd(serviceCode = "fee.queryAdminFeeDeposit") public class QueryAdminFeeDepositCmd extends Cmd { @Autowired private IPayFeeDetailV1InnerServiceSMO feeDetailV1InnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { super.validatePageInfo(reqJson); super.validateAdmin(context); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { FeeDetailDto feeDetailDto = BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class); int total = feeDetailV1InnerServiceSMOImpl.queryFeeDepositCount(feeDetailDto); List<FeeDetailDto> feeDetailDtos = null; if (total > 0) { feeDetailDtos = feeDetailV1InnerServiceSMOImpl.queryFeeDeposit(BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class)); } else { feeDetailDtos = new ArrayList<>(); } int row = reqJson.getInteger("row"); ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) total / (double) row), total, feeDetailDtos); context.setResponseEntity(responseEntity); } } service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDepositCmd.java
@@ -31,6 +31,7 @@ @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { super.validatePageInfo(reqJson); super.validateProperty(context); Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区"); } service-fee/src/main/java/com/java110/fee/cmd/oweFeeCallable/ListAdminOweFeeCallableCmd.java
New file @@ -0,0 +1,83 @@ /* * Copyright 2017-2020 吴学文 and java110 team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.fee.cmd.oweFeeCallable; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.oweFeeCallable.OweFeeCallableDto; import com.java110.intf.fee.IOweFeeCallableV1InnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import java.util.ArrayList; import java.util.List; /** * 类表述:查询 * 服务编码:oweFeeCallable.listOweFeeCallable * 请求路劲:/app/oweFeeCallable.ListOweFeeCallable * add by 吴学文 at 2023-08-17 15:05:16 mail: 928255095@qq.com * open source address: https://gitee.com/wuxw7/MicroCommunity * 官网:http://www.homecommunity.cn * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行 */ @Java110Cmd(serviceCode = "oweFeeCallable.listAdminOweFeeCallable") public class ListAdminOweFeeCallableCmd extends Cmd { private static Logger logger = LoggerFactory.getLogger(ListAdminOweFeeCallableCmd.class); @Autowired private IOweFeeCallableV1InnerServiceSMO oweFeeCallableV1InnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) { super.validatePageInfo(reqJson); super.validateAdmin(cmdDataFlowContext); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException { OweFeeCallableDto oweFeeCallableDto = BeanConvertUtil.covertBean(reqJson, OweFeeCallableDto.class); int count = oweFeeCallableV1InnerServiceSMOImpl.queryOweFeeCallablesCount(oweFeeCallableDto); List<OweFeeCallableDto> oweFeeCallableDtos = null; if (count > 0) { oweFeeCallableDtos = oweFeeCallableV1InnerServiceSMOImpl.queryOweFeeCallables(oweFeeCallableDto); } else { oweFeeCallableDtos = new ArrayList<>(); } ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, oweFeeCallableDtos); ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK); cmdDataFlowContext.setResponseEntity(responseEntity); } } service-fee/src/main/java/com/java110/fee/cmd/oweFeeCallable/ListOweFeeCallableCmd.java
@@ -58,6 +58,7 @@ @Override public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) { super.validatePageInfo(reqJson); super.validateProperty(cmdDataFlowContext); Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId"); } service-report/src/main/java/com/java110/report/cmd/room/QueryAdminRoomsTreeCmd.java
New file @@ -0,0 +1,55 @@ package com.java110.report.cmd.room; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.room.RoomDto; import com.java110.intf.report.IReportCommunityInnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.ListUtil; import com.java110.vo.api.ApiRoomDataVo; import com.java110.vo.api.ApiRoomVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import java.util.List; @Java110Cmd(serviceCode = "room.queryAdminRoomsTree") public class QueryAdminRoomsTreeCmd extends Cmd { @Autowired private IReportCommunityInnerServiceSMO reportCommunityInnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) { Assert.jsonObjectHaveKey(reqJson, "unitId", "请求中未包含单元信息"); super.validatePageInfo(reqJson); super.validateAdmin(cmdDataFlowContext); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException { RoomDto roomDto = BeanConvertUtil.covertBean(reqJson, RoomDto.class); ApiRoomVo apiRoomVo = new ApiRoomVo(); List<RoomDto> roomDtoList = null; roomDtoList = reportCommunityInnerServiceSMOImpl.queryRoomsTree(roomDto); apiRoomVo.setTotal(0); if (ListUtil.isNotNull(roomDtoList)) { apiRoomVo.setTotal(roomDtoList.size()); } apiRoomVo.setRooms(BeanConvertUtil.covertBeanList(roomDtoList, ApiRoomDataVo.class)); int row = reqJson.getInteger("row"); apiRoomVo.setRecords((int) Math.ceil((double) apiRoomVo.getTotal() / (double) row)); ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiRoomVo), HttpStatus.OK); cmdDataFlowContext.setResponseEntity(responseEntity); } } service-report/src/main/java/com/java110/report/cmd/room/QueryRoomsTreeCmd.java
@@ -34,6 +34,7 @@ Assert.isInteger(reqJson.getString("page"), "page不是数字"); Assert.isInteger(reqJson.getString("row"), "row不是数字"); Assert.hasLength(reqJson.getString("communityId"), "小区ID不能为空"); super.validateProperty(cmdDataFlowContext); } @Override