Merge branch 'master' of http://gitlab.scsmile.cn/zxf/device-new-platform

common-lib/pom.xml

@@ -85,6 +85,11 @@
             <artifactId>javase</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+        </dependency>
+
 
         <dependency>
             <groupId>junit</groupId>

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -61,6 +61,7 @@ import com.mortals.xhx.module.site.service.SiteService;
 import com.mortals.xhx.queue.DefaultTbQueueMsg;
 import com.mortals.xhx.queue.TbQueueMsg;
 import com.mortals.xhx.queue.TbQueueMsgHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,6 +90,7 @@ import static com.mortals.xhx.common.key.RedisKey.KEY_TOKEN_API_CACHE;
 @RestController
 @Slf4j
 @RequestMapping("/api")
+@Tag(name ="设备api")
 public class DeviceApiController {
     @Autowired
     private DeviceService deviceService;

device-manager/src/main/java/com/mortals/xhx/busiz/web/TestSendMsgController.java

@@ -5,14 +5,17 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.ILogService;
 import com.mortals.framework.service.impl.FileLogServiceImpl;
+import com.mortals.xhx.base.system.resource.model.ResourceEntity;
 import com.mortals.xhx.busiz.req.TestReq;
 import com.mortals.xhx.busiz.rsp.ApiResp;
 import com.mortals.xhx.busiz.rsp.DeviceResp;
 import com.mortals.xhx.common.code.ApiRespCodeEnum;
+import com.mortals.xhx.common.utils.ControllerScanUtil;
 import com.mortals.xhx.common.utils.ImgUtils;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import com.mortals.xhx.module.device.model.DeviceQuery;
@@ -145,11 +148,22 @@ public class TestSendMsgController {
     public String setData(@PathVariable("key") String key,
                           @PathVariable("value") String value) {
         cacheService.set(key, value);
-        String s =cacheService.get(key);
+        String s = cacheService.get(key);
         return s;
     }
 
 
+    @PostMapping("scan")
+    @UnAuth
+    public String scan() {
+        List<Class<?>> classList = ControllerScanUtil.getAllClassByPackageName("com.mortals.xhx");
+        //System.out.println(classList); //获取到了所有的类
+        List<ResourceEntity> list = ControllerScanUtil.getAnnotationInfo(classList);
+        return JSON.toJSONString(list);
+
+    }
+
+
     public static void main(String[] args) {
 
         String resp = HttpUtil.get("http://59.225.206.13:8331/oauth-pro/admin-pro/sys/randomImage/1675827431800?_t=1675827431");

device-manager/src/main/java/com/mortals/xhx/common/utils/MemoryPagination.java

 package com.mortals.xhx.common.utils;
 
-import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.module.sitestat.model.SitestatEntity;
 import org.apache.commons.collections4.CollectionUtils;
 
@@ -33,6 +32,10 @@ public class MemoryPagination {
         if (CollectionUtils.isEmpty(records)) {
             return Collections.emptyList();
         }
+        if (pageSize == -1) {
+            pageSize = 9999;
+        }
+
         int totalCount = records.size();
         int remainder = totalCount % pageSize;
         int pageCount = (remainder > 0) ? totalCount / pageSize + 1 : totalCount / pageSize;
@@ -48,12 +51,12 @@ public class MemoryPagination {
     }
 
 
-    public static List<SitestatEntity> search(String name, List<SitestatEntity> list){
+    public static List<SitestatEntity> search(String name, List<SitestatEntity> list) {
         List<SitestatEntity> results = new ArrayList();
-        Pattern pattern = Pattern.compile(name,Pattern.CASE_INSENSITIVE);
-        for(int i=0; i < list.size(); i++){
+        Pattern pattern = Pattern.compile(name, Pattern.CASE_INSENSITIVE);
+        for (int i = 0; i < list.size(); i++) {
             Matcher matcher = pattern.matcher((list.get(i)).getSiteName());
-            if(matcher.find()){
+            if (matcher.find()) {
                 results.add(list.get(i));
             }
         }

device-manager/src/main/java/com/mortals/xhx/module/alarm/web/AlarmConfigController.java

@@ -46,6 +46,14 @@ public class AlarmConfigController extends BaseCRUDJsonBodyMappingController<Ala
 
         super.init(model, context);
     }
+    public static void main(String[] args) {
+        String input = "example//path//to//file//with/////multiple////slashes//";
 
+        // 将多个斜杠替换为单个斜杠
+        String result = input.replaceAll("/+", "/");
+
+        System.out.println("处理前: " + input);
+        System.out.println("处理后: " + result);
+    }
 
 }
\ No newline at end of file