合并代码

CODE/foreign-service/src/main/java/com/community/huiju/controller/FSController.java

     @ApiOperation(value = "获取停车信息（通过车牌号）", notes = "获取停车信息（通过车牌号）")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
-    public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo) {
+    public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo,
+                                           @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iFuShiService.getParkInfoByCarNo(carNo);
+        responseBean = iFuShiService.getParkInfoByCarNo(carNo, communityId);
         return responseBean;
     }
 
     @ApiOperation(value = "获取月租车信息（通过车牌号）", notes = "获取月租车信息（通过车牌号）")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
-    public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo) {
+    public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo,
+                                                    @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iFuShiService.parkGetMonthCardInfoByCarNo(carNo);
+        responseBean = iFuShiService.parkGetMonthCardInfoByCarNo(carNo, communityId);
         return responseBean;
     }
 
     @ApiOperation(value = "获取临时车信息（通过车牌号）", notes = "获取临时车信息（通过车牌号）")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
-    public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo) {
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo,
+                                                         @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iFuShiService.parkGetTempCarPaymentInfoByCarNo(carNo);
+        responseBean = iFuShiService.parkGetTempCarPaymentInfoByCarNo(carNo, communityId);
         return responseBean;
     }
 
 //                    "CarNo车牌号;" +
 //                    "CardNo停车卡号;" +
 //                    "RechargeAmt充值续费金额;"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "Phone", value = "手机号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "RenewDayType", value = "续费日期类型( 3:年 2:月 1:日, 选入对应的数字)"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "RenewDay", value = "续费日期数目"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CarNo", value = "车牌号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CardNo", value = "停车卡号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "RechargeAmt", value = "充值续费金额"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "communityId", value = "小区Id"),
     })
     public ResponseBean apiThirdPartyMonthCardPay(@RequestParam(value = "Phone") String Phone,
                                                   @RequestParam(value = "RenewDayType") String RenewDayType,
                                                   @RequestParam(value = "PayStyle") String PayStyle,
                                                   @RequestParam(value = "CarNo") String CarNo,
                                                   @RequestParam(value = "CardNo", required = false) String CardNo,
-                                                  @RequestParam(value = "RechargeAmt") String RechargeAmt) {
+                                                  @RequestParam(value = "RechargeAmt") String RechargeAmt,
+                                                  @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = iFuShiService.apiThirdPartyMonthCardPay(Phone, RenewDayType,
-                RenewDay, PayStyle, CarNo, CardNo, RechargeAmt);
+                RenewDay, PayStyle, CarNo, CardNo, RechargeAmt, communityId);
         return responseBean;
     }
 
 //                    "CarNo车牌号;" +
 //                    "CardNo停车卡号;" +
 //                    "CouponList使用的优惠券列表"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "Amount", value = "应缴金额（单位元）"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "ActualAmount", value = "实缴金额（单位元）"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "DeductionAmount", value = "抵扣金额（单位元）"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CarNo", value = "车牌号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CardNo", value = "停车卡号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CouponList", value = "使用的优惠券列表"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "communityId", value = "小区Id"),
     })
     public ResponseBean apiThirdPartyTemporaryCardPay(@RequestParam(value = "Amount") String Amount,
                                                       @RequestParam(value = "ActualAmount") String ActualAmount,
                                                       @RequestParam(value = "PayStyle") String PayStyle,
                                                       @RequestParam(value = "CarNo") String CarNo,
                                                       @RequestParam(value = "CardNo",  required = false) String CardNo,
-                                                      @RequestParam(value = "CouponList", required = false) String CouponList) {
+                                                      @RequestParam(value = "CouponList", required = false) String CouponList,
+                                                      @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = iFuShiService.apiThirdPartyTemporaryCardPay(Amount, ActualAmount, DeductionAmount,
-                Reason, PayStyle, CarNo, CardNo, CouponList);
+                Reason, PayStyle, CarNo, CardNo, CouponList, communityId);
         return responseBean;
     }
 
     @RequestMapping(value = "/car/apiGetOfflineFee/{carNoOrCardNo}", method = RequestMethod.GET)
     @ApiOperation(value = "获取线下算费结果", notes = "获取线下算费结果")
     @ApiImplicitParams({
-        @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNoOrCardNo" , value = "车牌号码或卡号"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNoOrCardNo" , value = "车牌号码或卡号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "communityId", value = "小区Id"),
     })
