添加定时删除七天前的人流数据

refined-manager-ui/admin/package.json

@@ -41,8 +41,7 @@
     "vue-template-compiler": "^2.6.14",
     "vue2-org-tree": "^1.3.5",
     "vuex": "3.6.0",
-    "jwt-decode": "3.1.2"
-
+    "nprogress": "^0.2.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",

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

@@ -43,7 +43,6 @@ import java.util.Map;
 public class OperLogController extends BaseCRUDJsonBodyMappingController<OperLogService, OperLogEntity, Long> {
 
     public OperLogController() {
-        super.setFormClass(OperLogForm.class);
         super.setModuleDesc("操作日志");
     }
 

refined-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

refined-manager/src/main/java/com/mortals/xhx/base/system/param/web/ParamController.java

@@ -35,7 +35,6 @@ import java.util.Map;
 public class ParamController extends BaseCRUDJsonBodyMappingController<ParamService, ParamEntity, Long> {
 
     public ParamController() {
-        super.setFormClass(ParamForm.class);
         super.setModuleDesc("参数信息");
     }
 

refined-manager/src/main/java/com/mortals/xhx/base/system/param/web/ParamForm.java

-/**
-* 文件：ParamForm.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
-package com.mortals.xhx.base.system.param.web;
-
-
-import com.alibaba.fastjson.JSON;
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.base.system.param.model.ParamEntity;
-import com.mortals.xhx.base.system.param.model.ParamQuery;
-
-/**
- * <p>Title: 参数信息</p>
- * <p>Description: ParamForm  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
- */
-public class ParamForm extends BaseCRUDFormLong<ParamEntity> {
-	private ParamEntity entity = new ParamEntity();
-	private ParamQuery query = new ParamQuery();
-	public ParamForm(){
-		
-	}
-	
-    @Override
-	public ParamEntity getEntity() {
-		return entity;
-	}
-
-	public void setEntity(ParamEntity entity) {
-		this.entity = entity;
-	}
-	
-	@Override
-	public ParamQuery getQuery() {
-		return query;
-	}
-
-	public void setQuery(ParamQuery query) {
-		this.query = query;
-	}
-
-	public static void main(String[] args) {
-
-		ParamForm form = new ParamForm();
-
-		String entityName =form.getEntity().getClass().getSimpleName();
-		System.out.println(entityName);
-		if ((entityName = entityName.substring(0, 1).toLowerCase() + entityName.substring(1, entityName.length())).endsWith("Entity")) {
-			entityName = entityName.substring(0, entityName.length() - "Entity".length());
-		}
-
-		System.out.println(entityName);
-
-
-		System.out.println(JSON.toJSONString(form));
-
-	}
-}
\ No newline at end of file

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

@@ -35,7 +35,6 @@ import com.mortals.xhx.common.code.SourceType;
 public class ResourceController extends BaseCRUDJsonBodyMappingController<ResourceService,ResourceEntity,Long> {
 
 	public ResourceController(){
-		super.setFormClass(ResourceForm.class);
 		super.setModuleDesc("资源信息");
 	}
 

refined-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

refined-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleAuthController.java

@@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletResponse;
 public class RoleAuthController extends BaseCRUDJsonBodyMappingController<RoleAuthService, RoleAuthEntity, Long> {
 
     public RoleAuthController() {
-        super.setFormClass(RoleAuthForm.class);
         super.setModuleDesc("角色资源权限");
     }
 

refined-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleAuthForm.java

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

refined-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleController.java

@@ -39,7 +39,6 @@ public class RoleController extends BaseCRUDJsonBodyMappingController<RoleServic
 	private RoleUserService roleUserService;
 	
 	public RoleController(){
-		super.setFormClass(RoleForm.class);
 		super.setModuleDesc("角色信息");
 	}
 

refined-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleForm.java

-/**
-* 文件：RoleForm.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
-package com.mortals.xhx.base.system.role.web;
-
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.base.system.role.model.RoleEntity;
-import com.mortals.xhx.base.system.role.model.RoleQuery;
-
-/**
- * <p>Title: 角色信息</p>
- * <p>Description: RoleForm  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
- */
-public class RoleForm extends BaseCRUDFormLong<RoleEntity> {
-	private RoleEntity entity = new RoleEntity();
-	private RoleQuery query = new RoleQuery();
-	/** 用户ID */
-	private Long userId;
-	public RoleForm(){
-		
-	}
-	
-    @Override
-	public RoleEntity getEntity() {
-		return entity;
-	}
-
-	public void setEntity(RoleEntity entity) {
-		this.entity = entity;
-	}
-
-	@Override
-	public RoleQuery getQuery() {
-		return query;
-	}
-
-	public void setQuery(RoleQuery query) {
-		this.query = query;
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-	
-}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleUserController.java

@@ -49,7 +49,6 @@ public class RoleUserController extends BaseCRUDJsonBodyMappingController<RoleUs
     private UserService userService;
 
     public RoleUserController() {
-        super.setFormClass(RoleUserForm.class);
         super.setModuleDesc("角色用户");
     }
 

refined-manager/src/main/java/com/mortals/xhx/base/system/role/web/RoleUserForm.java

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

refined-manager/src/main/java/com/mortals/xhx/base/system/task/web/TaskController.java

@@ -40,7 +40,6 @@ import com.mortals.xhx.common.code.TaskInterimExcuteStatusEnum;
 public class TaskController extends BaseCRUDJsonBodyMappingController<TaskService, TaskEntity, Long> {
 
     public TaskController() {
-        super.setFormClass(TaskForm.class);
         super.setModuleDesc("任务信息");
     }
 

refined-manager/src/main/java/com/mortals/xhx/base/system/task/web/TaskForm.java

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

refined-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java

@@ -54,7 +54,6 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     private DeptService deptService;
 
     public UserController() {
-        super.setFormClass(UserForm.class);
         super.setModuleDesc("用户信息");
     }
 

refined-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserForm.java

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

refined-manager/src/main/java/com/mortals/xhx/busiz/web/HikCallbackController.java

 package com.mortals.xhx.busiz.web;
 
-import com.alibaba.fastjson.JSON;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.module.hik.event.model.req.callback.EventReq;

refined-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/SubEventStartedService.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.daemon.applicationservice;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.hikvision.artemis.sdk.constant.Constants;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.springcloud.service.IApplicationStartedService;
@@ -60,6 +61,9 @@ public class SubEventStartedService implements IApplicationStartedService {
     @Override
     public void start() {
         ThreadPool.getInstance().init(20);
+
+        Constants.DEFAULT_TIMEOUT=12000;
+
         log.info("开始服务..[事件订阅服务]");
         //String eventtypes = GlobalSysInfo.getParamValue(Constant.PARAM_EVENTTYPES, "131614,131659,1644175361,1644171265");
         String eventtypes = GlobalSysInfo.getParamValue(Constant.PARAM_EVENTTYPES, "131659,1644175361,1644171265");

refined-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -8,8 +8,6 @@
 		<setting name="useColumnLabel" value="true" />
 		<setting name="useGeneratedKeys" value="false" />
 		<setting name="defaultExecutorType" value="REUSE" />
-		<!-- 是否开始sql日志控制台打印 -->
-<!--       <setting name="logImpl" value="STDOUT_LOGGING" />-->
 	</settings>
 	<plugins>
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.MortalsPagePlugin">