瀏覽代碼

修改门禁点

weiximei 6 年之前
父節點
當前提交
43ed0d0189

+ 12
- 12
CODE/foreign-service/src/main/java/com/community/huiju/controller/FSController.java 查看文件

24
     @ApiImplicitParams({
24
     @ApiImplicitParams({
25
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
25
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
26
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
26
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
27
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
28
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
29
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
30
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
27
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
28
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
29
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
30
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
31
     })
31
     })
32
     public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo,
32
     public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo,
33
                                            @RequestParam(value = "communityId") Integer communityId) {
33
                                            @RequestParam(value = "communityId") Integer communityId) {
41
     @ApiImplicitParams({
41
     @ApiImplicitParams({
42
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
42
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
43
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
43
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
44
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
45
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
46
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
47
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
44
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
45
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
46
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
47
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
48
     })
48
     })
49
     public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo,
49
     public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo,
50
                                                     @RequestParam(value = "communityId") Integer communityId) {
50
                                                     @RequestParam(value = "communityId") Integer communityId) {
58
     @ApiImplicitParams({
58
     @ApiImplicitParams({
59
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
59
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
60
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
60
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
61
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
62
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
63
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
64
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
61
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
62
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
63
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
64
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
65
     })
65
     })
66
     public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo,
66
     public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo,
67
                                                          @RequestParam(value = "communityId") Integer communityId) {
67
                                                          @RequestParam(value = "communityId") Integer communityId) {

+ 16
- 16
CODE/foreign-service/src/main/java/com/community/huiju/controller/TaFceController.java 查看文件

32
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
32
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
33
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
33
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
34
             @ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", value = "图片"),
34
             @ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", value = "图片"),
35
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
36
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
37
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
38
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
35
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
36
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
37
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
38
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
39
     })
39
     })
40
     public ResponseBean addFace(@RequestParam(value = "userId") Integer userId,
40
     public ResponseBean addFace(@RequestParam(value = "userId") Integer userId,
41
                                 @RequestParam(value = "userVerifyId") Integer userVerifyId,
41
                                 @RequestParam(value = "userVerifyId") Integer userVerifyId,
54
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
54
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
55
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
55
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
56
             @ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", value = "图片"),
56
             @ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", value = "图片"),
57
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
58
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
59
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
60
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
57
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
58
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
59
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
60
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
61
     })
61
     })
62
     public ResponseBean updateFace(@RequestParam(value = "userId") Integer userId,
62
     public ResponseBean updateFace(@RequestParam(value = "userId") Integer userId,
63
                                 @RequestParam(value = "userVerifyId") Integer userVerifyId,
63
                                 @RequestParam(value = "userVerifyId") Integer userVerifyId,
74
     @ApiImplicitParams({
74
     @ApiImplicitParams({
75
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
75
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
76
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
76
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
77
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
78
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
79
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
80
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
77
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
78
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
79
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
80
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
81
     })
81
     })
82
     public ResponseBean deleteFace(@RequestParam(value = "userId") Integer userId,
82
     public ResponseBean deleteFace(@RequestParam(value = "userId") Integer userId,
83
                                    @RequestParam(value = "userVerifyId") Integer userVerifyId) {
83
                                    @RequestParam(value = "userVerifyId") Integer userVerifyId) {
94
     @ApiImplicitParams({
94
     @ApiImplicitParams({
95
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userId", value = "用户Id"),
95
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userId", value = "用户Id"),
96
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userVerifyId", value = "房产审核Id"),
96
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userVerifyId", value = "房产审核Id"),
97
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
98
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
99
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
100
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
97
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
98
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
99
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
100
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
101
     })
101
     })
102
     public ResponseBean getTaFaceByUserId(@RequestParam(value = "userId") Integer userId,
102
     public ResponseBean getTaFaceByUserId(@RequestParam(value = "userId") Integer userId,
103
                                    @RequestParam(value = "userVerifyId") Integer userVerifyId) {
103
                                    @RequestParam(value = "userVerifyId") Integer userVerifyId) {

+ 4
- 4
CODE/foreign-service/src/main/java/com/community/huiju/controller/TaUserController.java 查看文件

74
     @ApiOperation(value = "根据用户ID查询", notes = "根据用户ID查询")
74
     @ApiOperation(value = "根据用户ID查询", notes = "根据用户ID查询")
75
     @ApiImplicitParams({
75
     @ApiImplicitParams({
76
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "path", name = "userId", value = "用户id"),
76
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "path", name = "userId", value = "用户id"),
77
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
78
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
79
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
80
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
77
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
78
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
79
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
80
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
81
     })
81
     })
82
     public ResponseBean updateUser(@PathVariable(value = "userId") Integer userId){
82
     public ResponseBean updateUser(@PathVariable(value = "userId") Integer userId){
83
         ResponseBean responseBean = iTaUserService.getTaUser(userId);
83
         ResponseBean responseBean = iTaUserService.getTaUser(userId);

+ 1
- 1
CODE/foreign-service/src/main/java/com/community/huiju/filter/SignFilter.java 查看文件

29
  *
29
  *
30
  * @author weiximei on 2019-05-17
30
  * @author weiximei on 2019-05-17
31
  */
31
  */
32
-//@Component
32
+@Component
33
 @Slf4j
33
 @Slf4j
34
 public class SignFilter implements Filter {
34
 public class SignFilter implements Filter {
35
 
35
 

+ 1
- 1
CODE/foreign-service/src/main/resources/application-dev.yml 查看文件

4
       driver-class-name: com.mysql.jdbc.Driver
4
       driver-class-name: com.mysql.jdbc.Driver
5
       username: root
5
       username: root
6
       password: DQ@0lW##kBb2+-jPZC1s$Ma0h5$9W((q
6
       password: DQ@0lW##kBb2+-jPZC1s$Ma0h5$9W((q
7
-      url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/smart_community2.0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
7
+      url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/smart_community2.2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true

+ 1
- 1
CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKOpenApi.java 查看文件

194
         //设置时间参数
194
         //设置时间参数
195
         parMap.put("time", System.currentTimeMillis());
195
         parMap.put("time", System.currentTimeMillis());
196
         parMap.put("pageNo",1);
196
         parMap.put("pageNo",1);
197
-        parMap.put("pageSize",10);
197
+        parMap.put("pageSize",100);
198
         parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
198
         parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
199
         String params =  JSON.toJSONString(parMap);
199
         String params =  JSON.toJSONString(parMap);
200
         log.info("分页获取门禁点信息请求参数:{}", params);
200
         log.info("分页获取门禁点信息请求参数:{}", params);