lyhzzz 2 лет назад
Родитель
Сommit
1eacba14c9

+ 1 - 8
src/main/java/com/fdkankan/ucenter/controller/TestController.java

@@ -117,14 +117,7 @@ public class TestController extends BaseController {
     }
 
     public static void main(String[] args) {
-        String timeZone = "Asia/Tokyo";
-        TimeZone zone = TimeZone.getTimeZone(timeZone);
-        System.out.println("zone = " + zone.getID() );
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        sdf.setTimeZone(zone);
-        System.out.println(sdf.format(new Date()));
-
+        System.out.println(SecurityUtil.MD5("\u00155EAAMBC"));
     }
 
 }

+ 4 - 0
src/main/java/com/fdkankan/ucenter/service/ICameraIncrementLogService.java

@@ -3,6 +3,8 @@ package com.fdkankan.ucenter.service;
 import com.fdkankan.ucenter.entity.CameraIncrementLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -14,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ICameraIncrementLogService extends IService<CameraIncrementLog> {
 
     void saveLog(Long cameraId, Long incrementId, Long userId, Integer operationType);
+
+    void saveLog(List<Long> cameraIds,String userName);
 }

+ 24 - 0
src/main/java/com/fdkankan/ucenter/service/impl/CameraIncrementLogServiceImpl.java

@@ -1,10 +1,16 @@
 package com.fdkankan.ucenter.service.impl;
 import java.util.Date;
+import java.util.List;
 
 import com.fdkankan.ucenter.entity.CameraIncrementLog;
+import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.entity.UserIncrement;
 import com.fdkankan.ucenter.mapper.ICameraIncrementLogMapper;
 import com.fdkankan.ucenter.service.ICameraIncrementLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.ucenter.service.IUserIncrementService;
+import com.fdkankan.ucenter.service.IUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,6 +24,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class CameraIncrementLogServiceImpl extends ServiceImpl<ICameraIncrementLogMapper, CameraIncrementLog> implements ICameraIncrementLogService {
 
+    @Autowired
+    IUserService userService;
+    @Autowired
+    IUserIncrementService userIncrementService;
 
     @Override
     public void saveLog(Long cameraId, Long incrementId, Long userId, Integer operationType) {
@@ -29,4 +39,18 @@ public class CameraIncrementLogServiceImpl extends ServiceImpl<ICameraIncrementL
         this.save(cameraIncrementLog);
 
     }
+
+    @Override
+    public void saveLog(List<Long> cameraIds,String userName) {
+        User user = userService.getByUserName(userName);
+        if(user == null){
+            return;
+        }
+        for (Long cameraId : cameraIds) {
+            UserIncrement byCameraId = userIncrementService.getByCameraId(cameraId);
+            if(byCameraId != null ){
+                this.saveLog(cameraId,byCameraId.getId(),user.getId(),1);
+            }
+        }
+    }
 }

+ 3 - 0
src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -66,6 +66,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     IScenePlusService scenePlusService;
     @Autowired
     ISceneCooperationService sceneCooperationService;
+    @Autowired
+    ICameraIncrementLogService cameraIncrementLogService;
 
     @Override
     public Camera getBySnCode(String snCode) {
@@ -232,6 +234,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         for (String id : split) {
             cameraIds.add(Long.valueOf(id));
         }
+        cameraIncrementLogService.saveLog(cameraIds,userName);
         userIncrementService.unbindCamera(cameraIds);                   //取消关联用户权益
         cameraDetailService.unbindCamera(cameraIds);                    //取消相机用户关联
         sceneService.bindOrUnCamera(cameraIds,null);                //取消关联场景