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

Merge branch 'main' of http://192.168.65.198:3000/toolchaintechnologycenter/spdm-backend

Browse Source
This commit is contained in:
lidongyang
2025-12-22 20:42:32 +08:00
parent 475012be1a 209e8f57fc
commit 728d3066e9
7 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
capability/src/main/java/com/sdm/capability/model/req/flow/GetFlowTemplateReq.java
View File

@@ -10,7 +10,6 @@ import java.util.List;
@Data
public class GetFlowTemplateReq {
public String templateName;
public String templateType;

2
flowable/src/main/resources/application-lyric.yml
View File

@@ -16,7 +16,7 @@ spring:
cloud:
nacos:
discovery:
server-addr: 192.168.65.161:8848
server-addr: 192.168.30.146:8848
group: LYRIC_GROUP
enabled: true

9
project/src/main/resources/application-lyric.yml
View File

@@ -125,6 +125,15 @@ security:
#logging:
# config: ./config/logback.xml
YA:
backend:
backendPublicKey : MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo4hmt4m5CpMIE5DL8G60cg63X6nEiNPt1yWB+kXDXQA0RaiqXhT4O78HT9BldrQVpyj6g4Z2mwPMfLBP6LjR8QyLlwfMBJ2uUV5B4PlEWiF9pUK9tU0lPlByS+p0oIxX8XlvzbbGbkyWQaOQ6SflFxB7eHu3r/hDOYtsMDcNe4hsuz1BnrAuRY6Yj+Hq2d4zPDetDgXeXs066z3qO6bLN9r/2UkHZc4tdkpMJgxucwTuvAvmgRgdDfnd6sAVDHYPaIVuJHqWnEnEcQzq6zWb1YPItc2FgDbXWpi8noz7wSjXDfBiTHU11nU5vv//xLVF83h5mbhk8dWHKq7bLUGp9QIDAQAB
frontend:
#publicKeyUrl : http://s279983e.natappfree.cc/api-auth/clients/getPublicKey
publicKeyUrl : http://pisxwh.8866.org:8015/gateway/api-auth/clients/getPublicKey
frontendPrivateKey : MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCjz2pItCtM2Itf3knLhA1ZWzTVtKKY692Eptk3ZUy4qjlv+2e6u78/cBYZsVa/1nOyHPtb2j9xZAsHYGKZGoh64UWSewUhRdUO15xBRr5DyGEdTWHjwc1GHf7c99rKCjKDO2Xdp7cpqYABOAxgkSA2vP5zqhSCq0FCqwleEPLG1aAa/kh/oUzCZLUoSjZIdqQOgHJTZojqNeQCOC6U8Q+kUcHdKbptewu1A6XK8DHV0WqiJJEG3kyaoAZ1kGtr6ETtGy++aRvJT9gZN4M4bIgucKtAu2dcqQHj9jZ1i2xwhY3nmLjqaz3y313/IEYpMTG8pnPb8eP5usHDaDmH8RqJAgMBAAECggEAAzz05WYGWxkGvEjpHYhJOUR3yWeuNSaodNhVf+ZVO2tGAmQuWz8d2zOshCqAw/8Jv3IaN+kbCvNG0okBufQP0ZoFZY1f/xXhzc7OTG4JEc7yuIEQl897btDl+lk97nOAJx7z9ws7MCwlFyEUAY6s29glkYTBrgmTmy1FXKIqImsLfVV3LgfL2Mkixn0YSSsbUh2b+dki1zxjct3hTGZVh29bKOpbflOaG0LqEO0UwSX92Y/ir+fKmC8zEFbi5HZANYODivm8DiwF7khpraayf78kG3liccOTMMLVxIHwNiS9wcLG8WPuVEphlXMT4Ev4lq5VFM3mVxtd9g21ESbuvwKBgQDmsgE8u66qKVBsndp2K9FV9VWYDA4fYfRswDAWnZDCzIdanT0NFPp8s3nZCVU4FfX4m958yOrJ/MVp6d58z6fgkYQh2qL2Wy6zRPaIxCc6JG3FheFSxfWyULU/mBBK02ntUZCXEs8XKjAfDvmxaVVeonv0nCSgVwxJ4ypB5BZ+owKBgQC1x0GDnWtMbNGUMx6tYtFGWQIgop4hVQe6ZNgkKaQX7gtMa5egEda6ga6wCTV3+ZvQ9tBa1DxUFb5N/TrtQdFm39gOSXyhWSrntUKqaSFo03GvXXvvze2D3+uXpk7S8yzWuuD3OYyYj9S3nFVZffymabfukuY7oY3AN0E0PALw4wKBgQDQiyGrMU6X7HkTdy9BnCLEvd7+cAdkPzyiAqp2B0IRlqrVM0c5SDmX+PaxSEqNROzyLJVX4Ji+t44OTKgf0+hCjckQgYDHi24QCMuEny2G1d+Vq40hMmsFIwh10JUJz0v2iMFYkFw86JpPuU3nHv1ZazD60xwZBhfJw10z62iaWQKBgH+EVgsUJS8pryO9cKnFBnXI/tsR+Mf9NDynfZBwvbIjxT1IxMb/fJi9XGQVMbMGIS5H1gXBmMiLsEJZgDrrzw/Ru2jaWFl/ib+dwjR1J4C3w6p3c/fXh+TY8hYiDm2hNTU1R5dmgaCMVXawbpcm8FN1Ghh8aJIwVJYgrNcNuiptAoGAO14DHGqUXZZ//erIYWVfL0CAMXqy38dqNmfbzSAXYyLDl6cn49CCHF0GXOfCOesQN9ToQbqpLrntFgcFe0hil5dIWYafk9fHjjR8N8g74ijErQmCEAQy22b06V0q7rLzEsU/HDVL+RZg2aY4hDN+ODHRdpdFkOxsCYV73gevVeo=
scheduler:

4
system/src/main/java/com/sdm/system/controller/SimulationAppCenterController.java
View File

@@ -37,9 +37,9 @@ public class SimulationAppCenterController {
@GetMapping(value = "/queryAllApplication")
@ResponseBody
SdmResponse queryAllSimulationApplication()
SdmResponse queryAllSimulationApplication(@RequestParam("appName")String appName,@RequestParam("current")int current,@RequestParam("size")int size)
{
return service.querySimulationAllApp();
return service.querySimulationAllApp(appName,current,size);
}
@GetMapping(value = "/queryApplicationByType")

3
system/src/main/java/com/sdm/system/dao/SimulationAppManageMapper.java
View File

@@ -21,6 +21,9 @@ public interface SimulationAppManageMapper {
@Select("SELECT * FROM simulation_app_repository WHERE ${condition}")
List<AppCenterItemBean> querySimulationAppByCondition(@Param("condition") String condition);
@Select("SELECT COUNT(*) FROM simulation_app_repository WHERE ${condition}")
int querySimulationAppByConditionCount(@Param("condition") String condition);
@Insert("INSERT INTO simulation_app_configure(appId,appName,configName,configType,configValue,comment,creator) VALUES(#{appConfig.appId},#{appConfig.appName},#{appConfig.configName},#{appConfig.configType},#{appConfig.configValue},#{appConfig.comment},#{appConfig.creator})")
int addSimulationAppConfig(@Param("appConfig")AppConfigureBean appConfig);

2
system/src/main/java/com/sdm/system/service/ISimulatinoAppCenterService.java
View File

@@ -40,7 +40,7 @@ public interface ISimulatinoAppCenterService {
* 查询应用中心所有应用
* @return
*/
SdmResponse querySimulationAllApp();
SdmResponse querySimulationAllApp(String appName,int current,int size);
/**
* 根据类型查询应用

18
system/src/main/java/com/sdm/system/service/impl/SimulationAppCenterServiceImpl.java
View File

@@ -2,8 +2,8 @@ package com.sdm.system.service.impl;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.common.ThreadLocalContext;
import com.sdm.common.entity.bo.DataPageInfo;
import com.sdm.common.service.BaseService;
import com.sdm.common.utils.excel.*;
import com.sdm.system.dao.SimulationAppManageMapper;
import com.sdm.system.model.entity.AppCenterItemBean;
import com.sdm.system.model.entity.AppConfigureBean;
@@ -109,11 +109,21 @@ public class SimulationAppCenterServiceImpl extends BaseService implements ISimu
* @return
*/
@Override
public SdmResponse querySimulationAllApp() {
public SdmResponse querySimulationAllApp(String appName,int current,int size) {
SdmResponse response = SdmResponse.success();
String queryCondition = "true";
List<AppCenterItemBean> appBeans = appManageMapper.querySimulationAppByCondition(queryCondition);
response.setData(appBeans);
if(appName != null && !appName.isEmpty())
{
queryCondition += " AND appName LIKE '%"+appName+"%'" ;
}
int total = appManageMapper.querySimulationAppByConditionCount(queryCondition);
int offset = (current - 1) * size;
String limitQueryCondition = queryCondition+" LIMIT "+offset+", "+size;
List<AppCenterItemBean> appBeans = appManageMapper.querySimulationAppByCondition(limitQueryCondition);
DataPageInfo pageInfo = new DataPageInfo();
pageInfo.total = total;
pageInfo.data = appBeans;
response.setData(pageInfo);
return response;
}