From ff5126f80bdd09fccf25dd251b6190d96cd270a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=8E=89=E4=B8=9C?= <129883742+liyudong2018@users.noreply.github.com> Date: Fri, 26 Sep 2025 14:12:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=8C=87=E6=A0=87=E5=AD=90=E9=9B=86?= =?UTF-8?q?=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hshh/data/controller/DataController.java | 23 ++- .../hshh/data/service/DataRecordService.java | 2 +- .../service/impl/DataRecordServiceImpl.java | 32 ++- .../AssistantEvaluationProjectController.java | 29 +-- .../EvaluationProjectController.java | 22 +- .../impl/CoreEvaluationServiceImpl.java | 2 +- .../impl/EvaluationRootResultServiceImpl.java | 3 +- .../indicator/entity/IndicatorTopLevel.java | 3 +- .../controller/ModelDefineController.java | 14 +- .../hshh/model/entity/FormFieldConfig.java | 2 + .../java/com/hshh/model/entity/FormValue.java | 19 +- .../model/service/FormFieldConfigService.java | 2 +- .../impl/FormFieldConfigServiceImpl.java | 6 +- .../src/main/resources/application.yaml | 16 +- .../src/main/resources/indicator_set.yaml | 16 +- .../src/main/resources/templates/home.html | 19 ++ .../templates/model/add_model_field.html | 195 +++++------------- .../main/resources/templates/model/list.html | 96 ++++++--- .../resources/templates/project/list.html | 10 +- .../system/indicator/indicator_set.html | 82 +------- .../src/main/java/com/hshh/system/Global.java | 1 + .../algorithm/fuzzy/EvaluationLevel.java | 6 +- .../system/base/service/DictItemService.java | 2 + .../system/base/service/DictTypeService.java | 2 + .../service/impl/DictItemServiceImpl.java | 17 ++ .../service/impl/DictTypeServiceImpl.java | 9 + 26 files changed, 320 insertions(+), 310 deletions(-) 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 d5fb784..e02db46 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 @@ -8,6 +8,8 @@ import com.hshh.model.service.FormFieldConfigService; import com.hshh.model.service.FormValueService; import com.hshh.model.service.ModelDefineService; import com.hshh.system.annotation.LogOperation; +import com.hshh.system.base.entity.DictItem; +import com.hshh.system.base.service.DictItemService; import com.hshh.system.common.bean.BaseController; import com.hshh.system.common.bean.ErrorField; import com.hshh.system.common.bean.OperateResult; @@ -22,6 +24,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Controller; @@ -61,6 +64,8 @@ public class DataController extends BaseController { */ @Resource private DataRecordService dataRecordService; + @Resource + private DictItemService dictItemService; /** * 默认排序最大 999 */ @@ -93,13 +98,17 @@ public class DataController extends BaseController { formConfigList.forEach(formFieldConfig -> { headerMap.put(formFieldConfig.getFieldName(), formFieldConfig.getFieldLabel()); }); + Map formFieldConfigMap = formConfigList.stream().collect( + Collectors.toMap(FormFieldConfig::getFieldName, formFieldConfig -> formFieldConfig)); + + Map> dictMap = dictItemService.dictItemMap(); model.addAttribute("headerMap", headerMap); //查询模型数据 List formDataList = formValueService.list(request); List> listMap = new ArrayList<>(); formDataList.forEach(formData -> { - listMap.add(formData.toMap()); //转为map对象放入listMap中 + listMap.add(formData.toMap(formFieldConfigMap, dictMap)); //转为map对象放入listMap中 }); Long total = formValueService.count(request); setPaginationInfo(request, listMap, total, model); @@ -155,8 +164,8 @@ public class DataController extends BaseController { @GetMapping("/getForm/{id}") @Operation(summary = "获取form输入窗体", description = "根据模型ID获取form窗体") @ResponseBody - public OperateResult getForm(@PathVariable("id") Integer id, - HttpServletRequest httpServletRequest) { + public OperateResult getForm(@PathVariable("id") Integer id + ) { return OperateResult.success(dataRecordService.html(id), ErrorMessage.SUCCESS.getMessage()); } @@ -171,8 +180,8 @@ public class DataController extends BaseController { @PostMapping("/form/save") @ResponseBody @Operation(summary = "保存记录", description = "保存对应模型ID对应的form表单记录") - public OperateResult saveRecord(@RequestBody FormValue formValue, - HttpServletRequest httpServletRequest) { + public OperateResult saveRecord(@RequestBody FormValue formValue + ) { //验证字段合法性 Integer modelId = formValue.getModelDefineId(); @@ -197,7 +206,7 @@ public class DataController extends BaseController { @GetMapping("/remove/{id}") @Operation(summary = "删除记录", description = "根据ID删除记录") public OperateResult remove(@PathVariable("id") Integer id - ) { + ) { formValueService.removeById(id); return OperateResult.success(); } @@ -212,7 +221,7 @@ public class DataController extends BaseController { @GetMapping("/{id}") @Operation(summary = "删除记录", description = "根据ID删除记录") public OperateResult view(@PathVariable("id") Integer id - ) { + ) { FormValue formValue = formValueService.getById(id); if (formValue == null) { return OperateResult.error(null, ErrorMessage.ID_NOT_EXIT.getMessage(), diff --git a/manager-admin/src/main/java/com/hshh/data/service/DataRecordService.java b/manager-admin/src/main/java/com/hshh/data/service/DataRecordService.java index 4ff21f7..3304f65 100644 --- a/manager-admin/src/main/java/com/hshh/data/service/DataRecordService.java +++ b/manager-admin/src/main/java/com/hshh/data/service/DataRecordService.java @@ -28,5 +28,5 @@ public interface DataRecordService { * @return 错误信息 */ List getErrorField(List formConfigList, FormValue formValue); - void deleteFromByModelId(Integer id); + } diff --git a/manager-admin/src/main/java/com/hshh/data/service/impl/DataRecordServiceImpl.java b/manager-admin/src/main/java/com/hshh/data/service/impl/DataRecordServiceImpl.java index eacb3ea..c97c51f 100644 --- a/manager-admin/src/main/java/com/hshh/data/service/impl/DataRecordServiceImpl.java +++ b/manager-admin/src/main/java/com/hshh/data/service/impl/DataRecordServiceImpl.java @@ -8,10 +8,13 @@ import com.hshh.model.entity.FormValue; import com.hshh.model.entity.ModelDefine; import com.hshh.model.service.FormFieldConfigService; import com.hshh.model.service.ModelDefineService; +import com.hshh.system.base.entity.DictItem; +import com.hshh.system.base.service.DictItemService; import com.hshh.system.common.bean.ErrorField; import com.hshh.system.common.bean.FieldType; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Optional; import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; @@ -36,11 +39,14 @@ public class DataRecordServiceImpl implements DataRecordService { */ @Resource private FormFieldConfigService formFieldConfigService; + @Resource + private DictItemService dictItemService; //最大排序号 private static final int maxOrder = 999; @Override public String html(Integer modelId) { + Map> dictMap = dictItemService.dictItemMap(); //首先获取模型定义中,form中的字段显示方式,每行显示几个字段 ModelDefine modelDefine = modelDefineService.getById(modelId); if (modelDefine == null) { @@ -63,7 +69,7 @@ public class DataRecordServiceImpl implements DataRecordService { StringBuffer sb = new StringBuffer(); sb.append("
"); fieldList.forEach(field -> { - handleField(field, sb, divClass); + handleField(field, sb, divClass, dictMap); }); sb.append("
"); @@ -77,7 +83,8 @@ public class DataRecordServiceImpl implements DataRecordService { * @param sb html字符容器 * @param divClass 每个字段占用的格数 ,在不同的屏幕下 */ - private void handleField(FormFieldConfig field, StringBuffer sb, String divClass) { + private void handleField(FormFieldConfig field, StringBuffer sb, String divClass, + Map> dictMap) { String unit = ""; if (StringUtils.isNotBlank(field.getFieldUnit())) { unit = "(" + field.getFieldUnit() + ")"; @@ -90,7 +97,7 @@ public class DataRecordServiceImpl implements DataRecordService { sb.append(""); //输入域增加 - handleInputType(field, sb); + handleInputType(field, sb, dictMap); //验证div sb.append("
"); @@ -100,7 +107,8 @@ public class DataRecordServiceImpl implements DataRecordService { sb.append(""); } - private void handleInputType(FormFieldConfig field, StringBuffer sb) { + private void handleInputType(FormFieldConfig field, StringBuffer sb, + Map> dictMap) { if (field.getFieldType() == null) { field.setFieldType("TEXT"); } @@ -132,6 +140,19 @@ public class DataRecordServiceImpl implements DataRecordService { .append(field.getFieldId()) .append("\" class=\"form-control\" autocomplete=\"off\" >"); break; + case SELECT: + sb.append(" "); + + break; default: break; } @@ -151,8 +172,5 @@ public class DataRecordServiceImpl implements DataRecordService { return errorFieldList; } - @Override - public void deleteFromByModelId(Integer id) { - } } diff --git a/manager-admin/src/main/java/com/hshh/evaluation/controller/AssistantEvaluationProjectController.java b/manager-admin/src/main/java/com/hshh/evaluation/controller/AssistantEvaluationProjectController.java index e3e038f..6f13d8a 100644 --- a/manager-admin/src/main/java/com/hshh/evaluation/controller/AssistantEvaluationProjectController.java +++ b/manager-admin/src/main/java/com/hshh/evaluation/controller/AssistantEvaluationProjectController.java @@ -6,6 +6,7 @@ import com.hshh.evaluation.bean.ReportIndicatorNodeData; import com.hshh.evaluation.entity.EvaluationIndicatorResult; import com.hshh.evaluation.entity.EvaluationRootResult; import com.hshh.indicator.entity.IndicatorTopLevel; +import com.hshh.system.Global; import com.hshh.system.common.bean.BaseController; import com.hshh.system.common.enums.LevelEnum; import java.math.BigDecimal; @@ -46,16 +47,17 @@ public class AssistantEvaluationProjectController extends BaseController { } protected String getClosestLevel(List levelList, int targetScore) { - IndicatorTopLevel closest = null; - int minDiff = Integer.MAX_VALUE; - for (IndicatorTopLevel item : levelList) { - int diff = Math.abs(targetScore - (int) Double.parseDouble(item.getGrade())); - if (diff < minDiff) { - minDiff = diff; - closest = item; + levelList.sort((a, b) -> Integer.compare(Integer.parseInt(b.getLowValue()), + Integer.parseInt(a.getLowValue()))); + + String levelName = levelList.get(levelList.size() - 1).getLevelName(); + for (IndicatorTopLevel level : levelList) { + if (targetScore >= Integer.parseInt(level.getLowValue())) { + levelName = level.getLevelName(); + break; } } - return closest != null ? closest.getLevelName() : null; + return levelName; } //获取优良率 @@ -76,13 +78,14 @@ public class AssistantEvaluationProjectController extends BaseController { if (levelList.isEmpty()) { return; } - levelList.sort((a, b) -> Integer.compare(Integer.parseInt(b.getGrade()), Integer.parseInt(a.getGrade()))); + levelList.sort( + (a, b) -> Integer.compare(Integer.parseInt(b.getGrade()), Integer.parseInt(a.getGrade()))); rootResult.setLevelName(levelList.get(levelList.size() - 1).getLevelName()); for (IndicatorTopLevel indicatorTopLevel : levelList) { if (Double.parseDouble(rootResult.getFinalScore()) >= Double.parseDouble( - indicatorTopLevel.getGrade())) { + indicatorTopLevel.getLowValue())) { rootResult.setLevelName(indicatorTopLevel.getLevelName()); break; } @@ -113,14 +116,14 @@ public class AssistantEvaluationProjectController extends BaseController { reportIndicatorNodeData.setName(indicatorResult.getIndicatorName()); reportIndicatorNodeData.setLevel(indicatorResult.getLevel()); reportIndicatorNodeData.setScore( - new BigDecimal(indicatorResult.getFinalScore()).setScale(2, RoundingMode.HALF_UP) + new BigDecimal(indicatorResult.getFinalScore()).setScale(Global.scale, RoundingMode.HALF_UP) .doubleValue()); Map membershipScoreMap = new HashMap<>(); Map originalMap = membershipScoreMap(indicatorResult.getMemberShipScore()); originalMap.forEach((k, v) -> { membershipScoreMap.put(LevelEnum.getCode(k), - BigDecimal.valueOf(v * 100).setScale(2, RoundingMode.HALF_UP).doubleValue()); + BigDecimal.valueOf(v * 100).setScale(Global.scale, RoundingMode.HALF_UP).doubleValue()); }); reportIndicatorNodeData.setMembershipDist(membershipScoreMap); reportIndicatorNodeData.setEvaluation( @@ -139,7 +142,7 @@ public class AssistantEvaluationProjectController extends BaseController { BarData barData = new BarData(); barData.setName(indicatorResult.getIndicatorName()); barData.setScore( - new BigDecimal(indicatorResult.getFinalScore()).setScale(2, RoundingMode.HALF_UP) + new BigDecimal(indicatorResult.getFinalScore()).setScale(Global.scale, RoundingMode.HALF_UP) .doubleValue()); resultList.add(barData); }); 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 f853b4e..e77699e 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 @@ -21,10 +21,14 @@ import com.hshh.indicator.entity.Indicator; import com.hshh.indicator.entity.IndicatorTopLevel; import com.hshh.indicator.service.IndicatorService; import com.hshh.indicator.service.IndicatorTopLevelService; +import com.hshh.model.entity.FormFieldConfig; import com.hshh.model.entity.FormValue; import com.hshh.model.service.FormFieldConfigService; import com.hshh.model.service.FormValueService; +import com.hshh.system.Global; import com.hshh.system.annotation.LogOperation; +import com.hshh.system.base.entity.DictItem; +import com.hshh.system.base.service.DictItemService; import com.hshh.system.common.bean.OperateResult; import com.hshh.system.common.bean.PaginationBean; import com.hshh.system.common.enums.ErrorCode; @@ -113,7 +117,8 @@ public class EvaluationProjectController extends AssistantEvaluationProjectContr private IndicatorTopLevelService topLevelService; @Resource private EvaluationIndicatorResultService evaluationIndicatorResultService; - + @Resource + private DictItemService dictItemService; /** * 默认页. * @@ -222,7 +227,7 @@ public class EvaluationProjectController extends AssistantEvaluationProjectContr @GetMapping("/database") public String databasePage(PaginationBean request, Model model, @RequestParam Map params) { - + Map> dictItemMap = dictItemService.dictItemMap(); //获取基础设施ID Long modelId = evaluationProjectService.selectModelIdByProjectId( params.get("projectId") == null ? 0 : Integer.parseInt(params.get("projectId"))); @@ -235,7 +240,12 @@ public class EvaluationProjectController extends AssistantEvaluationProjectContr addDatasourceModelAttribute(request, model, params); //获取表头 - Map headerMap = formFieldConfigService.getHeaderMap(modelId.intValue()); + Map headerFieldMap = formFieldConfigService.getHeaderMap( + modelId.intValue()); + Map headerMap = new LinkedHashMap<>(); + headerFieldMap.forEach((k, v) -> { + headerMap.put(k, v.getFieldLabel()); + }); model.addAttribute("headerMap", headerMap); //查询数据 //替换为modelId查询 @@ -245,7 +255,7 @@ public class EvaluationProjectController extends AssistantEvaluationProjectContr List> listMap = new ArrayList<>(); formDataList.forEach(formData -> { - listMap.add(formData.toMap()); //转为map对象放入listMap中 + listMap.add(formData.toMap(headerFieldMap, dictItemMap)); //转为map对象放入listMap中 }); Long total = formValueService.count(request); @@ -446,7 +456,9 @@ public class EvaluationProjectController extends AssistantEvaluationProjectContr //各维度得分对比 String membership = rootResult.getMembershipScore(); + //获取各个等级的隶属度，key=优,良,可,差; value为实际隶属度 Map membershipMap = membershipScoreMap(membership); + StringBuilder replaceMemberShipBuilder = new StringBuilder(); levelList.forEach(level -> { if (membershipMap.get(level.getLevelName()) != null) { @@ -454,7 +466,7 @@ public class EvaluationProjectController extends AssistantEvaluationProjectContr .append(membershipMap.get(level.getLevelName())).append(";"); ; level.setActualValue(new BigDecimal(level.getGrade()).multiply( - new BigDecimal(membershipMap.get(level.getLevelName()))).setScale(1, + new BigDecimal(membershipMap.get(level.getLevelName()))).setScale(Global.scale, RoundingMode.HALF_UP).doubleValue()); } }); diff --git a/manager-admin/src/main/java/com/hshh/evaluation/service/impl/CoreEvaluationServiceImpl.java b/manager-admin/src/main/java/com/hshh/evaluation/service/impl/CoreEvaluationServiceImpl.java index 43ac8c2..9bc6a7d 100644 --- a/manager-admin/src/main/java/com/hshh/evaluation/service/impl/CoreEvaluationServiceImpl.java +++ b/manager-admin/src/main/java/com/hshh/evaluation/service/impl/CoreEvaluationServiceImpl.java @@ -361,7 +361,7 @@ public class CoreEvaluationServiceImpl implements CoreEvaluationService { topLevelList.forEach(topLevel -> { EvaluationLevel evaluationLevel = new EvaluationLevel(topLevel.getLevelName(), Double.parseDouble(topLevel.getGrade()), - topLevel.getEqualValue() == null ? "" : topLevel.getEqualValue()); + topLevel.getLowValue() == null ? "" : topLevel.getLowValue()); evaluationLevels.add(evaluationLevel); }); return new GlobalEvaluationConfig(evaluationLevels); diff --git a/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationRootResultServiceImpl.java b/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationRootResultServiceImpl.java index 8975357..d874d7c 100644 --- a/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationRootResultServiceImpl.java +++ b/manager-admin/src/main/java/com/hshh/evaluation/service/impl/EvaluationRootResultServiceImpl.java @@ -7,6 +7,7 @@ import com.hshh.evaluation.entity.EvaluationRootResult; import com.hshh.evaluation.mapper.EvaluationRootResultMapper; import com.hshh.evaluation.service.EvaluationIndicatorResultService; import com.hshh.evaluation.service.EvaluationRootResultService; +import com.hshh.system.Global; import com.hshh.system.algorithm.fuzzy.IndicatorNode; import java.math.BigDecimal; import java.math.RoundingMode; @@ -53,7 +54,7 @@ public class EvaluationRootResultServiceImpl extends indicatorNode.setScore(0d); } rootResult.setFinalScore( - new BigDecimal(indicatorNode.getScore()).setScale(1, RoundingMode.UP).toPlainString()); + new BigDecimal(indicatorNode.getScore()).setScale(Global.scale, RoundingMode.UP).toPlainString()); StringBuilder membershipBuilder = new StringBuilder(); indicatorNode.getMembershipDegrees().forEach((k, v) -> { membershipBuilder.append(k).append(":").append(String.format(doubleFormat, v)).append(";"); diff --git a/manager-admin/src/main/java/com/hshh/indicator/entity/IndicatorTopLevel.java b/manager-admin/src/main/java/com/hshh/indicator/entity/IndicatorTopLevel.java index d8dc58c..eced74b 100644 --- a/manager-admin/src/main/java/com/hshh/indicator/entity/IndicatorTopLevel.java +++ b/manager-admin/src/main/java/com/hshh/indicator/entity/IndicatorTopLevel.java @@ -39,5 +39,6 @@ public class IndicatorTopLevel implements Serializable { @TableField(exist = false) private double actualValue; - private String equalValue; + //等级判断最低分 + private String lowValue; } 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 ad7c12f..3f7fb66 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 @@ -6,7 +6,6 @@ import com.hshh.model.service.FormFieldConfigService; import com.hshh.model.service.ModelDefineService; import com.hshh.system.base.entity.DictItem; import com.hshh.system.base.entity.DictType; -import com.hshh.system.base.entity.TableRelations; import com.hshh.system.base.service.DictItemService; import com.hshh.system.base.service.DictTypeService; import com.hshh.system.base.service.TableRelationsService; @@ -19,6 +18,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import java.util.Map; import javax.annotation.Resource; import javax.validation.Valid; import org.springframework.stereotype.Controller; @@ -109,6 +109,13 @@ public class ModelDefineController extends BaseController { } } + Map dictTypeMap = dictTypeService.dictTypeMap(); + fieldList.forEach(field -> { + if (field.getFieldOptionsId() != null) { + field.setFieldOptionsName(dictTypeMap.get(field.getFieldOptionsId()) == null ? "" + : dictTypeMap.get(field.getFieldOptionsId()).getDictTypeName()); + } + }); //当前中选中的字段列表 model.addAttribute("fieldList", fieldList); //模型列表 @@ -213,6 +220,10 @@ public class ModelDefineController extends BaseController { if (bindResult.hasErrors()) { return errorsInputHandle(bindResult); } + //当类型为不为select时,下拉选项无效 + if (!"SELECT".equals(config.getFieldType())) { + config.setFieldOptionsId(null); + } //验证字段是否有重复，同一个模型下 List exitList = formFieldConfigService.getFormFieldConfigByLabelOrNameOrId( config.getDataModelId(), @@ -222,6 +233,7 @@ public class ModelDefineController extends BaseController { return OperateResult.error(null, ErrorMessage.NAME_OR_CODE_EXIT.getMessage(), ErrorCode.BUSINESS_ERROR.getCode()); } + formFieldConfigService.save(config); } else { if (exitList != null && !exitList.isEmpty()) { 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 abfe299..4f5078d 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 @@ -49,6 +49,8 @@ public class FormFieldConfig implements Serializable { private Integer fieldOptionsId; + @TableField(exist = false) + private String fieldOptionsName; private String fieldPlaceholder; diff --git a/manager-admin/src/main/java/com/hshh/model/entity/FormValue.java b/manager-admin/src/main/java/com/hshh/model/entity/FormValue.java index 2e49ee8..3915058 100644 --- a/manager-admin/src/main/java/com/hshh/model/entity/FormValue.java +++ b/manager-admin/src/main/java/com/hshh/model/entity/FormValue.java @@ -5,9 +5,12 @@ import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.hshh.system.base.entity.DictItem; import com.hshh.system.common.bean.BaseBean; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import lombok.Data; /** @@ -38,11 +41,25 @@ public class FormValue extends BaseBean { * * @return map键值对 */ - public Map toMap() { + public Map toMap(Map formFieldConfigMap, + Map> dictMap) { Map map = new HashMap<>(); map.put("id", id); map.put("seq", getSeq()); JSONObject jsonObj = JSON.parseObject(modelData, JSONObject.class); + jsonObj.forEach((key, value) -> { + if (formFieldConfigMap.get(key) != null && "SELECT".equals( + formFieldConfigMap.get(key).getFieldType())) { + + List itemList = dictMap.get( + formFieldConfigMap.get(key).getFieldOptionsId() == null ? 0 + : formFieldConfigMap.get(key).getFieldOptionsId()); + Map itemMap = itemList.stream() + .collect(Collectors.toMap(DictItem::getCode, a -> a)); + jsonObj.put(key, itemMap.get(value.toString()).getNameCn()); + + } + }); map.putAll(jsonObj); return map; } 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 40223b5..e813745 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 @@ -40,6 +40,6 @@ public interface FormFieldConfigService extends IService { * @param modelId 基础设施ID * @return 字段map */ - Map getHeaderMap(Integer modelId); + Map getHeaderMap(Integer modelId); void deleteByModelId(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 a84b2b5..1c50dd5 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 @@ -40,8 +40,8 @@ public class FormFieldConfigServiceImpl extends } @Override - public Map getHeaderMap(Integer modelId) { - Map headerMap = new LinkedHashMap<>(); + public Map getHeaderMap(Integer modelId) { + Map headerMap = new LinkedHashMap<>(); List list = getFormFieldConfigByModelId(modelId); list.sort((a, b) -> { if (a.getSortOrder() == null) { @@ -53,7 +53,7 @@ public class FormFieldConfigServiceImpl extends return a.getSortOrder().compareTo(b.getSortOrder()); }); list.forEach(formFieldConfig -> { - headerMap.put(formFieldConfig.getFieldName(), formFieldConfig.getFieldLabel()); + headerMap.put(formFieldConfig.getFieldName(), formFieldConfig); }); return headerMap; } diff --git a/manager-admin/src/main/resources/application.yaml b/manager-admin/src/main/resources/application.yaml index 17d509e..e85351c 100644 --- a/manager-admin/src/main/resources/application.yaml +++ b/manager-admin/src/main/resources/application.yaml @@ -13,14 +13,14 @@ spring: thymeleaf: cache: false datasource: - url: jdbc:dm://127.0.0.1:5236/MANAGER - username: SYSDBA - password: SYSDBA001 - driver-class-name: dm.jdbc.driver.DmDriver -# url: jdbc:mysql://localhost:3306/manager?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC -# username: root -# password: 123456 -# driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:dm://127.0.0.1:5236/MANAGER +# username: SYSDBA +# password: SYSDBA001 +# driver-class-name: dm.jdbc.driver.DmDriver + url: jdbc:mysql://localhost:3306/manager?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC + username: root + password: 123456 + driver-class-name: com.mysql.cj.jdbc.Driver hikari: minimum-idle: 5 maximum-pool-size: 20 diff --git a/manager-admin/src/main/resources/indicator_set.yaml b/manager-admin/src/main/resources/indicator_set.yaml index 611a9f3..f5849d1 100644 --- a/manager-admin/src/main/resources/indicator_set.yaml +++ b/manager-admin/src/main/resources/indicator_set.yaml @@ -2,22 +2,22 @@ indicator: default: levels: - levelName: 优 - grade: 90 + grade: 95 levelOrder: 1 - equalValue: 优 + lowValue: 90 - levelName: 良 - grade: 80 + grade: 85 levelOrder: 2 - equalValue: 良 + lowValue: 80 - levelName: 可 - grade: 70 + grade: 75 levelOrder: 3 - equalValue: 可 + lowValue: 70 - levelName: 差 - grade: 60 + grade: 65 levelOrder: 4 - equalValue: 差 + lowValue: 60 function: membershipFunc: TRAP_TRI softEdgeS: 0.10 diff --git a/manager-admin/src/main/resources/templates/home.html b/manager-admin/src/main/resources/templates/home.html index d113a03..d2917c2 100644 --- a/manager-admin/src/main/resources/templates/home.html +++ b/manager-admin/src/main/resources/templates/home.html @@ -371,6 +371,25 @@ } } + table { + border-collapse: collapse; + min-width: 1200px; /* 比容器宽，才会滚动 */ + width: 100%; + } + + /* 固定最后一列 */ + th:last-child, + td:last-child { + position: sticky; + right: 0; + background: #f7fafc; + z-index: 2; + } + /* 可选：加个阴影效果，体验更好 */ + th:last-child, + td:last-child { + box-shadow: -2px 0 6px -2px #8882; + } diff --git a/manager-admin/src/main/resources/templates/model/add_model_field.html b/manager-admin/src/main/resources/templates/model/add_model_field.html index 9ef8e83..b253c5d 100644 --- a/manager-admin/src/main/resources/templates/model/add_model_field.html +++ b/manager-admin/src/main/resources/templates/model/add_model_field.html @@ -13,7 +13,7 @@
- + @@ -22,29 +22,14 @@
- +
- - - - - - - - - - - - - - - - +
@@ -59,137 +44,64 @@
- - - - - - - - - - - - - - - - - + + + + + +
- - - - - - - - +
+
+ + - - - - - - - - - +
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
@@ -199,3 +111,4 @@
+ diff --git a/manager-admin/src/main/resources/templates/model/list.html b/manager-admin/src/main/resources/templates/model/list.html index 4402f39..8e7e818 100644 --- a/manager-admin/src/main/resources/templates/model/list.html +++ b/manager-admin/src/main/resources/templates/model/list.html @@ -7,6 +7,7 @@ padding-bottom: 0.5rem; margin-bottom: 0; } + .card-body.list-area { border-radius: 0 0 0.5rem 0.5rem; padding-top: 0.5rem; @@ -34,7 +35,7 @@ 增加设施
-
+
@@ -112,7 +113,7 @@
- +
- + - + - - - - - - - - - - + + + + + + + + + + @@ -152,21 +153,21 @@ - + - - + + - - - - - - - - - - + + + + + + + + + + + 2)} `; @@ -748,7 +748,7 @@ row.append('text') .attr('x', d => x(d.score) + 8).attr('y', barH / 2).attr('dy', '.35em') .attr('fill', '#0f172a').attr('font-weight', 800).attr('font-size', 18) - .text(d => d.score.toFixed(1)); + .text(d => d.score.toFixed(2)); // 最低分标注 const minScore = d3.min(src, d => d.score); diff --git a/manager-admin/src/main/resources/templates/system/indicator/indicator_set.html b/manager-admin/src/main/resources/templates/system/indicator/indicator_set.html index 4ccb442..4b51aa3 100644 --- a/manager-admin/src/main/resources/templates/system/indicator/indicator_set.html +++ b/manager-admin/src/main/resources/templates/system/indicator/indicator_set.html @@ -18,7 +18,7 @@
-
1.全局默认表(等级名/代表分)
+
1.全局默认表(百分制/等级名/代表分)
@@ -29,8 +29,8 @@
- - + + @@ -49,83 +49,13 @@ - - - - - - - - - - - - - - - - - - - - - -
No. @@ -128,21 +129,21 @@ 标签 名称默认值类型 可选项输入提示必填标志
\ No newline at end of file diff --git a/manager-admin/src/main/resources/templates/project/list.html b/manager-admin/src/main/resources/templates/project/list.html index 0c17954..ffbfbd0 100644 --- a/manager-admin/src/main/resources/templates/project/list.html +++ b/manager-admin/src/main/resources/templates/project/list.html @@ -440,14 +440,14 @@ .style('font-size', '12px') .style('font-weight', '600') .style('fill', 'white') - .text(d => d.data.value >= 5 ? `${d.data.value.toFixed(0)}%` : ''); + .text(d => d.data.value >= 5 ? `${d.data.value.toFixed(2)}%` : ''); // 图例：这里用 rows（原始数据），不是 d.data const legend = wrapper.append('div').attr('class', 'pie-legend'); rows.forEach(d => { const item = legend.append('div').attr('class', 'legend-item'); item.append('div').attr('class', 'legend-color').style('background-color', d.color || '#999'); - item.append('span').text(`${d.label} (${d.value.toFixed(1)}%)`); + item.append('span').text(`${d.label} (${d.value.toFixed(2)}%)`); }); } @@ -473,7 +473,7 @@
-
${(item.weight * 100).toFixed(0)}%
+
${(item.weight * 100).toFixed(2)}%
@@ -481,7 +481,7 @@
${createMembershipDistributionVisualization(item.membershipDist)} ${item.score.toFixed( - 1)} ${scoreInfo.level}
等级名代表分代表值等级代表分等级最低分
- - - - - -
- - - - - -
- - - - - -
- - - - - -
@@ -229,12 +159,12 @@ function saveIndicatorGlobalSet(){ let levelGradeList = []; let levelNames = document.getElementsByName("_level"); let grades = document.getElementsByName("_score"); - let equalValues = document.getElementsByName("_equalValue"); + let lowValues = document.getElementsByName("_lowValue"); for (let i = 0; i < levelNames.length; i++) { let level = {}; level.levelName = levelNames[i].value; level.grade = parseInt(grades[i].value); - level.equalValue = (equalValues[i].value); + level.lowValue = (lowValues[i].value); levelGradeList.push(level); } //评价集设置 diff --git a/manager-system/src/main/java/com/hshh/system/Global.java b/manager-system/src/main/java/com/hshh/system/Global.java index ac5e3b2..ab8ea02 100644 --- a/manager-system/src/main/java/com/hshh/system/Global.java +++ b/manager-system/src/main/java/com/hshh/system/Global.java @@ -20,4 +20,5 @@ public class Global { * 日志记录队列. */ public static LinkedBlockingQueue logQueue = new LinkedBlockingQueue<>(1000); + public static final int scale = 2; } diff --git a/manager-system/src/main/java/com/hshh/system/algorithm/fuzzy/EvaluationLevel.java b/manager-system/src/main/java/com/hshh/system/algorithm/fuzzy/EvaluationLevel.java index 35c9c0b..50eee64 100644 --- a/manager-system/src/main/java/com/hshh/system/algorithm/fuzzy/EvaluationLevel.java +++ b/manager-system/src/main/java/com/hshh/system/algorithm/fuzzy/EvaluationLevel.java @@ -15,12 +15,12 @@ public class EvaluationLevel { //分值 private double score; //相等值 - private String equalValue; + private String lowValue; - public EvaluationLevel(String levelName, double score, String equalValue) { + public EvaluationLevel(String levelName, double score, String lowValue) { this.levelName = levelName; this.score = score; - this.equalValue = equalValue; + this.lowValue = lowValue; } public String getLevelName() { return levelName; } diff --git a/manager-system/src/main/java/com/hshh/system/base/service/DictItemService.java b/manager-system/src/main/java/com/hshh/system/base/service/DictItemService.java index 1dc431f..7b034b6 100644 --- a/manager-system/src/main/java/com/hshh/system/base/service/DictItemService.java +++ b/manager-system/src/main/java/com/hshh/system/base/service/DictItemService.java @@ -3,6 +3,7 @@ package com.hshh.system.base.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hshh.system.base.entity.DictItem; import java.util.List; +import java.util.Map; /** * 字典条目服务类. @@ -44,4 +45,5 @@ public interface DictItemService extends IService { * @return 码表条目列表 */ List selectItemByTypeCode(String code); + Map> dictItemMap(); } diff --git a/manager-system/src/main/java/com/hshh/system/base/service/DictTypeService.java b/manager-system/src/main/java/com/hshh/system/base/service/DictTypeService.java index d443f88..0e08106 100644 --- a/manager-system/src/main/java/com/hshh/system/base/service/DictTypeService.java +++ b/manager-system/src/main/java/com/hshh/system/base/service/DictTypeService.java @@ -3,6 +3,7 @@ package com.hshh.system.base.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hshh.system.base.entity.DictType; import java.util.List; +import java.util.Map; /** *

@@ -29,4 +30,5 @@ public interface DictTypeService extends IService { * @return 当前最大排序号 */ int maxOrder(); + Map dictTypeMap(); } diff --git a/manager-system/src/main/java/com/hshh/system/base/service/impl/DictItemServiceImpl.java b/manager-system/src/main/java/com/hshh/system/base/service/impl/DictItemServiceImpl.java index a497b61..f630525 100644 --- a/manager-system/src/main/java/com/hshh/system/base/service/impl/DictItemServiceImpl.java +++ b/manager-system/src/main/java/com/hshh/system/base/service/impl/DictItemServiceImpl.java @@ -5,7 +5,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hshh.system.base.entity.DictItem; import com.hshh.system.base.mapper.DictItemMapper; import com.hshh.system.base.service.DictItemService; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -64,4 +69,16 @@ public class DictItemServiceImpl extends ServiceImpl i public List selectItemByTypeCode(String code) { return this.baseMapper.selectItemByTypeCode(code); } + + @Override + public Map> dictItemMap() { + List itemList = this.list(); + itemList.sort(Comparator.comparing(DictItem::getId)); + return itemList.stream() + .collect(Collectors.groupingBy( + DictItem::getTypeId, + LinkedHashMap::new, // 指定使用 LinkedHashMap + Collectors.toList() + )); + } } diff --git a/manager-system/src/main/java/com/hshh/system/base/service/impl/DictTypeServiceImpl.java b/manager-system/src/main/java/com/hshh/system/base/service/impl/DictTypeServiceImpl.java index f5f2271..17d837b 100644 --- a/manager-system/src/main/java/com/hshh/system/base/service/impl/DictTypeServiceImpl.java +++ b/manager-system/src/main/java/com/hshh/system/base/service/impl/DictTypeServiceImpl.java @@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hshh.system.base.entity.DictType; import com.hshh.system.base.mapper.DictTypeMapper; import com.hshh.system.base.service.DictTypeService; +import java.util.Collections; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -45,4 +48,10 @@ public class DictTypeServiceImpl extends ServiceImpl i } return 0; } + + @Override + public Map dictTypeMap() { + + return this.list().stream().collect(Collectors.toMap(DictType::getId, a -> a)); + } }