This commit is contained in:
liuchengqian 2023-03-02 11:55:48 +08:00
parent 103bdb901c
commit 24fd4e9e3d
3 changed files with 0 additions and 41 deletions

View File

@ -28,13 +28,6 @@ public interface FirePointService {
*/
List<FirePointEntity> selectTodayFirePoint(String countyCode);
/**
* 查询近一个月的火点信息
*
* @return
*/
List<FirePointEntity> selectFirePointByMonth(String countyCode);
/**
* 查询近一个月的火点数量
*

View File

@ -306,25 +306,6 @@ public class FirePointServiceImpl implements FirePointService {
return firePointQueryHelper.queryFirePoint(countyCode, startTimeString, endTimeString, null, null);
}
/**
* 查询近一个月的火点信息
*/
// @Cacheable(keyGenerator = "keyGenerator", unless = "#result == null")
@Override
public List<FirePointEntity> selectFirePointByMonth(String countyCode) {
// LocalDateTime startTime1 = LocalDateTime.now().minusMonths(1);
// LocalDateTime startTime2 = LocalDateTime.of(startTime1.getYear(), startTime1.getMonth(), startTime1.getDayOfMonth(), 0, 0, 0, 0);
// String startTimeString = DateTimeUtils.localDateTimeToString(startTime2);
//
// LocalDateTime endTime1 = LocalDateTime.now().plusDays(1);
// LocalDateTime endTime2 = LocalDateTime.of(endTime1.getYear(), endTime1.getMonth(), endTime1.getDayOfMonth(), 0, 0, 0, 0);
// String endTimeString = DateTimeUtils.localDateTimeToString(endTime2);
//
// return firePointQueryHelper.queryFirePoint(countyCode, startTimeString, endTimeString, null, null);
return firePointQueryHelper.queryFirePoint(countyCode, null, null, null, null);
}
/**
* 查询近一个月的火点数量
*

View File

@ -150,21 +150,6 @@ public class FirePointController {
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointList, locale);
}
/**
* 查询近一个月的火点信息
*/
@GetMapping("/selectFirePointByMonth")
public String selectFirePointByMonth(@RequestHeader(value = "Authorization") String token) {
// 验证token
String tokenUserName = TokenUtil.obtainUserNameByToken(token);
SysUserEntity sysUserEntity = sysUserDao.selectByUserName(tokenUserName);
List<FirePointEntity> firePointEntities = firePointService.selectFirePointByMonth(sysUserEntity.getCountyCode());
if (firePointEntities == null || firePointEntities.size() == 0) {
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有火点数据", locale);
}
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointEntities, locale);
}
/**
* 查询火点数量
*/