jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TBunchingMapper.java

@@ -1,16 +0,0 @@
-package jnpf.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import jnpf.entity.TBunching;
-import jnpf.model.dto.TBunchingDto;
-import org.apache.ibatis.annotations.Param;
-
-
-/**
- * @author xbw
- */
-public interface TBunchingMapper extends BaseMapper<TBunching> {
-    IPage<TBunching> selectList(IPage<TBunching> page, @Param("param") TBunchingDto.TBunchingDtoParam param);
-}
-

jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TReceiveConfigMapper.java

@@ -1,13 +0,0 @@
-package jnpf.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import jnpf.entity.TReceiveConfig;
-
-
-/**
- * @author xbw
- */
-public interface TReceiveConfigMapper extends BaseMapper<TReceiveConfig> {
-
-}
-

jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TReceiveMapper.java

@@ -1,13 +0,0 @@
-package jnpf.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import jnpf.entity.TReceive;
-
-
-/**
- * @author xbw
- */
-public interface TReceiveMapper extends BaseMapper<TReceive> {
-
-}
-

jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TSystemConfigurationMapper.java

@@ -1,18 +0,0 @@
-package jnpf.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import jnpf.entity.TSystemConfiguration;
-import jnpf.entity.TUserForLibrary;
-import jnpf.model.dto.TSystemConfigurationDto;
-import jnpf.model.dto.TUserForLibraryDto;
-import org.apache.ibatis.annotations.Param;
-
-
-/**
- * @author xbw
- */
-public interface TSystemConfigurationMapper extends BaseMapper<TSystemConfiguration> {
-    IPage<TSystemConfiguration> selectList(IPage<TSystemConfiguration> page,@Param("param") TSystemConfigurationDto.TSystemConfigurationDtoParam param);
-}
-

jnpf-library/jnpf-library-biz/src/main/java/jnpf/mapper/TUserForLibraryMapper.java

@@ -1,16 +0,0 @@
-package jnpf.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import jnpf.entity.TUserForLibrary;
-import jnpf.model.dto.TUserForLibraryDto;
-import org.apache.ibatis.annotations.Param;
-
-
-/**
- * @author xbw
- */
-public interface TUserForLibraryMapper extends BaseMapper<TUserForLibrary> {
-    IPage<TUserForLibrary> selectList(IPage<TUserForLibrary> page, @Param("param") TUserForLibraryDto.TUserForLibraryDtoParam param);
-}
-

jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/TBunchingService.java

@@ -1,23 +0,0 @@
-package jnpf.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import jnpf.entity.TBunching;
-import jnpf.entity.TSystemConfiguration;
-import jnpf.model.dto.TBunchingDto;
-import jnpf.model.dto.TSystemConfigurationDto;
-
-
-/**
- * @author xbw
- */
-public interface TBunchingService extends IService<TBunching> {
-
-    void addOrUpdate(TBunchingDto.TBunchingDtoAddOrUpdate bunchingDtoAddOrUpdate);
-
-    void del(TBunchingDto.TBunchingDtoDel del);
-
-    IPage<TBunching> selectList(TBunchingDto.TBunchingDtoParam param);
-
-}
-

jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/TReceiveConfigService.java

@@ -1,17 +0,0 @@
-package jnpf.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import jnpf.entity.TReceiveConfig;
-import jnpf.model.dto.TReceiveDto;
-
-
-/**
- * @author xbw
- */
-public interface TReceiveConfigService extends IService<TReceiveConfig> {
-
-    TReceiveConfig detail();
-
-    void update(TReceiveDto.TReceiveDtoConfig tReceiveDtoConfig);
-}
-

jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/TReceiveService.java

@@ -1,21 +0,0 @@
-package jnpf.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import jnpf.entity.TReceive;
-import jnpf.model.dto.TReceiveDto;
-
-
-/**
- * @author xbw
- */
-public interface TReceiveService extends IService<TReceive> {
-
-    /**查询修改记录
-     * @param param 分页
-     * @return {@link IPage}<{@link TReceive}>
-     */
-    IPage<TReceive> selectList(TReceiveDto.TReceiveDtoBasePageParam param);
-
-}
-

jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/TSystemConfigurationService.java

@@ -1,21 +0,0 @@
-package jnpf.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import jnpf.entity.TSystemConfiguration;
-import jnpf.model.dto.TSystemConfigurationDto;
-
-
-/**
- * @author xbw
- */
-public interface TSystemConfigurationService extends IService<TSystemConfiguration> {
-
-    void addOrUpdate(TSystemConfigurationDto.TSystemConfigurationDtoAdd tSystemConfigurationDtoAdd);
-
-    void del(TSystemConfigurationDto.TSystemConfigurationDtoDel configurationDtoDel);
-
-    IPage<TSystemConfiguration> selectList(TSystemConfigurationDto.TSystemConfigurationDtoParam param);
-
-}
-

jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/TUserForLibraryService.java

@@ -1,21 +0,0 @@
-package jnpf.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import jnpf.entity.TUserForLibrary;
-import jnpf.model.dto.TUserForLibraryDto;
-
-
-/**
- * @author xbw
- */
-public interface TUserForLibraryService extends IService<TUserForLibrary>{
-
-    void addOrUpdate(TUserForLibraryDto.TUserForLibraryDtoAdd tUserForLibraryDtoAdd);
-
-    void del(TUserForLibraryDto.TUserForLibraryDtoDel userForLibraryDtoDel);
-
-    IPage<TUserForLibrary> selectList(TUserForLibraryDto.TUserForLibraryDtoParam param);
-
-}
-

jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TBunchingServiceImpl.java

