Browse Source

修改门禁点

weiximei 6 years ago
parent
commit
43ed0d0189

+ 12
- 12
CODE/foreign-service/src/main/java/com/community/huiju/controller/FSController.java View File

@@ -24,10 +24,10 @@ public class FSController extends BaseController {
24 24
     @ApiImplicitParams({
25 25
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
26 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 32
     public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo,
33 33
                                            @RequestParam(value = "communityId") Integer communityId) {
@@ -41,10 +41,10 @@ public class FSController extends BaseController {
41 41
     @ApiImplicitParams({
42 42
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
43 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 49
     public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo,
50 50
                                                     @RequestParam(value = "communityId") Integer communityId) {
@@ -58,10 +58,10 @@ public class FSController extends BaseController {
58 58
     @ApiImplicitParams({
59 59
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
60 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 66
     public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo,
67 67
                                                          @RequestParam(value = "communityId") Integer communityId) {

+ 16
- 16
CODE/foreign-service/src/main/java/com/community/huiju/controller/TaFceController.java View File

@@ -32,10 +32,10 @@ public class TaFceController extends BaseController {
32 32
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
33 33
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
34 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 40
     public ResponseBean addFace(@RequestParam(value = "userId") Integer userId,
41 41
                                 @RequestParam(value = "userVerifyId") Integer userVerifyId,
@@ -54,10 +54,10 @@ public class TaFceController extends BaseController {
54 54
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
55 55
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
56 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 62
     public ResponseBean updateFace(@RequestParam(value = "userId") Integer userId,
63 63
                                 @RequestParam(value = "userVerifyId") Integer userVerifyId,
@@ -74,10 +74,10 @@ public class TaFceController extends BaseController {
74 74
     @ApiImplicitParams({
75 75
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
76 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 82
     public ResponseBean deleteFace(@RequestParam(value = "userId") Integer userId,
83 83
                                    @RequestParam(value = "userVerifyId") Integer userVerifyId) {
@@ -94,10 +94,10 @@ public class TaFceController extends BaseController {
94 94
     @ApiImplicitParams({
95 95
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userId", value = "用户Id"),
96 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 102
     public ResponseBean getTaFaceByUserId(@RequestParam(value = "userId") Integer userId,
103 103
                                    @RequestParam(value = "userVerifyId") Integer userVerifyId) {

+ 4
- 4
CODE/foreign-service/src/main/java/com/community/huiju/controller/TaUserController.java View File

@@ -74,10 +74,10 @@ public class TaUserController extends BaseController {
74 74
     @ApiOperation(value = "根据用户ID查询", notes = "根据用户ID查询")
75 75
     @ApiImplicitParams({
76 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 82
     public ResponseBean updateUser(@PathVariable(value = "userId") Integer userId){
83 83
         ResponseBean responseBean = iTaUserService.getTaUser(userId);

+ 1
- 1
CODE/foreign-service/src/main/java/com/community/huiju/filter/SignFilter.java View File

@@ -29,7 +29,7 @@ import java.util.TreeMap;
29 29
  *
30 30
  * @author weiximei on 2019-05-17
31 31
  */
32
-//@Component
32
+@Component
33 33
 @Slf4j
34 34
 public class SignFilter implements Filter {
35 35
 

+ 1
- 1
CODE/foreign-service/src/main/resources/application-dev.yml View File

@@ -4,4 +4,4 @@ spring:
4 4
       driver-class-name: com.mysql.jdbc.Driver
5 5
       username: root
6 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 View File

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