Merge remote-tracking branch 'origin/master'

common/src/main/java/com/huaxu/model/ResultStatus.java

@@ -50,6 +50,8 @@ public enum ResultStatus {
     USERGROUP_HAS_USER(300005,"请先解除用户与此用户组绑定关系"),
     ROLE_HAS_DISABLE(300008,"该用户角色已经被禁用，无法登录"),
     ORG_INFO_ERROR(300009,"公司/部门信息错误"),
+    APP_INFO_ERROR(300010,"appkey活appsecret错误"),
+    DEVICESERIAL_INFO_ERROR(300011,"设备序列号错误"),
 
     //400 工作流模块
     PROCESS_DEPLOY_FAILED(400006,"流程部署失败"),

sms_water/src/main/java/com/huaxu/service/impl/CameraManageServiceImpl.java

@@ -108,10 +108,14 @@ public class CameraManageServiceImpl implements CameraManageService {
         }
         cameraManage.setDateCreate(new Date());
         cameraManage.setCreateBy(currentUser.getUsername());
-        this.cameraManageMapper.insert(cameraManage);
-
         updateCameraName(cameraManage);
 
+            this.cameraManageMapper.insert(cameraManage);
+
+
+
+
+
         return 1;
     }
     private boolean isOrgCorrect(Integer companyId, Integer departmentId, List<ProgramItem>items){
@@ -135,8 +139,12 @@ public class CameraManageServiceImpl implements CameraManageService {
 
         return result;
     }
-    private void updateCameraName(CameraManage cameraManage){
+    private int updateCameraName(CameraManage cameraManage){
+        int result=1;
         String token = getToken(cameraManage.getAppkey(), cameraManage.getScrert());
+        if(token==null){
+            result=3;
+        }
         HttpHeaders headers = new HttpHeaders();
 
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
@@ -151,8 +159,12 @@ public class CameraManageServiceImpl implements CameraManageService {
         String url="https://open.ys7.com/api/lapp/camera/name/update";
         //String result = restTemplate.postForObject(url, "accessToken=at.d01poowjc4bwrwpyc3czs53nbc8m7v0a-39jm695wjp-14xe4rj-xbsmxw8en&deviceSerial=E40848837&deviceName=888&name=888&channelNo=1", String.class);
         ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity(url, requestEntity, String.class);
-        String result=stringResponseEntity.getBody();
-
+        JSONObject info = JSONObject.parseObject(stringResponseEntity.getBody());
+        Integer code = info.getInteger("code");
+        if(code!=200){
+            result=4;
+        }
+        return result;
 
     }
     private String getToken (String appKey,String secret){
@@ -170,11 +182,15 @@ public class CameraManageServiceImpl implements CameraManageService {
 //  执行HTTP请求
             ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity("https://open.ys7.com/api/lapp/token/get", requestEntity, String.class);
             JSONObject info = JSONObject.parseObject(stringResponseEntity.getBody());
+            Integer code = info.getInteger("code");
             JSONObject data = info.getJSONObject("data");
-            token=data.getString("accessToken");
-            long expireTime=data.getLong("expireTime");
-            redisUtil.set(appKey,token);
-            redisUtil.setExpire(appKey,expireTime-1000);
+            if(code==200){
+                token=data.getString("accessToken");
+                long expireTime=data.getLong("expireTime");
+                redisUtil.set(appKey,token);
+                redisUtil.setExpire(appKey,expireTime-1000);
+            }
+
         }
 
         return token;
@@ -207,8 +223,11 @@ public class CameraManageServiceImpl implements CameraManageService {
         }
         cameraManage.setDateUpdate(new Date());
         cameraManage.setUpdateBy(currentUser.getUsername());
-        this.cameraManageMapper.update(cameraManage);
+
         updateCameraName(cameraManage);
+
+            this.cameraManageMapper.update(cameraManage);
+
         return 1;
     }