liuchengqian/fire_point
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
liuchengqian 2025-06-04 13:39:43 +08:00
parent 6e003adc8c
commit ddae56c44f
7 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/xkrs/controller/FirePointController.java
View File

@ -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);
}

13
src/main/java/com/xkrs/controller/SysUserController.java
View File

@ -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<SysUserEntity> sysUserEntityList = sysUserDao.findAll(Sort.by(Sort.Direction.DESC, "id"));
List<SysUserVo> sysUserVoList = new ArrayList<>();
for (SysUserEntity sysUser : sysUserEntityList) {
sysUserVoList.add(SysUserConvertUtils.convert(sysUser));
}
List<SysUserEntity> sysUserEntityList = sysUserDao.selectUser(size, (page - 1) * size);
List<SysUserVo> sysUserVoList = sysUserEntityList.stream().map(SysUserConvertUtils::convert).collect(Collectors.toList());
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, sysUserVoList, locale);
}

5
src/main/java/com/xkrs/dao/SysUserDao.java
View File

@ -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<SysUserEntity, Long>, JpaSpecificationExecutor<SysUserEntity> {
@ -27,6 +29,9 @@ public interface SysUserDao extends JpaRepository<SysUserEntity, Long>, 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<SysUserEntity> selectUser(int limit, int offset);
/**
* 删除系统用户（危险操作！）
*/

4
src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java
View File

@ -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) {

2
src/main/java/com/xkrs/utilsnew/JsonUtils.java
View File

@ -25,7 +25,7 @@ public class JsonUtils {
try {
return MAPPER.readValue(json, clazz);
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
return null;
}
}

7
src/main/java/com/xkrs/utilsnew/TimeRangeUtils.java
View File

@ -49,14 +49,9 @@ public class TimeRangeUtils {
public static List<DataWrapper2<LocalDateTime, LocalDateTime>> getVipRangeList(String vipTimeRangeJson) {
List<DataWrapper2<LocalDateTime, LocalDateTime>> vipRangeList = new ArrayList<>();//VIP范围结果列表
List<VipTimeRangeBean.VipTimeRangeItemBean> 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");
}
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());

2
src/main/java/com/xkrs/utilsold/HttpClientUtils.java
View File

@ -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);