Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-02-21 e23023b93f34286f5a807b0b85e9a0619a297ed7

 service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java

@@ -23,8 +23,11 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
import com.java110.dto.parking.ParkingAreaDto;
import com.java110.dto.workflow.WorkflowModelDto;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.community.IParkingAreaAttrInnerServiceSMO;
import com.java110.intf.community.IParkingAreaInnerServiceSMO;
import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
import com.java110.po.oaWorkflow.OaWorkflowPo;
@@ -32,10 +35,13 @@
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.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.List;

/**
 * 类表述：保存
@@ -63,11 +69,15 @@
    @Autowired
    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;

    @Autowired
    private IParkingAreaInnerServiceSMO parkingAreaInnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "typeName", "请求报文中未包含typeName");
        Assert.hasKeyAndValue(reqJson, "faceWay", "请求报文中未包含faceWay");
        Assert.hasKeyAndValue(reqJson, "carNumWay", "请求报文中未包含carNumWay");

        Assert.hasKeyAndValue(reqJson, "auditWay", "请求报文中未包含auditWay");
        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");

@@ -82,7 +92,7 @@
        oaWorkflowPo.setStoreId(storeId);
        oaWorkflowPo.setFlowId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_flowId));
        oaWorkflowPo.setFlowName(reqJson.getString("typeName")+"审批流程");
        oaWorkflowPo.setFlowType(OaWorkflowDto.FLOW_TYPE_ITEM_RELEASE);
        oaWorkflowPo.setFlowType(OaWorkflowDto.FLOW_TYPE_VISIT);

        //创建model
        WorkflowModelDto workflowModelDto = new WorkflowModelDto();
@@ -98,10 +108,21 @@
            throw new CmdException("保存数据失败");
        }



        VisitSettingPo visitSettingPo = BeanConvertUtil.covertBean(reqJson, VisitSettingPo.class);
        visitSettingPo.setSettingId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
        visitSettingPo.setFlowId(oaWorkflowPo.getFlowId());
        visitSettingPo.setFlowName(oaWorkflowPo.getFlowName());

        if(!StringUtil.isEmpty(visitSettingPo.getPaId())) {
            ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
            parkingAreaDto.setCommunityId(reqJson.getString("communityId"));
            parkingAreaDto.setPaId(reqJson.getString("paId"));
            List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
            Assert.listOnlyOne(parkingAreaDtos, "停车场不存在");
            visitSettingPo.setPaNum(parkingAreaDtos.get(0).getNum());
        }
        flag = visitSettingV1InnerServiceSMOImpl.saveVisitSetting(visitSettingPo);

        if (flag < 1) {