-
+
+
-
-
+
-
-
-
-
-
-
-
- 选择指标 - 必填 -
-
-
-
-
- formConfigList = formFieldConfigService.getFormFieldConfigByModelId(
- modelDefineList.get(0).getId()); //查询模型表头
+ (request.getId() == null ? modelDefineList.get(0).getId() : request.getId())); //查询模型表头
sortFieldList(formConfigList); //排序
Map headerMap = new LinkedHashMap<>(); //定义表头兑现
formConfigList.forEach(formFieldConfig -> {
@@ -131,10 +131,13 @@ public class DataController extends BaseController {
model.addAttribute("currentModelDefine", activeModelDefine.get());
} else {
//设置默认第一个选中
- modelDefineList.get(0).setChecked(true);
- //设置查询参数为第一个
- request.setId(modelDefineList.get(0).getId());
- model.addAttribute("currentModelDefine", modelDefineList.get(0));
+ if (!modelDefineList.isEmpty()) {
+ modelDefineList.get(0).setChecked(true);
+ //设置查询参数为第一个
+ request.setId(modelDefineList.get(0).getId());
+ model.addAttribute("currentModelDefine", modelDefineList.get(0));
+ }
+
}
}
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/bean/DatasourceRequest.java b/manager-admin/src/main/java/com/hshh/evaluation/bean/DatasourceRequest.java
new file mode 100644
index 0000000..a789dd0
--- /dev/null
+++ b/manager-admin/src/main/java/com/hshh/evaluation/bean/DatasourceRequest.java
@@ -0,0 +1,20 @@
+package com.hshh.evaluation.bean;
+
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 描述请求数据到类型类.
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+@Data
+public class DatasourceRequest implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ //数据源类型 数据库||Csv文件
+ private String datasourceType;
+ //工程ID
+ private Integer projectId;
+}
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/bean/EvalItemToFieldInfo.java b/manager-admin/src/main/java/com/hshh/evaluation/bean/EvalItemToFieldInfo.java
new file mode 100644
index 0000000..ceb7a5c
--- /dev/null
+++ b/manager-admin/src/main/java/com/hshh/evaluation/bean/EvalItemToFieldInfo.java
@@ -0,0 +1,28 @@
+package com.hshh.evaluation.bean;
+
+import com.hshh.indicator.entity.IndicatorEvalItem;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * 描述评估字段对应的信息，包含权重和评价集.
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+@Data
+public class EvalItemToFieldInfo {
+
+ /**
+ * 字段名称.
+ */
+ private String name;
+ /**
+ * 权重.
+ */
+ private double weight;
+ /**
+ * 评价集列表.
+ */
+ private List evalItemList;
+}
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/bean/EvaluationRequest.java b/manager-admin/src/main/java/com/hshh/evaluation/bean/EvaluationRequest.java
new file mode 100644
index 0000000..80420d8
--- /dev/null
+++ b/manager-admin/src/main/java/com/hshh/evaluation/bean/EvaluationRequest.java
@@ -0,0 +1,42 @@
+package com.hshh.evaluation.bean;
+
+import lombok.Data;
+
+/**
+ * 描述评估请求对象.
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+@Data
+public class EvaluationRequest {
+
+ /**
+ * database | csv.
+ */
+ private String datasourceType;
+ /**
+ * 基础设施ID.
+ */
+ private Integer modelId;
+ /**
+ * 工程ID.
+ */
+ private Integer projectId;
+ /**
+ * 查询关键子.
+ */
+ private String search;
+ /**
+ * 模板ID.
+ */
+ private Integer templateId;
+ /**
+ * 随机字符.
+ */
+ private String randomKey;
+ /**
+ * 计算方式
+ */
+ private String method;
+}
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/controller/EvaluationProjectController.java b/manager-admin/src/main/java/com/hshh/evaluation/controller/EvaluationProjectController.java
index a1c1a6e..0d9f851 100644
--- a/manager-admin/src/main/java/com/hshh/evaluation/controller/EvaluationProjectController.java
+++ b/manager-admin/src/main/java/com/hshh/evaluation/controller/EvaluationProjectController.java
@@ -1,9 +1,15 @@
package com.hshh.evaluation.controller;
+import com.hshh.evaluation.bean.EvaluationRequest;
import com.hshh.evaluation.entity.EvaluationProject;
import com.hshh.evaluation.entity.EvaluationTemplate;
import com.hshh.evaluation.service.EvaluationProjectService;
import com.hshh.evaluation.service.EvaluationTemplateService;
+import com.hshh.indicator.entity.Indicator;
+import com.hshh.indicator.service.IndicatorService;
+import com.hshh.model.entity.FormValue;
+import com.hshh.model.service.FormFieldConfigService;
+import com.hshh.model.service.FormValueService;
import com.hshh.system.base.entity.TableRelations;
import com.hshh.system.base.service.TableRelationsService;
import com.hshh.system.common.bean.BaseController;
@@ -13,7 +19,9 @@ import com.hshh.system.common.enums.ErrorCode;
import com.hshh.system.common.enums.ErrorMessage;
import io.swagger.v3.oas.annotations.Operation;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import javax.validation.Valid;
import org.springframework.stereotype.Controller;
@@ -38,17 +46,36 @@ public class EvaluationProjectController extends BaseController {
@Resource
private EvaluationProjectService evaluationProjectService;
+
/**
* 模板服务类.
*/
@Resource
private EvaluationTemplateService evaluationTemplateService;
+
/**
* 数据库引用关系记录服务类.
*/
@Resource
private TableRelationsService tableRelationsService;
+ /**
+ * 基础设施服务类.
+ */
+ @Resource
+ private FormFieldConfigService formFieldConfigService;
+ /**
+ * 数据查询服务类.
+ */
+ @Resource
+ private FormValueService formValueService;
+ /**
+ * 指标服务类.
+ */
+ @Resource
+ private IndicatorService indicatorService;
+
+
/**
* 默认页.
*
@@ -120,8 +147,7 @@ public class EvaluationProjectController extends BaseController {
@ResponseBody
@GetMapping("/remove/{id}")
public OperateResult remove(@PathVariable("id") Integer id) {
- List reList = tableRelationsService.queryRel(id,
- "m_data_evaluation_project");
+ List reList = tableRelationsService.queryRel(id, "m_data_evaluation_project");
if (!reList.isEmpty()) {
return OperateResult.error(null, ErrorMessage.OBJ_ALREADY_TAKEN.getMessage(),
ErrorCode.BUSINESS_ERROR.getCode());
@@ -130,4 +156,106 @@ public class EvaluationProjectController extends BaseController {
return OperateResult.success();
}
+ /**
+ * 选择数据源类型.
+ *
+ * @param projectId 工程ID
+ * @param model session容器
+ * @return project/datasource_select.html
+ */
+ @GetMapping("/selectDatasourceType")
+ public String selectDatasourceType(Integer projectId, String randomKey, Model model) {
+ model.addAttribute("projectId", projectId);
+ model.addAttribute("randomKey", randomKey);
+ return "project/datasource_select";
+ }
+
+ /**
+ * 导航到数据库记录展现界面.
+ *
+ * @param request 查询请求
+ * @param model session容器
+ * @return project/datasource_db.html
+ */
+ @GetMapping("/database")
+ public String databasePage(PaginationBean request, Model model) {
+ //获取工程
+
+ //获取基础设施ID
+ Long modelId = evaluationProjectService.selectModelIdByProjectId(request.getId());
+ //设置数据源页面中的隐藏属性
+ addDatasourceModelAttribute(modelId, request, model);
+ //获取表头
+ Map headerMap = formFieldConfigService.getHeaderMap(modelId.intValue());
+ model.addAttribute("headerMap", headerMap);
+ //查询数据
+ //替换为modelId查询
+ request.setId(modelId.intValue());
+ List formDataList = formValueService.list(request);
+ List> listMap = new ArrayList<>();
+ formDataList.forEach(formData -> {
+
+ listMap.add(formData.toMap()); //转为map对象放入listMap中
+ });
+
+ Long total = formValueService.count(request);
+ setPaginationInfo(request, listMap, total, model);
+ return "project/datasource_db";
+ }
+
+ private void addDatasourceModelAttribute(Long modelId, PaginationBean request, Model model) {
+ EvaluationProject project = evaluationProjectService.getById(request.getId());
+ if (project != null) {
+ model.addAttribute("templateId", project.getTemplateId());
+ }
+ //缓存modelId,projectId
+ model.addAttribute("modelId", modelId);
+ model.addAttribute("projectId", request.getId());
+ model.addAttribute("search", request.getSearch());
+ model.addAttribute("randomKey", request.getRandomKey());
+ model.addAttribute("method", request.getMethod());
+ }
+
+ /**
+ * 导航到csv记录呈现界面.
+ *
+ * @param request 查询请求
+ * @param model session容器
+ * @return project/datasource_csv.html
+ */
+ @GetMapping("/csv")
+ public String csvPage(PaginationBean request, Model model) {
+ return "project/datasource_csv";
+ }
+
+ /**
+ * 导航的数据评估执行页面.
+ *
+ * @param request 评估请求
+ * @param model session容器
+ * @return 评估处理页面
+ */
+ @PostMapping("/processEvaluation")
+ public String processEvaluationPage(@RequestBody EvaluationRequest request, Model model) {
+
+ addProcessEvaluationModelAttribute(request, model);
+ return "project/project_evaluation_process";
+ }
+
+ private void addProcessEvaluationModelAttribute(EvaluationRequest request, Model model) {
+ //获取工程名称
+ EvaluationProject project = evaluationProjectService.getById(request.getProjectId());
+ if (project != null) {
+ model.addAttribute("projectName", project.getProjectName());
+ }
+ Indicator indicator = indicatorService.selectByTemplateId(
+ request.getTemplateId());
+ //获取指标名称
+ if (indicator != null) {
+ model.addAttribute("indicatorName", indicator.getName());
+ }
+ //设置数据源类型
+ model.addAttribute("datasourceName",
+ (request.getDatasourceType().equals("database") ? "数据库" : "CSV文件"));
+ }
}
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/controller/EvaluationTemplateController.java b/manager-admin/src/main/java/com/hshh/evaluation/controller/EvaluationTemplateController.java
index 86d8605..5527a50 100644
--- a/manager-admin/src/main/java/com/hshh/evaluation/controller/EvaluationTemplateController.java
+++ b/manager-admin/src/main/java/com/hshh/evaluation/controller/EvaluationTemplateController.java
@@ -8,6 +8,7 @@ import com.hshh.evaluation.bean.MetricMapperWeightBean;
import com.hshh.evaluation.bean.MetricTableHeaderBean;
import com.hshh.evaluation.entity.EvaluationTemplate;
import com.hshh.evaluation.entity.EvaluationTemplateWeight;
+import com.hshh.evaluation.service.EvaluationTemplateIndicatorWeightService;
import com.hshh.evaluation.service.EvaluationTemplateService;
import com.hshh.evaluation.service.EvaluationTemplateWeightService;
import com.hshh.indicator.entity.Indicator;
@@ -74,10 +75,16 @@ public class EvaluationTemplateController extends AssistantTemplateController {
private TableRelationsService tableRelationsService;
/**
- * 权重服务类.
+ * 权重服务详情类.
*/
@Resource
- private EvaluationTemplateWeightService evaluationTemplateWeightService;
+ private EvaluationTemplateWeightService evaluationTemplateDetailWeightService;
+ /**
+ * 指标权重类.
+ */
+ @Resource
+ private EvaluationTemplateIndicatorWeightService evaluationTemplateIndicatorWeightService;
+
/**
* 默认页.
@@ -111,16 +118,40 @@ public class EvaluationTemplateController extends AssistantTemplateController {
/**
* 获取指标树.
*
- * @param id 项目ID
+ * @param id 指标ID
* @return 指标树
*/
- @GetMapping("/metricTree/{id}")
+ @GetMapping("/metricTree/{id}/{templateId}")
@ResponseBody
- public OperateResult> metricTree(@PathVariable("id") Integer id, Model model) {
-
- return OperateResult.success(indicatorService.metricTree(id));
+ public OperateResult> metricTree(@PathVariable("id") Integer id,
+ @PathVariable("templateId") Integer templateId) {
+ if (id == null) {
+ return OperateResult.success(new ArrayList<>());
+ }
+ //查询指标权重树
+ Map weightMap = evaluationTemplateIndicatorWeightService.getEvaluationTemplateIndicatorWeightMap(
+ id, templateId);
+ Map> weightDetailMap = evaluationTemplateDetailWeightService.groupByParentIndicatorId(
+ id, templateId);
+ List jsTreeList = indicatorService.metricTree(id);
+ //开始给指标设置权重，指标名称后挂在权重信息;并在data属性中，增加子节点-子节点的权重信息
+ setWeightToTree(jsTreeList, weightMap, weightDetailMap);
+ return OperateResult.success(jsTreeList);
}
+ private void setWeightToTree(List jsTreeList, Map weightMap,
+ Map> weightDetailMap) {
+ jsTreeList.forEach(tree -> {
+ if (weightMap.containsKey((int) tree.getOriginalId())) {
+ tree.getData().put("weight", weightMap.get((int) tree.getOriginalId()));
+
+ }
+ if(weightDetailMap.containsKey((int) tree.getOriginalId())) {
+ tree.getData().put("weightDetail", weightDetailMap.get((int) tree.getOriginalId()));
+ }
+ setWeightToTree(tree.getChildren(), weightMap, weightDetailMap);
+ });
+ }
/**
* 保存模板. 必须设置指标；设置完成权重，才成成功提交
@@ -207,157 +238,7 @@ public class EvaluationTemplateController extends AssistantTemplateController {
return OperateResult.success(template);
}
- /**
- * 暂存权重数据.
- *
- * @param data 权重数据 页面传入的权重map数据key为rowId_colId(from指标id_to指标ID）
- * value为{rowId:a,colId:b,value:0.1}类似
- * @return 操作结果
- */
- @PostMapping("/receiveDraft")
- @ResponseBody
- @SuppressWarnings("unchecked")
- public synchronized OperateResult receiveDraft(@RequestBody DraftWeightData data) {
- log.info("receive draft data: pId= {}", data.getParentIndicationId());
- //根据key获取已经缓存的信息
- Map dataMap = DraftStore.get(data.getKey(), Map.class);
- //如果缓存不存在
- if (dataMap == null) {
- dataMap = new HashMap<>();
- }
- //key为上级指标
- dataMap.put(data.getParentIndicationId(), data);
- //更新缓存
- DraftStore.put(data.getKey(), dataMap);
- return OperateResult.success();
- }
- /**
- * 获取暂存数据.
- *
- * @param requestData 请求数据.
- * @return 表格和数据
- */
- @SuppressWarnings("unchecked")
- @PostMapping("/getDraftData")
- public synchronized String getDraftData(@RequestBody DraftWeightData requestData, Model model) {
- //查看key 是否有缓存记录
- Map cacheData = DraftStore.get(requestData.getKey(), Map.class);
- //如果没有记录
- if (cacheData == null) { //从数据库中获取
- model.addAttribute("data", createNewDynamicFromDatabase(requestData));
- return "project_template/table";
- }
- //如果有记录查看对应的指标是否有记录
- Object cacheWeightObj = cacheData.get(requestData.getParentIndicationId());
- //如果对应指标没有记录
- if (cacheWeightObj == null) { //从数据库读取
- model.addAttribute("data", createNewDynamicFromDatabase(requestData));
- return "project_template/table";
- }
- DraftWeightData data = (DraftWeightData) cacheWeightObj;
-
- model.addAttribute("data", createDynamicFromCache(data));
- return "project_template/table";
-
- }
-
- /**
- * 从数据库创建动态表.
- *
- * @param requestData 用户请求数据
- * @return 动态表
- */
- private DynamicTable createNewDynamicFromDatabase(DraftWeightData requestData) {
- DynamicTable dynamicTable = new DynamicTable();
- //查询当前指标的子指标
- List children = indicatorService.queryChildren(requestData.getParentIndicationId());
- //获取指标权重信息
- List weightInDbList = evaluationTemplateWeightService.queryListByIndicatorParentIdAndTemplateId(
- requestData.getParentIndicationId(), requestData.getTemplateId());
- //转化为key=fromId+"_"+toId,value=self
- Map weightInMap = weightInDbList.stream()
- .collect(
- Collectors.toMap(a -> a.getFromIndicatorId() + "_" + a.getToIndicatorId(), a -> a));
- //设置头信息
- dynamicTable.setHeaderMap(createTableHeaderMap(children));
-
- //设置权重信息
- List> weight = new ArrayList<>();
- for (int i = 0; i < children.size(); i++) {
- List innerList = createEmptyMapperList(requestData, children, i,
- weightInMap);
- weight.add(innerList);
- }
-
- dynamicTable.setWeight(weight);
- return dynamicTable;
- }
-
- /**
- * 创建表格头.
- *
- * @param children 子指标
- * @return 表格头信息
- */
- private Map createTableHeaderMap(List children) {
- List headerBeans = new ArrayList<>();
- children.forEach(a -> {
- MetricTableHeaderBean bean = new MetricTableHeaderBean();
- bean.setId(a.getId());
- bean.setName(a.getName());
- headerBeans.add(bean);
- });
- Map headerMap = new LinkedHashMap<>();
- headerBeans.forEach(header -> {
- headerMap.put(header.getId(), header);
- });
- return headerMap;
- }
-
- /**
- * 从数据库创建一个空的默认映射列表.
- *
- * @param requestData 请求数据
- * @param children 子指标
- * @param i 行号
- * @return 默认映射列表
- */
- private static List createEmptyMapperList(DraftWeightData requestData,
- List children, int i, Map weightInMap) {
- List innerList = new ArrayList<>();
- for (Indicator child : children) {
- MetricMapperWeightBean weightBean = new MetricMapperWeightBean();
- //行ID
- weightBean.setRowId(children.get(i).getId());
- //列Id
- weightBean.setColId(child.getId());
- EvaluationTemplateWeight evaluationTemplateWeight = weightInMap.get(
- weightBean.getRowId() + "_" + weightBean.getColId());
- //初始默认为1
- weightBean.setValue(
- evaluationTemplateWeight == null ? "1" : evaluationTemplateWeight.getWeight() + "");
-
- weightBean.setRowNum(evaluationTemplateWeight == null ? (i + 1)
- : evaluationTemplateWeight.getRowNum());
- weightBean.setParentId(requestData.getParentIndicationId());
- innerList.add(weightBean);
- }
- return innerList;
- }
-
- /**
- * 从缓存中创建动态表.
- *
- * @param data 缓存数据
- * @return 动态表
- */
- protected DynamicTable createDynamicFromCache(DraftWeightData data) {
- DynamicTable dynamicTable = new DynamicTable();
- dynamicTable.setHeaderMap(data.getHeaderMap());
- dynamicTable.setWeight(data.getWeight());
- return dynamicTable;
- }
/**
* 计算指标，当设置变化时触发.
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/entity/EvaluationTemplateWeight.java b/manager-admin/src/main/java/com/hshh/evaluation/entity/EvaluationTemplateWeight.java
index 1764769..ba083f0 100644
--- a/manager-admin/src/main/java/com/hshh/evaluation/entity/EvaluationTemplateWeight.java
+++ b/manager-admin/src/main/java/com/hshh/evaluation/entity/EvaluationTemplateWeight.java
@@ -8,13 +8,13 @@ import lombok.Data;
/**
* {
* @return 总条数
*/
Long count(PaginationBean paginationBean);
+
+ /**
+ * 根据工程ID获取到对应的基础设施ID.
+ *
+ * @param projectId 工程ID
+ * @return 基础设施ID
+ */
+ Long selectModelIdByProjectId(Integer projectId);
}
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/mapper/EvaluationTemplateMapper.java b/manager-admin/src/main/java/com/hshh/evaluation/mapper/EvaluationTemplateMapper.java
index 6e51873..3c7fada 100644
--- a/manager-admin/src/main/java/com/hshh/evaluation/mapper/EvaluationTemplateMapper.java
+++ b/manager-admin/src/main/java/com/hshh/evaluation/mapper/EvaluationTemplateMapper.java
@@ -28,4 +28,6 @@ public interface EvaluationTemplateMapper extends BaseMapper
* @return 总数
*/
Long count(PaginationBean search);
+
+
}
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/service/EvaluationProjectService.java b/manager-admin/src/main/java/com/hshh/evaluation/service/EvaluationProjectService.java
index f5a06e9..b259ee9 100644
--- a/manager-admin/src/main/java/com/hshh/evaluation/service/EvaluationProjectService.java
+++ b/manager-admin/src/main/java/com/hshh/evaluation/service/EvaluationProjectService.java
@@ -1,6 +1,7 @@
package com.hshh.evaluation.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.hshh.evaluation.bean.EvaluationRequest;
import com.hshh.evaluation.entity.EvaluationProject;
import com.hshh.system.common.bean.PaginationBean;
import java.util.List;
@@ -43,4 +44,20 @@ public interface EvaluationProjectService extends IService {
* @param evaluationProject 工程数据
*/
void saveWhole(EvaluationProject evaluationProject);
+
+ /**
+ * 根据工程ID获取到对应的基础设施ID.
+ *
+ * @param projectId 工程ID
+ * @return 基础设施ID
+ */
+ Long selectModelIdByProjectId(Integer projectId);
+
+ /**
+ * 评估动作.
+ *
+ * @param request 评估请求
+ * @param userId 用户ID
+ */
+ void evaluate(EvaluationRequest request, Integer userId);
}
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/service/EvaluationTemplateService.java b/manager-admin/src/main/java/com/hshh/evaluation/service/EvaluationTemplateService.java
index 20c3e47..770e40f 100644
--- a/manager-admin/src/main/java/com/hshh/evaluation/service/EvaluationTemplateService.java
+++ b/manager-admin/src/main/java/com/hshh/evaluation/service/EvaluationTemplateService.java
@@ -2,7 +2,6 @@ package com.hshh.evaluation.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hshh.evaluation.bean.DraftWeightData;
-import com.hshh.evaluation.bean.MetricMapperWeightBean;
import com.hshh.evaluation.entity.EvaluationTemplate;
import com.hshh.system.common.bean.PaginationBean;
import java.util.List;
@@ -48,5 +47,13 @@ public interface EvaluationTemplateService extends IService
* @return 模板列表
*/
List queryByName(String name);
+
+ /**
+ * 删除模板(事务删除).
+ *
+ * @param evaluationTemplate 模板数据
+ */
void deleteTemplate(EvaluationTemplate evaluationTemplate);
+
+
}
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/service/EvaluationTemplateWeightService.java b/manager-admin/src/main/java/com/hshh/evaluation/service/EvaluationTemplateWeightService.java
index 4dccddd..b683b07 100644
--- a/manager-admin/src/main/java/com/hshh/evaluation/service/EvaluationTemplateWeightService.java
+++ b/manager-admin/src/main/java/com/hshh/evaluation/service/EvaluationTemplateWeightService.java
@@ -3,6 +3,7 @@ package com.hshh.evaluation.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hshh.evaluation.entity.EvaluationTemplateWeight;
import java.util.List;
+import java.util.Map;
/**
* 模板指标权重表 服务类.
@@ -40,4 +41,14 @@ public interface EvaluationTemplateWeightService extends IService queryListByIndicatorParentIdAndTemplateId(
Integer indicatorParentId, Integer templateId);
+
+ /**
+ * 指标对应的权重详情，按照父指标ID分类.
+ *
+ * @param indicatorParentId 父指标ID
+ * @param templateId 模板ID
+ * @return 权重map信息
+ */
+ Map> groupByParentIndicatorId(Integer indicatorParentId,
+ Integer templateId);
}
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationProjectServiceImpl.java b/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationProjectServiceImpl.java
index 7383f1c..a7aa2b9 100644
--- a/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationProjectServiceImpl.java
+++ b/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationProjectServiceImpl.java
@@ -2,14 +2,27 @@ package com.hshh.evaluation.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hshh.evaluation.bean.EvaluationRequest;
+import com.hshh.evaluation.entity.EvaluationHistory;
import com.hshh.evaluation.entity.EvaluationProject;
+import com.hshh.evaluation.entity.EvaluationTemplate;
import com.hshh.evaluation.mapper.EvaluationProjectMapper;
+import com.hshh.evaluation.service.EvaluationHistoryService;
import com.hshh.evaluation.service.EvaluationProjectService;
+import com.hshh.evaluation.service.EvaluationTemplateService;
+import com.hshh.model.entity.FormValue;
+import com.hshh.model.service.FormValueService;
import com.hshh.system.base.service.TableRelationsService;
import com.hshh.system.common.bean.PaginationBean;
+import com.hshh.system.ws.WsEvaluationServer;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -20,15 +33,33 @@ import org.springframework.transaction.annotation.Transactional;
* @since 2025-08-11
*/
@Service
+@Slf4j
public class EvaluationProjectServiceImpl extends
- ServiceImpl implements
- EvaluationProjectService {
+ ServiceImpl implements EvaluationProjectService {
+ private static final DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ //每次评估一批数据的长度
+ private static final int pageSize = 100;
/**
* 数据库引用关系记录服务类.
*/
@Resource
private TableRelationsService tableRelationsService;
+ /**
+ * 评估历史服务类.
+ */
+ @Resource
+ private EvaluationHistoryService evaluationHistoryService;
+ /**
+ * 评估模板服务类.
+ */
+ @Resource
+ private EvaluationTemplateService evaluationTemplateService;
+ /**
+ * 数据查询服务类.
+ */
+ @Resource
+ private FormValueService formValueService;
@Override
public List list(PaginationBean paginationBean) {
@@ -58,4 +89,139 @@ public class EvaluationProjectServiceImpl extends
tableRelationsService.addRel(evaluationProject.getId(), "m_data_evaluation_project", relList,
"m_data_evaluation_template");
}
+
+ @Override
+ public Long selectModelIdByProjectId(Integer projectId) {
+ return this.baseMapper.selectModelIdByProjectId(projectId);
+ }
+
+ /**
+ * 评估操作.
+ *
+ * @param request 评估请求
+ * @param userId 用户ID
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void evaluate(EvaluationRequest request, Integer userId) {
+
+ //查询模板然后获取指标ID
+ EvaluationTemplate template = evaluationTemplateService.getById(request.getTemplateId());
+
+ //发送开始处理消息
+ sendTips("开始处理", request.getRandomKey());
+
+ //插入评估历史表
+ Integer historyId = insertEvaluationHistory(request, userId);
+ //处理来自于数据库的记录
+ if (request.getDatasourceType().equals("database")) {
+ handleDataBaseData(request, template.getIndicatorTopId(), historyId, userId);
+ }
+ //处理来自于 csv导入的记录
+ if (request.getDatasourceType().equals("csv")) {
+ handleCsvData(request, template.getIndicatorTopId(), historyId, userId);
+ }
+
+
+ }
+
+ //根据searchKey查询
+
+ /**
+ * 处理数据库的记录.
+ *
+ * @param request 评估请求.
+ * @param indicatorTopId 指标ID
+ * @param historyId 历史记录ID
+ * @param userId 用户ID
+ */
+ private void handleDataBaseData(EvaluationRequest request, Integer indicatorTopId,
+ Integer historyId, Integer userId) {
+
+ sendTips("数据来源:数据库记录", request.getRandomKey());
+ AtomicInteger count = new AtomicInteger(0);
+ //查询记录总条数
+ PaginationBean pageBean = new PaginationBean();
+ pageBean.setId(request.getModelId());
+ pageBean.setSearch(request.getSearch());
+ Long total = formValueService.count(pageBean);
+
+ sendTips("数据记录条数" + total, request.getRandomKey());
+
+ int totalPage = (int) Math.ceil(total / (double) pageSize);
+ //开始循坏评估
+ for (int i = 1; i <= totalPage; i++) {
+ pageBean.setCurrentPage(1);
+ pageBean.setPageSize(pageSize);
+ pageBean.setSearch(request.getSearch());
+ //查询
+ List originalList = formValueService.list(pageBean);
+ count.addAndGet(originalList.size());
+
+ //把表单数据映射为一个列表
+ List dataList = originalList.stream()
+ .map(FormValue::getModelData).collect(Collectors.toList());
+ evaluationOneBatchData(dataList, request, indicatorTopId, historyId, userId);
+
+ sendTips(originalList.size() + "数据评估完成,累计完成(" + count.get() + ")",
+ request.getRandomKey());
+ }
+
+ sendTips("数据全部评估完成，累计评估(" + count.get() + ")", request.getRandomKey());
+
+ }
+
+ /**
+ * 处理CSV的记录.
+ *
+ * @param request 评估请求.
+ * @param indicatorTopId 指标ID
+ * @param historyId 历史记录ID
+ * @param userId 用户ID
+ */
+ private void handleCsvData(EvaluationRequest request, Integer indicatorTopId, Integer historyId,
+ Integer userId) {
+
+ }
+
+
+ /**
+ * 评估一批数据.
+ *
+ * @param data 待评估数据
+ * @param request 请求信息
+ * @param indicatorTopId 指标ID
+ * @param historyId 历史记录ID
+ * @param userId 用户ID
+ */
+ private void evaluationOneBatchData(List data, EvaluationRequest request,
+ Integer indicatorTopId, Integer historyId, Integer userId) {
+ //结果集定义
+ List resultList = new ArrayList<>();
+ for (String rawData : data) {
+
+ }
+ }
+
+
+ /**
+ * 插入评估历史表，返回ID.
+ *
+ * @param request 评估请求
+ */
+ private Integer insertEvaluationHistory(EvaluationRequest request, Integer userId) {
+ EvaluationHistory history = new EvaluationHistory();
+ history.setProjectId(request.getProjectId());
+ history.setCreateTime(LocalDateTime.now());
+ history.setUserId(userId);
+ history.setRandomKey(request.getRandomKey());
+ evaluationHistoryService.save(history);
+ return history.getId();
+ }
+
+ void sendTips(String message, String randomKey) {
+ //发送开始处理消息
+ LocalDateTime start = LocalDateTime.now();
+ WsEvaluationServer.sendToKey(randomKey, start.format(df) + " " + message);
+ }
}
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationTemplateServiceImpl.java b/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationTemplateServiceImpl.java
index d07386f..bd589bd 100644
--- a/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationTemplateServiceImpl.java
+++ b/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationTemplateServiceImpl.java
@@ -92,4 +92,6 @@ public class EvaluationTemplateServiceImpl extends
evaluationTemplate.getId());
this.removeById(evaluationTemplate.getId());
}
+
+
}
diff --git a/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationTemplateWeightServiceImpl.java b/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationTemplateWeightServiceImpl.java
index 7a8367f..5c8d655 100644
--- a/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationTemplateWeightServiceImpl.java
+++ b/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationTemplateWeightServiceImpl.java
@@ -6,6 +6,8 @@ import com.hshh.evaluation.entity.EvaluationTemplateWeight;
import com.hshh.evaluation.mapper.EvaluationTemplateWeightMapper;
import com.hshh.evaluation.service.EvaluationTemplateWeightService;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -51,4 +53,16 @@ public class EvaluationTemplateWeightServiceImpl extends
queryWrapper.eq("indicator_parent_id", indicatorParentId);
return this.list(queryWrapper);
}
+
+ @Override
+ public Map> groupByParentIndicatorId(
+ Integer indicatorParentId, Integer templateId) {
+ List list = this.queryListByIndicatorParentIdAndTemplateId(
+ indicatorParentId, templateId);
+ if (!list.isEmpty()) {
+ return list.stream()
+ .collect(Collectors.groupingBy(EvaluationTemplateWeight::getIndicatorParentId));
+ }
+ return Map.of();
+ }
}
diff --git a/manager-admin/src/main/java/com/hshh/indicator/controller/EvaluationController.java b/manager-admin/src/main/java/com/hshh/indicator/controller/EvaluationController.java
index f2af5d6..6f070cf 100644
--- a/manager-admin/src/main/java/com/hshh/indicator/controller/EvaluationController.java
+++ b/manager-admin/src/main/java/com/hshh/indicator/controller/EvaluationController.java
@@ -56,38 +56,36 @@ public class EvaluationController extends BaseController {
if (topIndicatorId != null) {
for (Indicator indicator : rootList) {
if (indicator.getId().equals(topIndicatorId)) {
+ //回显上次选择的
indicator.setChecked(true);
}
}
-
- } else {
- topIndicatorId = rootList.get(0).getId();
- rootList.get(0).setChecked(true);
-
}
}
//查询所有没有孩子的子节点
- List indicatorListWithoutChildren = indicatorService.selectNoChildByTopId(
- topIndicatorId);
- if (!indicatorListWithoutChildren.isEmpty()) {
- if (indicatorId != null) {
- for (Indicator indicator : indicatorListWithoutChildren) {
- if (indicator.getId().equals(indicatorId)) {
- indicator.setChecked(true);
+ if (topIndicatorId != null) {
+ List indicatorListWithoutChildren = indicatorService.selectNoChildByTopId(
+ topIndicatorId);
+ if (!indicatorListWithoutChildren.isEmpty()) {
+ {
+ for (Indicator indicator : indicatorListWithoutChildren) {
+ if (indicator.getId().equals(indicatorId)) {
+ indicator.setChecked(true);
+ }
}
}
- } else {
- indicatorListWithoutChildren.get(0).setChecked(true);
-
+ //查询子指标的评价集
+ List evaluationList = indicatorEvalItemService.queryListByIndicatorId(
+ (indicatorId == null ? indicatorListWithoutChildren.get(0).getId() : indicatorId)
+ );
+ model.addAttribute("evaluationList", evaluationList);
+ model.addAttribute("indicatorListWithoutChildren", indicatorListWithoutChildren);
}
+
}
- //查询子指标的评价集
- List evaluationList = indicatorEvalItemService.queryListByIndicatorId(
- indicatorId == null ? (indicatorListWithoutChildren.isEmpty() ? 0
- : indicatorListWithoutChildren.get(0).getId()) : indicatorId);
- model.addAttribute("evaluationList", evaluationList);
+
model.addAttribute("rootList", rootList);
- model.addAttribute("indicatorListWithoutChildren", indicatorListWithoutChildren);
+
return "indicator/evaluation_list";
}
diff --git a/manager-admin/src/main/java/com/hshh/indicator/controller/IndicatorController.java b/manager-admin/src/main/java/com/hshh/indicator/controller/IndicatorController.java
index 7a2263c..bd0c648 100644
--- a/manager-admin/src/main/java/com/hshh/indicator/controller/IndicatorController.java
+++ b/manager-admin/src/main/java/com/hshh/indicator/controller/IndicatorController.java
@@ -121,7 +121,7 @@ public class IndicatorController extends BaseController {
}
}
model.addAttribute("rootList", rootList);
- return "/indicator/list";
+ return "indicator/list";
}
@@ -236,14 +236,15 @@ public class IndicatorController extends BaseController {
List rootList = indicatorService.queryRootList();
//设置根指标的选中状态
- setChecked(rootList, indicatorTopId, true);
+ setChecked(rootList, indicatorTopId, false);
// 顶级指标放入session容器
model.addAttribute("rootList", rootList);
// 底层指标放入session容器
- model.addAttribute("childrenIndicator", indicatorService.selectNoChildByTopId(
- indicatorTopId == null ? (rootList.isEmpty() ? 0 : rootList.get(0).getId())
- : indicatorTopId));
+ if (indicatorTopId != null) {
+ model.addAttribute("childrenIndicator", indicatorService.selectNoChildByTopId(
+ indicatorTopId));
+ }
// form表单和顶级指标对应列表放入session容器
modelForm(model, (indicatorTopId == null ? (rootList.isEmpty() ? 0 : rootList.get(0).getId())
diff --git a/manager-admin/src/main/java/com/hshh/indicator/entity/Indicator.java b/manager-admin/src/main/java/com/hshh/indicator/entity/Indicator.java
index f65ce5e..97fbd5b 100644
--- a/manager-admin/src/main/java/com/hshh/indicator/entity/Indicator.java
+++ b/manager-admin/src/main/java/com/hshh/indicator/entity/Indicator.java
@@ -45,5 +45,7 @@ public class Indicator extends CheckedBean {
return this.name;
}
+ @TableField(exist = false)
+ private double weight;
}
diff --git a/manager-admin/src/main/java/com/hshh/indicator/entity/IndicatorEvalItem.java b/manager-admin/src/main/java/com/hshh/indicator/entity/IndicatorEvalItem.java
index c3b4cf7..717064a 100644
--- a/manager-admin/src/main/java/com/hshh/indicator/entity/IndicatorEvalItem.java
+++ b/manager-admin/src/main/java/com/hshh/indicator/entity/IndicatorEvalItem.java
@@ -52,6 +52,7 @@ public class IndicatorEvalItem implements Serializable {
@NotNull(message = "值不能为空")
@Size(max = 10, message = "值不能超过10字符")
private String maxValue;
-
+ @NotNull(message = "值不能为空")
+ private Double grade;
}
diff --git a/manager-admin/src/main/java/com/hshh/indicator/mapper/IndicatorMapper.java b/manager-admin/src/main/java/com/hshh/indicator/mapper/IndicatorMapper.java
index e1c927c..288d60a 100644
--- a/manager-admin/src/main/java/com/hshh/indicator/mapper/IndicatorMapper.java
+++ b/manager-admin/src/main/java/com/hshh/indicator/mapper/IndicatorMapper.java
@@ -19,5 +19,13 @@ public interface IndicatorMapper extends BaseMapper {
* @param topId 祖先指标ID
* @return 指标集
*/
- public List selectNoChildByTopId(@Param("topId") Integer topId);
+ List selectNoChildByTopId(@Param("topId") Integer topId);
+
+ /**
+ * 根据评估模板获取指标.
+ *
+ * @param templateId 模板 ID
+ * @return 指标列表
+ */
+ List selectByTemplateId(@Param("templateId") Integer templateId);
}
diff --git a/manager-admin/src/main/java/com/hshh/indicator/service/IndicatorEvalItemService.java b/manager-admin/src/main/java/com/hshh/indicator/service/IndicatorEvalItemService.java
index aec20e6..7fcb040 100644
--- a/manager-admin/src/main/java/com/hshh/indicator/service/IndicatorEvalItemService.java
+++ b/manager-admin/src/main/java/com/hshh/indicator/service/IndicatorEvalItemService.java
@@ -1,8 +1,10 @@
package com.hshh.indicator.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.hshh.evaluation.bean.EvalItemToFieldInfo;
import com.hshh.indicator.entity.IndicatorEvalItem;
import java.util.List;
+import java.util.Map;
/**
* 指标规则表 服务类.
@@ -28,4 +30,20 @@ public interface IndicatorEvalItemService extends IService {
* @return 评价集
*/
List queryListByIndicatorId(Integer indicatorId);
+
+ /**
+ * 查询数据类型为从数据库读取的字段评价集及权重.
+ *
+ * @param indicatorTopId 指标顶级ID
+ * @return 对应map key为字段名称
+ */
+ Map evalMapForDatabaseTypeData(Integer indicatorTopId);
+
+ /**
+ * 查询数据类型为从csv读取的字段评价集及权重.
+ *
+ * @param indicatorTopId 指标顶级ID
+ * @return 对应map key为字段名称
+ */
+ Map evalMapForCsvType(Integer indicatorTopId);
}
diff --git a/manager-admin/src/main/java/com/hshh/indicator/service/IndicatorService.java b/manager-admin/src/main/java/com/hshh/indicator/service/IndicatorService.java
index 05fbde1..6c5a4b9 100644
--- a/manager-admin/src/main/java/com/hshh/indicator/service/IndicatorService.java
+++ b/manager-admin/src/main/java/com/hshh/indicator/service/IndicatorService.java
@@ -7,6 +7,7 @@ import com.hshh.indicator.entity.IndicatorCsvColumn;
import com.hshh.system.common.bean.JsTree;
import java.io.IOException;
import java.util.List;
+import org.apache.ibatis.annotations.Param;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -99,4 +100,14 @@ public interface IndicatorService extends IService {
* @return 指标列表，topId一致
*/
List queryByTopId(Integer topId);
+
+ /**
+ * 根据评估模板获取指标.
+ *
+ * @param templateId 模板 ID
+ * @return 指标列表
+ */
+ Indicator selectByTemplateId(@Param("templateId") Integer templateId);
+
+
}
diff --git a/manager-admin/src/main/java/com/hshh/indicator/service/impl/IndicatorEvalItemServiceImpl.java b/manager-admin/src/main/java/com/hshh/indicator/service/impl/IndicatorEvalItemServiceImpl.java
index 4814a6d..6214a8a 100644
--- a/manager-admin/src/main/java/com/hshh/indicator/service/impl/IndicatorEvalItemServiceImpl.java
+++ b/manager-admin/src/main/java/com/hshh/indicator/service/impl/IndicatorEvalItemServiceImpl.java
@@ -2,10 +2,12 @@ package com.hshh.indicator.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hshh.evaluation.bean.EvalItemToFieldInfo;
import com.hshh.indicator.entity.IndicatorEvalItem;
import com.hshh.indicator.mapper.IndicatorEvalItemMapper;
import com.hshh.indicator.service.IndicatorEvalItemService;
import java.util.List;
+import java.util.Map;
import org.springframework.stereotype.Service;
/**
@@ -35,4 +37,19 @@ public class IndicatorEvalItemServiceImpl extends
return this.list(queryWrapper);
}
+
+ @Override
+ public Map evalMapForDatabaseTypeData(Integer indicatorTopId) {
+
+ return Map.of();
+ }
+
+ @Override
+ public Map evalMapForCsvType(Integer indicatorTopId) {
+
+ return Map.of();
+ }
+
+
+
}
diff --git a/manager-admin/src/main/java/com/hshh/indicator/service/impl/IndicatorServiceImpl.java b/manager-admin/src/main/java/com/hshh/indicator/service/impl/IndicatorServiceImpl.java
index 5f8f611..4f10026 100644
--- a/manager-admin/src/main/java/com/hshh/indicator/service/impl/IndicatorServiceImpl.java
+++ b/manager-admin/src/main/java/com/hshh/indicator/service/impl/IndicatorServiceImpl.java
@@ -187,4 +187,15 @@ public class IndicatorServiceImpl extends ServiceImpl list = this.baseMapper.selectByTemplateId(templateId);
+ if (list.isEmpty()) {
+ return null;
+ }
+ return list.get(0);
+ }
+
+
}
diff --git a/manager-admin/src/main/java/com/hshh/model/controller/ModelDefineController.java b/manager-admin/src/main/java/com/hshh/model/controller/ModelDefineController.java
index 269d6a5..8d9e3b7 100644
--- a/manager-admin/src/main/java/com/hshh/model/controller/ModelDefineController.java
+++ b/manager-admin/src/main/java/com/hshh/model/controller/ModelDefineController.java
@@ -99,10 +99,13 @@ public class ModelDefineController extends BaseController {
modelDefine.getId()));
} else {
- fieldList.addAll(formFieldConfigService.getFormFieldConfigByModelId(
- modelList.get(0).getId()));
+ if (!modelList.isEmpty()) {
+ fieldList.addAll(formFieldConfigService.getFormFieldConfigByModelId(
+ modelList.get(0).getId()));
+
+ modelList.get(0).setChecked(true);
+ }
- modelList.get(0).setChecked(true);
}
}
diff --git a/manager-admin/src/main/java/com/hshh/model/entity/FormFieldConfig.java b/manager-admin/src/main/java/com/hshh/model/entity/FormFieldConfig.java
index 0678886..abfe299 100644
--- a/manager-admin/src/main/java/com/hshh/model/entity/FormFieldConfig.java
+++ b/manager-admin/src/main/java/com/hshh/model/entity/FormFieldConfig.java
@@ -34,12 +34,10 @@ public class FormFieldConfig implements Serializable {
@NotBlank(message = "字段名称不能为空")
@Size(max = 50, message = "字段名称不能超过50字符")
- @Pattern(regexp = "^[A-Za-z_]+$", message = "字段ID只能包含英文字符")
+ @Pattern(regexp = "^[A-Za-z_0-9]+$", message = "字段ID只能包含英文和数字字符")
private String fieldName;
- @NotBlank(message = "字段ID不能为空")
- @Size(max = 50, message = "字段ID不能超过50字符")
- @Pattern(regexp = "^[A-Za-z_]+$", message = "字段ID只能包含英文字符")
+
private String fieldId;
@NotBlank(message = "字段标签不能为空")
@Size(max = 50, message = "字段标签不能超过50字符")
diff --git a/manager-admin/src/main/java/com/hshh/model/service/FormFieldConfigService.java b/manager-admin/src/main/java/com/hshh/model/service/FormFieldConfigService.java
index b82b9a4..1ae1aab 100644
--- a/manager-admin/src/main/java/com/hshh/model/service/FormFieldConfigService.java
+++ b/manager-admin/src/main/java/com/hshh/model/service/FormFieldConfigService.java
@@ -3,6 +3,7 @@ package com.hshh.model.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hshh.model.entity.FormFieldConfig;
import java.util.List;
+import java.util.Map;
import javax.validation.constraints.NotNull;
/**
@@ -19,7 +20,7 @@ public interface FormFieldConfigService extends IService {
* @param modelId 模型ID
* @return 字段列表
*/
- public List getFormFieldConfigByModelId(Integer modelId);
+ List getFormFieldConfigByModelId(Integer modelId);
/**
* 查询符合条件的字段列表.
@@ -30,6 +31,14 @@ public interface FormFieldConfigService extends IService {
* @param id id
* @return 结果列表
*/
- public List getFormFieldConfigByLabelOrNameOrId(@NotNull Integer modelId,
+ List getFormFieldConfigByLabelOrNameOrId(@NotNull Integer modelId,
@NotNull String label, @NotNull String name, @NotNull String id);
+
+ /**
+ * 获取基础设施的字段信息，按照map返回，linkedHashMap key=fieldName,value=fieldLabel.
+ *
+ * @param modelId 基础设施ID
+ * @return 字段map
+ */
+ Map getHeaderMap(Integer modelId);
}
diff --git a/manager-admin/src/main/java/com/hshh/model/service/impl/FormFieldConfigServiceImpl.java b/manager-admin/src/main/java/com/hshh/model/service/impl/FormFieldConfigServiceImpl.java
index 0b5ec72..048b9d1 100644
--- a/manager-admin/src/main/java/com/hshh/model/service/impl/FormFieldConfigServiceImpl.java
+++ b/manager-admin/src/main/java/com/hshh/model/service/impl/FormFieldConfigServiceImpl.java
@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hshh.model.entity.FormFieldConfig;
import com.hshh.model.mapper.FormFieldConfigMapper;
import com.hshh.model.service.FormFieldConfigService;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.springframework.stereotype.Service;
/**
@@ -36,4 +38,14 @@ public class FormFieldConfigServiceImpl extends
.eq("field_id", id));
return this.list(queryWrapper);
}
+
+ @Override
+ public Map getHeaderMap(Integer modelId) {
+ Map headerMap = new HashMap<>();
+ List list = getFormFieldConfigByModelId(modelId);
+ list.forEach(formFieldConfig -> {
+ headerMap.put(formFieldConfig.getFieldName(), formFieldConfig.getFieldLabel());
+ });
+ return headerMap;
+ }
}
diff --git a/manager-admin/src/main/java/com/hshh/thread/HandleCmdThread.java b/manager-admin/src/main/java/com/hshh/thread/HandleCmdThread.java
new file mode 100644
index 0000000..61b9661
--- /dev/null
+++ b/manager-admin/src/main/java/com/hshh/thread/HandleCmdThread.java
@@ -0,0 +1,44 @@
+package com.hshh.thread;
+
+import com.alibaba.fastjson2.JSON;
+import com.hshh.evaluation.bean.EvaluationRequest;
+import com.hshh.evaluation.service.impl.EvaluationProjectServiceImpl;
+import com.hshh.system.Global;
+import com.hshh.system.common.bean.SpringContextHolder;
+import com.hshh.system.common.cmd.CmdEnum;
+import com.hshh.system.common.cmd.CmdInfo;
+import java.util.Objects;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 处理系统中的任务线程.
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+@Slf4j
+public class HandleCmdThread implements Runnable {
+
+ @Override
+ public void run() {
+ while (!Thread.interrupted()) {
+ try {
+ CmdInfo cmd = Global.cmdQueue.take();
+ if (Objects.requireNonNull(cmd.getType()) == CmdEnum.EVALUATION) {
+ evaluation(cmd);
+ }
+ } catch (Exception e) {
+ log.error("error:", e);
+ }
+
+ }
+ }
+
+ //评估
+ private void evaluation(CmdInfo cmd) {
+
+ SpringContextHolder.getBean(EvaluationProjectServiceImpl.class)
+ .evaluate(JSON.parseObject(cmd.getCmd(),
+ EvaluationRequest.class), cmd.getUserId());
+ }
+}
diff --git a/manager-admin/src/main/resources/application.yaml b/manager-admin/src/main/resources/application.yaml
index 0e21dd9..6dcbe8b 100644
--- a/manager-admin/src/main/resources/application.yaml
+++ b/manager-admin/src/main/resources/application.yaml
@@ -26,7 +26,7 @@ mybatis-plus:
mapper-locations: classpath*:/mapper/**/*.xml
configuration:
- database-id: mysql
+ database-id: mysql
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/manager-admin/src/main/resources/mapper/EvaluationProjectMapper.xml b/manager-admin/src/main/resources/mapper/EvaluationProjectMapper.xml
index caf31a2..1795b27 100644
--- a/manager-admin/src/main/resources/mapper/EvaluationProjectMapper.xml
+++ b/manager-admin/src/main/resources/mapper/EvaluationProjectMapper.xml
@@ -50,4 +50,12 @@
+
diff --git a/manager-admin/src/main/resources/mapper/EvaluationTemplateMapper.xml b/manager-admin/src/main/resources/mapper/EvaluationTemplateMapper.xml
index e8d7b45..d76abc0 100644
--- a/manager-admin/src/main/resources/mapper/EvaluationTemplateMapper.xml
+++ b/manager-admin/src/main/resources/mapper/EvaluationTemplateMapper.xml
@@ -50,4 +50,5 @@
+
diff --git a/manager-admin/src/main/resources/mapper/IndicatorMapper.xml b/manager-admin/src/main/resources/mapper/IndicatorMapper.xml
index caa6004..b03546b 100644
--- a/manager-admin/src/main/resources/mapper/IndicatorMapper.xml
+++ b/manager-admin/src/main/resources/mapper/IndicatorMapper.xml
@@ -10,4 +10,12 @@
WHERE t2.top_id = #{topId} and t2.parent_id IS NOT NULL)
order by sort_order
+
diff --git a/manager-admin/src/main/resources/static/js/common/common.js b/manager-admin/src/main/resources/static/js/common/common.js
index 89a1255..cddd3aa 100644
--- a/manager-admin/src/main/resources/static/js/common/common.js
+++ b/manager-admin/src/main/resources/static/js/common/common.js
@@ -4,7 +4,6 @@
*/
function removeValidCss(formId) {
-
let form = document.getElementById(formId);
let elements = form.elements;
for (const element of elements) {
@@ -63,17 +62,19 @@ function openDialog(id) {
return;
}
}
+
function disabledForm(formId) {
let form = document.getElementById(formId);
// 只读 input 和 textarea
- form.querySelectorAll('input, textarea').forEach(function(el) {
+ form.querySelectorAll('input, textarea').forEach(function (el) {
el.readOnly = true;
});
// 禁用 select 和 button
- form.querySelectorAll('select').forEach(function(el) {
+ form.querySelectorAll('select').forEach(function (el) {
el.disabled = true;
});
}
+
/**
* 自动填充表单，根据 JSON 数据中的 key 和嵌套对象自动拼接 name 属性进行匹配
* @param {string} formId - 表单的 ID，例如 "myForm"
@@ -88,8 +89,6 @@ function fillForm(formId, data) {
return;
}
-
-
/**
* 递归处理 JSON 对象, 将嵌套对象的 key 拼接为点连接的形式
* @param {Object} obj - 当前处理的 JSON 对象
@@ -102,7 +101,6 @@ function fillForm(formId, data) {
var fullKey = prefix ? prefix + "." + key : key;
var value = obj[key];
-
// 如果值为对象，但不为数组，则递归处理
if (value && typeof value === "object" && !Array.isArray(value)) {
@@ -130,7 +128,7 @@ function fillForm(formId, data) {
field.value = value;
}
- }else{
+ } else {
}
}
@@ -220,7 +218,7 @@ function common_batchRemove() {
}
-//分页相关
+//普通静态数据分页相关
function _next() {
let currentPageNum = document.getElementById("_currentPage").value;
_setPage(parseInt(currentPageNum) + 1);
@@ -246,6 +244,17 @@ function _resetPageNoSearch() {
_search();
}
+//动态数据,动态表头，动态表格 header=map record=list(map)
+function _dynamic_next(form) {
+
+}
+function _dynamic_pre(form) {
+
+}
+function _dynamic_resetPageNoSearch(form){
+
+}
+
document.addEventListener('DOMContentLoaded', function () {
if (document.getElementById('uploadIcon') && document.getElementById(
'fileInput')) {
@@ -352,13 +361,15 @@ function hideContextMenu() {
}
}
+
function generateDraftKey() {
// 优先用 crypto.randomUUID 生成
if (window.crypto && window.crypto.randomUUID) {
return 'tpl:new:' + window.crypto.randomUUID();
}
// 兼容老浏览器
- return 'tpl:new:' + Date.now().toString(36) + Math.random().toString(36).substring(2, 10);
+ return 'tpl:new:' + Date.now().toString(36) + Math.random().toString(
+ 36).substring(2, 10);
}
function mapToObject(map) {
@@ -368,10 +379,33 @@ function mapToObject(map) {
}
return obj;
}
-function showFieldErrorTip(formId,fieldId,message){
+
+function showFieldErrorTip(formId, fieldId, message) {
let formElement = document.getElementById(formId);
formElement.elements[fieldId].classList.add(
"is-invalid");
document.getElementById(
- fieldId + "_error_tip").innerHTML =message;
+ fieldId + "_error_tip").innerHTML = message;
}
+
+function connectWs(url, {
+ onOpen = () => {},
+ onClose = () => {},
+ onMessage = (msg) => {},
+ onError = (err) => {}
+} = {}) {
+ url = wsUrl(url);
+ const ws = new WebSocket(url);
+
+ ws.onopen = (ev) => { onOpen(ev, ws); };
+ ws.onclose = (ev) => { onClose(ev, ws); };
+ ws.onmessage = (ev) => { onMessage(ev.data, ws); };
+ ws.onerror = (err) => { onError(err, ws); };
+
+ return ws;
+}
+function wsUrl(path) {
+ const loc = window.location; // 当前页面的地址
+ const scheme = loc.protocol === "https:" ? "wss:" : "ws:";
+ return scheme + "//" + loc.host + path;
+}
\ No newline at end of file
diff --git a/manager-admin/src/main/resources/templates/data/list.html b/manager-admin/src/main/resources/templates/data/list.html
index 5386364..0210e0b 100644
--- a/manager-admin/src/main/resources/templates/data/list.html
+++ b/manager-admin/src/main/resources/templates/data/list.html
@@ -3,83 +3,82 @@
-
+
+
+
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/manager-admin/src/main/java/com/hshh/Application.java b/manager-admin/src/main/java/com/hshh/Application.java
index 16e1eb9..3f25596 100644
--- a/manager-admin/src/main/java/com/hshh/Application.java
+++ b/manager-admin/src/main/java/com/hshh/Application.java
@@ -24,4 +24,5 @@ public class Application {
SpringApplication.run(Application.class, args);
}
+
}
diff --git a/manager-admin/src/main/java/com/hshh/Init.java b/manager-admin/src/main/java/com/hshh/Init.java
new file mode 100644
index 0000000..f43a2e9
--- /dev/null
+++ b/manager-admin/src/main/java/com/hshh/Init.java
@@ -0,0 +1,40 @@
+package com.hshh;
+
+import com.hshh.system.common.threadpool.ThreadPools;
+import com.hshh.thread.HandleCmdThread;
+import java.util.concurrent.ExecutorService;
+import javax.annotation.PostConstruct;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 系统初始化类.
+ *
+ * @author LiDongYU
+ * @since 2025/7/22
+ */
+@Component
+@Slf4j
+public class Init {
+
+ private static final ExecutorService cpu = ThreadPools.newCpuBoundPool("cpu-pool");
+ private static final int evaluationThreadNum = 5;
+
+ /**
+ * 初始化系统相关函数.
+ */
+ @PostConstruct
+ public void init() {
+ startEvaluationThread();
+ }
+
+ private void startEvaluationThread() {
+ try {
+ for (int i = 0; i < evaluationThreadNum; i++) {
+ cpu.execute(new Thread(new HandleCmdThread()));
+ }
+ } catch (Exception e) {
+ log.error("error::", e);
+ }
+ }
+}
diff --git a/manager-admin/src/main/java/com/hshh/data/controller/DataController.java b/manager-admin/src/main/java/com/hshh/data/controller/DataController.java
index af7d5ad..a92ea73 100644
--- a/manager-admin/src/main/java/com/hshh/data/controller/DataController.java
+++ b/manager-admin/src/main/java/com/hshh/data/controller/DataController.java
@@ -84,7 +84,7 @@ public class DataController extends BaseController {
if (!modelDefineList.isEmpty()) {
List
-
-
-
-
-
-
- 选择后将影响下方所有设置。
-
+
+
+
+
+
+
+
+
+
+
+
+ + Logs +
+
+
+
+
+
+
+
+
+
+ + Checked URL +
+
+
+ GET https://preview.tabler.ioRequest Timing
+
+
+ Effective URL https://preview.tabler.io+
Redirect count 0
Name lookup time 3.4e-05
Connect time 0.000521
Pre-transfer time 0.0
Start-transfer time 0.0
App connect time 0.0
Redirect time 0.0
Total time 28.000601
Response code 0
Return keyword operation_timedout
Response Headers
+
+
+ HTTP/1.1 200 Connection established+
- * 模板指标权重表 + * 模板指标权重详情表. *
* * @author liDongYu * @since 2025-08-14 */ -@TableName("m_data_evaluation_template_weight") +@TableName("m_data_evaluation_template_weight_detail") @Data public class EvaluationTemplateWeight implements Serializable { diff --git a/manager-admin/src/main/java/com/hshh/evaluation/mapper/EvaluationProjectMapper.java b/manager-admin/src/main/java/com/hshh/evaluation/mapper/EvaluationProjectMapper.java index abdbf2e..a54671f 100644 --- a/manager-admin/src/main/java/com/hshh/evaluation/mapper/EvaluationProjectMapper.java +++ b/manager-admin/src/main/java/com/hshh/evaluation/mapper/EvaluationProjectMapper.java @@ -28,4 +28,12 @@ public interface EvaluationProjectMapper extends BaseMapper
-
-
-
-
-
-
-
-
@@ -91,12 +90,12 @@
@@ -267,6 +267,7 @@
+
diff --git a/manager-admin/src/main/resources/templates/indicator/indicator_mapper.html b/manager-admin/src/main/resources/templates/indicator/indicator_mapper.html
index cf7565d..00d8396 100644
--- a/manager-admin/src/main/resources/templates/indicator/indicator_mapper.html
+++ b/manager-admin/src/main/resources/templates/indicator/indicator_mapper.html
@@ -42,7 +42,7 @@
-
+
-
-
-
-
-
-
- 新增
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
-