add dockerfile

src/main/java/com/cnooc/expert/controller/expert/ExpertController.java

@@ -14,9 +14,6 @@ import com.cnooc.expert.controller.expert.model.request.ExamRecordSaveReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
-import com.cnooc.expert.controller.expert.model.request.KaoShiPageReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieFuJianListReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieGetReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuByOwnerPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuInfoGetByChouQuMaReq;
 import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiApplyReq;
@@ -30,11 +27,9 @@ import com.cnooc.expert.controller.expert.model.request.WeiGuiGetReq;
 import com.cnooc.expert.controller.expert.model.request.WeiGuiJiLuPageReq;
 import com.cnooc.expert.controller.expert.model.request.ZhuanJiaShenQingJiLuPageReq;
 import com.cnooc.expert.controller.expert.model.response.ApproveBusinessIdGetResp;
-import com.cnooc.expert.controller.expert.model.response.KaoShiPageResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieFuJianListResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieGetResp;
 import com.cnooc.expert.controller.expert.model.response.PingBiaoZhuanYeTreeNodeResp;
 import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
+import com.cnooc.expert.external.expert.model.request.ExamPaperSubmitApiReq;
 import com.cnooc.expert.external.expert.model.request.TainLessonProgressUpdateApiReq;
 import com.cnooc.expert.external.expert.model.response.CityTreeApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonFuJianListApiResp;
@@ -43,6 +38,7 @@ import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiR
 import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieGetApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieZhuanYePageApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamPaperSubmitApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
@@ -311,12 +307,6 @@ public class ExpertController extends AbstractBaseController {
         return ApiResult.successWithResult(apiResp);
     }
 
-    // 课后考试列表查询
-    @PostMapping("/kaoShi/getKaoShiPage")
-    public ApiResult<BasePageResp<KaoShiPageResp>> getKaoShiPage(@RequestBody @Validated KaoShiPageReq req) {
-        return ApiResult.successWithResult(expertService.pageKaoShi(req));
-    }
-
     // 考试分页
     @PostMapping("/train/exam/page")
     public ApiResult<BasePageResp<TrainExamPageApiResp>> trainExamPage(@RequestBody @Validated TrainExamPageReq req) {
@@ -358,18 +348,10 @@ public class ExpertController extends AbstractBaseController {
         return ApiResult.successWithResult(apiResp);
     }
 
-
-    // 课程详情 课节 详情
-    @PostMapping("/peiXun/kecheng/kejie/detail/get")
-    public ApiResult<PeiXunKeChengKeJieGetResp> getPeiXunKeChengKeJie(@RequestBody @Validated PeiXunKeChengKeJieGetReq req) {
-        return ApiResult.successWithResult(expertService.getPeiXunKeChengKeJie(req));
-    }
-
-    // 课程详情 课节 附件 列表
-    @PostMapping("/peiXun/kecheng/kejie/fujian/list")
-    public ApiResult<List<PeiXunKeChengKeJieFuJianListResp>> listPeiXunKeChengKeJieFuJian(@RequestBody @Validated PeiXunKeChengKeJieFuJianListReq req) {
-        return ApiResult.successWithResult(expertService.listPeiXunKeChengKeJieFuJian(req));
+    // 提交试卷
+    @PostMapping("/train/exam/question/paperr/submit")
+    public ApiResult<ExamPaperSubmitApiResp> examQuestionPaperSubmit(@RequestBody @Validated ExamPaperSubmitApiReq req) {
+        ExamPaperSubmitApiResp apiResp = expertService.submitExamPaper(req);
+        return ApiResult.successWithResult(apiResp);
     }
-
-
 }

src/main/java/com/cnooc/expert/controller/expert/ExpertMockController.java

@@ -35,6 +35,7 @@ import com.cnooc.expert.controller.expert.model.response.CityTreeNodeResp;
 import com.cnooc.expert.controller.expert.model.response.DictListItemResp;
 import com.cnooc.expert.controller.expert.model.response.DongJieGetResp;
 import com.cnooc.expert.controller.expert.model.response.DongJiePageResp;
+import com.cnooc.expert.controller.expert.model.response.ExamPaperSubmitResp;
 import com.cnooc.expert.controller.expert.model.response.ExamQuestionListResp;
 import com.cnooc.expert.controller.expert.model.response.ExamQuestionXiaoTiListResp;
 import com.cnooc.expert.controller.expert.model.response.ExamRecordSaveResp;
@@ -55,8 +56,10 @@ import com.cnooc.expert.controller.expert.model.response.TempExamPaperGetResp;
 import com.cnooc.expert.controller.expert.model.response.WeiGuiGetResp;
 import com.cnooc.expert.controller.expert.model.response.WeiGuiPageResp;
 import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
+import com.cnooc.expert.external.expert.model.request.ExamPaperSubmitApiReq;
 import com.cnooc.expert.external.expert.model.request.TainLessonProgressUpdateApiReq;
 import com.cnooc.expert.external.expert.model.response.CommonFuJianListApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamPaperSubmitApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
@@ -430,5 +433,10 @@ public class ExpertMockController extends AbstractBaseController {
         return ApiResult.successWithResult(expertMockService.pageKaoShi(req));
     }
 
-
+    // 提交试卷
+    @PostMapping("/train/exam/question/paperr/submit")
+    public ApiResult<ExamPaperSubmitResp> examQuestionPaperSubmit(@RequestBody @Validated ExamPaperSubmitApiReq req) {
+        ExamPaperSubmitResp apiResp = expertMockService.submitExamPaper(req);
+        return ApiResult.successWithResult(apiResp);
+    }
 }

