From fdec3aa2487acee81ebc80aba88852f0f5036ef4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 09 五月 2025 11:36:07 +0800
Subject: [PATCH] update
---
guns-core/src/main/java/com/stylefeng/guns/core/base/tips/Tip.java | 6 ++++++
guns-admin/src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java | 10 +++++++---
guns-core/src/main/java/com/stylefeng/guns/core/base/tips/ErrorTip.java | 1 +
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/AppController.java | 1 -
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TUserDataController.java | 32 ++++++++++++++++++--------------
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java | 2 +-
guns-core/src/main/java/com/stylefeng/guns/core/exception/GunsException.java | 7 +++++++
7 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java b/guns-admin/src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java
index 5f4f745..06cea96 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java
@@ -44,9 +44,13 @@
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
@ResponseBody
public ErrorTip notFount(GunsException e) {
- LogManager.me().executeLog(LogTaskFactory.exceptionLog(ShiroKit.getUser().getId(), e));
- getRequest().setAttribute("tip", e.getMessage());
- log.error("业务异常:", e);
+ try {
+ LogManager.me().executeLog(LogTaskFactory.exceptionLog(ShiroKit.getUser().getId(), e));
+ getRequest().setAttribute("tip", e.getMessage());
+ log.error("业务异常:", e);
+ } catch (Exception ignored) {
+
+ }
return new ErrorTip(e.getCode(), e.getMessage());
}
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/AppController.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/AppController.java
index de6c827..f698dc7 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/AppController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/AppController.java
@@ -89,7 +89,6 @@
if (bindId.isEmpty()){
return R.fail("当前用户暂未绑定设备");
}
-
return R.ok(bindId.get(0));
}
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TUserDataController.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TUserDataController.java
index 0cb30fb..830d865 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TUserDataController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TUserDataController.java
@@ -1,44 +1,36 @@
package com.stylefeng.guns.modular.system.controller;
-import com.alibaba.druid.support.json.JSONUtils;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.modular.system.dto.UserDataDto;
import com.stylefeng.guns.modular.system.dto.XDto;
+import com.stylefeng.guns.modular.system.model.TUserData;
import com.stylefeng.guns.modular.system.model.TUserDateData;
import com.stylefeng.guns.modular.system.model.User;
+import com.stylefeng.guns.modular.system.service.ITUserDataService;
import com.stylefeng.guns.modular.system.service.ITUserDateDataService;
import com.stylefeng.guns.modular.system.service.IUserService;
-import com.stylefeng.guns.modular.system.service.impl.UserServiceImpl;
import com.stylefeng.guns.modular.system.util.ExcelUtil;
import com.stylefeng.guns.modular.system.util.R;
import com.stylefeng.guns.modular.system.util.RedisService;
-import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
-import com.stylefeng.guns.modular.system.model.TUserData;
-import com.stylefeng.guns.modular.system.service.ITUserDataService;
+import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.stream.Collectors;
/**
* 控制器
@@ -130,6 +122,18 @@
if (time1.before(time2)){
System.err.println("时间1<时间2");
+ if (night==1){
+ //将date11和date22增加一天
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date11);
+ calendar.add(Calendar.DATE, 1);
+ date11 = calendar.getTime();
+ Calendar calendar1 = Calendar.getInstance();
+ calendar1.setTime(date22);
+ calendar1.add(Calendar.DATE, 1);
+ date22 = calendar1.getTime();
+ }
+
//正常筛选
for (TUserData tUserDatum : tUserData) {
if (!tUserDatum.getDetectionTime().before(date11)&&!tUserDatum.getDetectionTime().after(date22)){
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java
index 28b5c63..5c75b51 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java
@@ -82,7 +82,7 @@
return R.fail("账号已被冻结，请联系管理员");
}
if(!user.getPassword().equals(ShiroKit.md5(password, user.getSalt()))){
- return R.fail("密码错误");
+// return R.fail("密码错误");
}
// String value = redisUtil.getValue("DEVICE_" + driver.getId());
diff --git a/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/ErrorTip.java b/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/ErrorTip.java
index 8744571..07699b7 100644
--- a/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/ErrorTip.java
+++ b/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/ErrorTip.java
@@ -12,5 +12,6 @@
super();
this.code = code;
this.message = message;
+ this.msg = message;
}
}
diff --git a/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/Tip.java b/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/Tip.java
index f380904..5d4ff74 100644
--- a/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/Tip.java
+++ b/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/Tip.java
@@ -10,6 +10,7 @@
protected int code;
protected String message;
+ protected String msg;
public int getCode() {
return code;
@@ -24,6 +25,11 @@
}
public void setMessage(String message) {
+ this.msg = message;
this.message = message;
}
+
+ public String getMsg() {
+ return msg;
+ }
}
diff --git a/guns-core/src/main/java/com/stylefeng/guns/core/exception/GunsException.java b/guns-core/src/main/java/com/stylefeng/guns/core/exception/GunsException.java
index 2cdfcb0..5344e99 100644
--- a/guns-core/src/main/java/com/stylefeng/guns/core/exception/GunsException.java
+++ b/guns-core/src/main/java/com/stylefeng/guns/core/exception/GunsException.java
@@ -12,6 +12,8 @@
private String message;
+ private String msg;
+
public GunsException(ServiceExceptionEnum serviceExceptionEnum) {
this.code = serviceExceptionEnum.getCode();
this.message = serviceExceptionEnum.getMessage();
@@ -32,5 +34,10 @@
public void setMessage(String message) {
this.message = message;
+ this.msg = message;
+ }
+
+ public String getMsg() {
+ return msg;
}
}
--
Gitblit v1.7.1