代码修改

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

@@ -0,0 +1,61 @@
+package com.ims.eval.controller;
+
+
+import com.ims.eval.entity.DataDictionary;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IDataDictionaryService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 数据字典表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+@RestController
+@RequestMapping("//data-dictionary")
+public class DataDictionaryController {
+
+	@Autowired
+	private IDataDictionaryService dataDictionaryService;
+
+
+	//@ImsPreAuth("eval:dataDictionary:view")
+	@GetMapping(value = "list")
+	public R list(@RequestParam(value = "id", required = false) String id,
+									 @RequestParam(value = "dataKey", required = false) String dataKey,
+									 @RequestParam(value = "keyName", required = false) String keyName,
+									 @RequestParam(value = "superKey", required = false) String superKey ) {
+		List<DataDictionary> list = dataDictionaryService.list(id,dataKey,keyName,superKey);
+		return R.ok().data(list);
+	}
+
+
+	/**
+	 * 添加
+	 * @param dictionary
+	 * @return
+	 */
+
+	//@ImsPreAuth("eval:dataDictionary:edit")
+	@PostMapping(value = "/add-dictionary")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R addAll(@RequestBody DataDictionary dictionary) {
+
+		boolean b = dataDictionaryService.saveOrUpdate(dictionary);
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("保存失败！");
+		}
+	}
+
+
+
+}

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

@@ -3,26 +3,22 @@
  */
 package com.ims.eval.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.ims.core.controller.WebController;
+import com.ims.core.utils.StringUtils;
+import com.ims.eval.entity.DeptResponsibility;
+import com.ims.eval.service.IDeptResponsibilityService;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.http.MediaType;
 
-
-import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-
-import com.ims.eval.entity.DeptResponsibility;
-import com.ims.eval.service.IDeptResponsibilityService;
-
 /**
  * 部门目标责任Controller
  * @author wang

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

@@ -3,33 +3,21 @@
  */
 package com.ims.eval.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ims.system.auth.ImsPreAuth;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ims.core.controller.WebController;
+import com.ims.core.utils.StringUtils;
+import com.ims.eval.entity.DeptResponsibilityTarget;
+import com.ims.eval.service.IDeptResponsibilityTargetService;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.http.MediaType;
 
-
-import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-
-import com.ims.eval.entity.DeptResponsibilityTarget;
-import com.ims.eval.service.IDeptResponsibilityTargetService;
 
 /**
  * 目标责任书指标Controller
@@ -38,7 +26,7 @@ import com.ims.eval.service.IDeptResponsibilityTargetService;
  */
 @Controller
 @RequestMapping(value = "/eval/deptResponsibilityTarget")
-public class DeptResponsibilityTargetController extends WebController<IDeptResponsibilityTargetService,DeptResponsibilityTarget> {
+public class DeptResponsibilityTargetController extends WebController<IDeptResponsibilityTargetService, DeptResponsibilityTarget> {
 
  	//@ImsPreAuth("eval:deptResponsibilityTarget:view")
 	@RequestMapping(value = "list")
@@ -131,4 +119,4 @@ public class DeptResponsibilityTargetController extends WebController<IDeptRespo
          super.exportFile(deptResponsibilityTarget,request,response );
 	}
 
-}
+}

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

@@ -3,33 +3,21 @@
  */
 package com.ims.eval.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ims.system.auth.ImsPreAuth;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ims.core.controller.WebController;
+import com.ims.core.utils.StringUtils;
+import com.ims.eval.entity.EvaluateRule;
+import com.ims.eval.service.IEvaluateRuleService;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.http.MediaType;
 
-
-import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-
-import com.ims.eval.entity.EvaluateRule;
-import com.ims.eval.service.IEvaluateRuleService;
 
 /**
  * 考评规则Controller
@@ -131,4 +119,4 @@ public class EvaluateRuleController extends WebController<IEvaluateRuleService,E
          super.exportFile(evaluateRule,request,response );
 	}
 
-}
+}

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

@@ -3,33 +3,21 @@
  */
 package com.ims.eval.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ims.system.auth.ImsPreAuth;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ims.core.controller.WebController;
+import com.ims.core.utils.StringUtils;
+import com.ims.eval.entity.EvaluateScore;
+import com.ims.eval.service.IEvaluateScoreService;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.http.MediaType;
 
-
-import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-
-import com.ims.eval.entity.EvaluateScore;
-import com.ims.eval.service.IEvaluateScoreService;
 
 /**
  * 考评得分Controller
@@ -38,7 +26,7 @@ import com.ims.eval.service.IEvaluateScoreService;
  */
 @Controller
 @RequestMapping(value = "/eval/evaluateScore")
-public class EvaluateScoreController extends WebController<IEvaluateScoreService,EvaluateScore> {
+public class EvaluateScoreController extends WebController<IEvaluateScoreService, EvaluateScore> {
 
  	//@ImsPreAuth("eval:evaluateScore:view")
 	@RequestMapping(value = "list")
@@ -131,4 +119,4 @@ public class EvaluateScoreController extends WebController<IEvaluateScoreService
          super.exportFile(evaluateScore,request,response );
 	}
 
-}
+}

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

@@ -1,134 +1,19 @@
-/**
- *
- */
 package com.ims.eval.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
-import com.ims.system.auth.ImsPreAuth;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.http.MediaType;
-
-
-import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-
-import com.ims.eval.entity.Indicator;
-import com.ims.eval.service.IIndicatorService;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 指标Controller
+ * <p>
+ *  前端控制器
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-26
  */
-@Controller
-@RequestMapping(value = "/eval/indicator")
-public class IndicatorController extends WebController<IIndicatorService,Indicator> {
-
- 	//@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "list")
-	public String list(Indicator indicator, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorList";
-	}
-
-    //@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "form")
-	public String form(Indicator indicator, Model model) {
-	    String formView = indicator.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorForm";
-	}
-
-    //@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "lov")
-	public String lov(Indicator indicator, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorList";
-	}
-
-    //@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(Indicator indicator, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(Indicator indicator, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(Indicator indicator, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(Indicator indicator, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(Indicator indicator, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(Indicator indicator, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(Indicator indicator, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(Indicator indicator, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(Indicator indicator,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(indicator,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(Indicator indicator, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(indicator,request,response );
-	}
+@RestController
+@RequestMapping("//indicator")
+public class IndicatorController {
 
-}
+}

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

@@ -1,137 +1,35 @@
-/**
- *
- */
 package com.ims.eval.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
-import com.ims.system.auth.ImsPreAuth;
+import com.ims.eval.entity.IndicatorDictionary;
+import com.ims.eval.service.IIndicatorDictionaryService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.http.MediaType;
-
-
-import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
+import org.springframework.web.bind.annotation.RestController;
 
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-
-import com.ims.eval.entity.IndicatorDictionary;
-import com.ims.eval.service.IIndicatorDictionaryService;
+import java.util.List;
 
 /**
- * 指标字典表Controller
- * @author song
- * @version 2023-02-22
+ * <p>
+ * 指标字典表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
  */
