用户修改,单据类型修改,往来单位修改,单据管理

master
anthonywj 2 years ago
parent a2e2e31e6d
commit 02e236724a

@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.*; import com.glxp.api.entity.auth.*;
import com.glxp.api.req.auth.AuthUserSaveRequest; import com.glxp.api.req.auth.AuthUserSaveRequest;
import com.glxp.api.req.auth.FilterInvLinkDataRequest; import com.glxp.api.req.auth.FilterInvLinkDataRequest;
@ -25,13 +26,11 @@ import java.util.*;
* *
*/ */
@RestController @RestController
public class AuthUserController { public class AuthUserController extends BaseController {
@Resource @Resource
private AuthAdminService authAdminService; private AuthAdminService authAdminService;
@Resource @Resource
private InvWarehouseService invWarehouseService;
@Resource
private WarehouseUserService warehouseUserService; private WarehouseUserService warehouseUserService;
@ -43,16 +42,9 @@ public class AuthUserController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
if (authUserSaveRequest.getId() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误!");
}
InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(authUserSaveRequest.getLocSubInvCode());
if (invWarehouseEntity != null) {
authUserSaveRequest.setLocInvCode(invWarehouseEntity.getParentId());
}
AuthAdmin authAdmin = new AuthAdmin(); AuthAdmin authAdmin = new AuthAdmin();
BeanUtils.copyProperties(authUserSaveRequest, authAdmin); BeanUtils.copyProperties(authUserSaveRequest, authAdmin);
authAdmin.setId(getUserId());
authAdmin.setLastModifyTime(new Date()); authAdmin.setLastModifyTime(new Date());
boolean b = authAdminService.updateAuthAdmin(authAdmin); boolean b = authAdminService.updateAuthAdmin(authAdmin);
if (!b) { if (!b) {
@ -83,7 +75,7 @@ public class AuthUserController {
// 先删除之前的角色 // 先删除之前的角色
//todo 记得删除用户关联角色表 //todo 记得删除用户关联角色表
// authRoleAdminService.deleteByAdminId(authAdminSaveRequest.getId()); // authRoleAdminService.deleteByAdminId(authAdminSaveRequest.getId());
warehouseUserService.deleteByCodeAndId(authUserSaveRequest.getId(), byId.getLocSubInvCode()); warehouseUserService.deleteByCodeAndId(authUserSaveRequest.getId(), byId.getLocInvCode());
return ResultVOUtils.success(); return ResultVOUtils.success();
} }

@ -73,7 +73,7 @@ public class DeptController {
AuthAdmin authAdmin = customerService.getUserBean(); AuthAdmin authAdmin = customerService.getUserBean();
filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setStatus(1);
filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); filterInvWarehouseRequest.setUserId(authAdmin.getId());
List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
return ResultVOUtils.success(mInvWarehouseEntities); return ResultVOUtils.success(mInvWarehouseEntities);
} }
@ -115,7 +115,7 @@ public class DeptController {
filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setStatus(1);
List<DeptEntity> invWarehouseEntities; List<DeptEntity> invWarehouseEntities;
AuthAdmin authAdmin = customerService.getUserBean(); AuthAdmin authAdmin = customerService.getUserBean();
filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); filterInvWarehouseRequest.setUserId(authAdmin.getId());
filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setPid(0);
List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
Map<String, DeptEntity> invWarehouseEntityMap = new HashMap<>(); Map<String, DeptEntity> invWarehouseEntityMap = new HashMap<>();
@ -141,7 +141,7 @@ public class DeptController {
public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
List<DeptEntity> invWarehouseEntities; List<DeptEntity> invWarehouseEntities;
AuthAdmin authAdmin = customerService.getUserBean(); AuthAdmin authAdmin = customerService.getUserBean();
filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); filterInvWarehouseRequest.setUserId(authAdmin.getId());
filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setPid(0);
invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
return ResultVOUtils.success(invWarehouseEntities); return ResultVOUtils.success(invWarehouseEntities);

@ -8,6 +8,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.*; import com.glxp.api.entity.auth.*;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.system.SystemParamConfigEntity;
@ -38,7 +39,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
@RestController @RestController
public class InvWarehouseController { public class InvWarehouseController extends BaseController {
@Resource @Resource
InvWarehouseService invWarehouseService; InvWarehouseService invWarehouseService;
@ -64,7 +65,40 @@ public class InvWarehouseController {
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(responses); pageSimpleResponse.setList(responses);
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
}
/**
* -
*
* @param filterInvWarehouseRequest
* @return
*/
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/findByUser")
public BaseResponse findByDept(FilterInvWarehouseRequest filterInvWarehouseRequest) {
AuthAdmin authAdmin = getUser();
filterInvWarehouseRequest.setUserId(authAdmin.getId());
if (StrUtil.isEmpty(filterInvWarehouseRequest.getDeptCode())) {
return ResultVOUtils.error(500, "部门编码不能为空");
}
List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
return ResultVOUtils.success(invSubWarehouseEntities);
}
/**
*
*
* @param filterInvWarehouseRequest
* @return
*/
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/findByUser")
public BaseResponse findByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
AuthAdmin authAdmin = getUser();
filterInvWarehouseRequest.setUserId(authAdmin.getId());
List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
return ResultVOUtils.success(invSubWarehouseEntities);
} }
@ -80,14 +114,14 @@ public class InvWarehouseController {
if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) {
if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || filterInvWarehouseRequest.getFilter() == 2) { if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || filterInvWarehouseRequest.getFilter() == 2) {
if (authAdmin.getCustomerId() == 110) { if (authAdmin.getCustomerId() == 110) {
filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); filterInvWarehouseRequest.setUserId(authAdmin.getId());
} else { } else {
filterInvWarehouseRequest.setSpUse(true); filterInvWarehouseRequest.setSpUse(true);
} }
} }
} else { } else {
if (filterInvWarehouseRequest.getFilter() == 3 && filterInvWarehouseRequest.getFilter() != null) { if (filterInvWarehouseRequest.getFilter() != null && filterInvWarehouseRequest.getFilter() == 3) {
filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); filterInvWarehouseRequest.setUserId(authAdmin.getId());
} else { } else {
//走这边表示单据选择的是往来单位里面调出调入的库 //走这边表示单据选择的是往来单位里面调出调入的库
//判断单据类型是1就是设置单据需要需要查询除自己以外的分库 //判断单据类型是1就是设置单据需要需要查询除自己以外的分库

@ -47,18 +47,14 @@ public class LoginController extends BaseController {
private AuthAdminService authAdminService; private AuthAdminService authAdminService;
@Resource @Resource
private LogininforService logininforService; private LogininforService logininforService;
@Resource @Resource
private AuthCheckService authCheckService; private AuthCheckService authCheckService;
@Resource @Resource
SysPdaKeyService sysPdaKeyService; SysPdaKeyService sysPdaKeyService;
@Resource @Resource
SysPermissionService sysPermissionService; SysPermissionService sysPermissionService;
@Resource @Resource
private CompanyService companyService; private CompanyService companyService;
@Resource @Resource
private AuthLicenseDao authLicenseDao; private AuthLicenseDao authLicenseDao;
@ -119,7 +115,7 @@ public class LoginController extends BaseController {
LoginResponse loginResponse = new LoginResponse(); LoginResponse loginResponse = new LoginResponse();
loginResponse.setId(authAdmin.getId() + ""); loginResponse.setId(authAdmin.getId() + "");
loginResponse.setToken(token); loginResponse.setToken(token);
loginResponse.setDept(authAdmin.getDept()); loginResponse.setDept(authAdmin.getLocDeptCode());
loginResponse.setDeptName(authAdmin.getDeptName()); loginResponse.setDeptName(authAdmin.getDeptName());
logininforService.recordLogininfor(authAdmin.getEmployeeName(), Constant.LOGIN_SUCCESS, "登录成功!", request); logininforService.recordLogininfor(authAdmin.getEmployeeName(), Constant.LOGIN_SUCCESS, "登录成功!", request);
@ -205,10 +201,10 @@ public class LoginController extends BaseController {
AuthAdmin authAdmin = authAdminService.findById(id); AuthAdmin authAdmin = authAdminService.findById(id);
LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse();
BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); BeanUtils.copyProperties(authAdmin, loginUserInfoResponse);
DeptEntity deptEntity = deptService.selectByCode(authAdmin.getLocInvCode()); DeptEntity deptEntity = deptService.selectByCode(authAdmin.getLocDeptCode());
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(authAdmin.getLocSubInvCode()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(authAdmin.getLocInvCode());
loginUserInfoResponse.setLocInvName(deptEntity.getName()); loginUserInfoResponse.setLocDeptName(deptEntity.getName());
loginUserInfoResponse.setLocSubInvName(invWarehouseEntity.getName()); loginUserInfoResponse.setLocInvName(invWarehouseEntity.getName());
return ResultVOUtils.success(loginUserInfoResponse); return ResultVOUtils.success(loginUserInfoResponse);
} }
@ -225,8 +221,8 @@ public class LoginController extends BaseController {
BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); BeanUtils.copyProperties(authAdmin, loginUserInfoResponse);
CompanyEntity companyEntity = companyService.findCompany(); CompanyEntity companyEntity = companyService.findCompany();
loginUserInfoResponse.setCompanyName(companyEntity.getName()); loginUserInfoResponse.setCompanyName(companyEntity.getName());
loginUserInfoResponse.setLocInvName(deptService.getInvName(loginUserInfoResponse.getLocInvCode())); loginUserInfoResponse.setLocDeptName(deptService.getInvName(loginUserInfoResponse.getLocDeptCode()));
loginUserInfoResponse.setLocSubInvName(invWarehouseService.getSubInvName(loginUserInfoResponse.getLocSubInvCode())); loginUserInfoResponse.setLocInvName(invWarehouseService.getSubInvName(loginUserInfoResponse.getLocInvCode()));
// 角色集合 // 角色集合
Set<String> roles = sysPermissionService.getRolePermission(authAdmin); Set<String> roles = sysPermissionService.getRolePermission(authAdmin);

@ -62,6 +62,31 @@ public class BasicBussinessTypeController extends BaseController {
return ResultVOUtils.page(pageInfo); return ResultVOUtils.page(pageInfo);
} }
/**
* -
*
* @return
*/
@AuthRuleAnnotation("")
@GetMapping("/udiwms/busType/findByInvUser")
public BaseResponse findByInvUser(FilterBussinessTypeRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (StrUtil.isEmpty(bussinessTypeFilterRequest.getCode())) {
return ResultVOUtils.error(500, "仓库编码不能为空!");
}
bussinessTypeFilterRequest.setUserId(getUserId());
List<BasicBussinessTypeResponse> bussinessTypeEntities;
bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(
bussinessTypeFilterRequest);
return ResultVOUtils.success(bussinessTypeEntities);
}
/** /**
* *
* *
@ -107,7 +132,6 @@ public class BasicBussinessTypeController extends BaseController {
/** /**
* *
* *
* @param bussinessTypeEntity
* @param bindingResult * @param bindingResult
* @return * @return
*/ */

@ -0,0 +1,38 @@
package com.glxp.api.controller.inout;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.req.inout.FilterIoCodeRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.inout.IoCodeTempService;
import com.glxp.api.util.page.TableDataInfo;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@RestController
public class IoCodeTempController extends BaseController {
@Resource
private IoCodeTempService codeTempService;
@AuthRuleAnnotation("")
@GetMapping("admin/warehouse/inout/findErrorByOrderId")
public BaseResponse findErrorByOrderId(FilterIoCodeRequest warehouseQueryRequest) {
if (StrUtil.isEmpty(warehouseQueryRequest.getOrderId())) {
return ResultVOUtils.error(500, "单据号不能为空!");
}
TableDataInfo<IoCodeTempEntity> tableDataInfo = codeTempService.findByOrderId(warehouseQueryRequest);
PageSimpleResponse<IoCodeTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(tableDataInfo.getTotal());
pageSimpleResponse.setList(tableDataInfo.getList());
return ResultVOUtils.success(pageSimpleResponse);
}
}

@ -1,7 +1,7 @@
package com.glxp.api.dao.basic; package com.glxp.api.dao.basic;
import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.ProductInfoEntity;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import com.glxp.api.req.basic.ProductInfoFilterRequest; import com.glxp.api.req.basic.ProductInfoFilterRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

@ -0,0 +1,8 @@
package com.glxp.api.dao.inout;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.inout.IoCodeEnttity;
import com.glxp.api.entity.inout.IoCodeTempEntity;
public interface IoCodeTempDao extends BaseMapperPlus<IoCodeTempDao, IoCodeTempEntity, IoCodeTempEntity> {
}

@ -29,10 +29,9 @@ public class AuthAdmin {
private String comments; private String comments;
private String employeeName; private String employeeName;
private Long CustomerId; private Long CustomerId;
private String locDeptCode;
private String locInvCode; private String locInvCode;
private String locSubInvCode;
private String dept;
private String deptName; private String deptName;

@ -0,0 +1,143 @@
package com.glxp.api.entity.inout;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName(value = "io_code_temp")
public class IoCodeTempEntity implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* UDI
*/
@TableField(value = "code")
private String code;
/**
*
*/
@TableField(value = "mainAction")
private String mainAction;
/**
*
*/
@TableField(value = "`action`")
private String action;
/**
*
*/
@TableField(value = "orderId")
private String orderId;
/**
*
*/
@TableField(value = "corpOrderId")
private String corpOrderId;
/**
* DI
*/
@TableField(value = "nameCode")
private String nameCode;
/**
*
*/
@TableField(value = "batchNo")
private String batchNo;
/**
*
*/
@TableField(value = "produceDate")
private String produceDate;
/**
*
*/
@TableField(value = "expireDate")
private String expireDate;
/**
*
*/
@TableField(value = "serialNo")
private String serialNo;
/**
*
*/
@TableField(value = "packageLevel")
private String packageLevel;
/**
* ID
*/
@TableField(value = "supId")
private String supId;
/**
* ID
*/
@TableField(value = "relId")
private Long relId;
/**
*
*/
@TableField(value = "`count`")
private Integer count;
/**
*
*/
@TableField(value = "reCount")
private Integer reCount;
/**
*
*/
@TableField(value = "deptCode")
private String deptCode;
/**
*
*/
@TableField(value = "invCode")
private String invCode;
/**
*
*/
@TableField(value = "warehouseCode")
private String warehouseCode;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
private Integer status; //条码校验状态
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,22 @@
package com.cpt.common.exception;
/**
*
*
* @author ruoyi
*/
public class UtilException extends RuntimeException {
private static final long serialVersionUID = 8247610319171014183L;
public UtilException(Throwable e) {
super(e.getMessage(), e);
}
public UtilException(String message) {
super(message);
}
public UtilException(String message, Throwable throwable) {
super(message, throwable);
}
}

@ -1,7 +1,7 @@
package com.glxp.api.http.req; package com.glxp.api.http.req;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -13,7 +13,6 @@ public class AuthUserSaveRequest {
// id // id
private Long id; private Long id;
// 昵称 // 昵称
@NotEmpty(message = "请输入用户名")
private String userName; private String userName;
// 登录密码 // 登录密码
private String passWord; private String passWord;
@ -33,9 +32,8 @@ public class AuthUserSaveRequest {
private String comments; private String comments;
// 角色ids // 角色ids
private List<Long> roles; private List<Long> roles;
private String locDeptCode;
private String locInvCode; private String locInvCode;
private String locSubInvCode;
private String dept;
private List<Long> depts; private List<Long> depts;
} }

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
/** /**

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
/** /**

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@ -13,12 +13,13 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
private Integer pid; private Integer pid;
private String code; private String code;
private String name; private String name;
private String deptCode;
private Boolean advanceType; private Boolean advanceType;
private Boolean isDefault; private Boolean isDefault;
private Date updateTime; private Date updateTime;
private Integer level; private Integer level;
private String pcode; private String pcode;
private Integer userId; private Long userId;
private String locInvCode; private String locInvCode;
private Integer status; private Integer status;
private String lastUpdateTime; private String lastUpdateTime;

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.auth; package com.glxp.api.req.auth;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,9 +1,7 @@
package com.glxp.api.req.basic; package com.glxp.api.req.basic;
import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.util.page.ListPageRequest;
import com.glxp.api.req.ListPageRequest;
import com.glxp.api.res.basic.BasicErpUnitsResponse; import com.glxp.api.res.basic.BasicErpUnitsResponse;
import com.glxp.api.res.thrsys.ThrCorpsResponse;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

@ -1,6 +1,6 @@
package com.glxp.api.req.basic; package com.glxp.api.req.basic;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.basic; package com.glxp.api.req.basic;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
/** /**

@ -1,6 +1,6 @@
package com.glxp.api.req.basic; package com.glxp.api.req.basic;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
/** /**

@ -1,6 +1,6 @@
package com.glxp.api.req.basic; package com.glxp.api.req.basic;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

@ -1,6 +1,6 @@
package com.glxp.api.req.basic; package com.glxp.api.req.basic;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,7 +1,7 @@
package com.glxp.api.req.basic; package com.glxp.api.req.basic;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,7 +1,7 @@
package com.glxp.api.req.basic; package com.glxp.api.req.basic;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;

@ -1,6 +1,6 @@
package com.glxp.api.req.basic; package com.glxp.api.req.basic;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

@ -1,6 +1,6 @@
package com.glxp.api.req.basic; package com.glxp.api.req.basic;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.basic; package com.glxp.api.req.basic;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.basic; package com.glxp.api.req.basic;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

@ -1,8 +1,21 @@
package com.glxp.api.req.inout; package com.glxp.api.req.inout;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.List;
@Data @Data
public class FilterIoCodeRequest { public class FilterIoCodeRequest extends ListPageRequest {
private String corpOrderId;
private String code;
private String udi;
private String batchNo;
private String orderId;
private String nameCode;
private String supId;
private String locStorageCode;
private String relId;
List<String> actions;
} }

@ -1,6 +1,6 @@
package com.glxp.api.req.monitor; package com.glxp.api.req.monitor;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.monitor; package com.glxp.api.req.monitor;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.system; package com.glxp.api.req.system;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

@ -1,6 +1,6 @@
package com.glxp.api.req.system; package com.glxp.api.req.system;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.system; package com.glxp.api.req.system;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

@ -1,6 +1,6 @@
package com.glxp.api.req.system; package com.glxp.api.req.system;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

@ -1,6 +1,6 @@
package com.glxp.api.req.system; package com.glxp.api.req.system;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.system; package com.glxp.api.req.system;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

@ -1,6 +1,6 @@
package com.glxp.api.req.system; package com.glxp.api.req.system;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.system; package com.glxp.api.req.system;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,6 +1,6 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
/** /**

@ -1,7 +1,7 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -1,7 +1,7 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;

@ -1,7 +1,7 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse;
import lombok.Data; import lombok.Data;

@ -1,6 +1,6 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;

@ -1,7 +1,7 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import com.glxp.api.res.thrsys.ThrInvProductResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse;
import lombok.Data; import lombok.Data;

@ -1,7 +1,7 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;

@ -1,7 +1,7 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.res.thrsys.ThrOrderResponse;
import lombok.Data; import lombok.Data;

@ -1,14 +1,8 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.baomidou.mybatisplus.annotation.IdType; import com.glxp.api.util.page.ListPageRequest;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.glxp.api.req.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.Date;
@Data @Data
public class FilterThrProductsExportLogRequest extends ListPageRequest { public class FilterThrProductsExportLogRequest extends ListPageRequest {

@ -1,6 +1,6 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -2,7 +2,7 @@ package com.glxp.api.req.thrsys;
import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

@ -1,6 +1,6 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@Data @Data

@ -2,7 +2,7 @@ package com.glxp.api.req.thrsys;
import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrCorpEntity;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

@ -1,7 +1,7 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import com.glxp.api.res.thrsys.ThrInvProductResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse;
import lombok.Data; import lombok.Data;

@ -1,7 +1,7 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse;
import lombok.Data; import lombok.Data;

@ -1,6 +1,6 @@
package com.glxp.api.req.thrsys; package com.glxp.api.req.thrsys;
import com.glxp.api.req.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
/** /**

@ -17,11 +17,11 @@ public class LoginUserInfoResponse {
private String employeeName; private String employeeName;
// 权限列表 // 权限列表
private List<String> authRules; private List<String> authRules;
private String locDeptCode;
private String locInvCode; private String locInvCode;
private String locSubInvCode;
private String locDeptName;
private String locInvName; private String locInvName;
private String locSubInvName;
Set<String> roles; //用户角色 Set<String> roles; //用户角色
Set<String> permissions; //用户权限 Set<String> permissions; //用户权限

@ -48,7 +48,7 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
if (null != filterBussinessTypeRequest.getPage() && null != filterBussinessTypeRequest.getLimit()) { if (null != filterBussinessTypeRequest.getPage() && null != filterBussinessTypeRequest.getLimit()) {
PageHelper.offsetPage((filterBussinessTypeRequest.getPage() - 1) * filterBussinessTypeRequest.getLimit(), filterBussinessTypeRequest.getLimit()); PageHelper.offsetPage((filterBussinessTypeRequest.getPage() - 1) * filterBussinessTypeRequest.getLimit(), filterBussinessTypeRequest.getLimit());
} }
return basicBussinessTypeDao.filterList(filterBussinessTypeRequest); return basicBussinessTypeDao.filterJoinByUser(filterBussinessTypeRequest);
} }
@Override @Override

@ -0,0 +1,17 @@
package com.glxp.api.service.inout;
import com.glxp.api.entity.inout.IoCodeEnttity;
import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.req.inout.FilterIoCodeRequest;
import com.glxp.api.util.page.PageQuery;
import com.glxp.api.util.page.TableDataInfo;
import java.util.List;
public interface IoCodeTempService {
List<IoCodeTempEntity> findByOrderId(String billNo);
TableDataInfo<IoCodeTempEntity> findByOrderId(FilterIoCodeRequest filterIoCodeRequest);
}

@ -7,11 +7,13 @@ import com.glxp.api.entity.inout.IoCodeEnttity;
import com.glxp.api.service.inout.IoCodeService; import com.glxp.api.service.inout.IoCodeService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List; import java.util.List;
@Service @Service
public class IoCodeServiceImpl implements IoCodeService { public class IoCodeServiceImpl implements IoCodeService {
@Resource
IoCodeDao ioCodeDao; IoCodeDao ioCodeDao;
@Override @Override

@ -0,0 +1,39 @@
package com.glxp.api.service.inout.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.glxp.api.dao.inout.IoCodeTempDao;
import com.glxp.api.entity.auth.SysDictData;
import com.glxp.api.entity.inout.IoCodeEnttity;
import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.req.inout.FilterIoCodeRequest;
import com.glxp.api.service.inout.IoCodeTempService;
import com.glxp.api.util.BeanCopyUtils;
import com.glxp.api.util.page.PageQuery;
import com.glxp.api.util.page.TableDataInfo;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@Service
public class IoCodeTempServiceImpl implements IoCodeTempService {
@Resource
IoCodeTempDao ioCodeTempDao;
@Override
public List<IoCodeTempEntity> findByOrderId(String billNo) {
return ioCodeTempDao.selectList(new QueryWrapper<IoCodeTempEntity>().eq("orderId", billNo));
}
@Override
public TableDataInfo<IoCodeTempEntity> findByOrderId(FilterIoCodeRequest filterIoCodeRequest) {
PageQuery pageQuery = new PageQuery();
BeanCopyUtils.copy(filterIoCodeRequest, pageQuery);
Page<IoCodeTempEntity> page = ioCodeTempDao.selectPage(pageQuery.build(), new QueryWrapper<IoCodeTempEntity>().eq("orderId", filterIoCodeRequest.getOrderId()));
return TableDataInfo.build(page);
}
}

@ -0,0 +1,271 @@
package com.glxp.api.util;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.springframework.util.AntPathMatcher;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
*
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class StringUtils extends org.apache.commons.lang3.StringUtils {
/**
*
*
* @param str defaultValue value
* @return value
*/
public static String blankToDefault(String str, String defaultValue) {
return StrUtil.blankToDefault(str, defaultValue);
}
/**
* *
*
* @param str String
* @return true false
*/
public static boolean isEmpty(String str) {
return StrUtil.isEmpty(str);
}
/**
* *
*
* @param str String
* @return true false
*/
public static boolean isNotEmpty(String str) {
return !isEmpty(str);
}
/**
*
*/
public static String trim(String str) {
return StrUtil.trim(str);
}
/**
*
*
* @param str
* @param start
* @return
*/
public static String substring(final String str, int start) {
return substring(str, start, str.length());
}
/**
*
*
* @param str
* @param start
* @param end
* @return
*/
public static String substring(final String str, int start, int end) {
return StrUtil.sub(str, start, end);
}
/**
* , {} <br>
* {} <br>
* {} 使 \\ { {} \ 使 \\\\ <br>
* <br>
* 使format("this is {} for {}", "a", "b") -> this is a for b<br>
* {} format("this is \\{} for {}", "a", "b") -> this is {} for a<br>
* \ format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
*
* @param template {}
* @param params
* @return
*/
public static String format(String template, Object... params) {
return StrUtil.format(template, params);
}
/**
* http(s)://开头
*
* @param link
* @return
*/
public static boolean ishttp(String link) {
return Validator.isUrl(link);
}
/**
* set
*
* @param str
* @param sep
* @return set
*/
public static Set<String> str2Set(String str, String sep) {
return new HashSet<>(str2List(str, sep, true, false));
}
/**
* list
*
* @param str
* @param sep
* @param filterBlank
* @param trim
* @return list
*/
public static List<String> str2List(String str, String sep, boolean filterBlank, boolean trim) {
List<String> list = new ArrayList<>();
if (isEmpty(str)) {
return list;
}
// 过滤空白字符串
if (filterBlank && isBlank(str)) {
return list;
}
String[] split = str.split(sep);
for (String string : split) {
if (filterBlank && isBlank(string)) {
continue;
}
if (trim) {
string = trim(string);
}
list.add(string);
}
return list;
}
/**
*
*
* @param cs
* @param searchCharSequences
* @return
*/
public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) {
return StrUtil.containsAnyIgnoreCase(cs, searchCharSequences);
}
/**
* 线
*/
public static String toUnderScoreCase(String str) {
return StrUtil.toUnderlineCase(str);
}
/**
*
*
* @param str
* @param strs
* @return true
*/
public static boolean inStringIgnoreCase(String str, String... strs) {
return StrUtil.equalsAnyIgnoreCase(str, strs);
}
/**
* 线线 HELLO_WORLD->HelloWorld
*
* @param name 线
* @return
*/
public static String convertToCamelCase(String name) {
return StrUtil.upperFirst(StrUtil.toCamelCase(name));
}
/**
* user_name->userName
*/
public static String toCamelCase(String s) {
return StrUtil.toCamelCase(s);
}
/**
*
*
* @param str
* @param strs
* @return
*/
public static boolean matches(String str, List<String> strs) {
if (isEmpty(str) || CollUtil.isEmpty(strs)) {
return false;
}
for (String pattern : strs) {
if (isMatch(pattern, str)) {
return true;
}
}
return false;
}
/**
* url:
* ? ;
* * ;
* ** ;
*
* @param pattern
* @param url url
* @return
*/
public static boolean isMatch(String pattern, String url) {
AntPathMatcher matcher = new AntPathMatcher();
return matcher.match(pattern, url);
}
/**
* 0使size size
*
* @param num
* @param size
* @return
*/
public static final String padl(final Number num, final int size) {
return padl(num.toString(), size, '0');
}
/**
* ssizesize
*
* @param s
* @param size
* @param c
* @return
*/
public static final String padl(final String s, final int size, final char c) {
final StringBuilder sb = new StringBuilder(size);
if (s != null) {
final int len = s.length();
if (s.length() <= size) {
for (int i = size - len; i > 0; i--) {
sb.append(c);
}
sb.append(s);
} else {
return s.substring(len - size, len);
}
} else {
for (int i = size; i > 0; i--) {
sb.append(c);
}
}
return sb.toString();
}
}

@ -1,4 +1,4 @@
package com.glxp.api.req; package com.glxp.api.util.page;
import lombok.Data; import lombok.Data;

@ -0,0 +1,85 @@
package com.glxp.api.util.page;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.api.util.StringUtils;
import lombok.Data;
import java.io.Serializable;
/**
*
*
* @author Lion Li
*/
@Data
public class PageQuery implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
private Integer limit;
/**
*
*/
private Integer page;
/**
*
*/
private String orderByColumn;
/**
* descasc
*/
private String isAsc;
/**
*
*/
public static final int DEFAULT_PAGE_NUM = 1;
/**
*
*/
public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
public <T> Page<T> build() {
Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM);
Integer pageSize = ObjectUtil.defaultIfNull(getLimit(), DEFAULT_PAGE_SIZE);
if (pageNum <= 0) {
pageNum = DEFAULT_PAGE_NUM;
}
Page<T> page = new Page<>(pageNum, pageSize);
OrderItem orderItem = buildOrderItem();
if (ObjectUtil.isNotNull(orderItem)) {
page.addOrder(orderItem);
}
return page;
}
private OrderItem buildOrderItem() {
// 兼容前端排序类型
if ("ascending".equals(isAsc)) {
isAsc = "asc";
} else if ("descending".equals(isAsc)) {
isAsc = "desc";
}
if (StringUtils.isNotBlank(orderByColumn)) {
String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
orderBy = StringUtils.toUnderScoreCase(orderBy);
if ("asc".equals(isAsc)) {
return OrderItem.asc(orderBy);
} else if ("desc".equals(isAsc)) {
return OrderItem.desc(orderBy);
}
}
return null;
}
}

