@@ -183,8 +183,12 @@ public class DspCallbackServiceImpl implements IDspCallbackService { | |||
if (StringUtils.isNotEmpty(questionFile.getQuestionCode())) { | |||
QuestionType questionType = questionTypeMapper.selectOne(Wrappers.<QuestionType>lambdaQuery() | |||
.eq(QuestionType::getCode, questionFile.getQuestionCode()) | |||
.eq(QuestionType::getMark, 1)); | |||
inspectionFile.setQuestionId(questionType.getId()); | |||
.eq(QuestionType::getMark, MarkEnum.VALID.getCode())); | |||
if (ObjectUtil.isNotEmpty(questionType)) { | |||
inspectionFile.setQuestionId(questionType.getId()); | |||
} else { | |||
log.info("该问题类型不存在,questionCode={}", questionFile.getQuestionCode()); | |||
} | |||
} | |||
// 问题名称 | |||
inspectionFile.setQuestionName(questionFile.getQuestionName()); |
@@ -145,7 +145,7 @@ tuoheng: | |||
pilot-url: http://192.168.11.11:7011/pilot/web/ | |||
#airport配置地址 | |||
#airport-url: http://192.168.11.22:9060 | |||
airport-url: https://airport-test.t-aaron.com | |||
airport-url: http://192.168.11.11:7011/airport/admin | |||
# 文件配置 | |||
uploads: | |||
#上传的服务器上的映射文件夹 |
@@ -150,7 +150,7 @@ tuoheng: | |||
#飞手平台地址 | |||
pilot-url: http://192.168.11.241:7011/pilot/web/ | |||
#airport配置地址 | |||
airport-url: http://192.168.11.22:9060 | |||
airport-url: http://192.168.11.11:7011/airport/admin | |||
# 文件配置 | |||
uploads: | |||
#上传的服务器上的映射文件夹 |
@@ -145,7 +145,7 @@ tuoheng: | |||
#飞手平台地址 | |||
pilot-url: https://pilot.t-aaron.com/pilot/web/ | |||
#airport配置地址 | |||
airport-url: https://airport.t-aaron.com | |||
airport-url: https://airport.t-aaron.com/api | |||
# 文件配置 | |||
uploads: | |||
#上传的服务器上的映射文件夹 |
@@ -145,7 +145,7 @@ tuoheng: | |||
#飞手平台地址 | |||
pilot-url: http://172.15.1.11:7011/pilot/web/ | |||
#airport配置地址 | |||
airport-url: https://airport-test.t-aaron.com | |||
airport-url: https://airport-test.t-aaron.com/airport/admin | |||
# 文件配置 | |||
uploads: | |||
#上传的服务器上的映射文件夹 |
@@ -11,7 +11,7 @@ import lombok.Getter; | |||
*/ | |||
public enum RoleEnum { | |||
SUPER_ADMIN(1,"超级管理员"), | |||
ALL(1,"超级管理员"), | |||
ADMIN(2,"管理员"), | |||
ORDINARY_USER(3,"普通用户"); | |||