diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java index 1a768ff..f10b1ad 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java @@ -38,19 +38,18 @@ public class SysMenuController { private ISysMenuService iSysMenuService; @GetMapping(value = "/build") - public ResponseEntity buildMenus(@Validated String systemType) { //校验系统表是否存在该系统类型 return new ResponseEntity(iSysMenuService.buildMenus(systemType),HttpStatus.OK); } - + @GetMapping(value = "/lazy") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity query(@RequestParam String pid) { return new ResponseEntity<>(iSysMenuService.getMenus(pid), HttpStatus.OK); } - + @PostMapping(value = "/getMenusByRole") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity getMenusByRole(@RequestBody JSONObject json) { @@ -60,7 +59,7 @@ public class SysMenuController { return new ResponseEntity<>(iSysMenuService.getMenusByRole(role_id, system_type, category), HttpStatus.OK); } - + @GetMapping(value = "/child") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity child(@RequestParam String id) { @@ -73,14 +72,13 @@ public class SysMenuController { } @GetMapping - @SaCheckPermission("menu:list") public ResponseEntity pageQuery(MenuQuery query, PageQuery page) throws Exception { List list = iSysMenuService.query(query, page); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } - + @PostMapping("/superior") @SaCheckPermission("menu:list") public ResponseEntity getSuperior(@RequestBody JSONObject param) { @@ -94,7 +92,6 @@ public class SysMenuController { } @Log("新增菜单") - @PostMapping @SaCheckPermission("menu:add") public ResponseEntity create(@RequestBody SysMenu form) { @@ -103,7 +100,6 @@ public class SysMenuController { } @Log("修改菜单") - @PutMapping @SaCheckPermission("menu:edit") public ResponseEntity update( @RequestBody SysMenu form) { @@ -112,7 +108,6 @@ public class SysMenuController { } @Log("删除菜单") - @DeleteMapping @SaCheckPermission("menu:del") public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java index b6a5223..592e78c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java @@ -359,6 +359,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl if (ObjectUtil.isEmpty(entity)){ return menuDto; } + menuDto.setEn_title(entity.getEn_title()); + menuDto.setIn_title(entity.getIn_title()); + menuDto.setZh_title(entity.getZh_title()); menuDto.setMenu_id(entity.getMenu_id()); menuDto.setType(entity.getType()); menuDto.setPermission(entity.getPermission()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java index b2d0b9f..b737fb5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java @@ -47,7 +47,7 @@ public class SysRole implements Serializable { /** * id名称 */ - private String in_name; + private String id_name; /** * 角色级别 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java index 0a3c2e3..3b52db0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java @@ -45,7 +45,9 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override public IPage query(Map param, PageQuery page) { String blurry = null; - if (ObjectUtil.isNotEmpty(param.get("blurry"))) blurry = param.get("blurry").toString(); + if (ObjectUtil.isNotEmpty(param.get("blurry"))) { + blurry = param.get("blurry").toString(); + } LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); lam.like(ObjectUtil.isNotEmpty(blurry), SysRole::getName, blurry); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/controller/MdBaseClassstandardController.java similarity index 93% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/controller/MdBaseClassstandardController.java index 1b4513a..b64b99f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/controller/MdBaseClassstandardController.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.classification.controller; +package org.nl.wms.basedata.classification.controller; @@ -6,8 +6,8 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; -import org.nl.wms.database.classification.service.IMdBaseClassstandardService; -import org.nl.wms.database.classification.service.dao.MdBaseClassstandard; +import org.nl.wms.basedata.classification.service.IMdBaseClassstandardService; +import org.nl.wms.basedata.classification.service.dao.MdBaseClassstandard; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/IMdBaseClassstandardService.java similarity index 92% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/IMdBaseClassstandardService.java index 5779f4c..01cd6ce 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/IMdBaseClassstandardService.java @@ -1,9 +1,9 @@ -package org.nl.wms.database.classification.service; +package org.nl.wms.basedata.classification.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.database.classification.service.dao.MdBaseClassstandard; +import org.nl.wms.basedata.classification.service.dao.MdBaseClassstandard; import java.util.ArrayList; import java.util.List; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/MdBaseClassstandard.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/MdBaseClassstandard.java similarity index 89% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/MdBaseClassstandard.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/MdBaseClassstandard.java index 6cc3af0..29c2ea4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/MdBaseClassstandard.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/MdBaseClassstandard.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.classification.service.dao; +package org.nl.wms.basedata.classification.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -9,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.util.List; /** * @description / @@ -24,64 +23,64 @@ public class MdBaseClassstandard implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "class_id", type = IdType.NONE) - + private String class_id; - + private String class_code; - + private String class_name; - + private String class_desc; - + private String parent_class_id; - + private Integer sub_count; - + private Boolean is_leaf; - + private Boolean is_modify; - + private Boolean is_delete; - + private String class_level; - + private String ext_id; - + private String ext_parent_id; - + private String workshop_code; - + private String remark; - + private String create_id; - + private String create_name; - + private String create_time; - + private String update_id; - + private String update_name; - + private String update_time; @TableField(exist = false) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.java similarity index 60% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.java index 656069b..5f03fef 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.java @@ -1,7 +1,7 @@ -package org.nl.wms.database.classification.service.dao.mapper; +package org.nl.wms.basedata.classification.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.database.classification.service.dao.MdBaseClassstandard; +import org.nl.wms.basedata.classification.service.dao.MdBaseClassstandard; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.xml similarity index 75% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.xml rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.xml index fc841cc..b8a563d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardDto.java similarity index 95% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardDto.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardDto.java index 09830e6..6a28102 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.classification.service.dto; +package org.nl.wms.basedata.classification.service.dto; import lombok.Data; import java.io.Serializable; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardQuery.java similarity index 60% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardQuery.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardQuery.java index bbf449a..909eb38 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardQuery.java @@ -1,7 +1,7 @@ -package org.nl.wms.database.classification.service.dto; +package org.nl.wms.basedata.classification.service.dto; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.database.classification.service.dao.MdBaseClassstandard; +import org.nl.wms.basedata.classification.service.dao.MdBaseClassstandard; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardTrees.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardTrees.java similarity index 81% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardTrees.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardTrees.java index c5f76cc..6513b3d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardTrees.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardTrees.java @@ -1,11 +1,11 @@ -package org.nl.wms.database.classification.service.dto; +package org.nl.wms.basedata.classification.service.dto; import com.baomidou.mybatisplus.annotation.TableField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.nl.wms.database.classification.service.dao.MdBaseClassstandard; +import org.nl.wms.basedata.classification.service.dao.MdBaseClassstandard; import java.io.Serializable; import java.util.List; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/impl/MdBaseClassstandardServiceImpl.java similarity index 97% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/impl/MdBaseClassstandardServiceImpl.java index 49f05d7..b6877c7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/impl/MdBaseClassstandardServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.classification.service.impl; +package org.nl.wms.basedata.classification.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -12,10 +12,10 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; -import org.nl.wms.database.classification.service.IMdBaseClassstandardService; -import org.nl.wms.database.classification.service.dao.MdBaseClassstandard; -import org.nl.wms.database.classification.service.dao.mapper.MdBaseClassstandardMapper; -import org.nl.wms.database.classification.service.dto.MdBaseClassstandardTrees; +import org.nl.wms.basedata.classification.service.IMdBaseClassstandardService; +import org.nl.wms.basedata.classification.service.dao.MdBaseClassstandard; +import org.nl.wms.basedata.classification.service.dao.mapper.MdBaseClassstandardMapper; +import org.nl.wms.basedata.classification.service.dto.MdBaseClassstandardTrees; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/controller/MdBaseMaterialController.java similarity index 92% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/controller/MdBaseMaterialController.java index f7e1055..c7f06f5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/controller/MdBaseMaterialController.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.material.controller; +package org.nl.wms.basedata.material.controller; @@ -7,8 +7,8 @@ import org.nl.common.annotation.Limit; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; -import org.nl.wms.database.material.service.IMdBaseMaterialService; -import org.nl.wms.database.material.service.dao.MdBaseMaterial; +import org.nl.wms.basedata.material.service.IMdBaseMaterialService; +import org.nl.wms.basedata.material.service.dao.MdBaseMaterial; import org.nl.wms.ext.mes.service.WmsToMesService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/IMdBaseMaterialService.java similarity index 83% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/IMdBaseMaterialService.java index f142f66..56f0173 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/IMdBaseMaterialService.java @@ -1,11 +1,10 @@ -package org.nl.wms.database.material.service; +package org.nl.wms.basedata.material.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.database.material.service.dao.MdBaseMaterial; -import org.nl.wms.database.material.service.dto.MdBaseMaterialQuery; +import org.nl.wms.basedata.material.service.dao.MdBaseMaterial; +import org.nl.wms.basedata.material.service.dto.MdBaseMaterialQuery; import java.util.Map; import java.util.Set; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/MdBaseMaterial.java similarity index 93% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/MdBaseMaterial.java index 3598cc4..637c424 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/MdBaseMaterial.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.material.service.dao; +package org.nl.wms.basedata.material.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -24,85 +24,85 @@ public class MdBaseMaterial implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "material_id", type = IdType.NONE) - + private String material_id; - + private String material_code; - + private String half_material_code; - + private String raw_material_code; - + private String material_name; - + private String material_spec; - + private String class_id; - + private Integer standing_time; - + private Integer cooling_time; - + private String workshop_code; - + private String remark; - + private Boolean is_used; - + private Boolean 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; - + private String ext_time; - + private String material_model; - + private String single_weight; - + private String a_long_side; - + private String b_short_side; - + private String h_height; - + private String w_thickness; private String matsize; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdBaseMaterialMapper.java similarity index 70% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdBaseMaterialMapper.java index 365bb67..567e152 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdBaseMaterialMapper.java @@ -1,9 +1,9 @@ -package org.nl.wms.database.material.service.dao.mapper; +package org.nl.wms.basedata.material.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.wms.database.material.service.dao.MdBaseMaterial; -import org.nl.wms.database.material.service.dto.MdBaseMaterialQuery; +import org.nl.wms.basedata.material.service.dao.MdBaseMaterial; +import org.nl.wms.basedata.material.service.dto.MdBaseMaterialQuery; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdBaseMaterialMapper.xml similarity index 92% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdBaseMaterialMapper.xml index a53f2fd..e587d09 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdBaseMaterialMapper.xml @@ -1,8 +1,8 @@ - + - WITH CTE AS ( SELECT mm.*, diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dto/MdBaseMaterialDto.java similarity index 95% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialDto.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dto/MdBaseMaterialDto.java index 56354af..a23e260 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dto/MdBaseMaterialDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.material.service.dto; +package org.nl.wms.basedata.material.service.dto; import lombok.Data; import java.io.Serializable; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dto/MdBaseMaterialQuery.java similarity index 83% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dto/MdBaseMaterialQuery.java index 9088a41..78b250f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dto/MdBaseMaterialQuery.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.material.service.dto; +package org.nl.wms.basedata.material.service.dto; import lombok.Data; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/impl/MdBaseMaterialServiceImpl.java similarity index 94% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/impl/MdBaseMaterialServiceImpl.java index 40b14f7..f06819e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/impl/MdBaseMaterialServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.material.service.impl; +package org.nl.wms.basedata.material.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -13,10 +13,10 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; -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.nl.wms.database.material.service.dto.MdBaseMaterialQuery; +import org.nl.wms.basedata.material.service.IMdBaseMaterialService; +import org.nl.wms.basedata.material.service.dao.MdBaseMaterial; +import org.nl.wms.basedata.material.service.dao.mapper.MdBaseMaterialMapper; +import org.nl.wms.basedata.material.service.dto.MdBaseMaterialQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/controller/MdBaseVehicleController.java similarity index 90% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/controller/MdBaseVehicleController.java index e80abe4..dd9804f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/controller/MdBaseVehicleController.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.vehicle.controller; +package org.nl.wms.basedata.vehicle.controller; @@ -6,8 +6,8 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; -import org.nl.wms.database.vehicle.service.IMdBaseVehicleService; -import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle; +import org.nl.wms.basedata.vehicle.service.IMdBaseVehicleService; +import org.nl.wms.basedata.vehicle.service.dao.MdBaseVehicle; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/IMdBaseVehicleService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/IMdBaseVehicleService.java similarity index 88% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/IMdBaseVehicleService.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/IMdBaseVehicleService.java index 1444e28..0fa7ac8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/IMdBaseVehicleService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/IMdBaseVehicleService.java @@ -1,9 +1,9 @@ -package org.nl.wms.database.vehicle.service; +package org.nl.wms.basedata.vehicle.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.database.vehicle.service.dao.MdBaseVehicle; +import org.nl.wms.basedata.vehicle.service.dao.MdBaseVehicle; import java.util.Map; import java.util.Set; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/MdBaseVehicle.java similarity index 89% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/MdBaseVehicle.java index 9a53988..adef556 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/MdBaseVehicle.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.vehicle.service.dao; +package org.nl.wms.basedata.vehicle.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -23,58 +23,58 @@ public class MdBaseVehicle implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "vehicle_code", type = IdType.NONE) - + private String vehicle_code; - + private String vehicle_name; - + private String vehicle_type; - + private String one_code; - + private String two_code; - + private String rfid_code; - + private BigDecimal vehicle_width; - + private BigDecimal vehicle_long; - + private BigDecimal vehicle_height; - + private String overstruct_type; - + private BigDecimal occupystruct_qty; - + private String ext_id; - + private String create_id; - + private String create_name; - + private String create_time; - + private String update_id; - + private String update_name; - + private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.java similarity index 59% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.java index 9dc21e3..8435912 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.java @@ -1,7 +1,7 @@ -package org.nl.wms.database.vehicle.service.dao.mapper; +package org.nl.wms.basedata.vehicle.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle; +import org.nl.wms.basedata.vehicle.service.dao.MdBaseVehicle; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml similarity index 73% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml index e51e86f..ba8701c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleDto.java similarity index 96% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleDto.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleDto.java index 737739f..97b3407 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.vehicle.service.dto; +package org.nl.wms.basedata.vehicle.service.dto; import java.math.BigDecimal; import lombok.Data; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleQuery.java similarity index 58% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleQuery.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleQuery.java index 7048638..77eb12f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleQuery.java @@ -1,7 +1,7 @@ -package org.nl.wms.database.vehicle.service.dto; +package org.nl.wms.basedata.vehicle.service.dto; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle; +import org.nl.wms.basedata.vehicle.service.dao.MdBaseVehicle; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/impl/MdBaseVehicleServiceImpl.java similarity index 92% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/impl/MdBaseVehicleServiceImpl.java index 2839a55..7f952ae 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/impl/MdBaseVehicleServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.vehicle.service.impl; +package org.nl.wms.basedata.vehicle.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -7,15 +7,14 @@ 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.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; -import org.nl.wms.database.vehicle.service.IMdBaseVehicleService; -import org.nl.wms.database.vehicle.service.dao.mapper.MdBaseVehicleMapper; -import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle; +import org.nl.wms.basedata.vehicle.service.IMdBaseVehicleService; +import org.nl.wms.basedata.vehicle.service.dao.mapper.MdBaseVehicleMapper; +import org.nl.wms.basedata.vehicle.service.dao.MdBaseVehicle; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/controller/MdBaseWorkshopController.java similarity index 91% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/controller/MdBaseWorkshopController.java index 27c33b5..6b472de 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/controller/MdBaseWorkshopController.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.workshop.controller; +package org.nl.wms.basedata.workshop.controller; @@ -6,8 +6,8 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; -import org.nl.wms.database.workshop.service.IMdBaseWorkshopService; -import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; +import org.nl.wms.basedata.workshop.service.IMdBaseWorkshopService; +import org.nl.wms.basedata.workshop.service.dao.MdBaseWorkshop; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/IMdBaseWorkshopService.java similarity index 89% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/IMdBaseWorkshopService.java index be158c6..030e9e9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/IMdBaseWorkshopService.java @@ -1,9 +1,9 @@ -package org.nl.wms.database.workshop.service; +package org.nl.wms.basedata.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.database.workshop.service.dao.MdBaseWorkshop; +import org.nl.wms.basedata.workshop.service.dao.MdBaseWorkshop; import java.util.List; import java.util.Map; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dao/MdBaseWorkshop.java similarity index 86% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dao/MdBaseWorkshop.java index db4b6f3..91c9f41 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dao/MdBaseWorkshop.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.workshop.service.dao; +package org.nl.wms.basedata.workshop.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Table; import java.io.Serializable; /** @@ -21,37 +20,37 @@ import java.io.Serializable; public class MdBaseWorkshop implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "workshop_code", type = IdType.NONE) - + private String workshop_code; - + private String workshop_name; - + private String remark; - + private Boolean is_used; - + private Boolean 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; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dao/mapper/MdBaseWorkshopMapper.java similarity index 59% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dao/mapper/MdBaseWorkshopMapper.java index 8b4819d..41dac79 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dao/mapper/MdBaseWorkshopMapper.java @@ -1,7 +1,7 @@ -package org.nl.wms.database.workshop.service.dao.mapper; +package org.nl.wms.basedata.workshop.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; +import org.nl.wms.basedata.workshop.service.dao.MdBaseWorkshop; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dao/mapper/MdBaseWorkshopMapper.xml similarity index 74% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.xml rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dao/mapper/MdBaseWorkshopMapper.xml index e8e0f0d..5bfe0ab 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dao/mapper/MdBaseWorkshopMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dto/MdBaseWorkshopDto.java similarity index 93% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopDto.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dto/MdBaseWorkshopDto.java index c9a3178..2aa70a4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dto/MdBaseWorkshopDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.workshop.service.dto; +package org.nl.wms.basedata.workshop.service.dto; import lombok.Data; import java.io.Serializable; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dto/MdBaseWorkshopQuery.java similarity index 58% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopQuery.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dto/MdBaseWorkshopQuery.java index a05b258..7b8302c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dto/MdBaseWorkshopQuery.java @@ -1,7 +1,7 @@ -package org.nl.wms.database.workshop.service.dto; +package org.nl.wms.basedata.workshop.service.dto; import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; +import org.nl.wms.basedata.workshop.service.dao.MdBaseWorkshop; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/impl/MdBaseWorkshopServiceImpl.java similarity index 91% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/impl/MdBaseWorkshopServiceImpl.java index aae4573..c22475d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/impl/MdBaseWorkshopServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.database.workshop.service.impl; +package org.nl.wms.basedata.workshop.service.impl; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.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.nl.wms.basedata.workshop.service.IMdBaseWorkshopService; +import org.nl.wms.basedata.workshop.service.dao.mapper.MdBaseWorkshopMapper; +import org.nl.wms.basedata.workshop.service.dao.MdBaseWorkshop; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java index 3604cf3..4eac700 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; -import org.nl.wms.database.material.service.IMdBaseMaterialService; +import org.nl.wms.basedata.material.service.IMdBaseMaterialService; import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.group.service.dao.mapper.SchBaseVehiclematerialgroupMapper; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java index 52ffb5d..3146c3e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java @@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.exception.BadRequestException; import org.nl.config.IdUtil; -import org.nl.wms.database.material.service.IMdBaseMaterialService; -import org.nl.wms.database.material.service.dao.MdBaseMaterial; +import org.nl.wms.basedata.material.service.IMdBaseMaterialService; +import org.nl.wms.basedata.material.service.dao.MdBaseMaterial; import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.nl.wms.storage_manage.ios.service.iostorInv.IStIvtIostorinvService; import org.nl.wms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdisService; diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl b/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl index 08223a6..c4ef2ca 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl +++ b/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl @@ -1,7 +1,5 @@ package ${package}.controller; - - import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -22,7 +20,6 @@ import java.util.Set; **/ @Slf4j @RestController - = "${apiAlias}管理") @RequestMapping("/api/${changeClassName}") public class ${className}Controller { @@ -31,7 +28,6 @@ public class ${className}Controller { @GetMapping @Log("查询${apiAlias}") - //@SaCheckPermission("@el.check('${changeClassName}:list')") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(${changeClassName}Service.queryAll(whereJson,page)),HttpStatus.OK); @@ -39,7 +35,6 @@ public class ${className}Controller { @PostMapping @Log("新增${apiAlias}") - //@SaCheckPermission("@el.check('${changeClassName}:add')") public ResponseEntity create(@Validated @RequestBody ${className} entity){ ${changeClassName}Service.create(entity); @@ -48,7 +43,6 @@ public class ${className}Controller { @PutMapping @Log("修改${apiAlias}") - //@SaCheckPermission("@el.check('${changeClassName}:edit')") public ResponseEntity update(@Validated @RequestBody ${className} entity){ ${changeClassName}Service.update(entity); @@ -56,7 +50,6 @@ public class ${className}Controller { } @Log("删除${apiAlias}") - //@SaCheckPermission("@el.check('${changeClassName}:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl b/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl index da1a90e..dfd549a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl +++ b/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl @@ -1,19 +1,19 @@ package ${package}.service.dao; <#if hasPk> -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; + import com.baomidou.mybatisplus.annotation.IdType; + import com.baomidou.mybatisplus.annotation.TableId; + import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; <#if hasTimestamp> -import java.sql.Timestamp; + import java.sql.Timestamp; <#if hasBigDecimal> -import java.math.BigDecimal; + import java.math.BigDecimal; import java.io.Serializable; @@ -27,17 +27,17 @@ import java.io.Serializable; @TableName("${tableName}") public class ${className} implements Serializable { - private static final long serialVersionUID = 1L; +private static final long serialVersionUID = 1L; <#if columns??> <#list columns as column> <#if column.columnKey = 'PRI'> @TableId(value = "${column.columnName}", type = <#if auto>IdType.AUTO<#else>IdType.NONE) -<#if column.remark != ''> - +<#if column.remark?has_content> + /** ${column.remark} */ <#else> - + /** ${column.changeColumnName} */ private ${column.columnType} ${column.changeColumnName}; diff --git a/lms/nladmin-ui/src/i18n/langs/chinese.js b/lms/nladmin-ui/src/i18n/langs/chinese.js index f344de3..a790763 100644 --- a/lms/nladmin-ui/src/i18n/langs/chinese.js +++ b/lms/nladmin-ui/src/i18n/langs/chinese.js @@ -1,9 +1,11 @@ import zhLocale from 'element-ui/lib/locale/lang/zh-CN' import zh from './zh-CN' import menu from './menu/zh' +import param from './param/zh' export default { ...zhLocale, ...zh, - ...menu + ...menu, + ...param } diff --git a/lms/nladmin-ui/src/i18n/langs/english.js b/lms/nladmin-ui/src/i18n/langs/english.js index 32fe505..8a52608 100644 --- a/lms/nladmin-ui/src/i18n/langs/english.js +++ b/lms/nladmin-ui/src/i18n/langs/english.js @@ -1,9 +1,11 @@ import enLocale from 'element-ui/lib/locale/lang/en' import en from './en' import menu from './menu/en' +import param from './param/en' export default { ...enLocale, ...en, - ...menu + ...menu, + ...param } diff --git a/lms/nladmin-ui/src/i18n/langs/indonesian.js b/lms/nladmin-ui/src/i18n/langs/indonesian.js index 998fe75..e83412c 100644 --- a/lms/nladmin-ui/src/i18n/langs/indonesian.js +++ b/lms/nladmin-ui/src/i18n/langs/indonesian.js @@ -1,9 +1,11 @@ import idLocale from 'element-ui/lib/locale/lang/id' import id from './in' import menu from './menu/in' +import param from './param/in' export default { ...idLocale, ...id, - ...menu + ...menu, + ...param } diff --git a/lms/nladmin-ui/src/i18n/langs/menu/en.js b/lms/nladmin-ui/src/i18n/langs/menu/en.js index 3e17f1d..524f33d 100644 --- a/lms/nladmin-ui/src/i18n/langs/menu/en.js +++ b/lms/nladmin-ui/src/i18n/langs/menu/en.js @@ -1,5 +1,6 @@ export default { 'menu': { + 'home': 'home', 'title': 'Menu', 'placeholder': { 'fuzzy_search': 'fuzzy search', diff --git a/lms/nladmin-ui/src/i18n/langs/menu/in.js b/lms/nladmin-ui/src/i18n/langs/menu/in.js index 74a3012..fb93a54 100644 --- a/lms/nladmin-ui/src/i18n/langs/menu/in.js +++ b/lms/nladmin-ui/src/i18n/langs/menu/in.js @@ -1,5 +1,6 @@ export default { 'menu': { + 'home': 'halaman rumah', 'title': 'Menu', 'placeholder': { 'fuzzy_search': 'pencarian kabur', diff --git a/lms/nladmin-ui/src/i18n/langs/menu/zh.js b/lms/nladmin-ui/src/i18n/langs/menu/zh.js index e6815aa..5c46b8e 100644 --- a/lms/nladmin-ui/src/i18n/langs/menu/zh.js +++ b/lms/nladmin-ui/src/i18n/langs/menu/zh.js @@ -1,5 +1,6 @@ export default { 'menu': { + 'home': '首页', 'title': '菜单', 'placeholder': { 'fuzzy_search': '模糊搜索',