lius
2023-09-18 b5987ef848f226bec0a109571a44de98f2f79535
驱动参数配置下拉选择控制系统类型
已添加1个文件
已修改6个文件
91 ■■■■■ 文件已修改
lxzn-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDriveTypeParamConfigController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/OptionsDto.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDriveTypeParamConfigMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDriveTypeParamConfigMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDriveTypeParamConfigService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDriveTypeParamConfigServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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的一些基本的内容,比如扫描的包等等 ï¼ˆMDC)
     *
     * @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");
    }
    /***
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);
    }
}
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;
}
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();
}
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>
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();
}
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;
    }
}