-    public ResponseBean apiGetOfflineFee(@PathVariable("carNoOrCardNo") String carNoOrCardNo) {
+    public ResponseBean apiGetOfflineFee(@PathVariable("carNoOrCardNo") String carNoOrCardNo,
+                                         @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iFuShiService.apiGetOfflineFee(carNoOrCardNo);
+        responseBean = iFuShiService.apiGetOfflineFee(carNoOrCardNo, communityId);
         return responseBean;
     }
 

CODE/foreign-service/src/main/java/com/community/huiju/dao/TaTemporaryLicenseOrderMapper.java

+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaTemporaryLicenseOrder;
+
+/**
+ * <p>
+ * 临时车缴费表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface TaTemporaryLicenseOrderMapper extends BaseMapper<TaTemporaryLicenseOrder> {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/dao/TaUserLicenseOrderMapper.java

+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaUserLicenseOrder;
+
+/**
+ * <p>
+ * 月租车缴费订单表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface TaUserLicenseOrderMapper extends BaseMapper<TaUserLicenseOrder> {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/model/TaTemporaryLicenseOrder.java

+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 临时车缴费表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_temporary_license_order")
+public class TaTemporaryLicenseOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 人员ID
+     */
+    private Integer taUserId;
+
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+
+    /**
+     * 支付状态  0：未支付  1: 已支付 2: 正在支付中
+     */
+    private String orderStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+    /**
+     * 缴费手机号
+     */
+    private String paymentTel;
+
+    /**
+     * 缴费人姓名
+     */
+    private String paymentName;
+
+    /**
+     * 缴费方式 1是支付宝 2是微信支付
+     */
+    private String paymentType;
+
+    /**
+     * 实缴金额
+     */
+    private String actualAmount;
+
+    /**
+     * 抵扣金额
+     */
+    private String deductionAmount;
+
+    /**
+     * 应缴金额
+     */
+    private String amount;
+
+    /**
+     * 停车场
+     */
+    private String parkingLot;
+
+    /**
+     * 车牌号
+     */
+    private String licensePlate;
+
+    /**
+     * 来源
+     */
+    private String sourceFrom;
+
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/model/TaUserLicenseOrder.java

+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 月租车缴费订单表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_user_license_order")
+public class TaUserLicenseOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 人员ID
+     */
+    private Integer taUserId;
+
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+
+    /**
+     * 支付状态  0：未支付  1: 已支付 2: 正在支付中 3:已关闭
+     */
+    private String orderStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+    /**
+     * 延期月份
+     */
+    private Integer extensionMonth;
+
+    /**
+     * 延期费用
+     */
+    private String extensionPrice;
+
+    /**
+     * 缴费手机号
+     */
+    private String paymentTel;
+
+    /**
+     * 缴费人姓名
+     */
+    private String paymentName;
+
+    /**
+     * 缴费方式 0是微信支付 2是支付宝 
+     */
+    private String paymentType;
+
+    /**
+     * 到期时间
+     */
+    private Date expireDate;
+
+    /**
+     * 单价费用
+     */
+    private String unitPrice;
+
+    /**
+     * 停车场
+     */
+    private String parkingLot;
+
+    /**
+     * 车牌号
+     */
+    private String licensePlate;
+
+    /**
+     * 来源
+     */
+    private String sourceFrom;
+
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/service/IFuShiService.java

      * @param carNo
      * @return
      */
-    ResponseBean getParkInfoByCarNo(String carNo);
+    ResponseBean getParkInfoByCarNo(String carNo, Integer communityId);
 
     /**
      * 第三方月卡上发续费
      * @param RechargeAmt 充值续费金额
      * @return
      */
-    ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt);
+    ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt, Integer communityId);
 
 
     /**
      *
      * @return
      */
