暂存

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

@@ -34,7 +34,7 @@ public class HKConstant {
    //public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
     //  public static final String OPENAPI_IP_PORT_HTTPS = "http://192.168.0.122";
     //public static final String OPENAPI_IP_PORT_HTTP = "http://huiju.ngrok.xiaomiqiu.cn";
-    public static final String OPENAPI_IP_PORT_HTTP = "http://huifang.ngrok.xiaomiqiu.cn";
+    public static final String OPENAPI_IP_PORT_HTTP = "http://huifang.vipgz1.idcfengye.com";
 
     /**
      * <p>操作用户UUID，即用户UUID，首次使用操作用户UUID可以通过接口 [获取默认用户UUID]来获取</p>

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

@@ -47,6 +47,7 @@ public class HKOpenApi {
         } catch (Exception e) {
             e.printStackTrace();
             log.error("获取监控列表失败!",e);
+            throw new RuntimeException("获取监控列表失败!");
         }
 
         return data;
@@ -78,6 +79,7 @@ public class HKOpenApi {
         } catch (Exception e) {
             e.printStackTrace();
             log.error("根据部门名称分页获取部门失败!",e);
+            throw new RuntimeException("根据部门名称分页获取部门失败!");
         }
 
         return data;
@@ -112,6 +114,7 @@ public class HKOpenApi {
         } catch (Exception e) {
             e.printStackTrace();
             log.error("添加人员失败!",e);
+            throw new RuntimeException("添加人员失败!");
         }
 
         return data;
@@ -144,6 +147,7 @@ public class HKOpenApi {
         } catch (Exception e) {
             e.printStackTrace();
             log.error("批量开卡失败!",e);
+            throw new RuntimeException("批量开卡失败!");
         }
 
         return data;
@@ -174,6 +178,7 @@ public class HKOpenApi {
         } catch (Exception e) {
             e.printStackTrace();
             log.error("获取失败!",e);
+            throw new RuntimeException("获取失败!");
         }
 
         return data;
@@ -203,6 +208,7 @@ public class HKOpenApi {
         } catch (Exception e) {
             e.printStackTrace();
             log.error("获取失败!",e);
+            throw new RuntimeException("获取失败!");
         }
 
         return data;
@@ -232,7 +238,8 @@ public class HKOpenApi {
             log.info("获取控制中心信息 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("获取失败!",e);
+            log.error("获取控制中心信息失败!",e);
+            throw new RuntimeException("获取控制中心信息失败!");
         }
 
         return data;
@@ -262,7 +269,8 @@ public class HKOpenApi {
             log.info("根据中心UUID分页获取下级区域 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("获取失败!",e);
+            log.error("根据中心UUID分页获取下级区域获取失败!",e);
+            throw new RuntimeException("根据中心UUID分页获取下级区域获取失败!");
         }
 
         return data;
@@ -289,7 +297,8 @@ public class HKOpenApi {
             log.info("根据区域UUID集获取门禁点 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("获取失败!",e);
+            log.error("根据区域UUID集获取门禁点获取失败!",e);
+            throw new RuntimeException("根据区域UUID集获取门禁点获取失败!");
         }
 
         return data;
@@ -318,7 +327,8 @@ public class HKOpenApi {
             log.info("根据人员ID集添加权限 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("获取失败!",e);
+            log.error("根据人员ID集添加权限!",e);
+            throw new RuntimeException("根据人员ID集添加权限!");
         }
 
         return data;
@@ -345,7 +355,8 @@ public class HKOpenApi {
             log.info("根据设备UUID集异动下载门禁权限 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("获取失败!",e);
+            log.error("根据设备UUID集异动下载门禁权限获取失败!",e);
+            throw new RuntimeException("根据设备UUID集异动下载门禁权限获取失败!");
         }
 
         return data;
@@ -374,7 +385,8 @@ public class HKOpenApi {
             log.info("指定人员人脸/指纹权限下载 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("获取失败!",e);
+            log.error("指定人员人脸/指纹权限下载获取失败!",e);
+            throw new RuntimeException("指定人员人脸/指纹权限下载获取失败!");
         }
 
         return data;
@@ -401,6 +413,7 @@ public class HKOpenApi {
             data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
         } catch (Exception e) {
             e.printStackTrace();
+            throw new RuntimeException("添加人脸失败!");
         }
         return data;
     }
@@ -442,6 +455,7 @@ public class HKOpenApi {
             data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
         } catch (Exception e) {
             e.printStackTrace();
+            throw new RuntimeException("修改人脸失败!");
         }
         return data;
     }
@@ -474,6 +488,7 @@ public class HKOpenApi {
         } catch (Exception e) {
             e.printStackTrace();
             log.error("修改加人员失败!",e);
+            throw new RuntimeException("修改加人员失败!");
         }
         return data;
     }
@@ -516,6 +531,7 @@ public class HKOpenApi {
         } catch (Exception e) {
             e.printStackTrace();
             log.error("获取失败!",e);
+            throw new RuntimeException("获取失败!");
         }
     
         return data;

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

@@ -148,7 +148,7 @@ public class TicketController extends BaseController {
     @ApiOperation(value = "添加 报修/投诉/联系单", notes = "添加 报修/投诉/联系单")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "ticketTitle:工单内容,ticketContent:小区标题，type: 0 代表 报修  1 代表 投诉  2代表 联系单 , repairType：0:公共区域  1: 房屋质量  2:户内设施, imageUrl:图片地址 "),
+                    "ticketTitle:工单标题,ticketContent:工单内容，type: 0 代表 报修  1 代表 投诉  2代表 联系单 , repairType：0:公共区域  1: 房屋质量  2:户内设施, imageUrl:图片地址 "),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addtpTicket", method = RequestMethod.POST)

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

@@ -1,5 +1,6 @@
 package com.community.huiju.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
@@ -33,10 +34,12 @@ public class VistorController extends BaseController {
 
     @RequestMapping(value = "/vistorDetail/{communityId}", method = RequestMethod.POST)
     @ApiOperation(value = "创建访客", notes = "创建访客")
-    @ApiImplicitParams({@ApiImplicitParam(name = "taVisitor", value = "访客", required = true, dataType = "TaVisitor"),
+    @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id")})
-    public ResponseBean findVistorDetail(@PathVariable("communityId")Integer communityId, @RequestBody TaVisitor taVisitor, HttpSession session) {
+            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value = "carLicense:车牌(数组),drivingStatus:0 是不开车 1是开车," +
+                    "visitorName:访问人姓名,visitorNum:访问人数,visitorTel:访问人电话,visitorStatrtTime:访问人电话,visitorEndTime:访问人结束时间")})
+    public ResponseBean findVistorDetail(@PathVariable("communityId")Integer communityId, @RequestBody String parameter, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
 
         if (!check(communityId)) {
@@ -46,6 +49,7 @@ public class VistorController extends BaseController {
 
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
+        TaVisitor taVisitor = JSONObject.parseObject(parameter,TaVisitor.class);
         responseBean = vistorServiceI.insertTaVistor(taVisitor, communityId, userId);
         return  responseBean;
     }

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

@@ -95,12 +95,13 @@ public class TaUserServiceImpl implements ITaUserService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean login(String loginName,String communityId,String code) {
         ResponseBean response = new ResponseBean();
         String phoneCode = (String) AppkeyCache.getCache(loginName);
         if ("1234".equals(code)) {
 
-        }else if (!phoneCode.equals(code)) {
+        }else if (StringUtils.isBlank(phoneCode) || !phoneCode.equals(code)) {
             response.addError("验证码错误!");
             return response;
         }