From 6e0dccfbbb8c630764f94557f3f3284684119418 Mon Sep 17 00:00:00 2001
From: caojianbin <1910336823>
Date: Mon, 6 Jan 2025 18:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E6=AC=A1=E6=95=B0=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LatestLocationAppController.java    | 16 +++++------
 .../controller/LocationLimitInfoController.java    | 32 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/controller/LatestLocationAppController.java b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/controller/LatestLocationAppController.java
index 00132c6..dd8d7ab 100644
--- a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/controller/LatestLocationAppController.java
+++ b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/controller/LatestLocationAppController.java
@@ -63,17 +63,17 @@ public class LatestLocationAppController {
         if (CommonConstant.AUDIT_STATUS_ONE.equals(onlineStatus)){
             String deviceModelId = deviceInfo.getDeviceModelId();
             String hasKey="local:limitCount"+":"+deviceModelId;
-            int limitCount=500;
+        //    int limitCount=5;
             if (redisService.hasKey(hasKey)){
-                limitCount=redisService.getCacheObject(hasKey);
-            }
-
-            Long count =(Long) redisService.redisTemplate.execute(localLimitScript, Arrays.asList(imei),limitCount,getStartTimeStamp());
-            System.out.println("定位次数===:"+count);
-            if (count<=0){
-                return AjaxResult.error(241,"该设备每天的定位次数已到达上限");
+                int limitCount=redisService.getCacheObject(hasKey);
+                Long count =(Long) redisService.redisTemplate.execute(localLimitScript, Arrays.asList(imei),limitCount,getStartTimeStamp());
+                System.out.println("定位次数===:"+count);
+                if (count<=0){
+                    return AjaxResult.error(241,"该设备每天的定位次数已到达上限");
 
+                }
             }
+
         }
 
         return AjaxResult.success(latestLocationAppService.getLastLocationInstructions(imei,onlineStatus));
diff --git a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/controller/LocationLimitInfoController.java b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/controller/LocationLimitInfoController.java
index 42b8436..d223189 100644
--- a/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/controller/LocationLimitInfoController.java
+++ b/ecell-internationalize/ecell-internationalize-system/src/main/java/com/ecell/internationalize/system/controller/LocationLimitInfoController.java
@@ -171,6 +171,38 @@ public class LocationLimitInfoController {
         return  i>0? AjaxResult.success(LocaleUtil.getMessage(FieldConstant.MESSAGES_SUCCESS)) : AjaxResult.error(LocaleUtil.getMessage(FieldConstant.MESSAGES_ERROR));
     }
 
+//    /**
+//     *
+//     * @param id
+//     * @param type
+//     * @return
+//     */
+//    @GetMapping("/enabled/{id}/{type}")
+//    public AjaxResult enabled(@PathVariable("id") String id,@PathVariable("type") String type) {
+//        LocationLimitInfo locationLimitInfo=null;
+//        if (StringUtils.isNotEmpty(id)){
+//            QueryWrapper<LocationLimitInfo>wrapper =new QueryWrapper<>();
+//            wrapper.eq("id",id);
+//            locationLimitInfo= locationLimitInfoService.getBaseMapper().selectOne(wrapper);
+//            if (StringUtils.isNull(locationLimitInfo)){
+//                return AjaxResult.error(LocaleUtil.getMessage(FieldConstant.LOCATIONINFO_MESSAGES_ERROR));
+//            }
+//        }
+//        int i = locationLimitInfoService.getBaseMapper().deleteById(id);
+//        if (i>0){
+//            String hashKey="local:limitCount"+":"+locationLimitInfo.getModelId();
+//            if (redisService.hasKey(hashKey)){
+//                redisService.deleteObject(hashKey);
+//            }
+//
+//        }
+//
+//
+//
+//        return  i>0? AjaxResult.success(LocaleUtil.getMessage(FieldConstant.MESSAGES_SUCCESS)) : AjaxResult.error(LocaleUtil.getMessage(FieldConstant.MESSAGES_ERROR));
+//    }
+//
+