-    ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList);
+    ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList, Integer communityId);
 
     /**
      * 获取线下算费结果
      * @param CarNoOrCardNo 车牌号码或卡号
      * @return
      */
-    ResponseBean apiGetOfflineFee(String CarNoOrCardNo);
+    ResponseBean apiGetOfflineFee(String CarNoOrCardNo, Integer communityId);
 
     /**
      * 获取月租车信息（通过车牌号）
      * @param CarNo
      * @return
      */
-    ResponseBean parkGetMonthCardInfoByCarNo(String CarNo);
+    ResponseBean parkGetMonthCardInfoByCarNo(String CarNo, Integer communityId);
 
     /**
      * 获取临时车信息（通过车牌号）
      * @param CarNo
      * @return
      */
-    ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo);
+    ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo, Integer communityId);
 }

CODE/foreign-service/src/main/java/com/community/huiju/service/ITaTemporaryLicenseOrderService.java

+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.model.TaTemporaryLicenseOrder;
+
+/**
+ * <p>
+ * 临时车缴费表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface ITaTemporaryLicenseOrderService extends IService<TaTemporaryLicenseOrder> {
+
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/service/ITaUserLicenseOrderService.java

+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TaUserLicenseOrder;
+
+/**
+ * <p>
+ * 月租车缴费订单表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface ITaUserLicenseOrderService extends IService<TaUserLicenseOrder> {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/FuShiServiceImpl.java

 package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.community.commom.fushi.FuShiRequestAPI;
+import com.community.commom.fushi.error.FuShiException;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.uuid.IdGen;
 import com.community.huiju.common.perproties.FuShiProperties;
+import com.community.huiju.dao.TaTemporaryLicenseOrderMapper;
+import com.community.huiju.dao.TaUserLicenseOrderMapper;
+import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.log.LogAnnotation;
 import com.community.huiju.log.LogEnums;
+import com.community.huiju.model.TaTemporaryLicenseOrder;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TaUserLicenseOrder;
 import com.community.huiju.service.IFuShiService;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.Map;
 
 /**
 
     private IdGen idGen = IdGen.get();
 
+    @Autowired
+    private TaTemporaryLicenseOrderMapper taTemporaryLicenseOrderMapper;
+
+    @Autowired
+    private TaUserLicenseOrderMapper taUserLicenseOrderMapper;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     /**
      * 获取 富士 json 值
      * @param jsonString
 
     @LogAnnotation(value = LogEnums.DA_SU, alias = "获取停车信息（通过车牌号)")
     @Override
-    public ResponseBean getParkInfoByCarNo(String carNo) {
+    public ResponseBean getParkInfoByCarNo(String carNo, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         String parkInfo = fuShiRequestAPI.getParkInfoByCarNo(fuShiProperties.getParkingCode(), carNo);
         Map<String, Object> fuShiInfo = getFuShiInfo(parkInfo);
 
     @LogAnnotation(value = LogEnums.DA_SU, alias = "第三方月卡上发续费")
     @Override
-    public ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt) {
+    public ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss");
         // 交易编码
         Map<String, Object> map = Maps.newHashMap();
         map.put("TradeNo", tradeNo);
         responseBean.addSuccess(map);
+
+        QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
+        userQueryWrapper.eq("login_name", Phone);
+        TaUser user = taUserMapper.selectOne(userQueryWrapper);
+
+        // 月租车缴费记录
+        TaUserLicenseOrder taUserLicenseOrder = new TaUserLicenseOrder();
+        taUserLicenseOrder.setCommunityId(communityId);
+        taUserLicenseOrder.setTaUserId(user.getUserId());
+        taUserLicenseOrder.setOrderNumber(dealNo);
+        taUserLicenseOrder.setOrderStatus("1");
+        taUserLicenseOrder.setCreateUser(user.getUserId());
+        taUserLicenseOrder.setCreateDate(new Date());
+        taUserLicenseOrder.setExtensionMonth(Integer.valueOf(RenewDay));
+        taUserLicenseOrder.setExtensionPrice(RechargeAmt);
+        taUserLicenseOrder.setPaymentTel(user.getLoginName());
+        taUserLicenseOrder.setPaymentName(user.getUserName());
+        // 缴费方式 1是支付宝 2是微信支付
+        if (PayStyle.contains("微信")) {
+            taUserLicenseOrder.setPaymentType("0");
+        } else if (PayStyle.contains("支付宝")){
+            taUserLicenseOrder.setPaymentType("2");
+        }
+
+        // 查询这个交费后的车牌
+        String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetMonthCardInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
+        JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
+        Map<String, Object> innerMap = jsonObject.getInnerMap();
+        Integer messageCode = (Integer) innerMap.get("MessageCode");
+        if (200 != messageCode.intValue()) {
+            log.error("月租车缴费记录错误：{}", parkGetMonthCardInfoByCarNo);
+            String messageContent = jsonObject.getString("MessageContent");
+            throw new FuShiException(messageCode, messageContent);
+        }
+
+        Map<String, Object> result = (Map<String, Object>) innerMap.get("Result");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        try {
+            taUserLicenseOrder.setExpireDate(format.parse(String.valueOf(result.get("EndTime"))));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        Object cost = result.get("Cost");
+        String costValue = String.valueOf(Double.valueOf(((BigDecimal) cost).toString()) * 100);
+
+        taUserLicenseOrder.setUnitPrice(costValue.substring(0, costValue.lastIndexOf(".")));
+        taUserLicenseOrder.setParkingLot(String.valueOf(result.get("ParkingName")));
+        taUserLicenseOrder.setLicensePlate(CarNo);
+        taUserLicenseOrder.setSourceFrom("大苏");
+        taUserLicenseOrderMapper.insert(taUserLicenseOrder);
+
         return responseBean;
     }
 
      */
     @LogAnnotation(value = LogEnums.DA_SU, alias = "第三方临时卡上发缴费")
     @Override