@ -0,0 +1,56 @@
package com.glxp.api.util.page;
import cn.hutool.core.exceptions.UtilException;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.StringUtils;
/**
* sql
*
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class SqlUtil {
/**
* sql
*/
public static final String SQL_REGEX = "select |insert |delete |update |drop |count |exec |chr |mid |master |truncate |char |and |declare ";
/**
* 线
*/
public static final String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+";
/**
*
*/
public static String escapeOrderBySql(String value) {
if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) {
throw new UtilException("参数不符合规范,不能进行查询");
}
return value;
}
/**
* order by
*/
public static boolean isValidOrderBySql(String value) {
return value.matches(SQL_PATTERN);
}
/**
* SQL
*/
public static void filterKeyword(String value) {
if (StringUtils.isEmpty(value)) {
return;
}
String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|");
for (String sqlKeyword : sqlKeywords) {
if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1) {
throw new UtilException("参数存在SQL注入风险");
}
}
}
}

@ -0,0 +1,76 @@
package com.glxp.api.util.page;
import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
*
*/
@Data
@NoArgsConstructor
public class TableDataInfo<T> implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
private long total;
/**
*
*/
private List<T> list;
/**
*
*/
private int code;
/**
*
*/
private String msg;
/**
*
*
* @param list
* @param total
*/
public TableDataInfo(List<T> list, long total) {
this.list = list;
this.total = total;
}
public static <T> TableDataInfo<T> build(IPage<T> page) {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("查询成功");
rspData.setList(page.getRecords());
rspData.setTotal(page.getTotal());
return rspData;
}
public static <T> TableDataInfo<T> build(List<T> list) {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("查询成功");
rspData.setList(list);
rspData.setTotal(list.size());
return rspData;
}
public static <T> TableDataInfo<T> build() {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("查询成功");
return rspData;
}
}

