root/lanzhouhailiang_two
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 菜单多语言、包名修改

Browse Source
This commit is contained in:
liyongde
2024-03-25 15:43:56 +08:00
parent 83ef66968b
commit 10527668be
47 changed files with 181 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java
View File

@@ -38,7 +38,6 @@ public class SysMenuController {
private ISysMenuService iSysMenuService;
@GetMapping(value = "/build")
public ResponseEntity<Object> buildMenus(@Validated String systemType) {
//校验系统表是否存在该系统类型
return new ResponseEntity(iSysMenuService.buildMenus(systemType),HttpStatus.OK);
@@ -73,7 +72,6 @@ public class SysMenuController {
}
@GetMapping
@SaCheckPermission("menu:list")
public ResponseEntity<Object> pageQuery(MenuQuery query, PageQuery page) throws Exception {
List list = iSysMenuService.query(query, page);
@@ -94,7 +92,6 @@ public class SysMenuController {
}
@Log("新增菜单")
@PostMapping
@SaCheckPermission("menu:add")
public ResponseEntity<Object> create(@RequestBody SysMenu form) {
@@ -103,7 +100,6 @@ public class SysMenuController {
}
@Log("修改菜单")
@PutMapping
@SaCheckPermission("menu:edit")
public ResponseEntity<Object> update( @RequestBody SysMenu form) {
@@ -112,7 +108,6 @@ public class SysMenuController {
}
@Log("删除菜单")
@DeleteMapping
@SaCheckPermission("menu:del")
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
View File

@@ -359,6 +359,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> 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());

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java
View File

@@ -47,7 +47,7 @@ public class SysRole implements Serializable {
/**
* id名称
*/
private String in_name;
private String id_name;
/**
* 角色级别

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java
View File

@@ -45,7 +45,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
@Override
public IPage<SysRole> 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<SysRole> lam = new LambdaQueryWrapper<>();
lam.like(ObjectUtil.isNotEmpty(blurry), SysRole::getName, blurry);
IPage<SysRole> pages = new Page<>(page.getPage() + 1, page.getSize());

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/controller/MdBaseClassstandardController.java
View File

@@ -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;

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/IMdBaseClassstandardService.java
View File

@@ -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;

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/MdBaseClassstandard.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/MdBaseClassstandard.java
View File

@@ -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 /

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.java
View File

@@ -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

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.xml → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dao/mapper/MdBaseClassstandardMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.database.classification.service.dao.mapper.MdBaseClassstandardMapper">
<mapper namespace="org.nl.wms.basedata.classification.service.dao.mapper.MdBaseClassstandardMapper">
</mapper>

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardDto.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardDto.java
View File

@@ -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;

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardQuery.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardQuery.java
View File

@@ -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

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardTrees.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/dto/MdBaseClassstandardTrees.java
View File

@@ -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;

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/classification/service/impl/MdBaseClassstandardServiceImpl.java
View File

@@ -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;

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/controller/MdBaseMaterialController.java
View File

@@ -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;

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/IMdBaseMaterialService.java
View File

@@ -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;

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/MdBaseMaterial.java
View File

@@ -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;

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdBaseMaterialMapper.java
View File

@@ -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

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dao/mapper/MdBaseMaterialMapper.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.database.material.service.dao.mapper.MdBaseMaterialMapper">
<mapper namespace="org.nl.wms.basedata.material.service.dao.mapper.MdBaseMaterialMapper">
<select id="queryByInventory" resultType="org.nl.wms.database.material.service.dao.MdBaseMaterial">
<select id="queryByInventory" resultType="org.nl.wms.basedata.material.service.dao.MdBaseMaterial">
WITH CTE AS (
SELECT
mm.*,

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialDto.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dto/MdBaseMaterialDto.java
View File

@@ -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;

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/dto/MdBaseMaterialQuery.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.database.material.service.dto;
package org.nl.wms.basedata.material.service.dto;
import lombok.Data;

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/material/service/impl/MdBaseMaterialServiceImpl.java
View File

@@ -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;

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/controller/MdBaseVehicleController.java
View File

@@ -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;

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/IMdBaseVehicleService.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/IMdBaseVehicleService.java
View File

@@ -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;

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/MdBaseVehicle.java
View File

@@ -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;

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.java
View File

@@ -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

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.database.vehicle.service.dao.mapper.MdBaseVehicleMapper">
<mapper namespace="org.nl.wms.basedata.vehicle.service.dao.mapper.MdBaseVehicleMapper">
</mapper>

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleDto.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleDto.java
View File

@@ -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;

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleQuery.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/dto/MdBaseVehicleQuery.java
View File

@@ -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

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/vehicle/service/impl/MdBaseVehicleServiceImpl.java
View File

@@ -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;

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/controller/MdBaseWorkshopController.java
View File

@@ -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;

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/IMdBaseWorkshopService.java
View File

@@ -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;

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dao/MdBaseWorkshop.java
View File

@@ -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;
/**

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dao/mapper/MdBaseWorkshopMapper.java
View File

@@ -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

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.xml → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dao/mapper/MdBaseWorkshopMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.database.workshop.service.dao.mapper.MdBaseWorkshopMapper">
<mapper namespace="org.nl.wms.basedata.workshop.service.dao.mapper.MdBaseWorkshopMapper">
</mapper>

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopDto.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dto/MdBaseWorkshopDto.java
View File

@@ -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;

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopQuery.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/dto/MdBaseWorkshopQuery.java
View File

@@ -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

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/workshop/service/impl/MdBaseWorkshopServiceImpl.java
View File

@@ -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;

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
View File

@@ -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;

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java
View File

@@ -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;

7
lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl
View File

@@ -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<Object> 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<Object> 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<Object> 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<Object> delete(@RequestBody Set<String> ids) {

18
lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl
View File

@@ -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;
</#if>
import lombok.Data;
import lombok.EqualsAndHashCode;
<#if hasTimestamp>
import java.sql.Timestamp;
import java.sql.Timestamp;
</#if>
<#if hasBigDecimal>
import java.math.BigDecimal;
import java.math.BigDecimal;
</#if>
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>)
</#if>
<#if column.remark != ''>
<#if column.remark?has_content>
/** ${column.remark} */
<#else>
/** ${column.changeColumnName} */
</#if>
private ${column.columnType} ${column.changeColumnName};

4
lms/nladmin-ui/src/i18n/langs/chinese.js
View File

@@ -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
}

4
lms/nladmin-ui/src/i18n/langs/english.js
View File

@@ -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
}

4
lms/nladmin-ui/src/i18n/langs/indonesian.js
View File

@@ -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
}

1
lms/nladmin-ui/src/i18n/langs/menu/en.js
View File

@@ -1,5 +1,6 @@
export default {
'menu': {
'home': 'home',
'title': 'Menu',
'placeholder': {
'fuzzy_search': 'fuzzy search',

1
lms/nladmin-ui/src/i18n/langs/menu/in.js
View File

@@ -1,5 +1,6 @@
export default {
'menu': {
'home': 'halaman rumah',
'title': 'Menu',
'placeholder': {
'fuzzy_search': 'pencarian kabur',

1
lms/nladmin-ui/src/i18n/langs/menu/zh.js
View File

@@ -1,5 +1,6 @@
export default {
'menu': {
'home': '首页',
'title': '菜单',
'placeholder': {
'fuzzy_search': '模糊搜索',