fix:字典管理

2025-11-13 11:21:42 +08:00
parent 84dec30ebd
commit 56771a0de0
8 changed files with 67 additions and 16 deletions
--- a/system/src/main/java/com/sdm/system/controller/SimulationAppCenterController.java
+++ b/system/src/main/java/com/sdm/system/controller/SimulationAppCenterController.java
@@ -1,9 +1,6 @@
 package com.sdm.system.controller;

 import com.sdm.common.common.SdmResponse;
-import com.sdm.system.model.bo.DataDictionary;
-import com.sdm.system.model.bo.DictionaryClass;
-import com.sdm.system.model.bo.FormConfigure;
 import com.sdm.system.model.entity.AppCenterItemBean;
 import com.sdm.system.model.entity.AppConfigureBean;
 import com.sdm.system.service.ISimulatinoAppCenterService;
--- a/system/src/main/java/com/sdm/system/controller/SimulationSystemConfigController.java
+++ b/system/src/main/java/com/sdm/system/controller/SimulationSystemConfigController.java
@@ -5,10 +5,14 @@ import com.sdm.system.model.bo.DataDictionary;
 import com.sdm.system.model.bo.DictionaryClass;
 import com.sdm.system.model.bo.FormConfigure;
 import com.sdm.system.model.req.system.FormConfigureReq;
+import com.sdm.system.model.resp.SimuDictionaryResp;
 import com.sdm.system.service.ISimulationSystemConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

