From 1dca0b72ef9731bda8b1c55fc2b577fbdf0bce9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 02 三月 2025 00:23:14 +0800
Subject: [PATCH] 完成运营业主信息 和业主详情显示处理
---
service-fee/src/main/java/com/java110/fee/cmd/receipt/ListAccountReceiptCmd.java | 1
service-common/src/main/java/com/java110/common/cmd/machineTranslate/ListMachineTranslatesCmd.java | 1
service-common/src/main/java/com/java110/common/cmd/machineTranslate/ListAdminMachineTranslatesCmd.java | 60 ++++++++++
service-community/src/main/java/com/java110/community/cmd/visit/ListAdminVisitsCmd.java | 155 +++++++++++++++++++++++++
service-fee/src/main/java/com/java110/fee/cmd/receipt/ListAdminAccountReceiptCmd.java | 88 ++++++++++++++
5 files changed, 305 insertions(+), 0 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machineTranslate/ListAdminMachineTranslatesCmd.java b/service-common/src/main/java/com/java110/common/cmd/machineTranslate/ListAdminMachineTranslatesCmd.java
new file mode 100644
index 0000000..7555765
--- /dev/null
+++ b/service-common/src/main/java/com/java110/common/cmd/machineTranslate/ListAdminMachineTranslatesCmd.java
@@ -0,0 +1,60 @@
+package com.java110.common.cmd.machineTranslate;
+
+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.machine.MachineTranslateDto;
+import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.api.machineTranslate.ApiMachineTranslateDataVo;
+import com.java110.vo.api.machineTranslate.ApiMachineTranslateVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Java110Cmd(serviceCode = "machineTranslate.listAdminMachineTranslates")
+public class ListAdminMachineTranslatesCmd extends Cmd {
+
+ @Autowired
+ private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;
+
+
+ @Override
+ public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ super.validatePageInfo(reqJson);
+ super.validateAdmin(context);
+ }
+
+ @Override
+ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+ MachineTranslateDto machineTranslateDto = BeanConvertUtil.covertBean(reqJson, MachineTranslateDto.class);
+
+ int count = machineTranslateInnerServiceSMOImpl.queryMachineTranslatesCount(machineTranslateDto);
+
+ List<ApiMachineTranslateDataVo> machineTranslates = null;
+
+ if (count > 0) {
+ machineTranslates = BeanConvertUtil.covertBeanList(machineTranslateInnerServiceSMOImpl.queryMachineTranslates(machineTranslateDto), ApiMachineTranslateDataVo.class);
+ } else {
+ machineTranslates = new ArrayList<>();
+ }
+
+ ApiMachineTranslateVo apiMachineTranslateVo = new ApiMachineTranslateVo();
+
+ apiMachineTranslateVo.setTotal(count);
+ apiMachineTranslateVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
+ apiMachineTranslateVo.setMachineTranslates(machineTranslates);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiMachineTranslateVo), HttpStatus.OK);
+
+ context.setResponseEntity(responseEntity);
+ }
+}
diff --git a/service-common/src/main/java/com/java110/common/cmd/machineTranslate/ListMachineTranslatesCmd.java b/service-common/src/main/java/com/java110/common/cmd/machineTranslate/ListMachineTranslatesCmd.java
index c18f4cc..c369407 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machineTranslate/ListMachineTranslatesCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machineTranslate/ListMachineTranslatesCmd.java
@@ -30,6 +30,7 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
super.validatePageInfo(reqJson);
+ super.validateProperty(context);
Assert.jsonObjectHaveKey(reqJson,"communityId","璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
}
diff --git a/service-community/src/main/java/com/java110/community/cmd/visit/ListAdminVisitsCmd.java b/service-community/src/main/java/com/java110/community/cmd/visit/ListAdminVisitsCmd.java
new file mode 100644
index 0000000..c9592dc
--- /dev/null
+++ b/service-community/src/main/java/com/java110/community/cmd/visit/ListAdminVisitsCmd.java
@@ -0,0 +1,155 @@
+package com.java110.community.cmd.visit;
+
+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.doc.annotation.*;
+import com.java110.dto.file.FileRelDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.visit.VisitDto;
+import com.java110.dto.visit.VisitSettingDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
+import com.java110.intf.community.IVisitV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
+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.utils.util.StringUtil;
+import com.java110.vo.api.visit.ApiVisitDataVo;
+import com.java110.vo.api.visit.ApiVisitVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Java110Cmd(serviceCode = "visit.listAdminVisits")
+public class ListAdminVisitsCmd extends Cmd {
+
+ @Autowired
+ private IVisitV1InnerServiceSMO visitV1InnerServiceSMO;
+
+ @Autowired
+ private IVisitSettingV1InnerServiceSMO visitSettingV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
+
+ //閿�
+ public static final String CAR_FREE_TIME = "CAR_FREE_TIME";
+
+ //閿�
+ public static final String VISIT_NUMBER = "VISIT_NUMBER";
+
+ @Override
+ public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ super.validatePageInfo(reqJson);
+ super.validateAdmin(context);
+ }
+
+ @Override
+ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>("", HttpStatus.OK);
+
+
+ VisitDto visitDto = BeanConvertUtil.covertBean(reqJson, VisitDto.class);
+ visitDto.setPhoneNumber(reqJson.getString("ownerTel"));
+
+ int count = visitV1InnerServiceSMO.queryVisitsCount(visitDto);
+ String visitorCode = "";
+
+ List<ApiVisitDataVo> visits = new ArrayList<>();
+ if (count > 0) {
+ List<VisitDto> visitDtos = visitV1InnerServiceSMO.queryVisits(visitDto);
+ for (VisitDto visit : visitDtos) {
+ ApiVisitDataVo apiVisitDataVo = BeanConvertUtil.covertBean(visit, ApiVisitDataVo.class);
+ apiVisitDataVo.setVisitorCode(visitorCode);
+ if (!StringUtil.isEmpty(visit.getFileSaveName())) {
+ apiVisitDataVo.setUrl(visit.getFileSaveName());
+ }
+ visits.add(apiVisitDataVo);
+ }
+ } else {
+ visits = new ArrayList<>();
+ }
+
+ //鍒峰叆娴佺▼ID
+ refreshOwners(visits, reqJson);
+ // 鍒峰叆浜鸿劯
+ refreshPhoto(visits, reqJson);
+ ApiVisitVo apiVisitVo = new ApiVisitVo();
+ apiVisitVo.setTotal(count);
+ apiVisitVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
+ apiVisitVo.setVisits(visits);
+ responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiVisitVo), HttpStatus.OK);
+
+ context.setResponseEntity(responseEntity);
+ }
+
+ private void refreshOwners(List<ApiVisitDataVo> visits, JSONObject reqJson) {
+ if (ListUtil.isNull(visits)) {
+ return;
+ }
+ List<String> ownerIds = new ArrayList<>();
+ for (ApiVisitDataVo apiVisitDataVo : visits) {
+ ownerIds.add(apiVisitDataVo.getOwnerId());
+ }
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setOwnerIds(ownerIds.toArray(new String[ownerIds.size()]));
+ ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
+ ownerDto.setCommunityId(reqJson.getString("communityId"));
+ List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
+
+ for (ApiVisitDataVo apiVisitDataVo : visits) {
+ for (OwnerDto tmpOwnerDto : ownerDtos) {
+ if (StringUtil.isEmpty(apiVisitDataVo.getOwnerId())) {
+ continue;
+ }
+ if (!apiVisitDataVo.getOwnerId().equals(tmpOwnerDto.getOwnerId())) {
+ continue;
+ }
+ apiVisitDataVo.setOwnerName(tmpOwnerDto.getName());
+ apiVisitDataVo.setOwnerTel(tmpOwnerDto.getLink());
+ }
+ }
+ }
+
+ private void refreshPhoto(List<ApiVisitDataVo> visits, JSONObject reqJson) {
+ List<String> vIds = new ArrayList<>();
+ for (ApiVisitDataVo apiVisitDataVo : visits) {
+ vIds.add(apiVisitDataVo.getvId());
+ }
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjIds(vIds.toArray(new String[vIds.size()]));
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+ if (fileRelDtos == null || fileRelDtos.size() < 1) {
+ return;
+ }
+ String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
+ for (ApiVisitDataVo apiVisitDataVo : visits) {
+ for (FileRelDto tmpFileRelDto : fileRelDtos) {
+ if (!apiVisitDataVo.getvId().equals(tmpFileRelDto.getObjId())) {
+ continue;
+ }
+ if (tmpFileRelDto.getFileSaveName().startsWith("http")) {
+ apiVisitDataVo.setUrl(tmpFileRelDto.getFileSaveName());
+ } else {
+ apiVisitDataVo.setUrl(imgUrl + tmpFileRelDto.getFileSaveName());
+ }
+ }
+ }
+ }
+
+}
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/receipt/ListAccountReceiptCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/receipt/ListAccountReceiptCmd.java
index 0cd4e0f..54b1427 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/receipt/ListAccountReceiptCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/receipt/ListAccountReceiptCmd.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", "鏈寘鍚皬鍖轰俊鎭�");
}
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/receipt/ListAdminAccountReceiptCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/receipt/ListAdminAccountReceiptCmd.java
new file mode 100644
index 0000000..1ea767b
--- /dev/null
+++ b/service-fee/src/main/java/com/java110/fee/cmd/receipt/ListAdminAccountReceiptCmd.java
@@ -0,0 +1,88 @@
+/*
+ * 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.receipt;
+
+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.account.AccountReceiptDto;
+import com.java110.intf.fee.IAccountReceiptV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
+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;
+
+
+/**
+ * 绫昏〃杩帮細鏌ヨ
+ * 鏈嶅姟缂栫爜锛歳eceipt.listAdminAccountReceipt
+ * 璇锋眰璺姴锛�/app/receipt.listAdminAccountReceipt
+ * add by 鍚村鏂� at 2023-04-13 01:28:30 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 瀹樼綉锛歨ttp://www.homecommunity.cn
+ * 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
+ * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
+ */
+@Java110Cmd(serviceCode = "receipt.listAdminAccountReceipt")
+public class ListAdminAccountReceiptCmd extends Cmd {
+
+ private static Logger logger = LoggerFactory.getLogger(ListAdminAccountReceiptCmd.class);
+ @Autowired
+ private IAccountReceiptV1InnerServiceSMO accountReceiptV1InnerServiceSMOImpl;
+
+ @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 {
+
+ AccountReceiptDto accountReceiptDto = BeanConvertUtil.covertBean(reqJson, AccountReceiptDto.class);
+
+ if (reqJson.containsKey("arIds") && !StringUtil.isEmpty(reqJson.getString("arIds"))) {
+ accountReceiptDto.setArIds(reqJson.getString("arIds").split(","));
+ }
+
+ int count = accountReceiptV1InnerServiceSMOImpl.queryAccountReceiptsCount(accountReceiptDto);
+
+ List<AccountReceiptDto> accountReceiptDtos = null;
+
+ if (count > 0) {
+ accountReceiptDtos = accountReceiptV1InnerServiceSMOImpl.queryAccountReceipts(accountReceiptDto);
+ } else {
+ accountReceiptDtos = new ArrayList<>();
+ }
+
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, accountReceiptDtos);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+ cmdDataFlowContext.setResponseEntity(responseEntity);
+ }
+}
--
Gitblit v1.8.0