src/main/java/com/cnooc/expert/controller/expert/model/response/ExamPaperSubmitResp.java

+package com.cnooc.expert.controller.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@Builder
+public class ExamPaperSubmitResp {
+
+    private List<ShiTiManagerXiaoTi> shiTiError;
+
+    private BigDecimal totalScore;
+
+    @Data
+    @Builder
+    public static class ShiTiManagerXiaoTi {
+
+        private String shiTiManagerXiaoTiGuid;//主键
+
+        private String xiaoTiName;//小题题目名称
+
+        private Long createTime;//创建时间
+
+        private String creatorGuid;//创建人Guid
+
+        private String creatorName;//创建人名称
+
+        private Long modifyTime;//修改时间
+
+        private String modifierGuid;//修改人Guid
+
+        private String modifierName;//修改人名称
+
+        private Boolean isDeleted;//是否删除
+
+        private String shiTiManagerDaTiGuid;//题目所属大题的Guid
+
+        private List<ShiTiManagerDaAn> daAnList;//小题对应的答案集合（oneToMany）
+
+        private BigDecimal xiaoTiScore;//小题分值
+
+        private String remark;//备注
+
+        private ShiTiManagerDaTi daTi;//小题所属的大题（ManyToOne）
+
+        private String userDaAnGuid;//专家考试时选中的答案Guid。  瞬时变量
+
+    }
+
+    @Data
+    @Builder
+    public static class ShiTiManagerDaAn {
+
+        private String shiTiManagerDaAnGuid;//主键
+
+        private String daAnName;//答案名称
+
+        private String isDaAn;//easyui BUG 须用字符串
+
+        private Long createTime;
+
+        private String creatorGuid;
+
+        private String creatorName;
+
+        private Long modifyTime;
+
+        private String modifierGuid;
+
+        private String modifierName;
+
+        private String shiTiManagerXiaoTiGuid;//答案对应的题目Guid
+
+        private Integer sort; //排序
+
+    }
+
+    @Data
+    @Builder
+    public static class ShiTiManagerDaTi {
+
+        private String shiTiManagerDaTiGuid;//主键
+
+        private String daTiName;//大题名称
+
+        private BigDecimal xiaoTiScore;//大题下面每个小题的分数
+
+        private Integer tiMuType;//题目类型  对应枚举TiMuType
+
+        private String tiMuTypeText;
+
+        private String remark;//备注
+
+        private Long createTime;
+
+        private String creatorGuid;
+
+        private String creatorName;
+
+        private Long modifyTime;
+
+        private String modifierGuid;
+
+        private String modifierName;
+
+        private BigDecimal daTiScore;//大题总分值
+
+    }
+
+}

src/main/java/com/cnooc/expert/external/common/AbstractRetrofitManager.java

