toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改company/jobNumber

Browse Source
This commit is contained in:
zhuxinru
2025-11-07 09:08:53 +08:00
parent 28d08e2114
commit fcc5116ade
30 changed files with 215 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
system/src/main/java/com/sdm/system/dao/SystemMapper.java
View File

@@ -11,30 +11,30 @@ import java.util.List;
@Mapper
public interface SystemMapper {
SysCompany getCompanyByName(@Param("company") String company);
SysCompany getCompanyByName(@Param("company") Long company);
int addCompany(@Param("sysCompany") SysCompany sysCompany);
int updateCompanyStatus(@Param("company") String company, @Param("status") Integer status, @Param("updater") String updater);
int updateCompanyStatus(@Param("company") Long company, @Param("status") Integer status, @Param("updater") String updater);
List<SysCompany> getCompanyList(@Param("company") String company, @Param("status") Integer status, @Param("initDir") Integer initDir, @Param("pos") int pos, @Param("limit") int limit);
List<SysCompany> getCompanyList(@Param("company") Long company, @Param("status") Integer status, @Param("initDir") Integer initDir, @Param("pos") int pos, @Param("limit") int limit);
int getCompanyCount(@Param("company") String company, @Param("status") Integer status, @Param("initDir") Integer initDir);
int getCompanyCount(@Param("company") Long company, @Param("status") Integer status, @Param("initDir") Integer initDir);
int addSysConfigBatch(@Param("configs") List<SysConfig> configs);
List<SysConfig> getSysConfig(@Param("configName") String configName, @Param("company") String company);
List<SysConfig> getSysConfig(@Param("configName") String configName, @Param("company") Long company);
int delSysConfigByName(@Param("configName") String configName, @Param("company") String company);
int delSysConfigByName(@Param("configName") String configName, @Param("company") Long company);
List<String> queryGroupMemberByGroupName(@Param("groupName") String groupName, @Param("company") String company);
List<String> queryGroupMemberByGroupName(@Param("groupName") String groupName, @Param("company") Long company);
List<SysWhiteList> getSysWhiteList(@Param("status") Integer status, @Param("company") String company, @Param("pos") int pos, @Param("limit") int limit);
int getSysWhiteListCount(@Param("status") Integer status, @Param("company") String company);
List<SysWhiteList> getSysWhiteList(@Param("status") Integer status, @Param("company") Long company, @Param("pos") int pos, @Param("limit") int limit);
int getSysWhiteListCount(@Param("status") Integer status, @Param("company") Long company);
int addSysWhiteList(@Param("whiteLists") List<SysWhiteList> whiteLists);
int updateSysWhiteList(@Param("whiteList") SysWhiteList whiteList, @Param("updater") String updater);
int updateSysWhiteList(@Param("whiteList") SysWhiteList whiteList, @Param("updater") Long updater);
SysWhiteList getSysWhiteListById(@Param("id") Integer id);

24
system/src/main/java/com/sdm/system/service/impl/SystemServiceImpl.java
View File

@@ -32,7 +32,7 @@ public class SystemServiceImpl implements SystemService {
@Override
public SdmResponse addCompany(SysCompany company) {
SysCompany sysCompany = systemMapper.getCompanyByName(company.getCompany());
SysCompany sysCompany = systemMapper.getCompanyByName(company.getTenantId());
if (ObjectUtils.isNotEmpty(sysCompany)) {
return SdmResponse.failed("公司已存在");
}
@@ -45,14 +45,14 @@ public class SystemServiceImpl implements SystemService {
@Override
public SdmResponse updateCompanyStatus(String company, int status) {
SysCompany sysCompany = systemMapper.getCompanyByName(company);
SysCompany sysCompany = systemMapper.getCompanyByName(Long.valueOf(company));
if (ObjectUtils.isNotEmpty(sysCompany)) {
return SdmResponse.failed("公司已存在");
}
if (sysCompany.getStatus() == status) {
return SdmResponse.failed("公司状态无需变更");
}
int result = systemMapper.updateCompanyStatus(company, status, ThreadLocalContext.getJobNumber());
int result = systemMapper.updateCompanyStatus(Long.valueOf(company), status, ThreadLocalContext.getJobNumber());
if (result <= 0) {
return SdmResponse.failed("更新公司状态失败");
}
@@ -63,8 +63,8 @@ public class SystemServiceImpl implements SystemService {
public SdmResponse getCompanyList(GetCompanyListReq req) {
int pos = (req.getPageNum() - 1) * req.getPageSize();
int limit = req.getPageSize();
List<SysCompany> companyList = systemMapper.getCompanyList(req.getCompany(), req.getStatus(), null, pos, limit);
int total = systemMapper.getCompanyCount(req.getCompany(), req.getStatus(), null);
List<SysCompany> companyList = systemMapper.getCompanyList(Long.valueOf(req.getCompany()), req.getStatus(), null, pos, limit);
int total = systemMapper.getCompanyCount(Long.valueOf(req.getCompany()), req.getStatus(), null);
JSONObject jsonObject = new JSONObject();
jsonObject.put("total", total);
jsonObject.put("list", companyList);
@@ -82,11 +82,11 @@ public class SystemServiceImpl implements SystemService {
@Override
public SdmResponse delSysConfig(String configName) {
List<SysConfig> configs = systemMapper.getSysConfig(configName, ThreadLocalContext.getCompany());
List<SysConfig> configs = systemMapper.getSysConfig(configName, ThreadLocalContext.getTenantId());
if (CollectionUtils.isEmpty(configs)) {
return SdmResponse.failed("系统配置不存在");
}
int result = systemMapper.delSysConfigByName(configName, ThreadLocalContext.getCompany());
int result = systemMapper.delSysConfigByName(configName, ThreadLocalContext.getTenantId());
if (result <= 0) {
return SdmResponse.failed("删除系统配置失败");
}
@@ -95,8 +95,8 @@ public class SystemServiceImpl implements SystemService {
@Override
public SdmResponse querySysConfig(QuerySysConfigReq req) {
String loginJobNumber = ThreadLocalContext.getJobNumber();
String company = ThreadLocalContext.getCompany();
Long loginJobNumber = ThreadLocalContext.getUserId();
Long company = ThreadLocalContext.getTenantId();
String configName = req.getConfigName();
List<SysConfig> results = new ArrayList<>();
// 不是root用户或admin，要筛选用户所在学科
@@ -129,8 +129,8 @@ public class SystemServiceImpl implements SystemService {
@Override
public SdmResponse getSysWhiteList(GetSysWhiteListReq req) {
int pos = (req.getPageNum() - 1) * req.getPageSize();
List<SysWhiteList> list = systemMapper.getSysWhiteList(req.getStatus(), ThreadLocalContext.getCompany(), pos, req.getPageSize());
int total = systemMapper.getSysWhiteListCount(req.getStatus(), ThreadLocalContext.getCompany());
List<SysWhiteList> list = systemMapper.getSysWhiteList(req.getStatus(), ThreadLocalContext.getTenantId(), pos, req.getPageSize());
int total = systemMapper.getSysWhiteListCount(req.getStatus(), ThreadLocalContext.getTenantId());
JSONObject jsonObject = new JSONObject();
jsonObject.put("total", total);
jsonObject.put("list", list);
@@ -154,7 +154,7 @@ public class SystemServiceImpl implements SystemService {
}
private void updateSysWhiteList(SysWhiteList whiteList) {
systemMapper.updateSysWhiteList(whiteList, ThreadLocalContext.getCompany());
systemMapper.updateSysWhiteList(whiteList, ThreadLocalContext.getTenantId());
redisUtil.set(RedisConstant.WHITE_LIST + whiteList.getUrl(), whiteList.getRole());
}