Kaynağa Gözat

去除本地限制

lyhzzz 1 yıl önce
ebeveyn
işleme
7042b0a5e1

+ 1 - 1
src/main/java/com/fdkankan/ucenter/service/impl/CameraDetailServiceImpl.java

@@ -121,7 +121,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
             CameraType cameraType = cameraTypeService.getByCameraType(cameraDetail.getType());
 
             //国内服解绑
-            if(!"aws".equals(NacosProperty.uploadType) && !"local".equals(NacosProperty.uploadType) && cameraType.getIsLaser() ==0){
+            if(!"aws".equals(NacosProperty.uploadType)  && cameraType.getIsLaser() ==0){
                 sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId());     //封存场景
             }
             //国际服解绑

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

@@ -315,9 +315,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         sceneProService.bindOrUnCamera(cameraIds,user.getId());
         scenePlusService.bindOrUnCamera(cameraIds,user.getId());
 
-        if("local".equals(NacosProperty.uploadType)){   //局域网绑定相机,添加权益
-            //userIncrementService.addByCameraAndUser(cameraIds,user.getId());
-        }
     }
 
     @Override

+ 2 - 6
src/main/java/com/fdkankan/ucenter/service/impl/UserIncrementServiceImpl.java

@@ -147,12 +147,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         if(cameraIds.size() >0){
             LambdaUpdateWrapper<UserIncrement> wrapper = new LambdaUpdateWrapper<>();
             wrapper.in(UserIncrement::getCameraId,cameraIds);
-            if("local".equals(NacosProperty.uploadType)){
-                this.remove(wrapper);
-            }else {
-                wrapper.set(UserIncrement::getCameraId,null);
-                this.update(wrapper);
-            }
+            wrapper.set(UserIncrement::getCameraId,null);
+            this.update(wrapper);
         }
 
     }

+ 1 - 17
src/main/java/com/fdkankan/ucenter/task/TaskService.java

@@ -40,11 +40,7 @@ public class TaskService {
 
     @Scheduled(cron = "${task.cron.del_qrCode:0 */10 * * * ?}")
     public void delLoginQrCode(){
-        if("local".equals(NacosProperty.uploadType)){
-            //AuthLicenseUtil.checkAuthLicense();
-            this.updateSceneViewCount();
-            return;
-        }
+        this.updateSceneViewCount();
         try {
             long startTime = new Date().getTime();
             String qrCodePath = QrCodeFilePath.LOGIN_QR_CODE_PATH;
@@ -103,9 +99,6 @@ public class TaskService {
 
     @Scheduled(cron = "${task.cron.increment_sendMsg:0 0 12 * * ?}")
     public void job11() {
-        if("local".equals(NacosProperty.uploadType)){
-            return;
-        }
         log.info("每天12:00开始执行定时任务:短信提醒增值权益准备到期");
         try {
             userIncrementService.incrementExpireSendSms();
@@ -119,9 +112,6 @@ public class TaskService {
 
     @Scheduled(cron = "${task.cron.update_order_status:0 0 0 * * ?}")
     public void checkIncrementExpire() {
-        if("local".equals(NacosProperty.uploadType)){
-            return;
-        }
         log.info("每天00:00开始执行定时任务:增值权益到期检查");
         try {
             userIncrementService.incrementExpire();
@@ -136,9 +126,6 @@ public class TaskService {
 
     @Scheduled(cron = "${task.cron.update_order_status:0 0 1 * * ?}")
     public void updateOrderStatus() {
-        if("local".equals(NacosProperty.uploadType)){
-            return;
-        }
         log.info("每天01:00开始执行定时任务:更新收货状态");
         try {
             //更新收货状态,发货后15天,默认用户已经收到货物
@@ -153,9 +140,6 @@ public class TaskService {
     ISceneStatisticsService sceneStatisticsService;
     @Scheduled(cron = "${task.cron.add_baidu_data:0 0 2 * * ?}")
     public void addBaiduData() {
-        if("local".equals(NacosProperty.uploadType)){
-            return;
-        }
         log.info("每天02:00开始执行定时任务:获取百度统计的数据入库");
         try {
             String dateStr = DateUtil.date2String(DateUtil.daysCalculate(new Date(), -1), DateUtil.YYYYMMDD_DATA_FORMAT);