完成运营业主信息 和业主详情显示处理

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);
+    }
+}

service-common/src/main/java/com/java110/common/cmd/machineTranslate/ListMachineTranslatesCmd.java

@@ -30,6 +30,7 @@ public class ListMachineTranslatesCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
+        super.validateProperty(context);
         Assert.jsonObjectHaveKey(reqJson,"communityId","请求报文中未包含小区信息");
     }
 

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());
+                }
+            }
+        }
+    }
+
+}

service-fee/src/main/java/com/java110/fee/cmd/receipt/ListAccountReceiptCmd.java

@@ -58,6 +58,7 @@ public class ListAccountReceiptCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        super.validateProperty(cmdDataFlowContext);
         Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区信息");
     }
 

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;
+
+
+/**
+ * 类表述：查询
+ * 服务编码：receipt.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
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释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);
+    }
+}