修改设备新增

db/module.sql

@@ -123,3 +123,6 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '日志类型，', 'DeviceLog', 'l
 
 INSERT INTO `mortals_xhx_param` VALUES (null, '设备来源，为其它时候上线下线通过查询', 'Device', 'deviceSource', '0', '大厅', 1, 4, 0, 'deviceSource', NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_param` VALUES (null, '设备来源，为其它时候上线下线通过查询', 'Device', 'deviceSource', '1', '其它', 1, 4, 0, 'deviceSource', NULL, NULL, NULL);
+
+
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '13', '无感一码通', 1, 4, 0, 'deviceType', NULL, NULL, NULL);

device-manager-ui/admin/src/views/login/authentication.vue

@@ -34,12 +34,12 @@ export default {
     },
     loginFail(error) {
       this.$message.error(error.message || '请登录');
-      // this.$router.replace({
-      //   path: '/login',
-      //   query: {
-      //     redirect: this.redirect,
-      //   }
-      // });
+      this.$router.replace({
+        path: '/login',
+        query: {
+          redirect: this.redirect,
+        }
+      });
     },
 
 getUrlKey (name) {

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

 package com.mortals.xhx.base.system.param.web;
 
 
-import com.alibaba.fastjson.JSONObject;
-import com.mortals.framework.annotation.RepeatSubmit;
 import com.mortals.framework.common.code.PageDisplayType;
 import com.mortals.framework.model.Context;
-
 import com.mortals.framework.util.FileUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-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 com.mortals.xhx.base.system.param.model.ParamEntity;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.DataSatusEnum;
 import com.mortals.xhx.common.code.ModStatusEnum;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceStatTaskImpl.java

@@ -91,7 +91,7 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
      * 定时清除设备日志
      */
     private void doDeviceLogDel() {
-        //默认保存30天日志
+        //默认保存15天日志
         int timeout = -GlobalSysInfo.getParamIntValue(ParamKey.SYS_PARAM_LOG_TIME, 15);
         try {
             DeviceLogQuery query = new DeviceLogQuery();