diff --git a/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/cache/LocalCacheService.java b/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/cache/LocalCacheService.java index 9e05dcd..9b542e4 100644 --- a/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/cache/LocalCacheService.java +++ b/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/cache/LocalCacheService.java @@ -6,8 +6,8 @@ import com.fibo.ddp.common.dao.strategyx.aimodel.MachineLearningModelsMapper; import com.fibo.ddp.common.model.datax.datamanage.Field; import com.fibo.ddp.common.model.strategyx.aimodel.MachineLearningModels; import com.fibo.ddp.common.model.strategyx.aimodel.ModelDTO; -import com.fibo.ddp.common.service.common.CommUtil; import com.fibo.ddp.common.service.strategyx.aimodel.PMMLExecutor.PMMLExecutor; +import com.fibo.ddp.common.utils.util.CommUtil; import org.jpmml.evaluator.Evaluator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,7 +60,6 @@ public class LocalCacheService { @Resource PMMLExecutor pmmlExecutor; - private static final String VERSION = "2025-02-14 17:00"; private final String startTime = LocalDateTime.now().toString(); @@ -90,7 +89,7 @@ public class LocalCacheService { public Map getInfo(){ Map info = new HashMap<>(); - info.put("VERSION",VERSION); + info.put("VERSION",CommUtil.getVersion()); info.put("startTime",startTime); info.put("runCount",runCount.longValue()); diff --git a/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/common/CommUtil.java b/ddp/ddp-common/ddp-utils/src/main/java/com/fibo/ddp/common/utils/util/CommUtil.java similarity index 58% rename from ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/common/CommUtil.java rename to ddp/ddp-common/ddp-utils/src/main/java/com/fibo/ddp/common/utils/util/CommUtil.java index 7048226..67915c8 100644 --- a/ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/common/CommUtil.java +++ b/ddp/ddp-common/ddp-utils/src/main/java/com/fibo/ddp/common/utils/util/CommUtil.java @@ -1,8 +1,14 @@ -package com.fibo.ddp.common.service.common; +package com.fibo.ddp.common.utils.util; public class CommUtil { + private static final String VERSION = "2025-02-14 17:00"; + + + public static String getVersion(){ + return VERSION; + } public static void doSleep(long time){ if(time<=0){ return; diff --git a/ddp/ddp-manager-web/src/main/java/com/fibo/ddp/manager/web/controller/InfoController.java b/ddp/ddp-manager-web/src/main/java/com/fibo/ddp/manager/web/controller/InfoController.java new file mode 100644 index 0000000..2e3beab --- /dev/null +++ b/ddp/ddp-manager-web/src/main/java/com/fibo/ddp/manager/web/controller/InfoController.java @@ -0,0 +1,41 @@ +package com.fibo.ddp.manager.web.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.fibo.ddp.common.model.common.ResponseEntityBuilder; +import com.fibo.ddp.common.model.common.ResponseEntityDto; +import com.fibo.ddp.common.model.common.message.template.entity.AppTemplate; +import com.fibo.ddp.common.model.common.message.template.vo.AppTemplateReqVo; +import com.fibo.ddp.common.service.common.SessionManager; +import com.fibo.ddp.common.service.common.message.template.AppTemplateService; +import com.fibo.ddp.common.utils.util.CommUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +@RestController +@RequestMapping("info") +public class InfoController { + + @Autowired + private AppTemplateService appTemplateService; + + @RequestMapping("status") + public Object status(HttpServletRequest request){ + Map map = new HashMap(); + map.put("version", CommUtil.getVersion()); + map.put("now", LocalDateTime.now().toString()); + + return map; + } + + + +}