@@ -1,71 +0,0 @@
-package jnpf.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jnpf.entity.TBunching;
-import jnpf.exception.DataException;
-import jnpf.mapper.TBunchingMapper;
-import jnpf.model.dto.TBunchingDto;
-import jnpf.service.TBunchingService;
-import jnpf.util.UserProvider;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-
-
-/**
- * @author xbw
- */
-@Service("iTBunchingService")
-@DS("library")
-public class TBunchingServiceImpl extends ServiceImpl<TBunchingMapper, TBunching> implements TBunchingService {
-
-
-    @Override
-    public void addOrUpdate(TBunchingDto.TBunchingDtoAddOrUpdate bunchingDtoAddOrUpdate) {
-        if (StringUtils.isBlank(bunchingDtoAddOrUpdate.getBunchingTo())) {
-            throw new DataException("分堆去向不能为空");
-        }
-        if (bunchingDtoAddOrUpdate.getBunchingNumber() == null) {
-            throw new DataException("送样数量不能为空");
-        }
-
-        TBunching tBunching = new TBunching();
-        BeanUtils.copyProperties(bunchingDtoAddOrUpdate, tBunching);
-        if (bunchingDtoAddOrUpdate.getId() == null) {
-            tBunching.setCreateName(UserProvider.getUser().getUserName());
-            tBunching.setCreateBy(UserProvider.getUser().getUserId());
-            tBunching.setCreateTime(LocalDateTime.now());
-            this.save(tBunching);
-        }
-
-        tBunching.setUpdateTime(LocalDateTime.now());
-        tBunching.setUpdateBy(UserProvider.getUser().getUserId());
-        tBunching.setUpdateName(UserProvider.getUser().getUserId());
-        this.updateById(tBunching);
-
-    }
-
-    @Override
-    public void del(TBunchingDto.TBunchingDtoDel del) {
-        if (del.getId() == null) {
-            throw new DataException("请传入系统参数id");
-        }
-
-        TBunching byId = this.getById(del.getId());
-        if (byId == null || byId.getDelFlag() == 1) {
-            throw new DataException("不存在或已删除");
-        }
-        byId.setDelFlag(1);
-        this.updateById(byId);
-    }
-
-    @Override
-    public IPage<TBunching> selectList(TBunchingDto.TBunchingDtoParam param) {
-        return this.baseMapper.selectList(new Page<>(param.getCurrent(), param.getSize()), param);
-    }
-}

jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveConfigServiceImpl.java

@@ -1,133 +0,0 @@
-package jnpf.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jnpf.base.UserInfo;
-import jnpf.entity.TReceive;
-import jnpf.entity.TReceiveConfig;
-import jnpf.enump.TReceiveEnum;
-import jnpf.exception.DataException;
-import jnpf.mapper.TReceiveConfigMapper;
-import jnpf.model.dto.TReceiveDto;
-import jnpf.service.TReceiveConfigService;
-import jnpf.service.TReceiveService;
-import jnpf.util.UserProvider;
-import org.apache.dubbo.common.utils.CollectionUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
-
-/**
- * @author xbw
- */
-@Service("iTReceiveServiceConfig")
-@DS("library")
-public class TReceiveConfigServiceImpl extends ServiceImpl<TReceiveConfigMapper, TReceiveConfig> implements TReceiveConfigService {
-
-    @Resource
-    TReceiveService tReceiveService;
-
-    @Override
-    public TReceiveConfig detail() {
-        return this.baseMapper.selectOne(Wrappers.emptyWrapper());
-    }
-
-    @Override
-    public void update(TReceiveDto.TReceiveDtoConfig tReceiveDtoConfig) {
-        TReceiveConfig tReceiveConfig = this.baseMapper.selectOne(Wrappers.emptyWrapper());
-        tReceiveConfig = Optional.ofNullable(tReceiveConfig).orElse(new TReceiveConfig());
-        List<TReceive> tReceives = new ArrayList<>();
-        //领用数量变化 需要社长审核范围
-        if (!Objects.equals(tReceiveDtoConfig.getReceiveNumber(), tReceiveConfig.getReceiveNumber())) {
-            TReceive tReceive = new TReceive();
-            tReceive.setModifyItem(TReceiveEnum.PresidentReviewEnum.NUMBER.getDescribe());
-            tReceive.setModifyValue(String.valueOf(tReceiveDtoConfig.getReceiveNumber()));
-            tReceive.setSetItem(TReceiveEnum.ReceiveEnum.PRESIDENT.getDescribe());
-            tReceives.add(tReceive);
-        }
-        //单册金额变化 需要社长审核范围
-        if (!Objects.equals(tReceiveDtoConfig.getVolumeAmount(), tReceiveConfig.getVolumeAmount())) {
-            TReceive tReceive = new TReceive();
-            tReceive.setModifyItem(TReceiveEnum.PresidentReviewEnum.SINGLE_AMOUNT.getDescribe());
-            tReceive.setModifyValue(String.valueOf(tReceiveDtoConfig.getReceiveNumber()));
-            tReceive.setSetItem(TReceiveEnum.ReceiveEnum.PRESIDENT.getDescribe());
-            tReceives.add(tReceive);
-        }
-        //领用总金额变化 需要社长审核范围
-        if (!Objects.equals(tReceiveDtoConfig.getVolumeAmountAll(), tReceiveConfig.getVolumeAmountAll())) {
-            TReceive tReceive = new TReceive();
-            tReceive.setModifyItem(TReceiveEnum.PresidentReviewEnum.ALL_AMOUNT.getDescribe());
-            tReceive.setModifyValue(String.valueOf(tReceiveDtoConfig.getReceiveNumber()));
-            tReceive.setSetItem(TReceiveEnum.ReceiveEnum.PRESIDENT.getDescribe());
-            tReceives.add(tReceive);
-        }
-        //是否开放 领用审核权限
-        if (!Objects.equals(tReceiveDtoConfig.getReceiveAuth(), tReceiveConfig.getReceiveAuth())) {
-            List<String> list = Arrays.asList(Optional.ofNullable(tReceiveConfig.getReceiveAuth()).orElse("").split(","));
-            // 差集
-            List<String> collect = Arrays.stream(tReceiveDtoConfig.getReceiveAuth().split(",")).filter(item -> !list.contains(item)).collect(Collectors.toList());
-            if (!collect.isEmpty()) {
-
-                TReceive tReceive = new TReceive();
-                tReceive.setModifyItem(TReceiveEnum.ReceiveItemEnum.OPEN.getDescribe());
-                // 换成描述值
-                List<String> collectDescribe = collect.stream().map(item -> Optional.ofNullable(TReceiveEnum.ReceiveAuthEnum.getEnumByCode(Integer.valueOf(item))).map(TReceiveEnum.ReceiveAuthEnum::getDescribe).orElse("")).collect(Collectors.toList());
-                tReceive.setModifyValue(CollectionUtils.join(collectDescribe, ","));
-                tReceive.setSetItem(TReceiveEnum.ReceiveEnum.AUTH.getDescribe());
-                tReceives.add(tReceive);
-            }
-
-
-        }
-        //是否开放 领用范围
-        if (!Objects.equals(tReceiveDtoConfig.getReceiveRadius(), tReceiveConfig.getReceiveRadius())) {
-            List<String> list = Arrays.asList(Optional.ofNullable(tReceiveConfig.getReceiveRadius()).orElse("").split(","));
-            // 差集
-            List<String> collect = Arrays.stream(tReceiveDtoConfig.getReceiveRadius().split(",")).filter(item -> !list.contains(item)).collect(Collectors.toList());
-            if (!collect.isEmpty()) {
-
-                TReceive tReceive = new TReceive();
-                tReceive.setModifyItem(TReceiveEnum.ReceiveItemEnum.OPEN.getDescribe());
-                // 换成描述值
-                List<String> collectDescribe = collect.stream().map(item -> Optional.ofNullable(TReceiveEnum.ReceiveRadiusEnum.getEnumByCode(Integer.valueOf(item))).map(TReceiveEnum.ReceiveRadiusEnum::getDescribe).orElse("")).collect(Collectors.toList());
-                tReceive.setModifyValue(CollectionUtils.join(collectDescribe, ","));
-                tReceive.setSetItem(TReceiveEnum.ReceiveEnum.RADIUS.getDescribe());
-                tReceives.add(tReceive);
-            }
-        }
-        if (tReceives.isEmpty()) {
-            throw new DataException("配置没有变动");
-        }
-        UserInfo user = UserProvider.getUser();
-        BeanUtils.copyProperties(tReceiveDtoConfig, tReceiveConfig);
-        // 更新配置
-        tReceiveConfig.setUpdateTime(LocalDateTime.now());
-        tReceiveConfig.setUpdateName(user.getUserName());
-        tReceiveConfig.setUpdateBy(user.getUserId());
-        if(tReceiveConfig.getId()==null){
-            tReceiveConfig.setCreateBy(user.getUserId());
-            tReceiveConfig.setCreateName(user.getUserId());
-            tReceiveConfig.setCreateTime(LocalDateTime.now());
-            this.save(tReceiveConfig);
-        }else {
-            this.updateById(tReceiveConfig);
-        }
-
-        LocalDateTime now = LocalDateTime.now();
-
-        tReceives.forEach(item -> {
-            item.setCreateTime(now);
-            item.setCreateBy(user.getUserId());
-            item.setCreateName(user.getUserName());
-        });
-        // 添加修改记录
-        tReceiveService.saveBatch(tReceives);
-
-    }
-}

jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TReceiveServiceImpl.java

@@ -1,26 +0,0 @@
-package jnpf.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jnpf.entity.TReceive;
-import jnpf.mapper.TReceiveMapper;
-import jnpf.model.dto.TReceiveDto;
-import jnpf.service.TReceiveService;
-import org.springframework.stereotype.Service;
-
-
-/**
- * @author xbw
- */
-@Service("iTReceiveService")
-@DS("library")
-public class TReceiveServiceImpl extends ServiceImpl<TReceiveMapper, TReceive> implements TReceiveService {
-
-
-    @Override
-    public IPage<TReceive> selectList(TReceiveDto.TReceiveDtoBasePageParam param) {
-        return this.page(new Page<>(param.getCurrent(), param.getSize()));
-    }
-}

jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TSystemConfigurationServiceImpl.java

@@ -1,77 +0,0 @@
-package jnpf.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jnpf.entity.TSystemConfiguration;
-import jnpf.exception.DataException;
-import jnpf.mapper.TSystemConfigurationMapper;
-import jnpf.model.dto.TSystemConfigurationDto;
-import jnpf.service.TSystemConfigurationService;
-import jnpf.util.UserProvider;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-
-
-/**
- * @author xbw
- */
-@Service("iTSystemConfigurationService")
-@DS("library")
-public class TSystemConfigurationServiceImpl extends ServiceImpl<TSystemConfigurationMapper, TSystemConfiguration> implements TSystemConfigurationService {
-
-
-    @Override
-    public void addOrUpdate(TSystemConfigurationDto.TSystemConfigurationDtoAdd tSystemConfigurationDtoAdd) {
-        if (StringUtils.isBlank(tSystemConfigurationDtoAdd.getSystemParameter())) {
-            throw new DataException("系统参数不能为空");
-        }
-        if (StringUtils.isBlank(tSystemConfigurationDtoAdd.getSystemParameterValue())) {
-            throw new DataException("系统参数值不能为空");
-        }
-        if (StringUtils.isBlank(tSystemConfigurationDtoAdd.getSystemParameterRemark())) {
-            throw new DataException("系统参数说明不能为空");
-        }
-
-        TSystemConfiguration tSystemConfiguration = new TSystemConfiguration();
-        BeanUtils.copyProperties(tSystemConfigurationDtoAdd, tSystemConfiguration);
-        if (tSystemConfigurationDtoAdd.getId() == null) {
-            BeanUtils.copyProperties(tSystemConfigurationDtoAdd, tSystemConfiguration);
-            tSystemConfiguration.setCreateTime(LocalDateTime.now());
-            tSystemConfiguration.setCreateName(UserProvider.getUser().getUserName());
-            tSystemConfiguration.setCreateBy(UserProvider.getUser().getUserId());
-            this.save(tSystemConfiguration);
-            return;
-        }
-
-        tSystemConfiguration.setUpdateTime(LocalDateTime.now());
-        tSystemConfiguration.setUpdateBy(UserProvider.getUser().getUserName());
-        tSystemConfiguration.setUpdateName(UserProvider.getUser().getUserId());
-        this.updateById(tSystemConfiguration);
-
-    }
-
-    @Override
-    public void del(TSystemConfigurationDto.TSystemConfigurationDtoDel configurationDtoDel) {
-        if (configurationDtoDel.getId() == null) {
-            throw new DataException("请传入系统参数id");
-        }
-
-        TSystemConfiguration byId = this.getById(configurationDtoDel.getId());
-        if(byId==null||byId.getDelFlag()==1){
-            throw new DataException("不存在或已删除");
-        }
-
-        byId.setDelFlag(1);
-        this.updateById(byId);
-    }
-
-    @Override
-    public IPage<TSystemConfiguration> selectList(TSystemConfigurationDto.TSystemConfigurationDtoParam param) {
-        return this.baseMapper.selectList(new Page<>(param.getCurrent(), param.getSize()), param);
-    }
-}

jnpf-library/jnpf-library-biz/src/main/java/jnpf/service/impl/TUserForLibraryServiceImpl.java

