优化精简项目结构
This commit is contained in:
parent
f6cbed514f
commit
08c5783e5c
|
|
@ -126,7 +126,11 @@
|
||||||
<artifactId>poi-ooxml</artifactId>
|
<artifactId>poi-ooxml</artifactId>
|
||||||
<version>5.2.5</version>
|
<version>5.2.5</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>cn.qihangerp.service</groupId>
|
||||||
|
<artifactId>service</artifactId>
|
||||||
|
<version>2.0.0</version>
|
||||||
|
</dependency>
|
||||||
<!-- <dependency>-->
|
<!-- <dependency>-->
|
||||||
<!-- <groupId>org.projectlombok</groupId>-->
|
<!-- <groupId>org.projectlombok</groupId>-->
|
||||||
<!-- <artifactId>lombok</artifactId>-->
|
<!-- <artifactId>lombok</artifactId>-->
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.Primary;
|
import org.springframework.context.annotation.Primary;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@MapperScan({"cn.qihangerp.module.*.mapper","cn.qihangerp.module.mapper","cn.qihangerp.mapper"})
|
@MapperScan({"cn.qihangerp.mapper","cn.qihangerp.module.mapper","cn.qihangerp.mapper"})
|
||||||
public class MybatisPlusConfig {
|
public class MybatisPlusConfig {
|
||||||
@Primary
|
@Primary
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,13 @@
|
||||||
package cn.qihangerp.erp.controller;
|
package cn.qihangerp.erp.controller;
|
||||||
|
|
||||||
|
|
||||||
import cn.qihangerp.common.AjaxResult;
|
import cn.qihangerp.common.AjaxResult;
|
||||||
import cn.qihangerp.common.PageQuery;
|
import cn.qihangerp.common.PageQuery;
|
||||||
import cn.qihangerp.common.ResultVo;
|
import cn.qihangerp.common.ResultVo;
|
||||||
import cn.qihangerp.common.TableDataInfo;
|
import cn.qihangerp.common.TableDataInfo;
|
||||||
|
|
||||||
import cn.qihangerp.model.entity.ErpStockIn;
|
import cn.qihangerp.model.entity.ErpStockIn;
|
||||||
import cn.qihangerp.model.request.StockInCreateRequest;
|
import cn.qihangerp.model.request.StockInCreateRequest;
|
||||||
import cn.qihangerp.model.request.StockInRequest;
|
import cn.qihangerp.model.request.StockInRequest;
|
||||||
import cn.qihangerp.module.stock.service.ErpStockInService;
|
import cn.qihangerp.module.service.ErpStockInService;
|
||||||
import cn.qihangerp.security.common.BaseController;
|
import cn.qihangerp.security.common.BaseController;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ import cn.qihangerp.common.TableDataInfo;
|
||||||
import cn.qihangerp.model.entity.ErpStockOut;
|
import cn.qihangerp.model.entity.ErpStockOut;
|
||||||
import cn.qihangerp.model.request.StockOutCreateRequest;
|
import cn.qihangerp.model.request.StockOutCreateRequest;
|
||||||
import cn.qihangerp.model.request.StockOutItemRequest;
|
import cn.qihangerp.model.request.StockOutItemRequest;
|
||||||
import cn.qihangerp.module.stock.service.ErpStockOutService;
|
import cn.qihangerp.module.service.ErpStockOutService;
|
||||||
import cn.qihangerp.security.common.BaseController;
|
import cn.qihangerp.security.common.BaseController;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
package cn.qihangerp.erp.controller;
|
package cn.qihangerp.erp.controller;
|
||||||
|
|
||||||
|
|
||||||
import cn.qihangerp.common.AjaxResult;
|
import cn.qihangerp.common.AjaxResult;
|
||||||
import cn.qihangerp.common.TableDataInfo;
|
import cn.qihangerp.common.TableDataInfo;
|
||||||
import cn.qihangerp.model.entity.ErpWarehouse;
|
import cn.qihangerp.model.entity.ErpWarehouse;
|
||||||
import cn.qihangerp.model.entity.ErpWarehousePosition;
|
import cn.qihangerp.model.entity.ErpWarehousePosition;
|
||||||
import cn.qihangerp.module.stock.service.ErpWarehousePositionService;
|
import cn.qihangerp.module.service.ErpWarehousePositionService;
|
||||||
import cn.qihangerp.module.stock.service.ErpWarehouseService;
|
import cn.qihangerp.module.service.ErpWarehouseService;
|
||||||
import cn.qihangerp.security.common.BaseController;
|
import cn.qihangerp.security.common.BaseController;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
|
|
|
||||||
|
|
@ -1,69 +1,69 @@
|
||||||
package cn.qihangerp.erp.serviceImpl;
|
//package cn.qihangerp.erp.serviceImpl;
|
||||||
|
//
|
||||||
import cn.qihangerp.model.entity.SysConfig;
|
//import cn.qihangerp.model.entity.SysConfig;
|
||||||
import cn.qihangerp.service.SysConfigService;
|
//import cn.qihangerp.service.SysConfigService;
|
||||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
//import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import org.springframework.stereotype.Service;
|
//import org.springframework.stereotype.Service;
|
||||||
|
//
|
||||||
import java.util.Collection;
|
//import java.util.Collection;
|
||||||
import java.util.Map;
|
//import java.util.Map;
|
||||||
import java.util.Optional;
|
//import java.util.Optional;
|
||||||
import java.util.function.Function;
|
//import java.util.function.Function;
|
||||||
@Service
|
//@Service
|
||||||
public class SysConfigServiceImpl implements SysConfigService {
|
//public class SysConfigServiceImpl implements SysConfigService {
|
||||||
@Override
|
// @Override
|
||||||
public boolean selectCaptchaEnabled() {
|
// public boolean selectCaptchaEnabled() {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean saveBatch(Collection<SysConfig> entityList, int batchSize) {
|
// public boolean saveBatch(Collection<SysConfig> entityList, int batchSize) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean saveOrUpdateBatch(Collection<SysConfig> entityList, int batchSize) {
|
// public boolean saveOrUpdateBatch(Collection<SysConfig> entityList, int batchSize) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean updateBatchById(Collection<SysConfig> entityList, int batchSize) {
|
// public boolean updateBatchById(Collection<SysConfig> entityList, int batchSize) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean saveOrUpdate(SysConfig entity) {
|
// public boolean saveOrUpdate(SysConfig entity) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public SysConfig getOne(Wrapper<SysConfig> queryWrapper, boolean throwEx) {
|
// public SysConfig getOne(Wrapper<SysConfig> queryWrapper, boolean throwEx) {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public Optional<SysConfig> getOneOpt(Wrapper<SysConfig> queryWrapper, boolean throwEx) {
|
// public Optional<SysConfig> getOneOpt(Wrapper<SysConfig> queryWrapper, boolean throwEx) {
|
||||||
return Optional.empty();
|
// return Optional.empty();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public Map<String, Object> getMap(Wrapper<SysConfig> queryWrapper) {
|
// public Map<String, Object> getMap(Wrapper<SysConfig> queryWrapper) {
|
||||||
return Map.of();
|
// return Map.of();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public <V> V getObj(Wrapper<SysConfig> queryWrapper, Function<? super Object, V> mapper) {
|
// public <V> V getObj(Wrapper<SysConfig> queryWrapper, Function<? super Object, V> mapper) {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public BaseMapper<SysConfig> getBaseMapper() {
|
// public BaseMapper<SysConfig> getBaseMapper() {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public Class<SysConfig> getEntityClass() {
|
// public Class<SysConfig> getEntityClass() {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|
|
||||||
|
|
@ -1,123 +1,123 @@
|
||||||
package cn.qihangerp.erp.serviceImpl;
|
//package cn.qihangerp.erp.serviceImpl;
|
||||||
|
//
|
||||||
import cn.qihangerp.model.entity.SysUser;
|
//import cn.qihangerp.model.entity.SysUser;
|
||||||
import cn.qihangerp.service.ISysUserService;
|
//import cn.qihangerp.service.ISysUserService;
|
||||||
|
//
|
||||||
import org.springframework.stereotype.Service;
|
//import org.springframework.stereotype.Service;
|
||||||
|
//
|
||||||
import java.util.List;
|
//import java.util.List;
|
||||||
|
//
|
||||||
/**
|
///**
|
||||||
* 用户 业务层处理
|
// * 用户 业务层处理
|
||||||
*
|
// *
|
||||||
* @author qihang
|
// * @author qihang
|
||||||
*/
|
// */
|
||||||
@Service
|
//@Service
|
||||||
public class SysUserServiceImpl implements ISysUserService
|
//public class SysUserServiceImpl implements ISysUserService
|
||||||
{
|
//{
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public List<SysUser> selectUserList(SysUser user) {
|
// public List<SysUser> selectUserList(SysUser user) {
|
||||||
return List.of();
|
// return List.of();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public List<SysUser> selectAllocatedList(SysUser user) {
|
// public List<SysUser> selectAllocatedList(SysUser user) {
|
||||||
return List.of();
|
// return List.of();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public List<SysUser> selectUnallocatedList(SysUser user) {
|
// public List<SysUser> selectUnallocatedList(SysUser user) {
|
||||||
return List.of();
|
// return List.of();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public SysUser selectUserByUserName(String userName) {
|
// public SysUser selectUserByUserName(String userName) {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public SysUser selectUserById(Long userId) {
|
// public SysUser selectUserById(Long userId) {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean checkUserNameUnique(SysUser user) {
|
// public boolean checkUserNameUnique(SysUser user) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean checkPhoneUnique(SysUser user) {
|
// public boolean checkPhoneUnique(SysUser user) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean checkEmailUnique(SysUser user) {
|
// public boolean checkEmailUnique(SysUser user) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void checkUserAllowed(SysUser user) {
|
// public void checkUserAllowed(SysUser user) {
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int insertUser(SysUser user) {
|
// public int insertUser(SysUser user) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean registerUser(SysUser user) {
|
// public boolean registerUser(SysUser user) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int updateUser(SysUser user) {
|
// public int updateUser(SysUser user) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int updateUserStatus(SysUser user) {
|
// public int updateUserStatus(SysUser user) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int updateUserProfile(SysUser user) {
|
// public int updateUserProfile(SysUser user) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean updateUserAvatar(String userName, String avatar) {
|
// public boolean updateUserAvatar(String userName, String avatar) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int resetPwd(SysUser user) {
|
// public int resetPwd(SysUser user) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int resetUserPwd(String userName, String password) {
|
// public int resetUserPwd(String userName, String password) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int deleteUserById(Long userId) {
|
// public int deleteUserById(Long userId) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void checkUserDataScope(Long userId) {
|
// public void checkUserDataScope(Long userId) {
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public String selectUserRoleGroup(String userName) {
|
// public String selectUserRoleGroup(String userName) {
|
||||||
return "";
|
// return "";
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void insertUserAuth(Long userId, Long[] roleIds) {
|
// public void insertUserAuth(Long userId, Long[] roleIds) {
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|
|
||||||
|
|
@ -1,69 +1,69 @@
|
||||||
package cn.qihangerp.oms.service;
|
//package cn.qihangerp.oms.service;
|
||||||
|
//
|
||||||
import cn.qihangerp.model.entity.SysConfig;
|
//import cn.qihangerp.model.entity.SysConfig;
|
||||||
import cn.qihangerp.service.SysConfigService;
|
//import cn.qihangerp.service.SysConfigService;
|
||||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
//import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import org.springframework.stereotype.Service;
|
//import org.springframework.stereotype.Service;
|
||||||
|
//
|
||||||
import java.util.Collection;
|
//import java.util.Collection;
|
||||||
import java.util.Map;
|
//import java.util.Map;
|
||||||
import java.util.Optional;
|
//import java.util.Optional;
|
||||||
import java.util.function.Function;
|
//import java.util.function.Function;
|
||||||
@Service
|
//@Service
|
||||||
public class SysConfigServiceImpl implements SysConfigService {
|
//public class SysConfigServiceImpl implements SysConfigService {
|
||||||
@Override
|
// @Override
|
||||||
public boolean selectCaptchaEnabled() {
|
// public boolean selectCaptchaEnabled() {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean saveBatch(Collection<SysConfig> entityList, int batchSize) {
|
// public boolean saveBatch(Collection<SysConfig> entityList, int batchSize) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean saveOrUpdateBatch(Collection<SysConfig> entityList, int batchSize) {
|
// public boolean saveOrUpdateBatch(Collection<SysConfig> entityList, int batchSize) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean updateBatchById(Collection<SysConfig> entityList, int batchSize) {
|
// public boolean updateBatchById(Collection<SysConfig> entityList, int batchSize) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean saveOrUpdate(SysConfig entity) {
|
// public boolean saveOrUpdate(SysConfig entity) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public SysConfig getOne(Wrapper<SysConfig> queryWrapper, boolean throwEx) {
|
// public SysConfig getOne(Wrapper<SysConfig> queryWrapper, boolean throwEx) {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public Optional<SysConfig> getOneOpt(Wrapper<SysConfig> queryWrapper, boolean throwEx) {
|
// public Optional<SysConfig> getOneOpt(Wrapper<SysConfig> queryWrapper, boolean throwEx) {
|
||||||
return Optional.empty();
|
// return Optional.empty();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public Map<String, Object> getMap(Wrapper<SysConfig> queryWrapper) {
|
// public Map<String, Object> getMap(Wrapper<SysConfig> queryWrapper) {
|
||||||
return Map.of();
|
// return Map.of();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public <V> V getObj(Wrapper<SysConfig> queryWrapper, Function<? super Object, V> mapper) {
|
// public <V> V getObj(Wrapper<SysConfig> queryWrapper, Function<? super Object, V> mapper) {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public BaseMapper<SysConfig> getBaseMapper() {
|
// public BaseMapper<SysConfig> getBaseMapper() {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public Class<SysConfig> getEntityClass() {
|
// public Class<SysConfig> getEntityClass() {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|
|
||||||
|
|
@ -1,122 +1,122 @@
|
||||||
package cn.qihangerp.oms.service;
|
//package cn.qihangerp.oms.service;
|
||||||
|
//
|
||||||
import cn.qihangerp.model.entity.SysUser;
|
//import cn.qihangerp.model.entity.SysUser;
|
||||||
import cn.qihangerp.service.ISysUserService;
|
//import cn.qihangerp.service.ISysUserService;
|
||||||
import org.springframework.stereotype.Service;
|
//import org.springframework.stereotype.Service;
|
||||||
|
//
|
||||||
import java.util.List;
|
//import java.util.List;
|
||||||
|
//
|
||||||
/**
|
///**
|
||||||
* 用户 业务层处理
|
// * 用户 业务层处理
|
||||||
*
|
// *
|
||||||
* @author qihang
|
// * @author qihang
|
||||||
*/
|
// */
|
||||||
@Service
|
//@Service
|
||||||
public class SysUserServiceImpl implements ISysUserService
|
//public class SysUserServiceImpl implements ISysUserService
|
||||||
{
|
//{
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public List<SysUser> selectUserList(SysUser user) {
|
// public List<SysUser> selectUserList(SysUser user) {
|
||||||
return List.of();
|
// return List.of();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public List<SysUser> selectAllocatedList(SysUser user) {
|
// public List<SysUser> selectAllocatedList(SysUser user) {
|
||||||
return List.of();
|
// return List.of();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public List<SysUser> selectUnallocatedList(SysUser user) {
|
// public List<SysUser> selectUnallocatedList(SysUser user) {
|
||||||
return List.of();
|
// return List.of();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public SysUser selectUserByUserName(String userName) {
|
// public SysUser selectUserByUserName(String userName) {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public SysUser selectUserById(Long userId) {
|
// public SysUser selectUserById(Long userId) {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean checkUserNameUnique(SysUser user) {
|
// public boolean checkUserNameUnique(SysUser user) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean checkPhoneUnique(SysUser user) {
|
// public boolean checkPhoneUnique(SysUser user) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean checkEmailUnique(SysUser user) {
|
// public boolean checkEmailUnique(SysUser user) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void checkUserAllowed(SysUser user) {
|
// public void checkUserAllowed(SysUser user) {
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int insertUser(SysUser user) {
|
// public int insertUser(SysUser user) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean registerUser(SysUser user) {
|
// public boolean registerUser(SysUser user) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int updateUser(SysUser user) {
|
// public int updateUser(SysUser user) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int updateUserStatus(SysUser user) {
|
// public int updateUserStatus(SysUser user) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int updateUserProfile(SysUser user) {
|
// public int updateUserProfile(SysUser user) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean updateUserAvatar(String userName, String avatar) {
|
// public boolean updateUserAvatar(String userName, String avatar) {
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int resetPwd(SysUser user) {
|
// public int resetPwd(SysUser user) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int resetUserPwd(String userName, String password) {
|
// public int resetUserPwd(String userName, String password) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public int deleteUserById(Long userId) {
|
// public int deleteUserById(Long userId) {
|
||||||
return 0;
|
// return 0;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void checkUserDataScope(Long userId) {
|
// public void checkUserDataScope(Long userId) {
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public String selectUserRoleGroup(String userName) {
|
// public String selectUserRoleGroup(String userName) {
|
||||||
return "";
|
// return "";
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void insertUserAuth(Long userId, Long[] roleIds) {
|
// public void insertUserAuth(Long userId, Long[] roleIds) {
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|
|
||||||
|
|
@ -189,11 +189,11 @@
|
||||||
<artifactId>security</artifactId>
|
<artifactId>security</artifactId>
|
||||||
<version>1.0</version>
|
<version>1.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<!-- <dependency>-->
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
<!-- <groupId>cn.qihangerp.service</groupId>-->
|
||||||
<artifactId>sys</artifactId>
|
<!-- <artifactId>sys</artifactId>-->
|
||||||
<version>2.0.0</version>
|
<!-- <version>2.0.0</version>-->
|
||||||
</dependency>
|
<!-- </dependency>-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
<groupId>cn.qihangerp.service</groupId>
|
||||||
<artifactId>service</artifactId>
|
<artifactId>service</artifactId>
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ package cn.qihangerp.sys.controller;
|
||||||
import cn.qihangerp.common.AjaxResult;
|
import cn.qihangerp.common.AjaxResult;
|
||||||
import cn.qihangerp.common.constant.UserConstants;
|
import cn.qihangerp.common.constant.UserConstants;
|
||||||
import cn.qihangerp.common.utils.StringUtils;
|
import cn.qihangerp.common.utils.StringUtils;
|
||||||
import cn.qihangerp.module.domain.SysDept;
|
import cn.qihangerp.model.SysDept;
|
||||||
import cn.qihangerp.module.service.ISysDeptService;
|
import cn.qihangerp.module.service.ISysDeptService;
|
||||||
import cn.qihangerp.security.common.BaseController;
|
import cn.qihangerp.security.common.BaseController;
|
||||||
import org.apache.commons.lang3.ArrayUtils;
|
import org.apache.commons.lang3.ArrayUtils;
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ package cn.qihangerp.sys.controller;
|
||||||
|
|
||||||
import cn.qihangerp.common.AjaxResult;
|
import cn.qihangerp.common.AjaxResult;
|
||||||
import cn.qihangerp.common.TableDataInfo;
|
import cn.qihangerp.common.TableDataInfo;
|
||||||
import cn.qihangerp.module.domain.SysDictType;
|
import cn.qihangerp.model.SysDictType;
|
||||||
import cn.qihangerp.module.service.ISysDictTypeService;
|
import cn.qihangerp.module.service.ISysDictTypeService;
|
||||||
import cn.qihangerp.security.common.BaseController;
|
import cn.qihangerp.security.common.BaseController;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package cn.qihangerp.sys.controller;
|
package cn.qihangerp.sys.controller;
|
||||||
|
|
||||||
import cn.qihangerp.model.entity.SysUser;
|
import cn.qihangerp.model.entity.SysUser;
|
||||||
import cn.qihangerp.module.domain.LoginBody;
|
import cn.qihangerp.model.LoginBody;
|
||||||
import cn.qihangerp.module.domain.SysMenu;
|
import cn.qihangerp.model.SysMenu;
|
||||||
import cn.qihangerp.module.service.ISysMenuService;
|
import cn.qihangerp.module.service.ISysMenuService;
|
||||||
import cn.qihangerp.module.service.SysPermissionService;
|
import cn.qihangerp.module.service.SysPermissionService;
|
||||||
import cn.qihangerp.security.common.Constants;
|
import cn.qihangerp.security.common.Constants;
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ package cn.qihangerp.sys.controller;
|
||||||
import cn.qihangerp.common.AjaxResult;
|
import cn.qihangerp.common.AjaxResult;
|
||||||
import cn.qihangerp.common.constant.UserConstants;
|
import cn.qihangerp.common.constant.UserConstants;
|
||||||
import cn.qihangerp.common.utils.StringUtils;
|
import cn.qihangerp.common.utils.StringUtils;
|
||||||
import cn.qihangerp.module.domain.SysMenu;
|
import cn.qihangerp.model.SysMenu;
|
||||||
import cn.qihangerp.module.service.ISysMenuService;
|
import cn.qihangerp.module.service.ISysMenuService;
|
||||||
import cn.qihangerp.security.common.BaseController;
|
import cn.qihangerp.security.common.BaseController;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@ import cn.qihangerp.common.TableDataInfo;
|
||||||
import cn.qihangerp.common.utils.StringUtils;
|
import cn.qihangerp.common.utils.StringUtils;
|
||||||
import cn.qihangerp.model.entity.SysRole;
|
import cn.qihangerp.model.entity.SysRole;
|
||||||
import cn.qihangerp.model.entity.SysUser;
|
import cn.qihangerp.model.entity.SysUser;
|
||||||
import cn.qihangerp.module.domain.SysDept;
|
import cn.qihangerp.model.SysDept;
|
||||||
import cn.qihangerp.module.domain.SysUserRole;
|
import cn.qihangerp.model.SysUserRole;
|
||||||
import cn.qihangerp.module.service.ISysDeptService;
|
import cn.qihangerp.module.service.ISysDeptService;
|
||||||
import cn.qihangerp.module.service.ISysRoleService;
|
import cn.qihangerp.module.service.ISysRoleService;
|
||||||
import cn.qihangerp.module.service.SysPermissionService;
|
import cn.qihangerp.module.service.SysPermissionService;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.qihangerp.module.mapper;
|
package cn.qihangerp.mapper;
|
||||||
|
|
||||||
|
|
||||||
import cn.qihangerp.model.entity.SysConfig;
|
import cn.qihangerp.model.entity.SysConfig;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package cn.qihangerp.module.mapper;
|
package cn.qihangerp.mapper;
|
||||||
|
|
||||||
|
|
||||||
import cn.qihangerp.module.domain.SysDept;
|
import cn.qihangerp.model.SysDept;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.qihangerp.module.mapper;
|
package cn.qihangerp.mapper;
|
||||||
|
|
||||||
import cn.qihangerp.model.entity.SysDictData;
|
import cn.qihangerp.model.entity.SysDictData;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package cn.qihangerp.module.mapper;
|
package cn.qihangerp.mapper;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import cn.qihangerp.module.domain.SysDictType;
|
import cn.qihangerp.model.SysDictType;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package cn.qihangerp.module.mapper;
|
package cn.qihangerp.mapper;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import cn.qihangerp.module.domain.SysMenu;
|
import cn.qihangerp.model.SysMenu;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package cn.qihangerp.module.mapper;
|
package cn.qihangerp.mapper;
|
||||||
|
|
||||||
|
|
||||||
import cn.qihangerp.module.domain.SysOss;
|
import cn.qihangerp.model.SysOss;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.qihangerp.module.mapper;
|
package cn.qihangerp.mapper;
|
||||||
|
|
||||||
import cn.qihangerp.model.entity.SysRole;
|
import cn.qihangerp.model.entity.SysRole;
|
||||||
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package cn.qihangerp.module.mapper;
|
package cn.qihangerp.mapper;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import cn.qihangerp.module.domain.SysRoleMenu;
|
import cn.qihangerp.model.SysRoleMenu;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.qihangerp.module.mapper;
|
package cn.qihangerp.mapper;
|
||||||
|
|
||||||
import cn.qihangerp.model.entity.SysUser;
|
import cn.qihangerp.model.entity.SysUser;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package cn.qihangerp.module.mapper;
|
package cn.qihangerp.mapper;
|
||||||
|
|
||||||
|
|
||||||
import cn.qihangerp.module.domain.SysUserRole;
|
import cn.qihangerp.model.SysUserRole;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -73,7 +73,7 @@
|
||||||
</select>
|
</select>
|
||||||
<select id="salesDaily" resultType="cn.qihangerp.model.vo.SalesDailyVo">
|
<select id="salesDaily" resultType="cn.qihangerp.model.vo.SalesDailyVo">
|
||||||
SELECT
|
SELECT
|
||||||
DATE(order_time) AS date,
|
DATE(order_create_time) AS date,
|
||||||
COUNT(*) AS count,
|
COUNT(*) AS count,
|
||||||
SUM(payment) AS amount
|
SUM(payment) AS amount
|
||||||
|
|
||||||
|
|
@ -97,13 +97,13 @@
|
||||||
FROM
|
FROM
|
||||||
o_order
|
o_order
|
||||||
|
|
||||||
WHERE DATE(`order_time`) = CURDATE();
|
WHERE DATE(`order_create_time`) = CURDATE();
|
||||||
</select>
|
</select>
|
||||||
<select id="getWaitShipOrderAllCount" resultType="int">
|
<select id="getWaitShipOrderAllCount" resultType="int">
|
||||||
SELECT
|
SELECT
|
||||||
COUNT(*) AS count
|
COUNT(*) AS count
|
||||||
FROM
|
FROM
|
||||||
o_order as o
|
o_order as o
|
||||||
WHERE order_status=1 and refund_status=1 and ship_status != 2
|
WHERE ship_status != 11 and (ship_status =0 or ship_status=1)
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.qihangerp.module.mapper.SysConfigMapper">
|
<mapper namespace="cn.qihangerp.mapper.SysConfigMapper">
|
||||||
|
|
||||||
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.SysConfig">
|
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.SysConfig">
|
||||||
<id property="configId" column="config_id" jdbcType="INTEGER"/>
|
<id property="configId" column="config_id" jdbcType="INTEGER"/>
|
||||||
|
|
@ -2,9 +2,9 @@
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.qihangerp.module.mapper.SysDeptMapper">
|
<mapper namespace="cn.qihangerp.mapper.SysDeptMapper">
|
||||||
|
|
||||||
<resultMap type="cn.qihangerp.module.domain.SysDept" id="SysDeptResult">
|
<resultMap type="cn.qihangerp.model.SysDept" id="SysDeptResult">
|
||||||
<id property="deptId" column="dept_id" />
|
<id property="deptId" column="dept_id" />
|
||||||
<result property="parentId" column="parent_id" />
|
<result property="parentId" column="parent_id" />
|
||||||
<result property="ancestors" column="ancestors" />
|
<result property="ancestors" column="ancestors" />
|
||||||
|
|
@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
from sys_dept d
|
from sys_dept d
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectDeptList" parameterType="cn.qihangerp.module.domain.SysDept" resultMap="SysDeptResult">
|
<select id="selectDeptList" parameterType="cn.qihangerp.model.SysDept" resultMap="SysDeptResult">
|
||||||
<include refid="selectDeptVo"/>
|
<include refid="selectDeptVo"/>
|
||||||
where d.del_flag = '0'
|
where d.del_flag = '0'
|
||||||
<if test="deptId != null and deptId != 0">
|
<if test="deptId != null and deptId != 0">
|
||||||
|
|
@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
|
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<insert id="insertDept" parameterType="cn.qihangerp.module.domain.SysDept">
|
<insert id="insertDept" parameterType="cn.qihangerp.model.SysDept">
|
||||||
insert into sys_dept(
|
insert into sys_dept(
|
||||||
<if test="deptId != null and deptId != 0">dept_id,</if>
|
<if test="deptId != null and deptId != 0">dept_id,</if>
|
||||||
<if test="parentId != null and parentId != 0">parent_id,</if>
|
<if test="parentId != null and parentId != 0">parent_id,</if>
|
||||||
|
|
@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
<update id="updateDept" parameterType="cn.qihangerp.module.domain.SysDept">
|
<update id="updateDept" parameterType="cn.qihangerp.model.SysDept">
|
||||||
update sys_dept
|
update sys_dept
|
||||||
<set>
|
<set>
|
||||||
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
|
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.qihangerp.module.mapper.SysDictDataMapper">
|
<mapper namespace="cn.qihangerp.mapper.SysDictDataMapper">
|
||||||
|
|
||||||
<resultMap type="cn.qihangerp.model.entity.SysDictData" id="SysDictDataResult">
|
<resultMap type="cn.qihangerp.model.entity.SysDictData" id="SysDictDataResult">
|
||||||
<id property="dictCode" column="dict_code" />
|
<id property="dictCode" column="dict_code" />
|
||||||
|
|
@ -2,9 +2,9 @@
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.qihangerp.module.mapper.SysDictTypeMapper">
|
<mapper namespace="cn.qihangerp.mapper.SysDictTypeMapper">
|
||||||
|
|
||||||
<resultMap type="cn.qihangerp.module.domain.SysDictType" id="SysDictTypeResult">
|
<resultMap type="cn.qihangerp.model.SysDictType" id="SysDictTypeResult">
|
||||||
<id property="dictId" column="dict_id" />
|
<id property="dictId" column="dict_id" />
|
||||||
<result property="dictName" column="dict_name" />
|
<result property="dictName" column="dict_name" />
|
||||||
<result property="dictType" column="dict_type" />
|
<result property="dictType" column="dict_type" />
|
||||||
|
|
@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
from sys_dict_type
|
from sys_dict_type
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectDictTypeList" parameterType="cn.qihangerp.module.domain.SysDictType" resultMap="SysDictTypeResult">
|
<select id="selectDictTypeList" parameterType="cn.qihangerp.model.SysDictType" resultMap="SysDictTypeResult">
|
||||||
<include refid="selectDictTypeVo"/>
|
<include refid="selectDictTypeVo"/>
|
||||||
<where>
|
<where>
|
||||||
<if test="dictName != null and dictName != ''">
|
<if test="dictName != null and dictName != ''">
|
||||||
|
|
@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</foreach>
|
</foreach>
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<update id="updateDictType" parameterType="cn.qihangerp.module.domain.SysDictType">
|
<update id="updateDictType" parameterType="cn.qihangerp.model.SysDictType">
|
||||||
update sys_dict_type
|
update sys_dict_type
|
||||||
<set>
|
<set>
|
||||||
<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
|
<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
|
||||||
|
|
@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
where dict_id = #{dictId}
|
where dict_id = #{dictId}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<insert id="insertDictType" parameterType="cn.qihangerp.module.domain.SysDictType">
|
<insert id="insertDictType" parameterType="cn.qihangerp.model.SysDictType">
|
||||||
insert into sys_dict_type(
|
insert into sys_dict_type(
|
||||||
<if test="dictName != null and dictName != ''">dict_name,</if>
|
<if test="dictName != null and dictName != ''">dict_name,</if>
|
||||||
<if test="dictType != null and dictType != ''">dict_type,</if>
|
<if test="dictType != null and dictType != ''">dict_type,</if>
|
||||||
|
|
@ -2,9 +2,9 @@
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.qihangerp.module.mapper.SysMenuMapper">
|
<mapper namespace="cn.qihangerp.mapper.SysMenuMapper">
|
||||||
|
|
||||||
<resultMap type="cn.qihangerp.module.domain.SysMenu" id="SysMenuResult">
|
<resultMap type="cn.qihangerp.model.SysMenu" id="SysMenuResult">
|
||||||
<id property="menuId" column="menu_id" />
|
<id property="menuId" column="menu_id" />
|
||||||
<result property="menuName" column="menu_name" />
|
<result property="menuName" column="menu_name" />
|
||||||
<result property="parentName" column="parent_name" />
|
<result property="parentName" column="parent_name" />
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
from sys_menu
|
from sys_menu
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectMenuList" parameterType="cn.qihangerp.module.domain.SysMenu" resultMap="SysMenuResult">
|
<select id="selectMenuList" parameterType="cn.qihangerp.model.SysMenu" resultMap="SysMenuResult">
|
||||||
<include refid="selectMenuVo"/>
|
<include refid="selectMenuVo"/>
|
||||||
<where>
|
<where>
|
||||||
<if test="menuName != null and menuName != ''">
|
<if test="menuName != null and menuName != ''">
|
||||||
|
|
@ -54,7 +54,7 @@
|
||||||
order by m.parent_id, m.order_num
|
order by m.parent_id, m.order_num
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectMenuListByUserId" parameterType="cn.qihangerp.module.domain.SysMenu" resultMap="SysMenuResult">
|
<select id="selectMenuListByUserId" parameterType="cn.qihangerp.model.SysMenu" resultMap="SysMenuResult">
|
||||||
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
|
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
|
||||||
from sys_menu m
|
from sys_menu m
|
||||||
left join sys_role_menu rm on m.menu_id = rm.menu_id
|
left join sys_role_menu rm on m.menu_id = rm.menu_id
|
||||||
|
|
@ -127,12 +127,12 @@
|
||||||
select count(1) from sys_menu where parent_id = #{menuId}
|
select count(1) from sys_menu where parent_id = #{menuId}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="checkMenuNameUnique" parameterType="cn.qihangerp.module.domain.SysMenu" resultMap="SysMenuResult">
|
<select id="checkMenuNameUnique" parameterType="cn.qihangerp.model.SysMenu" resultMap="SysMenuResult">
|
||||||
<include refid="selectMenuVo"/>
|
<include refid="selectMenuVo"/>
|
||||||
where menu_name=#{menuName} and parent_id = #{parentId} limit 1
|
where menu_name=#{menuName} and parent_id = #{parentId} limit 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="updateMenu" parameterType="cn.qihangerp.module.domain.SysMenu">
|
<update id="updateMenu" parameterType="cn.qihangerp.model.SysMenu">
|
||||||
update sys_menu
|
update sys_menu
|
||||||
<set>
|
<set>
|
||||||
<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
|
<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
|
||||||
|
|
@ -155,7 +155,7 @@
|
||||||
where menu_id = #{menuId}
|
where menu_id = #{menuId}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<insert id="insertMenu" parameterType="cn.qihangerp.module.domain.SysMenu">
|
<insert id="insertMenu" parameterType="cn.qihangerp.model.SysMenu">
|
||||||
insert into sys_menu(
|
insert into sys_menu(
|
||||||
<if test="menuId != null and menuId != 0">menu_id,</if>
|
<if test="menuId != null and menuId != 0">menu_id,</if>
|
||||||
<if test="parentId != null and parentId != 0">parent_id,</if>
|
<if test="parentId != null and parentId != 0">parent_id,</if>
|
||||||
|
|
@ -2,9 +2,9 @@
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.qihangerp.module.mapper.SysOssMapper">
|
<mapper namespace="cn.qihangerp.mapper.SysOssMapper">
|
||||||
|
|
||||||
<resultMap id="BaseResultMap" type="cn.qihangerp.module.domain.SysOss">
|
<resultMap id="BaseResultMap" type="cn.qihangerp.model.SysOss">
|
||||||
<id property="ossId" column="oss_id" jdbcType="BIGINT"/>
|
<id property="ossId" column="oss_id" jdbcType="BIGINT"/>
|
||||||
<result property="fileName" column="file_name" jdbcType="VARCHAR"/>
|
<result property="fileName" column="file_name" jdbcType="VARCHAR"/>
|
||||||
<result property="originalName" column="original_name" jdbcType="VARCHAR"/>
|
<result property="originalName" column="original_name" jdbcType="VARCHAR"/>
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.qihangerp.module.mapper.SysRoleMapper">
|
<mapper namespace="cn.qihangerp.mapper.SysRoleMapper">
|
||||||
|
|
||||||
<resultMap type="cn.qihangerp.model.entity.SysRole" id="SysRoleResult">
|
<resultMap type="cn.qihangerp.model.entity.SysRole" id="SysRoleResult">
|
||||||
<id property="roleId" column="role_id" />
|
<id property="roleId" column="role_id" />
|
||||||
|
|
@ -2,9 +2,9 @@
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.qihangerp.module.mapper.SysRoleMenuMapper">
|
<mapper namespace="cn.qihangerp.mapper.SysRoleMenuMapper">
|
||||||
|
|
||||||
<resultMap type="cn.qihangerp.module.domain.SysRoleMenu" id="SysRoleMenuResult">
|
<resultMap type="cn.qihangerp.model.SysRoleMenu" id="SysRoleMenuResult">
|
||||||
<result property="roleId" column="role_id" />
|
<result property="roleId" column="role_id" />
|
||||||
<result property="menuId" column="menu_id" />
|
<result property="menuId" column="menu_id" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.qihangerp.module.mapper.SysUserMapper">
|
<mapper namespace="cn.qihangerp.mapper.SysUserMapper">
|
||||||
|
|
||||||
<resultMap type="cn.qihangerp.model.entity.SysUser" id="SysUserResult">
|
<resultMap type="cn.qihangerp.model.entity.SysUser" id="SysUserResult">
|
||||||
<id property="userId" column="user_id" />
|
<id property="userId" column="user_id" />
|
||||||
|
|
@ -2,9 +2,9 @@
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="cn.qihangerp.module.mapper.SysUserRoleMapper">
|
<mapper namespace="cn.qihangerp.mapper.SysUserRoleMapper">
|
||||||
|
|
||||||
<resultMap type="cn.qihangerp.module.domain.SysUserRole" id="SysUserRoleResult">
|
<resultMap type="cn.qihangerp.model.SysUserRole" id="SysUserRoleResult">
|
||||||
<result property="userId" column="user_id" />
|
<result property="userId" column="user_id" />
|
||||||
<result property="roleId" column="role_id" />
|
<result property="roleId" column="role_id" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</foreach>
|
</foreach>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
<delete id="deleteUserRoleInfo" parameterType="cn.qihangerp.module.domain.SysUserRole">
|
<delete id="deleteUserRoleInfo" parameterType="cn.qihangerp.model.SysUserRole">
|
||||||
delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
|
delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.qihangerp.module.domain;
|
package cn.qihangerp.model;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户登录对象
|
* 用户登录对象
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.qihangerp.module.domain;
|
package cn.qihangerp.model;
|
||||||
|
|
||||||
import cn.qihangerp.model.entity.BaseEntity;
|
import cn.qihangerp.model.entity.BaseEntity;
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.qihangerp.module.domain;
|
package cn.qihangerp.model;
|
||||||
|
|
||||||
import cn.qihangerp.model.entity.BaseEntity;
|
import cn.qihangerp.model.entity.BaseEntity;
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package cn.qihangerp.module.domain;
|
package cn.qihangerp.model;
|
||||||
|
|
||||||
import cn.qihangerp.model.entity.BaseEntity;
|
import cn.qihangerp.model.entity.BaseEntity;
|
||||||
import cn.qihangerp.module.domain.vo.MenusDetailVo;
|
import cn.qihangerp.model.vo.MenusDetailVo;
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.qihangerp.module.domain;
|
package cn.qihangerp.model;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.qihangerp.module.domain;
|
package cn.qihangerp.model;
|
||||||
|
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.qihangerp.module.domain;
|
package cn.qihangerp.model;
|
||||||
|
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
package cn.qihangerp.model.vo;
|
||||||
|
|
||||||
|
public class MenuMetaVo {
|
||||||
|
}
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
package cn.qihangerp.module.domain.vo;
|
package cn.qihangerp.model.vo;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class MenusDetailVo {
|
public class MenusDetailVo {
|
||||||
private String title;
|
private String title;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.qihangerp.module.domain.vo;
|
package cn.qihangerp.model.vo;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package cn.qihangerp.module.domain.vo;
|
package cn.qihangerp.model.vo;
|
||||||
|
|
||||||
|
|
||||||
import cn.qihangerp.module.domain.SysDept;
|
import cn.qihangerp.model.SysDept;
|
||||||
import cn.qihangerp.module.domain.SysMenu;
|
import cn.qihangerp.model.SysMenu;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package cn.qihangerp.module.domain.vo;
|
package cn.qihangerp.model.vo;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -3,8 +3,8 @@ package cn.qihangerp.module.service;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import cn.qihangerp.module.domain.SysDept;
|
import cn.qihangerp.model.SysDept;
|
||||||
import cn.qihangerp.module.domain.vo.TreeSelect;
|
import cn.qihangerp.model.vo.TreeSelect;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package cn.qihangerp.module.service;
|
package cn.qihangerp.module.service;
|
||||||
|
|
||||||
import cn.qihangerp.model.entity.SysDictData;
|
import cn.qihangerp.model.entity.SysDictData;
|
||||||
import cn.qihangerp.module.domain.SysDictType;
|
import cn.qihangerp.model.SysDictType;
|
||||||
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package cn.qihangerp.module.service;
|
package cn.qihangerp.module.service;
|
||||||
|
|
||||||
import cn.qihangerp.model.vo.RouterVo;
|
import cn.qihangerp.model.vo.RouterVo;
|
||||||
import cn.qihangerp.module.domain.SysMenu;
|
import cn.qihangerp.model.SysMenu;
|
||||||
import cn.qihangerp.module.domain.vo.TreeSelect;
|
import cn.qihangerp.model.vo.TreeSelect;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package cn.qihangerp.module.service;
|
package cn.qihangerp.module.service;
|
||||||
|
|
||||||
import cn.qihangerp.model.entity.SysRole;
|
import cn.qihangerp.model.entity.SysRole;
|
||||||
import cn.qihangerp.module.domain.SysUserRole;
|
import cn.qihangerp.model.SysUserRole;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package cn.qihangerp.module.service;
|
package cn.qihangerp.module.service;
|
||||||
|
|
||||||
|
|
||||||
import cn.qihangerp.module.domain.SysOss;
|
import cn.qihangerp.model.SysOss;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package cn.qihangerp.module.service.impl;
|
package cn.qihangerp.module.service.impl;
|
||||||
|
|
||||||
import cn.qihangerp.model.entity.SysConfig;
|
import cn.qihangerp.model.entity.SysConfig;
|
||||||
import cn.qihangerp.module.mapper.SysConfigMapper;
|
import cn.qihangerp.mapper.SysConfigMapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
|
||||||
|
|
@ -7,10 +7,10 @@ import cn.qihangerp.common.utils.SpringUtils;
|
||||||
import cn.qihangerp.common.utils.StringUtils;
|
import cn.qihangerp.common.utils.StringUtils;
|
||||||
import cn.qihangerp.model.entity.SysRole;
|
import cn.qihangerp.model.entity.SysRole;
|
||||||
import cn.qihangerp.model.entity.SysUser;
|
import cn.qihangerp.model.entity.SysUser;
|
||||||
import cn.qihangerp.module.domain.SysDept;
|
import cn.qihangerp.model.SysDept;
|
||||||
import cn.qihangerp.module.domain.vo.TreeSelect;
|
import cn.qihangerp.model.vo.TreeSelect;
|
||||||
import cn.qihangerp.module.mapper.SysDeptMapper;
|
import cn.qihangerp.mapper.SysDeptMapper;
|
||||||
import cn.qihangerp.module.mapper.SysRoleMapper;
|
import cn.qihangerp.mapper.SysRoleMapper;
|
||||||
import cn.qihangerp.module.service.ISysDeptService;
|
import cn.qihangerp.module.service.ISysDeptService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
@ -2,7 +2,7 @@ package cn.qihangerp.module.service.impl;
|
||||||
|
|
||||||
import cn.qihangerp.model.DictUtils;
|
import cn.qihangerp.model.DictUtils;
|
||||||
import cn.qihangerp.model.entity.SysDictData;
|
import cn.qihangerp.model.entity.SysDictData;
|
||||||
import cn.qihangerp.module.mapper.SysDictDataMapper;
|
import cn.qihangerp.mapper.SysDictDataMapper;
|
||||||
import cn.qihangerp.module.service.ISysDictDataService;
|
import cn.qihangerp.module.service.ISysDictDataService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
@ -5,9 +5,9 @@ import cn.qihangerp.common.constant.UserConstants;
|
||||||
import cn.qihangerp.common.utils.StringUtils;
|
import cn.qihangerp.common.utils.StringUtils;
|
||||||
import cn.qihangerp.model.DictUtils;
|
import cn.qihangerp.model.DictUtils;
|
||||||
import cn.qihangerp.model.entity.SysDictData;
|
import cn.qihangerp.model.entity.SysDictData;
|
||||||
import cn.qihangerp.module.domain.SysDictType;
|
import cn.qihangerp.model.SysDictType;
|
||||||
import cn.qihangerp.module.mapper.SysDictDataMapper;
|
import cn.qihangerp.mapper.SysDictDataMapper;
|
||||||
import cn.qihangerp.module.mapper.SysDictTypeMapper;
|
import cn.qihangerp.mapper.SysDictTypeMapper;
|
||||||
import cn.qihangerp.module.service.ISysDictTypeService;
|
import cn.qihangerp.module.service.ISysDictTypeService;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
@ -3,15 +3,15 @@ package cn.qihangerp.module.service.impl;
|
||||||
import cn.qihangerp.common.constant.Constants;
|
import cn.qihangerp.common.constant.Constants;
|
||||||
import cn.qihangerp.common.constant.UserConstants;
|
import cn.qihangerp.common.constant.UserConstants;
|
||||||
import cn.qihangerp.common.utils.StringUtils;
|
import cn.qihangerp.common.utils.StringUtils;
|
||||||
|
import cn.qihangerp.mapper.SysMenuMapper;
|
||||||
|
import cn.qihangerp.mapper.SysRoleMapper;
|
||||||
|
import cn.qihangerp.mapper.SysRoleMenuMapper;
|
||||||
import cn.qihangerp.model.entity.SysRole;
|
import cn.qihangerp.model.entity.SysRole;
|
||||||
import cn.qihangerp.model.entity.SysUser;
|
import cn.qihangerp.model.entity.SysUser;
|
||||||
import cn.qihangerp.model.vo.MetaVo;
|
import cn.qihangerp.model.vo.MetaVo;
|
||||||
import cn.qihangerp.model.vo.RouterVo;
|
import cn.qihangerp.model.vo.RouterVo;
|
||||||
import cn.qihangerp.module.domain.SysMenu;
|
import cn.qihangerp.model.SysMenu;
|
||||||
import cn.qihangerp.module.domain.vo.TreeSelect;
|
import cn.qihangerp.model.vo.TreeSelect;
|
||||||
import cn.qihangerp.module.mapper.SysMenuMapper;
|
|
||||||
import cn.qihangerp.module.mapper.SysRoleMapper;
|
|
||||||
import cn.qihangerp.module.mapper.SysRoleMenuMapper;
|
|
||||||
import cn.qihangerp.module.service.ISysMenuService;
|
import cn.qihangerp.module.service.ISysMenuService;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package cn.qihangerp.module.service.impl;
|
package cn.qihangerp.module.service.impl;
|
||||||
|
|
||||||
import cn.qihangerp.module.domain.SysOss;
|
import cn.qihangerp.model.SysOss;
|
||||||
import cn.qihangerp.module.mapper.SysOssMapper;
|
import cn.qihangerp.mapper.SysOssMapper;
|
||||||
import cn.qihangerp.module.service.SysOssService;
|
import cn.qihangerp.module.service.SysOssService;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
|
||||||
|
|
@ -6,11 +6,11 @@ import cn.qihangerp.common.utils.SpringUtils;
|
||||||
import cn.qihangerp.common.utils.StringUtils;
|
import cn.qihangerp.common.utils.StringUtils;
|
||||||
import cn.qihangerp.model.entity.SysRole;
|
import cn.qihangerp.model.entity.SysRole;
|
||||||
import cn.qihangerp.model.entity.SysUser;
|
import cn.qihangerp.model.entity.SysUser;
|
||||||
import cn.qihangerp.module.domain.SysRoleMenu;
|
import cn.qihangerp.model.SysRoleMenu;
|
||||||
import cn.qihangerp.module.domain.SysUserRole;
|
import cn.qihangerp.model.SysUserRole;
|
||||||
import cn.qihangerp.module.mapper.SysRoleMapper;
|
import cn.qihangerp.mapper.SysRoleMapper;
|
||||||
import cn.qihangerp.module.mapper.SysRoleMenuMapper;
|
import cn.qihangerp.mapper.SysRoleMenuMapper;
|
||||||
import cn.qihangerp.module.mapper.SysUserRoleMapper;
|
import cn.qihangerp.mapper.SysUserRoleMapper;
|
||||||
import cn.qihangerp.module.service.ISysRoleService;
|
import cn.qihangerp.module.service.ISysRoleService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
@ -6,10 +6,10 @@ import cn.qihangerp.common.constant.UserConstants;
|
||||||
import cn.qihangerp.common.utils.StringUtils;
|
import cn.qihangerp.common.utils.StringUtils;
|
||||||
import cn.qihangerp.model.entity.SysRole;
|
import cn.qihangerp.model.entity.SysRole;
|
||||||
import cn.qihangerp.model.entity.SysUser;
|
import cn.qihangerp.model.entity.SysUser;
|
||||||
import cn.qihangerp.module.domain.SysUserRole;
|
import cn.qihangerp.model.SysUserRole;
|
||||||
import cn.qihangerp.module.mapper.SysRoleMapper;
|
import cn.qihangerp.mapper.SysRoleMapper;
|
||||||
import cn.qihangerp.module.mapper.SysUserMapper;
|
import cn.qihangerp.mapper.SysUserMapper;
|
||||||
import cn.qihangerp.module.mapper.SysUserRoleMapper;
|
import cn.qihangerp.mapper.SysUserRoleMapper;
|
||||||
import cn.qihangerp.service.ISysUserService;
|
import cn.qihangerp.service.ISysUserService;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>serviceImpl</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</parent>
|
|
||||||
<artifactId>dou</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>dou</name>
|
|
||||||
<url>http://maven.apache.org</url>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.core</groupId>
|
|
||||||
<artifactId>common</artifactId>
|
|
||||||
<version>1.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>goods</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
|
|
||||||
<version>3.5.5</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>serviceImpl</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</parent>
|
|
||||||
<artifactId>goods</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>goods</name>
|
|
||||||
<url>http://maven.apache.org</url>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.core</groupId>
|
|
||||||
<artifactId>common</artifactId>
|
|
||||||
<version>1.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>service</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
|
|
||||||
<version>3.5.5</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>serviceImpl</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</parent>
|
|
||||||
<artifactId>jd</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>jd</name>
|
|
||||||
<url>http://maven.apache.org</url>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.core</groupId>
|
|
||||||
<artifactId>common</artifactId>
|
|
||||||
<version>1.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>goods</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
|
|
||||||
<version>3.5.5</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>serviceImpl</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>order</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
<name>order</name>
|
|
||||||
<url>http://maven.apache.org</url>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.core</groupId>
|
|
||||||
<artifactId>common</artifactId>
|
|
||||||
<version>1.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>goods</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>service</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.mapper</groupId>
|
|
||||||
<artifactId>mapper</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
|
|
||||||
<version>3.5.5</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>serviceImpl</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>pdd</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>pdd</name>
|
|
||||||
<url>http://maven.apache.org</url>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.core</groupId>
|
|
||||||
<artifactId>common</artifactId>
|
|
||||||
<version>1.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.mapper</groupId>
|
|
||||||
<artifactId>mapper</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- <dependency>-->
|
|
||||||
<!-- <groupId>cn.qihangerp.service</groupId>-->
|
|
||||||
<!-- <artifactId>goods</artifactId>-->
|
|
||||||
<!-- <version>2.0.0</version>-->
|
|
||||||
<!-- </dependency>-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
|
|
||||||
<version>3.5.5</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
<name>serviceImpl</name>
|
<name>serviceImpl</name>
|
||||||
<url>http://maven.apache.org</url>
|
<url>http://maven.apache.org</url>
|
||||||
<modules>
|
<modules>
|
||||||
<module>sys</module>
|
<!-- <module>sys</module>-->
|
||||||
<!-- <module>goods</module>-->
|
<!-- <module>goods</module>-->
|
||||||
<!-- <module>order</module>-->
|
<!-- <module>order</module>-->
|
||||||
<!-- <module>service</module>-->
|
<!-- <module>service</module>-->
|
||||||
|
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>serviceImpl</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>stock</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>wms</name>
|
|
||||||
<url>http://maven.apache.org</url>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.core</groupId>
|
|
||||||
<artifactId>common</artifactId>
|
|
||||||
<version>1.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<!-- <dependency>-->
|
|
||||||
<!-- <groupId>cn.qihangerp.service</groupId>-->
|
|
||||||
<!-- <artifactId>goods</artifactId>-->
|
|
||||||
<!-- <version>2.0.0</version>-->
|
|
||||||
<!-- <scope>compile</scope>-->
|
|
||||||
<!-- </dependency>-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.mapper</groupId>
|
|
||||||
<artifactId>mapper</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
package cn.qihangerp.module;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hello world!
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class App
|
|
||||||
{
|
|
||||||
public static void main( String[] args )
|
|
||||||
{
|
|
||||||
System.out.println( "Hello World!" );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
package cn.qihangerp.module.domain.vo;
|
|
||||||
|
|
||||||
public class MenuMetaVo {
|
|
||||||
}
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>serviceImpl</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>tao</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>tao</name>
|
|
||||||
<url>http://maven.apache.org</url>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.core</groupId>
|
|
||||||
<artifactId>common</artifactId>
|
|
||||||
<version>1.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.mapper</groupId>
|
|
||||||
<artifactId>mapper</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- <dependency>-->
|
|
||||||
<!-- <groupId>cn.qihangerp.service</groupId>-->
|
|
||||||
<!-- <artifactId>goods</artifactId>-->
|
|
||||||
<!-- <version>2.0.0</version>-->
|
|
||||||
<!-- </dependency>-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
|
|
||||||
<version>3.5.5</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>cn.qihangerp.service</groupId>
|
|
||||||
<artifactId>serviceImpl</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>wei</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>wei</name>
|
|
||||||
<url>http://maven.apache.org</url>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.core</groupId>
|
|
||||||
<artifactId>common</artifactId>
|
|
||||||
<version>1.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.qihangerp.mapper</groupId>
|
|
||||||
<artifactId>mapper</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- <dependency>-->
|
|
||||||
<!-- <groupId>cn.qihangerp.service</groupId>-->
|
|
||||||
<!-- <artifactId>goods</artifactId>-->
|
|
||||||
<!-- <version>2.0.0</version>-->
|
|
||||||
<!-- </dependency>-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
|
|
||||||
<version>3.5.5</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
Loading…
Reference in New Issue