@ -6,7 +6,7 @@
<select id="listAdminPage" parameterType="com.glxp.api.req.auth.FilterAuthUserRequest" <select id="listAdminPage" parameterType="com.glxp.api.req.auth.FilterAuthUserRequest"
resultType="com.glxp.api.entity.auth.AuthAdmin"> resultType="com.glxp.api.entity.auth.AuthAdmin">
SELECT auth_user.*,auth_dept.name deptName SELECT auth_user.*,auth_dept.name deptName
FROM auth_user left join auth_dept on auth_user.locDeptCode = auth_dept.code FROM auth_user left join auth_dept on auth_user.dept = auth_dept.code
<where> <where>
<if test="ids != null and ids.size > 0"> <if test="ids != null and ids.size > 0">
AND id IN AND id IN
@ -62,9 +62,8 @@
</select> </select>
<insert id="insertAuthAdmin" keyProperty="id" parameterType="com.glxp.api.entity.auth.AuthAdmin"> <insert id="insertAuthAdmin" keyProperty="id" parameterType="com.glxp.api.entity.auth.AuthAdmin">
INSERT INTO INSERT INTO auth_user( userName, passWord, lastLoginIp, lastLoginTime, createTime, userFlag
auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag , employeeName, CustomerId, lastModifyTime, locDeptCode, locInvCode, comments)
,employeeName,CustomerId,lastModifyTime,locInvCode,locSubInvCode,dept,comments)
values values
(#{userName}, (#{userName},
<choose> <choose>
@ -98,15 +97,14 @@
#{employeeName}, #{employeeName},
#{CustomerId}, #{CustomerId},
#{lastModifyTime}, #{lastModifyTime},
#{locInvCode}, #{locDeptCode},
#{locSubInvCode}, #{locInvCode}, #{comments})
#{dept},#{comments})
</insert> </insert>
<insert id="replaceAuthAdmin" keyProperty="id" parameterType="com.glxp.api.entity.auth.AuthAdmin"> <insert id="replaceAuthAdmin" keyProperty="id" parameterType="com.glxp.api.entity.auth.AuthAdmin">
replace replace
INTO auth_user(id, userName, passWord, lastLoginIp, INTO auth_user(id, userName, passWord, lastLoginIp,
lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId,locInvCode,locSubInvCode,dept,comments) lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId,locDeptCode,locInvCode,comments)
values ( values (
#{id}, #{id},
#{userName}, #{userName},
@ -118,9 +116,8 @@
#{lastModifyTime}, #{lastModifyTime},
#{employeeName}, #{employeeName},
#{CustomerId}, #{CustomerId},
#{locDeptCode},
#{locInvCode}, #{locInvCode},
#{locSubInvCode},
#{dept},
#{comments} #{comments}
) )
</insert> </insert>
@ -129,17 +126,36 @@
<update id="updateAuthAdmin" parameterType="com.glxp.api.entity.auth.AuthAdmin"> <update id="updateAuthAdmin" parameterType="com.glxp.api.entity.auth.AuthAdmin">
UPDATE auth_user UPDATE auth_user
<set> <set>
<if test="userName != null">userName=#{userName},</if> <if test="userName != null">
<if test="passWord != null">passWord=#{passWord},</if> userName=#{userName},
<if test="lastLoginIp != null">lastLoginIp=#{lastLoginIp},</if> </if>
<if test="lastLoginTime != null">lastLoginTime=#{lastLoginTime},</if> <if test="passWord != null">
<if test="lastModifyTime != null">lastModifyTime=#{lastModifyTime},</if> passWord=#{passWord},
<if test="userFlag != null">userFlag=#{userFlag},</if> </if>
<if test="employeeName != null">employeeName=#{employeeName},</if> <if test="lastLoginIp != null">
<if test="locInvCode != null">locInvCode=#{locInvCode},</if> lastLoginIp=#{lastLoginIp},
<if test="locSubInvCode != null">locSubInvCode=#{locSubInvCode},</if> </if>
<if test="dept != null">dept=#{dept},</if> <if test="lastLoginTime != null">
<if test="comments != null">comments=#{comments},</if> lastLoginTime=#{lastLoginTime},
</if>
<if test="lastModifyTime != null">
lastModifyTime=#{lastModifyTime},
</if>
<if test="userFlag != null">
userFlag=#{userFlag},
</if>
<if test="employeeName != null">
employeeName=#{employeeName},
</if>
<if test="locDeptCode != null">
locDeptCode=#{locDeptCode},
</if>
<if test="locInvCode != null">
locInvCode=#{locInvCode},
</if>
<if test="comments != null">
comments=#{comments},
</if>
</set> </set>
WHERE id=#{id} WHERE id=#{id}
</update> </update>
@ -195,7 +211,7 @@
left join auth_user_role sur on u.id = sur.user_id left join auth_user_role sur on u.id = sur.user_id
left join auth_role r on r.role_id = sur.role_id left join auth_role r on r.role_id = sur.role_id
<where> <where>
<if test="ids!=null and ids.size()!=0"> <if test="ids != null and ids.size() != 0">
u.id not in u.id not in
<foreach collection="ids" item="item" index="index" separator="," open="(" close=")"> <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
#{item} #{item}

@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.auth.InvSubWarehouseDao"> <mapper namespace="com.glxp.api.dao.auth.InvSubWarehouseDao">
<select id="filterInvSubWarehouse" parameterType="com.glxp.api.req.auth.FilterInvSubWarehouseRequest" <select id="filterInvSubWarehouse" parameterType="com.glxp.api.req.auth.FilterInvSubWarehouseRequest"
resultType="com.glxp.api.entity.auth.InvWarehouseEntity"> resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
select * select *
@ -15,7 +14,7 @@
AND a.code = #{code} AND a.code = #{code}
</if> </if>
<if test="name != '' and name != null"> <if test="name != '' and name != null">
AND a.name like concat('%',#{name},'%') AND a.name like concat('%', #{name}, '%')
</if> </if>
<if test="parentId != '' and parentId != null"> <if test="parentId != '' and parentId != null">
AND a.parentId = #{parentId} AND a.parentId = #{parentId}
@ -23,14 +22,17 @@
<if test="defaultInv != '' and defaultInv != null"> <if test="defaultInv != '' and defaultInv != null">
AND a.defaultInv = #{defaultInv} AND a.defaultInv = #{defaultInv}
</if> </if>
</where> </where>
</select> </select>
<select id="selectJoinThirdSys" parameterType="Map" <select id="selectJoinThirdSys" parameterType="Map"
resultType="com.glxp.api.entity.auth.InvWarehouseEntity"> resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
select auth_warehouse.* ,a.name thirdName,a1.name thirdName1,a2.name thirdName2,a3.name thirdName3,a4.name select auth_warehouse.*,
a.name thirdName,
a1.name thirdName1,
a2.name thirdName2,
a3.name thirdName3,
a4.name
thirdName4 thirdName4
from auth_warehouse from auth_warehouse
LEFT JOIN thr_inv_warehouse a on a.code = auth_warehouse.thirdId LEFT JOIN thr_inv_warehouse a on a.code = auth_warehouse.thirdId
@ -52,9 +54,11 @@
limit 1 limit 1
</select> </select>
<select id="filterGroupInvSub" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest" <select id="filterGroupInvSub" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest"
resultType="com.glxp.api.entity.auth.InvWarehouseEntity"> resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
select auth_warehouse.*, auth_dept.`name` AS warehouseName from auth_warehouse INNER JOIN select auth_warehouse.*, auth_dept.`name` AS warehouseName from auth_warehouse
INNER JOIN
auth_dept auth_dept
on auth_warehouse.parentId = auth_dept.code on auth_warehouse.parentId = auth_dept.code
<if test="userId != '' and userId != null"> <if test="userId != '' and userId != null">
@ -64,6 +68,9 @@
<if test="userId != '' and userId != null"> <if test="userId != '' and userId != null">
AND auth_warehouse_user.userId = #{userId} AND auth_warehouse_user.userId = #{userId}
</if> </if>
<if test="deptCode != '' and deptCode != null">
AND auth_warehouse.parentId = #{deptCode}
</if>
<if test="pcode != '' and pcode != null"> <if test="pcode != '' and pcode != null">
AND auth_dept.code = #{pcode} AND auth_dept.code = #{pcode}
</if> </if>
@ -86,19 +93,20 @@
<select id="filterGroupInvSubAndcode" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest" <select id="filterGroupInvSubAndcode" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest"
resultType="com.glxp.api.entity.auth.InvWarehouseEntity"> resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
select auth_warehouse.* from auth_warehouse select auth_warehouse.*
from auth_warehouse
<where> <where>
<if test="code != '' and code != null"> <if test="code != '' and code != null">
AND auth_warehouse.code = #{code} AND auth_warehouse.code = #{code}
</if> </if>
</where> </where>
group by auth_warehouse.id group by auth_warehouse.id
</select> </select>
<select id="selectMaxCode" parameterType="com.glxp.api.req.auth.FilterInvSubWarehouseRequest" <select id="selectMaxCode" parameterType="com.glxp.api.req.auth.FilterInvSubWarehouseRequest"
resultType="com.glxp.api.entity.auth.InvWarehouseEntity"> resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
select max(code) as code from auth_warehouse select max(code) as code
from auth_warehouse
<where> <where>
<if test="id != '' and id != null"> <if test="id != '' and id != null">
AND id = #{id} AND id = #{id}
@ -113,7 +121,6 @@
AND parentId = #{parentId} AND parentId = #{parentId}
</if> </if>
</where> </where>
</select> </select>
@ -150,27 +157,44 @@
<update id="updateInvSubWarehouse" parameterType="com.glxp.api.entity.auth.InvWarehouseEntity"> <update id="updateInvSubWarehouse" parameterType="com.glxp.api.entity.auth.InvWarehouseEntity">
UPDATE auth_warehouse UPDATE auth_warehouse
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<if test="name != null">name=#{name},</if> <if test="name != null">
<if test="code != null">code=#{code},</if> name=#{name},
<if test="parentId != null">parentId=#{parentId},</if> </if>
<if test="remark != null">remark=#{remark},</if> <if test="code != null">
<if test="defaultInv != null">defaultInv=#{defaultInv},</if> code=#{code},
<if test="parentCode != null">parentCode=#{parentCode},</if> </if>
<if test="parentId != null">
parentId=#{parentId},
</if>
<if test="remark != null">
remark=#{remark},
</if>
<if test="defaultInv != null">
defaultInv=#{defaultInv},
</if>
<if test="parentCode != null">
parentCode=#{parentCode},
</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<insert id="importInvSubWarehouse" parameterType="java.util.List"> <insert id="importInvSubWarehouse" parameterType="java.util.List">
replace into auth_warehouse replace
into auth_warehouse
(id, code, `name`, parentId, remark,defaultInv,parentCode) (id, code, `name`, parentId, remark,defaultInv,parentCode)
values values
<foreach collection="invWarehouseEntities" item="item" index="index" separator=","> <foreach collection="invWarehouseEntities" item="item" index="index" separator=",">
( (
#{item.id}, #{item.id},
#{item.code}, #{item.code},
#{item.name}, #{item.name},
#{item.parentId}, #{item.parentId},
#{item.remark},#{item.defaultInv},#{item.parentCode}) #{item.remark},
#{item.defaultInv},
#{item.parentCode}
)
</foreach> </foreach>
</insert> </insert>
@ -195,8 +219,20 @@
<select id="filterInvSubWarehouseResponse" <select id="filterInvSubWarehouseResponse"
resultType="com.glxp.api.res.auth.InvSubWarehouseResponse"> resultType="com.glxp.api.res.auth.InvSubWarehouseResponse">
select a.id, a.code, a.name, a.parentId, a.remark, a.defaultInv, a.thirdId, a.thirdId1, a.thirdId2, select a.id,
a.thirdId3, a.thirdId4, b.name as parentName,a.parentCode,c.name parentInvName a.code,
a.name,
a.parentId,
a.remark,
a.defaultInv,
a.thirdId,
a.thirdId1,
a.thirdId2,
a.thirdId3,
a.thirdId4,
b.name as parentName,
a.parentCode,
c.name parentInvName
FROM auth_warehouse a FROM auth_warehouse a
left join auth_dept b on a.parentId = b.code left join auth_dept b on a.parentId = b.code
left join auth_warehouse c on a.parentCode = c.code left join auth_warehouse c on a.parentCode = c.code
@ -208,7 +244,7 @@
AND a.code = #{code} AND a.code = #{code}
</if> </if>
<if test="name != '' and name != null"> <if test="name != '' and name != null">
AND a.name like concat('%',#{name},'%') AND a.name like concat('%', #{name}, '%')
</if> </if>
<if test="parentId != '' and parentId != null"> <if test="parentId != '' and parentId != null">
AND a.parentId = #{parentId} AND a.parentId = #{parentId}
@ -224,17 +260,17 @@
<select id="filterGroupInvSubDown" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest" <select id="filterGroupInvSubDown" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest"
resultType="com.glxp.api.entity.auth.InvWarehouseEntity"> resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
select auth_warehouse.*, auth_dept.`name` AS warehouseName from auth_warehouse INNER JOIN select auth_warehouse.*, auth_dept.`name` AS warehouseName
from auth_warehouse
INNER JOIN
auth_dept auth_dept
on auth_warehouse.parentId = auth_dept.code on auth_warehouse.parentId = auth_dept.code
<where> <where>
<if test="subordinateCode != '' and subordinateCode != null"> <if test="subordinateCode != '' and subordinateCode != null">
AND auth_dept.pcode = #{subordinateCode} AND auth_dept.pcode = #{subordinateCode}
</if> </if>
</where> </where>
group by auth_warehouse.id group by auth_warehouse.id
</select> </select>
<select id="filterSubInvList" resultType="com.glxp.api.res.auth.InvSubWarehouseResponse"> <select id="filterSubInvList" resultType="com.glxp.api.res.auth.InvSubWarehouseResponse">
@ -249,7 +285,8 @@
a.thirdId2, a.thirdId2,
a.thirdId3, a.thirdId3,
a.thirdId4, a.thirdId4,
b.name parentName,a.parentCode b.name parentName,
a.parentCode
from auth_warehouse a from auth_warehouse a
left join auth_dept b on a.parentId = b.code left join auth_dept b on a.parentId = b.code
left join auth_warehouse_user c on a.code = c.code left join auth_warehouse_user c on a.code = c.code

@ -617,7 +617,7 @@
<!--测试专用--> <!--测试专用-->
<select id="findAllUuids" parameterType="com.glxp.api.req.ListPageRequest" resultType="java.lang.String"> <select id="findAllUuids" parameterType="com.glxp.api.util.page.ListPageRequest" resultType="java.lang.String">
SELECT uuid SELECT uuid
from device from device
group by uuid limit #{page}, #{limit} group by uuid limit #{page}, #{limit}

Loading…
Cancel
Save