-    public ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList) {
+    public ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         // 交易编号
         String dealNo = idGen.nextId() + "";
         Map<String, Object> map = Maps.newHashMap();
         map.put("TradeNo", tradeNo);
         responseBean.addSuccess(map);
+
+        // 临时车缴费记录
+        TaTemporaryLicenseOrder taTemporaryLicenseOrder = new TaTemporaryLicenseOrder();
+        taTemporaryLicenseOrder.setCommunityId(communityId);
+        taTemporaryLicenseOrder.setOrderNumber(dealNo);
+        taTemporaryLicenseOrder.setOrderStatus("1");
+        taTemporaryLicenseOrder.setCreateDate(new Date());
+        taTemporaryLicenseOrder.setUpdateDate(new Date());
+        // 缴费方式 1是支付宝 2是微信支付
+        if (PayStyle.contains("微信")) {
+            taTemporaryLicenseOrder.setPaymentType("2");
+        } else if (PayStyle.contains("支付宝")){
+            taTemporaryLicenseOrder.setPaymentType("1");
+        }
+        taTemporaryLicenseOrder.setActualAmount(ActualAmount);
+        taTemporaryLicenseOrder.setDeductionAmount(DeductionAmount);
+        taTemporaryLicenseOrder.setAmount(Amount);
+
+        String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetTempCarPaymentInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
+        JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
+        Map<String, Object> innerMap = jsonObject.getInnerMap();
+        Integer messageCode = (Integer) innerMap.get("MessageCode");
+        if (200 != messageCode.intValue()) {
+            log.error("临时车缴费记录错误：{}", parkGetMonthCardInfoByCarNo);
+            String messageContent = jsonObject.getString("MessageContent");
+            throw new FuShiException(messageCode, messageContent);
+        }
+
+        Map<String, Object> result = (Map<String, Object>) innerMap.get("Result");
+        taTemporaryLicenseOrder.setParkingLot(String.valueOf(result.get("ParkingName")));
+        taTemporaryLicenseOrder.setLicensePlate(CarNo);
+        taTemporaryLicenseOrder.setSourceFrom("大苏");
+
+        taTemporaryLicenseOrderMapper.insert(taTemporaryLicenseOrder);
+
+
+
         return responseBean;
     }
 
     @LogAnnotation(value = LogEnums.DA_SU, alias = "获取线下算费结果")
     @Override
