Merge remote-tracking branch 'refs/remotes/origin/dev'

This commit is contained in:
landaiqing
2024-07-23 13:47:36 +08:00
63 changed files with 510 additions and 13 deletions

View File

@@ -5,6 +5,7 @@ import com.schisandra.system.entity.SchisandraSmsConfigDTO;
import com.schisandra.system.entity.SchisandraSysConfigDTO;
import com.schisandra.system.entity.SchisandraSysOauthDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -18,4 +19,17 @@ public interface SchisandraSystemFeignService {
@PostMapping("/system/sms/querySmsByConfigId")
Result<SchisandraSmsConfigDTO> querySmsByConfigId(@RequestParam(value = "configId") String configId);
@GetMapping("/system/sms/list")
Result listSysSms();
@GetMapping("/system/list")
Result listSysConfig();
@GetMapping("/system/log/list")
Result listSysLog();
@GetMapping("/system/oauth/list")
Result listSysOauth();
}

View File

@@ -12,6 +12,7 @@ import org.apache.commons.lang3.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* 短信配置信息表 controller
@@ -232,4 +233,9 @@ public class SchisandraSmsConfigController {
return Result.ok(schisandraSmsConfigDTO);
}
@GetMapping("list")
public Result list() {
return Result.ok(schisandraSmsConfigDomainService.queryAll());
}
}

View File

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* controller
@@ -128,4 +129,10 @@ public class SchisandraSysConfigController {
}
}
}
@GetMapping("list")
public Result<List<SchisandraSysConfigDTO>> list() {
return Result.ok(schisandraSysConfigDomainService.queryAll());
}
}

View File

@@ -2,21 +2,22 @@ package com.schisandra.system.application.controller;
import com.alibaba.fastjson.JSON;
import com.google.common.base.Preconditions;
import com.schisandra.system.application.convert.SchisandraSysLogDTOConverter;
import com.schisandra.system.application.dto.SchisandraSysLogDTO;
import com.schisandra.system.common.entity.Result;
import com.schisandra.system.domain.bo.SchisandraSysLogBO;
import com.schisandra.system.domain.service.SchisandraSysLogDomainService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* controller
* controller
*
* @author landaiqing
* @since 2024-05-12 14:21:42
@@ -146,4 +147,9 @@ public class SchisandraSysLogController {
}
@GetMapping("list")
public Result list() {
return Result.ok(schisandraSysLogDomainService.queryAll());
}
}

View File

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* controller
@@ -141,4 +142,9 @@ public class SchisandraSysOauthController {
return Result.ok(schisandraSysOauthDTO);
}
@GetMapping("list")
public Result list() {
return Result.ok(schisandraSysOauthDomainService.queryAll());
}
}

View File

@@ -1,6 +1,9 @@
package com.schisandra.system.domain.service;
import com.schisandra.system.domain.bo.SchisandraSmsConfigBO;
import com.schisandra.system.infra.basic.entity.SchisandraSmsConfig;
import java.util.List;
/**
* 短信配置信息表 领域service
@@ -27,5 +30,7 @@ public interface SchisandraSmsConfigDomainService {
SchisandraSmsConfigBO queryByConfigId(String configId);
List<SchisandraSmsConfig> queryAll();
}

View File

@@ -1,6 +1,9 @@
package com.schisandra.system.domain.service;
import com.schisandra.system.domain.bo.SchisandraSysConfigBO;
import com.schisandra.system.infra.basic.entity.SchisandraSysConfig;
import java.util.List;
/**
* 领域service
@@ -26,4 +29,5 @@ public interface SchisandraSysConfigDomainService {
Boolean delete(SchisandraSysConfigBO schisandraSysConfigBO);
Object getConfigByKey(String key);
List<SchisandraSysConfig> queryAll();
}

View File

@@ -1,6 +1,9 @@
package com.schisandra.system.domain.service;
import com.schisandra.system.domain.bo.SchisandraSysLogBO;
import com.schisandra.system.infra.basic.entity.SchisandraSysLog;
import java.util.List;
/**
* 领域service
@@ -25,4 +28,6 @@ public interface SchisandraSysLogDomainService {
*/
Boolean delete(SchisandraSysLogBO schisandraSysLogBO);
List<SchisandraSysLog> queryAll();
}

View File