@@ -1,81 +0,0 @@
-package jnpf.service.impl;
-
-import cn.hutool.core.util.PhoneUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jnpf.entity.TUserForLibrary;
-import jnpf.enump.TUserForLibraryEnum;
-import jnpf.exception.DataException;
-import jnpf.mapper.TUserForLibraryMapper;
-import jnpf.model.dto.TUserForLibraryDto;
-import jnpf.service.TUserForLibraryService;
-import jnpf.util.UserProvider;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-
-
-/**
- * @author xbw
- */
-@Service("iUserForLibraryService")
-@DS("library")
-public class TUserForLibraryServiceImpl extends ServiceImpl<TUserForLibraryMapper, TUserForLibrary> implements TUserForLibraryService {
-
-
-    @Override
-    public void addOrUpdate(TUserForLibraryDto.TUserForLibraryDtoAdd tUserForLibraryDtoAdd) {
-        if (StringUtils.isBlank(tUserForLibraryDtoAdd.getUserName())) {
-            throw new DataException("用户姓名不正确");
-        }
-        if (StringUtils.isBlank(tUserForLibraryDtoAdd.getUserPhone()) || !PhoneUtil.isMobile(tUserForLibraryDtoAdd.getUserPhone())) {
-            throw new DataException("用户号码不正确");
-        }
-        if (tUserForLibraryDtoAdd.getSex() == null) {
-            throw new DataException("用户性别不正确");
-        }
-        if (TUserForLibraryEnum.InsideEnum.getEnumByCode(tUserForLibraryDtoAdd.getInside()) == null) {
-            throw new DataException("用户类型不正确");
-        }
-        TUserForLibrary tUserForLibrary = new TUserForLibrary();
-        BeanUtils.copyProperties(tUserForLibraryDtoAdd, tUserForLibrary);
-        if (tUserForLibraryDtoAdd.getId() == null) {
-            // 外部用户
-            tUserForLibrary.setCreateTime(LocalDateTime.now());
-            tUserForLibrary.setCreateName(UserProvider.getUser().getUserName());
-            tUserForLibrary.setCreateBy(UserProvider.getUser().getUserId());
-            this.save(tUserForLibrary);
-            return;
-        }
-
-        BeanUtils.copyProperties(tUserForLibraryDtoAdd, tUserForLibrary);
-        tUserForLibrary.setUpdateTime(LocalDateTime.now());
-        tUserForLibrary.setUpdateBy(UserProvider.getUser().getUserName());
-        tUserForLibrary.setUpdateName(UserProvider.getUser().getUserId());
-        this.updateById(tUserForLibrary);
-
-    }
-
-    @Override
-    public void del(TUserForLibraryDto.TUserForLibraryDtoDel userForLibraryDtoDel) {
-        if (userForLibraryDtoDel.getId() == null) {
-            throw new DataException("请传入用户id");
-        }
-
-        TUserForLibrary byId = this.getById(userForLibraryDtoDel.getId());
-        if(byId==null||byId.getDelFlag()==1){
-            throw new DataException("不存在或已删除");
-        }
-        byId.setDelFlag(1);
-        this.updateById(byId);
-    }
-
-    @Override
-    public IPage<TUserForLibrary> selectList(TUserForLibraryDto.TUserForLibraryDtoParam param) {
-        return this.baseMapper.selectList(new Page<>(param.getCurrent(), param.getSize()), param);
-    }
-}

