合并

CODE/foreign-service/pom.xml

@@ -107,6 +107,13 @@
             <version>3.11.0</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-collections4 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.1</version>
+        </dependency>
+
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>

CODE/foreign-service/src/main/java/com/community/huiju/common/sign/DaSuSign.java

@@ -0,0 +1,85 @@
+package com.community.huiju.common.sign;
+
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+/**
+ * 大苏签名校验
+ */
+@Slf4j
+public class DaSuSign {
+
+    /**
+     * 校验签名是否相等
+     * @param val_1
+     * @param val_2
+     * @return true 相等  false 不相等
+     */
+    public static boolean isMD5Sign(String val_1, String val_2) {
+        return StringUtils.equals(val_1, val_2);
+    }
+
+    /**
+     *
+     * 创建签名
+     * 对请求参数进行签名
+     *
+     *
+     *      参考参数
+     *      * @param appid
+     *      * @param appSecret
+     *      * @param datetime 时间戳
+     *      * @param encrypt 加密方式(目前就 MD5)
+     *      * @param communityId 小区id
+     *
+     * @return
+     */
+    public static String createSign(TreeMap<String ,Object> treeMap, String appSecret){
+
+        String sign = "";
+
+        StringBuilder sb = new StringBuilder();
+        Set<Map.Entry<String, Object>> entries = treeMap.entrySet();
+        entries.forEach(e-> {
+            sb.append(e.getKey());
+            sb.append("=");
+            sb.append(e.getValue());
+            sb.append("&");
+        });
+
+        sign = sb.toString();
+        sign = sign.substring(0, sign.lastIndexOf("&"));
+
+        log.info("签名之前参数: {}, appSecret: {}" , JSONObject.toJSONString(treeMap), appSecret);
+
+        try {
+            String str = new String(sign.getBytes("UTF-8"), "UTF-8");
+            sign = DigestUtils.md5Hex( str + appSecret);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        log.info("签名: {}" , sign);
+
+        return sign;
+    }
+
+    public static void main(String[] args) {
+
+        Long timeMillis = System.currentTimeMillis();
+        System.out.println(timeMillis);
+        TreeMap<String, Object> treeMap = new TreeMap<>();
+        treeMap.put("appid", "dssdw2576sd997");
+        treeMap.put("communityId", "100");
+        String sign = createSign(treeMap, "fgexhd855sf4");
+    }
+
+}

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

@@ -22,7 +22,11 @@ public class FSController extends BaseController {
     @RequestMapping(value = "/car/getParkInfoByCarNo/{carNo}", method = RequestMethod.GET)
     @ApiOperation(value = "获取停车信息（通过车牌号）", notes = "获取停车信息（通过车牌号）")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", 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 = "签名"),
     })
     public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo) {
         ResponseBean responseBean = new ResponseBean();
@@ -33,7 +37,11 @@ public class FSController extends BaseController {
     @RequestMapping(value = "/car/parkGetMonthCardInfoByCarNo/{carNo}", method = RequestMethod.GET)
     @ApiOperation(value = "获取月租车信息（通过车牌号）", notes = "获取月租车信息（通过车牌号）")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", 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 = "签名"),
     })
     public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo) {
         ResponseBean responseBean = new ResponseBean();
@@ -44,7 +52,11 @@ public class FSController extends BaseController {
     @RequestMapping(value = "/car/parkGetTempCarPaymentInfoByCarNo/{carNo}", method = RequestMethod.GET)
     @ApiOperation(value = "获取临时车信息（通过车牌号）", notes = "获取临时车信息（通过车牌号）")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", 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 = "签名"),
     })
     public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo) {
         ResponseBean responseBean = new ResponseBean();
@@ -60,7 +72,11 @@ public class FSController extends BaseController {
                     "PayStyle交易方式(中文描述)，例如：微信、 支付宝、 银联;" +
                     "CarNo车牌号;" +
                     "CardNo停车卡号;" +
-                    "RechargeAmt充值续费金额;")
+                    "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 = "签名"),
     })
     public ResponseBean apiThirdPartyMonthCardPay(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
@@ -85,7 +101,11 @@ public class FSController extends BaseController {
                     "PayStyle交易方式(汉字描述)，例如：微信、支付宝、银联;" +
                     "CarNo车牌号;" +
                     "CardNo停车卡号;" +
-                    "CouponList使用的优惠券列表")
+                    "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 = "签名"),
     })
     public ResponseBean apiThirdPartyTemporaryCardPay(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
@@ -105,7 +125,11 @@ public class FSController extends BaseController {
     @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 = "签名"),
     })
     public ResponseBean apiGetOfflineFee(@PathVariable("carNoOrCardNo") String carNoOrCardNo) {
         ResponseBean responseBean = new ResponseBean();

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

@@ -0,0 +1,111 @@
+package com.community.huiju.controller;
+
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.service.FaceServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * weiximei on 2019-05-17
+ */
+
+@RestController
+@RequestMapping("/")
+@Api(value = "人脸操作 API", description = "人脸操作 API")
+public class TaFceController extends BaseController {
+
+    @Autowired
+    private FaceServiceI faceServiceI;
+
+    @RequestMapping(value = "/face", method = RequestMethod.POST)
+    @ApiOperation(value = "录入人脸" , notes = "录入人脸")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
+            @ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", 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 = "签名"),
+    })
+    public ResponseBean addFace(@RequestParam(value = "userId") Integer userId,
+                                @RequestParam(value = "userVerifyId") Integer userVerifyId,
+                                @RequestParam(value = "uploadFile") MultipartFile uploadFile) {
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = faceServiceI.addFace(userId, userVerifyId, uploadFile);
+        return responseBean;
+
+    }
+
+
+    @RequestMapping(value = "/face", method = RequestMethod.PUT)
+    @ApiOperation(value = "修改人脸" , notes = "修改人脸")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
+            @ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", 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 = "签名"),
+    })
+    public ResponseBean updateFace(@RequestParam(value = "userId") Integer userId,
+                                @RequestParam(value = "userVerifyId") Integer userVerifyId,
+                                @RequestParam(value = "uploadFile") MultipartFile uploadFile) {
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = faceServiceI.updateFace(userId, userVerifyId, uploadFile);
+        return responseBean;
+
+    }
+
+    @RequestMapping(value = "/face", method = RequestMethod.DELETE)
+    @ApiOperation(value = "删除人脸" , notes = "删除人脸")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
+            @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 = "签名"),
+    })
+    public ResponseBean deleteFace(@RequestParam(value = "userId") Integer userId,
+                                   @RequestParam(value = "userVerifyId") Integer userVerifyId) {
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = faceServiceI.deleteFace(userId, userVerifyId);
+        return responseBean;
+
+    }
+
+
+    @RequestMapping(value = "/face", method = RequestMethod.GET)
+    @ApiOperation(value = "查询人脸信息" , notes = "查询人脸信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userId", value = "用户Id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userVerifyId", 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 getTaFaceByUserId(@RequestParam(value = "userId") Integer userId,
+                                   @RequestParam(value = "userVerifyId") Integer userVerifyId) {
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = faceServiceI.getTaFaceByUserId(userId, userVerifyId);
+        return responseBean;
+
+    }
+
+}

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

