From 9282e10873cb96ae64f4ebc864f3827db4408c53 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 26 Apr 2024 18:11:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/utils/ColUtil.java | 8 ++++ .../java/org/nl/common/utils/GenUtil.java | 6 +-- .../org/nl/modules/common/utils/FileUtil.java | 8 ++-- .../generator/CodeGenConfigController.java | 10 +++-- .../generator/CodeGeneratorController.java | 29 ++++++------- .../generator/ICodeGenConfigService.java | 4 +- .../generator/ICodeGeneratorService.java | 26 +++++------- .../generator/dao/CodeColumnConfig.java | 24 ++++++----- .../service/generator/dao/CodeGenConfig.java | 3 +- .../dao/mapper/CodeColumnConfigMapper.java | 21 +++++----- .../service/generator/dto/ColumnInfo.java | 1 + .../impl/CodeGenConfigServiceImpl.java | 4 +- .../impl/CodeGeneratorServiceImpl.java | 6 +-- .../template/generator/admin/Controller.ftl | 11 +++-- .../template/generator/admin/Dto.ftl | 42 +++++++++++++------ .../template/generator/admin/Entity.ftl | 19 ++++----- .../template/generator/admin/ServiceImpl.ftl | 5 ++- .../template/generator/front/index.ftl | 18 ++++---- 18 files changed, 127 insertions(+), 118 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/ColUtil.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/ColUtil.java index ad0aa1d1a..50b19c005 100644 --- a/lms/nladmin-system/src/main/java/org/nl/common/utils/ColUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/ColUtil.java @@ -6,6 +6,14 @@ import org.apache.commons.configuration.PropertiesConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + *

+ * 工具类 + *

