b2894lxlx/tuanwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

240401

Browse Source
This commit is contained in:
b2894lxlx
2024-04-01 22:11:01 +08:00
parent 1a47ed7630
commit 9139457203
622 changed files with 5520 additions and 48434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/com/gxwebsoft/common/system/service/AreaService.java Normal file
View File

@@ -0,0 +1,46 @@
package com.gxwebsoft.common.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gxwebsoft.common.core.web.PageResult;
import com.gxwebsoft.common.system.entity.Area;
import com.gxwebsoft.common.system.param.AreaParam;
import java.util.List;
/**
* Service
*
* @author 科技小王子
* @since 2024-03-15 23:18:34
*/
public interface AreaService extends IService<Area> {
/**
* 分页关联查询
*
* @param param 查询参数
* @return PageResult<Area>
*/
PageResult<Area> pageRel(AreaParam param);
/**
* 关联查询全部
*
* @param param 查询参数
* @return List<Area>
*/
List<Area> listRel(AreaParam param);
/**
* 根据id查询
*
* @param id
* @return Area
*/
Area getByIdRel(Integer id);
Area getParent(Integer id);
Area getCityByName(String name);
}

2
src/main/java/com/gxwebsoft/common/system/service/DictDataService.java
View File

@@ -49,4 +49,6 @@ public interface DictDataService extends IService<DictData> {
*/
DictData getByDictCodeAndName(String dictCode, String dictDataName);
List<DictData> getByDictId(Integer dictId);
}

2
src/main/java/com/gxwebsoft/common/system/service/OrganizationService.java
View File

@@ -39,4 +39,6 @@ public interface OrganizationService extends IService<Organization> {
*/
Organization getByIdRel(Integer organizationId);
Organization getByName(String name);
}

9
src/main/java/com/gxwebsoft/common/system/service/UserService.java
View File

@@ -104,4 +104,13 @@ public interface UserService extends IService<User>, UserDetailsService {
List<User> listStatisticsRel(UserParam param);
/***
* 区代
* @param cityId
* @return
*/
User getCityAgent(Integer cityId);
User getCityLevel2(Integer cityId);
}

63
src/main/java/com/gxwebsoft/common/system/service/impl/AreaServiceImpl.java Normal file
View File

@@ -0,0 +1,63 @@
package com.gxwebsoft.common.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gxwebsoft.common.system.mapper.AreaMapper;
import com.gxwebsoft.common.system.service.AreaService;
import com.gxwebsoft.common.system.entity.Area;
import com.gxwebsoft.common.system.param.AreaParam;
import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.PageResult;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Service实现
*
* @author 科技小王子
* @since 2024-03-15 23:18:34
*/
@Service
public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements AreaService {
@Override
public PageResult<Area> pageRel(AreaParam param) {
PageParam<Area, AreaParam> page = new PageParam<>(param);
//page.setDefaultOrder("create_time desc");
List<Area> list = baseMapper.selectPageRel(page, param);
return new PageResult<>(list, page.getTotal());
}
@Override
public List<Area> listRel(AreaParam param) {
List<Area> list = baseMapper.selectListRel(param);
// 排序
PageParam<Area, AreaParam> page = new PageParam<>();
//page.setDefaultOrder("create_time desc");
return page.sortRecords(list);
}
@Override
public Area getByIdRel(Integer id) {
AreaParam param = new AreaParam();
param.setId(id);
return param.getOne(baseMapper.selectListRel(param));
}
@Override
public Area getParent(Integer id) {
Area area = getById(id);
return getById(area.getFid());
}
@Override
public Area getCityByName(String name) {
return getOne(
new LambdaQueryWrapper<Area>()
.eq(Area::getLevelId, 2)
.like(Area::getName, name)
);
}
}

6
src/main/java/com/gxwebsoft/common/system/service/impl/DictDataServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.gxwebsoft.common.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gxwebsoft.common.core.utils.CommonUtil;
import com.gxwebsoft.common.core.web.PageParam;
@@ -49,4 +50,9 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData>
return CommonUtil.listGetOne(list);
}
@Override
public List<DictData> getByDictId(Integer dictId) {
return list(new LambdaQueryWrapper<DictData>().eq(DictData::getDictId, dictId));
}
}

9
src/main/java/com/gxwebsoft/common/system/service/impl/OrganizationServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.gxwebsoft.common.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.PageResult;
@@ -42,4 +43,12 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
return param.getOne(baseMapper.selectListRel(param));
}
@Override
public Organization getByName(String name) {
return getOne(
new LambdaQueryWrapper<Organization>()
.eq(Organization::getOrganizationName, name)
);
}
}

42
src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
View File

@@ -105,21 +105,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
if (user != null) {
user.setRoles(userRoleService.listByUserId(user.getUserId()));
user.setAuthorities(roleMenuService.listMenuByUserId(user.getUserId(), null));
user.setCompanyInfo(companyService.getByTenantIdRel(user.getTenantId()));
// user.setCompanyInfo(companyService.getByTenantIdRel(user.getTenantId()));
final String cache = cacheClient.get(TEN_ANT_SETTING_KEY.concat(":setting"));
user.setSetting(cache);
// 商户编号
Merchant merchant = merchantService.getOne(new QueryWrapper<Merchant>()
.eq("merchant_owner", user.getUserId()),false);
if(merchant != null){
user.setMerchantCode(merchant.getMerchantCode());
user.setMerchantName(merchant.getMerchantName());
}else{
MerchantClerk clerk = merchantClerkService.getOne(new QueryWrapper<MerchantClerk>().eq("user_id",user.getUserId()),false);
if(clerk != null) {
user.setMerchantCode(clerk.getMerchantCode());
}
}
// Merchant merchant = merchantService.getOne(new QueryWrapper<Merchant>()
// .eq("merchant_owner", user.getUserId()),false);
// if(merchant != null){
// user.setMerchantCode(merchant.getMerchantCode());
// user.setMerchantName(merchant.getMerchantName());
// }else{
// MerchantClerk clerk = merchantClerkService.getOne(new QueryWrapper<MerchantClerk>().eq("user_id",user.getUserId()),false);
// if(clerk != null) {
// user.setMerchantCode(clerk.getMerchantCode());
// }
// }
}
return user;
}
@@ -232,6 +232,24 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
return list;
}
@Override
public User getCityAgent(Integer cityId) {
return getOne(
new LambdaQueryWrapper<User>()
.eq(User::getCityId, cityId)
.eq(User::getUserLevel, 1)
);
}
@Override
public User getCityLevel2(Integer cityId) {
return getOne(
new LambdaQueryWrapper<User>()
.eq(User::getCityId, cityId)
.eq(User::getUserLevel, 2)
);
}
/**
* 批量查询用户的角色
*