@@ -17,6 +17,8 @@ public abstract class AbstractRetrofitManager {
 
     protected final ObjectMapper objectMapper;
 
+    private static final String ACCESS_KEY = "YsyhlUtP";
+
     public AbstractRetrofitManager() {
         objectMapper = new ObjectMapper();
         objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
@@ -47,7 +49,7 @@ public abstract class AbstractRetrofitManager {
 
     protected Map<String, Object> getHeaders() {
         Map<String, Object> headers = Maps.newHashMap();
-        headers.put("key", "XXXXX");
+        headers.put("Access_Key", ACCESS_KEY);
         return headers;
     }
 

src/main/java/com/cnooc/expert/external/expert/api/ExpertServiceApi.java

 package com.cnooc.expert.external.expert.api;
 
-import com.cnooc.expert.external.expert.model.request.ExamQuestionXiaoTiListApiReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
-import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
 import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
 import com.cnooc.expert.external.common.model.response.ApiBaseResult;
 import com.cnooc.expert.external.expert.model.request.CityTreeApiReq;
@@ -12,7 +10,9 @@ import com.cnooc.expert.external.expert.model.request.CommonNofilterEnumGetApiRe
 import com.cnooc.expert.external.expert.model.request.DictByParentListApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieGetApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieZhuanYePageApiReq;
+import com.cnooc.expert.external.expert.model.request.ExamPaperSubmitApiReq;
 import com.cnooc.expert.external.expert.model.request.ExamQuestionListApiReq;
+import com.cnooc.expert.external.expert.model.request.ExamQuestionXiaoTiListApiReq;
 import com.cnooc.expert.external.expert.model.request.ExamRecordSaveApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetApiReq;
 import com.cnooc.expert.external.expert.model.request.GeRenXiuJiaApplyApiReq;
@@ -36,7 +36,9 @@ import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiR
 import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieGetApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieZhuanYePageApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamPaperSubmitApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
 import com.cnooc.expert.external.expert.model.response.GeRenXiuJiaApplyApiResp;
@@ -187,4 +189,6 @@ public interface ExpertServiceApi {
     @POST("/api/saas-expert/mini/zjfw/PXXX/queryXiaoTiList")
     Call<ApiBaseResult<List<ExamQuestionXiaoTiListApiResp>>> listExamQuestionXiaoTiApi(@HeaderMap Map<String, Object> headers, @Body ExamQuestionXiaoTiListApiReq req);
 
+    @POST("/api/saas-expert/mini/train/exam/submitExamResult")
+    Call<ApiBaseResult<ExamPaperSubmitApiResp>> submitExamPaperApi(@HeaderMap Map<String, Object> headers, @Body ExamPaperSubmitApiReq req);
 }

src/main/java/com/cnooc/expert/external/expert/api/LoginServiceApi.java

@@ -13,15 +13,15 @@ import java.util.Map;
 
 public interface LoginServiceApi {
 
-    @POST("/zjfw/zggrxxgl/querySingleByShengFenZhengOrMobile")
+    @POST("/api/saas-expert/mini/zjfw/zggrxxgl/querySingleByShengFenZhengOrMobile")
     Call<ExpertInfoResp> querySingleByShengFenZhengOrMobile(@HeaderMap Map<String, Object> headers, @Body ExpertInfoReq expertInfoReq);
 
-    @POST("/zjfw/zggrxxgl/getZhuanJiaInfoAppById")
+    @POST("/api/saas-expert/mini/zjfw/zggrxxgl/getZhuanJiaInfoAppById")
     Call<ExpertInfoAppResp> getZhuanJiaInfoAppById(@HeaderMap Map<String, Object> headers, @Body ExpertInfoAppReq expertInfoAppReq);
 
-    @POST("/zjfw/zggrxxgl/saveZhuanJiaInfoApp")
+    @POST("/api/saas-expert/mini/zjfw/zggrxxgl/saveZhuanJiaInfoApp")
     Call<ExpertInfoAppResp> saveZhuanJiaInfoApp(@HeaderMap Map<String, Object> headers, @Body ExpertInfoAppReq expertInfoAppReq);
 
-    @POST("/zjfw/zggrxxgl/updateZhuanJiaInfoApp")
+    @POST("/api/saas-expert/mini/zjfw/zggrxxgl/updateZhuanJiaInfoApp")
     Call<ExpertInfoAppResp> updateZhuanJiaInfoApp(@HeaderMap Map<String, Object> headers, @Body ExpertInfoAppReq expertInfoAppReq);
 }

src/main/java/com/cnooc/expert/external/expert/model/request/ExamPaperSubmitApiReq.java

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ExamPaperSubmitApiReq {
+
+    // 考试记录guid
+    private String kaoShiJiLuGuid;
+
+    // 试题考试答案列表
+    private List<ExamDaAn> list;
+
+    // 试卷Guid
+    private String shiJuanGuid;
+
+    // 专家guid
+    private String zhuanJiaGuid;
+
+    @Data
+    public static class ExamDaAn {
+
+        // 试题考试答案Guid
+        private String shiTiExamDaAnGuid;
+
+        // 专家选择的答案
+        private String shiTiManagerDaAnGuid;
+
+        // 答案对应的题目
+        private String shiTiManagerXiaoTiGuid;
+
+        // 试卷guid
+        private String shiJuanGuid;
+    }
+}

src/main/java/com/cnooc/expert/external/expert/model/response/ExamPaperSubmitApiResp.java

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class ExamPaperSubmitApiResp {
+
+    private List<ShiTiManagerXiaoTi> shiTiError;
+
+    private BigDecimal totalScore;
+
+    @Data
+    public static class ShiTiManagerXiaoTi {
+
+        private String shiTiManagerXiaoTiGuid;//主键
+
+        private String xiaoTiName;//小题题目名称
+
+        private Long createTime;//创建时间
+
+        private String creatorGuid;//创建人Guid
+
+        private String creatorName;//创建人名称
+
+        private Long modifyTime;//修改时间
+
+        private String modifierGuid;//修改人Guid
+
+        private String modifierName;//修改人名称
+
+        private String shiTiManagerDaTiGuid;//题目所属大题的Guid
+
+        private List<ShiTiManagerDaAn> daAnList;//小题对应的答案集合（oneToMany）
+
+        private BigDecimal xiaoTiScore;//小题分值
+
+        private String remark;//备注
+
+        private ShiTiManagerDaTi daTi;//小题所属的大题（ManyToOne）
+
+        private String userDaAnGuid;//专家考试时选中的答案Guid。  瞬时变量
+
+    }
+
+    public static class ShiTiManagerDaAn {
+
+        private String shiTiManagerDaAnGuid;//主键
+
+        private String daAnName;//答案名称
+
+        private String isDaAn;//easyui BUG 须用字符串
+
+        private Long createTime;
+
+        private String creatorGuid;
+
+        private String creatorName;
+
+        private Long modifyTime;
+
+        private String modifierGuid;
+
+        private String modifierName;
+
+        private String shiTiManagerXiaoTiGuid;//答案对应的题目Guid
+
+        private Integer sort; //排序
+
+    }
+
+    @Data
+    public static class ShiTiManagerDaTi {
+
+        private String shiTiManagerDaTiGuid;//主键
+
+        private String daTiName;//大题名称
+
+        private BigDecimal xiaoTiScore;//大题下面每个小题的分数
+
+        private Integer tiMuType;//题目类型  对应枚举TiMuType
+
+        private String tiMuTypeText;
+
+        private String remark;//备注
+
+        private Long createTime;
+
+        private String creatorGuid;
+
+        private String creatorName;
+
+        private Long modifyTime;
+
+        private String modifierGuid;
+
+        private String modifierName;
+
+        private BigDecimal daTiScore;//大题总分值
+
+    }
+
+}

src/main/java/com/cnooc/expert/external/expert/service/ExpertServiceClient.java

 package com.cnooc.expert.external.expert.service;
 
-import com.cnooc.expert.external.expert.model.request.ExamQuestionXiaoTiListApiReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
-import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
 import com.cnooc.expert.external.common.AbstractRetrofitManager;
 import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
 import com.cnooc.expert.external.common.model.response.ApiBaseResult;
@@ -14,7 +12,9 @@ import com.cnooc.expert.external.expert.model.request.CommonNofilterEnumGetApiRe
 import com.cnooc.expert.external.expert.model.request.DictByParentListApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieGetApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieZhuanYePageApiReq;
+import com.cnooc.expert.external.expert.model.request.ExamPaperSubmitApiReq;
 import com.cnooc.expert.external.expert.model.request.ExamQuestionListApiReq;
+import com.cnooc.expert.external.expert.model.request.ExamQuestionXiaoTiListApiReq;
 import com.cnooc.expert.external.expert.model.request.ExamRecordSaveApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetApiReq;
 import com.cnooc.expert.external.expert.model.request.GeRenXiuJiaApplyApiReq;
@@ -38,7 +38,9 @@ import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiR
 import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieGetApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieZhuanYePageApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamPaperSubmitApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
 import com.cnooc.expert.external.expert.model.response.GeRenXiuJiaApplyApiResp;
@@ -283,5 +285,11 @@ public class ExpertServiceClient extends AbstractRetrofitManager {
         return this.getResponseBody(call, "listExamQuestionXiaoTi");
     }
 
+    // 提交试卷
+    public ApiBaseResult<ExamPaperSubmitApiResp> submitExamPaper(ExamPaperSubmitApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ExamPaperSubmitApiResp>> call = expertServiceApi.submitExamPaperApi(headers, req);
+        return this.getResponseBody(call, "submitExamPaper");
+    }
 
 }

src/main/java/com/cnooc/expert/service/ExpertMockService.java

@@ -31,6 +31,7 @@ import com.cnooc.expert.controller.expert.model.response.CityTreeNodeResp;
 import com.cnooc.expert.controller.expert.model.response.DictListItemResp;
 import com.cnooc.expert.controller.expert.model.response.DongJieGetResp;
 import com.cnooc.expert.controller.expert.model.response.DongJiePageResp;
+import com.cnooc.expert.controller.expert.model.response.ExamPaperSubmitResp;
 import com.cnooc.expert.controller.expert.model.response.ExamQuestionListResp;
 import com.cnooc.expert.controller.expert.model.response.ExamQuestionXiaoTiListResp;
 import com.cnooc.expert.controller.expert.model.response.ExamRecordSaveResp;
@@ -54,6 +55,7 @@ import com.cnooc.expert.controller.expert.model.response.TempExamPaperGetResp;
 import com.cnooc.expert.controller.expert.model.response.WeiGuiGetResp;
 import com.cnooc.expert.controller.expert.model.response.WeiGuiPageResp;
 import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
+import com.cnooc.expert.external.expert.model.request.ExamPaperSubmitApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
 import com.cnooc.expert.external.expert.model.request.TainLessonProgressUpdateApiReq;
 import com.cnooc.expert.external.expert.model.response.CommonFuJianListApiResp;
@@ -2739,6 +2741,66 @@ public class ExpertMockService {
         );
     }
 
+    public ExamPaperSubmitResp submitExamPaper(ExamPaperSubmitApiReq req) {
+
+
+        List<ExamPaperSubmitResp.ShiTiManagerDaAn> daAnList = Lists.newArrayList(
+                ExamPaperSubmitResp.ShiTiManagerDaAn.builder()
+                        .createTime(1762418485815L)
+                        .creatorGuid("1314243183234727937")
+                        .creatorName("冯朗")
+                        .daAnName("错误")
+                        .isDaAn("否")
+                        .modifierGuid("")
+                        .modifierName("")
+                        .modifyTime(null)
+                        .shiTiManagerDaAnGuid("712219dc-fc95-4b46-9249-d0a8bd1d561a")
+                        .shiTiManagerXiaoTiGuid("76d44b07-87bc-4bc7-8b0b-b30778dc1752")
+                        .sort(1)
+                        .build()
+        );
+
+        ExamPaperSubmitResp.ShiTiManagerDaTi daTi = ExamPaperSubmitResp.ShiTiManagerDaTi.builder()
+                .createTime(1762418080506L)
+                .creatorGuid("1314243183234727937")
+                .creatorName("冯朗")
+                .daTiName("判断题")
+                .daTiScore(null)
+                .modifierGuid("")
+                .modifierName("")
+                .modifyTime(null)
+                .remark("")
+                .shiTiManagerDaTiGuid("7da9ee7b-6362-4fc5-8650-a6fb0d091b74")
+                .tiMuType(30)
+                .tiMuTypeText("判断题")
+                .xiaoTiScore(null)
+                .build();
+
+        List<ExamPaperSubmitResp.ShiTiManagerXiaoTi> shiTiError = Lists.newArrayList(
+                ExamPaperSubmitResp.ShiTiManagerXiaoTi.builder()
+                        .createTime(1762418485810L)
+                        .creatorGuid("1314243183234727937")
+                        .creatorName("冯朗")
+                        .modifierGuid("")
+                        .modifierName("")
+                        .modifyTime(null)
+                        .remark("")
+                        .shiTiManagerDaTiGuid("7da9ee7b-6362-4fc5-8650-a6fb0d091b74")
+                        .shiTiManagerXiaoTiGuid("76d44b07-87bc-4bc7-8b0b-b30778dc1752")
+                        .userDaAnGuid("712219dc-fc95-4b46-9249-d0a8bd1d561a")
+                        .xiaoTiName("对")
+                        .xiaoTiScore(null)
+                        .daAnList(daAnList)
+                        .daTi(daTi)
+                        .build()
+        );
+
+        return ExamPaperSubmitResp.builder()
+                .totalScore(new BigDecimal("68.0"))
+                .shiTiError(shiTiError)
+                .build();
+    }
+
     public PeiXunKeChengKeJieGetResp getPeiXunKeChengKeJie(PeiXunKeChengKeJieGetReq req) {
 
         return PeiXunKeChengKeJieGetResp.builder()
@@ -2828,5 +2890,4 @@ public class ExpertMockService {
                 .data(list)
                 .build();
     }
-
 }

src/main/java/com/cnooc/expert/service/ExpertService.java

@@ -5,16 +5,11 @@ import com.cnooc.expert.controller.expert.model.request.CommonFuJianListReq;
 import com.cnooc.expert.controller.expert.model.request.DictNofilterListReq;
 import com.cnooc.expert.controller.expert.model.request.DongJieGetReq;
 import com.cnooc.expert.controller.expert.model.request.DongJiePageReq;
-
 import com.cnooc.expert.controller.expert.model.request.ExamQuestionXiaoTiListReq;
 import com.cnooc.expert.controller.expert.model.request.ExamRecordSaveReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
-import com.cnooc.expert.controller.expert.model.request.KaoShiPageReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieFuJianGetReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieFuJianListReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieGetReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuByOwnerPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuInfoGetByChouQuMaReq;
 import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiApplyReq;
@@ -27,10 +22,6 @@ import com.cnooc.expert.controller.expert.model.request.TrainExamPageReq;
 import com.cnooc.expert.controller.expert.model.request.WeiGuiGetReq;
 import com.cnooc.expert.controller.expert.model.request.WeiGuiJiLuPageReq;
 import com.cnooc.expert.controller.expert.model.request.ZhuanJiaShenQingJiLuPageReq;
-import com.cnooc.expert.controller.expert.model.response.KaoShiPageResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieFuJianGetResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieFuJianListResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieGetResp;
 import com.cnooc.expert.controller.expert.model.response.PingBiaoZhuanYeTreeNodeResp;
 import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
 import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
@@ -42,6 +33,7 @@ import com.cnooc.expert.external.expert.model.request.CommonNofilterEnumGetApiRe
 import com.cnooc.expert.external.expert.model.request.DictByParentListApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieGetApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieZhuanYePageApiReq;
+import com.cnooc.expert.external.expert.model.request.ExamPaperSubmitApiReq;
 import com.cnooc.expert.external.expert.model.request.ExamQuestionListApiReq;
 import com.cnooc.expert.external.expert.model.request.ExamQuestionXiaoTiListApiReq;
 import com.cnooc.expert.external.expert.model.request.ExamRecordSaveApiReq;
@@ -68,6 +60,7 @@ import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiR
 import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieGetApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieZhuanYePageApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamPaperSubmitApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
@@ -94,7 +87,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -566,131 +558,10 @@ public class ExpertService {
         return apiResp.getData();
     }
 
-    public List<PeiXunKeChengKeJieFuJianListResp> listPeiXunKeChengKeJieFuJian(PeiXunKeChengKeJieFuJianListReq req) {
-        ArrayList<PeiXunKeChengKeJieFuJianListResp> result = Lists.newArrayList(
-                PeiXunKeChengKeJieFuJianListResp.builder()
-                        .createTime(1758532252845L)
-                        .creatorGuid("其他用户")
-                        .creatorName("其他用户")
-                        .fileGroupGuid("97f9d7ce-11dd-4fab-bf97-dee5360d8ffb")
-                        .fileGuid("1419732467212898305")
-                        .fileMD5("")
-                        .fileName("新建 PPT 演示文稿.pdf")
-                        .fileType(null)
-                        .groupGuid("41e2cb9c-5370-4c47-b448-b7b845932a9b")
-                        .otherInfo("")
-                        .sysFile(null)
-                        .uploadTime(null)
-                        .uploadTimeText("")
-                        .build()
-        );
-
-        return result;
-    }
-
-    public BasePageResp<KaoShiPageResp> pageKaoShi(KaoShiPageReq req) {
-        List<KaoShiPageResp> list = Arrays.asList(
-                KaoShiPageResp.builder()
-                        .courseGuid("3a7f2d9e-1b4c-4890-8765-1234567890ab")
-                        .courseName("2025年度新专家入库培训")
-                        .courseReleaseTimestamp(1735689600000L)  // 2025-01-01 00:00:00
-                        .courseTypeName("入库培训")
-                        .examPassTimestamp(null)
-                        .examResult(0)
-                        .jiGeScore(60.00)
-                        .lessonGuid("")
-                        .lessonName("")
-                        .score(0.00)
-                        .studyProgress(null)
-                        .testPaperGuid("1e2d3c4b-5f6a-7890-abcd-ef1234567890")
-                        .zuiGaoScore(null)
-                        .build(),
-                // 第2条：定期培训（假数据）
-                KaoShiPageResp.builder()
-                        .courseGuid("7d9f8e7c-6b5a-4032-1987-6543210fedcb")
-                        .courseName("2025Q2评标规范定期培训")
-                        .courseReleaseTimestamp(1743465600000L)  // 2025-04-01 00:00:00
-                        .courseTypeName("定期培训")
-                        .examPassTimestamp(null)
-                        .examResult(0)
-                        .jiGeScore(60.00)
-                        .lessonGuid("")
-                        .lessonName("")
-                        .score(0.00)
-                        .studyProgress(null)
-                        .testPaperGuid("1e2d3c4b-5f6a-7890-abcd-ef1234567890")
-                        .zuiGaoScore(null)
-                        .build(),
-                // 第3条：日常培训（假数据）
-                KaoShiPageResp.builder()
-                        .courseGuid("2b4d6f8a-9c7e-4135-8260-abcdef123456")
-                        .courseName("评标保密制度日常培训")
-                        .courseReleaseTimestamp(1750329600000L)  // 2025-07-19 00:00:00
-                        .courseTypeName("日常培训")
-                        .examPassTimestamp(null)
-                        .examResult(0)
-                        .jiGeScore(60.00)
-                        .lessonGuid("")
-                        .lessonName("")
-                        .score(0.00)
-                        .studyProgress(null)
-                        .testPaperGuid("1e2d3c4b-5f6a-7890-abcd-ef1234567890")
-                        .zuiGaoScore(null)
-                        .build(),
-                // 第4条：专项培训（假数据）
-                KaoShiPageResp.builder()
-                        .courseGuid("9f7d5b3a-8c6e-4201-7359-654321fedcba")
-                        .courseName("电子评标系统操作专项培训")
-                        .courseReleaseTimestamp(1758192000000L)  // 2025-10-18 00:00:00
-                        .courseTypeName("专项培训")
-                        .examPassTimestamp(null)
-                        .examResult(0)
-                        .jiGeScore(60.00)
-                        .lessonGuid("")
-                        .lessonName("")
-                        .score(0.00)
-                        .studyProgress(null)
-                        .testPaperGuid("1e2d3c4b-5f6a-7890-abcd-ef1234567890")
-                        .zuiGaoScore(null)
-                        .build()
-        );
-
-        return BasePageResp.<KaoShiPageResp>builder()
-                .current(1)
-                .pages(1)
-                .total(4)
-                .data(list)
-                .build();
-    }
-
-
-    public PeiXunKeChengKeJieGetResp getPeiXunKeChengKeJie(PeiXunKeChengKeJieGetReq req) {
-
-        return PeiXunKeChengKeJieGetResp.builder()
-                .courseGuid("0966b932-cf4f-45bc-bdbf-03ccc4a7e92a")
-                .isTestAfterLearn(false)
-                .learnContent("新建 PPT 演示文稿.pdf")
-                .learnFileGroupGuid("41e2cb9c-5370-4c47-b448-b7b845932a9b")
-                .leiJiXueXiShiChang(null)
-                .lessonGuid("6a9eea61-09ed-427d-ab22-281d9cbb7106")
-                .lessonName("test1")
-                .lessonProgressGuid("")
-                .progressDetails("")
-                .studyProgress(null)
-                .testPaperGuid("")
-                .xueXiShiChang(2)
-                .build();
-    }
-
-
-    public PeiXunKeChengKeJieFuJianGetResp getPeiXunKeChengKeJieFuJian(PeiXunKeChengKeJieFuJianGetReq req) {
-        return PeiXunKeChengKeJieFuJianGetResp.builder()
-                .fileName("新建 PPT 演示文稿.pdf")
-                .downLoadUrl("https://purb.m-bid.cnooc.com.cn/bid-mimic-cggl/892422091105296385/2/2025/9/22/1419732467212898305/%E6%96%B0%E5%BB%BA%20PPT%20%E6%BC%94%E7%A4%BA%E6%96%87%E7%A8%BF.pdf?response-content-disposition=attachment%3Bfilename%3D%25E6%2596%25B0%25E5%25BB%25BA%2BPPT%2B%25E6%25BC%2594%25E7%25A4%25BA%25E6%2596%2587%25E7%25A8%25BF.pdf&AWSAccessKeyId=5T0WWU7JAUDUXJ2EG1FB&Expires=1763091567&Signature=JAo0KSspEbWreyxgc306%2FjmcI8E%3D")
-                .directDownLoadUrl("https://purb.m-bid.cnooc.com.cn/bid-mimic-cggl/892422091105296385/2/2025/9/22/1419732467212898305/%E6%96%B0%E5%BB%BA%20PPT%20%E6%BC%94%E7%A4%BA%E6%96%87%E7%A8%BF.pdf?response-content-disposition=attachment%3Bfilename%3D%25E6%2596%25B0%25E5%25BB%25BA%2BPPT%2B%25E6%25BC%2594%25E7%25A4%25BA%25E6%2596%2587%25E7%25A8%25BF.pdf&AWSAccessKeyId=5T0WWU7JAUDUXJ2EG1FB&Expires=1763091567&Signature=JAo0KSspEbWreyxgc306%2FjmcI8E%3D")
-                .createTime("1758532197592")
-                .fileSize("1128")
-                .build();
+    // 提交试卷
+    public ExamPaperSubmitApiResp submitExamPaper(ExamPaperSubmitApiReq req) {
+        ApiBaseResult<ExamPaperSubmitApiResp> apiResp = expertServiceClient.submitExamPaper(req);
+        return apiResp.getData();
     }
 
     public BasePageResp<ZhuanJiaShenQingJiLuPageResp> pageZhuanJiaShenQingJiLu(ZhuanJiaShenQingJiLuPageReq req) {
@@ -754,5 +625,4 @@ public class ExpertService {
                 .data(list)
                 .build();
     }
-
 }

src/main/resources/Dockerfile

+####### 开发环境的dockerfile配置##########
+#FROM gmaslowski/jre:8
+#ENV TZ='Asia/Shanghai'
+#WORKDIR /home/server/
+#ADD target/*.jar /home/server/app.jar
+#VOLUME /home/server
+#ENV JAVA_OPTS="-XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=128m -Xms1024m -Xmx1024m -Xmn256m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC"
+#ENV profile="-Dspring.profiles.active=qa"
+#ENV LANG en_US.UTF-8
+#ENV LANGUAGE en_US:en
+#ENV LC_ALL en_US.UTF-8
+##ENV debug="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9528"
+#EXPOSE 3409
+#RUN echo $TZ > /etc/timezone
+##ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar $debug $profile /home/server/app.jar " ]
+#ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar $profile /home/server/app.jar " ]
+
+######### 测试环境的dockerfile文件配置###########
+FROM java:8-jre-alpine
+ENV TZ='Asia/Shanghai'
+WORKDIR /home/server/
+ADD target/zhuanjia.jar /home/server/app.jar
+VOLUME /home/server
+ENV JAVA_OPTS=""
+EXPOSE 9001
+RUN echo -e "https://mirror.tuna.tsinghua.edu.cn/alpine/v3.4/main\n\
+https://mirror.tuna.tsinghua.edu.cn/alpine/v3.4/community" > /etc/apk/repositories
+
+RUN apk --update add curl bash ttf-dejavu && \
+      rm -rf /var/cache/apk/*
+
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /home/server/app.jar" ]
\ No newline at end of file