添加资源扫描接口

device-manager/src/main/java/com/mortals/xhx/base/system/resource/web/ResourceController.java

@@ -6,6 +6,7 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.common.code.UserType;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.resource.model.ResourceEntity;
@@ -64,6 +65,12 @@ public class ResourceController extends BaseCRUDJsonBodyMappingController<Resour
     }
 
 
+    @Override
+    protected void doListBefore(ResourceEntity query, Map<String, Object> model, Context context) throws AppException {
+
+        super.doListBefore(query, model, context);
+    }
+
     /**
      * 资源路径刷新
      */

device-manager/src/main/java/com/mortals/xhx/common/key/ErrorCode.java

@@ -120,6 +120,6 @@ public interface ErrorCode {
     public static final int ERROR_TOKEN_UNAUTHORIZED = 9002;
     public static final String ERROR_TOKEN_UNAUTHORIZED_CONTENT = "token不正确或已过期";
 
-    public static final int ERROR_USER_OPERATION = 9009;
-    public static final String ERROR_USER_OPERATION_CONTENT = "用户无该操作权限!";
+    public static final int ERROR_USER_OPERATION = 405;
+    public static final String ERROR_USER_OPERATION_CONTENT = "当前用户无该操作权限!";
 }

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

@@ -29,7 +29,7 @@ public class ControllerScanUtil {
     public static final String[] ULR_VIEW = {"view", "info", "list", "get", "find", "export", "download",
             "index", "bill"};
 
-    public static final String[] WHITE_URL = {"login", "test"};
+    public static final String[] WHITE_URL = {"login", "test","file","securitycode"};
 
 
     public static void main(String[] args) {

device-manager/src/test/java/com/mortals/httpclient/device/DeviceLogController.http

 
 ###设备日志列表
-POST {{baseUrl}}/device/log/list
+POST {{baseUrl}}/device/alarm/info/interlist
 Content-Type: application/json
 
 {
+  "siteId": 87,
     "page":1,
     "size":10
 }