diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/SystemController.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/SystemController.java index d45c5a6..08244f5 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/SystemController.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/SystemController.java @@ -3,6 +3,7 @@ package com.ccag.controller; import com.alibaba.fastjson2.JSONObject; import com.ccag.common.SdmResponse; import com.ccag.config.shiro.IgnoreAuth; +import com.ccag.entity.pojo.system.LoadcasePoolNameVersion; import com.ccag.entity.req.system.*; import com.ccag.service.SystemService; import io.swagger.v3.oas.annotations.Operation; @@ -257,7 +258,7 @@ public class SystemController { */ @PostMapping("/queryLoadcasePool") @Operation(summary = "查询系统loadcase库名称") - public SdmResponse> queryLoadcasePool(@RequestBody @Validated QuerySystemLoadcasePoolReq req) { + public SdmResponse> queryLoadcasePool(@RequestBody @Validated QuerySystemLoadcasePoolReq req) { return systemService.queryLoadcasePool(req); } diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/dao/SystemMapper.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/dao/SystemMapper.java index 08792e3..ba601e9 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/dao/SystemMapper.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/dao/SystemMapper.java @@ -199,7 +199,7 @@ public interface SystemMapper { int delSystemLoadcasePoolFromCase(String poolName); @MapKey("poolName") - List getSystemLoadcasePoolNames(@Param("company") String company); + List getSystemLoadcasePoolNames(@Param("company") String company); int getSystemLoadcasePoolByName(@Param("poolName") String poolName, @Param("company") String company); diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/dao/xml/SystemMapper.xml b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/dao/xml/SystemMapper.xml index d4bfc4b..7193543 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/dao/xml/SystemMapper.xml +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/dao/xml/SystemMapper.xml @@ -579,7 +579,7 @@ DELETE FROM sim_system_loadcase_pool WHERE pool_name=#{poolName} - select a.pool_name as poolName,group_concat(a.version) as version from ( SELECT pool_name,version FROM sim_system_loadcase_version diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/SystemService.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/SystemService.java index d04ed5c..e5b6749 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/SystemService.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/SystemService.java @@ -3,6 +3,7 @@ package com.ccag.service; import com.alibaba.fastjson2.JSONObject; import com.ccag.common.SdmResponse; import com.ccag.entity.pojo.system.KeyValueParam; +import com.ccag.entity.pojo.system.LoadcasePoolNameVersion; import com.ccag.entity.pojo.user.GroupMember; import com.ccag.entity.req.system.*; import org.springframework.stereotype.Service; @@ -69,7 +70,7 @@ public interface SystemService { SdmResponse delLoadcasePool(DelSystemLoadcasePoolReq req); - SdmResponse> queryLoadcasePool(QuerySystemLoadcasePoolReq req); + SdmResponse> queryLoadcasePool(QuerySystemLoadcasePoolReq req); List queryLoadcasePoolContent(QueryLoadcasePoolContentReq req); diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/SystemServiceImpl.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/SystemServiceImpl.java index 3818abb..c558495 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/SystemServiceImpl.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/SystemServiceImpl.java @@ -1127,9 +1127,9 @@ public class SystemServiceImpl implements SystemService { } @Override - public SdmResponse> queryLoadcasePool(QuerySystemLoadcasePoolReq req) { + public SdmResponse> queryLoadcasePool(QuerySystemLoadcasePoolReq req) { String company = ThreadLocalContext.getUserContext().getUser().getTenantId(); - List pools = systemMapper.getSystemLoadcasePoolNames(company); + List pools = systemMapper.getSystemLoadcasePoolNames(company); return SdmResponse.success(pools); }