+ * + * @author lyd + * @since 2023-05-03 + */ public class ColUtil { private static final Logger log = LoggerFactory.getLogger(ColUtil.class); diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/GenUtil.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/GenUtil.java index 1be88e49e..782ac540a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/common/utils/GenUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/GenUtil.java @@ -21,7 +21,6 @@ import java.util.Map; import static org.nl.modules.common.utils.FileUtil.SYS_TEM_DIR; - /** * @author: lyd * @description: 代码生成 @@ -101,7 +100,7 @@ public class GenUtil { * 定义后端文件路径以及名称 */ private static String getAdminFilePath(String templateName, CodeGenConfig genConfig, String className, String rootPath) { - String projectPath = rootPath + File.separator; + String projectPath = rootPath + File.separator + genConfig.getModule_name() + File.separator; String packagePath = projectPath + "src" + File.separator + "main" + File.separator + "java" + File.separator; if (!ObjectUtils.isEmpty(genConfig.getPack())) { packagePath += genConfig.getPack().replace(".", File.separator) + File.separator; @@ -323,7 +322,6 @@ public class GenUtil { /** * 打包下载 - * * @param columns * @param genConfig * @return @@ -371,7 +369,6 @@ public class GenUtil { /** * 生成文件 - * * @param file * @param template * @param map @@ -394,7 +391,6 @@ public class GenUtil { /** * 生成代码 - * * @param columnInfos * @param genConfig * @throws IOException diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/FileUtil.java b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/FileUtil.java index 056f04a37..df4af2968 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/FileUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/FileUtil.java @@ -1,4 +1,4 @@ -/* +package org.nl.modules.common.utils;/* * Copyright 2019-2020 Zheng Jie * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.modules.common.utils; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; @@ -96,7 +95,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { File file = null; try { // 用uuid作为文件名，防止生成的临时文件重复 - //file = File.createTempFile(IdUtil.simpleUUID(), prefix); file = new File(SYS_TEM_DIR + IdUtil.simpleUUID() + prefix); // MultipartFile to File multipartFile.transferTo(file); @@ -210,7 +208,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { BigExcelWriter writer = ExcelUtil.getBigWriter(file); // 一次性写出内容，使用默认样式，强制输出标题 writer.write(list, true); - SXSSFSheet sheet = (SXSSFSheet) writer.getSheet(); + SXSSFSheet sheet = (SXSSFSheet)writer.getSheet(); //上面需要强转SXSSFSheet 不然没有trackAllColumnsForAutoSizing方法 sheet.trackAllColumnsForAutoSizing(); //列宽自适应 @@ -249,7 +247,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { // 1M int len = 1024 * 1024; if (size > (maxSize * len)) { - throw new BadRequestException("文件超出规定大小"); + throw new BadRequestException("文件超出规定大小!"); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java index 550b93bf9..d5c51ec90 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java @@ -2,6 +2,9 @@ package org.nl.system.controller.generator; import cn.dev33.satoken.annotation.SaIgnore; + + +import lombok.RequiredArgsConstructor; import org.nl.system.service.generator.ICodeGenConfigService; import org.nl.system.service.generator.dao.CodeGenConfig; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +23,6 @@ import org.springframework.web.bind.annotation.*; */ @SaIgnore @RestController - @RequestMapping("api/genConfig") public class CodeGenConfigController { @@ -29,14 +31,14 @@ public class CodeGenConfigController { @GetMapping(value = "/{tableName}") - public ResponseEntity query(@PathVariable String tableName) { + public ResponseEntity query(@PathVariable String tableName){ return new ResponseEntity<>(genConfigService.findByTableName(tableName), HttpStatus.OK); } @PutMapping - public ResponseEntity update(@Validated @RequestBody CodeGenConfig genConfig) { - return new ResponseEntity<>(genConfigService.update(genConfig.getTable_name(), genConfig), HttpStatus.OK); + public ResponseEntity update(@Validated @RequestBody CodeGenConfig genConfig){ + return new ResponseEntity<>(genConfigService.update(genConfig.getTable_name(), genConfig),HttpStatus.OK); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java index 751c474c1..058b6a04b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java @@ -28,7 +28,6 @@ import java.util.List; @SaIgnore @RestController @RequestMapping("/api/generator") - public class CodeGeneratorController { @Autowired private ICodeGeneratorService generatorService; @@ -40,26 +39,26 @@ public class CodeGeneratorController { @GetMapping(value = "/tables") - public ResponseEntity queryTables(@RequestParam(defaultValue = "") String name, PageQuery pageable) { + public ResponseEntity queryTables(@RequestParam(defaultValue = "") String name, PageQuery pageable){ return new ResponseEntity<>(TableDataInfo.build(generatorService.getTables(name, pageable)), HttpStatus.OK); } @GetMapping(value = "/columns") - public ResponseEntity queryColumns(@RequestParam String tableName) { + public ResponseEntity queryColumns(@RequestParam String tableName){ return new ResponseEntity<>(TableDataInfo.build(generatorService.getColumns(tableName)), HttpStatus.OK); } @PutMapping - public ResponseEntity save(@RequestBody List columnInfos) { + public ResponseEntity save(@RequestBody List columnInfos){ generatorService.updateBatchById(columnInfos); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping(value = "sync") - public ResponseEntity sync(@RequestBody List tables) { + public ResponseEntity sync(@RequestBody List tables){ for (String table : tables) { generatorService.sync(generatorService.getColumns(table), generatorService.query(table)); } @@ -68,24 +67,20 @@ public class CodeGeneratorController { @PostMapping(value = "/{tableName}/{type}") - public ResponseEntity generator(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response) { - if (!generatorEnabled && type == 0) { - throw new BadRequestException("此环境不允许生成代码，请选择预览或者下载查看！"); + public ResponseEntity generator(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response){ + if(!generatorEnabled && type == 0){ + throw new BadRequestException("此环境不允许生成代码，请选择预览或者下载查看"); } - switch (type) { + switch (type){ // 生成代码 - case 0: - generatorService.generator(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName)); + case 0: generatorService.generator(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName)); break; // 预览 - case 1: - return generatorService.preview(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName)); + case 1: return generatorService.preview(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName)); // 打包 - case 2: - generatorService.download(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName), request, response); + case 2: generatorService.download(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName), request, response); break; - default: - throw new BadRequestException("没有这个选项"); + default: throw new BadRequestException("信息为空"); } return new ResponseEntity<>(HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/ICodeGenConfigService.java b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/ICodeGenConfigService.java index 7710bf3f9..1ae10b931 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/ICodeGenConfigService.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/ICodeGenConfigService.java @@ -1,7 +1,7 @@ package org.nl.system.service.generator; -import com.baomidou.mybatisplus.extension.service.IService; import org.nl.system.service.generator.dao.CodeGenConfig; +import com.baomidou.mybatisplus.extension.service.IService; /** *

@@ -15,7 +15,6 @@ public interface ICodeGenConfigService extends IService { /** * 根据表名查找 - * * @param tableName * @return */ @@ -23,7 +22,6 @@ public interface ICodeGenConfigService extends IService { /** * 根据表名更新 - * * @param tableName * @param genConfig * @return diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java index 7ada3d817..2b10b25df 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java @@ -1,11 +1,12 @@ package org.nl.system.service.generator; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.generator.dao.CodeColumnConfig; +import com.baomidou.mybatisplus.extension.service.IService; import org.nl.system.service.generator.dao.CodeGenConfig; import org.nl.system.service.generator.dto.TablesInfo; +import org.springframework.data.domain.Pageable; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Async; @@ -25,16 +26,14 @@ public interface ICodeGeneratorService extends IService { /** * 获得所有的表格信息 - * * @param name * @param pageQuery - * @return + * @return IPage */ IPage getTables(String name, PageQuery pageQuery); /** * 得到数据表的元数据 - * * @param tableName 表名 * @return / */ @@ -42,7 +41,6 @@ public interface ICodeGeneratorService extends IService { /** * 根据表名查询表字段 - * * @param tableName * @return */ @@ -50,36 +48,32 @@ public interface ICodeGeneratorService extends IService { /** * 同步表数据 - * - * @param columnInfos / + * @param columnInfos / * @param columnInfoList / */ @Async void sync(IPage columnInfos, List columnInfoList); /** - * 预览代码 - * + * 视图 * @param byTableName * @param columns - * @return + * @return ResponseEntity */ ResponseEntity preview(CodeGenConfig byTableName, IPage columns); /** * 打包下载 - * - * @param genConfig 配置信息 + * @param genConfig 配置信息 * @param columnsPage 字段信息分页数据 - * @param request / - * @param response / + * @param request / + * @param response / */ void download(CodeGenConfig genConfig, IPage columnsPage, HttpServletRequest request, HttpServletResponse response); /** * 代码生成 - * - * @param genConfig 配置信息 + * @param genConfig 配置信息 * @param columnsPage 字段信息分页数据 */ void generator(CodeGenConfig genConfig, IPage columnsPage); diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java index 845e6d330..3041172b7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java @@ -5,12 +5,15 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; + + +import lombok.Builder; import lombok.Data; +import lombok.EqualsAndHashCode; import org.nl.common.utils.GenUtil; import org.nl.system.service.generator.dto.ColumnInfo; -import java.io.Serializable; - /** *

* 列的数据信息表 @@ -72,25 +75,24 @@ public class CodeColumnConfig implements Serializable { /** * 创建默认的实体 - * - * @param tableName - * @param config - * @return + * @param tableName / + * @param config / + * @return CodeColumnConfig */ public static CodeColumnConfig createDefault(String tableName, ColumnInfo config) { CodeColumnConfig columnConfig = new CodeColumnConfig(); - columnConfig.setColumn_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + columnConfig.setColumn_id(IdUtil.getSnowflake(1,1).nextIdStr()); columnConfig.setTable_name(tableName); columnConfig.setColumn_name(config.getColumn_name()); columnConfig.setColumn_type(config.getColumn_type()); columnConfig.setKey_type(config.getKey_type()); columnConfig.setExtra(config.getExtra()); columnConfig.setNot_null((ObjectUtil.isNotEmpty(config.getKey_type()) - && ObjectUtil.isNotEmpty(config.getExtra()) + &&ObjectUtil.isNotEmpty(config.getExtra()) && GenUtil.PK.equalsIgnoreCase(config.getKey_type()) - && GenUtil.EXTRA.equalsIgnoreCase(config.getExtra())) - ? false : ObjectUtil.isNotEmpty(config.getNot_null()) ? config.getNot_null() : false); - columnConfig.setRemark(ObjectUtil.isNotEmpty(config.getRemark()) ? config.getRemark() : null); + &&GenUtil.EXTRA.equalsIgnoreCase(config.getExtra())) + ?false:ObjectUtil.isNotEmpty(config.getNot_null())?config.getNot_null():false); + columnConfig.setRemark(ObjectUtil.isNotEmpty(config.getRemark())?config.getRemark():null); columnConfig.setList_show(true); columnConfig.setForm_show(true); return columnConfig; diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java index 69ea26efb..3d438c1a8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java @@ -2,12 +2,11 @@ package org.nl.system.service.generator.dao; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import java.io.Serializable; - /** *

* 代码生成配置表 diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java index 2008a91fb..ace02fd9b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java @@ -1,7 +1,7 @@ package org.nl.system.service.generator.dao.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.system.service.generator.dao.CodeColumnConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.system.service.generator.dto.ColumnInfo; import org.nl.system.service.generator.dto.TablesInfo; @@ -19,25 +19,24 @@ public interface CodeColumnConfigMapper extends BaseMapper { /** * 分页查找 - * - * @param name 表名 - * @return 表信息 + * @param name / + * @param pageSize / + * @param offset / + * @return List */ List getTables(String name, int pageSize, int offset); /** * 分页查询的总数 - * - * @param name 表名 - * @return 表信息 + * @param name + * @return long */ long getTablesTotal(String name); /** - * 获取 - * - * @param tableName 表名 - * @return 列数据 + * 获取字段名称 + * @param tableName + * @return List */ List getTablesByTableName(String tableName); } diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java index 093ee5b54..055378a93 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java @@ -1,5 +1,6 @@ package org.nl.system.service.generator.dto; + import lombok.Data; /** diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java index 42e89a226..7d0f5af1a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java @@ -40,7 +40,7 @@ public class CodeGenConfigServiceImpl extends ServiceImpl create(@Validated @RequestBody ${className} entity){ + public ResponseEntity create(@Validated @RequestBody ${className} entity){ ${changeClassName}Service.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @@ -54,7 +53,7 @@ public class ${className}Controller { //@SaCheckPermission("@el.check('${changeClassName}:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { - ${changeClassName}Service.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); + ${changeClassName}Service.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/lms/nladmin-system/src/main/resources/template/generator/admin/Dto.ftl b/lms/nladmin-system/src/main/resources/template/generator/admin/Dto.ftl index a17898bdc..6d8e3d288 100644 --- a/lms/nladmin-system/src/main/resources/template/generator/admin/Dto.ftl +++ b/lms/nladmin-system/src/main/resources/template/generator/admin/Dto.ftl @@ -1,16 +1,23 @@ package ${package}.service.dto; +import lombok.Data; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; <#if hasTimestamp> -import java.sql.Timestamp; + import java.sql.Timestamp; + import java.sql.Timestamp; <#if hasBigDecimal> -import java.math.BigDecimal; + import java.math.BigDecimal; + import java.math.BigDecimal; import lombok.Data; import lombok.Builder; import java.io.Serializable; +<#if !auto && pkColumnType = 'Long'> + import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + /** * @description / @@ -23,16 +30,27 @@ public class ${className}Dto implements Serializable { <#if columns??> <#list columns as column> - <#if column.remark != ''> - /** ${column.remark} */ - - <#if column.columnKey = 'PRI'> - <#if !auto && pkColumnType = 'Long'> - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - - - private ${column.columnType} ${column.changeColumnName}; + <#if column.remark != ''> + /** ${column.remark} */ + + <#if column.columnKey = 'PRI'> + <#if !auto && pkColumnType = 'Long'> + /** 防止精度丢失 */ + @JsonSerialize(using= ToStringSerializer.class) + + + private ${column.columnType} ${column.changeColumnName}; + <#if column.remark != ''> + /** ${column.remark} */ + + <#if column.columnKey = 'PRI'> + <#if !auto && pkColumnType = 'Long'> + /** 防止精度丢失 */ + @JsonSerialize(using= ToStringSerializer.class) + + + private ${column.columnType} ${column.changeColumnName}; } + diff --git a/lms/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl b/lms/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl index bcd8cb208..dfd549a68 100644 --- a/lms/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl +++ b/lms/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl @@ -1,41 +1,40 @@ package ${package}.service.dao; <#if hasPk> -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; + import com.baomidou.mybatisplus.annotation.IdType; + import com.baomidou.mybatisplus.annotation.TableId; + import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Builder; + import lombok.Data; import lombok.EqualsAndHashCode; <#if hasTimestamp> -import java.sql.Timestamp; + import java.sql.Timestamp; <#if hasBigDecimal> -import java.math.BigDecimal; + import java.math.BigDecimal; import java.io.Serializable; /** -* @description 添加'@Builder'注解最好不好添加'@NoArgsConstructor' +* @description / * @author ${author} * @date ${date} **/ @Data -@Builder @EqualsAndHashCode(callSuper = false) @TableName("${tableName}") public class ${className} implements Serializable { - private static final long serialVersionUID = 1L; +private static final long serialVersionUID = 1L; <#if columns??> <#list columns as column> <#if column.columnKey = 'PRI'> @TableId(value = "${column.columnName}", type = <#if auto>IdType.AUTO<#else>IdType.NONE) -<#if column.remark != ''> +<#if column.remark?has_content> /** ${column.remark} */ <#else> /** ${column.changeColumnName} */ diff --git a/lms/nladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl b/lms/nladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl index 5e504d265..a364dd189 100644 --- a/lms/nladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl +++ b/lms/nladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl @@ -8,8 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; +import org.nl.config.language.LangProcess; import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import ${package}.service.I${className}Service; import ${package}.service.dao.mapper.${className}Mapper; @@ -59,7 +60,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c @Override public void update(${className} entity) { ${className} dto = ${changeClassName}Mapper.selectById(entity.get${pkChangeColName ? cap_first }()); - if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); diff --git a/lms/nladmin-system/src/main/resources/template/generator/front/index.ftl b/lms/nladmin-system/src/main/resources/template/generator/front/index.ftl index d793e3022..25600a473 100644 --- a/lms/nladmin-system/src/main/resources/template/generator/front/index.ftl +++ b/lms/nladmin-system/src/main/resources/template/generator/front/index.ftl @@ -9,8 +9,8 @@ <#if queryColumns??> <#list queryColumns as column> <#if column.queryType != 'BetWeen'> - - + + @@ -37,7 +37,7 @@ <#if columns??> <#list columns as column> <#if column.formShow> - prop="${column.changeColumnName}"> + prop="${column.changeColumnName}"> <#if column.formType = 'Input'> <#elseif column.formType = 'Textarea'> @@ -80,15 +80,15 @@ <#list columns as column> <#if column.columnShow> <#if (column.dictName)?? && (column.dictName)!=""> - + - <#elseif column.columnType != 'Timestamp'> - + <#elseif column.columnType != 'Date'> + <#else> - + @@ -152,7 +152,7 @@ export default { <#list isNotNullColumns as column> <#if column.istNotNull> ${column.changeColumnName}: [ - { required: true, message: '<#if column.remark != ''>${column.remark}不能为空', trigger: 'blur' } + { required: true, message: '<#if column.remark?has_content>${column.remark}不能为空', trigger: 'blur' } ]<#if column_has_next>, @@ -162,7 +162,7 @@ export default { <#if queryColumns??> <#list queryColumns as column> <#if column.queryType != 'BetWeen'> - { key: '${column.changeColumnName}', display_name: '<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}' }<#if column_has_next>, + { key: '${column.changeColumnName}', display_name: '<#if column.remark?has_content>${column.remark}<#else>${column.changeColumnName}' }<#if column_has_next>, From 537295a272225365fd71bd3fa37d19756074a102 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sun, 28 Apr 2024 08:53:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=8F=AA=E5=81=9A=E6=8B=94=E8=BD=B4?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E7=BA=B8=E7=AE=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index db4dd7d88..d9faaa19e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -296,6 +296,12 @@ public class AutoCallAirShaftTask { param.put("point_code2", empty.getPoint_code()); param.put("vehicle_code", qzzNo); param.put("qzz_no", qzzNo); + // 当前纸管信息 + SlitterTaskUtil.putCurrentPaperSpec(param, list); + // 套管数量 + param.put("casingCount", 0); + // 拔管数量 + param.put("pullCount", list.size()); // hint: 当前分切计划的气涨轴尺寸 param.put("qzz_size", plan.getQzz_size()); param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>穿拔轴位")); From 819e8948a05633b32ea6d9b96ed5d773794dae4d Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 29 Apr 2024 08:43:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?rev:=20=E5=88=86=E5=88=87=E5=91=BC=E5=8F=AB?= =?UTF-8?q?=E5=A5=97=E8=BD=B4=E4=B8=8D=E5=8C=BA=E5=88=86=E9=94=82=E7=94=B5?= =?UTF-8?q?=E6=A0=87=E7=AE=94=EF=BC=8C=E5=8F=AA=E5=8C=BA=E5=88=86=E6=B0=94?= =?UTF-8?q?=E8=83=80=E8=BD=B4=E5=B0=BA=E5=AF=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IBstIvtCutpointivtService.java | 7 +- .../service/dao/BstIvtCutpointivt.java | 6 ++ .../dao/mapper/BstIvtCutpointivtMapper.java | 4 +- .../dao/mapper/BstIvtCutpointivtMapper.xml | 13 ++- .../impl/BstIvtCutpointivtServiceImpl.java | 8 +- .../service/IBstIvtShafttubeivtService.java | 4 +- .../service/dao/BstIvtShafttubeivt.java | 3 + .../dao/mapper/BstIvtShafttubeivtMapper.java | 14 ++- .../dao/mapper/BstIvtShafttubeivtMapper.xml | 13 +-- .../impl/BstIvtShafttubeivtServiceImpl.java | 4 +- .../IPdmBiSlittingproductionplanService.java | 3 +- .../PdmBiSlittingproductionplanMapper.java | 2 +- .../PdmBiSlittingproductionplanMapper.xml | 7 +- ...dmBiSlittingproductionplanServiceImpl.java | 4 +- .../slitter/auto/AutoCallAirShaftTask.java | 97 ++++++++++--------- .../mapper/dto/SlitterPlanDistinctDto.java | 8 ++ .../service/impl/SlitterServiceImpl.java | 1 + .../tasks/slitter/util/SlitterTaskUtil.java | 4 +- .../b_lms/bst/ivt/shafttubeivt/index.vue | 2 +- 19 files changed, 121 insertions(+), 83 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java index 627ee5158..baf9cb4fb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java @@ -57,10 +57,10 @@ public interface IBstIvtCutpointivtService extends IService { * 获取同尺寸的气涨轴 * @param type 点位类型：1套轴对接位，2分切缓存位，3分切对接位 * @param size 气涨轴尺寸 - * @param area 区域（0上1下） + * @param generation 代数（4：小，5：大） * @return / */ - List getPointByTypeAndShaftSize(String type, String size, String area); + List getPointByTypeAndShaftSize(String type, String size, String generation); /** * 根据桁架对应的点位编码获取点位实体 @@ -80,8 +80,7 @@ public interface IBstIvtCutpointivtService extends IService { /** * 获取类型1状态3，没任务的点位 * @param location 区域：0上1下 - * @param area：区域：B1 B2 B3 B4 * @return */ - List getAreaNotTaskPointByLocationAreaAndStatus(String location, String area); + List getAreaNotTaskPointByLocationAreaAndStatus(String location); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/BstIvtCutpointivt.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/BstIvtCutpointivt.java index d7eee30a1..68beb862a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/BstIvtCutpointivt.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/BstIvtCutpointivt.java @@ -1,6 +1,7 @@ package org.nl.b_lms.bst.ivt.cutpointivt.service.dao; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -84,4 +85,9 @@ public class BstIvtCutpointivt implements Serializable { private String point_status; + @TableField(exist = false) + private String qzz_generation; + @TableField(exist = false) + private String qzz_size; + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java index 4f4fa50aa..f1c122218 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java @@ -13,7 +13,7 @@ public interface BstIvtCutpointivtMapper extends BaseMapper { List getAreaNotTaskPointByStatus(String type, String pointStatus, String area, String sort); - List getPointByTypeAndShaftSize(String type, String size, String area); + List getPointByTypeAndShaftSize(String type, String size, String generation); - List getAreaNotTaskPointByLocationAreaAndStatus(String location, String area); + List getAreaNotTaskPointByLocationAreaAndStatus(String location); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml index 850de5f8c..e6be015bf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml @@ -29,11 +29,14 @@ resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt"> SELECT bc.* FROM `bst_ivt_cutpointivt` bc - LEFT JOIN pdm_bi_slittingproductionplan pp ON pp.qzzno = bc.qzz_no1 - OR pp.qzzno = bc.qzz_no2 + LEFT JOIN pdm_bi_slittingproductionplan pp ON pp.qzzno = bc.qzz_no1 + OR pp.qzzno = bc.qzz_no2 + LEFT JOIN st_ivt_cutpointivt sc ON sc.ext_code = pp.resource_name WHERE bc.point_type = #{type} AND pp.qzz_size = #{size} - AND LEFT(pp.resource_name, 2) = #{area} + + AND sc.qzz_generation = #{generation} + AND bc.is_used = '1' AND bc.point_status = '3' AND 0 = (SELECT COUNT(*) @@ -43,9 +46,10 @@ diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java index 357c4bdf2..b774b79c8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java @@ -94,8 +94,8 @@ public class BstIvtCutpointivtServiceImpl extends ServiceImpl getPointByTypeAndShaftSize(String type, String size, String area) { - return bstIvtCutpointivtMapper.getPointByTypeAndShaftSize(type, size, area); + public List getPointByTypeAndShaftSize(String type, String size, String generation) { + return bstIvtCutpointivtMapper.getPointByTypeAndShaftSize(type, size, generation); } @Override @@ -115,7 +115,7 @@ public class BstIvtCutpointivtServiceImpl extends ServiceImpl getAreaNotTaskPointByLocationAreaAndStatus(String location, String area) { - return bstIvtCutpointivtMapper.getAreaNotTaskPointByLocationAreaAndStatus(location, area); + public List getAreaNotTaskPointByLocationAreaAndStatus(String location) { + return bstIvtCutpointivtMapper.getAreaNotTaskPointByLocationAreaAndStatus(location); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java index 27cc5651d..f0ab9b2b9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java @@ -63,11 +63,11 @@ public interface IBstIvtShafttubeivtService extends IService /** * 获得气胀轴库对应的气涨轴位置 * @param qzzSize 气涨轴尺寸 - * @param specification 标箔、锂电 + * @param pointCode 对应的穿拔轴机 * @param location 位置：上半部分还是下半部分 * @return */ - List getByQzzSize(String qzzSize, String specification, String location); + List getByQzzSize(String qzzSize, String pointCode, String location); /** * 获取没任务的气涨轴缓存位 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/BstIvtShafttubeivt.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/BstIvtShafttubeivt.java index cbc76de73..cf8c8f38f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/BstIvtShafttubeivt.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/BstIvtShafttubeivt.java @@ -92,4 +92,7 @@ public class BstIvtShafttubeivt implements Serializable { /** 规划 */ private String plan; + /** 关联点位 */ + private String parent_code; + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java index 5880ecb9b..b81ce3553 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java @@ -13,9 +13,21 @@ public interface BstIvtShafttubeivtMapper extends BaseMapper List getAllShaftPointsByConditions(String type, String location, String have); - List getByQzzSize(String qzzSize, String specification, String location); + List getByQzzSize(String qzzSize, String pointCode, String location); + /** + * 获取含有气胀轴的气胀轴暂存位 + * @param qzzSize 气胀轴尺寸 + * @param specification 标箔/锂电 + * @param location 位置（上下） + * @return / + */ List getNotTaskShaftCache(String qzzSize, String specification, String location); + /** + * 获取空气胀轴的气胀轴暂存位 + * @param startPoint 点位信息（包含：尺寸、类型、位置） + * @return / + */ List getNotTaskShaftCacheEmpty(BstIvtShafttubeivt startPoint); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml index 13d272a00..e24dfa711 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml @@ -14,12 +14,13 @@ )