From ddae56c44f581bb025d8f7733b248ff8ac6e3971 Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Wed, 4 Jun 2025 13:39:43 +0800 Subject: [PATCH] bug --- .../com/xkrs/controller/FirePointController.java | 2 +- .../java/com/xkrs/controller/SysUserController.java | 13 +++++++------ src/main/java/com/xkrs/dao/SysUserDao.java | 5 +++++ .../service/impl/DispatchFirePointServiceImpl.java | 4 ++-- src/main/java/com/xkrs/utilsnew/JsonUtils.java | 2 +- src/main/java/com/xkrs/utilsnew/TimeRangeUtils.java | 9 ++------- .../java/com/xkrs/utilsold/HttpClientUtils.java | 2 +- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/xkrs/controller/FirePointController.java b/src/main/java/com/xkrs/controller/FirePointController.java index a33809e..16de8d6 100644 --- a/src/main/java/com/xkrs/controller/FirePointController.java +++ b/src/main/java/com/xkrs/controller/FirePointController.java @@ -107,7 +107,7 @@ public class FirePointController { try { return outputEncapsulationObject(PromptMessageEnum.SUCCESS, ReptileUtils.reptileBatch(), locale); } catch (IOException e) { - e.printStackTrace(); +// e.printStackTrace(); } return outputEncapsulationObject(PromptMessageEnum.SUCCESS, null, locale); } diff --git a/src/main/java/com/xkrs/controller/SysUserController.java b/src/main/java/com/xkrs/controller/SysUserController.java index 3011d64..a11a30c 100644 --- a/src/main/java/com/xkrs/controller/SysUserController.java +++ b/src/main/java/com/xkrs/controller/SysUserController.java @@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletRequest; import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationErrorList; import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject; @@ -214,18 +215,18 @@ public class SysUserController { * 查看用户信息 */ @GetMapping("/selectAllUser") - public String selectAllUser(@RequestHeader(value = "Authorization") String token) { + public String selectAllUser(@RequestHeader(value = "Authorization") String token,// + @RequestParam(value = "page", defaultValue = "1") int page,// + @RequestParam(value = "size", defaultValue = "10") int size// + ) { // 验证token String tokenUserName = TokenUtil.obtainUserNameByToken(token); SysUserEntity sysUserEntity = sysUserDao.selectByUserName(tokenUserName); if (sysUserEntity == null) { return outputEncapsulationObject(PromptMessageEnum.USER_LOGIN_ERROR, "您还没有注册登录，请先注册登录", locale); } - List sysUserEntityList = sysUserDao.findAll(Sort.by(Sort.Direction.DESC, "id")); - List sysUserVoList = new ArrayList<>(); - for (SysUserEntity sysUser : sysUserEntityList) { - sysUserVoList.add(SysUserConvertUtils.convert(sysUser)); - } + List sysUserEntityList = sysUserDao.selectUser(size, (page - 1) * size); + List sysUserVoList = sysUserEntityList.stream().map(SysUserConvertUtils::convert).collect(Collectors.toList()); return outputEncapsulationObject(PromptMessageEnum.SUCCESS, sysUserVoList, locale); } diff --git a/src/main/java/com/xkrs/dao/SysUserDao.java b/src/main/java/com/xkrs/dao/SysUserDao.java index ad996b2..e3b3bcd 100644 --- a/src/main/java/com/xkrs/dao/SysUserDao.java +++ b/src/main/java/com/xkrs/dao/SysUserDao.java @@ -8,6 +8,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Component; +import java.util.List; + @Component public interface SysUserDao extends JpaRepository, JpaSpecificationExecutor { @@ -27,6 +29,9 @@ public interface SysUserDao extends JpaRepository, JpaSpeci @Query(value = "SELECT * FROM sys_user WHERE user_name = :userName", nativeQuery = true) SysUserEntity selectByUserName(@Param("userName") String userName); + @Query(value = "SELECT * FROM sys_user ORDER BY id DESC LIMIT ?1 OFFSET ?2", nativeQuery = true) + List selectUser(int limit, int offset); + /** * 删除系统用户（危险操作！） */ diff --git a/src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java index 11228da..f51411f 100644 --- a/src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java @@ -69,7 +69,7 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService { if (!checkSatelliteTypeWrapper.getData1()) { return outputEncapsulationObject(PromptMessageEnum.PROCESS_FAIL, checkSatelliteTypeWrapper.getData2(), locale); } - log.info("insertFirePoint 接收到火点信息：" + firePointQo.toString()); +// log.info("insertFirePoint 接收到火点信息：" + firePointQo.toString()); //解构接收的数据 String fireCode = firePointQo.getFireCode(); Long satelliteTimeTs = firePointQo.getSatelliteTimeTs(); @@ -122,7 +122,7 @@ public class DispatchFirePointServiceImpl implements DispatchFirePointService { firePointPushManager.pushNotification(firePointOrdinaryEntity);//将火点消息通知用户 return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功", locale); } - ErrorInfoLogUtils.log("高德逆地理编码异常，出现问题的火点详情：" + firePointOrdinaryEntity.toString()); +// ErrorInfoLogUtils.log("高德逆地理编码异常，出现问题的火点详情：" + firePointOrdinaryEntity.toString()); //使用网络方式解析地址信息失败，就使用接收到的数据结合字典表对实体类对象赋值入库。 StreetEntity streetEntity = obtainInfoByCountyCode(countyCode); if (streetEntity != null) { diff --git a/src/main/java/com/xkrs/utilsnew/JsonUtils.java b/src/main/java/com/xkrs/utilsnew/JsonUtils.java index 7338307..41bd0b3 100644 --- a/src/main/java/com/xkrs/utilsnew/JsonUtils.java +++ b/src/main/java/com/xkrs/utilsnew/JsonUtils.java @@ -25,7 +25,7 @@ public class JsonUtils { try { return MAPPER.readValue(json, clazz); } catch (JsonProcessingException e) { - throw new RuntimeException(e); + return null; } } diff --git a/src/main/java/com/xkrs/utilsnew/TimeRangeUtils.java b/src/main/java/com/xkrs/utilsnew/TimeRangeUtils.java index 02e5ed7..5d32c4b 100644 --- a/src/main/java/com/xkrs/utilsnew/TimeRangeUtils.java +++ b/src/main/java/com/xkrs/utilsnew/TimeRangeUtils.java @@ -49,14 +49,9 @@ public class TimeRangeUtils { public static List> getVipRangeList(String vipTimeRangeJson) { List> vipRangeList = new ArrayList<>();//VIP范围结果列表 List list = new ArrayList<>();//Json解析的VIP范围列表 - try { - VipTimeRangeBean vipTimeRangeBean = JsonUtils.deserialize(vipTimeRangeJson, VipTimeRangeBean.class); - if (vipTimeRangeBean.getList() == null || vipTimeRangeBean.getList().size() == 0) { - throw new RuntimeException("VipTimeRangeJson Error"); - } + VipTimeRangeBean vipTimeRangeBean = JsonUtils.deserialize(vipTimeRangeJson, VipTimeRangeBean.class); + if (vipTimeRangeBean != null && vipTimeRangeBean.getList() != null && !vipTimeRangeBean.getList().isEmpty()) { list.addAll(vipTimeRangeBean.getList()); - } catch (Exception e) { - e.printStackTrace(); } for (VipTimeRangeBean.VipTimeRangeItemBean item : list) { DateTimeUtils.checkDateTimeFormat(item.getStartTime()); diff --git a/src/main/java/com/xkrs/utilsold/HttpClientUtils.java b/src/main/java/com/xkrs/utilsold/HttpClientUtils.java index 71b098c..2194250 100644 --- a/src/main/java/com/xkrs/utilsold/HttpClientUtils.java +++ b/src/main/java/com/xkrs/utilsold/HttpClientUtils.java @@ -33,7 +33,7 @@ import java.security.cert.X509Certificate; */ public class HttpClientUtils { - private static final boolean printLog = true; + private static final boolean printLog = false; private static final Logger log = LoggerFactory.getLogger(HttpClientUtils.class);