jnpf-library/jnpf-library-biz/src/main/resources/mapper/TBunchingMapper.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="jnpf.mapper.TBunchingMapper">
-
-    <resultMap type="jnpf.entity.TBunching" id="TBunchingMap">
-        <result property="id" column="id" jdbcType="INTEGER"/>
-        <result property="bunchingTo" column="bunching_to"/>
-        <result property="bunchingRemark" column="bunching_remark"/>
-        <result property="bunchingNumber" column="bunching_number"/>
-
-        <result property="createBy" column="create_by"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateName" column="update_name"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag" jdbcType="VARCHAR"/>
-        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-        <result property="createName" column="create_name" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,bunching_to,bunching_remark,bunching_number,
-        create_by,update_by,update_name,update_time,del_flag,
-        create_time,create_name
-    </sql>
-
-    <select id="selectList" resultMap="TBunchingMap">
-        select
-        <include refid="Base_Column_List"/>
-        from t_bunching
-        <where>
-            <if test="param.bunchingTo!='' and param.bunchingTo != null">
-                and bunching_to like concat('%',#{param.bunchingTo},'%')
-            </if>
-        and del_flag = 0
-        </where>
-    </select>
-
-</mapper>

jnpf-library/jnpf-library-biz/src/main/resources/mapper/TReceiveConfigMapper.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="jnpf.mapper.TReceiveConfigMapper">
-
-    <resultMap type="jnpf.entity.TReceiveConfig" id="TBunchingMap">
-        <result property="id" column="id" jdbcType="INTEGER"/>
-        <result property="receiveNumber" column="receive_number"/>
-        <result property="volumeAmount" column="volume_amount"/>
-        <result property="volumeAmountAll" column="volume_amount_all"/>
-        <result property="receiveAuth" column="receive_auth"/>
-        <result property="receiveRadius" column="receive_radius"/>
-
-        <result property="createBy" column="create_by"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateName" column="update_name"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag" jdbcType="VARCHAR"/>
-        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-        <result property="createName" column="create_name" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,receive_number,volume_amount,volume_amount_all,receive_auth,receive_radius,
-        create_by,update_by,update_name,update_time,del_flag,
-        create_time,create_name
-    </sql>
-
-
-</mapper>

jnpf-library/jnpf-library-biz/src/main/resources/mapper/TReceiveMapper.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="jnpf.mapper.TReceiveMapper">
-
-    <resultMap type="jnpf.entity.TReceive" id="TBunchingMap">
-        <result property="id" column="id" jdbcType="INTEGER"/>
-        <result property="setItem" column="set_item"/>
-        <result property="modifyItem" column="modify_item"/>
-        <result property="modifyValue" column="modify_value"/>
-
-        <result property="createBy" column="create_by"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateName" column="update_name"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag" jdbcType="VARCHAR"/>
-        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-        <result property="createName" column="create_name" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,set_item,modify_item,modify_value,
-        create_by,update_by,update_name,update_time,del_flag,
-        create_time,create_name
-    </sql>
-
-</mapper>

jnpf-library/jnpf-library-biz/src/main/resources/mapper/TSystemConfiguration.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="jnpf.mapper.TSystemConfigurationMapper">
-
-    <resultMap type="jnpf.entity.TSystemConfiguration" id="TSystemConfigurationMap">
-        <result property="id" column="id" jdbcType="INTEGER"/>
-        <result property="systemParameter" column="system_parameter"/>
-        <result property="systemParameterRemark" column="system_parameter_remark"/>
-        <result property="systemParameterValue" column="system_parameter_value"/>
-
-        <result property="createBy" column="create_by"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateName" column="update_name"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag" jdbcType="VARCHAR"/>
-        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-        <result property="createName" column="create_name" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,system_parameter,system_parameter_remark,system_parameter_value,
-        create_by,update_by,update_name,update_time,del_flag,
-        create_time,create_name
-    </sql>
-
-    <select id="selectList" resultMap="TSystemConfigurationMap">
-        select
-        <include refid="Base_Column_List"/>
-        from t_system_configuration
-        <where>
-            <if test="param.systemParameter!='' and param.systemParameter != null">
-                and system_parameter like concat('%',#{param.systemParameter},'%')
-            </if>
-        and del_flag = 0
-        </where>
-    </select>
-
-</mapper>

jnpf-library/jnpf-library-biz/src/main/resources/mapper/TUserForLibraryMapper.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="jnpf.mapper.TUserForLibraryMapper">
-
-    <resultMap type="jnpf.entity.TUserForLibrary" id="TUserForLibraryMap">
-        <result property="id" column="id" jdbcType="INTEGER"/>
-        <result property="userName" column="user_name"/>
-        <result property="idNumber" column="id_number"/>
-        <result property="userPhone" column="user_phone"/>
-        <result property="sex" column="sex"/>
-        <result property="inside" column="inside"/>
-        <result property="job" column="job"/>
-        <result property="address" column="address"/>
-        <result property="section" column="section"/>
-        <result property="createBy" column="create_by"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateName" column="update_name"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag" jdbcType="VARCHAR"/>
-        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-        <result property="createName" column="create_name" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,user_name,id_number,user_phone,sex,inside,job,address,section,
-        create_by,update_by,update_name,update_time,del_flag,
-        create_time,create_name
-    </sql>
-    <select id="selectList" resultMap="TUserForLibraryMap">
-        select
-        <include refid="Base_Column_List"/>
-        from t_user_for_library
-        <where>
-            <if test="param.userPhone!='' and param.userPhone != null">
-                and user_phone like concat('%',#{param.userPhone},'%')
-            </if>
-            <if test="param.userName!='' and param.userName != null">
-                and user_name like concat('%',#{param.userName},'%')
-            </if>
-        and del_flag = 0
-        </where>
-    </select>
-
-</mapper>

jnpf-library/jnpf-library-controller/src/main/java/jnpf/controller/TBunchingController.java

@@ -1,51 +0,0 @@
-package jnpf.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jnpf.base.ActionResult;
-import jnpf.constant.MsgCode;
-import jnpf.entity.TBunching;
-import jnpf.model.dto.TBunchingDto;
-import jnpf.service.TBunchingService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author xbw
- */
-@RestController
-@Api("分堆管理")
-@Tag(name = "分堆管理", description = "bunching")
-@RequestMapping("/bunching")
-@AllArgsConstructor
-public class TBunchingController {
-    private final TBunchingService tBunchingService;
-
-    @Operation(summary = "分堆新增｜修改")
-    @PostMapping("newOrUpdateBunching")
-    public ActionResult<Void> newOrUpdateUserForLibrary(@RequestBody TBunchingDto.TBunchingDtoAddOrUpdate param) {
-        tBunchingService.addOrUpdate(param);
-        return ActionResult.success(MsgCode.SU000.get());
-    }
-
-    @Operation(summary = "分堆删除")
-    @PostMapping("delBunching")
-    public ActionResult<Void> delUserForLibrary(@RequestBody TBunchingDto.TBunchingDtoDel tBunchingDtoDel) {
-        tBunchingService.del(tBunchingDtoDel);
-        return ActionResult.success(MsgCode.SU000.get());
-    }
-
-
-    @Operation(summary = "分堆查询")
-    @PostMapping("selectList")
-    public ActionResult<IPage<TBunching>> selectList(@RequestBody TBunchingDto.TBunchingDtoParam param) {
-        return ActionResult.success(MsgCode.SU000.get(), tBunchingService.selectList(param));
-    }
-
-
-}

jnpf-library/jnpf-library-controller/src/main/java/jnpf/controller/TReceiveController.java

@@ -1,54 +0,0 @@
-package jnpf.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jnpf.base.ActionResult;
-import jnpf.constant.MsgCode;
-import jnpf.entity.TReceive;
-import jnpf.entity.TReceiveConfig;
-import jnpf.model.dto.TReceiveDto;
-import jnpf.service.TReceiveConfigService;
-import jnpf.service.TReceiveService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author xbw
- */
-@RestController
-@Api("领用设置")
-@Tag(name = "领用设置", description = "TReceive")
-@RequestMapping("/receive")
-@AllArgsConstructor
-public class TReceiveController {
-
-    private final TReceiveService tReceiveService;
-    private final TReceiveConfigService tReceiveConfigService;
-
-    @Operation(summary = "修改领用配置")
-    @PostMapping("update")
-    public ActionResult<Void> update(@RequestBody TReceiveDto.TReceiveDtoConfig param) {
-        tReceiveConfigService.update(param);
-        return ActionResult.success(MsgCode.SU000.get());
-    }
-
-    @Operation(summary = "查看配置")
-    @PostMapping("detail")
-    public ActionResult<TReceiveConfig> detail() {
-        return ActionResult.success(MsgCode.SU000.get(), tReceiveConfigService.detail());
-    }
-
-
-    @Operation(summary = "领用设置记录查询")
-    @PostMapping("selectList")
-    public ActionResult<IPage<TReceive>> selectList(@RequestBody TReceiveDto.TReceiveDtoBasePageParam param) {
-        return ActionResult.success(MsgCode.SU000.get(), tReceiveService.selectList(param));
-    }
-
-
-}

jnpf-library/jnpf-library-controller/src/main/java/jnpf/controller/TSystemConfigurationController.java

@@ -1,51 +0,0 @@
-package jnpf.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jnpf.base.ActionResult;
-import jnpf.constant.MsgCode;
-import jnpf.entity.TSystemConfiguration;
-import jnpf.model.dto.TSystemConfigurationDto;
-import jnpf.service.TSystemConfigurationService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author xbw
- */
-@RestController
-@Api("系统配置管理")
-@Tag(name = "系统配置管理", description = "systemConfiguration")
-@RequestMapping("/systemConfiguration")
-@AllArgsConstructor
-public class TSystemConfigurationController {
-    private final TSystemConfigurationService tSystemConfigurationService;
-
-    @Operation(summary = "系统配置新增")
-    @PostMapping("newOrUpdateSystemConfiguration")
-    public ActionResult<Void> newOrUpdateSystemConfiguration(@RequestBody TSystemConfigurationDto.TSystemConfigurationDtoAdd tSystemConfigurationDtoAdd) {
-        tSystemConfigurationService.addOrUpdate(tSystemConfigurationDtoAdd);
-        return ActionResult.success(MsgCode.SU000.get());
-    }
-
-    @Operation(summary = "系统配置删除")
-    @PostMapping("delSystemConfiguration")
-    public ActionResult<Void> delSystemConfiguration(@RequestBody TSystemConfigurationDto.TSystemConfigurationDtoDel configurationDtoDel) {
-        tSystemConfigurationService.del(configurationDtoDel);
-        return ActionResult.success(MsgCode.SU000.get());
-    }
-
-
-    @Operation(summary = "系配置查询")
-    @PostMapping("selectList")
-    public ActionResult<IPage<TSystemConfiguration>> selectList(@RequestBody TSystemConfigurationDto.TSystemConfigurationDtoParam param) {
-        return ActionResult.success(MsgCode.SU000.get(), tSystemConfigurationService.selectList(param));
-    }
-
-
-}

jnpf-library/jnpf-library-controller/src/main/java/jnpf/controller/TUserForLibraryController.java

@@ -1,52 +0,0 @@
-package jnpf.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jnpf.base.ActionResult;
-import jnpf.constant.MsgCode;
-import jnpf.entity.TUserForLibrary;
-import jnpf.model.dto.TUserForLibraryDto;
-import jnpf.service.TUserForLibraryService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author xbw
- */
-@RestController
-@Api("赠品用户管理")
-@Tag(name = "赠品用户管理", description = "userForLibrary")
-@RequestMapping("/userForLibrary")
-@AllArgsConstructor
-public class TUserForLibraryController {
-    private final TUserForLibraryService tUserForLibraryService;
-
-    @Operation(summary = "用户新增")
-    @PostMapping("newOrUpdateUserForLibrary")
-    public ActionResult<Void> newOrUpdateUserForLibrary(@RequestBody TUserForLibraryDto.TUserForLibraryDtoAdd param) {
-        tUserForLibraryService.addOrUpdate(param);
-        return ActionResult.success(MsgCode.SU000.get());
-    }
-
-    @Operation(summary = "用户删除")
-    @PostMapping("delUserForLibrary")
-    public ActionResult<Void> delUserForLibrary(@RequestBody TUserForLibraryDto.TUserForLibraryDtoDel userForLibraryDtoDel) {
-        tUserForLibraryService.del(userForLibraryDtoDel);
-        return ActionResult.success(MsgCode.SU000.get());
-    }
-
-
-    @Operation(summary = "用户查询")
-    @PostMapping("selectList")
-    public ActionResult<IPage<TUserForLibrary>> selectList(@RequestBody TUserForLibraryDto.TUserForLibraryDtoParam param) {
-        return ActionResult.success(MsgCode.SU000.get(),tUserForLibraryService.selectList(param));
-    }
-
-
-
-}

jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TBunching.java

@@ -1,83 +0,0 @@
-package jnpf.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @author xbw
- */
-@Data
-@TableName("t_bunching")
-public class TBunching implements Serializable {
-    private static final long serialVersionUID = -65167281438767901L;
-
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    @ApiModelProperty(value = "分堆去向")
-    @TableField(value = "bunching_to")
-    private String bunchingTo;
-
-    @ApiModelProperty(value = "分堆说明")
-    @TableField(value = "bunching_remark")
-    private String bunchingRemark;
-
-    @ApiModelProperty(value = "送样册数")
-    @TableField(value = "bunching_number")
-    private Integer bunchingNumber;
-
-
-    @ApiModelProperty(value = "删除标记0-正常 1-删除")
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-
-    @ApiModelProperty(value = "创建者id")
-    @TableField(value = "create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建者名称")
-    @TableField(value = "create_name")
-    private String createName;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者id")
-    @TableField(value = "update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新者名称")
-    @TableField(value = "update_name")
-    private String updateName;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "创建人单位名称")
-    @TableField(value = "create_corp_name")
-    private String createCorpName;
-
-    @ApiModelProperty(value = "创建人单位id")
-    @TableField(value = "create_corp_id")
-    private String createCorpId;
-
-    @ApiModelProperty(value = "创建人部门名称")
-    @TableField(value = "create_dept_name")
-    private String createDeptName;
-
-    @ApiModelProperty(value = "创建人部门id")
-    @TableField(value = "create_dept_id")
-    private String createDeptId;
-}

jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TReceive.java

@@ -1,85 +0,0 @@
-package jnpf.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @author xbw
- */
-@Data
-@TableName("t_receive")
-public class TReceive implements Serializable {
-    private static final long serialVersionUID = -65167281438767901L;
-
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    @ApiModelProperty(value = "设置项")
-    @TableField(value = "set_item")
-    private String setItem;
-
-    @ApiModelProperty(value = "修改配置")
-    @TableField(value = "modify_item")
-    private String modifyItem;
-
-    @ApiModelProperty(value = "参数值")
-    @TableField(value = "modify_value")
-    private String modifyValue;
-
-
-
-    @ApiModelProperty(value = "删除标记0-正常 1-删除")
-    @TableField(value = "del_flag")
-    @TableLogic
-    private Integer delFlag;
-
-    @ApiModelProperty(value = "创建者id")
-    @TableField(value = "create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建者名称")
-    @TableField(value = "create_name")
-    private String createName;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者id")
-    @TableField(value = "update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新者名称")
-    @TableField(value = "update_name")
-    private String updateName;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "创建人单位名称")
-    @TableField(value = "create_corp_name")
-    private String createCorpName;
-
-    @ApiModelProperty(value = "创建人单位id")
-    @TableField(value = "create_corp_id")
-    private String createCorpId;
-
-    @ApiModelProperty(value = "创建人部门名称")
-    @TableField(value = "create_dept_name")
-    private String createDeptName;
-
-    @ApiModelProperty(value = "创建人部门id")
-    @TableField(value = "create_dept_id")
-    private String createDeptId;
-}

jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TReceiveConfig.java

@@ -1,93 +0,0 @@
-package jnpf.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @author xbw
- */
-@Data
-@TableName("t_receive_config")
-public class TReceiveConfig implements Serializable {
-    private static final long serialVersionUID = -65167281438767901L;
-
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    @ApiModelProperty(value = "领用数量")
-    @TableField(value = "receive_number")
-    private Integer receiveNumber;
-
-    @ApiModelProperty(value = "单册金额")
-    @TableField(value = "volume_amount")
-    private Integer volumeAmount;
-
-    @ApiModelProperty(value = "审核权限")
-    @TableField(value = "receive_auth")
-    private String receiveAuth;
-
-    @ApiModelProperty(value = "总金额")
-    @TableField(value = "volume_amount_all")
-    private Integer volumeAmountAll;
-
-    @ApiModelProperty(value = "领用范围")
-    @TableField(value = "receive_radius")
-    private String receiveRadius;
-
-
-
-    @ApiModelProperty(value = "删除标记0-正常 1-删除")
-    @TableField(value = "del_flag")
-    @TableLogic
-    private Integer delFlag;
-
-    @ApiModelProperty(value = "创建者id")
-    @TableField(value = "create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建者名称")
-    @TableField(value = "create_name")
-    private String createName;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者id")
-    @TableField(value = "update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新者名称")
-    @TableField(value = "update_name")
-    private String updateName;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "创建人单位名称")
-    @TableField(value = "create_corp_name")
-    private String createCorpName;
-
-    @ApiModelProperty(value = "创建人单位id")
-    @TableField(value = "create_corp_id")
-    private String createCorpId;
-
-    @ApiModelProperty(value = "创建人部门名称")
-    @TableField(value = "create_dept_name")
-    private String createDeptName;
-
-    @ApiModelProperty(value = "创建人部门id")
-    @TableField(value = "create_dept_id")
-    private String createDeptId;
-}

jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TSystemConfiguration.java

@@ -1,83 +0,0 @@
-package jnpf.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @author xbw
- */
-@Data
-@TableName("t_system_configuration")
-public class TSystemConfiguration implements Serializable {
-    private static final long serialVersionUID = -65167281438767901L;
-
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    @ApiModelProperty(value = "系统参数")
-    @TableField(value = "system_parameter")
-    private String systemParameter;
-
-    @ApiModelProperty(value = "系统参数说明")
-    @TableField(value = "system_parameter_remark")
-    private String systemParameterRemark;
-
-    @ApiModelProperty(value = "系统参数值")
-    @TableField(value = "system_parameter_value")
-    private String systemParameterValue;
-
-
-    @ApiModelProperty(value = "删除标记0-正常 1-删除")
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-
-    @ApiModelProperty(value = "创建者id")
-    @TableField(value = "create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建者名称")
-    @TableField(value = "create_name")
-    private String createName;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者id")
-    @TableField(value = "update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新者名称")
-    @TableField(value = "update_name")
-    private String updateName;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "创建人单位名称")
-    @TableField(value = "create_corp_name")
-    private String createCorpName;
-
-    @ApiModelProperty(value = "创建人单位id")
-    @TableField(value = "create_corp_id")
-    private String createCorpId;
-
-    @ApiModelProperty(value = "创建人部门名称")
-    @TableField(value = "create_dept_name")
-    private String createDeptName;
-
-    @ApiModelProperty(value = "创建人部门id")
-    @TableField(value = "create_dept_id")
-    private String createDeptId;
-}

