优化设备管理系统callback 下发消息效率

device-manager/src/main/java/com/mortals/xhx/base/system/menu/web/MenuForm.java

-/**
-* 文件：MenuForm.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
-package com.mortals.xhx.base.system.menu.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.base.system.menu.model.MenuEntity;
-import com.mortals.xhx.base.system.menu.model.MenuQuery;
-
-/**
- * <p>Title: 菜单信息</p>
- * <p>Description: MenuForm  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
- */
-public class MenuForm extends BaseCRUDFormLong<MenuEntity> {
-	private MenuEntity entity = new MenuEntity();
-	private MenuQuery query = new MenuQuery();
-	public MenuForm(){
-		
-	}
-	
-    @Override
-	public MenuEntity getEntity() {
-		return entity;
-	}
-
-	public void setEntity(MenuEntity entity) {
-		this.entity = entity;
-	}
-
-	@Override
-	public MenuQuery getQuery() {
-		return query;
-	}
-
-	public void setQuery(MenuQuery query) {
-		this.query = query;
-	}
-}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/base/system/oper/web/OperLogController.java

@@ -8,7 +8,6 @@
 package com.mortals.xhx.base.system.oper.web;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
@@ -16,15 +15,9 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.oper.model.OperLogEntity;
 import com.mortals.xhx.base.system.oper.service.OperLogService;
 import com.mortals.xhx.common.code.OperTypeEnum;
-
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.mortals.framework.web.BaseCRUDJsonMappingController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -43,7 +36,6 @@ import java.util.Map;
 public class OperLogController extends BaseCRUDJsonBodyMappingController<OperLogService, OperLogEntity, Long> {
 
     public OperLogController() {
-        super.setFormClass(OperLogForm.class);
         super.setModuleDesc("操作日志");
     }
 

device-manager/src/main/java/com/mortals/xhx/base/system/oper/web/OperLogForm.java

-/**
-* 文件：OperLogForm.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
-package com.mortals.xhx.base.system.oper.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.base.system.oper.model.OperLogEntity;
-import com.mortals.xhx.base.system.oper.model.OperLogQuery;
-
-/**
- * <p>Title: 操作日志</p>
- * <p>Description: OperLogForm  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
- */
-public class OperLogForm extends BaseCRUDFormLong<OperLogEntity> {
-	private OperLogEntity entity = new OperLogEntity();
-	private OperLogQuery query = new OperLogQuery();
-	public OperLogForm(){
-		
-	}
-	
-    @Override
-	public OperLogEntity getEntity() {
-		return entity;
-	}
-
-	public void setEntity(OperLogEntity entity) {
-		this.entity = entity;
-	}
-
-	@Override
-	public OperLogQuery getQuery() {
-		return query;
-	}
-
-	public void setQuery(OperLogQuery query) {
-		this.query = query;
-	}
-}
\ No newline at end of file

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

 package com.mortals.xhx.base.system.resource.web;
 
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.common.code.UserType;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.resource.model.ResourceEntity;
+import com.mortals.xhx.base.system.resource.service.ResourceService;
+import com.mortals.xhx.common.code.AuthType;
+import com.mortals.xhx.common.code.SourceType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.fastjson.JSONObject;
-import com.mortals.framework.model.Context;
-import com.mortals.framework.web.BaseCRUDJsonMappingController;
-import com.mortals.xhx.base.system.resource.model.ResourceEntity;
-import com.mortals.xhx.base.system.resource.service.ResourceService;
-import com.mortals.xhx.common.code.AuthType;
-import com.mortals.xhx.common.code.SourceType;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 资源信息
@@ -35,7 +30,6 @@ import com.mortals.xhx.common.code.SourceType;
 public class ResourceController extends BaseCRUDJsonBodyMappingController<ResourceService,ResourceEntity,Long> {
 
 	public ResourceController(){
-		super.setFormClass(ResourceForm.class);
 		super.setModuleDesc("资源信息");
 	}
 

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

-/**
-* 文件：ResourceForm.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
-package com.mortals.xhx.base.system.resource.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.base.system.resource.model.ResourceEntity;
-import com.mortals.xhx.base.system.resource.model.ResourceQuery;
-
-/**
- * <p>Title: 资源信息</p>
- * <p>Description: ResourceForm  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
- */
-public class ResourceForm extends BaseCRUDFormLong<ResourceEntity> {
-	private ResourceEntity entity = new ResourceEntity();
-	private ResourceQuery query = new ResourceQuery();
-	public ResourceForm(){
-		
-	}
-	
-    @Override
-	public ResourceEntity getEntity() {
-		return entity;
-	}
-
-	public void setEntity(ResourceEntity entity) {
-		this.entity = entity;
-	}
-
-	@Override
-	public ResourceQuery getQuery() {
-		return query;
-	}
-
-	public void setQuery(ResourceQuery query) {
-		this.query = query;
-	}
-}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceDownMsgService.java

@@ -57,7 +57,7 @@ public class DeviceDownMsgService implements IApplicationStartedService {
                 int waitTime = 1;
                 while (!stopped) {
                     try {
-                        DeviceMsgReq deviceMsgReq = cacheService.lpop(KEY_DEVICE_DOWN_MSG_QUEUE, DeviceMsgReq.class);
+                        DeviceMsgReq deviceMsgReq = cacheService.blpop(KEY_DEVICE_DOWN_MSG_QUEUE,10, DeviceMsgReq.class);
                         if (!ObjectUtils.isEmpty(deviceMsgReq)) {
                             log.info("下发消息:{}",deviceMsgReq.getDeviceCode());
                             //根据设备编码查询设备

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

 package com.mortals.xhx.module.device.web;
 
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -50,6 +51,17 @@ public class DeviceAlarmInfoController extends BaseCRUDJsonBodyMappingController
         super.init(model, context);
     }
 
+    @Override
+    @UnAuth
+    public Rest<Object> list(DeviceAlarmInfoEntity query) {
+        return super.list(query);
+    }
+
+    @Override
+    @UnAuth
+    public String info(Long id) {
+        return super.info(id);
+    }
 
     @Override
     protected void doListBefore(DeviceAlarmInfoEntity query, Map<String, Object> model, Context context) throws AppException {

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

@@ -83,6 +83,12 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         super.setModuleDesc("设备");
     }
 
+    @Override
+    @UnAuth
+    public Rest<Object> list(DeviceEntity query) {
+        return super.list(query);
+    }
+
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "platformId", platformService.find(new PlatformEntity()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getPlatformName())));

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

 package com.mortals.xhx.module.device.web;
+
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.device.model.DeviceModuleUseEntity;
 import com.mortals.xhx.module.device.model.DeviceQuery;
+import com.mortals.xhx.module.device.service.DeviceModuleUseService;
 import com.mortals.xhx.module.device.service.DeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
-import com.mortals.framework.model.Context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.device.model.DeviceModuleUseEntity;
-import com.mortals.xhx.module.device.service.DeviceModuleUseService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
+
 import java.util.Map;
 import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
 /**
 *
 * 设备模块使用频率
@@ -50,5 +41,15 @@ public class DeviceModuleUseController extends BaseCRUDJsonBodyMappingController
         super.init(model, context);
     }
 
+    @Override
+    @UnAuth
+    public Rest<Object> list(DeviceModuleUseEntity query) {
+        return super.list(query);
+    }
 
+    @Override
+    @UnAuth
+    public String info(Long id) {
+        return super.info(id);
+    }
 }
\ No newline at end of file