代码恢复

src/main/java/com/sundata/internalevaluation/configuration/controller/SysReqRuleController.java

@@ -1,20 +1,14 @@
 package com.sundata.internalevaluation.configuration.controller;
 
-import java.util.List;
-import java.util.Map;
-
 import com.sundata.common.base.BaseAction;
-import com.sundata.internalevaluation.calc.calcUnit.RulesCalcUnit;
-import com.sundata.internalevaluation.calc.running.threads.CalcTaskResult;
-import com.sundata.internalevaluation.calc.util.CalcUtil;
-import com.sundata.internalevaluation.configuration.model.SysReqRules;
+import com.sundata.internalevaluation.configuration.model.SysReqRule;
+import com.sundata.internalevaluation.configuration.service.SysReqRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.sundata.internalevaluation.configuration.model.SysReqRule;
-import com.sundata.internalevaluation.configuration.service.SysReqRuleService;
+import java.util.List;
 
 @RestController
 @RequestMapping("/nprule")
@@ -37,20 +31,20 @@ public class SysReqRuleController extends BaseAction {
     /**
      * 根据主键查询
      *
-     * @param id 主键
+     * @param sysReqRule 主键
      * @return 返回记录，没有返回null
      */
     @RequestMapping("getById")
     public SysReqRule getById(@RequestBody SysReqRule sysReqRule) {
-        SysReqRules rules = new SysReqRules();
-        rules.setRulesNo("rules1001");
-        rules.setRulesName("年龄判断");
-        System.out.println("****** 计算开始 *******");
-        CalcTaskResult calc = CalcUtil.calc("waterNo:" + System.currentTimeMillis(),
-                new RulesCalcUnit(rules.getRulesNo(), rules.getRulesName(), Map.of(), rules, sysReqRuleService),
-                Map.of());
-
-        System.out.println("结果："+calc);
+//        SysReqRules rules = new SysReqRules();
+//        rules.setRulesNo("rules1001");
+//        rules.setRulesName("年龄判断");
+//        System.out.println("****** 计算开始 *******");
+//        CalcTaskResult calc = CalcUtil.calc("waterNo:" + System.currentTimeMillis(),
+//                new RulesCalcUnit(rules.getRulesNo(), rules.getRulesName(), Map.of(), rules, sysReqRuleService),
+//                Map.of());
+//
+//        System.out.println("结果："+calc);
 
         return sysReqRuleService.getById(sysReqRule.getRuleNo());
     }