jnpf-library/jnpf-library-entity/src/main/java/jnpf/entity/TUserForLibrary.java

@@ -1,104 +0,0 @@
-package jnpf.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @author xbw
- */
-@Data
-@TableName("t_user_for_library")
-public class TUserForLibrary implements Serializable {
-    private static final long serialVersionUID = -65167281438767901L;
-
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-
-    @ApiModelProperty(value = "用户姓名")
-    @TableField(value = "user_name")
-    private String userName;
-
-    @ApiModelProperty(value = "身份证号码")
-    @TableField(value = "id_number")
-    private String idNumber;
-
-
-    @ApiModelProperty(value = "用户手机号")
-    @TableField(value = "user_phone")
-    private String userPhone;
-
-    @ApiModelProperty(value = "0-女  1-男")
-    @TableField(value = "sex")
-    private Integer sex;
-
-    @ApiModelProperty(value = "0-内部  1-外部用户")
-    @TableField(value = "inside")
-    private Integer inside;
-
-    @ApiModelProperty(value = "职务")
-    @TableField(value = "job")
-    private String job;
-
-    @ApiModelProperty(value = "地址")
-    @TableField(value = "address")
-    private String address;
-
-    @ApiModelProperty(value = "部门")
-    @TableField(value = "section")
-    private String section;
-
-
-    @ApiModelProperty(value = "删除标记0-正常 1-删除")
-    @TableField(value = "del_flag")
-    private Integer delFlag;
-
-    @ApiModelProperty(value = "创建者id")
-    @TableField(value = "create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建者名称")
-    @TableField(value = "create_name")
-    private String createName;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新者id")
-    @TableField(value = "update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新者名称")
-    @TableField(value = "update_name")
-    private String updateName;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "创建人单位名称")
-    @TableField(value = "create_corp_name")
-    private String createCorpName;
-
-    @ApiModelProperty(value = "创建人单位id")
-    @TableField(value = "create_corp_id")
-    private String createCorpId;
-
-    @ApiModelProperty(value = "创建人部门名称")
-    @TableField(value = "create_dept_name")
-    private String createDeptName;
-
-    @ApiModelProperty(value = "创建人部门id")
-    @TableField(value = "create_dept_id")
-    private String createDeptId;
-}