+import java.util.List;
+import java.util.Map;
+
@RestController
@RequestMapping(value = "/systemData")
 public class SimulationSystemConfigController {
@@ -37,6 +41,13 @@ public class SimulationSystemConfigController {
        return service.queryDictionaryData(dictClass);
    }

+    @GetMapping(value = "/getAllDictionaryData")
+    @ResponseBody
+    SdmResponse<Map<String, List<SimuDictionaryResp>>> getAllDictionaryData()
+    {
+        return service.getAllDictionaryData();
+    }
+
    @GetMapping(value = "/deleteDictionaryData")
    @ResponseBody
    SdmResponse deleteDictionaryData(@RequestParam("uuid")String uuid)
--- a/system/src/main/java/com/sdm/system/dao/SimulationAppManageMapper.java
+++ b/system/src/main/java/com/sdm/system/dao/SimulationAppManageMapper.java
@@ -1,9 +1,5 @@
 package com.sdm.system.dao;

-import com.sdm.common.common.SdmResponse;
-import com.sdm.system.model.bo.DataDictionary;
-import com.sdm.system.model.bo.DictionaryClass;
-import com.sdm.system.model.bo.FormConfigure;
 import com.sdm.system.model.entity.AppCenterItemBean;
 import com.sdm.system.model.entity.AppConfigureBean;
 import org.apache.ibatis.annotations.*;
--- a/system/src/main/java/com/sdm/system/dao/SimulationSystemMapper.java
+++ b/system/src/main/java/com/sdm/system/dao/SimulationSystemMapper.java
@@ -17,6 +17,9 @@ public interface SimulationSystemMapper {
    @Select("SELECT * FROM simulation_data_dictionary WHERE dictClass=#{dictClass} ORDER BY dictOrder ASC")
    List<DataDictionary> queryDictionaryClassData(@Param("dictClass")String dictClass);

+    @Select("SELECT * FROM simulation_data_dictionary")
+    List<DataDictionary> getAllDictionaryData();
+
    @Delete("DELETE FROM simulation_data_dictionary WHERE dictClass=#{dictClass}")
    int deleteDictionaryClassItems(@Param("dictClass")String dictClass);

--- a/system/src/main/java/com/sdm/system/model/bo/FormConfigure.java
+++ b/system/src/main/java/com/sdm/system/model/bo/FormConfigure.java
@@ -4,12 +4,8 @@ import com.sdm.common.entity.bo.BaseBean;
 import lombok.Data;

@Data
-public class FormConfigure extends BaseBean {
+public class FormConfigure{

-    public FormConfigure()
-    {
-        init();
-    }
    public int id;

    public String formName;
--- a/system/src/main/java/com/sdm/system/model/resp/SimuDictionaryResp.java
+++ b/system/src/main/java/com/sdm/system/model/resp/SimuDictionaryResp.java
@@ -0,0 +1,21 @@
+package com.sdm.system.model.resp;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@NoArgsConstructor
+public class SimuDictionaryResp {
+
+    public String dictName;
+    public String dictValue;
+    public String dictClass;
+
+    public SimuDictionaryResp(String dictValue, String dictClass, String dictName) {
+        this.dictValue = dictValue;
+        this.dictClass = dictClass;
+        this.dictName = dictName;
+    }
+
+}
--- a/system/src/main/java/com/sdm/system/service/ISimulationSystemConfigService.java
+++ b/system/src/main/java/com/sdm/system/service/ISimulationSystemConfigService.java
@@ -5,6 +5,10 @@ import com.sdm.system.model.bo.DataDictionary;
 import com.sdm.system.model.bo.DictionaryClass;
 import com.sdm.system.model.bo.FormConfigure;
 import com.sdm.system.model.req.system.FormConfigureReq;
+import com.sdm.system.model.resp.SimuDictionaryResp;
+
+import java.util.List;
+import java.util.Map;

 public interface ISimulationSystemConfigService {

@@ -12,6 +16,8 @@ public interface ISimulationSystemConfigService {

    SdmResponse queryDictionaryData(String dictClass);

+    SdmResponse<Map<String, List<SimuDictionaryResp>>> getAllDictionaryData();
+
    SdmResponse deleteDataDictionary(String uuid);

    SdmResponse deleteDataDictionaryClass(String className);
--- a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java
+++ b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java
@@ -2,6 +2,7 @@ package com.sdm.system.service.impl;


 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sdm.common.common.SdmResponse;
@@ -15,6 +16,7 @@ import com.sdm.system.model.bo.DictionaryClass;
 import com.sdm.system.model.bo.FormConfigure;
 import com.sdm.system.model.entity.SysFormConfigure;
 import com.sdm.system.model.req.system.FormConfigureReq;
+import com.sdm.system.model.resp.SimuDictionaryResp;
 import com.sdm.system.service.IFormConfigureService;
 import com.sdm.system.service.ISimulationSystemConfigService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -24,6 +26,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;

@Service
 public class SimulationSystemConfigServiceImpl extends BaseService implements ISimulationSystemConfigService {
@@ -111,6 +115,17 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
        return response;
    }

+    /**
+     * 查询全量数据字典条目
+     * @return
+     */
+    public SdmResponse<Map<String, List<SimuDictionaryResp>> > getAllDictionaryData() {
+        List<DataDictionary> dictionaries = mapper.getAllDictionaryData();
+        List<SimuDictionaryResp> newDictionaries = dictionaries.stream().filter(i -> StringUtils.isNotBlank(i.dictClass)).map(i -> new SimuDictionaryResp(i.dictValue, i.dictClass, i.dictName)).collect(Collectors.toList());
+        Map<String, List<SimuDictionaryResp>> dictionMap = newDictionaries.stream().collect(Collectors.groupingBy(SimuDictionaryResp::getDictClass));
+        return SdmResponse.success(dictionMap);
+    }
+
    /**
     * 更新数据字典条目
     * @param dict
@@ -266,10 +281,15 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
    public SdmResponse updateSystemFormConfigure(FormConfigure configure) {
        SdmResponse response = SdmResponse.success();
        if (CollectionUtils.isNotEmpty(formConfigureService.lambdaQuery().eq(SysFormConfigure::getFormName, configure.formName).list())) {
-            formConfigureService.lambdaUpdate()
-                    .set(SysFormConfigure::getFormConfig, configure.getFormConfig())
-                    .set(SysFormConfigure::getComment, configure.getComment())
-                    .eq(SysFormConfigure::getFormName, configure.getFormName()).update();
+            LambdaUpdateWrapper<SysFormConfigure> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(SysFormConfigure::getFormName, configure.getFormName());
+            if (configure.getFormConfig() != null) {
+                updateWrapper.set(SysFormConfigure::getFormConfig, configure.getFormConfig());
+            }
+            if (configure.getComment() != null) {
+                updateWrapper.set(SysFormConfigure::getComment, configure.getComment());
+            }
+            formConfigureService.update(updateWrapper);
        } else {
            response = SdmResponse.failed("该表单配置不存在");
        }
@@ -312,6 +332,7 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
        if (StringUtils.isNotBlank(req.formName)) {
            queryWrapper.like(SysFormConfigure::getFormName, req.formName);
        }
+        queryWrapper.orderByDesc(SysFormConfigure::getCreateTime);
        List<SysFormConfigure> list = formConfigureService.list(queryWrapper);
        if (CollectionUtils.isEmpty(list)) {
            return SdmResponse.failed("自定义表单列表为空，请初始化");