添加资源扫描接口

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

@@ -8,6 +8,7 @@ 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.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.resource.model.ResourceEntity;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -67,7 +69,7 @@ public class ResourceController extends BaseCRUDJsonBodyMappingController<Resour
 
     @Override
     protected void doListBefore(ResourceEntity query, Map<String, Object> model, Context context) throws AppException {
-
+        query.setOrderColList(Arrays.asList(new OrderCol("sourceType")));
         super.doListBefore(query, model, context);
     }
 

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

@@ -54,6 +54,7 @@ public class ControllerScanUtil {
                 resourceViewEntity.initAttrValue();
                 ResourceEntity resourceEditEntity = new ResourceEntity();
                 resourceEditEntity.initAttrValue();
+                resourceEditEntity.setSourceType(1);
 
                 Method substringMethod = null;
                 String result = "";

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

 
 ###设备日志列表
-POST {{baseUrl}}/device/alarm/info/interlist
+POST {{baseUrl}}/device/alarm/info/list
 Content-Type: application/json
 
 {