@@ -1,7 +1,9 @@
package com.schisandra.system.domain.service;
import com.schisandra.system.domain.bo.SchisandraSysOauthBO;
import com.schisandra.system.infra.basic.entity.SchisandraSysOauth;
import java.util.List;
/**
@@ -28,4 +30,6 @@ public interface SchisandraSysOauthDomainService {
Boolean delete(SchisandraSysOauthBO schisandraSysOauthBO);
SchisandraSysOauthBO getOauthConfigByType(String type);
List<SchisandraSysOauth> queryAll();
}

View File

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* 短信配置信息表 领域service实现了
@@ -52,4 +53,9 @@ public class SchisandraSmsConfigDomainServiceImpl implements SchisandraSmsConfig
return SchisandraSmsConfigBOConverter.INSTANCE.convertEntityToBO(schisandraSmsConfig);
}
@Override
public List<SchisandraSmsConfig> queryAll() {
return schisandraSmsConfigService.queryAll();
}
}

View File

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* 领域service实现了
@@ -56,4 +57,9 @@ public class SchisandraSysConfigDomainServiceImpl implements SchisandraSysConfig
return schisandraSysConfigBO;
}
@Override
public List<SchisandraSysConfig> queryAll() {
return schisandraSysConfigService.queryAll();
}
}

View File

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* 领域service实现了
@@ -43,4 +44,9 @@ public class SchisandraSysLogDomainServiceImpl implements SchisandraSysLogDomain
return schisandraSysLogService.update(schisandraSysLog) > 0;
}
@Override
public List<SchisandraSysLog> queryAll() {
return schisandraSysLogService.queryAll();
}
}

View File

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* 领域service实现了
@@ -52,4 +53,9 @@ public class SchisandraSysOauthDomainServiceImpl implements SchisandraSysOauthDo
return SchisandraSysOauthBOConverter.INSTANCE.convertEntityToBO(schisandraSysOauth);
}
@Override
public List<SchisandraSysOauth> queryAll() {
return schisandraSysOauthService.queryAll();
}
}

View File

@@ -2,6 +2,8 @@ package com.schisandra.system.infra.basic.service;
import com.schisandra.system.infra.basic.entity.SchisandraSmsConfig;
import java.util.List;
/**
* 短信配置信息表 表服务接口
*
@@ -43,5 +45,6 @@ public interface SchisandraSmsConfigService {
boolean deleteById(Long id);
SchisandraSmsConfig queryByConfigId(String configId);
List<SchisandraSmsConfig> queryAll();
}

View File

@@ -2,6 +2,8 @@ package com.schisandra.system.infra.basic.service;
import com.schisandra.system.infra.basic.entity.SchisandraSysConfig;
import java.util.List;
/**
* 表服务接口
@@ -45,4 +47,5 @@ public interface SchisandraSysConfigService {
SchisandraSysConfig getConfigByKey(String key);
List<SchisandraSysConfig> queryAll();
}

View File

@@ -2,6 +2,8 @@ package com.schisandra.system.infra.basic.service;
import com.schisandra.system.infra.basic.entity.SchisandraSysLog;
import java.util.List;
/**
* 表服务接口
*
@@ -42,5 +44,7 @@ public interface SchisandraSysLogService {
*/
boolean deleteById(Long id);
List<SchisandraSysLog> queryAll();
}

View File

@@ -2,6 +2,8 @@ package com.schisandra.system.infra.basic.service;
import com.schisandra.system.infra.basic.entity.SchisandraSysOauth;
import java.util.List;
/**
* 表服务接口
*
@@ -44,4 +46,5 @@ public interface SchisandraSysOauthService {
SchisandraSysOauth getOauthConfigByType(String type);
List<SchisandraSysOauth> queryAll();
}

View File

@@ -7,6 +7,7 @@ import com.schisandra.system.infra.basic.service.SchisandraSmsConfigService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* 短信配置信息表 表服务实现类
@@ -69,4 +70,9 @@ public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigServic
return schisandraSmsConfigDao.selectOneByCondition(SchisandraSmsConfigTableDef.SCHISANDRA_SMS_CONFIG.CONFIG_ID.eq(configId));
}
@Override
public List<SchisandraSmsConfig> queryAll() {
return schisandraSmsConfigDao.selectAll();
}
}

View File

@@ -8,6 +8,7 @@ import com.schisandra.system.infra.basic.service.SchisandraSysConfigService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* 表服务实现类
@@ -76,4 +77,9 @@ public class SchisandraSysConfigServiceImpl implements SchisandraSysConfigServic
return schisandraSysConfigDao.selectOneByCondition(SchisandraSysConfigTableDef.SCHISANDRA_SYS_CONFIG.CONFIG_KEY.eq(key));
}
@Override
public List<SchisandraSysConfig> queryAll() {
return schisandraSysConfigDao.selectAll();
}
}

View File

@@ -7,6 +7,7 @@ import com.schisandra.system.infra.basic.service.SchisandraSysLogService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* 表服务实现类
@@ -64,5 +65,10 @@ public class SchisandraSysLogServiceImpl implements SchisandraSysLogService {
return this.schisandraSysLogDao.deleteById(id) > 0;
}
@Override
public List<SchisandraSysLog> queryAll() {
return schisandraSysLogDao.selectAll();
}
}

View File

@@ -7,6 +7,7 @@ import com.schisandra.system.infra.basic.service.SchisandraSysOauthService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* 表服务实现类
@@ -75,4 +76,9 @@ public class SchisandraSysOauthServiceImpl implements SchisandraSysOauthService
return schisandraSysOauthDao.selectOneByCondition(SchisandraSysOauthTableDef.SCHISANDRA_SYS_OAUTH.CLIENT_TYPE.eq(type));
}
@Override
public List<SchisandraSysOauth> queryAll() {
return schisandraSysOauthDao.selectAll();
}
}