bugfix(server): 优化碳排放服务接口和实现类
- 更新 InterceptorConfig 中的拦截路径 - 在 CarbonEmissionServiceImpl 中增加空值检查
This commit is contained in:
parent
39f6b38e04
commit
99e08554d3
@ -22,7 +22,7 @@ public class JWTUtil {
|
|||||||
/**
|
/**
|
||||||
* 加密密钥
|
* 加密密钥
|
||||||
*/
|
*/
|
||||||
private static final String SECRET = "net.carbon.xyz";
|
private static final String SECRET = "net.carbon";
|
||||||
/**
|
/**
|
||||||
* 令牌前缀
|
* 令牌前缀
|
||||||
*/
|
*/
|
||||||
|
@ -15,7 +15,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
|
|||||||
registry
|
registry
|
||||||
.addInterceptor(new LoginInterceptor())
|
.addInterceptor(new LoginInterceptor())
|
||||||
//拦截的路径
|
//拦截的路径
|
||||||
// .addPathPatterns("/api/user/*/**", "/api/**/*/**")
|
.addPathPatterns("/api/user/*/**", "/api/carbon/*/**")
|
||||||
//放行的路径
|
//放行的路径
|
||||||
.excludePathPatterns("/api/user/*/register", "/api/user/*/login");
|
.excludePathPatterns("/api/user/*/register", "/api/user/*/login");
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@ package net.carbon.service;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import net.carbon.model.CarbonEmissionDO;
|
import net.carbon.model.CarbonEmissionDO;
|
||||||
|
import net.carbon.vo.CarbonTimelyAlertVO;
|
||||||
import net.carbon.vo.CarbonVO;
|
import net.carbon.vo.CarbonVO;
|
||||||
|
|
||||||
|
|
||||||
@ -15,7 +16,7 @@ import net.carbon.vo.CarbonVO;
|
|||||||
*/
|
*/
|
||||||
public interface CarbonEmissionService extends IService<CarbonEmissionDO> {
|
public interface CarbonEmissionService extends IService<CarbonEmissionDO> {
|
||||||
|
|
||||||
public Object timelyAlert(String city);
|
public CarbonTimelyAlertVO timelyAlert(String city);
|
||||||
|
|
||||||
|
|
||||||
CarbonVO getCarbonEmissionData(String city);
|
CarbonVO getCarbonEmissionData(String city);
|
||||||
|
@ -40,6 +40,9 @@ public class CarbonEmissionServiceImpl extends ServiceImpl<CarbonEmissionMapper,
|
|||||||
CarbonEmissionDO carbonEmissionDO = carbonEmissionMapper.selectOne(queryWrapper);
|
CarbonEmissionDO carbonEmissionDO = carbonEmissionMapper.selectOne(queryWrapper);
|
||||||
|
|
||||||
CarbonTimelyAlertVO result = new CarbonTimelyAlertVO();
|
CarbonTimelyAlertVO result = new CarbonTimelyAlertVO();
|
||||||
|
if (carbonEmissionDO == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
BeanUtils.copyProperties(carbonEmissionDO, result);
|
BeanUtils.copyProperties(carbonEmissionDO, result);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
@ -56,6 +59,9 @@ public class CarbonEmissionServiceImpl extends ServiceImpl<CarbonEmissionMapper,
|
|||||||
CarbonEmissionDO carbonEmissionDO = carbonEmissionMapper.selectOne(queryWrapper);
|
CarbonEmissionDO carbonEmissionDO = carbonEmissionMapper.selectOne(queryWrapper);
|
||||||
|
|
||||||
CarbonVO result = new CarbonVO();
|
CarbonVO result = new CarbonVO();
|
||||||
|
if (carbonEmissionDO == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
BeanUtils.copyProperties(carbonEmissionDO, result);
|
BeanUtils.copyProperties(carbonEmissionDO, result);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
Loading…
Reference in New Issue
Block a user