-    public ResponseBean apiGetOfflineFee(String CarNoOrCardNo) {
+    public ResponseBean apiGetOfflineFee(String CarNoOrCardNo, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         String apiGetOfflineFee = fuShiRequestAPI.apiGetOfflineFee(fuShiProperties.getParkingCode(), CarNoOrCardNo);
         String result = JSONObject.parseObject(apiGetOfflineFee).getString("Result");
      */
     @LogAnnotation(value = LogEnums.DA_SU, alias = "获取月租车信息（通过车牌号）")
     @Override
-    public ResponseBean parkGetMonthCardInfoByCarNo(String CarNo) {
+    public ResponseBean parkGetMonthCardInfoByCarNo(String CarNo, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetMonthCardInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
         JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
      */
     @LogAnnotation(value = LogEnums.DA_SU, alias = "获取临时车信息（通过车牌号）")
     @Override
-    public ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo) {
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo,Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetTempCarPaymentInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
         JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TaTemporaryLicenseOrderServiceImpl.java

+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TaTemporaryLicenseOrderMapper;
+import com.community.huiju.model.TaTemporaryLicenseOrder;
+import com.community.huiju.service.ITaTemporaryLicenseOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 临时车缴费表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Service
+public class TaTemporaryLicenseOrderServiceImpl extends ServiceImpl<TaTemporaryLicenseOrderMapper, TaTemporaryLicenseOrder> implements ITaTemporaryLicenseOrderService {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TaUserLicenseOrderServiceImpl.java

+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TaUserLicenseOrderMapper;
+import com.community.huiju.model.TaUserLicenseOrder;
+import com.community.huiju.service.ITaUserLicenseOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 月租车缴费订单表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Service
+public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrderMapper, TaUserLicenseOrder> implements ITaUserLicenseOrderService {
+
+}

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

 
 	@ApiOperation(value = "门口机开门", notes = "门口机开门")
 	@ApiImplicitParams({
-			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "header", name = "X-Auth-Token", value = "用户审核房产id")
+			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "header", name = "X-Auth-Token", value = "Token")
 	})
 	@RequestMapping(value = "/visual/syncControl", method = RequestMethod.POST)
 	public ResponseBean syncControl( HttpServletRequest request, HttpSession session){

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

     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行")
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/monitoring/{communityId}",method = RequestMethod.GET)
     public ResponseBean getList(@PathVariable("communityId") Integer communityId,
                                 @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
-                                @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+                                @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                HttpSession session){
         ResponseBean response = new ResponseBean();
         if (!check(communityId)) {
             response.addError("小区不存在");
             return response;
         }
 
-        response = iMonitoringService.getByCommunityId(communityId,pageNo,pageSize);
+        UserElement userElement = getUserElement(session);
+        response = iMonitoringService.getByCommunityId(userElement,communityId,pageNo,pageSize);
         return response;
     }
 
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行")
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value = "/monitoring/hls/{communityId}",method = RequestMethod.GET)
     public ResponseBean getListHLS(@PathVariable("communityId") Integer communityId,
                                    @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
-                                   @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize) {
+                                   @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                   HttpSession session) {
 
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iMonitoringService.getHlsByCommunityId(communityId, pageNo, pageSize);
+        UserElement userElement = getUserElement(session);
+        responseBean = iMonitoringService.getHlsByCommunityId(userElement,communityId, pageNo, pageSize);
         return responseBean;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaPublicMonitorMapper.java

+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaPublicMonitor;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaPublicMonitorMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaPublicMonitor record);
+
+    int insertSelective(TaPublicMonitor record);
+
+    TaPublicMonitor selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaPublicMonitor record);
+
+    int updateByPrimaryKey(TaPublicMonitor record);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaRemotelyDoorMapper.java

+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaRemotelyDoor;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaRemotelyDoorMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaRemotelyDoor record);
+
+    int insertSelective(TaRemotelyDoor record);
+
+    TaRemotelyDoor selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaRemotelyDoor record);
+
+    int updateByPrimaryKey(TaRemotelyDoor record);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaRemotelyMonitorMapper.java

+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaRemotelyMonitor;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaRemotelyMonitorMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaRemotelyMonitor record);
+
+    int insertSelective(TaRemotelyMonitor record);
+
+    TaRemotelyMonitor selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaRemotelyMonitor record);
+
+    int updateByPrimaryKey(TaRemotelyMonitor record);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java

 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpBuildingOwnerInfo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
     @ResultMap("BaseResultMap")
     @Select("select * from tp_building_owner_info where ta_user_verify_id = #{userVerifyId}")
     TpBuildingOwnerInfo selectByUserVerifyId(@Param("userVerifyId") Integer userVerifyId);
+
+    /**
+     * 根据手机号更新手机号
+     * @param oldPhone
+     * @param newPhone
+     * @return
+     */
+    @ResultType(Integer.class)
+    @Update("update tp_building_owner_info set owner_tel = #{newPhone} where owner_tel = #{oldPhone}")
+    Integer updateAllByPhone(String oldPhone, String newPhone);
 }

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

+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaPublicMonitor {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserVerifyId;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaRemotelyDoor {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserVerifyId;
+
+    private Integer unitId;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaRemotelyMonitor {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserVerifyId;
+
+    private Integer unitId;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

      * @param pageSize
      * @return
      */
-    ResponseBean getByCommunityId(Integer communityId,Integer pageNo, Integer pageSize);
+    ResponseBean getByCommunityId(UserElement userElement, Integer communityId,Integer pageNo, Integer pageSize);
 
     /**
      * 生成 Token
      * @param communityId
      * @return
      */
-    ResponseBean getHlsByCommunityId(Integer communityId, Integer pageNo, Integer pageSize);
+    ResponseBean getHlsByCommunityId(UserElement userElement, Integer communityId, Integer pageNo, Integer pageSize);
 
     /**
      * 可是对讲 视频流

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

     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
+    @Autowired
+    private TaRemotelyDoorMapper taRemotelyDoorMapper;
+
     /**
      * 获取设备UUID
      * @param equipmentList
         JSONObject jsonObject = JSONObject.parseObject(data);
         int errorCode = jsonObject.getInteger("errorCode");
         if (errorCode == 0) {
+
+            // 记录 远程开门次数
+            TaRemotelyDoor taRemotelyDoor = new TaRemotelyDoor();
+            taRemotelyDoor.setCommunityId(userVerify.getCommunityId());
+            taRemotelyDoor.setTaUserVerifyId(userVerify.getUserId());
+            taRemotelyDoor.setUnitId(userVerify.getUnitId());
+            taRemotelyDoor.setCreateDate(new Date());
+            taRemotelyDoorMapper.insertSelective(taRemotelyDoor);
+
             responseBean.addSuccess("操作成功!");
             return responseBean;
         }

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

 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
     @Autowired
     private ToCommunitiesMapper toCommunitiesMapper;
 
+    @Autowired
+    private TaPublicMonitorMapper taPublicMonitorMapper;
+
+    @Autowired
+    private TaRemotelyMonitorMapper taRemotelyMonitorMapper;
+
     @Override
-    public ResponseBean getByCommunityId(Integer communityId,Integer pageNo, Integer pageSize) {
+    public ResponseBean getByCommunityId(UserElement userElement, Integer communityId,Integer pageNo, Integer pageSize) {
 
         // TODO 数据是假数据, 后期在更改. 需要根据小区查询 组织中心编号
 
         Page<TpEquipment> page = PageHelper.startPage(pageNo, pageSize);
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityId(communityId);
 
+        if (CollectionUtils.isEmpty(tpEquipments)) {
+            response.addError("系统未配置监控设备!");
+            return response;
+        }
+
         Map<String, Object> map = Maps.newHashMap();
         map.put("pageNo", page.getPageNum());
         map.put("pageSize", page.getPageSize());
         map.put("list", tpEquipments);
         response.addSuccess(map);
 
+        // 记录 查看监控
+        insertPublicMonitor(communityId, userElement.getId());
+
         return response;
     }
 
+    /**
+     * 记录 查看监控
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    private TaPublicMonitor insertPublicMonitor(Integer communityId, Integer userId) {
+        // 记录查看监控设备
+        TaPublicMonitor taPublicMonitor = new TaPublicMonitor();
+        taPublicMonitor.setCommunityId(communityId);
+        taPublicMonitor.setTaUserVerifyId(userId);
+        taPublicMonitor.setCreateDate(new Date());
+        taPublicMonitorMapper.insertSelective(taPublicMonitor);
+
+        return taPublicMonitor;
+    }
+
     @Override
     public ResponseBean getMonitoringToken(Integer communityId, Integer pageNo, Integer pageSize) {
 
     }
 
     @Override
-    public ResponseBean getHlsByCommunityId(Integer communityId, Integer pageNo, Integer pageSize) {
+    public ResponseBean getHlsByCommunityId(UserElement userElement, Integer communityId, Integer pageNo, Integer pageSize) {
         ResponseBean response = new ResponseBean();
         Page<TpEquipment> page = PageHelper.startPage(pageNo, pageSize);
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectHlsByCommunityId(communityId);
 
+        if (CollectionUtils.isEmpty(tpEquipments)) {
+            response.addError("系统未配置监控设备!");
+            return response;
+        }
+
         Map<String, Object> map = Maps.newHashMap();
         map.put("pageNo", page.getPageNum());
         map.put("pageSize", page.getPageSize());
         map.put("total", page.getTotal());
         map.put("list", tpEquipments);
         response.addSuccess(map);
+
+        // 记录 查看监控
+        insertPublicMonitor(communityId, userElement.getId());
+
         return response;
     }
 
         map.put("address", toCommunities.getCommunityName() + tpUnit.getPhaseName() + tpUnit.getBuildingName() + tpUnit.getName());
         map.put("token", tpEquipment.getOpUserUuid());
         responseBean.addSuccess(map);
+
+        // 记录 单元门监控查看
+        TaRemotelyMonitor taRemotelyMonitor = new TaRemotelyMonitor();
+        taRemotelyMonitor.setCommunityId(userElement.getCommunityId());
+        taRemotelyMonitor.setTaUserVerifyId(userElement.getId());
+        taRemotelyMonitor.setUnitId(userElement.getUnitId());
+        taRemotelyMonitor.setCreateDate(new Date());
+        taRemotelyMonitorMapper.insertSelective(taRemotelyMonitor);
+
         return responseBean;
     }
 }

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

         // 校验手机号和验证码
         iCode.checkPhoneAndCode(phone, code);
 
-        //当前小区下的电话校验
-        TaUser loginName = taUserMapper.getByLoginName(user.getCommunityId(), phone);
-        if (null != loginName) {
+        // 查询出这个手机号
+        TaUser hasUserPhone = hasUserPhone(phone);
+        if (null != hasUserPhone && user.getId().intValue() != hasUserPhone.getId().intValue()) {
             response.addError("号码已占用");
             return response;
         }
+
+        // 如果提交上来的手机号 和 这个用户本身的手机号相等，就直接返回成功！
+        if (null != hasUserPhone && user.getLoginName().equals(phone)) {
+            response.addSuccess(new String[0]);
+            return response;
+        }
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userElement.getCommunityId());
         String data = HKOpenApi.HKpersonPhone(user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), phone, tpEquipmentTree.getHttpServer());
         JSONObject jsonobject = JSONObject.parseObject(data);
         taUserMapper.updateLongName(taUser);
         response.addSuccess("修改成功");
 
-        /**
-         * 如果是 家属或者租客,修改手机号, 就不允许修改资料库的信息
-         * 根据房产判断 当前是否是 业主
-         */
-
-        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
-        TaSysRole sysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
-
-        // 修改楼栋信息资料库的手机号
-        // 1 业主 2 租客 3 家属
-        // 只允许业主修改
-        if (null != sysRole && sysRole.getId().intValue() == 1) {
-            TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(userVerify.getRoomNoId());
-            buildingOwnerInfo.setOwnerTel(phone);
-            tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(buildingOwnerInfo);
-        }
+        // 修改楼栋资料库手机号
+        tpBuildingOwnerInfoMapper.updateAllByPhone(user.getLoginName(), phone);
 
         // 给前端返回一个空数组
         response.addSuccess(new String[0]);

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaPublicMonitorMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaPublicMonitor" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ta_user_verify_id, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_public_monitor
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_public_monitor
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaPublicMonitor" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
+    insert into ta_public_monitor (id, community_id, ta_user_verify_id, 
+      create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserVerifyId,jdbcType=INTEGER}, 
+      #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaPublicMonitor" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+    insert into ta_public_monitor
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserVerifyId != null" >
+        #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaPublicMonitor" >
+    update ta_public_monitor
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaPublicMonitor" >
+    update ta_public_monitor
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaRemotelyDoorMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaRemotelyDoor" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
+    <result column="unit_id" property="unitId" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ta_user_verify_id, unit_id, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_remotely_door
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_remotely_door
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaRemotelyDoor" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
+    insert into ta_remotely_door (id, community_id, ta_user_verify_id, 
+      unit_id, create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserVerifyId,jdbcType=INTEGER}, 
+      #{unitId,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaRemotelyDoor" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+    insert into ta_remotely_door
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id,
+      </if>
+      <if test="unitId != null" >
+        unit_id,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserVerifyId != null" >
+        #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="unitId != null" >
+        #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaRemotelyDoor" >
+    update ta_remotely_door
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="unitId != null" >
+        unit_id = #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaRemotelyDoor" >
+    update ta_remotely_door
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      unit_id = #{unitId,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaRemotelyMonitorMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaRemotelyMonitor" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
+    <result column="unit_id" property="unitId" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ta_user_verify_id, unit_id, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_remotely_monitor
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_remotely_monitor
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaRemotelyMonitor" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
+    insert into ta_remotely_monitor (id, community_id, ta_user_verify_id, 
+      unit_id, create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserVerifyId,jdbcType=INTEGER}, 
+      #{unitId,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaRemotelyMonitor" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
+    insert into ta_remotely_monitor
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id,
+      </if>
+      <if test="unitId != null" >
+        unit_id,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserVerifyId != null" >
+        #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="unitId != null" >
+        #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaRemotelyMonitor" >
+    update ta_remotely_monitor
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="unitId != null" >
+        unit_id = #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaRemotelyMonitor" >
+    update ta_remotely_monitor
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      unit_id = #{unitId,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/FuShiRequestAPI.java

         map.put("ParkingCode", ParkingCode);
         map.put("CardNo", CardNo);
         map.put("PayCostMachineOrderId", PayCostMachineOrderId);
-        map.put("CouponList", JSONObject.parseObject(CouponList).getInnerMap());
+        map.put("CouponList", null == CouponList ? null : JSONObject.parseObject(CouponList).getInnerMap());
 
         String json = JSONObject.toJSONString(map);
         log.info("第三方临时卡上发缴费请求参数：{}", json);