Commit 381e6769 by kenzo

add train exam

parent 68ff765e
...@@ -23,7 +23,7 @@ public class RetrofitDevConfiguration { ...@@ -23,7 +23,7 @@ public class RetrofitDevConfiguration {
@Bean("retrofitExpert") @Bean("retrofitExpert")
@Primary @Primary
public Retrofit RetrofitExpert(Gson gson) { public Retrofit RetrofitExpert(Gson gson) {
return createRetrofit("https://dev.randomuser.me/", gson); return createRetrofit("https://purb.d-bid.cnooc.com.cn/", gson);
} }
/** /**
...@@ -33,7 +33,7 @@ public class RetrofitDevConfiguration { ...@@ -33,7 +33,7 @@ public class RetrofitDevConfiguration {
*/ */
@Bean("retrofitWorkflow") @Bean("retrofitWorkflow")
public Retrofit RetrofitWorkflow(Gson gson) { public Retrofit RetrofitWorkflow(Gson gson) {
return createRetrofit("https://dev.randomuser.com/", gson); return createRetrofit("https://purb.d-bid.cnooc.com.cn/", gson);
} }
/** /**
...@@ -43,7 +43,7 @@ public class RetrofitDevConfiguration { ...@@ -43,7 +43,7 @@ public class RetrofitDevConfiguration {
*/ */
@Bean("retrofitPortal") @Bean("retrofitPortal")
public Retrofit RetrofitPortal(Gson gson) { public Retrofit RetrofitPortal(Gson gson) {
return createRetrofit("https://dev.randomuser.cn/", gson); return createRetrofit("https://ex.d-bid.cnooc.com.cn/", gson);
} }
/** /**
...@@ -53,7 +53,17 @@ public class RetrofitDevConfiguration { ...@@ -53,7 +53,17 @@ public class RetrofitDevConfiguration {
*/ */
@Bean("retrofitSubject") @Bean("retrofitSubject")
public Retrofit RetrofitSubject(Gson gson) { public Retrofit RetrofitSubject(Gson gson) {
return createRetrofit("https://dev.randomuser.cn.com/", gson); return createRetrofit("https://purb.d-bid.cnooc.com.cn/", gson);
}
/**
* 文件服务
* @param gson
* @return
*/
@Bean("retrofitFile")
public Retrofit RetrofitFile(Gson gson) {
return createRetrofit("https://purb.d-bid.cnooc.com.cn/", gson);
} }
private Retrofit createRetrofit(String baseUrl, Gson gson) { private Retrofit createRetrofit(String baseUrl, Gson gson) {
......
...@@ -23,7 +23,7 @@ public class RetrofitPreConfiguration { ...@@ -23,7 +23,7 @@ public class RetrofitPreConfiguration {
@Bean("retrofitExpert") @Bean("retrofitExpert")
@Primary @Primary
public Retrofit RetrofitExpert(Gson gson) { public Retrofit RetrofitExpert(Gson gson) {
return createRetrofit("https://pre.randomuser.me/", gson); return createRetrofit("https://purb.m-bid.cnooc.com.cn/", gson);
} }
/** /**
...@@ -33,7 +33,7 @@ public class RetrofitPreConfiguration { ...@@ -33,7 +33,7 @@ public class RetrofitPreConfiguration {
*/ */
@Bean("retrofitWorkflow") @Bean("retrofitWorkflow")
public Retrofit RetrofitWorkflow(Gson gson) { public Retrofit RetrofitWorkflow(Gson gson) {
return createRetrofit("https://pre.randomuser.com/", gson); return createRetrofit("https://purb.m-bid.cnooc.com.cn/", gson);
} }
/** /**
...@@ -43,7 +43,7 @@ public class RetrofitPreConfiguration { ...@@ -43,7 +43,7 @@ public class RetrofitPreConfiguration {
*/ */
@Bean("retrofitPortal") @Bean("retrofitPortal")
public Retrofit RetrofitPortal(Gson gson) { public Retrofit RetrofitPortal(Gson gson) {
return createRetrofit("https://pre.randomuser.cn/", gson); return createRetrofit("https://ex.m-bid.cnooc.com.cn/", gson);
} }
/** /**
...@@ -53,7 +53,17 @@ public class RetrofitPreConfiguration { ...@@ -53,7 +53,17 @@ public class RetrofitPreConfiguration {
*/ */
@Bean("retrofitSubject") @Bean("retrofitSubject")
public Retrofit RetrofitSubject(Gson gson) { public Retrofit RetrofitSubject(Gson gson) {
return createRetrofit("https://pre.randomuser.cn.com/", gson); return createRetrofit("https://purb.m-bid.cnooc.com.cn/", gson);
}
/**
* 文件服务
* @param gson
* @return
*/
@Bean("retrofitFile")
public Retrofit RetrofitFile(Gson gson) {
return createRetrofit("https://purb.m-bid.cnooc.com.cn/", gson);
} }
private Retrofit createRetrofit(String baseUrl, Gson gson) { private Retrofit createRetrofit(String baseUrl, Gson gson) {
......
...@@ -23,7 +23,7 @@ public class RetrofitProdConfiguration { ...@@ -23,7 +23,7 @@ public class RetrofitProdConfiguration {
@Bean("retrofitExpert") @Bean("retrofitExpert")
@Primary @Primary
public Retrofit RetrofitExpert(Gson gson) { public Retrofit RetrofitExpert(Gson gson) {
return createRetrofit("https://prod.randomuser.me/", gson); return createRetrofit("https://purb.bid.cnooc.com.cn/", gson);
} }
/** /**
...@@ -33,7 +33,7 @@ public class RetrofitProdConfiguration { ...@@ -33,7 +33,7 @@ public class RetrofitProdConfiguration {
*/ */
@Bean("retrofitWorkflow") @Bean("retrofitWorkflow")
public Retrofit RetrofitWorkflow(Gson gson) { public Retrofit RetrofitWorkflow(Gson gson) {
return createRetrofit("https://prod.randomuser.com/", gson); return createRetrofit("https://purb.bid.cnooc.com.cn/", gson);
} }
/** /**
...@@ -43,7 +43,7 @@ public class RetrofitProdConfiguration { ...@@ -43,7 +43,7 @@ public class RetrofitProdConfiguration {
*/ */
@Bean("retrofitPortal") @Bean("retrofitPortal")
public Retrofit RetrofitPortal(Gson gson) { public Retrofit RetrofitPortal(Gson gson) {
return createRetrofit("https://prod.randomuser.cn/", gson); return createRetrofit("https://ex.bid.cnooc.com.cn/", gson);
} }
/** /**
...@@ -53,7 +53,17 @@ public class RetrofitProdConfiguration { ...@@ -53,7 +53,17 @@ public class RetrofitProdConfiguration {
*/ */
@Bean("retrofitSubject") @Bean("retrofitSubject")
public Retrofit RetrofitSubject(Gson gson) { public Retrofit RetrofitSubject(Gson gson) {
return createRetrofit("https://prod.randomuser.cn.com/", gson); return createRetrofit("https://purb.bid.cnooc.com.cn/", gson);
}
/**
* 文件服务
* @param gson
* @return
*/
@Bean("retrofitFile")
public Retrofit RetrofitFile(Gson gson) {
return createRetrofit("https://purb.bid.cnooc.com.cn/", gson);
} }
private Retrofit createRetrofit(String baseUrl, Gson gson) { private Retrofit createRetrofit(String baseUrl, Gson gson) {
......
...@@ -23,7 +23,7 @@ public class RetrofitTestConfiguration { ...@@ -23,7 +23,7 @@ public class RetrofitTestConfiguration {
@Bean("retrofitExpert") @Bean("retrofitExpert")
@Primary @Primary
public Retrofit RetrofitExpert(Gson gson) { public Retrofit RetrofitExpert(Gson gson) {
return createRetrofit("https://test.randomuser.me/", gson); return createRetrofit("https://purb.t-bid.cnooc.com.cn/", gson);
} }
/** /**
...@@ -33,7 +33,7 @@ public class RetrofitTestConfiguration { ...@@ -33,7 +33,7 @@ public class RetrofitTestConfiguration {
*/ */
@Bean("retrofitWorkflow") @Bean("retrofitWorkflow")
public Retrofit RetrofitWorkflow(Gson gson) { public Retrofit RetrofitWorkflow(Gson gson) {
return createRetrofit("https://test.randomuser.com/", gson); return createRetrofit("https://purb.t-bid.cnooc.com.cn/", gson);
} }
/** /**
...@@ -43,7 +43,7 @@ public class RetrofitTestConfiguration { ...@@ -43,7 +43,7 @@ public class RetrofitTestConfiguration {
*/ */
@Bean("retrofitPortal") @Bean("retrofitPortal")
public Retrofit RetrofitPortal(Gson gson) { public Retrofit RetrofitPortal(Gson gson) {
return createRetrofit("https://test.randomuser.cn/", gson); return createRetrofit("https://ex.t-bid.cnooc.com.cn/", gson);
} }
/** /**
...@@ -53,7 +53,17 @@ public class RetrofitTestConfiguration { ...@@ -53,7 +53,17 @@ public class RetrofitTestConfiguration {
*/ */
@Bean("retrofitSubject") @Bean("retrofitSubject")
public Retrofit RetrofitSubject(Gson gson) { public Retrofit RetrofitSubject(Gson gson) {
return createRetrofit("https://test.randomuser.cn.com/", gson); return createRetrofit("https://purb.t-bid.cnooc.com.cn/", gson);
}
/**
* 文件服务
* @param gson
* @return
*/
@Bean("retrofitFile")
public Retrofit RetrofitFile(Gson gson) {
return createRetrofit("https://purb.t-bid.cnooc.com.cn/", gson);
} }
private Retrofit createRetrofit(String baseUrl, Gson gson) { private Retrofit createRetrofit(String baseUrl, Gson gson) {
......
...@@ -3,7 +3,7 @@ package com.cnooc.expert.controller.expert; ...@@ -3,7 +3,7 @@ package com.cnooc.expert.controller.expert;
import com.cnooc.expert.common.response.ApiResult; import com.cnooc.expert.common.response.ApiResult;
import com.cnooc.expert.common.response.BasePageResp; import com.cnooc.expert.common.response.BasePageResp;
import com.cnooc.expert.controller.common.AbstractBaseController; import com.cnooc.expert.controller.common.AbstractBaseController;
import com.cnooc.expert.controller.expert.model.request.CompanyPageReq; 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.DictNofilterListReq;
import com.cnooc.expert.controller.expert.model.request.DongJieGetReq; 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.DongJiePageReq;
...@@ -14,14 +14,16 @@ import com.cnooc.expert.controller.expert.model.request.KaoShiPageReq; ...@@ -14,14 +14,16 @@ 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.PeiXunKeChengKeJieFuJianGetReq;
import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieFuJianListReq; 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.PeiXunKeChengKeJieGetReq;
import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJiePageReq;
import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengReq;
import com.cnooc.expert.controller.expert.model.request.PeiXunPageReq;
import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuByOwnerPageReq; 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.PingBiaoXiangMuInfoGetByChouQuMaReq;
import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuPageReq; import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuPageReq;
import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiApplyReq; import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiApplyReq;
import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiPageReq; import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiPageReq;
import com.cnooc.expert.controller.expert.model.request.TrainCourseGetInfoReq;
import com.cnooc.expert.controller.expert.model.request.TrainCourseLessonGetReq;
import com.cnooc.expert.controller.expert.model.request.TrainCourseLessonPageReq;
import com.cnooc.expert.controller.expert.model.request.TrainCoursePageReq;
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.WeiGuiGetReq;
import com.cnooc.expert.controller.expert.model.request.WeiGuiJiLuPageReq; 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.request.ZhuanJiaShenQingJiLuPageReq;
...@@ -40,12 +42,19 @@ import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieGetRe ...@@ -40,12 +42,19 @@ import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieGetRe
import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJiePageResp; import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJiePageResp;
import com.cnooc.expert.controller.expert.model.response.PeiXunPageResp; import com.cnooc.expert.controller.expert.model.response.PeiXunPageResp;
import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuInfoGetByChouQuMaResp; import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuInfoGetByChouQuMaResp;
import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuPageResp;
import com.cnooc.expert.controller.expert.model.response.PingBiaoZhuanYeTreeNodeResp; import com.cnooc.expert.controller.expert.model.response.PingBiaoZhuanYeTreeNodeResp;
import com.cnooc.expert.controller.expert.model.response.QingJiaJinJiApplyResp; import com.cnooc.expert.controller.expert.model.response.QingJiaJinJiApplyResp;
import com.cnooc.expert.controller.expert.model.response.SecondaryUnitListItemResp; import com.cnooc.expert.controller.expert.model.response.SecondaryUnitListItemResp;
import com.cnooc.expert.controller.expert.model.response.WeiGuiGetResp; 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.WeiGuiPageResp;
import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp; import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
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.TainLessonProgressUpdateApiResp;
import com.cnooc.expert.external.expert.model.response.TrainCourseLessonGetApiResp;
import com.cnooc.expert.external.expert.model.response.TrainCourseLessonPageApiResp;
import com.cnooc.expert.external.expert.model.response.TrainExamPageApiResp;
import com.cnooc.expert.service.ExpertMockService; import com.cnooc.expert.service.ExpertMockService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -92,7 +101,7 @@ public class ExpertMockController extends AbstractBaseController { ...@@ -92,7 +101,7 @@ public class ExpertMockController extends AbstractBaseController {
} }
/** /**
* 执业资格列表 * 职称列表
* *
* @return * @return
*/ */
...@@ -198,7 +207,7 @@ public class ExpertMockController extends AbstractBaseController { ...@@ -198,7 +207,7 @@ public class ExpertMockController extends AbstractBaseController {
} }
@PostMapping("/pingBiaoXiangMu/page") @PostMapping("/pingBiaoXiangMu/page")
public ApiResult<BasePageResp<Object>> pingBiaoXiangMuPage(@RequestBody @Validated PingBiaoXiangMuPageReq req) { public ApiResult<BasePageResp<PingBiaoXiangMuPageResp>> pingBiaoXiangMuPage(@RequestBody @Validated PingBiaoXiangMuPageReq req) {
return ApiResult.successWithResult(expertMockService.pagePingBiaoXiangMu(req)); return ApiResult.successWithResult(expertMockService.pagePingBiaoXiangMu(req));
} }
...@@ -280,62 +289,76 @@ public class ExpertMockController extends AbstractBaseController { ...@@ -280,62 +289,76 @@ public class ExpertMockController extends AbstractBaseController {
return ApiResult.successWithResult(expertMockService.getWeiGui(req)); return ApiResult.successWithResult(expertMockService.getWeiGui(req));
} }
// *** 课程培训 和 课后考试 // *** 培训 / 考试 ***
// 课后考试
/** // 课程培训
* 课后考试列表查询
* // 培训课程分页
* @param req @PostMapping("/train/course/page")
* @return public ApiResult<BasePageResp<PeiXunPageResp>> pageTrainCourse(@RequestBody @Validated TrainCoursePageReq req) {
*/ return ApiResult.successWithResult(expertMockService.pageTrainCourse(req));
@PostMapping("/kaoShi/getKaoShiPage")
public ApiResult<BasePageResp<KaoShiPageResp>> getKaoShiPage(@RequestBody @Validated KaoShiPageReq req) {
return ApiResult.successWithResult(expertMockService.pageKaoShi(req));
} }
// 培训课程详情
@PostMapping("/train/course/get")
public ApiResult<Object> getTrainCourseInfo(@RequestBody @Validated TrainCourseGetInfoReq req) {
return ApiResult.successWithResult(expertMockService.getTrainCourse(req));
}
// 课程培训 // 培训课程课节分页
@PostMapping("/train/course/lesson/page")
public ApiResult<BasePageResp<PeiXunKeChengKeJiePageResp>> pageTrainCourseLesson(@RequestBody @Validated TrainCourseLessonPageReq req) {
return ApiResult.successWithResult(expertMockService.pageTrainCourseLesson(req));
}
/** // 培训课程课节详情
* 培训课程列表查询 @PostMapping("/train/course/lesson/get")
* public ApiResult<TrainCourseLessonGetApiResp> getTrainCourseLesson(@RequestBody @Validated TrainCourseLessonGetReq req) {
* @param req TrainCourseLessonGetApiResp apiResp = expertMockService.getTrainCourseLesson(req);
* @return return ApiResult.successWithResult(apiResp);
*/
@PostMapping("/peiXun/getPeiXunPage")
public ApiResult<BasePageResp<PeiXunPageResp>> getPeiXunPage(@RequestBody @Validated PeiXunPageReq req) {
return ApiResult.successWithResult(expertMockService.pagePeiXunKeCheng(req));
} }
/** // 附件列表
* 培训课程详情查询 @PostMapping("/common/fu-jian/list")
* public ApiResult<List<CommonFuJianListApiResp>> listCommonFuJian(@RequestBody @Validated CommonFuJianListReq req) {
* @param req List<CommonFuJianListApiResp> apiResp = expertMockService.listCommonFuJian(req);
* @return return ApiResult.successWithResult(apiResp);
*/
@PostMapping("/peiXun/getPeiXunInfo")
public ApiResult<Object> getPeiXunInfo(@RequestBody @Validated PeiXunKeChengReq req) {
return ApiResult.successWithResult(expertMockService.getPeiXunInfo(req));
} }
// 课程详情 课节列表 分页列表 // 更新培训课节学习进度
@PostMapping("/peiXun/kecheng/kejie/page") @PostMapping("/train/lesson-progress/update")
public ApiResult<BasePageResp<PeiXunKeChengKeJiePageResp>> pagePeiXunKeChengKeJie(@RequestBody @Validated PeiXunKeChengKeJiePageReq req) { public ApiResult<TainLessonProgressUpdateApiResp> updateTainLessonProgress(@RequestBody TainLessonProgressUpdateApiReq req) {
return ApiResult.successWithResult(expertMockService.pagePeiXunKeChengKeJie(req)); TainLessonProgressUpdateApiResp apiResp = expertMockService.updateTainLessonProgress(req);
return ApiResult.successWithResult(apiResp);
} }
// 考试分页
@PostMapping("/train/exam/page")
public ApiResult<BasePageResp<TrainExamPageApiResp>> trainExamPage(@RequestBody @Validated TrainExamPageReq req) {
BasePageResp<TrainExamPageApiResp> apiResp = expertMockService.pageTrainExam(req);
return ApiResult.successWithResult(apiResp);
}
// 课程详情 课节 详情 // 课程详情 课节 详情
@PostMapping("/peiXun/kecheng/kejie/get") @PostMapping("/peiXun/kecheng/kejie/detail/get")
public ApiResult<PeiXunKeChengKeJieGetResp> getPeiXunKeChengKeJie(@RequestBody @Validated PeiXunKeChengKeJieGetReq req) { public ApiResult<PeiXunKeChengKeJieGetResp> getPeiXunKeChengKeJie(@RequestBody @Validated PeiXunKeChengKeJieGetReq req) {
return ApiResult.successWithResult(expertMockService.getPeiXunKeChengKeJie(req)); return ApiResult.successWithResult(expertMockService.getPeiXunKeChengKeJie(req));
} }
// 课程详情 课节 附件 列表
@PostMapping("/peiXun/kecheng/kejie/fujian/list")
public ApiResult<List<PeiXunKeChengKeJieFuJianListResp>> listPeiXunKeChengKeJieFuJian(@RequestBody @Validated PeiXunKeChengKeJieFuJianListReq req) {
return ApiResult.successWithResult(expertMockService.listPeiXunKeChengKeJieFuJian(req));
}
// 课程详情 课节 附件 详情 // 课程详情 课节 附件 详情
@PostMapping("/peiXun/kecheng/kejie/fujian/get") @PostMapping("/peiXun/kecheng/kejie/fujian/get")
...@@ -343,4 +366,11 @@ public class ExpertMockController extends AbstractBaseController { ...@@ -343,4 +366,11 @@ public class ExpertMockController extends AbstractBaseController {
return ApiResult.successWithResult(expertMockService.getPeiXunKeChengKeJieFuJian(req)); return ApiResult.successWithResult(expertMockService.getPeiXunKeChengKeJieFuJian(req));
} }
// 培训课程分页
@PostMapping("/kaoShi/getKaoShiPage")
public ApiResult<BasePageResp<KaoShiPageResp>> getKaoShiPage(@RequestBody @Validated KaoShiPageReq req) {
return ApiResult.successWithResult(expertMockService.pageKaoShi(req));
}
} }
package com.cnooc.expert.controller.expert.model.request;
import lombok.Data;
@Data
public class CommonFuJianListReq {
private String groupGuid;
}
package com.cnooc.expert.controller.expert.model.request; package com.cnooc.expert.controller.expert.model.request;
import lombok.Data;
@Data
public class DongJieGetReq { public class DongJieGetReq {
private String dongJieGuid; private String pingBiaoZhuanYeGuid;
} }
...@@ -10,4 +10,8 @@ public class PingBiaoXiangMuByOwnerPageReq extends BasePageRequest { ...@@ -10,4 +10,8 @@ public class PingBiaoXiangMuByOwnerPageReq extends BasePageRequest {
private String zhuanJiaGuid; private String zhuanJiaGuid;
private Long pingBiaoStartTime;
private Long pingBiaoEndTime;
} }
...@@ -9,4 +9,8 @@ import lombok.EqualsAndHashCode; ...@@ -9,4 +9,8 @@ import lombok.EqualsAndHashCode;
public class PingBiaoXiangMuPageReq extends BasePageRequest { public class PingBiaoXiangMuPageReq extends BasePageRequest {
private String zhuanJiaGuid; private String zhuanJiaGuid;
private Long pingBiaoStartTime;
private Long pingBiaoEndTime;
} }
...@@ -11,6 +11,6 @@ public class QingJiaJinJiApplyReq { ...@@ -11,6 +11,6 @@ public class QingJiaJinJiApplyReq {
private String jinJiQingJiaReason; private String jinJiQingJiaReason;
private String qingJiaTime; private Long qingJiaTime;
} }
...@@ -10,4 +10,8 @@ public class QingJiaJinJiPageReq extends BasePageRequest { ...@@ -10,4 +10,8 @@ public class QingJiaJinJiPageReq extends BasePageRequest {
private String zhuanJiaGuid; private String zhuanJiaGuid;
private Long qingJiaStartTime;
private Long qingJiaEndTime;
} }
...@@ -2,22 +2,12 @@ package com.cnooc.expert.controller.expert.model.request; ...@@ -2,22 +2,12 @@ package com.cnooc.expert.controller.expert.model.request;
import lombok.Data; import lombok.Data;
/**
* @author: FuHongZhang
* @date 2025-11-15 14:46
*/
@Data @Data
public class PeiXunKeChengReq { public class TrainCourseGetInfoReq {
/** /**
* 课程Guid * 课程Guid
*/ */
private String courseGuid; private String courseGuid;
// -------查询课程详情下课节信息入参----------
private String userId; // 从服务上获取
// 必传
// private String courseGuid;
} }
package com.cnooc.expert.controller.expert.model.request;
import lombok.Data;
@Data
public class TrainCourseLessonGetReq {
private String lessonGuid;
}
...@@ -6,7 +6,9 @@ import lombok.EqualsAndHashCode; ...@@ -6,7 +6,9 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class PeiXunKeChengKeJiePageReq extends BasePageRequest { public class TrainCourseLessonPageReq extends BasePageRequest {
private String zhuanJiaGuid;
private String courseGuid; private String courseGuid;
......
package com.cnooc.expert.controller.expert.model.request;
import com.cnooc.expert.common.request.BasePageRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
public class TrainCoursePageReq extends BasePageRequest {
// 课程名称
private String courseName;
// 课程类型Guid
private String courseTypeGuid;
// 课程类型名称
private String courseTypeName;
// 课程发布时间查询开始时间
private Long courseReleaseStartTimestamp;
// 课程发布时间查询结束时间
private Long courseReleaseEndTimestamp;
// 学习进度状态(10:未完成;20:已完成)
private Short progressStatus;
// 专家guid
private String zhuanJiaGuid;
}
package com.cnooc.expert.controller.expert.model.request;
import com.cnooc.expert.common.request.BasePageRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
public class TrainExamPageReq extends BasePageRequest {
private String zhuanJiaGuid;
}
...@@ -5,6 +5,8 @@ import lombok.Data; ...@@ -5,6 +5,8 @@ import lombok.Data;
@Data @Data
public class WeiGuiGetReq { public class WeiGuiGetReq {
private String zhuanJiaGuid;
private String guid; private String guid;
} }
...@@ -8,9 +8,7 @@ import lombok.Data; ...@@ -8,9 +8,7 @@ import lombok.Data;
public class WeiGuiGetResp { public class WeiGuiGetResp {
private String applyBusinessId; private String applyBusinessId;
private Integer applyshenheStatus; private Integer applyshenheStatus;
private String businessId; private String businessId;
private String chouquRenwuGuid; private String chouquRenwuGuid;
private Long chuliEndTime; private Long chuliEndTime;
......
package com.cnooc.expert.controller.file;
import com.cnooc.expert.common.response.ApiResult;
import com.cnooc.expert.controller.common.AbstractBaseController;
import com.cnooc.expert.controller.file.model.request.DownloadInfoReq;
import com.cnooc.expert.external.file.model.response.DownLoadInfoDTO;
import com.cnooc.expert.service.FileService;
import lombok.AllArgsConstructor;
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 java.util.List;
@AllArgsConstructor
@RestController
@RequestMapping("/file")
public class FileController extends AbstractBaseController {
private final FileService fileService;
@PostMapping("/generatorDownloadInfo")
public ApiResult<List<DownLoadInfoDTO>> downloadInfo(@RequestBody @Validated DownloadInfoReq req) {
List<DownLoadInfoDTO> apiResp = fileService.downloadInfo(req.getPathId());
return ApiResult.successWithResult(apiResp);
}
}
package com.cnooc.expert.controller.file;
import com.cnooc.expert.common.response.ApiResult;
import com.cnooc.expert.controller.common.AbstractBaseController;
import com.cnooc.expert.controller.file.model.request.DownloadInfoReq;
import com.cnooc.expert.external.file.model.response.DownLoadInfoDTO;
import com.cnooc.expert.service.FileMockService;
import lombok.AllArgsConstructor;
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 java.util.List;
@AllArgsConstructor
@RestController
@RequestMapping("/mock/file")
public class FileMockController extends AbstractBaseController {
private final FileMockService fileMockService;
@PostMapping("/generatorDownloadInfo")
public ApiResult<List<DownLoadInfoDTO>> downloadInfo(@RequestBody @Validated DownloadInfoReq req) {
List<DownLoadInfoDTO> apiResp = fileMockService.downloadInfo(req.getPathId());
return ApiResult.successWithResult(apiResp);
}
}
package com.cnooc.expert.controller.file.model.request;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class DownloadInfoReq {
@NotBlank
private String pathId;
}
package com.cnooc.expert.controller.subject; package com.cnooc.expert.controller.subject;
import com.cnooc.expert.common.response.ApiResult; import com.cnooc.expert.common.response.ApiResult;
import com.cnooc.expert.common.response.BasePageResp;
import com.cnooc.expert.controller.common.AbstractBaseController; import com.cnooc.expert.controller.common.AbstractBaseController;
import com.cnooc.expert.controller.subject.model.request.CompanyPageReq; import com.cnooc.expert.controller.subject.model.request.CompanyPageReq;
import com.cnooc.expert.controller.subject.model.response.CompanyPageResp; import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
import com.cnooc.expert.external.subject.model.response.PlatformCompanyPageApiResp;
import com.cnooc.expert.service.SubjectService; import com.cnooc.expert.service.SubjectService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -21,14 +21,13 @@ public class SubjectController extends AbstractBaseController { ...@@ -21,14 +21,13 @@ public class SubjectController extends AbstractBaseController {
private final SubjectService subjectService; private final SubjectService subjectService;
/** /**
* 公司列表 * 公司列表 / 回避单位
* *
* @return * @return
*/ */
@PostMapping("/company/page") @PostMapping("/company/page")
public ApiResult<BasePageResp<CompanyPageResp>> companyPage(@RequestBody @Validated CompanyPageReq req) { public ApiResult<ApiBasePageResp<PlatformCompanyPageApiResp>> companyPage(@RequestBody @Validated CompanyPageReq req) {
BasePageResp<CompanyPageResp> apiResp = subjectService.pageCompany(req); ApiBasePageResp<PlatformCompanyPageApiResp> apiResp = subjectService.pageCompany(req);
return ApiResult.successWithResult(apiResp); return ApiResult.successWithResult(apiResp);
} }
......
...@@ -7,4 +7,19 @@ import lombok.EqualsAndHashCode; ...@@ -7,4 +7,19 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CompanyPageReq extends BasePageRequest { public class CompanyPageReq extends BasePageRequest {
// 业务类型 集合 4 申请成为供应商 5 申请成为平台采购商 6 申请成为招标代理 7 申请成为企业专属供应商 8自然人供应商 -1 运营平台 12 企业专属招标代理
private Integer businessType;
// 是否有效 0 无效; 1 有效
private Boolean validStatus;
// 租户ID
private Integer tenantId;
// 单位名称
private String subjectName;
// 企业代码
private String creditCode;
} }
...@@ -11,6 +11,7 @@ public class ApprovePathSettingPageResp { ...@@ -11,6 +11,7 @@ public class ApprovePathSettingPageResp {
private String defId; private String defId;
private String defName; private String defName;
private String defPath;
private String opinion; private String opinion;
private String pathId; private String pathId;
private Boolean useIfream; private Boolean useIfream;
......
...@@ -9,26 +9,12 @@ import java.util.List; ...@@ -9,26 +9,12 @@ import java.util.List;
@Builder @Builder
public class ApiBasePageResp<T> { public class ApiBasePageResp<T> {
private Integer totalCount; private Integer pages;
private Integer pageSize; private Integer total;
private Integer pageNum; private Integer current;
private Integer firstResult; private List<T> data;
private Integer pageNo;
private Boolean firstPage;
private Integer totalPage;
private Boolean lastPage;
private Integer nextPage;
private Integer prePage;
private List<T> list;
} }
package com.cnooc.expert.external.expert.model.request;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class CommonFuJianListApiReq {
private String groupGuid;
}
package com.cnooc.expert.external.expert.model.request;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class DongJieGetApiReq {
private String pingBiaoZhuanYeGuid;
}
package com.cnooc.expert.external.expert.model.request;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class GeRenXiuJiaApplyApiReq {
private String zhuanJiaGuid;
private Long startTime;
private Long endTime;
private String qingJiaYuanYin;
private Integer qingJiaDays;
}
package com.cnooc.expert.external.expert.model.request;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class GeRenXiuJiaPageApiReq {
private Integer page;
private Integer rows;
private Long qingJiaStartTime;
private Long qingJiaEndTime;
private String zhuanJiaGuid;
}
package com.cnooc.expert.external.expert.model.request;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class JinJiQingJiaApplyApiReq {
private String chouQuQingKuangGuid;
private String chouQuRenWuGuid;
private String jinJiQingJiaReason;
private Long qingJiaTime;
}
package com.cnooc.expert.external.expert.model.request;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
public class JinJiQingJiaPageApiReq {
private Integer page;
private Integer rows;
private JinJiQingJiaVo jinJiQingJiaVO;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class JinJiQingJiaVo {
private String zhuanJiaGuid;
private Long qingJiaStartTime;
private Long qingJiaEndTime;
}
}
package com.cnooc.expert.external.expert.model.request;
import java.math.BigDecimal;
public class TainLessonProgressUpdateApiReq {
/**
* courseGuid 课程Guid
*/
private String courseGuid;
/**
* lessonGuid 课节Guid
*/
private String lessonGuid;
/**
* 学习进度
*/
private BigDecimal studyProgress;
/**
* 进度详情,存储视频进度关系及浏览文档进度关系(数据仅供前端使用)
*/
private String progressDetails;
/**
* 当前用户guid
*/
private String userGuid;
/**
* 当前用户名称
*/
private String userName;
/**
* 学习完成时间
*/
private Long finishTimestamp;
/**
* 进度状态
*/
private Short progressStatus;
/**
* 学习时长
* @date: 2023-8-15 11:32
**/
private Long leiJiXueXiShiChang;
}
package com.cnooc.expert.external.expert.model.request;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class TrainCourseGetApiReq {
private String courseGuid;
}
package com.cnooc.expert.external.expert.model.request;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class TrainCourseLessonGetApiReq {
private String lessonGuid;
}
package com.cnooc.expert.external.expert.model.request;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class TrainCourseLessonPageApiReq {
private Integer page;
private Integer rows;
// 课程Guid
private String courseGuid;
// 当前用户guid
private String userGuid;
}
package com.cnooc.expert.controller.expert.model.request; package com.cnooc.expert.external.expert.model.request;
import com.cnooc.expert.common.request.BasePageRequest; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List; import java.util.List;
/**
* @author: FuHongZhang
* @date 2025-11-15 14:25
*/
@EqualsAndHashCode(callSuper = true)
@Data @Data
public class PeiXunPageReq extends BasePageRequest { @Builder
public class TrainExamPageApiReq {
private Integer page;
private Integer rows;
/** /**
* courseName 课程名称 * 课程名称
*/ */
private String courseName; private String courseName;
/** /**
* courseTypeGuid 课程类型Guid * 课程类型Guid
*/ */
private String courseTypeGuid; private String courseTypeGuid;
/** /**
* courseTypeName 课程类型名称 * 课节名称
*/ */
private String courseTypeName; private String lessonName;
/** /**
* courseReleaseStartTimestamp 课程发布时间查询开始时间 * 课程发布时间查询开始时间
*/ */
private Long courseReleaseStartTimestamp; private Long courseReleaseStartTimestamp;
/** /**
* courseReleaseEndTimestamp 课程发布时间查询结束时间 * 课程发布时间查询结束时间
*/ */
private Long courseReleaseEndTimestamp; private Long courseReleaseEndTimestamp;
/** /**
* 学习进度状态(10:未完成;20:已完成) * 考试状态
*/ */
private Short progressStatus; private Short examStatus;
/**
* 当前用户guid
*/
private String userGuid;
/**
* 当前用户guid
*/
private String expertGuid; private String expertGuid;
private String courseTypeName;
/** /**
* 二开 - 排除的课程类型列表 (续期考试,续期培训) * 二开 - 排除的课程类型列表
*/ */
private List<String> excludeCourseTypeList; private List<String> excludeCourseTypeList;
......
package com.cnooc.expert.external.expert.model.request;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class ViolationExpertGetApiReq {
private String zhuanJiaGuid;
private String guid;
}
...@@ -6,4 +6,19 @@ import lombok.Data; ...@@ -6,4 +6,19 @@ import lombok.Data;
@Data @Data
@Builder @Builder
public class ViolationExpertPageApiReq { public class ViolationExpertPageApiReq {
private Integer page;
private Integer rows;
private String zhuanJiaGuid;
private String shenheStatus;
private String zhuanJiaZhuangTai;
private String chuliEndTime;
private String chuliStartTime;
} }
package com.cnooc.expert.external.expert.model.request;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class ZhuanJiaPingBiaoXiangMuRenWuPageApiReq {
private Integer page;
private Integer rows;
private String zhuanJiaGuid;
private Long pingBiaoStartTime;
private Long pingBiaoEndTime;
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class CommonFuJianListApiResp {
private Long createTime;
private String creatorGuid;
private String creatorName;
private String fileGroupGuid;
private String fileGuid;
private String fileMD5;
private String fileName;
private Integer fileType;
private String groupGuid;
private String otherInfo;
private String sysFile;
private Long uploadTime;
private String uploadTimeText;
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Data;
@Data
public class DongJieGetApiResp {
private String changeRecordGuid;
private String shiXiangGuid;
private Integer shiXiangType;
private String oldValue;
private String newValue;
private Long createTime;
private String creatorGuid;
private String creatorName;
private Long modifyTime;
private String modifierGuid;
private String modifierName;
private String jieDongReason;
private String jieDongFuJianGuid;
private String dongJieReason;
private String dongJieFuJianGuid;
private Long dongJieSatrtTime;
private Long dongJieEndTime;
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class GeRenXiuJiaApplyApiResp {
private String qingJiaGuid;
private String zhuanJiaGuid;
private Short leiXing;
private Long startTime;
private Long endTime;
private Long xiaoJiaTime;
private Float qingJiaDays;
private String qingJiaYuanYin;
private Long tiJiaoTime;
private Long shenPiTime;
private String shenPiYiJian;
private Short shenPiZhuangTai;
private Long createTime;
private String creatorName;
private Long modifyTime;
private String modifierName;
private Boolean isDeleted;
private Long qingJiaStartTime;
private Long qingJiaEndTime;
private String zhuanJiaName;
private String shenFenZheng;
private Boolean isHaveChanged;
private Boolean isXiTongQj;//是否是系统请假
private String remark;//备注
private String zhuanJiaCode;
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class GeRenXiuJiaPageApiResp {
private Long createTime;
private String createTimeText;
private String creatorName;
private Long endTime;
private String endTimeText;
private Boolean isHaveChanged;
private Boolean isXiTongQj;
private Integer leiXing;
private String modifierName;
private Long modifyTime;
private String modifyTimeText;
private String qingJiaDays;
private String qingJiaGuid;
private String qingJiaYuanYin;
private String remark;
private String shenFenZheng;
private String shenPiTimeText;
private String shenPiYiJian;
private Long startTime;
private String startTimeText;
private String tiJiaoTimeText;
private Long xiaoJiaTime;
private String xiaoJiaTimeText;
private String zhuanJiaCode;
private String zhuanJiaGuid;
private String zhuanJiaName;
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Data;
@Data
public class JinJiQingJiaApplyApiResp {
private String jinJiQingJiaGuid;
private String chouQuQingKuangGuid;
private Long qingJiaTime;
private String jinJiQingJiaReason;
private Short shenHeStatus;
private Long createTime;
private String creatorName;
private String creatorGuid;
private String chouQuRenWuGuid;
private Integer qingJiaSource;//请假来源
private Integer qingJiaTimeNode;//请假时间节点
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Data;
@Data
public class JinJiQingJiaPageApiResp {
private String chouQuNum;
private String jinJiQingJiaGuid;
private String chouQuQingKuangGuid;
private String xiangMuNo;
private String xiangMuName;
private String jinJiQingJiaReason;
private Long qingJiaTime;
private Long pingBiaoStartTime;
private Integer shenHeStatus;
private Long pingBiaoEndTime;
private Boolean qingJia;
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
@Data
@Builder
public class TainLessonProgressUpdateApiResp {
private String lessonProgressGuid;
private String expertGuid;
private String courseGuid;
private String lessonGuid;
private String studyProgress;
private Long finishTimestamp;
private String progressDetails;
private String expertTestGuid;
private Integer progressStatus;
private String creatorName;
private Long createTime;
private String creatorGuid;
private String modifierName;
private Long modifyTime;
private String modifierGuid;
private Long leiJiXueXiShiChang;
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Data;
@Data
public class TrainCourseGetApiResp {
/**
* 课程Guid
*/
private String courseGuid;
/**
* 课程名称
*/
private String courseName;
/**
* 课程类型Guid
*/
private String courseTypeGuid;
/**
* 课程类型名称
*/
private String courseTypeName;
/**
* 课程发布状态
*/
private Short courseReleaseStatus;
/**
* 发布时间
*/
private Long courseReleaseTimestamp;
/**
* 课程简介
*/
private String courseIntroduction;
/**
* lessonCount 课节数量
*/
private Integer lessonCount;
/**
* 是否课后考试
* @author: yangfan
**/
private Boolean isTestAfterLearn;
/**
* 试卷guid
* @date: 2023-8-15 11:36
**/
private String testPaperGuid;
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
@Data
@Builder
public class TrainCourseLessonGetApiResp {
/**
* lessonGuid 课节Guid
*/
private String lessonGuid;
/**
* courseGuid 课程Guid
*/
private String courseGuid;
/**
* testPaperGuid 试卷Guid
*/
private String testPaperGuid;
/**
* lessonName 课节名称
*/
private String lessonName;
/**
* learnFileGroupGuid 学习内容附件-文件组ID
*/
private String learnFileGroupGuid;
/**
* learnContent 学习内容-文件名逗号分隔拼接
*/
private String learnContent;
/**
* isTestAfterLearn 是否课后考试
*/
private Boolean isTestAfterLearn;
/**
* 课节进度Guid
*/
private String lessonProgressGuid;
/**
* 课节学习进度
*/
private BigDecimal studyProgress;
/**
* 进度详情,存储视频进度关系及浏览文档进度关系(数据仅供前端使用)
*/
private String progressDetails;
/**
* 学习时长
* @date: 2023-8-15 11:32
**/
private int xueXiShiChang;
/**
* 累计学习时长
* @date: 2023-8-15 11:32
**/
private Long leiJiXueXiShiChang;
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
@Data
@Builder
public class TrainCourseLessonPageApiResp {
private Long finishTimestamp;
private String learnFileGroupGuid;
private String lessonGuid;
private String lessonName;
private String studyContent;
private BigDecimal studyProgress;
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Builder;
import lombok.Data;
import java.util.List;
@Data
@Builder
public class TrainCoursePageApiReq {
private Integer page;
private Integer rows;
private String userGuid;
private List<String> excludeCourseTypeList;
// 学习进度状态(10:未完成;20:已完成)
private Integer progressStatus;
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class TrainCoursePageApiResp {
// 课程Guid
private String courseGuid;
// 课程名称
private String courseName;
// 课程类型名称
private String courseTypeName;
// 课节数量
private Integer lessonCount;
// 发布时间
private Long courseReleaseTimestamp;
// 学习进度
private BigDecimal studyProgress;
// 学习进度状态(10:未完成;20:已完成)
private Integer progressStatus;
}
package com.cnooc.expert.external.expert.model.response;
import lombok.Builder;
import lombok.Data;
import java.math.BigDecimal;
@Data
@Builder
public class TrainExamPageApiResp {
private String courseGuid;
private String courseName;
private Long courseReleaseTimestamp;
private String courseTypeName;
private Long examPassTimestamp;
private Integer examResult;
private BigDecimal jiGeScore;
private String lessonGuid;
private String lessonName;
private BigDecimal score;
private BigDecimal studyProgress;
private String testPaperGuid;
private BigDecimal zuiGaoScore;
}
package com.cnooc.expert.external.expert.model.response;
public class ViolationExpertGetApiResp {
private String applyBusinessId;
private Integer applyshenheStatus;
private String businessId;
private String chouquRenwuGuid;
private Long chuliEndTime;
private Long chuliStartTime;
private String fujianGuid;
private String shenheRen;
private Integer shenheStatus;
private Long shenheTime;
private Long submitTime;
private String submiter;
private String submiterGuid;
private String submiterPersonId;
private String tijiaorenEmail;
private String tijiaorenPhone;
private Integer weiguiChuliShichang;
private String weiguiReason;
private String weiguiReasonName;
private String weiguiXiangxiMiaoshu;
private String zhuanJiaAdAccount;
private String zhuanJiaCode;
private String zhuanJiaZhuangTai;
private String zhuanjiaGuid;
private String zhuanjiaName;
private String zhuanjiaWeiguiGuid;
}
package com.cnooc.expert.external.file.api;
import com.cnooc.expert.external.common.model.response.ApiBaseResult;
import com.cnooc.expert.external.file.model.request.GeneratorDownloadInfoApiReq;
import com.cnooc.expert.external.file.model.response.DownLoadInfoDTO;
import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.POST;
import java.util.List;
public interface FileServiceApi {
@POST("/api/file/generatorDownloadInfo")
Call<ApiBaseResult<List<DownLoadInfoDTO>>> generatorDownloadInfoApi(@Body GeneratorDownloadInfoApiReq req);
}
package com.cnooc.expert.external.file.model.request;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class GeneratorDownloadInfoApiReq {
private String pathId;
}
package com.cnooc.expert.external.file.model.response;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class DownLoadInfoDTO {
/**
* 文件名称
*/
private String fileName;
/**
* 预览地址
*/
private String downLoadUrl;
/**
* 下载地址
*/
private String directDownLoadUrl;
/**
* 创建时间
*/
private Long createTime;
private Long fileSize;
}
package com.cnooc.expert.external.file.sevice;
import com.cnooc.expert.external.common.AbstractRetrofitManager;
import com.cnooc.expert.external.common.model.response.ApiBaseResult;
import com.cnooc.expert.external.file.api.FileServiceApi;
import com.cnooc.expert.external.file.model.request.GeneratorDownloadInfoApiReq;
import com.cnooc.expert.external.file.model.response.DownLoadInfoDTO;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import retrofit2.Call;
import retrofit2.Retrofit;
import java.util.List;
@Service
public class FileServiceClient extends AbstractRetrofitManager {
private final FileServiceApi fileServiceApi;
public FileServiceClient(@Qualifier("retrofitFile") Retrofit retrofit) {
this.fileServiceApi = retrofit.create(FileServiceApi.class);
}
public ApiBaseResult<List<DownLoadInfoDTO>> generatorDownloadInfo(String pathId) {
GeneratorDownloadInfoApiReq apiReq = GeneratorDownloadInfoApiReq.builder()
.pathId(pathId)
.build();
Call<ApiBaseResult<List<DownLoadInfoDTO>>> call = fileServiceApi.generatorDownloadInfoApi(apiReq);
return this.getResponseBody(call, "generatorDownloadInfo");
}
}
...@@ -18,7 +18,7 @@ public class PlatformCompanyPageApiReq { ...@@ -18,7 +18,7 @@ public class PlatformCompanyPageApiReq {
private Boolean validStatus; private Boolean validStatus;
// 租户ID // 租户ID
private Integer tenantId; private Long tenantId;
// 单位名称 // 单位名称
private String subjectName; private String subjectName;
......
package com.cnooc.expert.service;
import com.cnooc.expert.external.file.model.response.DownLoadInfoDTO;
import com.google.common.collect.Lists;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@AllArgsConstructor
@Service
public class FileMockService {
public List<DownLoadInfoDTO> downloadInfo(String pathId) {
List<DownLoadInfoDTO> result = Lists.newArrayList(
DownLoadInfoDTO.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(1758532197592L)
.fileSize(1128L)
.build()
);
return result;
}
}
package com.cnooc.expert.service;
import com.cnooc.expert.external.common.model.response.ApiBaseResult;
import com.cnooc.expert.external.file.model.response.DownLoadInfoDTO;
import com.cnooc.expert.external.file.sevice.FileServiceClient;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@AllArgsConstructor
@Service
public class FileService {
private final FileServiceClient FileServiceClient;
public List<DownLoadInfoDTO> downloadInfo(String pathId) {
ApiBaseResult<List<DownLoadInfoDTO>> apiResp = FileServiceClient.generatorDownloadInfo(pathId);
return apiResp.getData();
}
}
package com.cnooc.expert.service; package com.cnooc.expert.service;
import com.cnooc.expert.common.response.BasePageResp;
import com.cnooc.expert.controller.subject.model.request.CompanyPageReq; import com.cnooc.expert.controller.subject.model.request.CompanyPageReq;
import com.cnooc.expert.controller.subject.model.response.CompanyPageResp; import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
import com.cnooc.expert.external.common.model.response.ApiBaseResult;
import com.cnooc.expert.external.subject.model.request.PlatformCompanyPageApiReq;
import com.cnooc.expert.external.subject.model.response.PlatformCompanyPageApiResp;
import com.cnooc.expert.external.subject.service.SubjectServiceClient; import com.cnooc.expert.external.subject.service.SubjectServiceClient;
import com.google.common.collect.Lists;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class SubjectService { public class SubjectService {
private SubjectServiceClient subjectServiceClient; private SubjectServiceClient subjectServiceClient;
public BasePageResp<CompanyPageResp> pageCompany(CompanyPageReq req) { public ApiBasePageResp<PlatformCompanyPageApiResp> pageCompany(CompanyPageReq req) {
List<CompanyPageResp> data = Lists.newArrayList( PlatformCompanyPageApiReq apiReq = PlatformCompanyPageApiReq.builder()
CompanyPageResp.builder() .pageNum(req.getPageNo())
.id("1420053958893662209") .pageSize(req.getPageSize())
.subjectId("1420053958767833088") .businessType(req.getBusinessType())
.subjectName("江苏瑞尔姆电器安安有限公司") .tenantId(UserInfoUtils.TENANT_ID)
.businessType(5) .subjectName(req.getSubjectName())
.creditCode("91320577MA4Y6K7H0F") .creditCode(req.getCreditCode())
.contactPerson("张三")
.contactPhone("13800138000")
.contactEmail("zhangsan@cnooc.com.cn")
.build(),
CompanyPageResp.builder()
.id("1420051042464067584")
.subjectId("1420051042065608705")
.subjectName("中海科技很大的公司")
.businessType(5)
.creditCode("91320507MA4Y6K7H0F")
.contactPerson("里斯")
.contactPhone("13333333333")
.contactEmail("lisi@cnooc.com.cn")
.build()
);
return BasePageResp.<CompanyPageResp>builder()
.current(1)
.pages(1)
.total(2)
.data(data)
.build(); .build();
ApiBaseResult<ApiBasePageResp<PlatformCompanyPageApiResp>> apiResp = subjectServiceClient.pagePlatformCompanyApi(apiReq);
return apiResp.getData();
} }
} }
...@@ -42,6 +42,7 @@ public class WorkflowMockService { ...@@ -42,6 +42,7 @@ public class WorkflowMockService {
ApprovePathSettingPageResp.builder() ApprovePathSettingPageResp.builder()
.defId("e2dbccf455ec448b8a8284dc2c6c3b04") .defId("e2dbccf455ec448b8a8284dc2c6c3b04")
.defName("中移深化-专家审批") .defName("中移深化-专家审批")
.defPath("1")
.opinion(null) .opinion(null)
.pathId(null) .pathId(null)
.useIfream(true) .useIfream(true)
......
...@@ -42,6 +42,7 @@ public class WorkflowService { ...@@ -42,6 +42,7 @@ public class WorkflowService {
ApprovePathSettingPageResp.builder() ApprovePathSettingPageResp.builder()
.defId("e2dbccf455ec448b8a8284dc2c6c3b04") .defId("e2dbccf455ec448b8a8284dc2c6c3b04")
.defName("中移深化-专家审批") .defName("中移深化-专家审批")
.defPath("1")
.opinion(null) .opinion(null)
.pathId(null) .pathId(null)
.useIfream(true) .useIfream(true)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment