Commit 37a10903 authored by ZWT's avatar ZWT

feat(能源管理系统): 修改架构

1.修改架构添加cse;
2.修改各微服务服务名,启动验证,完成cse注册;
3.修改各模块pom及配置文件,解决服务间无法调用问题;
4.修改各服务配置,解决gateway模块跨域问题;
5.暂时删除部分编译错误代码,完成本地登录流程等基础功能测试,验证改造后链路是否正常;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 7318b0d9
...@@ -22,10 +22,6 @@ public class TaskLockCache implements XCacheObject, XCacheLife { ...@@ -22,10 +22,6 @@ public class TaskLockCache implements XCacheObject, XCacheLife {
* Redis Value * Redis Value
*/ */
private String redisValue; private String redisValue;
/**
* 过期时间(分钟)
*/
private Integer validity;
/** /**
* 获取持续时间 * 获取持续时间
...@@ -34,7 +30,7 @@ public class TaskLockCache implements XCacheObject, XCacheLife { ...@@ -34,7 +30,7 @@ public class TaskLockCache implements XCacheObject, XCacheLife {
*/ */
@Override @Override
public Integer getDuration() { public Integer getDuration() {
return validity * 60; return 600;
} }
/** /**
......
package pps.core.task.job; package pps.core.task.job;
import cn.hutool.core.util.ObjectUtil;
import pps.cloud.base.service.IBaseWeatherCloudService; import pps.cloud.base.service.IBaseWeatherCloudService;
import pps.core.common.cache.TaskLockCache;
import pps.core.task.constant.TaskConstant; import pps.core.task.constant.TaskConstant;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.base.tool.XLoggerTool;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
import xstartup.service.job.XJob; import xstartup.service.job.XJob;
import xstartup.service.job.annotation.XCronTrigger; import xstartup.service.job.annotation.XCronTrigger;
...@@ -29,12 +30,25 @@ public class WeatherReceiveJob implements XJob { ...@@ -29,12 +30,25 @@ public class WeatherReceiveJob implements XJob {
@XCronTrigger(value = TaskConstant.HALF_HOUR) @XCronTrigger(value = TaskConstant.HALF_HOUR)
@Override @Override
public XServiceResult execute(XContext xContext) { public XServiceResult execute(XContext xContext) {
XLoggerTool logger = xContext.getLogger(); String key = TaskConstant.TASK_LOCK_KEY + "WeatherReceiveJob";
logger.info("------ WeatherReceiveJob start:{}", System.currentTimeMillis()); TaskLockCache exist = TaskLockCache.exist(xContext, key);
IBaseWeatherCloudService service = xContext.getBean(IBaseWeatherCloudService.class); if (ObjectUtil.isNull(exist)) {
XServiceResult result = service.weatherDataProcess(xContext); TaskLockCache cache = new TaskLockCache();
result.throwIfFail(); cache.setRedisKey(key);
logger.info("------ WeatherReceiveJob end:{}", System.currentTimeMillis()); cache.setRedisValue(key);
TaskLockCache.set(xContext, cache);
try {
xContext.getLogger().info("------ WeatherReceiveJob start:{}", System.currentTimeMillis());
IBaseWeatherCloudService service = xContext.getBean(IBaseWeatherCloudService.class);
XServiceResult result = service.weatherDataProcess(xContext);
result.throwIfFail();
} catch (Exception e) {
xContext.getLogger().error("------ WeatherReceiveJob Exception: ", e);
} finally {
xContext.getLogger().info("------ WeatherReceiveJob end:{}", System.currentTimeMillis());
TaskLockCache.delete(xContext, key);
}
}
return XServiceResult.OK; return XServiceResult.OK;
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment