完善 访客

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -440,12 +440,12 @@ public class HKOpenApi {
     
     /**
      * 未预约登记
-     * @param visitorName
-     * @param phoneNo
-     * @param personNum
-     * @param startTime
-     * @param endTime
-     * @param personId
+     * @param visitorName 访客姓名
+     * @param phoneNo 联系电话
+     * @param personNum 来访人数
+     * @param startTime 来访时间
+     * @param endTime 离开时间
+     * @param personId 被访人ID
      * @return
      */
     public static String temporaryRegister(String visitorName, String phoneNo,Integer personNum,Long startTime,Long endTime,Integer personId){

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/VistorController.java

@@ -46,7 +46,7 @@ public class VistorController extends BaseController {
 
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        vistorServiceI.insertTaVistor(taVisitor, communityId, userId);
+        responseBean = vistorServiceI.insertTaVistor(taVisitor, communityId, userId);
         return  responseBean;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaVisitor.java

@@ -16,7 +16,7 @@ public class TaVisitor {
 
     private Date visitorStatrtTime;
 
-    private Integer visitorEndTime;
+    private Date visitorEndTime;
 
     private String drivingStatus;
 
@@ -84,11 +84,11 @@ public class TaVisitor {
         this.visitorStatrtTime = visitorStatrtTime;
     }
 
-    public Integer getVisitorEndTime() {
+    public Date getVisitorEndTime() {
         return visitorEndTime;
     }
 
-    public void setVisitorEndTime(Integer visitorEndTime) {
+    public void setVisitorEndTime(Date visitorEndTime) {
         this.visitorEndTime = visitorEndTime;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/TaVistorServiceI.java

@@ -1,5 +1,6 @@
 package com.community.huiju.service;
 
+import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.TaVisitor;
 
 import java.util.List;
@@ -11,6 +12,13 @@ import java.util.List;
  * @date 2018/11/1
  */
 public interface TaVistorServiceI {
-    void insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId);
+    /**
+     * 创建访客
+     * @param taVisitor
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    ResponseBean insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId);
     List<TaVisitor> invateHis(Integer communityId, Integer userId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaVistorServiceImpl.java

@@ -1,16 +1,25 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.hk.HKOpenApi;
+import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TaVisitorLicenseMapper;
 import com.community.huiju.dao.TaVisitorMapper;
+import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TaVisitor;
 import com.community.huiju.model.TaVisitorLicense;
 import com.community.huiju.service.TaVistorServiceI;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author weichaochao
@@ -19,6 +28,7 @@ import java.util.List;
  * @date 2018/11/1
  */
 @Service("TaVistorServiceImpl")
+@Slf4j
 public class TaVistorServiceImpl implements TaVistorServiceI {
 
     @Autowired
@@ -27,8 +37,13 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
     @Autowired
     private TaVisitorLicenseMapper taVisitorLicenseMapper;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     @Override
-    public void insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId) {
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId) {
+        ResponseBean response = new ResponseBean();
 
         //todo 推送到海康然后返回给我们一个vistor_code，暂未提供
 
@@ -37,6 +52,7 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
         taVisitor.setCreateUser(userId);
         taVisitor.setCreateDate(new Date());
         taVisitor.setUpdateDate(new Date());
+        taVisitor.setCommunityId(communityId);
 
         if (Constant.EFFECTIVE.equals(taVisitor.getDrivingStatus())){
             taVisitorMapper.insertSelective(taVisitor);
@@ -56,6 +72,10 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
             taVisitorMapper.insertSelective(taVisitor);
         }
 
+        // 推送海康
+        temporaryRegister(userId,taVisitor,response);
+
+        return response;
     }
 
     @Override
@@ -70,4 +90,40 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
         }
         return taVisitors;
     }
+
+    /**
+     * 推送海康
+     *
+     * 未预约登记（临时登记）【V2.8.2】
+     * @param userId 被访人ID
+     * @param visitor
+     */
+    private void temporaryRegister(Integer userId,TaVisitor visitor,ResponseBean response){
+        TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+        String result = HKOpenApi.temporaryRegister(visitor.getVisitorName(),visitor.getVisitorTel(),
+                Integer.valueOf(visitor.getVisitorNum()),visitor.getVisitorStatrtTime().getTime(),
+                visitor.getVisitorEndTime().getTime(),taUser.getHkUserId());
+
+        JSONObject resultJSON = JSONObject.parseObject(result);
+        int errorCode = resultJSON.getInteger("errorCode");
+        if (errorCode == 0) {
+            String visitorCode = resultJSON.getJSONObject("data").getString("QRCode");
+            Map<String,Object> map = Maps.newHashMap();
+            map.put("message","创建访问登记成功!");
+            map.put("visitorCode",resultJSON.getJSONObject("data").getString("QRCode"));
+
+            // 把访问码存入
+            visitor.setVisitorCode(visitorCode);
+            taVisitorMapper.updateByPrimaryKeySelective(visitor);
+
+            response.addSuccess(map);
+            return;
+        }
+
+        String errorMessage = resultJSON.getString("errorMessage");
+        response.addError("创建访问登记失败!");
+        log.error("创建访问登记失败! 错误信息: {}",errorMessage);
+        throw new RuntimeException("创建访问登记失败!" + errorMessage);
+
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -149,8 +149,8 @@ public class TicketServiceImpl implements ITicketService {
         List<TpTicketVO> tpTicketVOList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketList, tpTicketVOList);
         Map<String, Object> map = Maps.newHashMap();
-        map.put("pagelist",pagelist.getTotal());
-        map.put("total",tpTicketVOList);
+        map.put("pagelist",tpTicketVOList);
+        map.put("total",pagelist.getTotal());
 
         response.addSuccess(map);
 

CODE/smart-community/app-api/src/main/resources/mapper/TaVisitorMapper.xml

@@ -8,7 +8,7 @@
     <result column="visitor_tel" property="visitorTel" jdbcType="VARCHAR" />
     <result column="visitor_num" property="visitorNum" jdbcType="VARCHAR" />
     <result column="visitor_statrt_time" property="visitorStatrtTime" jdbcType="TIMESTAMP" />
-    <result column="visitor_end_time" property="visitorEndTime" jdbcType="INTEGER" />
+    <result column="visitor_end_time" property="visitorEndTime" jdbcType="TIMESTAMP" />
     <result column="driving_status" property="drivingStatus" jdbcType="CHAR" />
     <result column="pay_entity" property="payEntity" jdbcType="VARCHAR" />
     <result column="visitor_code" property="visitorCode" jdbcType="VARCHAR" />
@@ -42,7 +42,7 @@
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{visitorName,jdbcType=VARCHAR}, 
       #{visitorTel,jdbcType=VARCHAR}, #{visitorNum,jdbcType=VARCHAR}, #{visitorStatrtTime,jdbcType=TIMESTAMP}, 
-      #{visitorEndTime,jdbcType=INTEGER}, #{drivingStatus,jdbcType=CHAR}, #{payEntity,jdbcType=VARCHAR}, 
+      #{visitorEndTime,jdbcType=TIMESTAMP}, #{drivingStatus,jdbcType=CHAR}, #{payEntity,jdbcType=VARCHAR},
       #{visitorCode,jdbcType=VARCHAR}, #{taUserId,jdbcType=INTEGER}, #{createUser,jdbcType=INTEGER}, 
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
       )
@@ -116,7 +116,7 @@
         #{visitorStatrtTime,jdbcType=TIMESTAMP},
       </if>
       <if test="visitorEndTime != null" >
-        #{visitorEndTime,jdbcType=INTEGER},
+        #{visitorEndTime,jdbcType=TIMESTAMP},
       </if>
       <if test="drivingStatus != null" >
         #{drivingStatus,jdbcType=CHAR},
@@ -163,7 +163,7 @@
         visitor_statrt_time = #{visitorStatrtTime,jdbcType=TIMESTAMP},
       </if>
       <if test="visitorEndTime != null" >
-        visitor_end_time = #{visitorEndTime,jdbcType=INTEGER},
+        visitor_end_time = #{visitorEndTime,jdbcType=TIMESTAMP},
       </if>
       <if test="drivingStatus != null" >
         driving_status = #{drivingStatus,jdbcType=CHAR},
@@ -199,7 +199,7 @@
       visitor_tel = #{visitorTel,jdbcType=VARCHAR},
       visitor_num = #{visitorNum,jdbcType=VARCHAR},
       visitor_statrt_time = #{visitorStatrtTime,jdbcType=TIMESTAMP},
-      visitor_end_time = #{visitorEndTime,jdbcType=INTEGER},
+      visitor_end_time = #{visitorEndTime,jdbcType=TIMESTAMP},
       driving_status = #{drivingStatus,jdbcType=CHAR},
       pay_entity = #{payEntity,jdbcType=VARCHAR},
       visitor_code = #{visitorCode,jdbcType=VARCHAR},
@@ -280,7 +280,7 @@
         #{visitorStatrtTime,jdbcType=TIMESTAMP},
       </if>
       <if test="visitorEndTime != null" >
-        #{visitorEndTime,jdbcType=INTEGER},
+        #{visitorEndTime,jdbcType=TIMESTAMP},
       </if>
       <if test="drivingStatus != null" >
         #{drivingStatus,jdbcType=CHAR},