From b5987ef848f226bec0a109571a44de98f2f79535 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期一, 18 九月 2023 10:58:44 +0800
Subject: [PATCH] 驱动参数配置下拉选择控制系统类型
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/OptionsDto.java | 16 ++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDriveTypeParamConfigController.java | 9 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDriveTypeParamConfigService.java | 7 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDriveTypeParamConfigMapper.java | 6 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDriveTypeParamConfigMapper.xml | 7 +++
lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java | 26 ++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDriveTypeParamConfigServiceImpl.java | 20 ++++++++++
7 files changed, 90 insertions(+), 1 deletions(-)
diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java b/lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
index 92e962e..87c7bf5 100644
--- a/lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
@@ -76,7 +76,31 @@
.build()
.securitySchemes(Collections.singletonList(securityScheme()))
.securityContexts(securityContexts())
- .globalOperationParameters(setHeaderToken());
+ .globalOperationParameters(setHeaderToken())
+ .groupName("default");
+ }
+
+ /**
+ * swagger2鐨勯厤缃枃浠讹紝杩欓噷鍙互閰嶇疆swagger2鐨勪竴浜涘熀鏈殑鍐呭锛屾瘮濡傛壂鎻忕殑鍖呯瓑绛� 锛圡DC锛�
+ *
+ * @return Docket
+ */
+ @Bean(value = "defaultApi")
+ public Docket defaultApi() {
+ return new Docket(DocumentationType.SWAGGER_2)
+ .apiInfo(apiInfo())
+ .select()
+ //姝ゅ寘璺緞涓嬬殑绫伙紝鎵嶇敓鎴愭帴鍙ｆ枃妗�
+ .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.mdc"))
+ //鍔犱簡ApiOperation娉ㄨВ鐨勭被锛屾墠鐢熸垚鎺ュ彛鏂囨。
+ .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
+ .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+ .paths(PathSelectors.any())
+ .build()
+ .securitySchemes(Collections.singletonList(securityScheme()))
+ .securityContexts(securityContexts())
+ .globalOperationParameters(setHeaderToken())
+ .groupName("MDC");
}
/***
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDriveTypeParamConfigController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDriveTypeParamConfigController.java
index c740de6..984bb08 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDriveTypeParamConfigController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDriveTypeParamConfigController.java
@@ -11,6 +11,7 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.mdc.dto.OptionsDto;
import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
import org.jeecg.modules.mdc.service.IMdcDriveTypeParamConfigService;
import org.springframework.web.bind.annotation.*;
@@ -160,4 +161,12 @@
return Result.OK(list);
}
+ @AutoLog(value = "椹卞姩鍙傛暟閰嶇疆-鑾峰彇鎺у埗绯荤粺绫诲瀷涓嬫媺妗嗛�夐」")
+ @ApiOperation(value = "椹卞姩鍙傛暟閰嶇疆-鑾峰彇鎺у埗绯荤粺绫诲瀷涓嬫媺妗嗛�夐」", notes = "椹卞姩鍙傛暟閰嶇疆-鑾峰彇鎺у埗绯荤粺绫诲瀷涓嬫媺妗嗛�夐」")
+ @GetMapping(value = "/getDriveParamOptions")
+ public Result<List<OptionsDto>> getDriveParamOptions() {
+ List<OptionsDto> result = mdcDriveTypeParamConfigService.getDriveParamOptions();
+ return Result.OK(result);
+ }
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/OptionsDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/OptionsDto.java
new file mode 100644
index 0000000..079103c
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/OptionsDto.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.mdc.dto;
+
+import lombok.Data;
+
+/**
+ * @author: LiuS
+ * @create: 2023-09-18 10:35
+ */
+@Data
+public class OptionsDto {
+
+ private String value;
+
+ private String label;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDriveTypeParamConfigMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDriveTypeParamConfigMapper.java
index 047ef43..c0db871 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDriveTypeParamConfigMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDriveTypeParamConfigMapper.java
@@ -18,4 +18,10 @@
* 鏍规嵁璁惧缂栫爜鑾峰彇宸ヤ綔鏇茬嚎鍙傛暟
*/
List<MdcDriveTypeParamConfig> findWorkCurveParamList(@Param("equipmentId") String equipmentId);
+
+ /**
+ * 鑾峰彇鎺у埗绯荤粺绫诲瀷涓嬫媺妗嗛�夐」
+ */
+ List<String> getDriveParamOptions();
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDriveTypeParamConfigMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDriveTypeParamConfigMapper.xml
index af9a848..4eefc8f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDriveTypeParamConfigMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDriveTypeParamConfigMapper.xml
@@ -13,4 +13,11 @@
mdtpc.curve_generation_flags = 'Y'
AND me.equipment_id = #{equipmentId}
</select>
+
+ <select id="getDriveParamOptions" resultType="java.lang.String">
+ SELECT DISTINCT
+ control_system_type
+ FROM
+ mdc_drive_type_param_config
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDriveTypeParamConfigService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDriveTypeParamConfigService.java
index 32c5128..efcac99 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDriveTypeParamConfigService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDriveTypeParamConfigService.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.mdc.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.dto.OptionsDto;
import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
import java.util.List;
@@ -27,4 +28,10 @@
* 鏍规嵁鍙傛暟閰嶇疆鑾峰彇鏇茬嚎宸ヤ綔閰嶇疆
*/
List<MdcDriveTypeParamConfig> getByTypeCodeMdcShowCode(String codeTypeId);
+
+ /**
+ * 鑾峰彇鎺у埗绯荤粺绫诲瀷涓嬫媺妗嗛�夐」
+ */
+ List<OptionsDto> getDriveParamOptions();
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDriveTypeParamConfigServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDriveTypeParamConfigServiceImpl.java
index 38d011c..f9d398c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDriveTypeParamConfigServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDriveTypeParamConfigServiceImpl.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.modules.mdc.dto.OptionsDto;
import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
import org.jeecg.modules.mdc.mapper.MdcDriveTypeParamConfigMapper;
import org.jeecg.modules.mdc.service.IMdcDriveTypeParamConfigService;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -39,4 +41,22 @@
public List<MdcDriveTypeParamConfig> getByTypeCodeMdcShowCode(String codeTypeId) {
return this.baseMapper.selectBatchIds(Arrays.asList(codeTypeId.split(",")));
}
+
+ /**
+ * 鑾峰彇鎺у埗绯荤粺绫诲瀷涓嬫媺妗嗛�夐」
+ */
+ @Override
+ public List<OptionsDto> getDriveParamOptions() {
+ List<OptionsDto> result = new ArrayList<>();
+ List<String> driveParams = this.baseMapper.getDriveParamOptions();
+ if (driveParams != null && !driveParams.isEmpty()) {
+ for (String driveParam : driveParams) {
+ OptionsDto optionsDto = new OptionsDto();
+ optionsDto.setLabel(driveParam);
+ optionsDto.setValue(driveParam);
+ result.add(optionsDto);
+ }
+ }
+ return result;
+ }
}
--
Gitblit v1.9.3