优化代码

ims-service/ims-eval/src/main/java/com/ims/eval/controller/TestController.java

@@ -1,5 +1,6 @@
 package com.ims.eval.controller;
 
+import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.schedule.ScoreCalculationSchedule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,7 +23,12 @@ public class TestController {
 	private ScoreCalculationSchedule scoreCalculationSchedule;
 
 	@GetMapping("/cron")
-	public void test(){
+	public R test(){
 		boolean b = scoreCalculationSchedule.doTask();
+		if (b){
+			return R.ok().data(b);
+		}else {
+			return R.error().data("保存失败！");
+		}
 	}
 }

ims-service/ims-eval/src/main/java/com/ims/eval/expression/AlarmFunction.java

@@ -1,52 +0,0 @@
-package com.ims.eval.expression;
-
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Data
-@NoArgsConstructor
-@Slf4j
-public class AlarmFunction {
-
-
-
-    private AlarmExpression alarmExpression;
-
-    private List<AlarmFunction> children;
-
-    private AlarmFunction parent;
-
-
-
-    private long lastExplainTime = 0;
-
-
-
-    public Object explain() {
-
-        Map<String, Object> varMap = new HashMap<>();
-        if (alarmExpression.getVarList() != null && alarmExpression.getVarList().size() > 0) {
-            for (String varName : alarmExpression.getVarList()) {
-
-
-            }
-        }
-
-        if (children != null && children.size() > 0) {
-            for (AlarmFunction af : children) {
-                Object result = af.explain();
-                varMap.put(af.getAlarmExpression().getFunCode(), result);
-            }
-        }
-
-        return ScriptShell.parseExpr(alarmExpression.getExpression(), varMap);
-    }
-
-
-}