lidongyang/tvs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
gulongcheng
2025-10-31 11:27:19 +08:00
parent c20f1d754a
commit d1edc5abd1
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/SystemController.java
View File

@@ -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<List<Map>> queryLoadcasePool(@RequestBody @Validated QuerySystemLoadcasePoolReq req) {
public SdmResponse<List<LoadcasePoolNameVersion>> queryLoadcasePool(@RequestBody @Validated QuerySystemLoadcasePoolReq req) {
return systemService.queryLoadcasePool(req);
}

2
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/dao/SystemMapper.java
View File

@@ -199,7 +199,7 @@ public interface SystemMapper {
int delSystemLoadcasePoolFromCase(String poolName);
@MapKey("poolName")
List<Map> getSystemLoadcasePoolNames(@Param("company") String company);
List<LoadcasePoolNameVersion> getSystemLoadcasePoolNames(@Param("company") String company);
int getSystemLoadcasePoolByName(@Param("poolName") String poolName, @Param("company") String company);

2
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/dao/xml/SystemMapper.xml
View File

@@ -579,7 +579,7 @@
DELETE FROM sim_system_loadcase_pool WHERE pool_name=#{poolName}
</delete>
<select id="getSystemLoadcasePoolNames" resultType="Map">
<select id="getSystemLoadcasePoolNames" resultType="com.ccag.entity.pojo.system.LoadcasePoolNameVersion">
select a.pool_name as poolName,group_concat(a.version) as version from (
SELECT pool_name,version FROM sim_system_loadcase_version
<if test="company != '' and company != null">

3
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/SystemService.java
View File

@@ -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<Void> delLoadcasePool(DelSystemLoadcasePoolReq req);
SdmResponse<List<java.util.Map>> queryLoadcasePool(QuerySystemLoadcasePoolReq req);
SdmResponse<List<LoadcasePoolNameVersion>> queryLoadcasePool(QuerySystemLoadcasePoolReq req);
List<JSONObject> queryLoadcasePoolContent(QueryLoadcasePoolContentReq req);

4
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/SystemServiceImpl.java
View File

@@ -1127,9 +1127,9 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public SdmResponse<List<Map>> queryLoadcasePool(QuerySystemLoadcasePoolReq req) {
public SdmResponse<List<LoadcasePoolNameVersion>> queryLoadcasePool(QuerySystemLoadcasePoolReq req) {
String company = ThreadLocalContext.getUserContext().getUser().getTenantId();
List<Map> pools = systemMapper.getSystemLoadcasePoolNames(company);
List<LoadcasePoolNameVersion> pools = systemMapper.getSystemLoadcasePoolNames(company);
return SdmResponse.success(pools);
}