From 5963172f131dc13ae0b1eb8b8bfa32f40f37900e Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 5 May 2023 18:41:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8D=A2=E9=A9=BC=E5=B3=B0=E4=B8=BA?= =?UTF-8?q?=E4=B8=8B=E5=88=92=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/common/domain/query/BaseQuery.java | 6 +- .../org/nl/modules/common/base/BaseDTO.java | 14 +- .../org/nl/modules/common/utils/GenUtil.java | 86 +++++---- .../nl/modules/system/domain/vo/DeptVo.java | 22 +-- .../modules/system/service/dto/DeptTree.java | 2 +- .../system/service/impl/DeptServiceImpl.java | 10 +- .../system/service/impl/MenuServiceImpl.java | 20 +- .../controller/dept/DeptController.java | 8 +- .../controller/dict/SysDictController.java | 1 - .../generator/CodeGenConfigController.java | 2 +- .../controller/menu/SysMenuController.java | 2 +- .../quartz/SysQuartzJobController.java | 2 +- .../controller/user/UserController.java | 8 +- .../service/coderule/dao/SysCodeRule.java | 16 +- .../coderule/dao/SysCodeRuleDetail.java | 28 +-- .../impl/SysCodeRuleDetailServiceImpl.java | 24 ++- .../coderule/impl/SysCodeRuleServiceImpl.java | 52 +++--- .../nl/system/service/dept/dao/SysDept.java | 22 +-- .../system/service/dept/dao/SysUserDept.java | 4 +- .../nl/system/service/dept/dto/DeptQuery.java | 6 +- .../service/dept/impl/SysDeptServiceImpl.java | 26 +-- .../org/nl/system/service/dict/dao/Dict.java | 19 +- .../nl/system/service/dict/dto/DictQuery.java | 4 +- .../service/dict/impl/SysDictServiceImpl.java | 66 +++---- .../generator/dao/CodeColumnConfig.java | 24 +-- .../service/generator/dao/CodeGenConfig.java | 15 +- .../dao/mapper/CodeColumnConfigMapper.xml | 8 +- .../service/generator/dto/ColumnInfo.java | 20 +- .../service/generator/dto/TablesInfo.java | 4 +- .../impl/CodeGenConfigServiceImpl.java | 11 +- .../impl/CodeGeneratorServiceImpl.java | 38 ++-- .../nl/system/service/menu/dao/SysMenu.java | 22 +-- .../nl/system/service/menu/dto/MenuDto.java | 22 +-- .../nl/system/service/menu/dto/MenuQuery.java | 3 +- .../service/menu/impl/SysMenuServiceImpl.java | 68 +++---- .../nl/system/service/param/dao/Param.java | 16 +- .../param/impl/SysParamServiceImpl.java | 26 +-- .../permission/dao/SysDataPermission.java | 21 +-- .../service/permission/dao/SysDataScope.java | 8 +- .../impl/SysDataPermissionServiceImpl.java | 52 +++--- .../service/quartz/dao/SysQuartzJob.java | 30 +-- .../service/quartz/dao/SysQuartzLog.java | 16 +- .../system/service/quartz/dto/JobQuery.java | 9 +- .../quartz/impl/SysQuartzJobServiceImpl.java | 50 +++-- .../service/quartz/utils/ExecutionJob.java | 32 ++-- .../service/quartz/utils/QuartzManage.java | 26 +-- .../nl/system/service/role/dao/SysRole.java | 20 +- .../service/role/impl/SysRoleServiceImpl.java | 26 +-- .../secutiry/impl/OnlineUserService.java | 8 +- .../service/tools/dao/ToolLocalStorage.java | 16 +- .../impl/ToolLocalStorageServiceImpl.java | 27 ++- .../nl/system/service/user/dao/SysUser.java | 33 ++-- .../service/user/dao/mapper/SysUserMapper.xml | 60 +++--- .../user/dto/UserDataPermissionDto.java | 6 +- .../nl/system/service/user/dto/UserQuery.java | 4 +- .../user/impl/ISysUserServiceImpl.java | 30 +-- .../controller/MdBaseMaterialController.java} | 38 ++-- .../service/IMdBaseMaterialService.java} | 16 +- .../material/service/dao/MdBaseMaterial.java} | 40 ++-- .../dao/mapper/MdBaseMaterialMapper.java | 12 ++ .../dao/mapper/MdBaseMaterialMapper.xml} | 2 +- .../service/dto/MdBaseMaterialDto.java | 65 +++++++ .../service/dto/MdBaseMaterialQuery.java | 12 ++ .../impl/MdBaseMaterialServiceImpl.java | 80 ++++++++ .../controller/MdBaseWorkshopController.java} | 48 ++--- .../service/IMdBaseWorkshopService.java} | 23 +-- .../workshop/service/dao/MdBaseWorkshop.java} | 28 ++- .../dao/mapper/MdBaseWorkshopMapper.java | 12 ++ .../dao/mapper/MdBaseWorkshopMapper.xml} | 2 +- .../service/dto/MdBaseWorkshopDto.java | 46 +++++ .../service/dto/MdBaseWorkshopQuery.java | 12 ++ .../impl/MdBaseWorkshopServiceImpl.java | 80 ++++++++ .../basedata/dao/mapper/MaterialMapper.java | 12 -- .../basedata/dao/mapper/WorkshopMapper.java | 12 -- .../wms/service/basedata/dto/MaterialDto.java | 66 ------- .../service/basedata/dto/MaterialQuery.java | 12 -- .../wms/service/basedata/dto/WorkshopDto.java | 47 ----- .../service/basedata/dto/WorkshopQuery.java | 12 -- .../basedata/impl/MaterialServiceImpl.java | 91 --------- .../basedata/impl/WorkshopServiceImpl.java | 89 --------- .../main/resources/config/application-dev.yml | 8 +- .../src/main/resources/config/application.yml | 2 +- .../template/generator/admin/Controller.ftl | 12 +- .../template/generator/admin/Dto.ftl | 4 +- .../template/generator/admin/Entity.ftl | 2 +- .../template/generator/admin/Mapper.ftl | 4 +- .../template/generator/admin/MySQLMapper.ftl | 2 +- .../generator/admin/QueryCriteria.ftl | 4 +- .../template/generator/admin/Service.ftl | 4 +- .../template/generator/admin/ServiceImpl.ftl | 37 ++-- .../template/generator/front/index.ftl | 16 +- nladmin-ui/src/layout/components/Navbar.vue | 2 +- nladmin-ui/src/store/modules/user.js | 4 +- nladmin-ui/src/views/generator/config.vue | 50 ++--- nladmin-ui/src/views/generator/index.vue | 26 +-- .../src/views/system/dataPermission/index.vue | 22 +-- nladmin-ui/src/views/system/dept/index.vue | 50 ++--- .../src/views/system/dict/dictDetail.vue | 16 +- nladmin-ui/src/views/system/dict/index.vue | 48 ++++- nladmin-ui/src/views/system/menu/dd/index.vue | 34 ++-- nladmin-ui/src/views/system/menu/index.vue | 53 +++--- nladmin-ui/src/views/system/param/index.vue | 6 +- nladmin-ui/src/views/system/role/index.vue | 20 +- nladmin-ui/src/views/system/timing/index.vue | 157 +++++++++++----- nladmin-ui/src/views/system/timing/log.vue | 22 +-- nladmin-ui/src/views/system/user/index.vue | 85 ++++----- .../src/views/wms/basedata/material/index.vue | 175 +++++------------- .../{material.js => mdBaseMaterial.js} | 6 +- .../src/views/wms/basedata/workshop/index.vue | 107 ++++------- .../{workshop.js => mdBaseWorkshop.js} | 15 +- 110 files changed, 1488 insertions(+), 1563 deletions(-) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/{controller/basedata/MaterialController.java => database/material/controller/MdBaseMaterialController.java} (60%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/{service/basedata/IMaterialService.java => database/material/service/IMdBaseMaterialService.java} (58%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/{service/basedata/dao/Material.java => database/material/service/dao/MdBaseMaterial.java} (68%) create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/{service/basedata/dao/mapper/MaterialMapper.xml => database/material/service/dao/mapper/MdBaseMaterialMapper.xml} (63%) create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialDto.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/{controller/basedata/WorkshopController.java => database/workshop/controller/MdBaseWorkshopController.java} (53%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/{service/basedata/IWorkshopService.java => database/workshop/service/IMdBaseWorkshopService.java} (55%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/{service/basedata/dao/Workshop.java => database/workshop/service/dao/MdBaseWorkshop.java} (71%) create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.java rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/{service/basedata/dao/mapper/WorkshopMapper.xml => database/workshop/service/dao/mapper/MdBaseWorkshopMapper.xml} (63%) create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopDto.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopQuery.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/MaterialMapper.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/WorkshopMapper.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/MaterialDto.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/MaterialQuery.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/WorkshopDto.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/WorkshopQuery.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/impl/MaterialServiceImpl.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/impl/WorkshopServiceImpl.java rename nladmin-ui/src/views/wms/basedata/material/{material.js => mdBaseMaterial.js} (77%) rename nladmin-ui/src/views/wms/basedata/workshop/{workshop.js => mdBaseWorkshop.js} (55%) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java index a621661..adf573a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java @@ -27,12 +27,12 @@ public class BaseQuery { /** * 是否启用 */ - private Boolean isUsed; + private Boolean is_used; /** * 创建时间范围查询 */ - private Date startTime; - private Date endTime; + private Date start_time; + private Date end_time; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java index bce5112..d7e42c8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java @@ -2,12 +2,10 @@ package org.nl.modules.common.base; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.Date; -import java.util.Date; /** * @author Zheng Jie @@ -16,20 +14,20 @@ import java.util.Date; @Data public class BaseDTO implements Serializable { - private String createName; + private String create_name; - private String createId; + private String create_id; - private String updateName; + private String update_name; - private String updateId; + private String update_id; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + private Date create_time; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; + private Date update_time; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/GenUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/GenUtil.java index 263c46d..3a53276 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/GenUtil.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/GenUtil.java @@ -98,45 +98,42 @@ public class GenUtil { * 定义后端文件路径以及名称 */ private static String getAdminFilePath(String templateName, CodeGenConfig genConfig, String className, String rootPath) { - String projectPath = rootPath + File.separator + "nlsso-server" + File.separator; - String packagePath = projectPath + "src" + File.separator + "main" - + File.separator + "java" + File.separator + "org" - + File.separator + "nl" + File.separator + genConfig.getModuleName() + File.separator; - String packageName = null; + 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())) { - packageName = genConfig.getPack().replace(".", File.separator); + packagePath += genConfig.getPack().replace(".", File.separator) + File.separator; } if ("Entity".equals(templateName)) { - return packagePath + "service" + File.separator + packageName + File.separator + "dao" + File.separator + className + ".java"; + return packagePath + "service" + File.separator + "dao" + File.separator + className + ".java"; } if ("Controller".equals(templateName)) { - return packagePath + "controller" + File.separator + packageName + File.separator + className + "Controller.java"; + return packagePath + "controller" + File.separator + className + "Controller.java"; } if ("Service".equals(templateName)) { - return packagePath + "service" + File.separator + packageName + File.separator + "I" + className + "Service.java"; + return packagePath + "service" + File.separator + "I" + className + "Service.java"; } if ("ServiceImpl".equals(templateName)) { - return packagePath + "service" + File.separator + packageName + File.separator + "impl" + File.separator + className + "ServiceImpl.java"; + return packagePath + "service" + File.separator + "impl" + File.separator + className + "ServiceImpl.java"; } if ("Dto".equals(templateName)) { - return packagePath + "service" + File.separator + packageName + File.separator + "dto" + File.separator + className + "Dto.java"; + return packagePath + "service" + File.separator + "dto" + File.separator + className + "Dto.java"; } if ("QueryCriteria".equals(templateName)) { - return packagePath + "service" + File.separator + packageName + File.separator + "dto" + File.separator + className + "Query.java"; + return packagePath + "service" + File.separator + "dto" + File.separator + className + "Query.java"; } if ("Mapper".equals(templateName)) { - return packagePath + "service" + File.separator + packageName + File.separator + "dao" + File.separator + "mapper" + File.separator + className + "Mapper.java"; + return packagePath + "service" + File.separator + "dao" + File.separator + "mapper" + File.separator + className + "Mapper.java"; } if ("MySQLMapper".equals(templateName)) { - return packagePath + "service" + File.separator + packageName + File.separator + "dao" + File.separator + "mapper" + File.separator + className + "Mapper.xml"; + return packagePath + "service" + File.separator + "dao" + File.separator + "mapper" + File.separator + className + "Mapper.xml"; } return null; @@ -163,25 +160,25 @@ public class GenUtil { // 存储模版字段数据 Map genMap = new HashMap<>(16); // 接口别名 - genMap.put("apiAlias", genConfig.getApiAlias()); + genMap.put("apiAlias", genConfig.getApi_alias()); // 包名称 genMap.put("package", genConfig.getPack()); // 模块名称 - genMap.put("moduleName", genConfig.getModuleName()); + genMap.put("moduleName", genConfig.getModule_name()); // 作者 genMap.put("author", genConfig.getAuthor()); // 创建日期 genMap.put("date", LocalDate.now().toString()); // 表名 - genMap.put("tableName", genConfig.getTableName()); + genMap.put("tableName", genConfig.getTable_name()); // 大写开头的类名 - String className = StringUtils.toCapitalizeCamelCase(genConfig.getTableName()); + String className = StringUtils.toCapitalizeCamelCase(genConfig.getTable_name()); // 小写开头的类名 - String changeClassName = StringUtils.toCamelCase(genConfig.getTableName()); + String changeClassName = StringUtils.toCamelCase(genConfig.getTable_name()); // 判断是否去除表前缀 if (StrUtil.isNotEmpty(genConfig.getPrefix())) { - className = StringUtils.toCapitalizeCamelCase(StrUtil.removePrefix(genConfig.getTableName(), genConfig.getPrefix())); - changeClassName = StringUtils.toCamelCase(StrUtil.removePrefix(genConfig.getTableName(), genConfig.getPrefix())); + className = StringUtils.toCapitalizeCamelCase(StrUtil.removePrefix(genConfig.getTable_name(), genConfig.getPrefix())); + changeClassName = StringUtils.toCamelCase(StrUtil.removePrefix(genConfig.getTable_name(), genConfig.getPrefix())); } // 保存类名 genMap.put("className", className); // 驼峰命名 @@ -222,14 +219,15 @@ public class GenUtil { // 字段描述 listMap.put("remark", column.getRemark()); // 字段类型 - listMap.put("columnKey", column.getKeyType()); + listMap.put("columnKey", column.getKey_type()); // 主键类型 - String colType = ColUtil.cloToJava(column.getColumnType()); + String colType = ColUtil.cloToJava(column.getColumn_type()); // 小写开头的字段名 - 转驼峰 - String changeColumnName = StringUtils.toCamelCase(column.getColumnName()); +// String changeColumnName = StringUtils.toCamelCase(column.getColumnName()); + String changeColumnName = column.getColumn_name(); // 大写开头的字段名 - String capitalColumnName = StringUtils.toCapitalizeCamelCase(column.getColumnName()); - if (PK.equals(column.getKeyType())) { // 如果是主键 + String capitalColumnName = StringUtils.toCapitalizeCamelCase(column.getColumn_name()); + if (PK.equals(column.getKey_type())) { // 如果是主键 genMap.put("hasPk", true); // 存储主键类型 genMap.put("pkColumnType", colType); @@ -251,42 +249,42 @@ public class GenUtil { genMap.put("auto", true); } // 主键存在字典 - if (StrUtil.isNotEmpty(column.getDictName())) { + if (StrUtil.isNotEmpty(column.getDict_name())) { genMap.put("hasDict", true); - dicts.add(column.getDictName()); + dicts.add(column.getDict_name()); } // 存储字段类型 listMap.put("columnType", colType); // 存储字原始段名称 - listMap.put("columnName", column.getColumnName()); + listMap.put("columnName", column.getColumn_name()); // 不为空 - listMap.put("istNotNull", column.getNotNull()); + listMap.put("istNotNull", column.getNot_null()); // 字段列表显示 - listMap.put("columnShow", column.getListShow()); + listMap.put("columnShow", column.getList_show()); // 表单显示 - listMap.put("formShow", column.getFormShow()); + listMap.put("formShow", column.getForm_show()); // 表单组件类型 - listMap.put("formType", StrUtil.isNotEmpty(column.getFormType()) ? column.getFormType() : "Input"); - // 小写开头的字段名称 驼峰转换 + listMap.put("formType", StrUtil.isNotEmpty(column.getForm_type()) ? column.getForm_type() : "Input"); + // 小写开头的字段名称 listMap.put("changeColumnName", changeColumnName); - //大写开头的字段名称 驼峰转换 + //大写开头的字段名称 listMap.put("capitalColumnName", capitalColumnName); // 字典名称 - listMap.put("dictName", column.getDictName()); + listMap.put("dictName", column.getDict_name()); // 日期注解 - listMap.put("dateAnnotation", column.getDateAnnotation()); - if (StrUtil.isNotEmpty(column.getDateAnnotation())) { + listMap.put("dateAnnotation", column.getDate_annotation()); + if (StrUtil.isNotEmpty(column.getDate_annotation())) { genMap.put("hasDateAnnotation", true); } // 添加非空字段信息 - if (column.getNotNull()) { + if (column.getNot_null()) { isNotNullColumns.add(listMap); } // 判断是否有查询，如有则把查询的字段set进columnQuery - if (!StrUtil.isEmpty(column.getQueryType())) { + if (!StrUtil.isEmpty(column.getQuery_type())) { // 查询类型 - listMap.put("queryType", column.getQueryType()); + listMap.put("queryType", column.getQuery_type()); // 是否存在查询 genMap.put("hasQuery", true); if (TIMESTAMP.equals(colType)) { @@ -297,7 +295,7 @@ public class GenUtil { // 查询中存储 BigDecimal 类型 genMap.put("queryHasBigDecimal", true); } - if ("between".equalsIgnoreCase(column.getQueryType())) { + if ("between".equalsIgnoreCase(column.getQuery_type())) { betweens.add(listMap); } else { // 添加到查询列表中 @@ -330,7 +328,7 @@ public class GenUtil { public static String download(List columns, CodeGenConfig genConfig) throws IOException { // 拼接的路径：/tmpnladmin-gen-temp/，这个路径在Linux下需要root用户才有权限创建,非root用户会权限错误而失败，更改为： /tmp/nladmin-gen-temp/ // String tempPath =SYS_TEM_DIR + "nladmin-gen-temp" + File.separator + genConfig.getTableName() + File.separator; - String tempPath = SYS_TEM_DIR + "nladmin-gen-temp" + File.separator + genConfig.getTableName() + File.separator; + String tempPath = SYS_TEM_DIR + "nladmin-gen-temp" + File.separator + genConfig.getTable_name() + File.separator; Map genMap = getGenMap(columns, genConfig); TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH)); // 生成后端代码 @@ -419,7 +417,7 @@ public class GenUtil { templates = getFrontTemplateNames(); for (String templateName : templates) { Template template = engine.getTemplate("generator/front/" + templateName + ".ftl"); - String filePath = getFrontFilePath(templateName, genConfig.getApiPath(), genConfig.getPath(), genMap.get("changeClassName").toString()); + String filePath = getFrontFilePath(templateName, genConfig.getApi_path(), genConfig.getPath(), genMap.get("changeClassName").toString()); assert filePath != null; File file = new File(filePath); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/vo/DeptVo.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/vo/DeptVo.java index ec76c59..3ebd264 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/vo/DeptVo.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/vo/DeptVo.java @@ -15,7 +15,6 @@ */ package org.nl.modules.system.domain.vo; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @@ -24,7 +23,6 @@ import org.nl.modules.common.base.BaseDTO; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -36,15 +34,15 @@ import java.util.List; public class DeptVo extends BaseDTO implements Serializable { - private String deptId; + private String dept_id; private String code; - private String extId; + private String ext_id; @ApiModelProperty(value = "排序") - private Integer deptSort; + private Integer dept_sort; @NotBlank @@ -53,22 +51,22 @@ public class DeptVo extends BaseDTO implements Serializable { @NotNull @ApiModelProperty(value = "是否启用") - private Boolean isUsed; + private Boolean is_used; @ApiModelProperty(value = "上级部门") private Long pid; @ApiModelProperty(value = "子节点数目", hidden = true) - private Integer subCount = 0; + private Integer sub_count = 0; //前端显示 - private Boolean hasChildren =Boolean.FALSE; + private Boolean has_children =Boolean.FALSE; private List children; - public void setSubCount(Integer subCount) { - this.subCount = subCount; - if (subCount>0){ - this.hasChildren=Boolean.TRUE; + public void setSub_count(Integer sub_count) { + this.sub_count = sub_count; + if (sub_count >0){ + this.has_children =Boolean.TRUE; } } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DeptTree.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DeptTree.java index ead4e7a..4772b35 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DeptTree.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DeptTree.java @@ -30,7 +30,7 @@ import java.util.List; @Setter public class DeptTree implements Serializable { - private String deptId; + private String dept_id; private String pid; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java index 975faff..24632f8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java @@ -128,10 +128,10 @@ public class DeptServiceImpl implements DeptService { CurrentUser user = SecurityUtils.getCurrentUser(); dept.setSub_count(0); dept.setCode(UUID.randomUUID().toString()); - dept.setCreateTime(new Date()); - dept.setUpdateTime(new Date()); - dept.setCreateId(user.getId()); - dept.setCreateName(user.getUsername()); + dept.setCreate_time(new Date()); + dept.setUpdate_time(new Date()); + dept.setCreate_id(user.getId()); + dept.setCreate_name(user.getUsername()); WQLObject.getWQLObject("sys_dept").insert(JSONObject.parseObject(JSON.toJSONString(dept))); // 清理缓存 @@ -213,7 +213,7 @@ public class DeptServiceImpl implements DeptService { trees.add(deptDTO); } for (DeptTree it : deptDtos) { - if (it.getPid() != null && deptDTO.getDeptId().equals(it.getPid())) { + if (it.getPid() != null && deptDTO.getDept_id().equals(it.getPid())) { isChild = true; if (deptDTO.getChildren() == null) { deptDTO.setChildren(new ArrayList<>()); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java index 4d2bd0b..d40c9b0 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java @@ -68,30 +68,30 @@ public class MenuServiceImpl implements MenuService { @Override public MenuDto menuJsonToMenuDto(JSONObject json) { MenuDto menuDto = new MenuDto(); - menuDto.setMenuId(json.getString("menu_id")); + menuDto.setMenu_id(json.getString("menu_id")); menuDto.setType(json.getString("type")); menuDto.setPermission(json.getString("permission")); menuDto.setTitle(json.getString("title")); - menuDto.setMenuSort(json.getInteger("menu_sort")); + menuDto.setMenu_sort(json.getInteger("menu_sort")); menuDto.setPath(json.getString("path")); menuDto.setComponent(json.getString("component")); menuDto.setPid(json.getString("pid")); menuDto.setIcon(json.getString("icon")); - menuDto.setSubCount(json.getInteger("sub_count")); + menuDto.setSub_count(json.getInteger("sub_count")); menuDto.setIframe("1".equals(json.getString("i_frame"))); menuDto.setCache("1".equals(json.getString("cache"))); menuDto.setHidden("1".equals(json.getString("hidden"))); - menuDto.setComponentName(json.getString("component_name")); + menuDto.setComponent_name(json.getString("component_name")); //构建前端需要的数据结构树 Integer sub_count = json.getInteger("sub_count"); if (sub_count <= 0) { menuDto.setLeaf(true); - menuDto.setHasChildren(false); + menuDto.setHas_children(false); } else { menuDto.setLeaf(false); - menuDto.setHasChildren(true); + menuDto.setHas_children(true); } return menuDto; @@ -193,7 +193,7 @@ public class MenuServiceImpl implements MenuService { WQLObject menuTab = WQLObject.getWQLObject("sys_menu"); MenuDto newMenu = this.menuJsonToMenuDto(form); - if (newMenu.getMenuId().equals(newMenu.getPid())) { + if (newMenu.getMenu_id().equals(newMenu.getPid())) { throw new BadRequestException("上级不能为自己"); } @@ -299,7 +299,7 @@ public class MenuServiceImpl implements MenuService { trees.add(menuDTO); } for (MenuDto it : menuDtos) { - if (menuDTO.getMenuId().equals(it.getPid())) { + if (menuDTO.getMenu_id().equals(it.getPid())) { if (menuDTO.getChildren() == null) { menuDTO.setChildren(new ArrayList<>()); } @@ -309,7 +309,7 @@ public class MenuServiceImpl implements MenuService { } } if (trees.size() == 0) { - trees = menuDtos.stream().filter(s -> !ids.contains(s.getMenuId())).collect(Collectors.toList()); + trees = menuDtos.stream().filter(s -> !ids.contains(s.getMenu_id())).collect(Collectors.toList()); } return trees; } @@ -321,7 +321,7 @@ public class MenuServiceImpl implements MenuService { if (menuDTO != null) { List menuDtoList = menuDTO.getChildren(); MenuVo menuVo = new MenuVo(); - menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponentName()) ? menuDTO.getComponentName() : menuDTO.getTitle()); + menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getTitle()); // 一级目录需要加斜杠，不然会报警告 menuVo.setPath(ObjectUtil.isEmpty(menuDTO.getPid()) ? "/" + menuDTO.getPath() : menuDTO.getPath()); menuVo.setHidden(menuDTO.getHidden()); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java index 22aea2e..4eed267 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java @@ -80,7 +80,7 @@ public class DeptController { } return new ResponseEntity<>(deptService.getSuperior(ids),HttpStatus.OK); } -// + @Log("新增部门") @ApiOperation("新增部门") @PostMapping @@ -89,19 +89,19 @@ public class DeptController { deptService.createDept(resources); return new ResponseEntity<>(HttpStatus.CREATED); } -// + @Log("修改部门") @ApiOperation("修改部门") @PutMapping // @SaCheckPermission("dept:edit") public ResponseEntity update(@Validated @RequestBody SysDept dept){ - if (dept.getPid() != null && dept.getDeptId().equals(dept.getPid())) { + if (dept.getPid() != null && dept.getDept_id().equals(dept.getPid())) { throw new BadRequestException("上级不能为自己"); } deptService.updateDept(dept); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } -// + @Log("删除部门") @ApiOperation("删除部门") @DeleteMapping diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java index 8ae58e7..cdcf92c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java @@ -1,6 +1,5 @@ package org.nl.system.controller.dict; - import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java index 0657532..26297fc 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java @@ -37,7 +37,7 @@ public class CodeGenConfigController { @ApiOperation("修改") @PutMapping public ResponseEntity update(@Validated @RequestBody CodeGenConfig genConfig){ - return new ResponseEntity<>(genConfigService.update(genConfig.getTableName(), genConfig),HttpStatus.OK); + return new ResponseEntity<>(genConfigService.update(genConfig.getTable_name(), genConfig),HttpStatus.OK); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java index 6736be7..2af853b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java @@ -68,7 +68,7 @@ public class SysMenuController { List menuList = iSysMenuService.getMenus(id); menuSet.add(iSysMenuService.findById(id)); menuSet = iSysMenuService.getChildMenus(menuList, menuSet); - Set ids = menuSet.stream().map(SysMenu::getMenuId).collect(Collectors.toSet()); + Set ids = menuSet.stream().map(SysMenu::getMenu_id).collect(Collectors.toSet()); return new ResponseEntity<>(ids, HttpStatus.OK); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java index 51dc5c8..3a35b01 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java @@ -57,7 +57,7 @@ public class SysQuartzJobController { @PostMapping @SaCheckPermission("timing:add") public ResponseEntity create(@Validated @RequestBody SysQuartzJob resources) { - if (resources.getJobId() != null) { + if (resources.getJob_id() != null) { throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID"); } quartzJobService.createJob(resources); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java index 26d7f5a..ad08770 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java @@ -17,8 +17,6 @@ package org.nl.system.controller.user; import cn.dev33.satoken.secure.SaSecureUtil; import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import io.swagger.annotations.Api; @@ -31,19 +29,15 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.RsaUtils; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.logging.annotation.Log; -import org.nl.modules.tools.IdUtil; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; -import org.nl.system.service.user.dto.SysUserDetail; import org.nl.system.service.user.dto.UserQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.util.List; import java.util.Map; import java.util.Set; @@ -89,7 +83,7 @@ public class UserController { @ApiOperation("修改用户：个人中心") // @PutMapping(value = "center") public ResponseEntity center(@RequestBody SysUser resources){ - if(!resources.getUserId().equals(StpUtil.getLoginIdAsLong())){ + if(!resources.getUser_id().equals(StpUtil.getLoginIdAsLong())){ throw new BadRequestException("不能修改他人资料"); } userService.saveOrUpdate(resources); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRule.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRule.java index 809302f..3f2d00a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRule.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRule.java @@ -51,42 +51,42 @@ public class SysCodeRule implements Serializable { /** * 是否启用 */ - private String isActive; + private String is_active; /** * 是否删除 */ - private String isDelete; + private String is_delete; /** * 创建id */ - private String createId; + private String create_id; /** * 创建者 */ - private String createName; + private String create_name; /** * 创建时间 */ - private String createTime; + private String create_time; /** * 修改id */ - private String updateId; + private String update_id; /** * 修改者 */ - private String updateName; + private String update_name; /** * 修改时间 */ - private String updateTime; + private String update_time; @TableField(exist = false) private String demo; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRuleDetail.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRuleDetail.java index 7016de0..b85d88a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRuleDetail.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRuleDetail.java @@ -38,17 +38,17 @@ public class SysCodeRuleDetail implements Serializable { /** * 初始值 */ - private String initValue; + private String init_value; /** * 当前值 */ - private String currentValue; + private String current_value; /** * 允许最大值 */ - private String maxValue; + private String max_value; /** * 步长 @@ -73,7 +73,7 @@ public class SysCodeRuleDetail implements Serializable { /** * 排序号 */ - private BigDecimal sortNum; + private BigDecimal sort_num; /** * 备注 @@ -83,50 +83,50 @@ public class SysCodeRuleDetail implements Serializable { /** * 编码规则标识 */ - private String codeRuleId; + private String code_rule_id; /** * 是否启用 */ - private String isActive; + private String is_active; /** * 是否删除 */ - private String isDelete; + private String is_delete; /** * 创建id */ - private String createId; + private String create_id; /** * 创建者 */ - private String createName; + private String create_name; /** * 创建时间 */ - private String createTime; + private String create_time; /** * 修改id */ - private String updateId; + private String update_id; /** * 修改者 */ - private String updateName; + private String update_name; /** * 修改时间 */ - private String updateTime; + private String update_time; @TableField(exist = false) - private String dictName; + private String dict_name; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java index 7f4c41e..f804806 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java @@ -14,12 +14,10 @@ import org.nl.system.service.coderule.ISysCodeRuleDetailService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.system.service.coderule.dto.CodeRuleDetailQuery; import org.nl.system.service.coderule.utils.CodeRuleTypeEnum; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; -import java.util.Map; /** *

@@ -37,8 +35,8 @@ public class SysCodeRuleDetailServiceImpl extends ServiceImpl queryAll(CodeRuleDetailQuery form, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); - lam.eq(SysCodeRuleDetail::getCodeRuleId, form.getId()) - .orderByAsc(SysCodeRuleDetail::getSortNum); + lam.eq(SysCodeRuleDetail::getCode_rule_id, form.getId()) + .orderByAsc(SysCodeRuleDetail::getSort_num); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); codeRuleDetailMapper.selectPage(pages, lam); return pages; @@ -51,19 +49,19 @@ public class SysCodeRuleDetailServiceImpl extends ServiceImpl @@ -57,7 +55,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl().eq(SysCodeRule::getCode, code)).getId(); // 如果flag = 1就执行更新数据库的操作 String flag = (String) form.get("flag"); - List ruleDetails = codeRuleDetailMapper.selectList(new LambdaQueryWrapper().eq(SysCodeRuleDetail::getCodeRuleId, id)); + List ruleDetails = codeRuleDetailMapper.selectList(new LambdaQueryWrapper().eq(SysCodeRuleDetail::getCode_rule_id, id)); String demo = ""; boolean isSame = true; for(SysCodeRuleDetail detail : ruleDetails) { @@ -65,11 +63,11 @@ public class SysCodeRuleServiceImpl extends ServiceImpl maxValue) { - numValue = detail.getInitValue(); + Long maxValue = Long.valueOf(detail.getMax_value()); + if (!isSame && (Long.valueOf(detail.getCurrent_value()) + step) > maxValue) { + numValue = detail.getInit_value(); } else { - numValue = Integer.parseInt(detail.getCurrentValue()) + step + ""; + numValue = Integer.parseInt(detail.getCurrent_value()) + step + ""; } int size = numValue.length(); int length = detail.getLength(); @@ -101,18 +99,18 @@ public class SysCodeRuleServiceImpl extends ServiceImpl= maxValue) { - numCurr = Integer.parseInt(detail.getInitValue()); - detail.setCurrentValue(String.valueOf(numCurr)); + numCurr = Integer.parseInt(detail.getInit_value()); + detail.setCurrent_value(String.valueOf(numCurr)); }else{ - detail.setCurrentValue(String.valueOf(numCurr + step)); + detail.setCurrent_value(String.valueOf(numCurr + step)); } } } @@ -134,12 +132,12 @@ public class SysCodeRuleServiceImpl extends ServiceImpl sysCodeRules = codeRuleMapper.selectList(new LambdaQueryWrapper().eq(SysCodeRule::getCode, codeRule.getCode())); if (ObjectUtil.isNotEmpty(sysCodeRules)) throw new BadRequestException("编号[" + sysCodeRules.get(0).getCode() + "]已存在"); codeRule.setId(IdUtil.getSnowflake(1,1).nextIdStr()); - codeRule.setCreateId(currentUserId); - codeRule.setCreateName(currentUsername); - codeRule.setCreateTime(now); - codeRule.setUpdateId(currentUserId); - codeRule.setUpdateName(currentUsername); - codeRule.setUpdateTime(now); + codeRule.setCreate_id(currentUserId); + codeRule.setCreate_name(currentUsername); + codeRule.setCreate_time(now); + codeRule.setUpdate_id(currentUserId); + codeRule.setUpdate_name(currentUsername); + codeRule.setUpdate_time(now); codeRuleMapper.insert(codeRule); } @@ -148,7 +146,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl ids) { ids.forEach(id -> { codeRuleMapper.deleteById(id); - codeRuleDetailMapper.delete(new LambdaQueryWrapper().eq(SysCodeRuleDetail::getCodeRuleId, id)); + codeRuleDetailMapper.delete(new LambdaQueryWrapper().eq(SysCodeRuleDetail::getCode_rule_id, id)); }); } @@ -161,9 +159,9 @@ public class SysCodeRuleServiceImpl extends ServiceImpl { private Long pid; - private Boolean pidIsNull; + private Boolean pid_is_null; @Override public void paramMapping() { - super.doP.put("pidIsNull", QParam.builder().k(new String[]{"pid"}).type(QueryTEnum.NO).build()); - super.doP.put("deptIds", QParam.builder().k(new String[]{"deptId"}).type(QueryTEnum.IN).build()); + super.doP.put("pid_is_null", QParam.builder().k(new String[]{"pid"}).type(QueryTEnum.NO).build()); + super.doP.put("deptIds", QParam.builder().k(new String[]{"dept_id"}).type(QueryTEnum.IN).build()); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java index 8972c8b..6dde2f6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java @@ -62,7 +62,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl trees.add(deptDTO); } for (DeptTree it : deptDtos) { - if (it.getPid() != null && deptDTO.getDeptId().equals(it.getPid())) { + if (it.getPid() != null && deptDTO.getDept_id().equals(it.getPid())) { isChild = true; if (deptDTO.getChildren() == null) { deptDTO.setChildren(new ArrayList<>()); @@ -84,18 +84,18 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override public Page queryVo(DeptQuery query, PageQuery pageQuery) { - if (query.getPidIsNull() == null){ + if (query.getPid_is_null() == null){ if (query.getPid() == null){ - query.setPidIsNull(true); + query.setPid_is_null(true); } - if (StringUtils.isNotEmpty(query.getName()) || query.getIsUsed()!=null){ - query.setPidIsNull(null); + if (StringUtils.isNotEmpty(query.getName()) || query.getIs_used()!=null){ + query.setPid_is_null(null); } } Page page = this.page(pageQuery.build(SysDept.class), query.build()); page.setRecords(CopyUtil.copyList(page.getRecords(), DeptVo.class)); - if (StringUtils.isNotEmpty(query.getName()) || query.getIsUsed()!=null){ - page.getRecords().forEach(a->((DeptVo)a).setHasChildren(false) ); + if (StringUtils.isNotEmpty(query.getName()) || query.getIs_used()!=null){ + page.getRecords().forEach(a->((DeptVo)a).setHas_children(false) ); } return page; } @@ -117,12 +117,12 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public void updateDept(SysDept dept) { - if (dept == null ||StringUtils.isEmpty(dept.getDeptId())){ + if (dept == null ||StringUtils.isEmpty(dept.getDept_id())){ return; } this.updateById(dept); //删除节点信息 - sysDeptMapper.updateSubCount(dept.getDeptId()); + sysDeptMapper.updateSubCount(dept.getDept_id()); if (StringUtils.isNotEmpty(dept.getPid())){ sysDeptMapper.updateSubCount(dept.getPid()); } @@ -165,11 +165,11 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public void createDept(SysDept dept) { - dept.setDeptId(IdUtil.getStringId()); + dept.setDept_id(IdUtil.getStringId()); CurrentUser user = SecurityUtils.getCurrentUser(); - dept.setCreateId(user.getId()); - dept.setCreateName(user.getPresonName()); - dept.setCreateTime(new Date()); + dept.setCreate_id(user.getId()); + dept.setCreate_name(user.getPresonName()); + dept.setCreate_time(new Date()); this.save(dept); // 清理缓存 if (StringUtils.isNotEmpty(dept.getPid())){ diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java index 372e1bb..2010f30 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java @@ -2,7 +2,6 @@ package org.nl.system.service.dict.dao; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -28,7 +27,7 @@ public class Dict implements Serializable { * 字典标识 */ @TableId(value = "dict_id") - private String dictId; + private String dict_id; /** * 编码 @@ -53,12 +52,12 @@ public class Dict implements Serializable { /** * 排序号 */ - private BigDecimal dictSort; + private BigDecimal dict_sort; /** * 字典类型 */ - private String dictType; + private String dict_type; /** * 参数1 @@ -78,31 +77,31 @@ public class Dict implements Serializable { /** * 创建人 */ - private String createId; + private String create_id; /** * 创建人 */ - private String createName; + private String create_name; /** * 创建时间 */ - private String createTime; + private String create_time; /** * 修改人 */ - private String updateId; + private String update_id; /** * 修改人 */ - private String updateName; + private String update_name; /** * 修改时间 */ - private String updateTime; + private String update_time; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dto/DictQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dto/DictQuery.java index 3802779..c446f91 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dto/DictQuery.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dto/DictQuery.java @@ -13,6 +13,6 @@ import org.nl.system.service.dict.dao.Dict; public class DictQuery extends BaseQuery { private String code; - private String dictName; - private String dictId; + private String dict_name; + private String dict_id; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index 1a13ec0..c1ce6e8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -16,15 +16,12 @@ import org.nl.system.service.dict.ISysDictService; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; import org.nl.system.service.dict.dto.DictQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.function.Consumer; /** *

@@ -45,7 +42,7 @@ public class SysDictServiceImpl extends ServiceImpl impleme String blurry = null; if (ObjectUtil.isNotEmpty(whereJson.get("blurry"))) blurry = whereJson.get("blurry").toString(); IPage pages = this.page(new Page<>(page.getPage() + 1, page.getSize()), new QueryWrapper() - .select("MAX(dict_id) AS dictId, code, name") + .select("MAX(dict_id) AS dict_id, code, name") .lambda() .like(ObjectUtil.isNotEmpty(blurry), Dict::getCode, blurry) .or(ObjectUtil.isNotEmpty(blurry)) @@ -64,20 +61,23 @@ public class SysDictServiceImpl extends ServiceImpl impleme List oldDict = sysDictMapper.selectList(new LambdaQueryWrapper() .eq(ObjectUtil.isNotEmpty(dict.getCode()), Dict::getCode, dict.getCode())); if (ObjectUtil.isNotEmpty(oldDict)) throw new BadRequestException("字典[" + dict.getCode() + "]已存在"); - dict.setDictId(IdUtil.getSnowflake(1, 1).nextIdStr()); - dict.setCreateId(currentUserId); - dict.setCreateName(nickName); - dict.setCreateTime(date); - dict.setUpdateId(currentUserId); - dict.setUpdateName(nickName); - dict.setUpdateTime(date); + dict.setDict_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + dict.setCreate_id(currentUserId); + dict.setCreate_name(nickName); + dict.setCreate_time(date); + dict.setUpdate_id(currentUserId); + dict.setUpdate_name(nickName); + dict.setUpdate_time(date); sysDictMapper.insert(dict); } @Override @Transactional(rollbackFor = Exception.class) public void updateDict(Dict dto) { - Dict dict = sysDictMapper.selectById(dto.getDictId()); + Dict dict = sysDictMapper.selectById(dto.getDict_id()); + if (ObjectUtil.isEmpty(dict)) { + throw new BadRequestException("字典不存在"); + } List dictList = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getCode, dto.getCode())); if (ObjectUtil.isNotEmpty(dictList) && !dto.getCode().equals(dict.getCode())) throw new BadRequestException("字典[" + dto.getCode() + "]已存在"); @@ -88,9 +88,9 @@ public class SysDictServiceImpl extends ServiceImpl impleme dicts.forEach(di -> { di.setCode(dto.getCode()); di.setName(dto.getName()); - di.setUpdateId(currentUserId); - di.setUpdateName(currentNickName); - di.setUpdateTime(DateUtil.now()); + di.setUpdate_id(currentUserId); + di.setUpdate_name(currentNickName); + di.setUpdate_time(DateUtil.now()); sysDictMapper.updateById(di); }); } @@ -111,7 +111,7 @@ public class SysDictServiceImpl extends ServiceImpl impleme lam.eq(Dict::getCode, criteria.getCode()) .isNotNull(Dict::getLabel) .ne(Dict::getLabel, "") - .orderBy(true, true, Dict::getDictSort); + .orderBy(true, true, Dict::getDict_sort); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); sysDictMapper.selectPage(pages, lam); return pages; @@ -140,8 +140,8 @@ public class SysDictServiceImpl extends ServiceImpl impleme dic.setCode(dict.getCode()); dic.setLabel(dict.getLabel()); dic.setValue(dict.getValue()); - dic.setDictSort(dict.getDictSort()); - dic.setDictType(dict.getDictType()); + dic.setDict_sort(dict.getDict_sort()); + dic.setDict_type(dict.getDict_type()); dic.setPara1(dict.getPara1()); dic.setPara2(dict.getPara2()); dic.setPara3(dict.getPara3()); @@ -149,30 +149,34 @@ public class SysDictServiceImpl extends ServiceImpl impleme return; } // 插入新的数据 - dict.setDictId(IdUtil.getSnowflake(1, 1).nextIdStr()); + dict.setDict_id(IdUtil.getSnowflake(1, 1).nextIdStr()); dict.setCode(dic.getCode()); dict.setName(dic.getName()); - dict.setCreateId(SecurityUtils.getCurrentUserId()); - dict.setCreateName(SecurityUtils.getCurrentNickName()); - dict.setCreateTime(DateUtil.now()); - dict.setUpdateId(SecurityUtils.getCurrentUserId()); - dict.setUpdateName(SecurityUtils.getCurrentNickName()); - dict.setUpdateTime(DateUtil.now()); + dict.setCreate_id(SecurityUtils.getCurrentUserId()); + dict.setCreate_name(SecurityUtils.getCurrentNickName()); + dict.setCreate_time(DateUtil.now()); + dict.setUpdate_id(SecurityUtils.getCurrentUserId()); + dict.setUpdate_name(SecurityUtils.getCurrentNickName()); + dict.setUpdate_time(DateUtil.now()); sysDictMapper.insert(dict); } @Override @Transactional(rollbackFor = Exception.class) public void updateDetail(Dict resources) { - Dict dict = sysDictMapper.selectById(resources.getDictId()); - if (ObjectUtil.isEmpty(dict)) throw new BadRequestException("被删除或无权限，操作失败!"); + Dict dict = sysDictMapper.selectById(resources.getDict_id()); + if (ObjectUtil.isEmpty(dict)) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } // 校验是否已经有标签 List dictList = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getLabel, resources.getLabel()) .eq(Dict::getCode, resources.getCode())); - if (ObjectUtil.isNotEmpty(dictList) && !resources.getLabel().equals(dict.getLabel())) throw new BadRequestException("标签[" + dict.getLabel() + "]已存在"); - resources.setUpdateId(SecurityUtils.getCurrentUserId()); - resources.setUpdateName(SecurityUtils.getCurrentNickName()); - resources.setUpdateTime(DateUtil.now()); + if (ObjectUtil.isNotEmpty(dictList) && !resources.getLabel().equals(dict.getLabel())) { + throw new BadRequestException("标签[" + resources.getLabel() + "]已存在"); + } + resources.setUpdate_id(SecurityUtils.getCurrentUserId()); + resources.setUpdate_name(SecurityUtils.getCurrentNickName()); + resources.setUpdate_time(DateUtil.now()); sysDictMapper.updateById(resources); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java index 7f92402..f5427fc 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java @@ -30,19 +30,19 @@ public class CodeColumnConfig implements Serializable { * 标识 */ @TableId(value = "column_id", type = IdType.ASSIGN_ID) - private String columnId; + private String column_id; @ApiModelProperty(value = "表名") - private String tableName; + private String table_name; @ApiModelProperty(value = "数据库字段名称") - private String columnName; + private String column_name; @ApiModelProperty(value = "数据库字段类型") - private String columnType; + private String column_type; @ApiModelProperty(value = "数据库字段键类型") - private String keyType; + private String key_type; @ApiModelProperty(value = "字段额外的参数") private String extra; @@ -51,23 +51,23 @@ public class CodeColumnConfig implements Serializable { private String remark; @ApiModelProperty(value = "是否必填") - private Boolean notNull; + private Boolean not_null; @ApiModelProperty(value = "是否在列表显示") - private Boolean listShow; + private Boolean list_show; @ApiModelProperty(value = "是否表单显示") - private Boolean formShow; + private Boolean form_show; @ApiModelProperty(value = "表单类型") - private String formType; + private String form_type; @ApiModelProperty(value = "查询 1:模糊 2：精确") - private String queryType; + private String query_type; @ApiModelProperty(value = "字典名称") - private String dictName; + private String dict_name; @ApiModelProperty(value = "日期注解") - private String dateAnnotation; + private String date_annotation; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java index de60737..3d438c1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java @@ -1,6 +1,5 @@ package org.nl.system.service.generator.dao; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -24,20 +23,20 @@ public class CodeGenConfig implements Serializable { private static final long serialVersionUID = 1L; - public CodeGenConfig(String tableName) { - this.tableName = tableName; + public CodeGenConfig(String table_name) { + this.table_name = table_name; } /** * ID */ @TableId(value = "config_id") - private String configId; + private String config_id; /** * 表名 */ - private String tableName; + private String table_name; /** * 作者 @@ -52,7 +51,7 @@ public class CodeGenConfig implements Serializable { /** * 模块名称 */ - private String moduleName; + private String module_name; /** * 包名 @@ -67,7 +66,7 @@ public class CodeGenConfig implements Serializable { /** * api路径 */ - private String apiPath; + private String api_path; /** * 表前缀 @@ -77,7 +76,7 @@ public class CodeGenConfig implements Serializable { /** * 接口名称 */ - private String apiAlias; + private String api_alias; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.xml index 42cd78a..e35f1b8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.xml @@ -29,11 +29,11 @@ SELECT - ,sys_dept.dept_id as deptId - ,sys_dept.name as deptName - ,sys_users_roles.role_id as roleId + ,sys_dept.dept_id + ,sys_dept.name as dept_name + ,sys_users_roles.role_id FROM sys_user left join sys_user_dept on sys_user.user_id = sys_user_dept.user_id left join sys_users_roles on sys_users_roles.user_id = sys_user.user_id left join sys_dept on sys_user_dept.dept_id = sys_dept.dept_id - + and - sys_user.user_id in (select user_id from sys_user_dept where dept_id = #{query.deptId}) + sys_user.user_id in (select user_id from sys_user_dept where dept_id = #{query.dept_id}) - - and sys_user.is_used = #{query.isUsed} + + and sys_user.is_used = #{query.is_used} - + and and sys_user.create_time >= #{query.startTime} - - and #{query.endTime} >= sys_user.create_time + + and #{query.end_time} >= sys_user.create_time and (email like #{query.blurry} or username like #{query.blurry} or person_name like #{query.blurry}) @@ -110,7 +110,7 @@ and sys_user.is_used = #{query.isUsed} - and and sys_user.create_time >= #{query.startTime} + and sys_user.create_time >= #{query.startTime} and #{query.endTime} >= sys_user.create_time diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java index 8414405..d9fb570 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserDataPermissionDto.java @@ -17,11 +17,11 @@ import java.util.List; @EqualsAndHashCode(callSuper = false) @TableName("sys_user_data_permission") public class UserDataPermissionDto implements Serializable { - private String userId; + private String user_id; - private String permissionScopeType; + private String permission_scope_type; - private String permissionId; + private String permission_id; @TableField(exist = false) private List users; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java index 801df38..b344dfd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java @@ -13,10 +13,10 @@ import org.nl.system.service.user.dao.SysUser; @Data public class UserQuery extends BaseQuery { - private Long deptId; + private Long dept_id; @Override public void paramMapping() { - this.doP.put("deptId", QParam.builder().k(new String[]{"deptId"}).type(QueryTEnum.LK).build()); + this.doP.put("dept_id", QParam.builder().k(new String[]{"dept_id"}).type(QueryTEnum.LK).build()); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java index 547baa0..1de352b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java @@ -8,20 +8,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.SneakyThrows; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; -import org.apache.commons.beanutils.converters.DateConverter; -import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.config.FileProperties; import org.nl.modules.common.utils.FileUtil; import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.system.domain.Dept; import org.nl.modules.tools.IdUtil; import org.nl.system.service.dept.ISysDeptService; -import org.nl.system.service.dept.dao.SysDept; -import org.nl.system.service.dept.dao.mapper.SysDeptMapper; import org.nl.system.service.role.ISysRoleService; -import org.nl.system.service.role.dao.SysRole; -import org.nl.system.service.role.dao.mapper.SysRoleMapper; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; import org.nl.system.service.user.dao.mapper.SysUserMapper; @@ -36,11 +29,8 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; import java.io.File; -import java.lang.reflect.InvocationTargetException; import java.text.SimpleDateFormat; import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; /** *

