Commit e60ef349 by 赵剑炜

整合2

parent c84d6cf3
package com.junmp.gold.api.bean.dto; package com.junmp.jyzb.api.bean.dto;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.api.bean.dto; package com.junmp.jyzb.api.bean.dto;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.api.bean.dto; package com.junmp.jyzb.api.bean.dto;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.api.bean.dto; package com.junmp.jyzb.api.bean.dto;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.api.bean.req; package com.junmp.jyzb.api.bean.req;
import com.junmp.v2.common.bean.request.BaseRequest; import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.validator.api.validators.unique.TableUniqueValue; import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;
......
package com.junmp.gold.api.bean.req; package com.junmp.jyzb.api.bean.req;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.api.bean.req; package com.junmp.jyzb.api.bean.req;
import com.junmp.v2.common.bean.request.BaseRequest; import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.validator.api.validators.unique.TableUniqueValue; import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;
......
package com.junmp.gold.api.bean.req; package com.junmp.jyzb.api.bean.req;
import com.junmp.v2.common.bean.request.BaseRequest; import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.validator.api.validators.unique.TableUniqueValue; import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;
......
package com.junmp.gold.api.bean.req; package com.junmp.jyzb.api.bean.req;
import com.junmp.v2.common.bean.request.BaseRequest; import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.api.bean.req; package com.junmp.jyzb.api.bean.req;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.junmp.v2.common.bean.request.BaseRequest; import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date;
/** /**
* <pre> * <pre>
......
package com.junmp.gold.api.bean.vo; package com.junmp.jyzb.api.bean.vo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.api.bean.vo; package com.junmp.jyzb.api.bean.vo;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.api.bean.vo; package com.junmp.jyzb.api.bean.vo;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.api.bean.vo; package com.junmp.jyzb.api.bean.vo;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.api.constant; package com.junmp.jyzb.api.constant;
/** /**
* <pre> * <pre>
......
package com.junmp.gold.api.exception; package com.junmp.jyzb.api.exception;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.junmp.gold.api.constant.JYZBConstant; import com.junmp.jyzb.api.constant.JYZBConstant;
import com.junmp.v2.common.exception.IExceptionEnum; import com.junmp.v2.common.exception.IExceptionEnum;
import com.junmp.v2.common.exception.base.ServiceException; import com.junmp.v2.common.exception.base.ServiceException;
......
package com.junmp.gold.api.exception.enums; package com.junmp.jyzb.api.exception.enums;
import com.junmp.gold.api.constant.JYZBConstant; import com.junmp.jyzb.api.constant.JYZBConstant;
import com.junmp.v2.common.constant.CommonConstant; import com.junmp.v2.common.constant.CommonConstant;
import com.junmp.v2.common.exception.IExceptionEnum; import com.junmp.v2.common.exception.IExceptionEnum;
import lombok.Getter; import lombok.Getter;
......
package com.junmp.gold.api.exception.enums; package com.junmp.jyzb.api.exception.enums;
import com.junmp.gold.api.constant.JYZBConstant; import com.junmp.jyzb.api.constant.JYZBConstant;
import com.junmp.v2.common.constant.CommonConstant; import com.junmp.v2.common.constant.CommonConstant;
import com.junmp.v2.common.exception.IExceptionEnum; import com.junmp.v2.common.exception.IExceptionEnum;
import lombok.Getter; import lombok.Getter;
......
...@@ -10,4 +10,4 @@ ...@@ -10,4 +10,4 @@
* *
* </pre> * </pre>
*/ */
package com.junmp.gold.api.exception.enums; package com.junmp.jyzb.api.exception.enums;
package com.junmp.gold.api.util; package com.junmp.jyzb.api.util;
import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
......
package com.junmp.gold.cache; package com.junmp.jyzb.cache;
import com.junmp.gold.api.constant.JYZBConstant; import com.junmp.jyzb.api.constant.JYZBConstant;
import com.junmp.v2.cache.AbstractRedisCache; import com.junmp.v2.cache.AbstractRedisCache;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
......
package com.junmp.gold.controller; package com.junmp.jyzb.controller;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.junmp.gold.api.bean.req.CompanyReq; import com.junmp.jyzb.api.bean.req.CompanyReq;
import com.junmp.gold.doc.CompanyDoc; import com.junmp.jyzb.doc.CompanyDoc;
import com.junmp.gold.entity.Company; import com.junmp.jyzb.entity.Company;
import com.junmp.gold.service.CompanyService; import com.junmp.jyzb.service.CompanyService;
import com.junmp.v2.common.bean.request.ValidationApi; import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.exception.base.ServiceException; import com.junmp.v2.common.exception.base.ServiceException;
......
package com.junmp.gold.controller; package com.junmp.jyzb.controller;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.junmp.gold.api.constant.JYZBConstant; import com.junmp.jyzb.api.constant.JYZBConstant;
import com.junmp.gold.cache.GoldRedisCache; import com.junmp.jyzb.cache.GoldRedisCache;
import com.junmp.gold.doc.LoginDoc; import com.junmp.jyzb.doc.LoginDoc;
import com.junmp.v2.auth.api.bean.auth.LoginReq; import com.junmp.v2.auth.api.bean.auth.LoginReq;
import com.junmp.v2.auth.api.bean.auth.LoginRes; import com.junmp.v2.auth.api.bean.auth.LoginRes;
import com.junmp.v2.auth.sign.AuthContainer; import com.junmp.v2.auth.sign.AuthContainer;
......
package com.junmp.gold.controller; package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.junmp.gold.api.bean.dto.ProductBatchDto; import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
import com.junmp.gold.api.bean.dto.ProductProcessDto; import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
import com.junmp.gold.api.bean.req.ProductBatchReq; import com.junmp.jyzb.api.bean.req.ProductBatchReq;
import com.junmp.gold.api.exception.enums.ProductExceptionEnum; import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.gold.api.util.GenCodeUtil; import com.junmp.jyzb.api.util.GenCodeUtil;
import com.junmp.gold.doc.ProductBatchDoc; import com.junmp.jyzb.doc.ProductBatchDoc;
import com.junmp.gold.entity.ProductBatch; import com.junmp.jyzb.entity.ProductBatch;
import com.junmp.gold.entity.ProductTag; import com.junmp.jyzb.entity.ProductTag;
import com.junmp.gold.service.ProductBatchService; import com.junmp.jyzb.service.ProductBatchService;
import com.junmp.gold.service.ProductTagService; import com.junmp.jyzb.service.ProductTagService;
import com.junmp.v2.common.bean.request.ValidationApi; import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.exception.base.ServiceException; import com.junmp.v2.common.exception.base.ServiceException;
......
package com.junmp.gold.controller; package com.junmp.jyzb.controller;
import com.junmp.gold.api.bean.req.ProductReq; import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.gold.doc.ProductDoc; import com.junmp.jyzb.doc.ProductDoc;
import com.junmp.gold.entity.Product; import com.junmp.jyzb.entity.Product;
import com.junmp.gold.service.ProductService; import com.junmp.jyzb.service.ProductService;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
package com.junmp.gold.controller; package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.junmp.gold.api.bean.req.ProductSkuReq; import com.junmp.jyzb.api.bean.req.ProductSkuReq;
import com.junmp.gold.api.bean.vo.ProductSkuVo; import com.junmp.jyzb.api.bean.vo.ProductSkuVo;
import com.junmp.gold.doc.ProductSkuDoc; import com.junmp.jyzb.doc.ProductSkuDoc;
import com.junmp.gold.entity.ProductSku; import com.junmp.jyzb.entity.ProductSku;
import com.junmp.gold.service.ProductSkuService; import com.junmp.jyzb.service.ProductSkuService;
import com.junmp.v2.common.bean.request.ValidationApi; import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.exception.base.ServiceException; import com.junmp.v2.common.exception.base.ServiceException;
......
package com.junmp.gold.controller; package com.junmp.jyzb.controller;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.HexUtil; import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.junmp.gold.api.bean.dto.ProductTagDto; import com.junmp.jyzb.api.bean.dto.ProductTagDto;
import com.junmp.gold.api.bean.req.ProductTagReq; import com.junmp.jyzb.api.bean.req.ProductTagReq;
import com.junmp.gold.api.bean.vo.TagInfoVo; import com.junmp.jyzb.api.bean.vo.TagInfoVo;
import com.junmp.gold.api.exception.enums.ProductExceptionEnum; import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.gold.doc.ProductTagDoc; import com.junmp.jyzb.doc.ProductTagDoc;
import com.junmp.gold.entity.ProductTag; import com.junmp.jyzb.entity.ProductTag;
import com.junmp.gold.service.ProductTagService; import com.junmp.jyzb.service.ProductTagService;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum; import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
......
package com.junmp.gold.controller; package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.AES; import com.baomidou.mybatisplus.core.toolkit.AES;
import com.junmp.gold.api.bean.req.DbAccessReq; import com.junmp.jyzb.api.bean.req.DbAccessReq;
import com.junmp.gold.api.bean.vo.AuthAccessVo; import com.junmp.jyzb.api.bean.vo.AuthAccessVo;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum; import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
package com.junmp.gold.doc; package com.junmp.jyzb.doc;
import com.junmp.gold.api.bean.req.CompanyReq; import com.junmp.jyzb.api.bean.req.CompanyReq;
import com.junmp.gold.entity.Company; import com.junmp.jyzb.entity.Company;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
......
package com.junmp.gold.doc; package com.junmp.jyzb.doc;
import com.junmp.v2.auth.api.bean.auth.LoginReq; import com.junmp.v2.auth.api.bean.auth.LoginReq;
import com.junmp.v2.auth.api.bean.auth.LoginRes; import com.junmp.v2.auth.api.bean.auth.LoginRes;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
/** /**
* <pre> * <pre>
......
package com.junmp.gold.doc; package com.junmp.jyzb.doc;
import com.junmp.gold.api.bean.dto.ProductBatchDto; import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
import com.junmp.gold.api.bean.dto.ProductProcessDto; import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
import com.junmp.gold.api.bean.req.ProductBatchReq; import com.junmp.jyzb.api.bean.req.ProductBatchReq;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
......
package com.junmp.gold.doc; package com.junmp.jyzb.doc;
import com.junmp.gold.api.bean.req.CompanyReq; import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.gold.api.bean.req.ProductReq; import com.junmp.jyzb.entity.Product;
import com.junmp.gold.entity.Company;
import com.junmp.gold.entity.Product;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
......
package com.junmp.gold.doc; package com.junmp.jyzb.doc;
import com.junmp.gold.api.bean.req.ProductSkuReq; import com.junmp.jyzb.api.bean.req.ProductSkuReq;
import com.junmp.gold.api.bean.vo.ProductSkuVo; import com.junmp.jyzb.api.bean.vo.ProductSkuVo;
import com.junmp.gold.entity.ProductSku; import com.junmp.jyzb.entity.ProductSku;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
......
package com.junmp.gold.doc; package com.junmp.jyzb.doc;
import com.junmp.gold.api.bean.req.ProductTagReq; import com.junmp.jyzb.api.bean.req.ProductTagReq;
import com.junmp.gold.api.bean.vo.TagInfoVo; import com.junmp.jyzb.api.bean.vo.TagInfoVo;
import com.junmp.gold.entity.ProductTag; import com.junmp.jyzb.entity.ProductTag;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
/** /**
......
package com.junmp.gold.entity; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.entity; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.entity; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.entity; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
package com.junmp.gold.entity; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
......
package com.junmp.gold.mapper; package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.gold.entity.Company; import com.junmp.jyzb.entity.Company;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
......
package com.junmp.gold.mapper; package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.junmp.gold.api.bean.dto.ProductBatchDto; import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
import com.junmp.gold.api.bean.dto.ProductProcessDto; import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
import com.junmp.gold.api.bean.req.ProductBatchReq; import com.junmp.jyzb.api.bean.req.ProductBatchReq;
import com.junmp.gold.entity.ProductBatch; import com.junmp.jyzb.entity.ProductBatch;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
......
package com.junmp.gold.mapper; package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.gold.entity.Product; import com.junmp.jyzb.entity.Product;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
......
package com.junmp.gold.mapper; package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.gold.entity.ProductSku; import com.junmp.jyzb.entity.ProductSku;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
......
package com.junmp.gold.mapper; package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.gold.api.bean.dto.ProductTagDto; import com.junmp.jyzb.api.bean.dto.ProductTagDto;
import com.junmp.gold.api.bean.dto.SimpleTagDto; import com.junmp.jyzb.api.bean.dto.SimpleTagDto;
import com.junmp.gold.entity.ProductTag; import com.junmp.jyzb.entity.ProductTag;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* <pre> * <pre>
* *
......
package com.junmp.gold.service; package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.gold.api.bean.req.CompanyReq; import com.junmp.jyzb.api.bean.req.CompanyReq;
import com.junmp.gold.entity.Company; import com.junmp.jyzb.entity.Company;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import java.util.List; import java.util.List;
......
package com.junmp.gold.service; package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.gold.api.bean.dto.ProductBatchDto; import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
import com.junmp.gold.api.bean.dto.ProductProcessDto; import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
import com.junmp.gold.api.bean.req.ProductBatchReq; import com.junmp.jyzb.api.bean.req.ProductBatchReq;
import com.junmp.gold.entity.ProductBatch; import com.junmp.jyzb.entity.ProductBatch;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import java.util.List; import java.util.List;
......
package com.junmp.gold.service; package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.gold.api.bean.req.CompanyReq; import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.gold.api.bean.req.ProductReq; import com.junmp.jyzb.entity.Product;
import com.junmp.gold.entity.Company;
import com.junmp.gold.entity.Product;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import java.util.List; import java.util.List;
......
package com.junmp.gold.service; package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.gold.api.bean.req.ProductSkuReq; import com.junmp.jyzb.api.bean.req.ProductSkuReq;
import com.junmp.gold.entity.ProductSku; import com.junmp.jyzb.entity.ProductSku;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import java.util.List; import java.util.List;
......
package com.junmp.gold.service; package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.gold.api.bean.dto.ProductTagDto; import com.junmp.jyzb.api.bean.dto.ProductTagDto;
import com.junmp.gold.api.bean.req.ProductTagReq; import com.junmp.jyzb.api.bean.req.ProductTagReq;
import com.junmp.gold.entity.ProductTag; import com.junmp.jyzb.entity.ProductTag;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import java.util.List; import java.util.List;
......
package com.junmp.gold.service.impl; package com.junmp.jyzb.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
...@@ -6,12 +6,12 @@ import cn.hutool.core.util.StrUtil; ...@@ -6,12 +6,12 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.gold.api.bean.req.CompanyReq; import com.junmp.jyzb.api.bean.req.CompanyReq;
import com.junmp.gold.api.exception.enums.CompanyExceptionEnum; import com.junmp.jyzb.api.exception.enums.CompanyExceptionEnum;
import com.junmp.gold.api.util.GenCodeUtil; import com.junmp.jyzb.api.util.GenCodeUtil;
import com.junmp.gold.entity.Company; import com.junmp.jyzb.entity.Company;
import com.junmp.gold.mapper.CompanyMapper; import com.junmp.jyzb.mapper.CompanyMapper;
import com.junmp.gold.service.CompanyService; import com.junmp.jyzb.service.CompanyService;
import com.junmp.v2.common.exception.base.ServiceException; import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil; import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.factory.PageFactory; import com.junmp.v2.db.api.factory.PageFactory;
......
package com.junmp.gold.service.impl; package com.junmp.jyzb.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.gold.api.bean.dto.ProductBatchDto; import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
import com.junmp.gold.api.bean.dto.ProductProcessDto; import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
import com.junmp.gold.api.bean.req.ProductBatchReq; import com.junmp.jyzb.api.bean.req.ProductBatchReq;
import com.junmp.gold.api.exception.enums.ProductExceptionEnum; import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.gold.api.util.GenCodeUtil; import com.junmp.jyzb.api.util.GenCodeUtil;
import com.junmp.gold.entity.ProductBatch; import com.junmp.jyzb.entity.ProductBatch;
import com.junmp.gold.mapper.ProductBatchMapper; import com.junmp.jyzb.mapper.ProductBatchMapper;
import com.junmp.gold.service.ProductBatchService; import com.junmp.jyzb.service.ProductBatchService;
import com.junmp.v2.common.exception.base.ServiceException; import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum; import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
import com.junmp.v2.common.util.BeanPlusUtil; import com.junmp.v2.common.util.BeanPlusUtil;
......
package com.junmp.gold.service.impl; package com.junmp.jyzb.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.gold.api.bean.req.CompanyReq; import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.gold.api.bean.req.ProductReq; import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.gold.api.exception.enums.CompanyExceptionEnum; import com.junmp.jyzb.api.util.GenCodeUtil;
import com.junmp.gold.api.exception.enums.ProductExceptionEnum; import com.junmp.jyzb.entity.Product;
import com.junmp.gold.api.util.GenCodeUtil; import com.junmp.jyzb.mapper.ProductMapper;
import com.junmp.gold.entity.Company; import com.junmp.jyzb.service.ProductService;
import com.junmp.gold.entity.Product; import com.junmp.jyzb.service.ProductSkuService;
import com.junmp.gold.mapper.ProductMapper;
import com.junmp.gold.service.ProductService;
import com.junmp.gold.service.ProductSkuService;
import com.junmp.v2.common.exception.base.ServiceException; import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil; import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.factory.PageFactory; import com.junmp.v2.db.api.factory.PageFactory;
......
package com.junmp.gold.service.impl; package com.junmp.jyzb.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.gold.api.bean.req.ProductSkuReq; import com.junmp.jyzb.api.bean.req.ProductSkuReq;
import com.junmp.gold.api.exception.JYZBAppException; import com.junmp.jyzb.api.exception.JYZBAppException;
import com.junmp.gold.api.exception.enums.ProductExceptionEnum; import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.gold.api.util.GenCodeUtil; import com.junmp.jyzb.api.util.GenCodeUtil;
import com.junmp.gold.entity.Product; import com.junmp.jyzb.entity.Product;
import com.junmp.gold.entity.ProductSku; import com.junmp.jyzb.entity.ProductSku;
import com.junmp.gold.mapper.ProductSkuMapper; import com.junmp.jyzb.mapper.ProductSkuMapper;
import com.junmp.gold.service.ProductService; import com.junmp.jyzb.service.ProductService;
import com.junmp.gold.service.ProductSkuService; import com.junmp.jyzb.service.ProductSkuService;
import com.junmp.v2.common.exception.base.ServiceException; import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil; import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.factory.PageFactory; import com.junmp.v2.db.api.factory.PageFactory;
......
package com.junmp.gold.service.impl; package com.junmp.jyzb.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
...@@ -7,15 +7,15 @@ import cn.hutool.core.util.StrUtil; ...@@ -7,15 +7,15 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.gold.api.bean.dto.ProductTagDto; import com.junmp.jyzb.api.bean.dto.ProductTagDto;
import com.junmp.gold.api.bean.dto.SimpleTagDto; import com.junmp.jyzb.api.bean.dto.SimpleTagDto;
import com.junmp.gold.api.bean.req.ProductTagReq; import com.junmp.jyzb.api.bean.req.ProductTagReq;
import com.junmp.gold.api.exception.enums.ProductExceptionEnum; import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.gold.entity.ProductTag; import com.junmp.jyzb.entity.ProductTag;
import com.junmp.gold.mapper.ProductTagMapper; import com.junmp.jyzb.mapper.ProductTagMapper;
import com.junmp.gold.service.ProductTagService; import com.junmp.jyzb.service.ProductTagService;
import com.junmp.v2.common.exception.base.ServiceException; import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil; import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.factory.PageFactory; import com.junmp.v2.db.api.factory.PageFactory;
......
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.gold.mapper.CompanyMapper"> <mapper namespace="com.junmp.jyzb.mapper.CompanyMapper">
<select id="getMaxSn" resultType="java.lang.Integer"> <select id="getMaxSn" resultType="java.lang.Integer">
......
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.gold.mapper.ProductBatchMapper"> <mapper namespace="com.junmp.jyzb.mapper.ProductBatchMapper">
<select id="getMaxSn" resultType="java.lang.Integer"> <select id="getMaxSn" resultType="java.lang.Integer">
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
from biz_product_batch s1 from biz_product_batch s1
</select> </select>
<select id="getBatchProcess" resultType="com.junmp.gold.api.bean.dto.ProductBatchDto"> <select id="getBatchProcess" resultType="com.junmp.jyzb.api.bean.dto.ProductBatchDto">
select * select *
from v_product_batch_process from v_product_batch_process
where batchId = #{batchId} where batchId = #{batchId}
</select> </select>
<select id="getBatchPage" resultType="com.junmp.gold.api.bean.dto.ProductBatchDto"> <select id="getBatchPage" resultType="com.junmp.jyzb.api.bean.dto.ProductBatchDto">
select * from v_product_batch_process s1 where 1=1 select * from v_product_batch_process s1 where 1=1
<if test="null != batch"> <if test="null != batch">
<if test="null != batch.batchId"> <if test="null != batch.batchId">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
order by s1.createTime desc order by s1.createTime desc
</select> </select>
<select id="getBatchProcessPage" resultType="com.junmp.gold.api.bean.dto.ProductProcessDto"> <select id="getBatchProcessPage" resultType="com.junmp.jyzb.api.bean.dto.ProductProcessDto">
select * from v_product_batch_check s1 where 1=1 select * from v_product_batch_check s1 where 1=1
<if test="null != batch"> <if test="null != batch">
<if test="null != batch.batchId"> <if test="null != batch.batchId">
......
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.gold.mapper.ProductMapper"> <mapper namespace="com.junmp.jyzb.mapper.ProductMapper">
<select id="getMaxSn" resultType="java.lang.Integer"> <select id="getMaxSn" resultType="java.lang.Integer">
......
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.gold.mapper.ProductSkuMapper"> <mapper namespace="com.junmp.jyzb.mapper.ProductSkuMapper">
<!-- 获取当前产品最大序号 --> <!-- 获取当前产品最大序号 -->
......
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.gold.mapper.ProductTagMapper"> <mapper namespace="com.junmp.jyzb.mapper.ProductTagMapper">
<!-- limit 0,1--> <!-- limit 0,1-->
<select id="getInitTagInfo" resultType="com.junmp.gold.api.bean.dto.SimpleTagDto"> <select id="getInitTagInfo" resultType="com.junmp.jyzb.api.bean.dto.SimpleTagDto">
select s1.tag_id as tagId,s1.product_code as productCode select s1.tag_id as tagId,s1.product_code as productCode
from biz_product_tag s1 from biz_product_tag s1
where s1.batch_id = #{batchId} where s1.batch_id = #{batchId}
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
order by s1.serial_id asc limit 0,1 order by s1.serial_id asc limit 0,1
</select> </select>
<select id="getTagInfoByTagId" resultType="com.junmp.gold.api.bean.dto.ProductTagDto"> <select id="getTagInfoByTagId" resultType="com.junmp.jyzb.api.bean.dto.ProductTagDto">
SELECT s1.tagId, SELECT s1.tagId,
s1.productCode, s1.productCode,
s1.produceTime, s1.produceTime,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论