代码同步

src/main/java/com/fdkankan/ucenter/controller/app/AppController.java

@@ -51,6 +51,11 @@ public class AppController {
         return Result.success(appService.login2(param));
     }
 
+    /**
+     * 验证码登陆
+     * @param user
+     * @return
+     */
     @PostMapping("/quickLogin")
     public Result quickLogin(@RequestBody LoginParam param){
         return  Result.success(appService.quickLogin(param));

src/main/java/com/fdkankan/ucenter/controller/inner/InnerController.java

@@ -39,7 +39,7 @@ public class InnerController extends BaseController {
     private RedisUtil redisUtil;
 
     /**
-     * 下载全景图数据
+     * 根据场景码获取token
      */
     @GetMapping("/createTokenByNum")
     public Result createTokenByNum(String num) throws Exception{

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -87,6 +87,61 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
 
     @Override
+    public HashMap<String, Object> deadline(String username) {
+        //7天内过期的集合
+        List<CameraSpaceVo> cameraSpaceList = new ArrayList<>();
+        //所有期限的集合
+        List<CameraSpaceVo> cameraSpaceAll = new ArrayList<>();
+        User user = userService.getByUserName(username);
+        CameraParam param = new CameraParam();
+        param.setPageNum(1);
+        param.setPageSize(100);
+        param.setUserId(user.getId());
+        Page<CameraVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        List<Long> cameraIdList = page.getRecords().parallelStream().map(CameraVo::getId).collect(Collectors.toList());
+        if(cameraIdList.size() >0){
+            HashMap<Long, CameraSpaceVo> cameraSpaceMap = cameraSpaceService.getVoListByCameraIds(cameraIdList);
+            for (CameraVo responseCamera : page.getRecords()) {
+                CameraSpaceVo cameraSpace = cameraSpaceMap.get(responseCamera.getId());
+                if(cameraSpace != null){
+                    DateTime dateTime  = new DateTime(cameraSpace.getSpaceEndTime());
+                    cameraSpace.setSnCode(responseCamera.getSnCode());
+                    cameraSpace.setUsedSpace(Double.parseDouble(responseCamera.getUsedSpace()));
+                    cameraSpace.setUsedSpaceStr(responseCamera.getUsedSpaceStr());
+                    cameraSpace.setTotalSpace(Double.parseDouble(responseCamera.getTotalSpace()));
+                    cameraSpace.setTotalSpaceStr(responseCamera.getTotalSpaceStr());
+
+                    Long space = cameraSpace.getSpace();
+                    cameraSpace.setSpace((long)FileSizeUtil.formetFileSize(space, FileSizeUtil.SIZETYPE_GB));
+                    cameraSpace.setSpaceStr(FileSizeUtil.formatFileSize(space));
+                    cameraSpace.setSpaceEndStr(DateUtil.date2String(cameraSpace.getSpaceEndTime(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
+
+                    if(Days.daysBetween(new DateTime(), dateTime).getDays() < 7){
+                        cameraSpaceList.add(cameraSpace);
+                        cameraSpaceAll.add(cameraSpace);
+                        continue;
+                    }
+                    cameraSpaceAll.add(cameraSpace);
+                }
+            }
+        }
+        HashMap<String,Object> map = new HashMap<>();
+        map.put("nickName", user.getNickName());
+
+        if(cameraSpaceList.size() > 0){
+            map.put("isExpire", true);
+            Collections.sort(cameraSpaceList);
+            map.put("cameraList", cameraSpaceList);
+            return map;
+        }
+
+        map.put("isExpire", false);
+        Collections.sort(cameraSpaceAll);
+        map.put("cameraList", cameraSpaceAll);
+        return map;
+    }
+
+    @Override
     public PageInfo pageList(CameraParam param) {
         User user = userService.getByUserName(param.getUserName());
         param.setUserId(user.getId());
@@ -147,61 +202,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
 
     @Override
-    public HashMap<String, Object> deadline(String username) {
-        //7天内过期的集合
-        List<CameraSpaceVo> cameraSpaceList = new ArrayList<>();
-        //所有期限的集合
-        List<CameraSpaceVo> cameraSpaceAll = new ArrayList<>();
-        User user = userService.getByUserName(username);
-        CameraParam param = new CameraParam();
-        param.setPageNum(1);
-        param.setPageSize(100);
-        param.setUserId(user.getId());
-        Page<CameraVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
-        List<Long> cameraIdList = page.getRecords().parallelStream().map(CameraVo::getId).collect(Collectors.toList());
-        if(cameraIdList.size() >0){
-            HashMap<Long, CameraSpaceVo> cameraSpaceMap = cameraSpaceService.getVoListByCameraIds(cameraIdList);
-            for (CameraVo responseCamera : page.getRecords()) {
-                CameraSpaceVo cameraSpace = cameraSpaceMap.get(responseCamera.getId());
-                if(cameraSpace != null){
-                    DateTime dateTime  = new DateTime(cameraSpace.getSpaceEndTime());
-                    cameraSpace.setSnCode(responseCamera.getSnCode());
-                    cameraSpace.setUsedSpace(Double.parseDouble(responseCamera.getUsedSpace()));
-                    cameraSpace.setUsedSpaceStr(responseCamera.getUsedSpaceStr());
-                    cameraSpace.setTotalSpace(Double.parseDouble(responseCamera.getTotalSpace()));
-                    cameraSpace.setTotalSpaceStr(responseCamera.getTotalSpaceStr());
-
-                    Long space = cameraSpace.getSpace();
-                    cameraSpace.setSpace((long)FileSizeUtil.formetFileSize(space, FileSizeUtil.SIZETYPE_GB));
-                    cameraSpace.setSpaceStr(FileSizeUtil.formatFileSize(space));
-                    cameraSpace.setSpaceEndStr(DateUtil.date2String(cameraSpace.getSpaceEndTime(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
-
-                    if(Days.daysBetween(new DateTime(), dateTime).getDays() < 7){
-                        cameraSpaceList.add(cameraSpace);
-                        cameraSpaceAll.add(cameraSpace);
-                        continue;
-                    }
-                    cameraSpaceAll.add(cameraSpace);
-                }
-            }
-        }
-        HashMap<String,Object> map = new HashMap<>();
-        map.put("nickName", user.getNickName());
-
-        if(cameraSpaceList.size() > 0){
-            map.put("isExpire", true);
-            Collections.sort(cameraSpaceList);
-            map.put("cameraList", cameraSpaceList);
-            return map;
-        }
-
-        map.put("isExpire", false);
-        Collections.sort(cameraSpaceAll);
-        map.put("cameraList", cameraSpaceAll);
-        return map;
-    }
-
-    @Override
     public void unbind(Long cameraId, String ids,String userName) {
         if(cameraId != null){
             ids = cameraId.toString();