修改设备新增

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

@@ -76,6 +76,7 @@ public class UploadTask implements Runnable {
                 deviceEntity.setOnlineTime(new Date());
                 deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue());
                 deviceEntity.setIp(req.getIp());
+                deviceEntity.setDeviceType(req.getType());
                 deviceEntity.setPort(req.getPort());
                 deviceEntity.setSiteNum(req.getSitenum());
                 deviceEntity.setCenternum(req.getCenternum());

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

@@ -92,7 +92,7 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
      */
     private void doDeviceLogDel() {
         //默认保存30天日志
-        int timeout = -GlobalSysInfo.getParamIntValue(ParamKey.SYS_PARAM_LOG_TIME, 30);
+        int timeout = -GlobalSysInfo.getParamIntValue(ParamKey.SYS_PARAM_LOG_TIME, 15);
         try {
             DeviceLogQuery query = new DeviceLogQuery();
             query.setCreateTimeEnd(DateUtils.getStrDateTime(DateUtils.addCurrDate(timeout)));
@@ -111,7 +111,6 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
      * 定时查询更新其它设备状态
      */
     private void doDeviceQuery() {
-
         try {
             deviceService.getCacheList().parallelStream()
                     .filter(f -> f.getDeviceSource() == DeviceSourceEnum.其它.getValue())