@@ -65,10 +55,10 @@ public class ISysUserServiceImpl extends ServiceImpl imp @Override public Map updateAvatar(MultipartFile multipartFile) { SysUser user = this.getOne(new QueryWrapper().eq("username", SecurityUtils.getCurrentUsername())); - String oldPath = user.getAvatarPath(); + String oldPath = user.getAvatar_path(); File file = FileUtil.upload(multipartFile, properties.getPath().getAvatar()); - user.setAvatarPath(Objects.requireNonNull(file).getPath()); - user.setAvatarName(file.getName()); + user.setAvatar_path(Objects.requireNonNull(file).getPath()); + user.setAvatar_name(file.getName()); this.saveOrUpdate(user); if (StrUtil.isNotEmpty(oldPath)) { FileUtil.del(oldPath); @@ -97,7 +87,7 @@ public class ISysUserServiceImpl extends ServiceImpl imp sysUser.setPassword(SaSecureUtil.md5BySalt(sysUser.getPassword(), "salt")); } String userId = IdUtil.getStringId(); - sysUser.setUserId(userId); + sysUser.setUser_id(userId); this.save(sysUser); if (userDetail.get("depts") !=null){ deptService.saveUserDeptRelation(userId,(List)userDetail.get("depts")); @@ -133,16 +123,16 @@ public class ISysUserServiceImpl extends ServiceImpl imp }catch (Exception ex){ throw new RuntimeException(); } - sysUser.setUpdateTime(new Date()); - sysUser.setUpdateId(SecurityUtils.getCurrentUserId()); + sysUser.setUpdate_time(new Date()); + sysUser.setUpdate_id(SecurityUtils.getCurrentUserId()); this.updateById(sysUser); if (userDetail.get("deptIds")!=null){ - deptService.delUserDeptRelation(sysUser.getUserId()); - deptService.saveUserDeptRelation(sysUser.getUserId(), (List) userDetail.get("deptIds")); + deptService.delUserDeptRelation(sysUser.getUser_id()); + deptService.saveUserDeptRelation(sysUser.getUser_id(), (List) userDetail.get("deptIds")); }; if (userDetail.get("rolesIds") !=null){ - roleService.delUserRoleRelation(sysUser.getUserId()); - roleService.saveUserRoleRelation(sysUser.getUserId(),(List) userDetail.get("rolesIds")); + roleService.delUserRoleRelation(sysUser.getUser_id()); + roleService.saveUserRoleRelation(sysUser.getUser_id(),(List) userDetail.get("rolesIds")); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/controller/basedata/MaterialController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java similarity index 60% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/controller/basedata/MaterialController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java index 9cb914e..bde2e99 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/controller/basedata/MaterialController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java @@ -1,14 +1,14 @@ -package org.nl.wms.controller.basedata; +package org.nl.wms.database.material.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.modules.logging.annotation.Log; -import org.nl.wms.service.basedata.IMaterialService; -import org.nl.wms.service.basedata.dao.Material; +import org.nl.wms.database.material.service.IMdBaseMaterialService; +import org.nl.wms.database.material.service.dao.MdBaseMaterial; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -18,49 +18,49 @@ import java.util.Map; import java.util.Set; /** * @author lyd -* @date 2023-05-04 +* @date 2023-05-05 **/ @Slf4j @RestController -@RequiredArgsConstructor @Api(tags = "物料基础信息管理") -@RequestMapping("/api/material") -public class MaterialController { +@RequestMapping("/api/mdBaseMaterial") +public class MdBaseMaterialController { - private final IMaterialService materialService; + @Autowired + private IMdBaseMaterialService mdBaseMaterialService; @GetMapping @Log("查询物料基础信息") @ApiOperation("查询物料基础信息") - //@SaCheckPermission("@el.check('material:list')") + //@SaCheckPermission("@el.check('mdBaseMaterial:list')") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(materialService.queryAll(whereJson,page)),HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(mdBaseMaterialService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增物料基础信息") @ApiOperation("新增物料基础信息") - //@SaCheckPermission("@el.check('material:add')") - public ResponseEntity create(@Validated @RequestBody Material entity){ - materialService.create(entity); + //@SaCheckPermission("@el.check('mdBaseMaterial:add')") + public ResponseEntity create(@Validated @RequestBody MdBaseMaterial entity){ + mdBaseMaterialService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改物料基础信息") @ApiOperation("修改物料基础信息") - //@SaCheckPermission("@el.check('material:edit')") - public ResponseEntity update(@Validated @RequestBody Material entity){ - materialService.update(entity); + //@SaCheckPermission("@el.check('mdBaseMaterial:edit')") + public ResponseEntity update(@Validated @RequestBody MdBaseMaterial entity){ + mdBaseMaterialService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除物料基础信息") @ApiOperation("删除物料基础信息") - //@SaCheckPermission("@el.check('material:del')") + //@SaCheckPermission("@el.check('mdBaseMaterial:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { - materialService.deleteAll(ids); + mdBaseMaterialService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/IMaterialService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java similarity index 58% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/IMaterialService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java index cd6cec6..e28aff2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/IMaterialService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java @@ -1,9 +1,9 @@ -package org.nl.wms.service.basedata; +package org.nl.wms.database.material.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.service.basedata.dao.Material; +import org.nl.wms.database.material.service.dao.MdBaseMaterial; import java.util.Map; import java.util.Set; @@ -11,29 +11,29 @@ import java.util.Set; /** * @description 服务接口 * @author lyd -* @date 2023-05-04 +* @date 2023-05-05 **/ -public interface IMaterialService extends IService { +public interface IMdBaseMaterialService extends IService { /** * 查询数据分页 * @param whereJson 条件 * @param pageable 分页参数 - * @return IPage + * @return IPage */ - IPage queryAll(Map whereJson, PageQuery pageable); + IPage queryAll(Map whereJson, PageQuery pageable); /** * 创建 * @param entity / */ - void create(Material entity); + void create(MdBaseMaterial entity); /** * 编辑 * @param entity / */ - void update(Material entity); + void update(MdBaseMaterial entity); /** * 多选删除 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/Material.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java similarity index 68% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/Material.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java index 02720d9..ba85ce7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/Material.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java @@ -1,4 +1,4 @@ -package org.nl.wms.service.basedata.dao; +package org.nl.wms.database.material.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,63 +13,65 @@ import java.math.BigDecimal; /** * @description / * @author lyd -* @date 2023-05-04 +* @date 2023-05-05 **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("md_base_material") -public class Material implements Serializable { +public class MdBaseMaterial implements Serializable { + private static final long serialVersionUID = 1L; + @TableId(value = "material_id", type = IdType.NONE) @ApiModelProperty(value = "物料标识") - private String materialId; + private String material_id; @ApiModelProperty(value = "物料编码") - private String materialCode; + private String material_code; @ApiModelProperty(value = "物料名称 ") - private String materialName; + private String material_name; @ApiModelProperty(value = "物料规格") - private String materialSpec; + private String material_spec; @ApiModelProperty(value = "物料分类标识") - private String classId; + private String class_id; @ApiModelProperty(value = "静置时间(分钟)") - private BigDecimal standingTime; + private BigDecimal standing_time; @ApiModelProperty(value = "车间编码") - private String workshopCode; + private String workshop_code; @ApiModelProperty(value = "备注") private String remark; @ApiModelProperty(value = "是否启用") - private Boolean isUsed; + private Integer is_used; @ApiModelProperty(value = "是否删除") - private Boolean isDelete; + private Integer is_delete; @ApiModelProperty(value = "创建人") - private String createId; + private String create_id; @ApiModelProperty(value = "创建人") - private String createName; + private String create_name; @ApiModelProperty(value = "创建时间") - private String createTime; + private String create_time; @ApiModelProperty(value = "修改人") - private String updateId; + private String update_id; @ApiModelProperty(value = "修改人") - private String updateName; + private String update_name; @ApiModelProperty(value = "修改时间") - private String updateTime; + private String update_time; @ApiModelProperty(value = "外部标识") - private String extId; + private String ext_id; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java new file mode 100644 index 0000000..f7eaf33 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java @@ -0,0 +1,12 @@ +package org.nl.wms.database.material.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.database.material.service.dao.MdBaseMaterial; + +/** +* @author lyd +* @date 2023-05-05 +**/ +public interface MdBaseMaterialMapper extends BaseMapper { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/MaterialMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml similarity index 63% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/MaterialMapper.xml rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml index d45bbd4..07c96b6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/MaterialMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialDto.java new file mode 100644 index 0000000..56354af --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialDto.java @@ -0,0 +1,65 @@ +package org.nl.wms.database.material.service.dto; + +import lombok.Data; +import java.io.Serializable; +import java.math.BigDecimal; + +/** +* @description / +* @author lyd +* @date 2023-05-05 +**/ +@Data +public class MdBaseMaterialDto implements Serializable { + + /** 物料标识 */ + private String material_id; + + /** 物料编码 */ + private String material_code; + + /** 物料名称 */ + private String material_name; + + /** 物料规格 */ + private String material_spec; + + /** 物料分类标识 */ + private String class_id; + + /** 静置时间(分钟) */ + private BigDecimal standing_time; + + /** 车间编码 */ + private String workshop_code; + + /** 备注 */ + private String remark; + + /** 是否启用 */ + private Integer is_used; + + /** 是否删除 */ + private Integer is_delete; + + /** 创建人 */ + private String create_id; + + /** 创建人 */ + private String create_name; + + /** 创建时间 */ + private String create_time; + + /** 修改人 */ + private String update_id; + + /** 修改人 */ + private String update_name; + + /** 修改时间 */ + private String update_time; + + /** 外部标识 */ + private String ext_id; +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java new file mode 100644 index 0000000..2ce57b2 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.database.material.service.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.database.material.service.dao.MdBaseMaterial; + +/** +* @author lyd +* @date 2023-05-05 +**/ +public class MdBaseMaterialQuery extends BaseQuery { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java new file mode 100644 index 0000000..9fdd941 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java @@ -0,0 +1,80 @@ +package org.nl.wms.database.material.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.domain.query.PageQuery; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.SecurityUtils; +import org.nl.wms.database.material.service.IMdBaseMaterialService; +import org.nl.wms.database.material.service.dao.MdBaseMaterial; +import org.nl.wms.database.material.service.dao.mapper.MdBaseMaterialMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; +import java.util.Set; + + +/** +* @description 服务实现 +* @author lyd +* @date 2023-05-05 +**/ +@Slf4j +@Service +public class MdBaseMaterialServiceImpl extends ServiceImpl implements IMdBaseMaterialService { + + @Autowired + private MdBaseMaterialMapper mdBaseMaterialMapper; + + @Override + public IPage queryAll(Map whereJson, PageQuery page){ + LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + mdBaseMaterialMapper.selectPage(pages, lam); + return pages; + } + + @Override + public void create(MdBaseMaterial entity) { + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + entity.setMaterial_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setCreate_id(currentUserId); + entity.setCreate_name(nickName); + entity.setCreate_time(now); + entity.setUpdate_id(currentUserId); + entity.setUpdate_name(nickName); + entity.setUpdate_time(now); + mdBaseMaterialMapper.insert(entity); + } + + @Override + public void update(MdBaseMaterial entity) { + MdBaseMaterial dto = mdBaseMaterialMapper.selectById(entity.getMaterial_id()); + if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); + + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + entity.setUpdate_id(currentUserId); + entity.setUpdate_name(nickName); + entity.setUpdate_time(now); + + mdBaseMaterialMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + mdBaseMaterialMapper.deleteBatchIds(ids); + } + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/controller/basedata/WorkshopController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java similarity index 53% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/controller/basedata/WorkshopController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java index 776f42f..07ac0b3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/controller/basedata/WorkshopController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java @@ -1,14 +1,14 @@ -package org.nl.wms.controller.basedata; +package org.nl.wms.database.workshop.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.modules.logging.annotation.Log; -import org.nl.wms.service.basedata.IWorkshopService; -import org.nl.wms.service.basedata.dao.Workshop; +import org.nl.wms.database.workshop.service.IMdBaseWorkshopService; +import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -18,57 +18,49 @@ import java.util.Map; import java.util.Set; /** * @author lyd -* @date 2023-05-04 +* @date 2023-05-05 **/ @Slf4j @RestController -@RequiredArgsConstructor @Api(tags = "车间基础信息管理") -@RequestMapping("/api/workshop") -public class WorkshopController { +@RequestMapping("/api/mdBaseWorkshop") +public class MdBaseWorkshopController { - private final IWorkshopService workshopService; + @Autowired + private IMdBaseWorkshopService mdBaseWorkshopService; @GetMapping @Log("查询车间基础信息") @ApiOperation("查询车间基础信息") - //@SaCheckPermission("@el.check('workshop:list')") - public ResponseEntity query(Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(workshopService.queryAll(whereJson,page)),HttpStatus.OK); + //@SaCheckPermission("@el.check('mdBaseWorkshop:list')") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(mdBaseWorkshopService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增车间基础信息") @ApiOperation("新增车间基础信息") - //@SaCheckPermission("@el.check('workshop:add')") - public ResponseEntity create(@Validated @RequestBody Workshop entity){ - workshopService.create(entity); + //@SaCheckPermission("@el.check('mdBaseWorkshop:add')") + public ResponseEntity create(@Validated @RequestBody MdBaseWorkshop entity){ + mdBaseWorkshopService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改车间基础信息") @ApiOperation("修改车间基础信息") - //@SaCheckPermission("@el.check('workshop:edit')") - public ResponseEntity update(@Validated @RequestBody Workshop entity){ - workshopService.update(entity); + //@SaCheckPermission("@el.check('mdBaseWorkshop:edit')") + public ResponseEntity update(@Validated @RequestBody MdBaseWorkshop entity){ + mdBaseWorkshopService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除车间基础信息") @ApiOperation("删除车间基础信息") - //@SaCheckPermission("@el.check('workshop:del')") + //@SaCheckPermission("@el.check('mdBaseWorkshop:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { - workshopService.deleteAll(ids); + mdBaseWorkshopService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } - - @GetMapping("/workShopList") - @Log("查询车间下拉框") - @ApiOperation("查询车间下拉框") - //@SaCheckPermission("@el.check('workshop:list')") - public ResponseEntity workShopList(){ - return new ResponseEntity<>(workshopService.workShopList(),HttpStatus.OK); - } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/IWorkshopService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java similarity index 55% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/IWorkshopService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java index 8e172af..8753459 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/IWorkshopService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java @@ -1,50 +1,43 @@ -package org.nl.wms.service.basedata; +package org.nl.wms.database.workshop.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.service.basedata.dao.Workshop; +import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; -import java.util.List; import java.util.Map; import java.util.Set; /** * @description 服务接口 * @author lyd -* @date 2023-05-04 +* @date 2023-05-05 **/ -public interface IWorkshopService extends IService { +public interface IMdBaseWorkshopService extends IService { /** * 查询数据分页 * @param whereJson 条件 * @param pageable 分页参数 - * @return IPage + * @return IPage */ - IPage queryAll(Map whereJson, PageQuery pageable); + IPage queryAll(Map whereJson, PageQuery pageable); /** * 创建 * @param entity / */ - void create(Workshop entity); + void create(MdBaseWorkshop entity); /** * 编辑 * @param entity / */ - void update(Workshop entity); + void update(MdBaseWorkshop entity); /** * 多选删除 * @param ids / */ void deleteAll(Set ids); - - /** - * 获取下拉框 - * @return - */ - List workShopList(); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/Workshop.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java similarity index 71% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/Workshop.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java index 0023d57..cc3555d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/Workshop.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java @@ -1,4 +1,4 @@ -package org.nl.wms.service.basedata.dao; +package org.nl.wms.database.workshop.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,47 +13,45 @@ import java.io.Serializable; /** * @description / * @author lyd -* @date 2023-05-04 +* @date 2023-05-05 **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("md_base_workshop") -public class Workshop implements Serializable { - +public class MdBaseWorkshop implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "workshop_code", type = IdType.NONE) @ApiModelProperty(value = "车间编码") - private String workshopCode; + private String workshop_code; @ApiModelProperty(value = "车间名称 ") - private String workshopName; + private String workshop_name; @ApiModelProperty(value = "备注") private String remark; @ApiModelProperty(value = "是否启用") - private Boolean isUsed; + private String is_used; @ApiModelProperty(value = "是否删除") - private Boolean isDelete; + private String is_delete; @ApiModelProperty(value = "创建人") - private String createId; + private String create_id; @ApiModelProperty(value = "创建人") - private String createName; + private String create_name; @ApiModelProperty(value = "创建时间") - private String createTime; + private String create_time; @ApiModelProperty(value = "修改人") - private String updateId; + private String update_id; @ApiModelProperty(value = "修改人") - private String updateName; + private String update_name; @ApiModelProperty(value = "修改时间") - private String updateTime; + private String update_time; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.java new file mode 100644 index 0000000..8b4819d --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.java @@ -0,0 +1,12 @@ +package org.nl.wms.database.workshop.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; + +/** +* @author lyd +* @date 2023-05-05 +**/ +public interface MdBaseWorkshopMapper extends BaseMapper { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/WorkshopMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.xml similarity index 63% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/WorkshopMapper.xml rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.xml index ca12df2..e8e0f0d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/WorkshopMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopDto.java new file mode 100644 index 0000000..c9a3178 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopDto.java @@ -0,0 +1,46 @@ +package org.nl.wms.database.workshop.service.dto; + +import lombok.Data; +import java.io.Serializable; + +/** +* @description / +* @author lyd +* @date 2023-05-05 +**/ +@Data +public class MdBaseWorkshopDto implements Serializable { + + /** 车间编码 */ + private String workshop_code; + + /** 车间名称 */ + private String workshop_name; + + /** 备注 */ + private String remark; + + /** 是否启用 */ + private String is_used; + + /** 是否删除 */ + private String is_delete; + + /** 创建人 */ + private Long create_id; + + /** 创建人 */ + private String create_name; + + /** 创建时间 */ + private String create_time; + + /** 修改人 */ + private Long update_id; + + /** 修改人 */ + private String update_name; + + /** 修改时间 */ + private String update_time; +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopQuery.java new file mode 100644 index 0000000..a05b258 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.database.workshop.service.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; + +/** +* @author lyd +* @date 2023-05-05 +**/ +public class MdBaseWorkshopQuery extends BaseQuery { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java new file mode 100644 index 0000000..c696379 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java @@ -0,0 +1,80 @@ +package org.nl.wms.database.workshop.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.domain.query.PageQuery; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.SecurityUtils; +import org.nl.wms.database.workshop.service.IMdBaseWorkshopService; +import org.nl.wms.database.workshop.service.dao.mapper.MdBaseWorkshopMapper; +import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; +import java.util.Set; + + +/** +* @description 服务实现 +* @author lyd +* @date 2023-05-05 +**/ +@Slf4j +@Service +public class MdBaseWorkshopServiceImpl extends ServiceImpl implements IMdBaseWorkshopService { + + @Autowired + private MdBaseWorkshopMapper mdBaseWorkshopMapper; + + @Override + public IPage queryAll(Map whereJson, PageQuery page){ + LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + mdBaseWorkshopMapper.selectPage(pages, lam); + return pages; + } + + @Override + public void create(MdBaseWorkshop entity) { + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + entity.setWorkshop_code(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setCreate_id(currentUserId); + entity.setCreate_name(nickName); + entity.setCreate_time(now); + entity.setUpdate_id(currentUserId); + entity.setUpdate_name(nickName); + entity.setUpdate_time(now); + mdBaseWorkshopMapper.insert(entity); + } + + @Override + public void update(MdBaseWorkshop entity) { + MdBaseWorkshop dto = mdBaseWorkshopMapper.selectById(entity.getWorkshop_code()); + if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); + + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + entity.setUpdate_id(currentUserId); + entity.setUpdate_name(nickName); + entity.setUpdate_time(now); + + mdBaseWorkshopMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + mdBaseWorkshopMapper.deleteBatchIds(ids); + } + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/MaterialMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/MaterialMapper.java deleted file mode 100644 index 7cd19f9..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/MaterialMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.nl.wms.service.basedata.dao.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.service.basedata.dao.Material; - -/** -* @author lyd -* @date 2023-05-04 -**/ -public interface MaterialMapper extends BaseMapper { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/WorkshopMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/WorkshopMapper.java deleted file mode 100644 index 862a686..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dao/mapper/WorkshopMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.nl.wms.service.basedata.dao.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.service.basedata.dao.Workshop; - -/** -* @author lyd -* @date 2023-05-04 -**/ -public interface WorkshopMapper extends BaseMapper { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/MaterialDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/MaterialDto.java deleted file mode 100644 index b5d3a51..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/MaterialDto.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.nl.wms.service.basedata.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** -* @description / -* @author lyd -* @date 2023-05-04 -**/ -@Data -public class MaterialDto implements Serializable { - - /** 物料标识 */ - private String materialId; - - /** 物料编码 */ - private String materialCode; - - /** 物料名称 */ - private String materialName; - - /** 物料规格 */ - private String materialSpec; - - /** 物料分类标识 */ - private String classId; - - /** 静置时间(分钟) */ - private BigDecimal standingTime; - - /** 车间编码 */ - private String workshopCode; - - /** 备注 */ - private String remark; - - /** 是否启用 */ - private Boolean isUsed; - - /** 是否删除 */ - private Boolean isDelete; - - /** 创建人 */ - private String createId; - - /** 创建人 */ - private String createName; - - /** 创建时间 */ - private String createTime; - - /** 修改人 */ - private String updateId; - - /** 修改人 */ - private String updateName; - - /** 修改时间 */ - private String updateTime; - - /** 外部标识 */ - private String extId; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/MaterialQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/MaterialQuery.java deleted file mode 100644 index f251cbb..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/MaterialQuery.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.nl.wms.service.basedata.dto; - -import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.service.basedata.dao.Material; - -/** -* @author lyd -* @date 2023-05-04 -**/ -public class MaterialQuery extends BaseQuery { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/WorkshopDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/WorkshopDto.java deleted file mode 100644 index ed28aa7..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/WorkshopDto.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.nl.wms.service.basedata.dto; - -import lombok.Data; - -import java.io.Serializable; - -/** -* @description / -* @author lyd -* @date 2023-05-04 -**/ -@Data -public class WorkshopDto implements Serializable { - - /** 车间编码 */ - private String workshopCode; - - /** 车间名称 */ - private String workshopName; - - /** 备注 */ - private String remark; - - /** 是否启用 */ - private String isUsed; - - /** 是否删除 */ - private String isDelete; - - /** 创建人 */ - private Long createId; - - /** 创建人 */ - private String createName; - - /** 创建时间 */ - private String createTime; - - /** 修改人 */ - private Long updateId; - - /** 修改人 */ - private String updateName; - - /** 修改时间 */ - private String updateTime; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/WorkshopQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/WorkshopQuery.java deleted file mode 100644 index 88f5372..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/dto/WorkshopQuery.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.nl.wms.service.basedata.dto; - -import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.service.basedata.dao.Workshop; - -/** -* @author lyd -* @date 2023-05-04 -**/ -public class WorkshopQuery extends BaseQuery { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/impl/MaterialServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/impl/MaterialServiceImpl.java deleted file mode 100644 index 6225cdc..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/impl/MaterialServiceImpl.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.nl.wms.service.basedata.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -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.common.domain.query.PageQuery; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.wms.service.basedata.IMaterialService; -import org.nl.wms.service.basedata.dao.mapper.MaterialMapper; -import org.nl.wms.service.basedata.dao.Material; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Map; -import java.util.Set; - - -/** -* @description 服务实现 -* @author lyd -* @date 2023-05-04 -**/ -@Slf4j -@Service -@RequiredArgsConstructor -public class MaterialServiceImpl extends ServiceImpl implements IMaterialService { - - private final MaterialMapper materialMapper; - - @Override - public IPage queryAll(Map param, PageQuery page){ - String blurry = null; - if (ObjectUtil.isNotEmpty(param.get("blurry"))) blurry = param.get("blurry").toString(); - LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); - lam.like(ObjectUtil.isNotEmpty(blurry), Material::getMaterialCode, blurry) - .or(ObjectUtil.isNotEmpty(blurry)) - .like(ObjectUtil.isNotEmpty(blurry), Material::getMaterialName, blurry) - .orderByDesc(Material::getCreateTime); - IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - materialMapper.selectPage(pages, lam); - return pages; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(Material entity) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - entity.setMaterialId(IdUtil.getSnowflake(1, 1).nextIdStr()); - entity.setCreateId(currentUserId); - entity.setCreateName(nickName); - entity.setCreateTime(now); - entity.setUpdateId(currentUserId); - entity.setUpdateName(nickName); - entity.setUpdateTime(now); - materialMapper.insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(Material entity) { - Material dto = materialMapper.selectById(entity.getMaterialId()); - if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - entity.setUpdateId(currentUserId); - entity.setUpdateName(nickName); - entity.setUpdateTime(now); - - materialMapper.updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Set ids) { - // 真删除 - materialMapper.deleteBatchIds(ids); - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/impl/WorkshopServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/impl/WorkshopServiceImpl.java deleted file mode 100644 index c3063b2..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/service/basedata/impl/WorkshopServiceImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.nl.wms.service.basedata.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -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.common.domain.query.PageQuery; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.wms.service.basedata.IWorkshopService; -import org.nl.wms.service.basedata.dao.Workshop; -import org.nl.wms.service.basedata.dao.mapper.WorkshopMapper; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; -import java.util.Set; - - -/** -* @description 服务实现 -* @author lyd -* @date 2023-05-04 -**/ -@Slf4j -@Service -@RequiredArgsConstructor -public class WorkshopServiceImpl extends ServiceImpl< WorkshopMapper, Workshop> implements IWorkshopService { - - private final WorkshopMapper workshopMapper; - - @Override - public IPage queryAll(Map whereJson, PageQuery page){ - LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); - IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - workshopMapper.selectPage(pages, lam); - return pages; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(Workshop entity) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - entity.setCreateId(currentUserId); - entity.setCreateName(nickName); - entity.setCreateTime(now); - entity.setUpdateId(currentUserId); - entity.setUpdateName(nickName); - entity.setUpdateTime(now); - workshopMapper.insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(Workshop entity) { - Workshop dto = workshopMapper.selectById(entity.getWorkshopCode()); - if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - entity.setUpdateId(currentUserId); - entity.setUpdateName(nickName); - entity.setUpdateTime(now); - - workshopMapper.updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Set ids) { - // 真删除 - workshopMapper.deleteBatchIds(ids); - } - - @Override - public List workShopList() { - return this.list(); - } - -} diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 321b80f..5aa8f06 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -6,11 +6,11 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:nl-sso-server}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true -# url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true +# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:nl-sso-server}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} - password: ${DB_PWD:Root.123456} - # password: ${DB_PWD:12356} +# password: ${DB_PWD:Root.123456} + password: ${DB_PWD:12356} # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 2878f27..428c6ef 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -82,7 +82,7 @@ security: - /api/param/getValueByCode mybatis-plus: configuration: - map-underscore-to-camel-case: true + map-underscore-to-camel-case: false log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mapper-locations: - classpath:org.nl.**.mapper/*.xml diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl index d2badf3..eab2fff 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl @@ -1,14 +1,14 @@ -package org.nl.${moduleName}.controller.${package}; +package ${package}.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.modules.logging.annotation.Log; -import org.nl.${moduleName}.service.${package}.I${className}Service; -import org.nl.${moduleName}.service.${package}.dao.${className}; +import ${package}.service.I${className}Service; +import ${package}.service.dao.${className}; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -22,12 +22,12 @@ import java.util.Set; **/ @Slf4j @RestController -@RequiredArgsConstructor @Api(tags = "${apiAlias}管理") @RequestMapping("/api/${changeClassName}") public class ${className}Controller { - private final I${className}Service ${changeClassName}Service; + @Autowired + private I${className}Service ${changeClassName}Service; @GetMapping @Log("查询${apiAlias}") diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Dto.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Dto.ftl index 24a4110..b439e9a 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Dto.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Dto.ftl @@ -1,9 +1,7 @@ -package org.nl.${moduleName}.service.${package}.dto; +package ${package}.service.dto; import lombok.Data; import java.io.Serializable; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; /** * @description / diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl index 554da35..6a777b8 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl @@ -1,4 +1,4 @@ -package org.nl.${moduleName}.service.${package}.dao; +package ${package}.service.dao; <#if hasPk> import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Mapper.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Mapper.ftl index 1dfab88..0ab0952 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Mapper.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Mapper.ftl @@ -1,7 +1,7 @@ -package org.nl.${moduleName}.service.${package}.dao.mapper; +package ${package}.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.${moduleName}.service.${package}.dao.${className}; +import ${package}.service.dao.${className}; /** * @author ${author} diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/MySQLMapper.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/MySQLMapper.ftl index c4fc716..e4f0413 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/MySQLMapper.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/MySQLMapper.ftl @@ -1,5 +1,5 @@ - + diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/QueryCriteria.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/QueryCriteria.ftl index da49af4..d991085 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/QueryCriteria.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/QueryCriteria.ftl @@ -1,7 +1,7 @@ -package org.nl.${moduleName}.service.${package}.dto; +package ${package}.service.dto; import org.nl.common.domain.query.BaseQuery; -import org.nl.${moduleName}.service.${package}.dao.${className}; +import ${package}.service.dao.${className}; /** * @author ${author} diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Service.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Service.ftl index f887c7d..04c592e 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Service.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Service.ftl @@ -1,9 +1,9 @@ -package org.nl.${moduleName}.service.${package}; +package ${package}.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.${moduleName}.service.${package}.dao.${className}; +import ${package}.service.dao.${className}; import java.util.Map; import java.util.Set; diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl index e8d93b3..8ab80ef 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl @@ -1,4 +1,4 @@ -package org.nl.${moduleName}.service.${package}.impl; +package ${package}.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -11,11 +11,11 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; -import org.nl.${moduleName}.service.${package}.I${className}Service; -import org.nl.${moduleName}.service.${package}.dao.mapper.${className}Mapper; -import org.nl.${moduleName}.service.${package}.dao.${className}; +import ${package}.service.I${className}Service; +import ${package}.service.dao.mapper.${className}Mapper; +import ${package}.service.dao.${className}; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.Map; import java.util.Set; @@ -28,10 +28,10 @@ import java.util.Set; **/ @Slf4j @Service -@RequiredArgsConstructor public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${className}> implements I${className}Service { - private final ${className}Mapper ${changeClassName}Mapper; + @Autowired + private ${className}Mapper ${changeClassName}Mapper; @Override public IPage<${className}> queryAll(Map whereJson, PageQuery page){ @@ -42,24 +42,22 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c } @Override - @Transactional(rollbackFor = Exception.class) public void create(${className} entity) { String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); - entity.set${pkChangeColName ? cap_first }(IdUtil.getSnowflake(1, 1).nextId()); - entity.setCreateId(currentUserId); - entity.setCreateName(nickName); - entity.setCreateTime(now); - entity.setUpdateId(currentUserId); - entity.setUpdateName(nickName); - entity.setUpdateTime(now); + entity.set${pkChangeColName ? cap_first }(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setCreate_id(currentUserId); + entity.setCreate_name(nickName); + entity.setCreate_time(now); + entity.setUpdate_id(currentUserId); + entity.setUpdate_name(nickName); + entity.setUpdate_time(now); ${changeClassName}Mapper.insert(entity); } @Override - @Transactional(rollbackFor = Exception.class) public void update(${className} entity) { ${className} dto = ${changeClassName}Mapper.selectById(entity.get${pkChangeColName ? cap_first }()); if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); @@ -67,15 +65,14 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); - entity.setUpdateId(currentUserId); - entity.setUpdateName(nickName); - entity.setUpdateTime(now); + entity.setUpdate_id(currentUserId); + entity.setUpdate_name(nickName); + entity.setUpdate_time(now); ${changeClassName}Mapper.updateById(entity); } @Override - @Transactional(rollbackFor = Exception.class) public void deleteAll(Set ids) { // 真删除 ${changeClassName}Mapper.deleteBatchIds(ids); diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/front/index.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/front/index.ftl index e886a91..ebd252c 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/front/index.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/front/index.ftl @@ -120,7 +120,13 @@ import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -const defaultForm = { <#if columns??><#list columns as column>${column.changeColumnName}: null<#if column_has_next>, } +const defaultForm = { + <#if columns??> + <#list columns as column> + ${column.changeColumnName}: null<#if column_has_next>, + + +} export default { name: '${className}', components: { pagination, crudOperation, rrOperation, udOperation }, @@ -129,7 +135,13 @@ export default { dicts: [<#if hasDict??><#list dicts as dict>'${dict}'<#if dict_has_next>, ], cruds() { - return CRUD({ title: '${apiAlias}', url: 'api/${changeClassName}', idField: '${pkChangeColName}', sort: '${pkChangeColName},desc', crudMethod: { ...crud${className} }}) + return CRUD({ + title: '${apiAlias}', + url: 'api/${changeClassName}', + idField: '${pkChangeColName}', + sort: '${pkChangeColName},desc', + crudMethod: { ...crud${className} } + }) }, data() { return { diff --git a/nladmin-ui/src/layout/components/Navbar.vue b/nladmin-ui/src/layout/components/Navbar.vue index 2054253..738443b 100644 --- a/nladmin-ui/src/layout/components/Navbar.vue +++ b/nladmin-ui/src/layout/components/Navbar.vue @@ -25,7 +25,7 @@
- {{ user.personName }} + {{ user.person_name }}
diff --git a/nladmin-ui/src/store/modules/user.js b/nladmin-ui/src/store/modules/user.js index 5645e12..c824fa1 100644 --- a/nladmin-ui/src/store/modules/user.js +++ b/nladmin-ui/src/store/modules/user.js @@ -28,10 +28,9 @@ const user = { actions: { // 登录 Login({ commit }, userInfo) { - const rememberMe = userInfo.rememberMe + // const rememberMe = userInfo.rememberMe return new Promise((resolve, reject) => { login(userInfo.username, userInfo.password, userInfo.code, userInfo.uuid).then(res => { - console.log('登录信息：', res) // setToken(res.token, rememberMe) commit('SET_TOKEN', res.token) setUserInfo(res.user, commit) @@ -48,7 +47,6 @@ const user = { GetInfo({ commit }) { return new Promise((resolve, reject) => { getInfo().then(res => { - console.log('用户信息：', res) setUserInfo(res, commit) resolve(res) }).catch(error => { diff --git a/nladmin-ui/src/views/generator/config.vue b/nladmin-ui/src/views/generator/config.vue index 1e1ab47..0ad0ed8 100644 --- a/nladmin-ui/src/views/generator/config.vue +++ b/nladmin-ui/src/views/generator/config.vue @@ -4,7 +4,7 @@
- 字段配置：{{ tableName }} + 字段配置：{{ table_name }} - - + +