访客设置加入停车场功能

java110-bean/src/main/java/com/java110/dto/visitSetting/VisitSettingDto.java

@@ -16,6 +16,9 @@ import java.util.Date;
  **/
 public class VisitSettingDto extends OaWorkflowDto implements Serializable {
 
+    public static final String AUDIT_WAY_YES = "Y";
+    public static final String AUDIT_WAY_NO = "N";
+
     private String carNumWay;
     private String faceWay;
     private String typeName;
@@ -32,6 +35,11 @@ public class VisitSettingDto extends OaWorkflowDto implements Serializable {
     private String statusCd = "0";
 
 
+    private String paId;
+
+    private String paNum;
+
+
     public String getCarNumWay() {
         return carNumWay;
     }
@@ -120,4 +128,20 @@ public class VisitSettingDto extends OaWorkflowDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPaId() {
+        return paId;
+    }
+
+    public void setPaId(String paId) {
+        this.paId = paId;
+    }
+
+    public String getPaNum() {
+        return paNum;
+    }
+
+    public void setPaNum(String paNum) {
+        this.paNum = paNum;
+    }
 }

java110-bean/src/main/java/com/java110/po/visitSetting/VisitSettingPo.java

@@ -17,6 +17,7 @@ package com.java110.po.visitSetting;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2023-01-18 14:43:29 mail: 928255095@qq.com
@@ -28,76 +29,112 @@ import java.util.Date;
 public class VisitSettingPo implements Serializable {
 
     private String carNumWay;
-private String faceWay;
-private String typeName;
-private String auditWay;
-private String remark;
-private String statusCd = "0";
-private String communityId;
-private String flowId;
-private String flowName;
-private String settingId;
-public String getCarNumWay() {
+    private String faceWay;
+    private String typeName;
+    private String auditWay;
+    private String remark;
+    private String statusCd = "0";
+    private String communityId;
+    private String flowId;
+    private String flowName;
+    private String settingId;
+
+    private String paId;
+    private String paNum;
+
+    public String getCarNumWay() {
         return carNumWay;
     }
-public void setCarNumWay(String carNumWay) {
+
+    public void setCarNumWay(String carNumWay) {
         this.carNumWay = carNumWay;
     }
-public String getFaceWay() {
+
+    public String getFaceWay() {
         return faceWay;
     }
-public void setFaceWay(String faceWay) {
+
+    public void setFaceWay(String faceWay) {
         this.faceWay = faceWay;
     }
-public String getTypeName() {
+
+    public String getTypeName() {
         return typeName;
     }
-public void setTypeName(String typeName) {
+
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
-public String getAuditWay() {
+
+    public String getAuditWay() {
         return auditWay;
     }
-public void setAuditWay(String auditWay) {
+
+    public void setAuditWay(String auditWay) {
         this.auditWay = auditWay;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getFlowId() {
+
+    public String getFlowId() {
         return flowId;
     }
-public void setFlowId(String flowId) {
+
+    public void setFlowId(String flowId) {
         this.flowId = flowId;
     }
-public String getFlowName() {
+
+    public String getFlowName() {
         return flowName;
     }
-public void setFlowName(String flowName) {
+
+    public void setFlowName(String flowName) {
         this.flowName = flowName;
     }
-public String getSettingId() {
+
+    public String getSettingId() {
         return settingId;
     }
-public void setSettingId(String settingId) {
+
+    public void setSettingId(String settingId) {
         this.settingId = settingId;
     }
 
+    public String getPaId() {
+        return paId;
+    }
+
+    public void setPaId(String paId) {
+        this.paId = paId;
+    }
 
+    public String getPaNum() {
+        return paNum;
+    }
 
+    public void setPaNum(String paNum) {
+        this.paNum = paNum;
+    }
 }

java110-db/src/main/resources/mapper/community/VisitSettingV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存访客设置信息 add by wuxw 2018-07-03 -->
     <insert id="saveVisitSettingInfo" parameterType="Map">
         insert into visit_setting(
-        car_num_way,face_way,type_name,audit_way,remark,community_id,flow_id,flow_name,setting_id
+        car_num_way,face_way,type_name,audit_way,remark,community_id,flow_id,flow_name,setting_id,pa_id,pa_num
         ) values (
-        #{carNumWay},#{faceWay},#{typeName},#{auditWay},#{remark},#{communityId},#{flowId},#{flowName},#{settingId}
+        #{carNumWay},#{faceWay},#{typeName},#{auditWay},#{remark},#{communityId},#{flowId},#{flowName},#{settingId},#{paId},#{paNum}
         )
     </insert>
 
@@ -19,8 +19,8 @@
     <select id="getVisitSettingInfo" parameterType="Map" resultType="Map">
         select t.car_num_way,t.car_num_way carNumWay,t.face_way,t.face_way faceWay,t.type_name,t.type_name
         typeName,t.audit_way,t.audit_way auditWay,t.remark,t.status_cd,t.status_cd
-        statusCd,t.community_id,t.community_id communityId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name
-        flowName,t.setting_id,t.setting_id settingId
+        statusCd,t.community_id,t.community_id communityId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name,
+        flowName,t.setting_id,t.setting_id settingId,t.pa_id paId, t.pa_num paNum
         from visit_setting t
         where 1 =1
         <if test="carNumWay !=null and carNumWay != ''">
@@ -91,6 +91,12 @@
         <if test="flowName !=null and flowName != ''">
             , t.flow_name= #{flowName}
         </if>
+        <if test="paId !=null and paId != ''">
+            , t.pa_id= #{paId}
+        </if>
+        <if test="paNum !=null and paNum != ''">
+            , t.pa_num= #{paNum}
+        </if>
         where 1=1
         <if test="settingId !=null and settingId != ''">
             and t.setting_id= #{settingId}

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

@@ -13,10 +13,12 @@ import com.java110.dto.file.FileDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.parking.ParkingSpaceDto;
 import com.java110.dto.visit.VisitDto;
+import com.java110.dto.visitSetting.VisitSettingDto;
 import com.java110.intf.common.IFileInnerServiceSMO;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
 import com.java110.intf.community.IVisitInnerServiceSMO;
+import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
 import com.java110.intf.community.IVisitV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerCarAttrInnerServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
@@ -65,6 +67,9 @@ public class SaveVisitCmd extends Cmd {
     @Autowired
     private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
 
+    @Autowired
+    private IVisitSettingV1InnerServiceSMO visitSettingV1InnerServiceSMOImpl;
+
 
     //键
     public static final String IS_NEED_REVIEW = "IS_NEED_REVIEW";
@@ -106,7 +111,15 @@ public class SaveVisitCmd extends Cmd {
         photoSMOImpl.savePhoto(reqJson, reqJson.getString("vId"), reqJson.getString("communityId"));
 
         // 是否需要审核
-        hasAuditVisit(visitPo,reqJson);
+        if(hasAuditVisit(visitPo,reqJson)){
+            return; // 需要审核结束，审核时处理 相应 送图片 和车牌数据
+        }
+
+
+
+
+
+
 
     }
 
@@ -115,8 +128,23 @@ public class SaveVisitCmd extends Cmd {
      * @param visitPo
      * @param reqJson
      */
-    private void hasAuditVisit(VisitPo visitPo, JSONObject reqJson) {
+    private boolean hasAuditVisit(VisitPo visitPo, JSONObject reqJson) {
+
+
+        VisitSettingDto visitSettingDto = new VisitSettingDto();
+        visitSettingDto.setCommunityId(reqJson.getString("communityId"));
+        List<VisitSettingDto> visitSettingDtos = visitSettingV1InnerServiceSMOImpl.queryVisitSettings(visitSettingDto);
+
+        if(visitSettingDtos == null || visitSettingDtos.size()< 1){
+            return false;
+        }
+
+        // 需要审核
+        if(VisitSettingDto.AUDIT_WAY_YES.equals(visitSettingDtos.get(0).getAuditWay())){
+            return false;
+        }
 
+        return true;
 
     }
 

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

@@ -23,8 +23,11 @@ import com.java110.core.event.cmd.Cmd;
 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;
@@ -37,6 +40,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * 类表述：保存
  * 服务编码：visitSetting.saveVisitSetting
@@ -63,11 +68,15 @@ public class SaveVisitSettingCmd extends Cmd {
     @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, "paId", "请求报文中未包含paId");
         Assert.hasKeyAndValue(reqJson, "auditWay", "请求报文中未包含auditWay");
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
 
@@ -98,10 +107,17 @@ public class SaveVisitSettingCmd extends Cmd {
             throw new CmdException("保存数据失败");
         }
 
+        ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
+        parkingAreaDto.setCommunityId(reqJson.getString("communityId"));
+        parkingAreaDto.setPaId(reqJson.getString("paId"));
+        List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
+        Assert.listOnlyOne(parkingAreaDtos,"停车场不存在");
+
         VisitSettingPo visitSettingPo = BeanConvertUtil.covertBean(reqJson, VisitSettingPo.class);
         visitSettingPo.setSettingId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         visitSettingPo.setFlowId(oaWorkflowPo.getFlowId());
         visitSettingPo.setFlowName(oaWorkflowPo.getFlowName());
+        visitSettingPo.setPaNum(parkingAreaDtos.get(0).getNum());
         flag = visitSettingV1InnerServiceSMOImpl.saveVisitSetting(visitSettingPo);
 
         if (flag < 1) {

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

@@ -21,6 +21,8 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.parking.ParkingAreaDto;
+import com.java110.intf.community.IParkingAreaInnerServiceSMO;
 import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
 import com.java110.po.visitSetting.VisitSettingPo;
 import com.java110.utils.exception.CmdException;
@@ -31,6 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 
 /**
  * 类表述：更新
@@ -51,6 +55,10 @@ public class UpdateVisitSettingCmd extends Cmd {
     @Autowired
     private IVisitSettingV1InnerServiceSMO visitSettingV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IParkingAreaInnerServiceSMO parkingAreaInnerServiceSMOImpl;
+
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "settingId", "settingId不能为空");
@@ -63,6 +71,16 @@ public class UpdateVisitSettingCmd extends Cmd {
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
         VisitSettingPo visitSettingPo = BeanConvertUtil.covertBean(reqJson, VisitSettingPo.class);
+
+        if(reqJson.containsKey("paId")){
+            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());
+        }
+
         int flag = visitSettingV1InnerServiceSMOImpl.updateVisitSetting(visitSettingPo);
 
         if (flag < 1) {