Skip to content

Commit 49944ef

Browse files
authored
修改codecheck (#202)
* fix:fix page bug * fix:modify issues * fix:fix blockgroup issues * fix:fix issues * fix:fix codecheck
1 parent 9735983 commit 49944ef

File tree

5 files changed

+17
-14
lines changed

5 files changed

+17
-14
lines changed

app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,7 @@ public int getPlatformId() {
4545
}
4646

4747
@Override
48-
public String getSiteId() { return "1"; }
48+
public String getSiteId() {
49+
return "1";
50+
}
4951
}

base/src/main/java/com/tinyengine/it/service/app/impl/AiChatServiceImpl.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ public Result<Map<String, Object>> getAnswerFromAi(AiParam aiParam) {
9191
if (aiParam.getFoundationModel().get("model").isEmpty()) {
9292
model = Enums.FoundationModel.GPT_35_TURBO.getValue();
9393
}
94-
foundationModel.put("model",model);
94+
foundationModel.put("model", model);
9595
aiParam.setFoundationModel(foundationModel);
9696
Result<Map<String, Object>> resultData = requestAnswerFromAi(aiParam.getMessages(), aiParam.getFoundationModel());
9797
// 调用接口失败时且data为null
98-
if(!resultData.isSuccess() && resultData.getData() == null){
99-
return Result.failed(resultData.getCode(),resultData.getMessage());
98+
if (!resultData.isSuccess() && resultData.getData() == null) {
99+
return Result.failed(resultData.getCode(), resultData.getMessage());
100100
}
101101
Map<String, Object> data = resultData.getData();
102102
if (data.isEmpty()) {
@@ -134,7 +134,7 @@ public Result<Map<String, Object>> getAnswerFromAi(AiParam aiParam) {
134134
try {
135135
data = requestAnswerFromAi(aiParam.getMessages(), aiParam.getFoundationModel()).getData();
136136
} catch (Exception e) {
137-
throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg());
137+
throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg());
138138
}
139139
choices = (List<Map<String, Object>>) data.get("choices");
140140
message = (Map<String, String>) choices.get(0).get("message");
@@ -167,14 +167,14 @@ public Result<Map<String, Object>> getAnswerFromAi(AiParam aiParam) {
167167
private Result<Map<String, Object>> requestAnswerFromAi(List<AiMessages> messages, Map<String, String> foundationModel) {
168168
List<AiMessages> aiMessages = formatMessage(messages);
169169

170-
AiParam aiParam = new AiParam(foundationModel,aiMessages);
170+
AiParam aiParam = new AiParam(foundationModel, aiMessages);
171171
AiChatClient aiChatClient = new AiChatClient(foundationModel.get("model"), foundationModel.get("token"));
172172
Map<String, Object> response = aiChatClient.executeChatRequest(aiParam);
173173
// 适配文心一言的响应数据结构,文心的部分异常情况status也是200,需要转为400,以免前端无所适从
174174
if (response.get("error_code") != null) {
175-
String code = response.get("error_code").toString();
175+
String code = response.get("error_code").toString();
176176
String message = response.get("error_msg").toString();
177-
return Result.failed(code,message);
177+
return Result.failed(code, message);
178178
}
179179
if (response.get("error") != null) {
180180
String code = (response.get("code") != null) ? response.get("code").toString() : "";

base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ public class PageServiceImpl implements PageService {
139139
@SystemServiceLog(description = "通过appId查询page所有数据实现方法")
140140
public List<Page> queryAllPage(Integer aid) {
141141
List<Page> pageList = pageMapper.queryPageByApp(aid);
142-
if(pageList == null){
142+
if (pageList == null) {
143143
return null;
144144
}
145145
// 遍历数据给页面的ishome字段赋值
146-
for (Page page:pageList) {
147-
if(page.getIsPage()){
146+
for (Page page : pageList) {
147+
if (page.getIsPage()) {
148148
addIsHome(page);
149149
}
150150
}

base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.springframework.stereotype.Service;
3434

3535
import java.util.ArrayList;
36-
import java.util.Collections;
3736
import java.util.List;
3837
import java.util.stream.Collectors;
3938

@@ -202,7 +201,7 @@ public List<BlockGroup> getBlockGroupByIdsOrAppId(List<Integer> ids, Integer app
202201
blockGroupsListResult = blockGroupMapper.queryBlockGroupByAppId(appId, blockCreatedBy, groupCreatedBy);
203202
}
204203
if (ids == null && appId == null) {
205-
blockGroupsListResult = blockGroupMapper.queryAllBlockGroupAndBlock( blockCreatedBy, groupCreatedBy);
204+
blockGroupsListResult = blockGroupMapper.queryAllBlockGroupAndBlock(blockCreatedBy, groupCreatedBy);
206205
}
207206

208207
if (blockGroupsListResult.isEmpty() || blockGroupsListResult.get(0).getId() == null) {

base/src/test/java/com/tinyengine/it/common/handler/MockUserContext.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@ public int getPlatformId() {
4343
}
4444

4545
@Override
46-
public String getSiteId() { return "1"; }
46+
public String getSiteId() {
47+
return "1";
48+
}
4749
}

0 commit comments

Comments
 (0)