jnpf-library/jnpf-library-entity/src/main/java/jnpf/enump/TReceiveEnum.java

@@ -1,105 +0,0 @@
-package jnpf.enump;
-
-import lombok.Getter;
-
-/**
- * @author xbw
- */
-public class TReceiveEnum {
-    @Getter
-    public enum ReceiveEnum {
-        AUTH(0, "领用审核权限"),
-        PRESIDENT(1, "需要社长审核"),
-        RADIUS(2, "领用范围");
-
-        private final Integer code;
-        private final String describe;
-
-        ReceiveEnum(Integer code, String describe) {
-            this.code = code;
-            this.describe = describe;
-        }
-    }
-
-    @Getter
-    public enum ReceiveItemEnum {
-        OPEN(0, "是否开放");
-
-        private final Integer code;
-        private final String describe;
-
-        ReceiveItemEnum(Integer code, String describe) {
-            this.code = code;
-            this.describe = describe;
-        }
-    }
-
-
-    @Getter
-    public enum ReceiveAuthEnum {
-        DIRECTOR(0, "编辑室主任"),
-        SUB_LEADER(1, "分管领导"),
-        PRESIDENT(2, "社长");;
-
-        private final Integer code;
-        private final String describe;
-
-        ReceiveAuthEnum(Integer code, String describe) {
-            this.code = code;
-            this.describe = describe;
-        }
-
-        public static TReceiveEnum.ReceiveAuthEnum getEnumByCode(Integer type) {
-            for (TReceiveEnum.ReceiveAuthEnum enm : TReceiveEnum.ReceiveAuthEnum.values()) {
-                if (enm.getCode().equals(type)) {
-                    return enm;
-                }
-            }
-            return null;
-        }
-
-    }
-
-    @Getter
-    public enum ReceiveRadiusEnum {
-        CLIQUE(0, "集团"),
-        OUR_ASSOCIATION(1, "本社"),
-        FOREIGN_AGENCY(2, "外社"),
-        OTHER(3, "其他");
-
-        private final Integer code;
-        private final String describe;
-
-        ReceiveRadiusEnum(Integer code, String describe) {
-            this.code = code;
-            this.describe = describe;
-        }
-
-        public static TReceiveEnum.ReceiveRadiusEnum getEnumByCode(Integer type) {
-            for (TReceiveEnum.ReceiveRadiusEnum enm : TReceiveEnum.ReceiveRadiusEnum.values()) {
-                if (enm.getCode().equals(type)) {
-                    return enm;
-                }
-            }
-            return null;
-        }
-
-    }
-
-    @Getter
-    public enum PresidentReviewEnum {
-        NUMBER(0, "领用数量"),
-        SINGLE_AMOUNT(1, "单册金额"),
-        ALL_AMOUNT(2, "领用总金额");
-
-        private final Integer code;
-        private final String describe;
-
-        PresidentReviewEnum(Integer code, String describe) {
-            this.code = code;
-            this.describe = describe;
-        }
-    }
-
-
-}