@@ -35,6 +35,10 @@ public class TaUserController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "idCard", value = "身份证"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "gender", value = "性别 1：男   2：女"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "phone", 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 = "签名"),
     })
     public ResponseBean addUser(@RequestParam(value = "userName") String userName,
                                 @RequestParam(value = "idCard") String idCard,
@@ -52,6 +56,10 @@ public class TaUserController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "idCard", value = "身份证"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "gender", value = "性别 1：男   2：女"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "phone", 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 = "签名"),
     })
     public ResponseBean updateUser(@PathVariable(value = "userId") Integer userId,
                                 @RequestParam(value = "userName", required = false) String userName,
@@ -65,7 +73,11 @@ public class TaUserController extends BaseController {
     @RequestMapping(value = "/user/{userId}", method = RequestMethod.GET)
     @ApiOperation(value = "根据用户ID查询", notes = "根据用户ID查询")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "path", name = "userId", value = "用户id")
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "path", name = "userId", 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 updateUser(@PathVariable(value = "userId") Integer userId){
         ResponseBean responseBean = iTaUserService.getTaUser(userId);
@@ -73,7 +85,7 @@ public class TaUserController extends BaseController {
     }
 
     @RequestMapping(value = "/user", method = RequestMethod.GET)
-    @ApiOperation(value = "根据用户ID查询", notes = "根据用户ID查询")
+    @ApiOperation(value = "根据用户手机号查询", notes = "根据用户手机号查询")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "phone", value = "手机号")
     })

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

