1、优化访客登记2、优化第三方协议上报问题

java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java

@@ -15,8 +15,8 @@ import java.util.List;
  **/
 public class MachineDto extends PageDto implements Serializable {
 
-    public static final String MACHINE_TYPE_CAR = "9996";
-    public static final String MACHINE_TYPE_CAR_THIRD = "9995";
+    public static final String MACHINE_TYPE_CAR = "9996";//自有道闸设备道闸
+    public static final String MACHINE_TYPE_CAR_THIRD = "9995";//第三方道闸平台
     public static final String MACHINE_TYPE_ACCESS_CONTROL = "9999";
     public static final String MACHINE_STATE_ON = "1200";
     public static final String MACHINE_STATE_OFF = "1300";

java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java

@@ -3,7 +3,6 @@ package com.java110.dto.visit;
 import com.java110.dto.PageDto;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @ClassName FloorDto
@@ -29,6 +28,9 @@ public class VisitDto extends PageDto implements Serializable {
     private String visitStartTime;
     private String visitEndTime;
     private String statusCd = "0";
+    private String carNum;
+    private String entourage;
+    private String reasonType;
 
     public String getvName() {
         return vName;
@@ -70,7 +72,6 @@ public class VisitDto extends PageDto implements Serializable {
         this.vId = vId;
     }
 
-
     public String getPhoneNumber() {
         return phoneNumber;
     }
@@ -142,4 +143,28 @@ public class VisitDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getCarNum() {
+        return carNum;
+    }
+
+    public void setCarNum(String carNum) {
+        this.carNum = carNum;
+    }
+
+    public String getEntourage() {
+        return entourage;
+    }
+
+    public void setEntourage(String entourage) {
+        this.entourage = entourage;
+    }
+
+    public String getReasonType() {
+        return reasonType;
+    }
+
+    public void setReasonType(String reasonType) {
+        this.reasonType = reasonType;
+    }
 }

java110-bean/src/main/java/com/java110/po/owner/VisitPo.java

@@ -22,6 +22,9 @@ public class VisitPo implements Serializable {
     private String visitTime;
     private String departureTime;
     private String statusCd;
+    private String carNum;
+    private String entourage;
+    private String reasonType;
 
     public String getvId() {
         return vId;
@@ -110,4 +113,28 @@ public class VisitPo implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getCarNum() {
+        return carNum;
+    }
+
+    public void setCarNum(String carNum) {
+        this.carNum = carNum;
+    }
+
+    public String getEntourage() {
+        return entourage;
+    }
+
+    public void setEntourage(String entourage) {
+        this.entourage = entourage;
+    }
+
+    public String getReasonType() {
+        return reasonType;
+    }
+
+    public void setReasonType(String reasonType) {
+        this.reasonType = reasonType;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/visit/ApiVisitDataVo.java

@@ -1,7 +1,6 @@
 package com.java110.vo.api.visit;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class ApiVisitDataVo implements Serializable {
     private String vId;
@@ -16,6 +15,9 @@ public class ApiVisitDataVo implements Serializable {
     private String departureTime;
     private String createTime;
     private String statusCd = "0";
+    private String carNum;
+    private String entourage;
+    private String reasonType;
 
     public String getvId() {
         return vId;
@@ -112,4 +114,28 @@ public class ApiVisitDataVo implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getCarNum() {
+        return carNum;
+    }
+
+    public void setCarNum(String carNum) {
+        this.carNum = carNum;
+    }
+
+    public String getEntourage() {
+        return entourage;
+    }
+
+    public void setEntourage(String entourage) {
+        this.entourage = entourage;
+    }
+
+    public String getReasonType() {
+        return reasonType;
+    }
+
+    public void setReasonType(String reasonType) {
+        this.reasonType = reasonType;
+    }
 }

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

@@ -6,9 +6,9 @@
     <!-- 保存访客信息信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessVisitInfo" parameterType="Map">
         insert into business_visit_info(departure_time, v_name, visit_gender, owner_id, user_id, v_id, phone_number,
-                                        operate, visit_case, community_id, b_id, visit_time)
+                                        operate, visit_case, community_id, b_id, visit_time, car_num, entourage, reason_type)
         values (#{departureTime}, #{vName}, #{visitGender}, #{ownerId}, #{userId}, #{vId}, #{phoneNumber}, #{operate},
-                #{visitCase}, #{communityId}, #{bId}, #{visitTime})
+                #{visitCase}, #{communityId}, #{bId}, #{visitTime}, #{carNum}, #{entourage}, #{reasonType})
     </insert>
 
     <!-- 查询访客信息信息（Business） add by wuxw 2018-07-03 -->
@@ -16,7 +16,7 @@
         select t.departure_time,t.departure_time departureTime,t.v_name,t.v_name vName,t.visit_gender,t.visit_gender
         visitGender,t.owner_id,t.owner_id ownerId,t.user_id,t.user_id userId,t.v_id,t.v_id vId,t.visit_time,t.visit_time
         visitTime,t.phone_number,t.phone_number phoneNumber,t.operate,t.visit_case,t.visit_case
-        visitCase,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
+        visitCase,t.community_id,t.community_id communityId,t.b_id,t.b_id ,t.car_num,t.car_num carNum,t.entourage,t.reason_type,t.reason_type reasonType
         from business_visit_info t
         where 1 =1
         <if test="departureTime !=null ">
@@ -49,6 +49,15 @@
         <if test="visitCase !=null and visitCase != ''">
             and t.visit_case= #{visitCase}
         </if>
+        <if test="carNum !=null and carNum != ''">
+            and t.car_num= #{carNum}
+        </if>
+        <if test="entourage !=null and entourage != ''">
+            and t.entourage= #{entourage}
+        </if>
+        <if test="reasonType !=null and reasonType != ''">
+            and t.reason_type= #{reasonType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -60,9 +69,10 @@
     <!-- 保存访客信息信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveVisitInfoInstance" parameterType="Map">
         insert into s_visit_info(
-        departure_time,v_name,status_cd,visit_gender,owner_id,user_id,v_id,visit_time,phone_number,visit_case,community_id,b_id
+        departure_time,v_name,status_cd,visit_gender,owner_id,user_id,v_id,visit_time,phone_number,visit_case,community_id,b_id,car_num,entourage,reason_type
         ) select
-        t.departure_time,t.v_name,'0',t.visit_gender,t.owner_id,t.user_id,t.v_id,t.visit_time,t.phone_number,t.visit_case,t.community_id,t.b_id
+        t.departure_time,t.v_name,'0',t.visit_gender,t.owner_id,t.user_id,t.v_id,t.visit_time,t.phone_number,t.visit_case,t.community_id,t.b_id,
+        t.car_num,t.entourage,t.reason_type
         from business_visit_info t where 1=1
         <if test="departureTime !=null ">
             and t.departure_time= #{departureTime}
@@ -88,6 +98,15 @@
         <if test="phoneNumber !=null and phoneNumber != ''">
             and t.phone_number= #{phoneNumber}
         </if>
+        <if test="carNum !=null and carNum != ''">
+            and t.car_num= #{carNum}
+        </if>
+        <if test="entourage !=null and entourage != ''">
+            and t.entourage= #{entourage}
+        </if>
+        <if test="reasonType !=null and reasonType != ''">
+            and t.reason_type= #{reasonType}
+        </if>
         and t.operate= 'ADD'
         <if test="visitCase !=null and visitCase != ''">
             and t.visit_case= #{visitCase}
@@ -105,7 +124,8 @@
         select t.departure_time,t.departure_time departureTime,t.v_name,t.v_name vName,t.status_cd,t.status_cd
         statusCd,t.visit_gender,t.visit_gender visitGender,t.owner_id,t.owner_id ownerId,t.user_id,t.user_id
         userId,t.v_id,t.v_id vId,t.visit_time,t.visit_time visitTime,t.phone_number,t.phone_number
-        phoneNumber,t.visit_case,t.visit_case visitCase,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
+        phoneNumber,t.visit_case,t.visit_case visitCase,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
+        t.car_num,t.car_num carNum,t.entourage,t.reason_type,t.reason_type reasonType
         from s_visit_info t
         where 1 =1
         <if test="departureTime !=null ">
@@ -150,6 +170,15 @@
         <if test="visitEndTime !=null and visitEndTime !='' ">
             and t.visit_time &lt;= #{visitEndTime}
         </if>
+        <if test="carNum !=null and carNum != ''">
+            and t.car_num= #{carNum}
+        </if>
+        <if test="entourage !=null and entourage != ''">
+            and t.entourage= #{entourage}
+        </if>
+        <if test="reasonType !=null and reasonType != ''">
+            and t.reason_type= #{reasonType}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -189,6 +218,15 @@
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
+        <if test="carNum !=null and carNum != ''">
+            , t.car_num= #{carNum}
+        </if>
+        <if test="entourage !=null and entourage != ''">
+            , t.entourage= #{entourage}
+        </if>
+        <if test="reasonType !=null and reasonType != ''">
+            , t.reason_type= #{reasonType}
+        </if>
         where 1=1
         <if test="vId !=null and vId != ''">
             and t.v_id= #{vId}
@@ -245,6 +283,15 @@
         <if test="visitEndTime !=null and visitEndTime !='' ">
             and t.visit_time &lt;= #{visitEndTime}
         </if>
+        <if test="carNum !=null and carNum != ''">
+            and t.car_num= #{carNum}
+        </if>
+        <if test="entourage !=null and entourage != ''">
+            and t.entourage= #{entourage}
+        </if>
+        <if test="reasonType !=null and reasonType != ''">
+            and t.reason_type= #{reasonType}
+        </if>
     </select>
 
 </mapper>

service-api/src/main/java/com/java110/api/bmo/parkingSpace/impl/ParkingSpaceBMOImpl.java

@@ -1,5 +1,6 @@
 package com.java110.api.bmo.parkingSpace.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.parkingSpace.IParkingSpaceBMO;
@@ -12,9 +13,11 @@ import com.java110.dto.parking.ParkingSpaceDto;
 import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
 import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.IOwnerCarAttrInnerServiceSMO;
 import com.java110.po.car.OwnerCarPo;
 import com.java110.po.fee.PayFeeDetailPo;
 import com.java110.po.fee.PayFeePo;
+import com.java110.po.ownerCarAttr.OwnerCarAttrPo;
 import com.java110.po.parking.ParkingSpacePo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.CommonConstant;
@@ -51,6 +54,9 @@ public class ParkingSpaceBMOImpl extends ApiBaseBMO implements IParkingSpaceBMO
     @Autowired
     private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
 
+    @Autowired
+    IOwnerCarAttrInnerServiceSMO ownerCarAttrInnerServiceSMOImpl;
+
     /**
      * 添加小区楼信息
      *
@@ -230,6 +236,23 @@ public class ParkingSpaceBMOImpl extends ApiBaseBMO implements IParkingSpaceBMO
         if (!paramInJson.containsKey("carTypeCd") || StringUtil.isEmpty(paramInJson.getString("carTypeCd"))) {
             ownerCarPo.setCarTypeCd(OwnerCarDto.CAR_TYPE_PRIMARY);
         }
+        //添加车辆属性
+        OwnerCarAttrPo ownerCarAttrPo = new OwnerCarAttrPo();
+        ownerCarAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_cartId));
+        ownerCarAttrPo.setCarId(ownerCarPo.getCarId());
+        ownerCarAttrPo.setCommunityId(ownerCarPo.getCommunityId());
+        String carAttrs = paramInJson.getString("carAttrs");
+        if (StringUtil.isEmpty(carAttrs)) {
+            throw new IllegalArgumentException("属性值为空");
+        }
+        JSONArray jsonArray = JSONArray.parseArray(carAttrs);
+        String specCd = "";
+        if (jsonArray.size() > 0) {
+            specCd = jsonArray.getJSONObject(0).getString("specCd");
+        }
+        ownerCarAttrPo.setSpecCd(specCd);
+        ownerCarAttrPo.setValue(paramInJson.getString("value"));
+        ownerCarAttrInnerServiceSMOImpl.saveOwnerCarAttr(ownerCarAttrPo);
         super.insert(dataFlowContext, ownerCarPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_CAR);
     }
 

service-api/src/main/java/com/java110/api/bmo/visit/impl/VisitBMOImpl.java

@@ -6,7 +6,6 @@ import com.java110.api.bmo.visit.IVisitBMO;
 import com.java110.core.context.DataFlowContext;
 import com.java110.po.owner.VisitPo;
 import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.stereotype.Service;
 

service-api/src/main/java/com/java110/api/listener/owner/SaveOwnerCarListener.java

@@ -1,31 +1,25 @@
 package com.java110.api.listener.owner;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.parkingSpace.IParkingSpaceBMO;
 import com.java110.api.listener.AbstractServiceApiPlusListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
 import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
 import com.java110.intf.user.IOwnerCarAttrInnerServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
-import com.java110.po.ownerCarAttr.OwnerCarAttrPo;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.exception.ListenerExecuteException;
 import com.java110.utils.util.Assert;
-import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 
-import java.util.List;
 
 /**
  * @ClassName SaveParkingSpaceListener
@@ -115,9 +109,6 @@ public class SaveOwnerCarListener extends AbstractServiceApiPlusListener {
             throw new IllegalArgumentException("车辆已存在");
         }
 
-        /*OwnerCarAttrPo ownerCarAttrPo = new OwnerCarAttrPo();
-        ownerCarAttrPo.setAttrId("");
-        ownerCarAttrInnerServiceSMOImpl.saveOwnerCarAttr(ownerCarAttrPo);*/
     }
 
     @Override
@@ -125,30 +116,6 @@ public class SaveOwnerCarListener extends AbstractServiceApiPlusListener {
         //添加小区楼
         parkingSpaceBMOImpl.sellParkingSpace(reqJson, context);
         parkingSpaceBMOImpl.modifySellParkingSpaceState(reqJson, context);
-        commit(context);
-        OwnerCarDto ownerCarDto = new OwnerCarDto();
-        ownerCarDto.setOwnerId(reqJson.getString("ownerId"));
-        ownerCarDto.setCarNum(reqJson.getString("carNum"));
-        //查询业主车辆
-        List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
-        Assert.listOnlyOne(ownerCarDtos, "查询业主车辆错误");
-        OwnerCarAttrPo ownerCarAttrPo = new OwnerCarAttrPo();
-        ownerCarAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_cartId));
-        ownerCarAttrPo.setCarId(ownerCarDtos.get(0).getCarId());
-        ownerCarAttrPo.setCommunityId(reqJson.getString("communityId"));
-        //获取属性值
-        String carAttrs = reqJson.getString("carAttrs");
-        if (StringUtil.isEmpty(carAttrs)) {
-            throw new IllegalArgumentException("属性值为空");
-        }
-        JSONArray jsonArray = JSONArray.parseArray(carAttrs);
-        String specCd = "";
-        if (jsonArray.size() > 0) {
-            specCd = jsonArray.getJSONObject(0).getString("specCd");
-        }
-        ownerCarAttrPo.setSpecCd(specCd);
-        ownerCarAttrPo.setValue(reqJson.getString("value"));
-        ownerCarAttrInnerServiceSMOImpl.saveOwnerCarAttr(ownerCarAttrPo);
     }
 
 

service-api/src/main/java/com/java110/api/listener/visit/SaveVisitListener.java

@@ -28,7 +28,6 @@ public class SaveVisitListener extends AbstractServiceApiPlusListener {
     @Autowired
     private IVisitBMO visitBMOImpl;
 
-
     @Autowired
     private IFileInnerServiceSMO fileInnerServiceSMOImpl;
 

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

@@ -123,7 +123,6 @@ public class MachineUploadCarLogCmd extends AbstractServiceCmdListener {
         MachineDto machineDto = new MachineDto();
         machineDto.setMachineCode(reqJson.getString("machineCode"));
         machineDto.setCommunityId(reqJson.getString("communityId"));
-        machineDto.setMachineTypeCd(MachineDto.MACHINE_TYPE_CAR);
         List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
 
         Assert.listOnlyOne(machineDtos, "设备不存在");

service-community/src/main/java/com/java110/community/listener/visit/AbstractVisitBusinessServiceDataFlowListener.java

@@ -19,8 +19,8 @@ import java.util.Map;
  * Created by wuxw on 2018/7/4.
  */
 public abstract class AbstractVisitBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener {
-    private static Logger logger = LoggerFactory.getLogger(AbstractVisitBusinessServiceDataFlowListener.class);
 
+    private static Logger logger = LoggerFactory.getLogger(AbstractVisitBusinessServiceDataFlowListener.class);
 
     /**
      * 获取 DAO工具类
@@ -48,6 +48,8 @@ public abstract class AbstractVisitBusinessServiceDataFlowListener extends Abstr
         businessVisitInfo.put("operate", businessVisitInfo.get("operate"));
         businessVisitInfo.put("visitCase", businessVisitInfo.get("visit_case"));
         businessVisitInfo.put("communityId", businessVisitInfo.get("community_id"));
+        businessVisitInfo.put("carNum", businessVisitInfo.get("car_num"));
+        businessVisitInfo.put("entourage", businessVisitInfo.get("entourage"));
         businessVisitInfo.remove("bId");
         businessVisitInfo.put("statusCd", statusCd);
     }
@@ -83,7 +85,8 @@ public abstract class AbstractVisitBusinessServiceDataFlowListener extends Abstr
         currentVisitInfo.put("operate", currentVisitInfo.get("operate"));
         currentVisitInfo.put("visitCase", currentVisitInfo.get("visit_case"));
         currentVisitInfo.put("communityId", currentVisitInfo.get("community_id"));
-
+        currentVisitInfo.put("carNum", currentVisitInfo.get("car_num"));
+        currentVisitInfo.put("entourage", currentVisitInfo.get("entourage"));
 
         currentVisitInfo.put("operate", StatusConstant.OPERATE_DEL);
         getVisitServiceDaoImpl().saveBusinessVisitInfo(currentVisitInfo);
@@ -95,5 +98,4 @@ public abstract class AbstractVisitBusinessServiceDataFlowListener extends Abstr
         }
     }
 
-
 }