diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/common/SdmResponse.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/common/SdmResponse.java index f308f0f..c7cf2fa 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/common/SdmResponse.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/common/SdmResponse.java @@ -38,7 +38,7 @@ public class SdmResponse implements Serializable { * 成功返回结果 */ public static SdmResponse success() { - return new SdmResponse(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), Collections.EMPTY_LIST); + return new SdmResponse(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), (T) Collections.EMPTY_LIST); } /** diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/TestController.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/TestController.java deleted file mode 100644 index 9aa71b7..0000000 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/TestController.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.ccag.controller; - -import com.alibaba.fastjson2.JSONArray; -import com.alibaba.fastjson2.JSONObject; -import com.ccag.common.SdmResponse; -import com.ccag.config.shiro.IgnoreAuth; -import com.ccag.dao.ProjectMapper; -import com.ccag.entity.pojo.project.InputForm; -import com.ccag.entity.pojo.project.InputFormReject; -import com.ccag.entity.req.model.*; -import com.ccag.entity.req.svs.PushLoadcaseReq; -import com.ccag.entity.req.svs.PushStatusReq; -import com.ccag.entity.req.system.UpdateSystemApproveStatusReq; -import com.ccag.entity.req.task.RejectInputFormReq; -import com.ccag.service.ModelService; -import com.ccag.service.ProjectService; -import com.ccag.service.SystemService; -import com.ccag.service.remote.EmbseService; -import com.ccag.service.remote.SvsService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.jeecg.common.config.TenantContext; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.cloud.context.config.annotation.RefreshScope; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -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.ArrayList; -import java.util.Collections; -import java.util.List; - -@RefreshScope -@RestController -@Tag(name = "模型相关接口") -@RequestMapping("/model") -@Slf4j -public class TestController { - - @Autowired - private EmbseService embseService; - - @Resource - private SvsService svsService; - - @Autowired - private ProjectMapper projectMapper; - - @Resource - private SystemService systemService; - - @Autowired - private ProjectService projectService; - - @Value("${whetherPush}") - private String key1; - - - @IgnoreAuth - @PostMapping("/testModel") - public SdmResponse testModel(@RequestBody UpdateSystemApproveStatusReq req) { -// TenantContext.setTenant("666666666666"); -// KbMenuFileManagement kbMenuFileManagementParam = new KbMenuFileManagement(); -// kbMenuFileManagementParam.setFileCode("123"); -// kbManagementClientService.getKbMenuFileManagement(kbMenuFileManagementParam); -// JSONObject param = new JSONObject(); -// param.put("operation", req.getOperation()); -// param.put("roundId", req.getRoundId()); -// param.put("modelId", req.getModelId()); -// param.put("modelName", req.getModelName()); -// param.put("modelDescription", req.getModelDescription()); -// param.put("tenantId", req.getTenantId()); -// param.put("createUser", req.getCreateUser()); -// param.put("createTime", req.getCreateTime()); -// param.put("projectId", req.getProjectId()); -// param.put("projectCode", req.getProjectCode()); -// param.put("projectName", req.getProjectName()); -// param.put("dataSource", req.getDataSource()); -// param.put("sourceProjectId", req.getSourceProjectId()); -// param.put("loadcaseCode", req.getLoadcaseCode()); -// param.put("loadcaseName", req.getLoadcaseName()); -// List files = new ArrayList<>(); -// JSONObject file = new JSONObject(); -// file.put("fileName", req.getFileName()); -// file.put("fileId", req.getFileId()); -// file.put("fileSize", req.getFileSize()); -// file.put("createTime", req.getFileCreateTime()); -// file.put("createUser", req.getCreateBy()); -// files.add(file); -// param.put("modelFiles", files); -// embseService.pushModelInfo(param); -// svsService.pushLoadcase(Collections.singletonList(req)); - - -// String fileJsonStr = ""; -// if (!CollectionUtils.isEmpty(req.getRejectFiles())) { -//// log.info("转换退回文件：{}",req.getRejectFiles()); -//// JSONArray fileJson = JSONArray.of(req.getRejectFiles()); -//// log.info("转换后，文件为：{}",fileJson); -// -// fileJsonStr = req.getRejectFiles().toString(); -// } -// projectMapper.updateInputForm(req.getId(),req.getRejectReason(),req.getUpdateTime(),fileJsonStr); -// InputForm inputForm = projectMapper.newGetInputFormById(req.getId()); -// List rejectFiles = inputForm.getRejectFiles(); -// log.info("rejectFiles:" + rejectFiles); - -// List inputFormRejectList = projectMapper.getInputFormRejectList(1, 1); - -// projectService.testTransaction(890); - - - return SdmResponse.success(); - } - - -} diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/UserController.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/UserController.java index c07c229..db9a43c 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/UserController.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/controller/UserController.java @@ -1,5 +1,6 @@ package com.ccag.controller; +import com.alibaba.fastjson2.JSONObject; import com.ccag.common.SdmResponse; import com.ccag.entity.req.user.*; import com.ccag.service.UserService; @@ -10,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("/user") public class UserController { @@ -24,7 +27,7 @@ public class UserController { * @return */ @PostMapping("/addGroup") - public SdmResponse addGroup(@RequestBody @Validated GroupAddReq req) { + public SdmResponse addGroup(@RequestBody @Validated GroupAddReq req) { return userService.addGroup(req); } @@ -35,7 +38,7 @@ public class UserController { * @return */ @PostMapping("/delGroup") - public SdmResponse delGroup(@RequestBody @Validated GroupDelReq req) { + public SdmResponse delGroup(@RequestBody @Validated GroupDelReq req) { return userService.delGroup(req); } @@ -46,7 +49,7 @@ public class UserController { * @return */ @PostMapping("/queryGroup") - public SdmResponse queryGroup(@RequestBody @Validated GroupQueryReq req) { + public SdmResponse queryGroup(@RequestBody @Validated GroupQueryReq req) { return userService.queryGroup(req); } @@ -57,7 +60,7 @@ public class UserController { * @return */ @PostMapping("/updateGroup") - public SdmResponse updateGroup(@RequestBody @Validated GroupUpdateReq req) { + public SdmResponse updateGroup(@RequestBody @Validated GroupUpdateReq req) { return userService.updateGroup(req); } @@ -68,7 +71,7 @@ public class UserController { * @return */ @PostMapping("/addGroupMember") - public SdmResponse addGroupMember(@RequestBody @Validated GroupMemberAddReq req) { + public SdmResponse addGroupMember(@RequestBody @Validated GroupMemberAddReq req) { return userService.addGroupMember(req); } @@ -79,7 +82,7 @@ public class UserController { * @return */ @PostMapping("/addGroupMemberBatch") - public SdmResponse addGroupMemberBatch(@RequestBody @Validated AddGroupMemberBatchReq req) { + public SdmResponse addGroupMemberBatch(@RequestBody @Validated AddGroupMemberBatchReq req) { return userService.addGroupMemberBatch(req); } @@ -90,7 +93,7 @@ public class UserController { * @return */ @PostMapping("/delGroupMember") - public SdmResponse delGroupMember(@RequestBody @Validated GroupMemberDelReq req) { + public SdmResponse delGroupMember(@RequestBody @Validated GroupMemberDelReq req) { return userService.delGroupMember(req); } @@ -101,7 +104,7 @@ public class UserController { * @return */ @PostMapping("/delGroupMemberBatch") - public SdmResponse delGroupMemberBatch(@RequestBody @Validated DelGroupMemberBatchReq req) { + public SdmResponse delGroupMemberBatch(@RequestBody @Validated DelGroupMemberBatchReq req) { return userService.delGroupMemberBatch(req); } @@ -112,8 +115,8 @@ public class UserController { * @return */ @PostMapping("/queryGroupMember") - public SdmResponse queryGroupMember(@RequestBody @Validated GroupMemberQueryReq req) { + public SdmResponse> queryGroupMember(@RequestBody @Validated GroupMemberQueryReq req) { return userService.queryGroupMember(req); } -} +} \ No newline at end of file diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/UserService.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/UserService.java index 2589576..3030b0f 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/UserService.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/UserService.java @@ -1,5 +1,6 @@ package com.ccag.service; +import com.alibaba.fastjson2.JSONObject; import com.ccag.common.SdmResponse; import com.ccag.systemService.entity.SysUser; import com.ccag.entity.pojo.user.User; @@ -15,23 +16,23 @@ import java.util.Set; public interface UserService { Set getUserBelongsGroup(); - SdmResponse addGroup(GroupAddReq req); + SdmResponse addGroup(GroupAddReq req); - SdmResponse delGroup(GroupDelReq req); + SdmResponse delGroup(GroupDelReq req); - SdmResponse queryGroup(GroupQueryReq req); + SdmResponse queryGroup(GroupQueryReq req); - SdmResponse updateGroup(GroupUpdateReq req); + SdmResponse updateGroup(GroupUpdateReq req); - SdmResponse addGroupMember(GroupMemberAddReq req); + SdmResponse addGroupMember(GroupMemberAddReq req); - SdmResponse addGroupMemberBatch(AddGroupMemberBatchReq req); + SdmResponse addGroupMemberBatch(AddGroupMemberBatchReq req); - SdmResponse delGroupMember(GroupMemberDelReq req); + SdmResponse delGroupMember(GroupMemberDelReq req); - SdmResponse delGroupMemberBatch(DelGroupMemberBatchReq req); + SdmResponse delGroupMemberBatch(DelGroupMemberBatchReq req); - SdmResponse queryGroupMember(GroupMemberQueryReq req); + SdmResponse> queryGroupMember(GroupMemberQueryReq req); User getUserByIdCode(String idCode); @@ -49,4 +50,4 @@ public interface UserService { SysUser getUserByWorkNo(String workNo); -} +} \ No newline at end of file diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/UserServiceImpl.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/UserServiceImpl.java index 097277f..bd1b9b0 100644 --- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/UserServiceImpl.java +++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/service/impl/UserServiceImpl.java @@ -81,7 +81,7 @@ public class UserServiceImpl implements UserService { } @Override - public SdmResponse addGroup(GroupAddReq req) { + public SdmResponse addGroup(GroupAddReq req) { String groupName = req.getName(); String description = req.getGroupDescription(); int result; @@ -90,7 +90,7 @@ public class UserServiceImpl implements UserService { } @Override - public SdmResponse delGroup(GroupDelReq req) { + public SdmResponse delGroup(GroupDelReq req) { log.info(ThreadLocalContext.getIdCode() + " delGroup"); String groupName = req.getName(); int result; @@ -99,7 +99,7 @@ public class UserServiceImpl implements UserService { } @Override - public SdmResponse queryGroup(GroupQueryReq req) { + public SdmResponse queryGroup(GroupQueryReq req) { String company = ThreadLocalContext.getUserContext().getUser().getTenantId(); int pageSize = req.getPageSize(); int pageNum = req.getPageNum(); @@ -112,7 +112,7 @@ public class UserServiceImpl implements UserService { } @Override - public SdmResponse updateGroup(GroupUpdateReq req) { + public SdmResponse updateGroup(GroupUpdateReq req) { int result; String groupName = req.getName(); String strDesc = req.getGroupDescription(); @@ -121,7 +121,7 @@ public class UserServiceImpl implements UserService { } @Override - public SdmResponse addGroupMember(GroupMemberAddReq req) { + public SdmResponse addGroupMember(GroupMemberAddReq req) { String strName = req.getName(); String strIdentity = req.getIdCode(); String strUserName = req.getMemberUserName(); @@ -132,7 +132,7 @@ public class UserServiceImpl implements UserService { } @Override - public SdmResponse addGroupMemberBatch(AddGroupMemberBatchReq req) { + public SdmResponse addGroupMemberBatch(AddGroupMemberBatchReq req) { String company = ThreadLocalContext.getUserContext().getUser().getTenantId(); Group group = userMapper.getSystemGroup(req.getGroupMembers().get(0).getGroupName(), company); int result = Constant.GROUPADDMEMBER_SUCCESS; @@ -147,7 +147,7 @@ public class UserServiceImpl implements UserService { } @Override - public SdmResponse delGroupMember(GroupMemberDelReq req) { + public SdmResponse delGroupMember(GroupMemberDelReq req) { log.info(ThreadLocalContext.getIdCode() + " delGroupMember"); int result; String strName = req.getName(); @@ -158,7 +158,7 @@ public class UserServiceImpl implements UserService { } @Override - public SdmResponse delGroupMemberBatch(DelGroupMemberBatchReq req) { + public SdmResponse delGroupMemberBatch(DelGroupMemberBatchReq req) { log.info(ThreadLocalContext.getIdCode() + " delGroupMemberBatch"); int result = Constant.GROUPDELMEMBER_SUCCESS; if (userMapper.delGroupMemberBatch(req.getDelIds()) <= 0) { @@ -168,7 +168,7 @@ public class UserServiceImpl implements UserService { } @Override - public SdmResponse queryGroupMember(GroupMemberQueryReq req) { + public SdmResponse> queryGroupMember(GroupMemberQueryReq req) { String groupName = req.getName(); String userName = req.getUserName(); String idCode = req.getIdCode(); @@ -385,4 +385,4 @@ public class UserServiceImpl implements UserService { return userMapper.getUserByWorkNo(workNo); } -} +} \ No newline at end of file