@@ -39,6 +39,10 @@ public class TaUserVerifyController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "unitId", value = "单元Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "levelId", value = "楼层Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "roomNoId", value = "房间号Id"),
+            @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 = "签名"),
 
     })
     public ResponseBean addUserVerify(@RequestParam(value = "userId") Integer userId,
@@ -59,6 +63,10 @@ public class TaUserVerifyController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "path", name = "userVerifyId", value = "房产审核Id"),
+            @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 = "签名"),
     })
     public ResponseBean deleteUserVerify(@RequestParam(value = "userId") Integer userId,
                                          @PathVariable(value = "userVerifyId") Integer userVerifyId) {
@@ -71,7 +79,11 @@ public class TaUserVerifyController extends BaseController {
     @ApiOperation(value = "查询用户的房产关联关系列表", notes = "查询用户的房产关联关系列表")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userId", value = "用户Id"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id")
+            @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 getUserVerify(@RequestParam(value = "userId") Integer userId,
                                       @RequestParam(value = "communityId") Integer communityId) {

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

@@ -50,6 +50,10 @@ public class TpAddressController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "buildingId", value = "楼栋id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "unitId", value = "单元id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "levelId", 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 getBuildingInfo(@RequestParam("communityId") Integer communityId,
                                         @RequestParam(value = "phaseId", required = false) Integer phaseId,

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

@@ -32,7 +32,11 @@ public class TpEquipmentController extends BaseController {
     @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(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 = "签名"),
     })
     @RequestMapping(value = "/equipment/monitoring/{communityId}",method = RequestMethod.GET)
     public ResponseBean getListHLS(@PathVariable("communityId") Integer communityId,

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

@@ -16,18 +16,12 @@ public interface TaFaceMapper extends BaseMapper<TaFace> {
 
 
     /**
-     * 查看当前用户信息
+     * 查看当前房产信息
      * @param userVerifyId
      * @return
      */
     TaFace getByUserVerifyId(@Param("userVerifyId") Integer userVerifyId);
 
-    /**
-     * 查看当前信息
-     * @param id
-     * @return
-     */
-    TaFace getById(@Param("id")Integer id);
 
     /**
      * 根据审核ID删除人脸信息

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

@@ -24,7 +24,16 @@ public enum ResponseErrorsMessages {
     NO_ROOM_NO(1012, "户号不存在！"),
     NOT_USER_VERIFY(1013, "无房产关联关系！"),
     NOT_USER_FACE(1014, "未录入人脸信息！"),
-    NOT_PUSH_FACE(1015, "人脸推送失敗！")
+    NOT_PUSH_FACE(1015, "人脸推送失敗！"),
+    NOT_VERIFY(1016, "当前房产审核记录不存在！"),
+    NOT_IDENTITY_VERIFY(1017, "您的身份已停用！"),
+    EXIST_FACE(1018, "人脸信息已存在！"),
+    NOT_USER_VERIFY_1(1019, "房产审核未通过！"),
+    DELETE_FACE(1020, "人脸删除失败！"),
+    FACE_ERROR(1021, "请录入正确的人脸图片！"),
+    SIGN_ERROR(1022, "签名错误！"),
+    SIGN_DATETIME_ERROR(1023, "签名已过期！"),
+    SIGN_ENCRYPT_MD5_ERROR(1024, "未使用md5加密方式加密！")
     ;
 
 

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

@@ -0,0 +1,123 @@
+package com.community.huiju.filter;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.common.perproties.DaSuProperties;
+import com.community.huiju.common.sign.DaSuSign;
+import com.community.huiju.enums.ResponseErrorsMessages;
+import com.community.huiju.exception.WisdomException;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.AntPathMatcher;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ *
+ * 签名拦截器
+ *
+ * @author weiximei on 2019-05-17
+ */
+@Component
+@Slf4j
+public class SignFilter implements Filter {
+
+    private String [] urls = new String[]{
+            "/**/swagger-ui.html/**","/**/springfox-swagger-ui/**",
+            "/**/swagger-resources/**","/**/v2/api-docs/**",
+            "/**/swagger-resources/**"
+    };
+
+    private AntPathMatcher antPathMatcher = new AntPathMatcher();
+
+    @Autowired
+    private DaSuProperties daSuProperties;
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+
+        HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+        for (String url : urls) {
+            if (antPathMatcher.match(url ,httpServletRequest.getRequestURI())) {
+                chain.doFilter(request, response);
+                return;
+            }
+        }
+
+        ResponseBean responseBean = new ResponseBean();
+        TreeMap<String, Object> treeMap = Maps.newTreeMap();
+
+        try {
+            // 加密方式
+            String encrypt = request.getParameter("encrypt");
+            if (!"md5".equals(encrypt.toLowerCase())) {
+                responseBean.addError(ResponseErrorsMessages.SIGN_ENCRYPT_MD5_ERROR.getCode(), ResponseErrorsMessages.SIGN_ENCRYPT_MD5_ERROR.getMsg());
+                responseWriter(response, responseBean);
+                return;
+            }
+
+            String datetime = request.getParameter("datetime");
+            LocalDateTime localDateTime =LocalDateTime.ofEpochSecond(Long.valueOf(datetime),0, ZoneOffset.ofHours(8));
+            localDateTime.plusMinutes(10);
+
+            // 校验签名是否过期
+            if (StringUtils.isBlank(datetime) || System.currentTimeMillis() > Long.valueOf(datetime)) {
+                responseBean.addError(ResponseErrorsMessages.SIGN_DATETIME_ERROR.getCode(), ResponseErrorsMessages.SIGN_DATETIME_ERROR.getMsg());
+                responseWriter(response, responseBean);
+                return;
+            }
+        } catch (Exception e) {
+            responseBean.addError(ResponseErrorsMessages.SIGN_ERROR.getCode(), ResponseErrorsMessages.SIGN_ERROR.getMsg());
+            responseWriter(response, responseBean);
+            return;
+        }
+
+
+
+
+        // 获取请求的所有参数
+        Map<String, String[]> parameterMap = request.getParameterMap();
+        parameterMap.entrySet().forEach(e-> {
+            String key = e.getKey();
+            String [] value = e.getValue();
+            if (!"sign".equals(key) && !"appSecret".equals(key)) {
+                treeMap.put(key, value[0]);
+            }
+        });
+
+        String sign = DaSuSign.createSign(treeMap, daSuProperties.getAppSecret());
+        String parameterSign = request.getParameter("sign");
+
+        if (DaSuSign.isMD5Sign(sign, parameterSign)) {
+            chain.doFilter(request, response);
+        } else {
+            responseBean.addError(ResponseErrorsMessages.SIGN_ERROR.getCode(), ResponseErrorsMessages.SIGN_ERROR.getMsg());
+            responseWriter(response, responseBean);
+        }
+
+    }
+
+    private void responseWriter(ServletResponse response, ResponseBean responseBean) {
+        response.setContentType("application/json;charset=UTF-8");
+        PrintWriter writer = null;
+        try {
+            writer = response.getWriter();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        writer.write(JSONObject.toJSONString(responseBean));
+        writer.flush();
+        writer.close();
+    }
+}

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

@@ -29,17 +29,17 @@ public interface FaceServiceI extends IService<TaFace> {
 
     /**
      * 当前登入人是否有人脸信息
-     * @param userElement
-     * @param otherUserId
+     * @param userId
+     * @param userVerifyId
      * @return
      */
-    ResponseBean getTaFaceByUserId(UserElement userElement, Integer otherUserId);
+    ResponseBean getTaFaceByUserId(Integer userId, Integer userVerifyId);
 
     /**
      * 删除人脸
-     * @param userElement
-     * @param otherUserId
+     * @param userId
+     * @param userVerifyId
      * @return
      */
-    ResponseBean deleteFace(UserElement userElement, Integer otherUserId, Integer verifyId);
+    ResponseBean deleteFace(Integer userId, Integer userVerifyId);
 }

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

@@ -34,7 +34,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service("faceServicel")
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 @Slf4j
 public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> implements FaceServiceI {
 
@@ -106,9 +106,9 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
     /**
      * 修改人脸信息
      *
-     * @param userElement 登入人ID
+     * @param userId 登入人ID
+     * @param userVerifyId 房产审核id
      * @param uploadFile
-     * @param otherUserId 关联家属或者租客ID
      * @return
      */
     @Override
@@ -145,9 +145,9 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         face.setUpdateDate(new Date());
         ResponseBean resps = checKout(faceImg, face, false, uploadFile, userId, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
         if (resps.getCode().equals("0")) {
-            resps.addSuccess((Object) faceImg);
+            resps.addSuccess(face);
         } else {
-            resps.addError(resps.getMessage());
+            resps.addError(resps.getCode(), resps.getMessage());
         }
         return resps;
     }
@@ -173,7 +173,6 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         if (user.getHkUserId() == null) {
             log.error("本地库人员ID：{}  的海康人员ID不存在", userId);
             throw new WisdomException(ResponseErrorsMessages.NOT_PUSH_FACE.getCode(), ResponseErrorsMessages.NOT_PUSH_FACE.getMsg());
-            return responseBean;
         }
         AESDecode aesd = new AESDecode();
         String body = "{\"type\": \"0\", \"image_url\":\"" + faceImg + "\"}";
@@ -196,7 +195,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
                 } else {
                     taFaceMapper.updateById(taFace);
                 }
-                responseBean.addSuccess("操作成功");
+                responseBean.addSuccess(taFace);
 
                 // 设备树
                 TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
@@ -235,12 +234,12 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
 //                visualList.add("10010100000");
                 HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
             } else {
-                responseBean.addError("请录入正确图片");
+                responseBean.addError(ResponseErrorsMessages.FACE_ERROR.getCode(), ResponseErrorsMessages.FACE_ERROR.getMsg());
             }
         } catch (Exception e) {
             e.printStackTrace();
             log.error("海康人脸推送失敗！ {}", e);
-            throw new RuntimeException("海康人脸推送失敗！");
+            throw new WisdomException(ResponseErrorsMessages.NOT_PUSH_FACE.getCode(), ResponseErrorsMessages.NOT_PUSH_FACE.getMsg());
         }
         return responseBean;
     }
@@ -264,41 +263,26 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
      * 当前登入人是否有人脸信息
      */
     @Override
-    public ResponseBean getTaFaceByUserId(UserElement userElement, Integer otherUserId) {
+    public ResponseBean getTaFaceByUserId(Integer userId, Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
-        Integer userVerifyId = userElement.getUserVerifyId();
 
-        /**当otherUserId不为空时判断它是否是业主下的租客或者家属*/
-        if (null != otherUserId) {
-            TaUserVerify userVerify = getTaFaceParentId(userElement, otherUserId);
-            userVerifyId = userVerify.getUserVerifyId();
+        TaUserVerify userVerify = taUserVerifyMapper.selectByUserIdAndUserVerifyId(userId, userVerifyId);
+        if (null == userVerify) {
+            responseBean.addError(ResponseErrorsMessages.NOT_USER_VERIFY.getCode(), ResponseErrorsMessages.NOT_USER_VERIFY.getMsg());
+            return responseBean;
         }
+
+
         TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
         if (null != face) {
             responseBean.addSuccess(face);
             return responseBean;
         }
-        responseBean.addError("当前用户暂无人脸图片");
+        responseBean.addError(ResponseErrorsMessages.NOT_USER_FACE.getCode(), ResponseErrorsMessages.NOT_USER_FACE.getMsg());
         return responseBean;
 
     }
 
-    /**
-     * 判断当前用户下的人员关系（家属，租客）
-     */
-    public TaUserVerify getTaFaceParentId(UserElement userElement, Integer otherUserId) {
-        // 根据 家属/租客 的id， 和 当前的房产信息进行查询是否有值，有值就说明是 家属/租客
-        List<TaUserVerify> todUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndVerifyStatus(otherUserId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId(), 1);
-        // 判断 家属或者租客 属不属于这个业主的下面
-        if (null == todUserVerify || todUserVerify.size() == 0) {
-            throw new WisdomException("您输入的家属或租户ID有误或审核未通过！");
-        }
-//        if (!Constant.VERIFY_STATUS.equals(todUserVerify.get(0).getVerifyStatus())) {
-//            throw new WisdomException("用户房产审核未通过！");
-//        }
-
-        return todUserVerify.get(0);
-    }
 
     /**
      * 得到当前图片
@@ -321,14 +305,14 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
 
         TaUserVerify userVerify = taUserVerifyMapper.selectById(userVerifyId);
         if (null == userVerify) {
-            response.addError("当前房产审核记录不存在！");
+            response.addError(ResponseErrorsMessages.NOT_VERIFY.getCode(), ResponseErrorsMessages.NOT_VERIFY.getMsg());
             return response;
         }
         TaUser taUser = taUserMapper.selectById(userid);
 
         //身份为家属租客，状态为已停用
         if (null != taUser && !Constant.EFFECTIVE_STATUS.equals(taUser.getStatus())) {
-            response.addError("9996", "您的身份已停用，请联系物业");
+            response.addError(ResponseErrorsMessages.NOT_IDENTITY_VERIFY.getCode(), ResponseErrorsMessages.NOT_IDENTITY_VERIFY.getMsg());
             return response;
         }
 
@@ -339,26 +323,26 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
             if (Constant.EFFECTIVE_STATUS.equals(taUser.getStatus())) {
                 ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(),tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
                 if (responseBean.getCode().equals("0")) {
-                    responseBean.addSuccess("图片录入成功");
+                    responseBean.addSuccess("人脸录入成功");
                 } else {
-                    responseBean.addError(responseBean.getMessage());
+                    responseBean.addError(responseBean.getCode(),responseBean.getMessage());
                 }
                 return responseBean;
             }
         }
-        response.addError("您的信息已存在");
+        response.addError(ResponseErrorsMessages.EXIST_FACE.getCode(), ResponseErrorsMessages.EXIST_FACE.getMsg());
         return response;
     }
 
     @Override
-    public ResponseBean deleteFace(UserElement userElement, Integer otherUserId, Integer verifyId) {
+    public ResponseBean deleteFace(Integer userId, Integer userVerifyId) {
         ResponseBean responseBean= new ResponseBean();
-        TaUserVerify taUserVerify= infoExist(userElement.getUserVerifyId());
+        TaUserVerify taUserVerify= infoExist(userVerifyId);
         if (null ==taUserVerify) {
-            responseBean.addError("房产审核未通过");
+            responseBean.addError(ResponseErrorsMessages.NOT_USER_VERIFY_1.getCode(), ResponseErrorsMessages.NOT_USER_VERIFY_1.getMsg());
             return responseBean;
         }
-            TaUser taUser = taUserMapper.selectById(taUserVerify.getUserId());
+        TaUser taUser = taUserMapper.selectById(taUserVerify.getUserId());
 
         // 设备树
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(taUserVerify.getCommunityId());
@@ -401,11 +385,12 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
 
         if (object.get("errorCode").equals(1)){
             String errorMessage=  object.getString("errorMessage");
-            responseBean.addError(errorMessage);
+            log.info("删除人脸信息异常：{}", data);
+            responseBean.addError(ResponseErrorsMessages.DELETE_FACE.getCode(), ResponseErrorsMessages.DELETE_FACE.getMsg());
             return responseBean;
         }
-        Integer activeUser = otherUserId == null ? userElement.getUserVerifyId() : otherUserId;
-        taFaceMapper.deleteFace(activeUser);
+
+        taFaceMapper.deleteFace(userVerifyId);
         // 异动同步到设备
         Map<String,Object> appointJurisdictionMap = Maps.newHashMap();
         appointJurisdictionMap.put("appkey", tpEquipmentTree.getAppkey());
@@ -424,17 +409,20 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
 
     }
 
-    /*校验房产是否审核通过*/
+    /**
+     * 校验房产是否审核通过
+     * @param verifyID
+     * @return
+     */
     public TaUserVerify infoExist(Integer verifyID){
-        /*查询当前的房产ID*/
-        TaUserVerify taUserVerify = null;
-      if (!"".equals(verifyID)) {
+      TaUserVerify taUserVerify = null;
+      if (null != verifyID) {
         taUserVerify = taUserVerifyMapper.selectById(verifyID);
       }
       if (null!= taUserVerify && taUserVerify.getVerifyStatus().equals("1")) {
           return taUserVerify;
       }
-      return  null;
+      return  taUserVerify;
     }
 }
 

CODE/foreign-service/src/main/resources/mapper/TaFaceMapper.xml

@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.community.huiju.dao.TaFaceMapper">
 
+    <select id="getByUserVerifyId" resultType="com.community.huiju.model.TaFace" parameterType="java.lang.Integer">
+        select
+        *
+        from ta_face
+        where ta_user_verify_id = #{userVerifyId,jdbcType=INTEGER}
+    </select>
+
+    <delete id="deleteFace" >
+        delete from ta_face
+        where ta_user_verify_id = #{verifyId}
+    </delete>
+
 </mapper>

CODE/foreign-service/src/main/resources/mapper/TaUserVerifyMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="selectCommunityAndAddressAndVerifyStatus" resultType="com.community.huiju.model.TaUserVerify">
         select
-        <include refid="Base_Column_List"/>
+        *
         from ta_user_verify
         where community_id = #{communityId,jdbcType=INTEGER}
         and user_id = #{userId,jdbcType=INTEGER}

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

@@ -167,8 +167,12 @@ public class TicketController extends BaseController {
 
     @ApiOperation(value = "物业，门卫，领导电话", notes = "物业，门卫，领导电话")
     @RequestMapping(value = "/allTpAnnouncementTel", method = RequestMethod.GET)
-    public ResponseBean getTpAnnouncementTel() {
-        ResponseBean agreement = agreementServicel.getTpAnnouncementTel();
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    public ResponseBean getTpAnnouncementTel(HttpSession session) {
+        UserElement userElement = getUserElement(session);
+        ResponseBean agreement = agreementServicel.getTpAnnouncementTel(userElement);
         return agreement;
     }
 

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

@@ -191,10 +191,10 @@ public class WxPayController {
 	@ApiOperation(value = "取消支付", notes = "取消支付")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "path", dataType = "String", name = "outTradeNo", value = "订单号"),
-			@ApiImplicitParam(paramType = "form", dataType = "String", name = "outTradeNo", value = "type: 类型(car 车缴费, bill 物业缴费)"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "type: 类型(car 车缴费, bill 物业缴费)"),
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
 	})
-	@RequestMapping(value = "/wxCancelPay/{outTradeNo}",method = RequestMethod.POST)
+	@RequestMapping(value = "/wxCancelPay/{outTradeNo}",method = RequestMethod.GET)
 	public ResponseBean wxCancelPay(@PathVariable("outTradeNo") String outTradeNo, @RequestParam("type") String type,HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		try {

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

@@ -28,7 +28,7 @@ public interface TaUserLicenseOrderMapper {
      * @return
      */
     @ResultMap("BaseResultMap")
-    @Select("select * from ta_user_license_order where community_id = #{communityId} and ta_user_id = #{userId} and order_status = 1")
+    @Select("select * from ta_user_license_order where community_id = #{communityId} and ta_user_id = #{userId} and order_status = 1 order by update_date DESC")
     List<TaUserLicenseOrder> selectRecords(@Param("communityId") Integer communityId, @Param("userId") Integer userId);
 
     /**

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

@@ -3,9 +3,10 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpannouncementTel;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 @Mapper
 public interface TpannouncementTelMapper {
-    List<TpannouncementTel> getTpannouncementTel();
+    List<TpannouncementTel> getTpannouncementTel(@Param("communityId") Integer communityId);
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.TaAgreement;
 
 import java.util.List;
@@ -30,7 +31,9 @@ public interface AgreementServicel {
 
     /**
      * 物业电话/门卫电话/领导电话
+     *
+     * @param userElement
      * @return
      */
-    ResponseBean getTpAnnouncementTel();
+    ResponseBean getTpAnnouncementTel(UserElement userElement);
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service.impl;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TaAgreementMapper;
 import com.community.huiju.dao.TpannouncementTelMapper;
 import com.community.huiju.model.TaAgreement;
@@ -62,9 +63,9 @@ public class AgreementServiceimpl implements AgreementServicel {
     }
 
     @Override
-    public ResponseBean getTpAnnouncementTel() {
+    public ResponseBean getTpAnnouncementTel(UserElement userElement) {
         ResponseBean responseBody = new ResponseBean();
-        List<TpannouncementTel> tt = tpannouncementTelMapper.getTpannouncementTel();
+        List<TpannouncementTel> tt = tpannouncementTelMapper.getTpannouncementTel(userElement.getCommunityId());
         responseBody.addSuccess(tt);
         return responseBody;
     }

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

@@ -60,16 +60,17 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
         int rows = 0;
         if (null == taUserLicense.getId()) {
             rows = taUserLicenseMapper.insertSelective(taUserLicense);
+            responseBean.addSuccess(taUserLicense);
         } else {
             taUserLicense.setUpdateUser(userElement.getId());
             taUserLicense.setUpdateDate(new Date());
             rows = taUserLicenseMapper.updateByPrimaryKeySelective(taUserLicense);
+            responseBean.addSuccess("当前小区已关联此车牌");
         }
 
 
         if (rows > 0) {
             taUserLicense.setUnitPrice(String.valueOf(Double.valueOf(taUserLicense.getUnitPrice()) / 100));
-            responseBean.addSuccess(taUserLicense);
             return responseBean;
         }
 

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

@@ -19,7 +19,6 @@
     select
     <include refid="Base_Column_List" />
     from tp_announcement_tel
-
-
+    where community_id = #{communityId}
   </select>
 </mapper>