-@Controller
-@RequestMapping(value = "/eval/indicatorDictionary")
-public class IndicatorDictionaryController extends WebController<IIndicatorDictionaryService,IndicatorDictionary> {
+@RestController
+@RequestMapping("//indicator-dictionary")
+public class IndicatorDictionaryController  {
 
- 	//@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "list")
-	@ResponseBody
-	public String list(IndicatorDictionary indicatorDictionary, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorDictionaryList";
-	}
 
-    //@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "form")
-	public String form(IndicatorDictionary indicatorDictionary, Model model) {
-	    String formView = indicatorDictionary.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorDictionaryForm";
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "lov")
-	public String lov(IndicatorDictionary indicatorDictionary, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorDictionaryList";
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(IndicatorDictionary indicatorDictionary, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(indicatorDictionary,request,response,model);
-	}
+	@Autowired
+	private IIndicatorDictionaryService indicatorDictionaryService;
 
-    //@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(IndicatorDictionary indicatorDictionary, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        System.out.println("jjjjjjjjjjjjjjj");
-		return  super.getAllData(indicatorDictionary,request,response,model);
-	}
-
-
-    //@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(IndicatorDictionary indicatorDictionary, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(indicatorDictionary,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(IndicatorDictionary indicatorDictionary, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(indicatorDictionary,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(IndicatorDictionary indicatorDictionary, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(indicatorDictionary,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(IndicatorDictionary indicatorDictionary, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(indicatorDictionary,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(IndicatorDictionary indicatorDictionary, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(indicatorDictionary,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(IndicatorDictionary indicatorDictionary, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(indicatorDictionary,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(IndicatorDictionary indicatorDictionary,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(indicatorDictionary,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(IndicatorDictionary indicatorDictionary, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(indicatorDictionary,request,response );
+	//@ImsPreAuth("eval:indicator:view")
+	@RequestMapping(value = "list")
+	public List<IndicatorDictionary> list() {
+		List<IndicatorDictionary> list = indicatorDictionaryService.list();
+		return list;
 	}
 
 }

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

@@ -3,38 +3,26 @@
  */
 package com.ims.eval.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ims.system.auth.ImsPreAuth;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ims.core.controller.WebController;
+import com.ims.core.utils.StringUtils;
+import com.ims.eval.entity.Report;
+import com.ims.eval.service.IReportService;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.http.MediaType;
 
-
-import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-
-import com.ims.eval.entity.Report;
-import com.ims.eval.service.IReportService;
 
 /**
- * 公告发布Controller
+ * 发布公告表Controller
  * @author wang
- * @version 2023-02-23
+ * @version 2023-02-25
  */
 @Controller
 @RequestMapping(value = "/eval/report")
@@ -131,4 +119,4 @@ public class ReportController extends WebController<IReportService,Report> {
          super.exportFile(report,request,response );
 	}
 
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/DataDictionaryMapper.java

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ims.eval.entity.DataDictionary;
+
+/**
+ * <p>
+ * 数据字典表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/DdeptResponsibilityDao.java

@@ -0,0 +1,16 @@
+/**
+ *
+ */
+package com.ims.eval.dao;
+
+import com.ims.core.dao.CrudDao;
+import com.ims.eval.entity.DeptResponsibility;
+
+/**
+ * 部门目标责任DAO接口
+ * @author wang
+ * @version 2023-02-23
+ */
+public interface DdeptResponsibilityDao extends CrudDao<DeptResponsibility> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/DeptResponsibilityTargetDao.java

@@ -13,4 +13,4 @@ import com.ims.eval.entity.DeptResponsibilityTarget;
  */
 public interface DeptResponsibilityTargetDao extends CrudDao<DeptResponsibilityTarget> {
 
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluateRuleDao.java

@@ -6,6 +6,7 @@ package com.ims.eval.dao;
 import com.ims.core.dao.CrudDao;
 import com.ims.eval.entity.EvaluateRule;
 
+
 /**
  * 考评规则DAO接口
  * @author wang
@@ -13,4 +14,4 @@ import com.ims.eval.entity.EvaluateRule;
  */
 public interface EvaluateRuleDao extends CrudDao<EvaluateRule> {
 
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluateScoreDao.java

@@ -13,4 +13,4 @@ import com.ims.eval.entity.EvaluateScore;
  */
 public interface EvaluateScoreDao extends CrudDao<EvaluateScore> {
 
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/IndicatorDao.java

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.Indicator;
-
-/**
- * 指标DAO接口
- * @author wang
- * @version 2023-02-23
- */
-public interface IndicatorDao extends CrudDao<Indicator> {
-
-}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/IndicatorDictionaryDao.java

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.IndicatorDictionary;
-
-/**
- * 指标字典DAO接口
- * @author song
- * @version 2023-02-22
- */
-public interface IndicatorDictionaryDao extends CrudDao<IndicatorDictionary> {
-
-}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/IndicatorDictionaryMapper.java

@@ -0,0 +1,18 @@
+package com.ims.eval.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ims.eval.entity.IndicatorDictionary;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 指标字典表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+@Mapper
+public interface IndicatorDictionaryMapper extends BaseMapper<IndicatorDictionary> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/IndicatorMapper.java

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ims.eval.entity.Indicator;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+public interface IndicatorMapper extends BaseMapper<Indicator> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/ReportDao.java

@@ -7,9 +7,9 @@ import com.ims.core.dao.CrudDao;
 import com.ims.eval.entity.Report;
 
 /**
- * 公告发布DAO接口
+ * 发布公告表DAO接口
  * @author wang
- * @version 2023-02-23
+ * @version 2023-02-25
  */
 public interface ReportDao extends CrudDao<Report> {
 

ims-service/ims-eval/src/main/java/com/ims/eval/dao/result/R.java

@@ -0,0 +1,71 @@
+package com.ims.eval.dao.result;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName : R
+ * @Author : xieshengjie
+ * @Date: 2021/5/16 16:59
+ * @Description : 结果集
+ */
+@Data
+public class R {
+    @ApiModelProperty(value = "是否成功")
+    private Boolean success;
+    @ApiModelProperty(value = "返回码")
+    private Integer code;
+    @ApiModelProperty(value = "返回消息")
+    private String message;
+    @ApiModelProperty(value = "总数量")
+    private Integer count;
+    @ApiModelProperty(value = "返回数据")
+    private Object data = new Object();
+    private R(){}
+    public static R ok(){
+        R r = new R();
+        r.setSuccess(true);
+        r.setCode(ResultCode.SUCCESS);
+        r.setMessage("成功");
+        return r;
+    }
+    public static R ok(Integer count){
+        R r = new R();
+        r.setSuccess(true);
+        r.setCode(ResultCode.SUCCESS);
+        r.setMessage("成功");
+        r.setCount(count);
+        return r;
+    }
+    public static R error(){
+        R r = new R();
+        r.setSuccess(false);
+        r.setCode(ResultCode.ERROR);
+        r.setMessage("失败");
+        return r;
+    }
+    public R success(Boolean success){
+        this.setSuccess(success);
+        return this;
+    }
+    public R message(String message){
+        this.setMessage(message);
+        return this;
+    }
+    public R code(Integer code){
+        this.setCode(code);
+        return this;
+    }
+//    public R data(String key, Object value){
+//        this.data.put(key, value);
+//        return this;
+//    }
+//    public R data(Map<String, Object> map){
+//        this.setData(map);
+//        return this;
+//    }
+    public R data(Object value){
+        this.setData(value);
+        return this;
+    }
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/result/ResultCode.java

@@ -0,0 +1,12 @@
+package com.ims.eval.dao.result;
+
+/**
+ * @ClassName : ResultCode
+ * @Author : xieshengjie
+ * @Date: 2021/5/16 17:01
+ * @Description : 结果状态
+ */
+public class ResultCode {
+    public static Integer SUCCESS = 200;
+    public static Integer ERROR = 500;
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/result/ResultInfo.java

@@ -0,0 +1,87 @@
+package com.ims.eval.dao.result;
+
+import lombok.Data;
+
+/**
+ *@ClassName ResultInfo
+ *@Description 返回结果类统一封装
+ *@Author 谢生杰
+ *@Date 2020/9/25 18:53
+ *@Version 1.0
+ **/
+@Data
+public class ResultInfo {
+    // 状态码
+    private Integer code;
+    // 消息
+    private String message;
+    // 数据对象
+    private Object result;
+
+    private Integer total;
+
+    /**
+     * 无参构造器
+     */
+    public ResultInfo() {
+        super();
+    }
+
+    public ResultInfo(Status status) {
+        super();
+        this.code = status.code;
+        this.message = status.message;
+    }
+
+    public ResultInfo result(Object result) {
+        this.result = result;
+        return this;
+    }
+
+    public ResultInfo message(String message) {
+        this.message = message;
+        return this;
+    }
+    public ResultInfo total(Integer total) {
+        this.total = total;
+        return this;
+    }
+
+    /**
+     * 只返回状态，状态码，消息
+     *
+     * @param code
+     * @param message
+     */
+    public ResultInfo(Integer code, String message) {
+        super();
+        this.code = code;
+        this.message = message;
+    }
+
+    /**
+     * 只返回状态，状态码，数据对象
+     *
+     * @param code
+     * @param result
+     */
+    public ResultInfo(Integer code, Object result) {
+        super();
+        this.code = code;
+        this.result = result;
+    }
+
+    /**
+     * 返回全部信息即状态，状态码，消息，数据对象
+     *
+     * @param code
+     * @param message
+     * @param result
+     */
+    public ResultInfo(Integer code, String message, Object result) {
+        super();
+        this.code = code;
+        this.message = message;
+        this.result = result;
+    }
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/result/Status.java

@@ -0,0 +1,42 @@
+package com.ims.eval.dao.result;
+/**
+ *@ClassName Status
+ *@Description 枚举类对象
+ *@Author 谢生杰
+ *@Date 2020/9/25 18:54
+ *@Version 1.0
+ **/
+public enum Status {
+    // 公共
+    SUCCESS(2000, "成功"),
+    UNKNOWN_ERROR(9998,"未知异常"),
+    SYSTEM_ERROR(9999, "系统异常"),
+
+
+    INSUFFICIENT_PERMISSION(4003, "权限不足"),
+
+    WARN(9000, "失败"),
+    REQUEST_PARAMETER_ERROR(1002, "请求参数错误"),
+
+
+
+    // 登录
+    LOGIN_EXPIRE(2001, "未登录或者登录失效"),
+    LOGIN_CODE_ERROR(2002, "登录验证码错误"),
+    LOGIN_ERROR(2003, "用户名不存在或密码错误"),
+    LOGIN_USER_STATUS_ERROR(2004, "用户状态不正确"),
+    LOGOUT_ERROR(2005, "退出失败，token不存在"),
+    LOGIN_USER_NOT_EXIST(2006, "该用户不存在"),
+    LOGIN_USER_EXIST(2007, "该用户已存在");
+
+
+
+
+    public int code;
+    public String message;
+
+    Status(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/IDataDictionaryService.java

@@ -0,0 +1,21 @@
+package com.ims.eval.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.DataDictionary;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 数据字典表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+public interface IDataDictionaryService extends IService<DataDictionary> {
+
+	List<DataDictionary> list(String id,String dataKey,String keyName,String superKey);
+
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/IDeptResponsibilityService.java

@@ -4,9 +4,7 @@
 package com.ims.eval.service;
 
 
-
 import com.ims.core.service.ICrudService;
-
 import com.ims.eval.entity.DeptResponsibility;
 
 /**

ims-service/ims-eval/src/main/java/com/ims/eval/service/IDeptResponsibilityTargetService.java

@@ -4,11 +4,8 @@
 package com.ims.eval.service;
 
 
-
 import com.ims.core.service.ICrudService;
-
 import com.ims.eval.entity.DeptResponsibilityTarget;
-import com.ims.eval.dao.DeptResponsibilityTargetDao;
 
 /**
  * 目标责任书指标Service
@@ -18,4 +15,4 @@ import com.ims.eval.dao.DeptResponsibilityTargetDao;
 
 public interface IDeptResponsibilityTargetService extends ICrudService<DeptResponsibilityTarget> {
 
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluateRuleService.java

@@ -4,11 +4,8 @@
 package com.ims.eval.service;
 
 
-
 import com.ims.core.service.ICrudService;
-
 import com.ims.eval.entity.EvaluateRule;
-import com.ims.eval.dao.EvaluateRuleDao;
 
 /**
  * 考评规则Service
@@ -18,4 +15,4 @@ import com.ims.eval.dao.EvaluateRuleDao;
 
 public interface IEvaluateRuleService extends ICrudService<EvaluateRule> {
 
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluateScoreService.java

@@ -4,11 +4,8 @@
 package com.ims.eval.service;
 
 
-
 import com.ims.core.service.ICrudService;
-
 import com.ims.eval.entity.EvaluateScore;
-import com.ims.eval.dao.EvaluateScoreDao;
 
 /**
  * 考评得分Service
@@ -18,4 +15,4 @@ import com.ims.eval.dao.EvaluateScoreDao;
 
 public interface IEvaluateScoreService extends ICrudService<EvaluateScore> {
 
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/IIndicatorDictionaryService.java

@@ -1,21 +1,20 @@
-/**
- *
- */
 package com.ims.eval.service;
 
-
-
-import com.ims.core.service.ICrudService;
-
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ims.eval.entity.IndicatorDictionary;
-import com.ims.eval.dao.IndicatorDictionaryDao;
+
+import java.util.List;
 
 /**
- * 指标字典表Service
- * @author song
- * @version 2023-02-22
+ * <p>
+ * 指标字典表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
  */
+public interface IIndicatorDictionaryService extends IService<IndicatorDictionary> {
 
-public interface IIndicatorDictionaryService extends ICrudService<IndicatorDictionary> {
+	List<IndicatorDictionary> list();
 
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/IIndicatorService.java

@@ -1,21 +1,16 @@
-/**
- *
- */
 package com.ims.eval.service;
 
-
-
-import com.ims.core.service.ICrudService;
-
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ims.eval.entity.Indicator;
-import com.ims.eval.dao.IndicatorDao;
 
 /**
- * 指标Service
+ * <p>
+ *  服务类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-26
  */
+public interface IIndicatorService extends IService<Indicator> {
 
-public interface IIndicatorService extends ICrudService<Indicator> {
-
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/IReportService.java

@@ -4,11 +4,9 @@
 package com.ims.eval.service;
 
 
-
 import com.ims.core.service.ICrudService;
-
 import com.ims.eval.entity.Report;
-import com.ims.eval.dao.ReportDao;
+
 
 /**
  * 公告发布Service

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DataDictionaryServiceImpl.java

@@ -0,0 +1,35 @@
+package com.ims.eval.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ims.eval.dao.DataDictionaryMapper;
+import com.ims.eval.entity.DataDictionary;
+import com.ims.eval.service.IDataDictionaryService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 数据字典表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+@Service
+public class DataDictionaryServiceImpl extends ServiceImpl<DataDictionaryMapper, DataDictionary> implements IDataDictionaryService {
+
+	@Override
+	public List<DataDictionary> list(String id, String dataKey, String keyName, String superKey) {
+		QueryWrapper<DataDictionary> qw = new QueryWrapper<>();
+		qw.lambda().eq(DataDictionary::getId, id);
+		qw.lambda().eq(DataDictionary::getDataKey, dataKey);
+		qw.lambda().like(DataDictionary::getKeyName, keyName);
+		qw.lambda().eq(DataDictionary::getSuperKey, superKey);
+		List<DataDictionary> list = baseMapper.selectList(qw);
+		return list;
+	}
+
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DeptResponsibilityServiceImpl.java

@@ -3,18 +3,16 @@
  */
 package com.ims.eval.service.impl;
 
-import java.util.List;
-import com.ims.core.utils.IdGen;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ims.core.persistence.Page;
 import com.ims.core.service.impl.CrudServiceImpl;
-
+import com.ims.core.utils.IdGen;
+import com.ims.eval.dao.DdeptResponsibilityDao;
+import com.ims.eval.entity.DeptResponsibility;
 import com.ims.eval.service.IDeptResponsibilityService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import com.ims.eval.entity.DeptResponsibility;
-import com.ims.eval.dao.DeptResponsibilityDao;
+import java.util.List;
 
 
 /**
@@ -24,7 +22,7 @@ import com.ims.eval.dao.DeptResponsibilityDao;
  */
 @Service
 @Transactional(readOnly = true)
-public class DeptResponsibilityServiceImpl extends CrudServiceImpl<DeptResponsibilityDao, DeptResponsibility> implements IDeptResponsibilityService {
+public class DeptResponsibilityServiceImpl extends CrudServiceImpl<DdeptResponsibilityDao, DeptResponsibility> implements IDeptResponsibilityService {
 
  	public DeptResponsibility get(DeptResponsibility ddeptResponsibility) {
 		return super.get(ddeptResponsibility);

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DeptResponsibilityTargetServiceImpl.java

@@ -3,18 +3,16 @@
  */
 package com.ims.eval.service.impl;
 
-import java.util.List;
-import com.ims.core.utils.IdGen;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ims.core.persistence.Page;
 import com.ims.core.service.impl.CrudServiceImpl;
-
+import com.ims.core.utils.IdGen;
+import com.ims.eval.dao.DeptResponsibilityTargetDao;
+import com.ims.eval.entity.DeptResponsibilityTarget;
 import com.ims.eval.service.IDeptResponsibilityTargetService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import com.ims.eval.entity.DeptResponsibilityTarget;
-import com.ims.eval.dao.DeptResponsibilityTargetDao;
+import java.util.List;
 
 
 /**
@@ -74,4 +72,4 @@ public class DeptResponsibilityTargetServiceImpl extends CrudServiceImpl<DeptRes
 	public void delete(DeptResponsibilityTarget deptResponsibilityTarget,String baseFilter) {
 		super.delete(deptResponsibilityTarget,baseFilter);
 	}
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluateRuleServiceImpl.java

@@ -3,18 +3,16 @@
  */
 package com.ims.eval.service.impl;
 
-import java.util.List;
-import com.ims.core.utils.IdGen;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ims.core.persistence.Page;
 import com.ims.core.service.impl.CrudServiceImpl;
-
+import com.ims.core.utils.IdGen;
+import com.ims.eval.dao.EvaluateRuleDao;
+import com.ims.eval.entity.EvaluateRule;
 import com.ims.eval.service.IEvaluateRuleService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import com.ims.eval.entity.EvaluateRule;
-import com.ims.eval.dao.EvaluateRuleDao;
+import java.util.List;
 
 
 /**
@@ -74,4 +72,4 @@ public class EvaluateRuleServiceImpl extends CrudServiceImpl<EvaluateRuleDao, Ev
 	public void delete(EvaluateRule evaluateRule,String baseFilter) {
 		super.delete(evaluateRule,baseFilter);
 	}
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluateScoreServiceImpl.java

@@ -3,18 +3,16 @@
  */
 package com.ims.eval.service.impl;
 
-import java.util.List;
-import com.ims.core.utils.IdGen;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ims.core.persistence.Page;
 import com.ims.core.service.impl.CrudServiceImpl;
-
+import com.ims.core.utils.IdGen;
+import com.ims.eval.dao.EvaluateScoreDao;
+import com.ims.eval.entity.EvaluateScore;
 import com.ims.eval.service.IEvaluateScoreService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import com.ims.eval.entity.EvaluateScore;
-import com.ims.eval.dao.EvaluateScoreDao;
+import java.util.List;
 
 
 /**
@@ -74,4 +72,4 @@ public class EvaluateScoreServiceImpl extends CrudServiceImpl<EvaluateScoreDao,
 	public void delete(EvaluateScore evaluateScore,String baseFilter) {
 		super.delete(evaluateScore,baseFilter);
 	}
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/IndicatorDictionaryServiceImpl.java

@@ -1,77 +1,32 @@
-/**
- *
- */
 package com.ims.eval.service.impl;
 
-import java.util.List;
-import com.ims.core.utils.IdGen;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-
-import com.ims.eval.service.IIndicatorDictionaryService;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ims.eval.dao.IndicatorDictionaryMapper;
 import com.ims.eval.entity.IndicatorDictionary;
-import com.ims.eval.dao.IndicatorDictionaryDao;
+import com.ims.eval.service.IIndicatorDictionaryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+import java.util.List;
 
 /**
- * 指标字典表Service
- * @author song
- * @version 2023-02-22
+ * <p>
+ * 指标字典表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
  */
 @Service
-@Transactional(readOnly = true)
-public class IndicatorDictionaryServiceImpl extends CrudServiceImpl<IndicatorDictionaryDao, IndicatorDictionary> implements IIndicatorDictionaryService{
-
- 	public IndicatorDictionary get(IndicatorDictionary indicatorDictionary) {
-		return super.get(indicatorDictionary);
-	}
-
-    public List<IndicatorDictionary> findList(IndicatorDictionary indicatorDictionary) {
-        return super.findList(indicatorDictionary);
-    }
-
-	public List<IndicatorDictionary> findAllListM(IndicatorDictionary indicatorDictionary,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(indicatorDictionary,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<IndicatorDictionary> findPageM(Page<IndicatorDictionary> page, IndicatorDictionary indicatorDictionary,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, indicatorDictionary,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public IndicatorDictionary initInsert(IndicatorDictionary indicatorDictionary)  {
-		return super.initInsert(indicatorDictionary);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(IndicatorDictionary indicatorDictionary) {
-		super.checkSave(indicatorDictionary);
-	}
+public class IndicatorDictionaryServiceImpl extends ServiceImpl<IndicatorDictionaryMapper, IndicatorDictionary> implements IIndicatorDictionaryService {
 
-	@Transactional(readOnly = false)
-	public IndicatorDictionary save(IndicatorDictionary indicatorDictionary, boolean isNewRecord){
-	    if(isNewRecord){
-	        indicatorDictionary.setId(IdGen.uuid());
-	    }
-		return super.save(indicatorDictionary,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<IndicatorDictionary> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(IndicatorDictionary indicatorDictionary,String baseFilter){
-		super.checkRemove(indicatorDictionary,baseFilter);
-	}
 
-	@Transactional(readOnly = false)
-	public void delete(IndicatorDictionary indicatorDictionary,String baseFilter) {
-		super.delete(indicatorDictionary,baseFilter);
+	@Autowired
+	private IndicatorDictionaryMapper indicatorDictionaryMapper;
+	public  List<IndicatorDictionary>  list(){
+		QueryWrapper<IndicatorDictionary> qw = new QueryWrapper<>();
+		List<IndicatorDictionary> list = indicatorDictionaryMapper.selectList(qw);
+		return list;
 	}
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/IndicatorServiceImpl.java

@@ -1,77 +1,20 @@
-/**
- *
- */
 package com.ims.eval.service.impl;
 
-import java.util.List;
-import com.ims.core.utils.IdGen;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-
-import com.ims.eval.service.IIndicatorService;
-
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ims.eval.dao.IndicatorMapper;
 import com.ims.eval.entity.Indicator;
-import com.ims.eval.dao.IndicatorDao;
-
+import com.ims.eval.service.IIndicatorService;
+import org.springframework.stereotype.Service;
 
 /**
- * 指标Service
+ * <p>
+ *  服务实现类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-26
  */
 @Service
-@Transactional(readOnly = true)
-public class IndicatorServiceImpl extends CrudServiceImpl<IndicatorDao, Indicator> implements IIndicatorService{
-
- 	public Indicator get(Indicator indicator) {
-		return super.get(indicator);
-	}
-
-    public List<Indicator> findList(Indicator indicator) {
-        return super.findList(indicator);
-    }
-
-	public List<Indicator> findAllListM(Indicator indicator,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(indicator,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<Indicator> findPageM(Page<Indicator> page, Indicator indicator,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, indicator,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Indicator initInsert(Indicator indicator)  {
-		return super.initInsert(indicator);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(Indicator indicator) {
-		super.checkSave(indicator);
-	}
-
-	@Transactional(readOnly = false)
-	public Indicator save(Indicator indicator, boolean isNewRecord){
-	    if(isNewRecord){
-	        indicator.setId(IdGen.uuid());
-	    }
-		return super.save(indicator,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<Indicator> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(Indicator indicator,String baseFilter){
-		super.checkRemove(indicator,baseFilter);
-	}
+public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator> implements IIndicatorService {
 
-	@Transactional(readOnly = false)
-	public void delete(Indicator indicator,String baseFilter) {
-		super.delete(indicator,baseFilter);
-	}
-}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/ReportServiceImpl.java

@@ -3,18 +3,16 @@
  */
 package com.ims.eval.service.impl;
 
-import java.util.List;
-import com.ims.core.utils.IdGen;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ims.core.persistence.Page;
 import com.ims.core.service.impl.CrudServiceImpl;
-
+import com.ims.core.utils.IdGen;
+import com.ims.eval.dao.ReportDao;
+import com.ims.eval.entity.Report;
 import com.ims.eval.service.IReportService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import com.ims.eval.entity.Report;
-import com.ims.eval.dao.ReportDao;
+import java.util.List;
 
 
 /**
@@ -74,4 +72,4 @@ public class ReportServiceImpl extends CrudServiceImpl<ReportDao, Report> implem
 	public void delete(Report report,String baseFilter) {
 		super.delete(report,baseFilter);
 	}
-}
+}

ims-service/sm-test/src/main/java/com/ims/eval/SmTest.java

@@ -1,5 +1,6 @@
 package com.ims.eval;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springblade.core.launch.BladeApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 import org.springframework.context.annotation.ComponentScan;
@@ -14,6 +15,7 @@ import org.springframework.context.annotation.ComponentScans;
 @ComponentScans({
 	@ComponentScan("com.ims.ext.act")
 })
+@MapperScan("com.ims.eval.dao")
 public class SmTest {
 	public static void main(String[] args) {
 		BladeApplication.run("sm-test", SmTest.class, args);

ims-service/sm-test/src/main/java/com/ims/eval/controller/DataDictionaryController.java

@@ -0,0 +1,62 @@
+package com.ims.eval.controller;
+
+
+import com.ims.eval.entity.DataDictionary;
+import com.ims.eval.entity.IndicatorDictionary;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IDataDictionaryService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 数据字典表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+@RestController
+@RequestMapping("//data-dictionary")
+public class DataDictionaryController {
+
+	@Autowired
+	private IDataDictionaryService dataDictionaryService;
+
+
+	//@ImsPreAuth("eval:dataDictionary:view")
+	@GetMapping(value = "list")
+	public R list(@RequestParam(value = "id", required = false) String id,
+									 @RequestParam(value = "dataKey", required = false) String dataKey,
+									 @RequestParam(value = "keyName", required = false) String keyName,
+									 @RequestParam(value = "superKey", required = false) String superKey ) {
+		List<DataDictionary> list = dataDictionaryService.list(id,dataKey,keyName,superKey);
+		return R.ok().data(list);
+	}
+
+
+	/**
+	 * 添加
+	 * @param dictionary
+	 * @return
+	 */
+
+	//@ImsPreAuth("eval:dataDictionary:edit")
+	@PostMapping(value = "/add-dictionary")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R addAll(@RequestBody DataDictionary dictionary) {
+
+		boolean b = dataDictionaryService.saveOrUpdate(dictionary);
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("保存失败！");
+		}
+	}
+
+
+
+}

ims-service/sm-test/src/main/java/com/ims/eval/controller/IndicatorController.java

@@ -1,123 +1,20 @@
-/**
- *
- */
 package com.ims.eval.controller;
 
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
 
-import com.ims.eval.entity.Indicator;
-import com.ims.eval.service.IIndicatorService;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 指标Controller
+ * <p>
+ *  前端控制器
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-26
  */
-@Controller
-@RequestMapping(value = "/eval/indicator")
-public class IndicatorController extends WebController<IIndicatorService, Indicator> {
-
- 	//@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "list")
-	public String list(Indicator indicator, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorList";
-	}
-
-    //@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "form")
-	public String form(Indicator indicator, Model model) {
-	    String formView = indicator.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorForm";
-	}
-
-    //@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "lov")
-	public String lov(Indicator indicator, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorList";
-	}
-
-    //@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(Indicator indicator, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(Indicator indicator, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(Indicator indicator, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(Indicator indicator, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(Indicator indicator, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(Indicator indicator, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(Indicator indicator, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(Indicator indicator, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(indicator,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicator:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(Indicator indicator,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(indicator,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(Indicator indicator, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(indicator,request,response );
-	}
+@RestController
+@RequestMapping("//indicator")
+public class IndicatorController {
 
 }

ims-service/sm-test/src/main/java/com/ims/eval/controller/IndicatorDictionaryController.java

@@ -1,125 +1,41 @@
-/**
- *
- */
 package com.ims.eval.controller;
 
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
 
+import com.ims.core.controller.WebController;
+import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.IndicatorDictionary;
+import com.ims.eval.entity.Report;
 import com.ims.eval.service.IIndicatorDictionaryService;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
+import com.ims.eval.service.IReportService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
- * 指标字典表Controller
- * @author song
- * @version 2023-02-22
+ * <p>
+ * 指标字典表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
  */
-@Controller
-@RequestMapping(value = "/eval/indicatorDictionary")
-public class IndicatorDictionaryController extends WebController<IIndicatorDictionaryService, IndicatorDictionary> {
-
- 	//@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "list")
-	public String list(IndicatorDictionary indicatorDictionary, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorDictionaryList";
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "form")
-	public String form(IndicatorDictionary indicatorDictionary, Model model) {
-	    String formView = indicatorDictionary.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorDictionaryForm";
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "lov")
-	public String lov(IndicatorDictionary indicatorDictionary, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorDictionaryList";
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(IndicatorDictionary indicatorDictionary, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(indicatorDictionary,request,response,model);
-	}
+@RestController
+@RequestMapping("//indicator-dictionary")
+public class IndicatorDictionaryController  {
 
-    //@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(IndicatorDictionary indicatorDictionary, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        System.out.println("jjjjjjjjjjjjjjj");
-		return  super.getAllData(indicatorDictionary,request,response,model);
-	}
-
-
-    //@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(IndicatorDictionary indicatorDictionary, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(indicatorDictionary,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(IndicatorDictionary indicatorDictionary, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(indicatorDictionary,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(IndicatorDictionary indicatorDictionary, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(indicatorDictionary,request,response,model);
-	}
 
-    //@ImsPreAuth("eval:indicatorDictionary:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(IndicatorDictionary indicatorDictionary, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(indicatorDictionary,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(IndicatorDictionary indicatorDictionary, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(indicatorDictionary,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(IndicatorDictionary indicatorDictionary, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(indicatorDictionary,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:indicatorDictionary:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(IndicatorDictionary indicatorDictionary,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(indicatorDictionary,excelFile,null,request,response);
-	}
+	@Autowired
+	private IIndicatorDictionaryService indicatorDictionaryService;
 
-    //@ImsPreAuth("eval:indicatorDictionary:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(IndicatorDictionary indicatorDictionary, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(indicatorDictionary,request,response );
+	//@ImsPreAuth("eval:indicator:view")
+	@RequestMapping(value = "list")
+	public List<IndicatorDictionary> list() {
+		List<IndicatorDictionary> list = indicatorDictionaryService.list();
+		return list;
 	}
 
 }

ims-service/sm-test/src/main/java/com/ims/eval/dao/DataDictionaryMapper.java

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.DataDictionary;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 数据字典表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
+
+}

ims-service/sm-test/src/main/java/com/ims/eval/dao/IndicatorDao.java

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.Indicator;
-
-/**
- * 指标DAO接口
- * @author wang
- * @version 2023-02-23
- */
-public interface IndicatorDao extends CrudDao<Indicator> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/dao/IndicatorDictionaryDao.java

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.IndicatorDictionary;
-
-/**
- * 指标字典DAO接口
- * @author song
- * @version 2023-02-22
- */
-public interface IndicatorDictionaryDao extends CrudDao<IndicatorDictionary> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/dao/IndicatorDictionaryMapper.java

@@ -0,0 +1,18 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.IndicatorDictionary;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 指标字典表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+@Mapper
+public interface IndicatorDictionaryMapper extends BaseMapper<IndicatorDictionary> {
+
+}

ims-service/sm-test/src/main/java/com/ims/eval/dao/IndicatorMapper.java

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.Indicator;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+public interface IndicatorMapper extends BaseMapper<Indicator> {
+
+}

ims-service/sm-test/src/main/java/com/ims/eval/entity/DataDictionary.java

@@ -0,0 +1,74 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 数据字典表
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DataDictionary extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String id;
+
+
+	/**
+	 * 数据key
+	 */
+	private String dataKey;
+
+    /**
+     * 名称
+     */
+    private String keyName;
+
+    /**
+     * 对应值
+     */
+    private String keyValue;
+
+    /**
+     * 描述
+     */
+    private String des;
+
+    /**
+     * 父类key
+     */
+    private String superKey;
+
+    /**
+     * 创建时间
+     */
+    private LocalDate createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDate updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+
+}

ims-service/sm-test/src/main/java/com/ims/eval/entity/Indicator.java

@@ -1,151 +1,114 @@
-/**
- *
- */
 package com.ims.eval.entity;
 
 import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Date;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import com.ims.core.entity.DataEntity;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
- * 指标Entity
+ * <p>
+ * 
+ * </p>
+ *
  * @author wang
- * @version 2023-02-25
+ * @since 2023-02-26
  */
-public class Indicator extends DataEntity<Indicator> {
-
-	private static final long serialVersionUID = 1L;
-	private String indicatorName;		// 指标名称
-	private String indicatorCede;		// 指标编码
-	private String unit;		// 指标单位
-	private String isQuantified;		// 能否量化
-	private String isAdditional;		// 是否专项
-	private String des;		// 描述
-	private String binSection;		// 业务版块
-	private String binStage;		// 业务阶段
-	private String dept;		// 部门
-	private String company;		// 公司
-	private Boolean enable;		// 是否启用
-	private Date createTime;		// 创建时间
-	private Date updateTime;		// 修改时间
-	private String remark;		// 备注
-	private BigDecimal orderNum;		// 排序
-
-
-	public Indicator() {
-		super();
-	}
-
-	public Indicator(String id){
-		super(id);
-	}
-
-	public String getIndicatorName() {
-		return indicatorName;
-	}
-
-	public void setIndicatorName(String indicatorName) {
-		this.indicatorName = indicatorName;
-	}
-	public String getIndicatorCede() {
-		return indicatorCede;
-	}
-
-	public void setIndicatorCede(String indicatorCede) {
-		this.indicatorCede = indicatorCede;
-	}
-	public String getUnit() {
-		return unit;
-	}
-
-	public void setUnit(String unit) {
-		this.unit = unit;
-	}
-	public String getIsQuantified() {
-		return isQuantified;
-	}
-
-	public void setIsQuantified(String isQuantified) {
-		this.isQuantified = isQuantified;
-	}
-	public String getIsAdditional() {
-		return isAdditional;
-	}
-
-	public void setIsAdditional(String isAdditional) {
-		this.isAdditional = isAdditional;
-	}
-	public String getDes() {
-		return des;
-	}
-
-	public void setDes(String des) {
-		this.des = des;
-	}
-	public String getBinSection() {
-		return binSection;
-	}
-
-	public void setBinSection(String binSection) {
-		this.binSection = binSection;
-	}
-	public String getBinStage() {
-		return binStage;
-	}
-
-	public void setBinStage(String binStage) {
-		this.binStage = binStage;
-	}
-	public String getDept() {
-		return dept;
-	}
-
-	public void setDept(String dept) {
-		this.dept = dept;
-	}
-	public String getCompany() {
-		return company;
-	}
-
-	public void setCompany(String company) {
-		this.company = company;
-	}
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-	public BigDecimal getOrderNum() {
-		return orderNum;
-	}
-
-	public void setOrderNum(BigDecimal orderNum) {
-		this.orderNum = orderNum;
-	}
-
-}
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Indicator extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 指标名称
+     */
+    private String indicatorName;
+
+    /**
+     * 指标编码
+     */
+    private String indicatorCede;
+
+    /**
+     * 指标单位
+     */
+    private String unit;
+
+    /**
+     * 能否量化
+     */
+    private String isQuantified;
+
+    /**
+     * 是否专项
+     */
+    private String isAdditional;
+
+    /**
+     * 描述
+     */
+    private String des;
+
+    /**
+     * 业务版块
+     */
+    private String binSection;
+
+    /**
+     * 业务阶段
+     */
+    private String binStage;
+
+    /**
+     * 部门
+     */
+    private String dept;
+
+    /**
+     * 公司
+     */
+    private String company;
+
+    /**
+     * 是否启用
+     */
+    private Boolean enable;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 排序
+     */
+    private BigDecimal orderNum;
+
+
+}

ims-service/sm-test/src/main/java/com/ims/eval/entity/IndicatorDictionary.java

@@ -1,91 +1,74 @@
-/**
- *
- */
 package com.ims.eval.entity;
 
-import java.util.Date;
-import com.alibaba.fastjson.annotation.JSONField;
 import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Date;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import com.ims.core.entity.DataEntity;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
- * 指标字典表Entity
+ * <p>
+ * 指标字典表
+ * </p>
+ *
  * @author wang
- * @version 2023-02-25
+ * @since 2023-02-26
  */
-public class IndicatorDictionary extends DataEntity<IndicatorDictionary> {
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class IndicatorDictionary extends Model {
 
-	private static final long serialVersionUID = 1L;
-	private String indicatorId;		// 指标ID
-	private String optionCode;		// 选项编码
-	private String optionName;		// 选项名称
-	private Integer optionOrder;		// 选项顺序
-	private String des;		// 描述
-	private Date createTime;		// 创建时间
-	private Date updateTime;		// 更新时间
+    private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键ID
+     */
+    private String id;
 
-	public IndicatorDictionary() {
-		super();
-	}
+    /**
+     * 指标ID
+     */
+    private String indicatorId;
 
-	public IndicatorDictionary(String id){
-		super(id);
-	}
+    /**
+     * 选项编码
+     */
+    private String optionCode;
 
-	public String getIndicatorId() {
-		return indicatorId;
-	}
+    /**
+     * 选项名称
+     */
+    private String optionName;
 
-	public void setIndicatorId(String indicatorId) {
-		this.indicatorId = indicatorId;
-	}
-	public String getOptionCode() {
-		return optionCode;
-	}
+    /**
+     * 选项顺序
+     */
+    private BigDecimal optionOrder;
 
-	public void setOptionCode(String optionCode) {
-		this.optionCode = optionCode;
-	}
-	public String getOptionName() {
-		return optionName;
-	}
+    /**
+     * 描述
+     */
+    private String des;
 
-	public void setOptionName(String optionName) {
-		this.optionName = optionName;
-	}
-	public Integer getOptionOrder() {
-		return optionOrder;
-	}
+    /**
+     * 创建者
+     */
+    private String createBy;
 
-	public void setOptionOrder(Integer optionOrder) {
-		this.optionOrder = optionOrder;
-	}
-	public String getDes() {
-		return des;
-	}
+    /**
+     * 创建时间
+     */
+    private LocalDate createTime;
 
-	public void setDes(String des) {
-		this.des = des;
-	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
-	public Date getCreateTime() {
-		return createTime;
-	}
+    /**
+     * 更新者
+     */
+    private String updateBy;
 
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
-	public Date getUpdateTime() {
-		return updateTime;
-	}
+    /**
+     * 更新时间
+     */
+    private LocalDate updateTime;
 
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
 
 }

ims-service/sm-test/src/main/java/com/ims/eval/entity/dto/result/R.java

@@ -0,0 +1,71 @@
+package com.ims.eval.entity.dto.result;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName : R
+ * @Author : xieshengjie
+ * @Date: 2021/5/16 16:59
+ * @Description : 结果集
+ */
+@Data
+public class R {
+    @ApiModelProperty(value = "是否成功")
+    private Boolean success;
+    @ApiModelProperty(value = "返回码")
+    private Integer code;
+    @ApiModelProperty(value = "返回消息")
+    private String message;
+    @ApiModelProperty(value = "总数量")
+    private Integer count;
+    @ApiModelProperty(value = "返回数据")
+    private Object data = new Object();
+    private R(){}
+    public static R ok(){
+        R r = new R();
+        r.setSuccess(true);
+        r.setCode(ResultCode.SUCCESS);
+        r.setMessage("成功");
+        return r;
+    }
+    public static R ok(Integer count){
+        R r = new R();
+        r.setSuccess(true);
+        r.setCode(ResultCode.SUCCESS);
+        r.setMessage("成功");
+        r.setCount(count);
+        return r;
+    }
+    public static R error(){
+        R r = new R();
+        r.setSuccess(false);
+        r.setCode(ResultCode.ERROR);
+        r.setMessage("失败");
+        return r;
+    }
+    public R success(Boolean success){
+        this.setSuccess(success);
+        return this;
+    }
+    public R message(String message){
+        this.setMessage(message);
+        return this;
+    }
+    public R code(Integer code){
+        this.setCode(code);
+        return this;
+    }
+//    public R data(String key, Object value){
+//        this.data.put(key, value);
+//        return this;
+//    }
+//    public R data(Map<String, Object> map){
+//        this.setData(map);
+//        return this;
+//    }
+    public R data(Object value){
+        this.setData(value);
+        return this;
+    }
+}

ims-service/sm-test/src/main/java/com/ims/eval/entity/dto/result/ResultCode.java

@@ -0,0 +1,12 @@
+package com.ims.eval.entity.dto.result;
+
+/**
+ * @ClassName : ResultCode
+ * @Author : xieshengjie
+ * @Date: 2021/5/16 17:01
+ * @Description : 结果状态
+ */
+public class ResultCode {
+    public static Integer SUCCESS = 200;
+    public static Integer ERROR = 500;
+}

ims-service/sm-test/src/main/java/com/ims/eval/entity/dto/result/ResultInfo.java

@@ -0,0 +1,87 @@
+package com.ims.eval.entity.dto.result;
+
+import lombok.Data;
+
+/**
+ *@ClassName ResultInfo
+ *@Description 返回结果类统一封装
+ *@Author 谢生杰
+ *@Date 2020/9/25 18:53
+ *@Version 1.0
+ **/
+@Data
+public class ResultInfo {
+    // 状态码
+    private Integer code;
+    // 消息
+    private String message;
+    // 数据对象
+    private Object result;
+
+    private Integer total;
+
+    /**
+     * 无参构造器
+     */
+    public ResultInfo() {
+        super();
+    }
+
+    public ResultInfo(Status status) {
+        super();
+        this.code = status.code;
+        this.message = status.message;
+    }
+
+    public ResultInfo result(Object result) {
+        this.result = result;
+        return this;
+    }
+
+    public ResultInfo message(String message) {
+        this.message = message;
+        return this;
+    }
+    public ResultInfo total(Integer total) {
+        this.total = total;
+        return this;
+    }
+
+    /**
+     * 只返回状态，状态码，消息
+     *
+     * @param code
+     * @param message
+     */
+    public ResultInfo(Integer code, String message) {
+        super();
+        this.code = code;
+        this.message = message;
+    }
+
+    /**
+     * 只返回状态，状态码，数据对象
+     *
+     * @param code
+     * @param result
+     */
+    public ResultInfo(Integer code, Object result) {
+        super();
+        this.code = code;
+        this.result = result;
+    }
+
+    /**
+     * 返回全部信息即状态，状态码，消息，数据对象
+     *
+     * @param code
+     * @param message
+     * @param result
+     */
+    public ResultInfo(Integer code, String message, Object result) {
+        super();
+        this.code = code;
+        this.message = message;
+        this.result = result;
+    }
+}

ims-service/sm-test/src/main/java/com/ims/eval/entity/dto/result/Status.java

@@ -0,0 +1,42 @@
+package com.ims.eval.entity.dto.result;
+/**
+ *@ClassName Status
+ *@Description 枚举类对象
+ *@Author 谢生杰
+ *@Date 2020/9/25 18:54
+ *@Version 1.0
+ **/
+public enum Status {
+    // 公共
+    SUCCESS(2000, "成功"),
+    UNKNOWN_ERROR(9998,"未知异常"),
+    SYSTEM_ERROR(9999, "系统异常"),
+
+
+    INSUFFICIENT_PERMISSION(4003, "权限不足"),
+
+    WARN(9000, "失败"),
+    REQUEST_PARAMETER_ERROR(1002, "请求参数错误"),
+
+
+
+    // 登录
+    LOGIN_EXPIRE(2001, "未登录或者登录失效"),
+    LOGIN_CODE_ERROR(2002, "登录验证码错误"),
+    LOGIN_ERROR(2003, "用户名不存在或密码错误"),
+    LOGIN_USER_STATUS_ERROR(2004, "用户状态不正确"),
+    LOGOUT_ERROR(2005, "退出失败，token不存在"),
+    LOGIN_USER_NOT_EXIST(2006, "该用户不存在"),
+    LOGIN_USER_EXIST(2007, "该用户已存在");
+
+
+
+
+    public int code;
+    public String message;
+
+    Status(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

ims-service/sm-test/src/main/java/com/ims/eval/service/IDataDictionaryService.java

@@ -0,0 +1,21 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.DataDictionary;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 数据字典表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+public interface IDataDictionaryService extends IService<DataDictionary> {
+
+	List<DataDictionary> list(String id,String dataKey,String keyName,String superKey);
+
+
+}

ims-service/sm-test/src/main/java/com/ims/eval/service/IIndicatorDictionaryService.java

@@ -1,18 +1,20 @@
-/**
- *
- */
 package com.ims.eval.service;
 
-
-import com.ims.core.service.ICrudService;
 import com.ims.eval.entity.IndicatorDictionary;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
 
 /**
- * 指标字典表Service
- * @author song
- * @version 2023-02-22
+ * <p>
+ * 指标字典表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
  */
+public interface IIndicatorDictionaryService extends IService<IndicatorDictionary> {
 
-public interface IIndicatorDictionaryService extends ICrudService<IndicatorDictionary> {
+	List<IndicatorDictionary> list();
 
 }

ims-service/sm-test/src/main/java/com/ims/eval/service/IIndicatorService.java

@@ -1,19 +1,16 @@
-/**
- *
- */
 package com.ims.eval.service;
 
-
-import com.ims.core.service.ICrudService;
 import com.ims.eval.entity.Indicator;
-
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * 指标Service
+ * <p>
+ *  服务类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-26
  */
-
-public interface IIndicatorService extends ICrudService<Indicator> {
+public interface IIndicatorService extends IService<Indicator> {
 
 }

ims-service/sm-test/src/main/java/com/ims/eval/service/impl/DataDictionaryServiceImpl.java

@@ -0,0 +1,35 @@
+package com.ims.eval.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ims.eval.entity.DataDictionary;
+import com.ims.eval.dao.DataDictionaryMapper;
+import com.ims.eval.service.IDataDictionaryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 数据字典表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
+ */
+@Service
+public class DataDictionaryServiceImpl extends ServiceImpl<DataDictionaryMapper, DataDictionary> implements IDataDictionaryService {
+
+	@Override
+	public List<DataDictionary> list(String id, String dataKey, String keyName, String superKey) {
+		QueryWrapper<DataDictionary> qw = new QueryWrapper<>();
+		qw.lambda().eq(DataDictionary::getId, id);
+		qw.lambda().eq(DataDictionary::getDataKey, dataKey);
+		qw.lambda().like(DataDictionary::getKeyName, keyName);
+		qw.lambda().eq(DataDictionary::getSuperKey, superKey);
+		List<DataDictionary> list = baseMapper.selectList(qw);
+		return list;
+	}
+
+
+}

ims-service/sm-test/src/main/java/com/ims/eval/service/impl/IndicatorDictionaryServiceImpl.java

@@ -1,75 +1,33 @@
-/**
- *
- */
 package com.ims.eval.service.impl;
 
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-import com.ims.core.utils.IdGen;
-import com.ims.eval.dao.IndicatorDictionaryDao;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ims.eval.entity.IndicatorDictionary;
+import com.ims.eval.dao.IndicatorDictionaryMapper;
 import com.ims.eval.service.IIndicatorDictionaryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collection;
 import java.util.List;
 
-
 /**
- * 指标字典表Service
- * @author song
- * @version 2023-02-22
+ * <p>
+ * 指标字典表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-26
  */
 @Service
-@Transactional(readOnly = true)
-public class IndicatorDictionaryServiceImpl extends CrudServiceImpl<IndicatorDictionaryDao, IndicatorDictionary> implements IIndicatorDictionaryService{
-
- 	public IndicatorDictionary get(IndicatorDictionary indicatorDictionary) {
-		return super.get(indicatorDictionary);
-	}
-
-    public List<IndicatorDictionary> findList(IndicatorDictionary indicatorDictionary) {
-        return super.findList(indicatorDictionary);
-    }
-
-	public List<IndicatorDictionary> findAllListM(IndicatorDictionary indicatorDictionary,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(indicatorDictionary,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
+public class IndicatorDictionaryServiceImpl extends ServiceImpl<IndicatorDictionaryMapper, IndicatorDictionary> implements IIndicatorDictionaryService {
 
-	public Page<IndicatorDictionary> findPageM(Page<IndicatorDictionary> page, IndicatorDictionary indicatorDictionary,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, indicatorDictionary,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public IndicatorDictionary initInsert(IndicatorDictionary indicatorDictionary)  {
-		return super.initInsert(indicatorDictionary);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(IndicatorDictionary indicatorDictionary) {
-		super.checkSave(indicatorDictionary);
-	}
-
-	@Transactional(readOnly = false)
-	public IndicatorDictionary save(IndicatorDictionary indicatorDictionary, boolean isNewRecord){
-	    if(isNewRecord){
-	        indicatorDictionary.setId(IdGen.uuid());
-	    }
-		return super.save(indicatorDictionary,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<IndicatorDictionary> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(IndicatorDictionary indicatorDictionary,String baseFilter){
-		super.checkRemove(indicatorDictionary,baseFilter);
-	}
 
-	@Transactional(readOnly = false)
-	public void delete(IndicatorDictionary indicatorDictionary,String baseFilter) {
-		super.delete(indicatorDictionary,baseFilter);
+	@Autowired
+	private IndicatorDictionaryMapper indicatorDictionaryMapper;
+	public  List<IndicatorDictionary>  list(){
+		QueryWrapper<IndicatorDictionary> qw = new QueryWrapper<>();
+		List<IndicatorDictionary> list = indicatorDictionaryMapper.selectList(qw);
+		return list;
 	}
 }

ims-service/sm-test/src/main/java/com/ims/eval/service/impl/IndicatorServiceImpl.java

@@ -1,75 +1,20 @@
-/**
- *
- */
 package com.ims.eval.service.impl;
 
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-import com.ims.core.utils.IdGen;
-import com.ims.eval.dao.IndicatorDao;
 import com.ims.eval.entity.Indicator;
+import com.ims.eval.dao.IndicatorMapper;
 import com.ims.eval.service.IIndicatorService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
 
 /**
- * 指标Service
+ * <p>
+ *  服务实现类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-26
  */
 @Service
-@Transactional(readOnly = true)
-public class IndicatorServiceImpl extends CrudServiceImpl<IndicatorDao, Indicator> implements IIndicatorService{
-
- 	public Indicator get(Indicator indicator) {
-		return super.get(indicator);
-	}
-
-    public List<Indicator> findList(Indicator indicator) {
-        return super.findList(indicator);
-    }
-
-	public List<Indicator> findAllListM(Indicator indicator,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(indicator,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<Indicator> findPageM(Page<Indicator> page, Indicator indicator,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, indicator,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Indicator initInsert(Indicator indicator)  {
-		return super.initInsert(indicator);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(Indicator indicator) {
-		super.checkSave(indicator);
-	}
-
-	@Transactional(readOnly = false)
-	public Indicator save(Indicator indicator, boolean isNewRecord){
-	    if(isNewRecord){
-	        indicator.setId(IdGen.uuid());
-	    }
-		return super.save(indicator,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<Indicator> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(Indicator indicator,String baseFilter){
-		super.checkRemove(indicator,baseFilter);
-	}
+public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator> implements IIndicatorService {
 
-	@Transactional(readOnly = false)
-	public void delete(Indicator indicator,String baseFilter) {
-		super.delete(indicator,baseFilter);
-	}
 }