jnpf-library/jnpf-library-entity/src/main/java/jnpf/enump/TUserForLibraryEnum.java

@@ -1,35 +0,0 @@
-package jnpf.enump;
-
-import lombok.Getter;
-
-/**
- * @author xbw
- */
-public class TUserForLibraryEnum {
-
-    @Getter
-    public enum InsideEnum {
-        INSIDE(0, "内部用户"),
-        OUTSIDE(1, "外部用户");
-
-        ;
-
-        private final Integer code;
-        private final String describe;
-
-        InsideEnum(Integer code, String describe) {
-            this.code = code;
-            this.describe = describe;
-        }
-
-        public static InsideEnum getEnumByCode(Integer type) {
-            for (InsideEnum enm : InsideEnum.values()) {
-                if (enm.getCode().equals(type)) {
-                    return enm;
-                }
-            }
-            return null;
-        }
-    }
-
-}

jnpf-library/jnpf-library-entity/src/main/java/jnpf/model/dto/TBunchingDto.java

@@ -1,50 +0,0 @@
-package jnpf.model.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author xbw
- */
-public class TBunchingDto {
-
-    private TBunchingDto() {
-    }
-
-    @Data
-    public static class TBunchingDtoParam extends TBunchingDtoBasePageParam {
-        @ApiModelProperty(value = "分堆去向")
-        private String bunchingTo;
-    }
-
-    @Data
-    public static class TBunchingDtoBasePageParam {
-        @ApiModelProperty("当前页")
-        private Integer current = 1;
-        @ApiModelProperty("页大小")
-        private Integer size = 10;
-    }
-
-    @Data
-    public static class TBunchingDtoDel {
-        @ApiModelProperty(value = "分堆id")
-        private Long id;
-    }
-
-    @Data
-    public static class TBunchingDtoAddOrUpdate {
-        @ApiModelProperty(value = "分堆id 新增不传")
-        private Long id;
-
-        @ApiModelProperty(value = "分堆去向")
-        private String bunchingTo;
-
-        @ApiModelProperty(value = "分堆说明")
-        private String bunchingRemark;
-
-        @ApiModelProperty(value = "送阳册数")
-        private Integer bunchingNumber;
-
-
-    }
-}

jnpf-library/jnpf-library-entity/src/main/java/jnpf/model/dto/TReceiveDto.java

@@ -1,41 +0,0 @@
-package jnpf.model.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author xbw
- */
-public class TReceiveDto {
-
-    private TReceiveDto() {
-    }
-
-
-    @Data
-    public static class TReceiveDtoBasePageParam {
-        @ApiModelProperty("当前页")
-        private Integer current = 1;
-        @ApiModelProperty("页大小")
-        private Integer size = 10;
-    }
-
-    @Data
-    public static class TReceiveDtoConfig {
-        @ApiModelProperty(value = "领用数量")
-        private Integer receiveNumber;
-
-        @ApiModelProperty(value = "单册金额")
-        private Integer volumeAmount;
-
-        @ApiModelProperty(value = "总金额")
-        private Integer volumeAmountAll;
-
-        @ApiModelProperty(value = "领用范围 0-编辑室主任 1-分管领导 2-社长 用,隔开")
-        private String receiveAuth;
-
-        @ApiModelProperty(value = "领用范围 0-集团 1-本社 2-外社 3-其他 用,隔开")
-        private String receiveRadius;
-    }
-}

jnpf-library/jnpf-library-entity/src/main/java/jnpf/model/dto/TSystemConfigurationDto.java

@@ -1,49 +0,0 @@
-package jnpf.model.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author xbw
- */
-public class TSystemConfigurationDto {
-
-    private TSystemConfigurationDto(){}
-
-    @Data
-    public static class TSystemConfigurationDtoParam extends TSystemConfigurationDtoBasePageParam{
-        @ApiModelProperty(value = "系统参数")
-        private String systemParameter;
-    }
-
-    @Data
-    public static class TSystemConfigurationDtoBasePageParam {
-        @ApiModelProperty("当前页")
-        private Integer current = 1;
-        @ApiModelProperty("页大小")
-        private Integer size = 10;
-    }
-
-    @Data
-    public static class TSystemConfigurationDtoDel {
-        @ApiModelProperty(value = "用户id")
-        private Long id;
-    }
-
-    @Data
-    public static class TSystemConfigurationDtoAdd {
-        @ApiModelProperty(value = "用户id 新增不传")
-        private Long id;
-
-        @ApiModelProperty(value = "系统参数")
-        private String systemParameter;
-
-        @ApiModelProperty(value = "系统参数说明")
-        private String systemParameterRemark;
-
-        @ApiModelProperty(value = "系统参数值")
-        private String systemParameterValue;
-
-
-    }
-}

jnpf-library/jnpf-library-entity/src/main/java/jnpf/model/dto/TUserForLibraryDto.java

@@ -1,66 +0,0 @@
-package jnpf.model.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author xbw
- */
-public class TUserForLibraryDto {
-
-    private TUserForLibraryDto(){}
-
-    @Data
-    public static class TUserForLibraryDtoParam extends TUserForLibraryDtoBasePageParam{
-        @ApiModelProperty(value = "用户手机号")
-        private String userPhone;
-
-        @ApiModelProperty(value = "用户姓名")
-        private String userName;
-    }
-
-    @Data
-    public static class TUserForLibraryDtoBasePageParam {
-        @ApiModelProperty("当前页")
-        private Integer current = 1;
-        @ApiModelProperty("页大小")
-        private Integer size = 10;
-    }
-
-    @Data
-    public static class TUserForLibraryDtoDel {
-        @ApiModelProperty(value = "用户id")
-        private Long id;
-    }
-
-    @Data
-    public static class TUserForLibraryDtoAdd {
-        @ApiModelProperty(value = "用户id 新增不传")
-        private Long id;
-
-        @ApiModelProperty(value = "用户姓名")
-        private String userName;
-
-        @ApiModelProperty(value = "身份证号码")
-        private String idNumber;
-
-
-        @ApiModelProperty(value = "用户手机号")
-        private String userPhone;
-
-        @ApiModelProperty(value = "0-女  1-男")
-        private Integer sex;
-
-        @ApiModelProperty(value = "职务")
-        private String job;
-
-        @ApiModelProperty(value = "地址")
-        private String address;
-
-        @ApiModelProperty(value = "部门")
-        private String section;
-
-        @ApiModelProperty(value = "0-内部用户  1-外部用户")
-        private Integer inside;
-    }
-}