updata

src/main/java/com/cnooc/expert/config/RetrofitPreConfiguration.java

+package com.cnooc.expert.config;
+
+import com.google.gson.Gson;
+import okhttp3.OkHttpClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+import java.util.concurrent.TimeUnit;
+
+@Configuration
+@Profile("pre")
+public class RetrofitPreConfiguration {
+
+    /**
+     * 专家服务
+     * @param gson
+     * @return
+     */
+    @Bean("retrofitExpert")
+    @Primary
+    public Retrofit RetrofitExpert(Gson gson) {
+        return createRetrofit("https://pre.randomuser.me/", gson);
+    }
+
+    /**
+     * 工作流服务
+     * @param gson
+     * @return
+     */
+    @Bean("retrofitWorkflow")
+    public Retrofit RetrofitWorkflow(Gson gson) {
+        return createRetrofit("https://pre.randomuser.com/", gson);
+    }
+
+    /**
+     * 平台服务
+     * @param gson
+     * @return
+     */
+    @Bean("retrofitPortal")
+    public Retrofit RetrofitPortal(Gson gson) {
+        return createRetrofit("https://pre.randomuser.cn/", gson);
+    }
+
+    /**
+     * 主体服务
+     * @param gson
+     * @return
+     */
+    @Bean("retrofitSubject")
+    public Retrofit RetrofitSubject(Gson gson) {
+        return createRetrofit("https://pre.randomuser.cn.com/", gson);
+    }
+
+    private Retrofit createRetrofit(String baseUrl, Gson gson) {
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(30, TimeUnit.SECONDS)
+                .readTimeout(30, TimeUnit.SECONDS)
+                .build();
+
+        return new Retrofit.Builder()
+                .baseUrl(baseUrl)
+                .client(okHttpClient)
+                .addConverterFactory(GsonConverterFactory.create(gson))
+                .build();
+    }
+}

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

@@ -3,13 +3,55 @@ package com.cnooc.expert.controller.expert;
 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.expert.model.request.*;
-import com.cnooc.expert.controller.expert.model.response.*;
+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.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.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.PingBiaoXiangMuInfoGetByChouQuMaReq;
+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.QingJiaJinJiPageReq;
+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.DongJieGetResp;
+import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaApplyResp;
+import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaPageResp;
+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.PeiXunKeChengKeJiePageResp;
+import com.cnooc.expert.controller.expert.model.response.PeiXunPageResp;
+import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuByOwnerPageResp;
+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.QingJiaJinJiApplyResp;
+import com.cnooc.expert.controller.expert.model.response.QingJiaJinJiPageResp;
+import com.cnooc.expert.controller.expert.model.response.WeiGuiGetResp;
+import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
+import com.cnooc.expert.external.expert.model.response.CityTreeApiResp;
+import com.cnooc.expert.external.expert.model.response.CommonJiTuanErJiDanWeiListApiResp;
+import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiResp;
+import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
+import com.cnooc.expert.external.expert.model.response.DongJieZhuanYePageApiResp;
+import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
+import com.cnooc.expert.external.expert.model.response.ViolationExpertPageApiResp;
+import com.cnooc.expert.external.expert.model.response.XiangMuInfoByChouQuNumGetApiResp;
 import com.cnooc.expert.service.ExpertService;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,8 +80,9 @@ public class ExpertController extends AbstractBaseController {
      * @return
      */
     @PostMapping("/nofilter/list")
-    public ApiResult<List<NofilterListItemResp>> dictNofilterList(@RequestBody @Validated DictNofilterListReq req) {
-        return ApiResult.successWithResult(expertService.listDictNofilter(req));
+    public ApiResult<List<CommonNofilterEnumGetApiResp>> dictNofilterList(@RequestBody @Validated DictNofilterListReq req) {
+        List<CommonNofilterEnumGetApiResp> apiResp = expertService.listDictNofilter(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**
@@ -48,8 +91,9 @@ public class ExpertController extends AbstractBaseController {
      * @return
      */
     @PostMapping("/secondary-unit/list")
-    public ApiResult<List<SecondaryUnitListItemResp>> secondaryUnitList() {
-        return ApiResult.successWithResult(expertService.listSecondaryUnit());
+    public ApiResult<List<CommonJiTuanErJiDanWeiListApiResp>> secondaryUnitList() {
+        List<CommonJiTuanErJiDanWeiListApiResp> apiResp = expertService.listSecondaryUnit();
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**
@@ -58,8 +102,9 @@ public class ExpertController extends AbstractBaseController {
      * @return
      */
     @PostMapping("/dict/guid3/list")
-    public ApiResult<List<DictListItemResp>> dictGuiud3List() {
-        return ApiResult.successWithResult(expertService.listDict3());
+    public ApiResult<List<DictByParentListApiResp>> dictGuiud3List() {
+        List<DictByParentListApiResp> apiResp = expertService.listDict3();
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**
@@ -68,8 +113,9 @@ public class ExpertController extends AbstractBaseController {
      * @return
      */
     @PostMapping("/dict/guid4/list")
-    public ApiResult<List<DictListItemResp>> dictGuiud4List() {
-        return ApiResult.successWithResult(expertService.listDict4());
+    public ApiResult<List<DictByParentListApiResp>> dictGuiud4List() {
+        List<DictByParentListApiResp> apiResp = expertService.listDict4();
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**
@@ -78,8 +124,9 @@ public class ExpertController extends AbstractBaseController {
      * @return
      */
     @PostMapping("/dict/guid5/list")
-    public ApiResult<List<DictListItemResp>> dictGuiud5List() {
-        return ApiResult.successWithResult(expertService.listDict5());
+    public ApiResult<List<DictByParentListApiResp>> dictGuiud5List() {
+        List<DictByParentListApiResp> apiResp = expertService.listDict5();
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**
@@ -88,8 +135,9 @@ public class ExpertController extends AbstractBaseController {
      * @return
      */
     @PostMapping("/dict/guid6/list")
-    public ApiResult<List<DictListItemResp>> dictGuiud6List() {
-        return ApiResult.successWithResult(expertService.listDict6());
+    public ApiResult<List<DictByParentListApiResp>> dictGuiud6List() {
+        List<DictByParentListApiResp> apiResp = expertService.listDict6();
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**
@@ -98,8 +146,9 @@ public class ExpertController extends AbstractBaseController {
      * @return
      */
     @PostMapping("/dict/guid11/list")
-    public ApiResult<List<DictListItemResp>> dictGuiud11List() {
-        return ApiResult.successWithResult(expertService.listDict11());
+    public ApiResult<List<DictByParentListApiResp>> dictGuiud11List() {
+        List<DictByParentListApiResp> apiResp = expertService.listDict11();
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**
@@ -108,8 +157,9 @@ public class ExpertController extends AbstractBaseController {
      * @return
      */
     @PostMapping("/dict/guid12/list")
-    public ApiResult<List<DictListItemResp>> dictGuiud12List() {
-        return ApiResult.successWithResult(expertService.listDict12());
+    public ApiResult<List<DictByParentListApiResp>> dictGuiud12List() {
+        List<DictByParentListApiResp> apiResp = expertService.listDict12();
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**
@@ -119,7 +169,8 @@ public class ExpertController extends AbstractBaseController {
      */
     @PostMapping("/ping-biao-zhuan-ye/tree")
     public ApiResult<List<PingBiaoZhuanYeTreeNodeResp>> PingBiaoZhuanYeTree() {
-        return ApiResult.successWithResult(expertService.treePingBiaoZhuanYe());
+        List<PingBiaoZhuanYeTreeNodeResp> apiResp = expertService.treePingBiaoZhuanYe();
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**
@@ -128,18 +179,9 @@ public class ExpertController extends AbstractBaseController {
      * @return
      */
     @PostMapping("/city/tree")
-    public ApiResult<List<CityTreeNodeResp>> CityTree() {
-        return ApiResult.successWithResult(expertService.treeCity());
-    }
-
-    /**
-     * 公司列表
-     *
-     * @return
-     */
-    @PostMapping("/company/page")
-    public ApiResult<BasePageResp<Object>> companyPage(@RequestBody @Validated CompanyPageReq req) {
-        return ApiResult.successWithResult(expertService.pageCompany(req));
+    public ApiResult<List<CityTreeApiResp>> CityTree() {
+        List<CityTreeApiResp> apiResp = expertService.treeCity();
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**
@@ -148,8 +190,15 @@ public class ExpertController extends AbstractBaseController {
      * @return
      */
     @PostMapping("/info")
-    public ApiResult<ExpertInfoGetResp> ExpertInfoGet() {
-        return ApiResult.successWithResult(expertService.getExpertInfo(null));
+    public ApiResult<ExpertInfoGetApiResp> ExpertInfoGet() {
+        ExpertInfoGetApiResp apiResp = expertService.getExpertInfo(null);
+        return ApiResult.successWithResult(apiResp);
+    }
+
+    @PostMapping("/updateAllInfo")
+    public ApiResult<ExpertInfoGetApiResp> ExpertInfoUpdate(@RequestBody @Validated ExpertInfoUpdateApiReq req) {
+        ExpertInfoGetApiResp apiResp = expertService.updateExpetInfo(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**
@@ -159,79 +208,91 @@ public class ExpertController extends AbstractBaseController {
      * @return
      */
     @PostMapping("/pingBiaoXiangMu/info-by-chouqunum")
-    public ApiResult<PingBiaoXiangMuInfoGetByChouQuMaResp> pingBiaoXiangMuInfoGetByChouQuMa(@RequestBody @Validated PingBiaoXiangMuInfoGetByChouQuMaReq req) {
-        return ApiResult.successWithResult(expertService.getPingBiaoXiangMuInfoByChouQuMa(req));
+    public ApiResult<XiangMuInfoByChouQuNumGetApiResp> pingBiaoXiangMuInfoGetByChouQuMa(@RequestBody @Validated PingBiaoXiangMuInfoGetByChouQuMaReq req) {
+        XiangMuInfoByChouQuNumGetApiResp apiResp = expertService.getPingBiaoXiangMuInfoByChouQuMa(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
     @PostMapping("/pingBiaoXiangMu/page")
-    public ApiResult<BasePageResp<Object>> pingBiaoXiangMuPage(@RequestBody @Validated PingBiaoXiangMuPageReq req) {
-        return ApiResult.successWithResult(expertService.pagePingBiaoXiangMu(req));
+    public ApiResult<BasePageResp<PingBiaoXiangMuPageResp>> pingBiaoXiangMuPage(@RequestBody @Validated PingBiaoXiangMuPageReq req) {
+        BasePageResp<PingBiaoXiangMuPageResp> apiResp = expertService.pagePingBiaoXiangMu(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
     // *** 请假/休假 ***
 
     // 紧急请假分页列表
     @PostMapping("/qing-jia/page")
-    public ApiResult<BasePageResp<Object>> qingJiaJinJiPage(@RequestBody @Validated QingJiaJinJiPageReq req) {
-        return ApiResult.successWithResult(expertService.pageJinJiQingJia(req));
+    public ApiResult<BasePageResp<QingJiaJinJiPageResp>> qingJiaJinJiPage(@RequestBody @Validated QingJiaJinJiPageReq req) {
+        BasePageResp<QingJiaJinJiPageResp> apiResp = expertService.pageJinJiQingJia(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
     // 紧急请假申请
     @PostMapping("/qing-jia/apply")
     public ApiResult<QingJiaJinJiApplyResp> qingJiaJinJiApply(@RequestBody @Validated QingJiaJinJiApplyReq req) {
-        return ApiResult.successWithResult(expertService.applyJinJiQingJia(req));
+        QingJiaJinJiApplyResp apiResp = expertService.applyJinJiQingJia(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
 
     // 个人休假分页列表
     @PostMapping("/xiu-jia/page")
-    public ApiResult<BasePageResp<Object>> geRenXiuJiaPage(@RequestBody @Validated GeRenXiuJiaPageReq req) {
-        return ApiResult.successWithResult(expertService.pageGeRenXiuJia(req));
+    public ApiResult<BasePageResp<GeRenXiuJiaPageResp>> geRenXiuJiaPage(@RequestBody @Validated GeRenXiuJiaPageReq req) {
+        BasePageResp<GeRenXiuJiaPageResp> apiResp = expertService.pageGeRenXiuJia(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
     // 个人休假申请
     @PostMapping("/xiu-jia/apply")
     public ApiResult<GeRenXiuJiaApplyResp> geRenXiuJiaApply(@RequestBody @Validated GeRenXiuJiaApplyReq req) {
-        return ApiResult.successWithResult(expertService.applyGeRenXiuJia(req));
+        GeRenXiuJiaApplyResp apiResp = expertService.applyGeRenXiuJia(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
     // *** 评标项目 ***
 
     // 专家的评标项目分页列表
     @PostMapping("/ping-biao-xiang-mu/by-owner/page")
-    public ApiResult<BasePageResp<Object>> pingBiaoXiangMuByOwnerPage(@RequestBody @Validated PingBiaoXiangMuByOwnerPageReq req) {
-        return ApiResult.successWithResult(expertService.pagePingBiaoXiangmuByOwner(req));
+    public ApiResult<BasePageResp<PingBiaoXiangMuByOwnerPageResp>> pingBiaoXiangMuByOwnerPage(@RequestBody @Validated PingBiaoXiangMuByOwnerPageReq req) {
+        BasePageResp<PingBiaoXiangMuByOwnerPageResp> apiResp = expertService.pagePingBiaoXiangmuByOwner(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**
      * 专家个人的申请列表
+     *
      * @param req
      * @return
      */
     @PostMapping("/zhuan-jia/shen-qing-ji-lu/page")
     public ApiResult<BasePageResp<ZhuanJiaShenQingJiLuPageResp>> zhuanJiaShenQingJiLuPage(@RequestBody @Validated ZhuanJiaShenQingJiLuPageReq req) {
-        return ApiResult.successWithResult(expertService.pageZhuanJiaShenQingJiLu(req));
+        BasePageResp<ZhuanJiaShenQingJiLuPageResp> apiResp = expertService.pageZhuanJiaShenQingJiLu(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
     // *** 违规信息/冻结信息 ***
 
     // 专家冻结信息分页列表
     @PostMapping("/dong-jie/page")
-    public ApiResult<BasePageResp<DongJiePageResp>> dongJiePage(@RequestBody @Validated DongJiePageReq req) {
-        return ApiResult.successWithResult(expertService.pageDongJie(req));
+    public ApiResult<BasePageResp<DongJieZhuanYePageApiResp>> dongJiePage(@RequestBody @Validated DongJiePageReq req) {
+        BasePageResp<DongJieZhuanYePageApiResp> apiResp = expertService.pageDongJie(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
     // 专家冻结信息详情
     @PostMapping("/dong-jie/get")
     public ApiResult<DongJieGetResp> dongjieGet(@RequestBody @Validated DongJieGetReq req) {
-        return ApiResult.successWithResult(expertService.getDongJie(req));
+        DongJieGetResp apiResp = expertService.getDongJie(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
 
     // 专家违规分页列表
     @PostMapping("/wei-gui/page")
-    public ApiResult<BasePageResp<WeiGuiPageResp>> weiGuiJiLuPage(@RequestBody @Validated WeiGuiJiLuPageReq req) {
-        return ApiResult.successWithResult(expertService.pageWeiGuiList(req));
+    public ApiResult<BasePageResp<ViolationExpertPageApiResp>> weiGuiJiLuPage(@RequestBody @Validated WeiGuiJiLuPageReq req) {
+        BasePageResp<ViolationExpertPageApiResp> apiResp = expertService.pageWeiGuiList(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
     /**

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

+package com.cnooc.expert.controller.expert;
+
+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.expert.model.request.CompanyPageReq;
+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.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.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.PingBiaoXiangMuInfoGetByChouQuMaReq;
+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.QingJiaJinJiPageReq;
+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.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.ExpertInfoGetResp;
+import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaApplyResp;
+import com.cnooc.expert.controller.expert.model.response.KaoShiPageResp;
+import com.cnooc.expert.controller.expert.model.response.NofilterListItemResp;
+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.PeiXunKeChengKeJiePageResp;
+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.PingBiaoZhuanYeTreeNodeResp;
+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.WeiGuiGetResp;
+import com.cnooc.expert.controller.expert.model.response.WeiGuiPageResp;
+import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
+import com.cnooc.expert.service.ExpertMockService;
+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/expert")
+public class ExpertMockController extends AbstractBaseController {
+
+    private final ExpertMockService expertMockService;
+
+    @PostMapping("/approve/getBusinessId")
+    public ApiResult<ApproveBusinessIdGetResp> approveBusinessIdGet() {
+        return ApiResult.successWithResult(expertMockService.getApproveBusinessId());
+    }
+
+    // *** 数据字典 ***
+
+    /**
+     * 民族查询列表
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/nofilter/list")
+    public ApiResult<List<NofilterListItemResp>> dictNofilterList(@RequestBody @Validated DictNofilterListReq req) {
+        return ApiResult.successWithResult(expertMockService.listDictNofilter(req));
+    }
+
+    /**
+     * 集团二级单位列表
+     *
+     * @return
+     */
+    @PostMapping("/secondary-unit/list")
+    public ApiResult<List<SecondaryUnitListItemResp>> secondaryUnitList() {
+        return ApiResult.successWithResult(expertMockService.listSecondaryUnit());
+    }
+
+    /**
+     * 执业资格列表
+     *
+     * @return
+     */
+    @PostMapping("/dict/guid3/list")
+    public ApiResult<List<DictListItemResp>> dictGuiud3List() {
+        return ApiResult.successWithResult(expertMockService.listDict3());
+    }
+
+    /**
+     * 执业资格
+     *
+     * @return
+     */
+    @PostMapping("/dict/guid4/list")
+    public ApiResult<List<DictListItemResp>> dictGuiud4List() {
+        return ApiResult.successWithResult(expertMockService.listDict4());
+    }
+
+    /**
+     * 学历列表
+     *
+     * @return
+     */
+    @PostMapping("/dict/guid5/list")
+    public ApiResult<List<DictListItemResp>> dictGuiud5List() {
+        return ApiResult.successWithResult(expertMockService.listDict5());
+    }
+
+    /**
+     * 学位列表
+     *
+     * @return
+     */
+    @PostMapping("/dict/guid6/list")
+    public ApiResult<List<DictListItemResp>> dictGuiud6List() {
+        return ApiResult.successWithResult(expertMockService.listDict6());
+    }
+
+    /**
+     * 语种
+     *
+     * @return
+     */
+    @PostMapping("/dict/guid11/list")
+    public ApiResult<List<DictListItemResp>> dictGuiud11List() {
+        return ApiResult.successWithResult(expertMockService.listDict11());
+    }
+
+    /**
+     * 熟练程度
+     *
+     * @return
+     */
+    @PostMapping("/dict/guid12/list")
+    public ApiResult<List<DictListItemResp>> dictGuiud12List() {
+        return ApiResult.successWithResult(expertMockService.listDict12());
+    }
+
+    /**
+     * 评标专业树
+     *
+     * @return
+     */
+    @PostMapping("/ping-biao-zhuan-ye/tree")
+    public ApiResult<List<PingBiaoZhuanYeTreeNodeResp>> PingBiaoZhuanYeTree() {
+        return ApiResult.successWithResult(expertMockService.treePingBiaoZhuanYe());
+    }
+
+    /**
+     * 省市区树
+     *
+     * @return
+     */
+    @PostMapping("/city/tree")
+    public ApiResult<List<CityTreeNodeResp>> CityTree() {
+        return ApiResult.successWithResult(expertMockService.treeCity());
+    }
+
+    /**
+     * 专家个人信息
+     *
+     * @return
+     */
+    @PostMapping("/info")
+    public ApiResult<ExpertInfoGetResp> ExpertInfoGet() {
+        return ApiResult.successWithResult(expertMockService.getExpertInfo(null));
+    }
+
+    @PostMapping("/updateAllInfo")
+    public ApiResult<ExpertInfoGetResp> ExpertInfoUpdate(@RequestBody @Validated ExpertInfoUpdateApiReq req) {
+        return ApiResult.successWithResult(expertMockService.updateExpetInfo(req));
+    }
+
+    /**
+     * 抽取码详情
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/pingBiaoXiangMu/info-by-chouqunum")
+    public ApiResult<PingBiaoXiangMuInfoGetByChouQuMaResp> pingBiaoXiangMuInfoGetByChouQuMa(@RequestBody @Validated PingBiaoXiangMuInfoGetByChouQuMaReq req) {
+        return ApiResult.successWithResult(expertMockService.getPingBiaoXiangMuInfoByChouQuMa(req));
+    }
+
+    @PostMapping("/pingBiaoXiangMu/page")
+    public ApiResult<BasePageResp<Object>> pingBiaoXiangMuPage(@RequestBody @Validated PingBiaoXiangMuPageReq req) {
+        return ApiResult.successWithResult(expertMockService.pagePingBiaoXiangMu(req));
+    }
+
+    // *** 请假/休假 ***
+
+    // 紧急请假分页列表
+    @PostMapping("/qing-jia/page")
+    public ApiResult<BasePageResp<Object>> qingJiaJinJiPage(@RequestBody @Validated QingJiaJinJiPageReq req) {
+        return ApiResult.successWithResult(expertMockService.pageJinJiQingJia(req));
+    }
+
+    // 紧急请假申请
+    @PostMapping("/qing-jia/apply")
+    public ApiResult<QingJiaJinJiApplyResp> qingJiaJinJiApply(@RequestBody @Validated QingJiaJinJiApplyReq req) {
+        return ApiResult.successWithResult(expertMockService.applyJinJiQingJia(req));
+    }
+
+
+    // 个人休假分页列表
+    @PostMapping("/xiu-jia/page")
+    public ApiResult<BasePageResp<Object>> geRenXiuJiaPage(@RequestBody @Validated GeRenXiuJiaPageReq req) {
+        return ApiResult.successWithResult(expertMockService.pageGeRenXiuJia(req));
+    }
+
+    // 个人休假申请
+    @PostMapping("/xiu-jia/apply")
+    public ApiResult<GeRenXiuJiaApplyResp> geRenXiuJiaApply(@RequestBody @Validated GeRenXiuJiaApplyReq req) {
+        return ApiResult.successWithResult(expertMockService.applyGeRenXiuJia(req));
+    }
+
+    // *** 评标项目 ***
+
+    // 专家的评标项目分页列表
+    @PostMapping("/ping-biao-xiang-mu/by-owner/page")
+    public ApiResult<BasePageResp<Object>> pingBiaoXiangMuByOwnerPage(@RequestBody @Validated PingBiaoXiangMuByOwnerPageReq req) {
+        return ApiResult.successWithResult(expertMockService.pagePingBiaoXiangmuByOwner(req));
+    }
+
+    /**
+     * 专家个人的申请列表
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/zhuan-jia/shen-qing-ji-lu/page")
+    public ApiResult<BasePageResp<ZhuanJiaShenQingJiLuPageResp>> zhuanJiaShenQingJiLuPage(@RequestBody @Validated ZhuanJiaShenQingJiLuPageReq req) {
+        return ApiResult.successWithResult(expertMockService.pageZhuanJiaShenQingJiLu(req));
+    }
+
+    // *** 违规信息/冻结信息 ***
+
+    // 专家冻结信息分页列表
+    @PostMapping("/dong-jie/page")
+    public ApiResult<BasePageResp<DongJiePageResp>> dongJiePage(@RequestBody @Validated DongJiePageReq req) {
+        return ApiResult.successWithResult(expertMockService.pageDongJie(req));
+    }
+
+    // 专家冻结信息详情
+    @PostMapping("/dong-jie/get")
+    public ApiResult<DongJieGetResp> dongjieGet(@RequestBody @Validated DongJieGetReq req) {
+        return ApiResult.successWithResult(expertMockService.getDongJie(req));
+    }
+
+
+    // 专家违规分页列表
+    @PostMapping("/wei-gui/page")
+    public ApiResult<BasePageResp<WeiGuiPageResp>> weiGuiJiLuPage(@RequestBody @Validated WeiGuiJiLuPageReq req) {
+        return ApiResult.successWithResult(expertMockService.pageWeiGuiList(req));
+    }
+
+    /**
+     * 专家违规处理信息详情
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/wei-gui/get")
+    public ApiResult<WeiGuiGetResp> weiGuiGet(@RequestBody @Validated WeiGuiGetReq req) {
+        return ApiResult.successWithResult(expertMockService.getWeiGui(req));
+    }
+
+    // *** 课程培训  和  课后考试
+    // 课后考试
+
+    /**
+     * 课后考试列表查询
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/kaoShi/getKaoShiPage")
+    public ApiResult<BasePageResp<KaoShiPageResp>> getKaoShiPage(@RequestBody @Validated KaoShiPageReq req) {
+        return ApiResult.successWithResult(expertMockService.pageKaoShi(req));
+    }
+
+
+    // 课程培训
+
+    /**
+     * 培训课程列表查询
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/peiXun/getPeiXunPage")
+    public ApiResult<BasePageResp<PeiXunPageResp>> getPeiXunPage(@RequestBody @Validated PeiXunPageReq req) {
+        return ApiResult.successWithResult(expertMockService.pagePeiXunKeCheng(req));
+    }
+
+    /**
+     * 培训课程详情查询
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/peiXun/getPeiXunInfo")
+    public ApiResult<Object> getPeiXunInfo(@RequestBody @Validated PeiXunKeChengReq req) {
+        return ApiResult.successWithResult(expertMockService.getPeiXunInfo(req));
+    }
+
+    // 课程详情 课节列表 分页列表
+    @PostMapping("/peiXun/kecheng/kejie/page")
+    public ApiResult<BasePageResp<PeiXunKeChengKeJiePageResp>> pagePeiXunKeChengKeJie(@RequestBody @Validated PeiXunKeChengKeJiePageReq req) {
+        return ApiResult.successWithResult(expertMockService.pagePeiXunKeChengKeJie(req));
+    }
+
+    // 课程详情 课节 详情
+    @PostMapping("/peiXun/kecheng/kejie/get")
+    public ApiResult<PeiXunKeChengKeJieGetResp> getPeiXunKeChengKeJie(@RequestBody @Validated PeiXunKeChengKeJieGetReq 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")
+    public ApiResult<PeiXunKeChengKeJieFuJianGetResp> getPeiXunKeChengKeJieFuJian(@RequestBody @Validated PeiXunKeChengKeJieFuJianGetReq req) {
+        return ApiResult.successWithResult(expertMockService.getPeiXunKeChengKeJieFuJian(req));
+    }
+
+}

src/main/java/com/cnooc/expert/controller/expert/model/request/ExpertInfoUpdateApiReq.java

+package com.cnooc.expert.controller.expert.model.request;
+
+import com.cnooc.expert.controller.expert.model.response.ExpertInfoGetResp;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ExpertInfoUpdateApiReq {
+
+    private String businessId;
+
+    private String pinQiStartTime;
+
+    private String pinQiEndTime;
+
+    private Bean bean;
+
+    private SysShenHeJieGuo sysShenHeJieGuo;
+
+    private SysShenHeJieGuo xuQiShenHeJieGuo;
+
+    private ZhuangTaiXiuGaiJiLuSq xuQiXiuGaiJiLuSq;
+
+    private SysShenHeJieGuo tuiKuShenHeJieGuo;
+
+    private ZhuangTaiXiuGaiJiLuSq tuiKuGaiJiLuSq;
+
+    private SysShenHeJieGuo yiLeiShenHeJieGuo;
+
+    private SysShenHeJieGuo rukuShenHeJieGuo;
+
+    private List<Jl> jlList;
+
+    private List<Zg> zgList;
+
+    private List<Zc> zcList;
+
+    private List<Pb> pbList;
+
+    private List<Hb> hbList;
+
+    private List<Ps> psList;
+
+    private List<Language> languageList;
+
+    private List<XueLi> xueLiList;
+
+    private List<FuJian> fuJianList;
+
+
+    @Data
+    @Builder
+    public static class Bean {
+        private String adAccount;
+        private Integer age;
+        private String authPassWithImport;
+        private String auths;
+        private String base64FanMianFuJian;
+        private String base64FanMianFuJianName;
+        private String base64FuJian;
+        private String base64FuJianName;
+        private String base64Photo;
+        private String base64PhotoName;
+        private String baseAuths;
+        private String baseCode;
+        private String baseGuid;
+        private String baseMobile;
+        private String baseName;
+        private String baseSFZH;
+        private String baseShenPiZhuangTai;
+        private String baseZhuangTai;
+        private String biYeYuanXiao;
+        private Integer bianGengXuHao;
+        private String birthday;
+        private String buNengRuXuanQingKong;
+        private String byzFileGuid;
+        private String canYuXiangMu;
+        private String city;
+        private Long createTime;
+        private String createTimeText;
+        private String creatorName;
+        private String danRenQiTaZhuanJia;
+        private String danweiGuid;
+        private String department;
+        private String domainName;
+        private String email;
+        private String fanMianFuJianGuids;
+        private String fax;
+        private String fuJianGuids;
+        private String gongZuoBeiZhu;
+        private String gongZuoDanWei;
+        private String gongZuoDanWeiBH;
+        private String gongZuoDanWeiDiZhi;
+        private String gongZuoPhone;
+        private String gongZuoPost;
+        private Long gongZuoTime;
+        private String gongZuoZhiWu;
+        private String gongZuoZhuanYeName;
+        private String gongZuoZhuanYeYears;
+        private Integer gongZuoZhuangTai;
+        private String graduationDate;
+        private Boolean hasLianJieChuLiYiJian;
+        private String huoJiangQingKuang;
+        private Boolean inGroup;
+        private Boolean isHasLianJieChuLiYiJian;
+        private Boolean isQualified;
+        private Boolean isReadRuKuPromise;
+        private Boolean isSenior;
+        private Boolean isZhiYeZiGe;
+        private String jgdmFileGuid;
+        private String jiTuanErJiDanWeiCode;
+        private String jiTuanErJiDanWeiName;
+        private String jiaTingDiZhi;
+        private String jiaTingPhone;
+        private String jiaTingPost;
+        private String jianKangZhuangKuang;
+        private String jinJiLianXiRenGuid;
+        private String jinJiLianXiRenName;
+        private String jinJiLianXiRenPhone;
+        private String kaoShiFenShu;
+        private Integer leiJiFenZhi;
+        private Long leiJiZhanTingTime;
+        private String lianJieYiJianShuFuJianGuid;
+        private String lsFuJian;
+        private String minZu;
+        private String minZuText;
+        private String mobile;
+        private String mobileGJQHText;
+        private String mobileGuoJiQuHao;
+        private String modifierName;
+        private Long modifyTime;
+        private String modifyTimeText;
+        private Boolean needTest;
+        private String photoGuid;
+        private String pingBiaoChangZhuDiQu;
+        private String pingBiaoChangZhuDiQuName;
+        private Boolean pingBiaoIsYingJi;
+        private String pingBiaoQiTaDiQu;
+        private String pingBiaoTuiJianLX;
+        private String pingBiaoYingJiDiQu;
+        private Long pinqiEndTime;
+        private Long pinqiStartTime;
+        private String professionLevel;
+        private String qiTaLianXiFangShi;
+        private Boolean qualified;
+        private Boolean readRuKuPromise;
+        private Long readRuKuPromiseTime;
+        private Integer ruKuZhuangTai;
+        private Boolean senior;
+        private Boolean sex;
+        private String sfzFileGuid;
+        private String sfzFuJians;
+        private String shenFenZheng;
+        private Long shenHeEndTime;
+        private Long shenHeStartTime;
+        private String shenPiRen;
+        private String shenPiShiJian;
+        private String shenPiShiJianText;
+        private String shenPiYiJian;
+        private Integer shenPiZhuangTai;
+        private Long shenQingEndTime;
+        private Integer shenQingLeiXing;
+        private Long shenQingStartTime;
+        private Boolean shiFouYiFaZhuanJia;
+        private String subjectCode;
+        private String subjectId;
+        private String subjectName;
+        private Integer subjectType;
+        private String suoShuBuMeng;
+        private String suoShuDanWeiName;
+        private String suoShuHangYe;
+        private String suoShuZhaoBiaoDaiLi;
+        private String suoZaiQitaZhuanJiaKu;
+        private String tenantId;
+        private String tenantId_;
+        private String tenantName;
+        private Long tiJiaoTime;
+        private String tiJiaoTimeText;
+        private String tuiKuYuanYin;
+        private String waiYuChengDu;
+        private String xueLi;
+        private String xueLiTxt;
+        private String xueLiZhuanYe;
+        private String xueWei;
+        private String xueWeiTxt;
+        private String xueWeiZhuanYe;
+        private String yinHang;
+        private String yinHang1;
+        private String yinHangKa;
+        private String yinHangKaFileGuid;
+        private String yingJiZhuangTai;
+        private String zhangHao;
+        private String zhaoBiaoDanWeiBianHao;
+        private String zhaoBiaoDanweiMingChen;
+        private String zhengJianType;
+        private String zhengZhiMianMao;
+        private Boolean zhiYeZiGe;
+        private String zhuanJiaCode;
+        private Integer zhuanJiaFenJi;
+        private Integer zhuanJiaFenLei;
+        private String zhuanJiaGuid;
+        private String zhuanJiaName;
+        private String zhuanJiaShiXiangGuid;
+        private Integer zhuanJiaSourceType;
+        private String zhuanJiaSuoZaiDiGuids;
+        private String zhuanJiaSuoZaiDiNames;
+        private String zhuanJiaType;
+        private Integer zhuanJiaZhuangTai;
+        private String zhuanJiaZiZhiTiaoJian;
+        private String zhuanJiaZongHeBianHao;
+        private String zhuanYeJingLi;
+        private String zhuanYeTeChang;
+        private Integer zhuanjiaQinRenQi;
+        private Long ziDongZanTingEndTime;
+        private Long ziDongZanTingStartTime;
+    }
+
+    @Data
+    @Builder
+    public static class Jl {
+        private String buMenName;
+        private Long createTime;
+        private String createTimeText;
+        private String creatorName;
+        private String danWeiBH;
+        private String danWeiName;
+        private String gongZuoMiaoShu;
+        private String jingLiGuid;
+        private Long liZhiTime;
+        private String liZhiTimeText;
+        private String modifierName;
+        private Long modifyTime;
+        private String modifyTimeText;
+        private Long riZhiTime;
+        private String riZhiTimeText;
+        private String shenFenZheng;
+        private Long tenantId;
+        private String tenantName;
+        private String zhiWu;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+        private String ziXinXiGuid;
+    }
+
+    @Data
+    @Builder
+    public static class Zg {
+        private String base64ZgFile;
+        private String base64ZgFileName;
+        private Long createTime;
+        private String createTimeText;
+        private String creatorName;
+        private String dictGuid;
+        private Long huoQuDate;
+        private String modifierName;
+        private Long modifyTime;
+        private String modifyTimeText;
+        private Long obtainTime;
+        private String qiTaZiGe;
+        private String zgFileGuid;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+        private String ziGeGuid;
+        private String ziGeName;
+        private String ziGeZhengShuHao;
+        private String ziXinXiGuid;
+    }
+
+    @Data
+    @Builder
+    public static class Zc {
+        private String base64ZcFile;
+
+        private String base64ZcFileName;
+
+        private Long createTime;
+
+        private String createTimeText;
+
+        private String creatorName;
+
+        private String dictGuid;
+
+        private String modifierName;
+
+        private Long modifyTime;
+
+        private String modifyTimeText;
+
+        private Long pingDingTime;
+
+        private String pingDingTimeText;
+
+        private String zcFileGuid;
+
+        private String zhiChengGuid;
+
+        private String zhiChengName;
+
+        private String zhiChengZhuanYe;
+
+        private String zhuanJiaGuid;
+
+        private String zhuanJiaShiXiangGuid;
+
+        private String ziXinXiGuid;
+    }
+
+
+    @Data
+    @Builder
+    public static class Pb {
+        private Long createTime;
+        private String createTimeText;
+        private String creatorName;
+        private Long dongJieEndTime;
+        private String dongJieFuJianGuid;
+        private String dongJieOperator;
+        private String dongJieReason;
+        private Long dongJieSatrtTime;
+        private Long dongJieTime;
+        private Boolean isPrimary;
+        private Boolean isScarce;
+        private String jieDongFuJianGuid;
+        private String jieDongOperator;
+        private String jieDongReason;
+        private Long jieDongTime;
+        private String modifierName;
+        private Long modifyTime;
+        private String modifyTimeText;
+        private String parentGuid;
+        private String path;
+        private String pingBiaoZhuanYeGuid;
+        private Integer professionLevel;
+        private String zhuanJiaGuid;
+        private String zhuanJiaLeiBie;
+        private String zhuanJiaShiXiangGuid;
+        private String zhuanYeBH;
+        private String zhuanYeGuid;
+        private String zhuanYeJiBie;
+        private String zhuanYeName;
+        private Integer zhuanYeNianXian;
+        private Integer zhuanYeStatus;
+        private String zhuanYeXiangGuanJingLi;
+        private String ziXinXiGuid;
+    }
+
+    @Data
+    @Builder
+    public static class Hb {
+        private String danWeiBH;
+        private String danWeiName;
+        private String huiBiGuid;
+        private String huiBiMiaoShu;
+        private String huiBiMiaoShuStr;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+        private String ziXinXiGuid;
+    }
+
+    @Data
+    @Builder
+    public static class Ps {
+        private Long pinQiEndTime;
+        private String pinQiEndTimeText;
+        private Long pinQiStartTime;
+        private String pinQiStartTimeText;
+        private String pinShuFuJianGuid;
+        private String pingShuGuid;
+        private String zhuanJiaGuid;
+        private Integer zhuanJiaQinRenQi;
+    }
+
+    @Data
+    @Builder
+    public static class Language {
+        private String languageGuid;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+        private String languageName;
+        private String languageId;
+        private String shuLianChengDu;
+        private String shuLianChengDuId;
+    }
+
+    @Data
+    @Builder
+    public static class XueLi {
+        private Long biYeTime;
+        private String biYeYuanXiao;
+        private String biYeYuanXiaoGuid;
+        private String byzFileGuid;
+        private Long createTime;
+        private String creatorGuid;
+        private String creatorName;
+        private Long creatorTime;
+        private Boolean isImport;
+        private Boolean isZuiGaoXueLi;
+        private Boolean isZuiGaoXueWei;
+        private String modifier;
+        private String modifierName;
+        private Long modifyTime;
+        private String suoShuZhaoBiaoDaiLi;
+        private String xueLiBh;
+        private String xueLiDictGuid;
+        private String xueLiGuid;
+        private String xueLiName;
+        private String xueLiZhuanYe;
+        private String xueLiZhuanYeBh;
+        private String xueLiZhuanYeGuid;
+        private String xueWeiBh;
+        private String xueWeiDictGuid;
+        private String xueWeiName;
+        private String xwzFileGuid;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+        private String ziXinXiGuid;
+    }
+
+    @Data
+    @Builder
+    public static class FuJian {
+        private Long createTime;
+        private String creatorGuid;
+        private String creatorName;
+        private String downloadUrl;
+        private String feiQiRenGuid;
+        private String feiQiRenName;
+        private Long feiQiTime;
+        private String fileDescription;
+        private String fileName;
+        private Integer fileSize;
+        private Integer fileType;
+        private String fuJianGuid;
+        private Boolean isFeiQi;
+        private String modifierGuid;
+        private String modifierName;
+        private Long modifyTime;
+        private String shenHeRenGuid;
+        private String shenHeRenName;
+        private Integer shenHeStatus;
+        private Long shenHeTime;
+        private String shenHeYiJian;
+        private Long tiJiaoTime;
+        private String zhuanJiaFuJianGuid;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+        private String ziXinXiGuid;
+    }
+
+    @Data
+    @Builder
+    public static class SysShenHeJieGuo {
+        private String bianGengXuHao;
+        private String businessId;
+        private Long createTime;
+        private String createTimeText;
+        private String creatorName;
+        private String currentNode;
+        private String daiShenRenGuids;
+        private String daiShenRenNames;
+        private Boolean isFinish;
+        private String mobile;
+        private String modifierName;
+        private Long modifyTime;
+        private String modifyTimeText;
+        private Boolean nengCheHui;
+        private String photoGuid;
+        private String remark;
+        private String sequence;
+        private String shenFenZheng;
+        private String shenHeRenGuid;
+        private String shenPiBuMenGuid;
+        private String shenPiBuMenName;
+        private String shenPiJiLuGuid;
+        private String shenPiRen;
+        private String shenPiShiJian;
+        private String shenPiYiJian;
+        private Integer shenPiZhuangTai;
+        private Integer shenQingLeiXing;
+        private Boolean shiFouZhuanJiao;
+        private String shiXiangGuid;
+        private String shiXiangName;
+        private String shiXiangType;
+        private String shouLiRen;
+        private Long shouLiTime;
+        private String shouLiTimeText;
+        private Integer shouLiZhuanTai;
+        private String tiJiaoRenGuid;
+        private String tiJiaoRenName;
+        private Long tiJiaoTime;
+        private String tiJiaoTimeText;
+        private String tuiKuYuanYin;
+        private String workFlowBusinessId;
+        private String workFlowBusinessIdNew;
+        private String xiaJiShenHeRenGuid;
+        private String xiaJiShenHeRenName;
+        private String xiangMuGuid;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+    }
+
+    @Data
+    @Builder
+    public static class ZhuangTaiXiuGaiJiLuSq {
+
+        private String jiluSqGuid;
+        private String zhuanJiaGuid;
+        private Short xiuGaiQianZhuangTai;
+        private Short xiuGaiHouZhuangTai;
+        private String xiuGaiLeiXing;
+        private String xiuGaiYuanYin;
+        private Long createTime;
+        private String creatorName;
+        private String creatorGuid;
+        private Long startTime;
+        private Long endTime;
+        private Boolean isChanged;
+        private String fuJianGuid;
+        private Boolean isRenew;
+        private Short zhuanJiaQinRenQi;
+        /** 解聘原因，10:专家主动退库,20:到期清退,30:到龄清退,40:管理员清退 */
+        private Short jiePinYuanYinType;
+        /** 续期原因类型,0:其他;1:聘任到期; */
+        private Short renewYuanyinType;
+        private String renewJutiYuanyin;
+    }
+
+}

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

 package com.cnooc.expert.controller.expert.model.response;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class ExpertInfoGetResp {
 
     private String businessId;
@@ -246,12 +250,34 @@ public class ExpertInfoGetResp {
 
     @Data
     @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
     public static class Zg {
-
+        private String base64ZgFile;
+        private String base64ZgFileName;
+        private Long createTime;
+        private String createTimeText;
+        private String creatorName;
+        private String dictGuid;
+        private Long huoQuDate;
+        private String modifierName;
+        private Long modifyTime;
+        private String modifyTimeText;
+        private Long obtainTime;
+        private String qiTaZiGe;
+        private String zgFileGuid;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+        private String ziGeGuid;
+        private String ziGeName;
+        private String ziGeZhengShuHao;
+        private String ziXinXiGuid;
     }
 
     @Data
     @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
     public static class Zc {
         private String base64ZcFile;
 
@@ -293,6 +319,8 @@ public class ExpertInfoGetResp {
 
     @Data
     @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
     public static class Pb {
         private Long createTime;
         private String createTimeText;
@@ -331,6 +359,8 @@ public class ExpertInfoGetResp {
 
     @Data
     @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
     public static class Hb {
         private Long createTime;
         private String createTimeText;
@@ -350,6 +380,8 @@ public class ExpertInfoGetResp {
 
     @Data
     @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
     public static class Ps {
         private Long createTime;
         private String creatorGuid;
@@ -369,6 +401,8 @@ public class ExpertInfoGetResp {
 
     @Data
     @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
     public static class Language {
         private String languageGuid;
         private String zhuanJiaGuid;
@@ -377,11 +411,13 @@ public class ExpertInfoGetResp {
         private String languageId;
         private String shuLianChengDu;
         private String shuLianChengDuId;
-
+        private String ziXinXiGuid;
     }
 
     @Data
     @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
     public static class XueLi {
         private Long biYeTime;
         private String biYeYuanXiao;

src/main/java/com/cnooc/expert/controller/portal/PortalMockController.java

+package com.cnooc.expert.controller.portal;
+
+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.portal.model.request.AgentNumReq;
+import com.cnooc.expert.controller.portal.model.request.AgentPageReq;
+import com.cnooc.expert.controller.portal.model.request.MessagePageReq;
+import com.cnooc.expert.controller.portal.model.response.AgentNumResp;
+import com.cnooc.expert.controller.portal.model.response.MessageNumResp;
+import com.cnooc.expert.service.PortalMockService;
+import com.cnooc.expert.service.PortalService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+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;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/mock/portal")
+public class PortalMockController extends AbstractBaseController {
+
+    private final PortalMockService portalMockService;
+
+    // *** 业务待办 ***
+
+    @PostMapping("/agent/num/test")
+    public String agentNumTest(AgentNumReq req) throws JsonProcessingException {
+        return objectMapper.writeValueAsString(portalMockService.getAgentNum(req));
+    }
+
+    /**
+     * 已办待办数量
+     *
+     * @return
+     */
+    @PostMapping("/agent/num")
+    public ApiResult<AgentNumResp> agentNum(AgentNumReq req) {
+        return ApiResult.successWithResult(portalMockService.getAgentNum(req));
+    }
+
+    /**
+     * 已办待办分页列表
+     *
+     * @return
+     */
+    @PostMapping("/agent/page")
+    public ApiResult<BasePageResp<Object>> agentPage(@RequestBody @Validated AgentPageReq req) {
+        int curUserId = 1;
+        return ApiResult.successWithResult(portalMockService.pageAgentNum(req));
+    }
+
+    // *** 我的消息 ***
+
+    /**
+     * 已读未读数量查询
+     *
+     * @return
+     */
+    @PostMapping("/message/num")
+    public ApiResult<MessageNumResp> messageNum() {
+        return ApiResult.successWithResult(portalMockService.getMessageNum(null));
+    }
+
+    /**
+     * 消息列表查询
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/message/page")
+    public ApiResult<BasePageResp<Object>> messagePage(@RequestBody @Validated MessagePageReq req) {
+        int curUserId = 1;
+        return ApiResult.successWithResult(portalMockService.pageMessageNum(req));
+    }
+
+}

src/main/java/com/cnooc/expert/controller/subject/SubjectController.java

+package com.cnooc.expert.controller.subject;
+
+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.subject.model.request.CompanyPageReq;
+import com.cnooc.expert.controller.subject.model.response.CompanyPageResp;
+import com.cnooc.expert.service.SubjectService;
+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;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/subject")
+public class SubjectController extends AbstractBaseController {
+
+    private final SubjectService subjectService;
+
+    /**
+     * 公司列表
+     *
+     * @return
+     */
+    @PostMapping("/company/page")
+    public ApiResult<BasePageResp<CompanyPageResp>> companyPage(@RequestBody @Validated CompanyPageReq req) {
+        BasePageResp<CompanyPageResp> apiResp = subjectService.pageCompany(req);
+
+        return ApiResult.successWithResult(apiResp);
+    }
+
+}

src/main/java/com/cnooc/expert/controller/subject/SubjectMockController.java

+package com.cnooc.expert.controller.subject;
+
+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.subject.model.request.CompanyPageReq;
+import com.cnooc.expert.controller.subject.model.response.CompanyPageResp;
+import com.cnooc.expert.service.SubjectMockService;
+import com.cnooc.expert.service.SubjectService;
+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;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/mock/subject")
+public class SubjectMockController extends AbstractBaseController {
+
+    private final SubjectMockService subjectMockService;
+
+    /**
+     * 公司列表
+     *
+     * @return
+     */
+    @PostMapping("/company/page")
+    public ApiResult<BasePageResp<CompanyPageResp>> companyPage(@RequestBody @Validated CompanyPageReq req) {
+        BasePageResp<CompanyPageResp> apiResp = subjectMockService.pageCompany(req);
+
+        return ApiResult.successWithResult(apiResp);
+    }
+
+
+}

src/main/java/com/cnooc/expert/controller/subject/model/request/CompanyPageReq.java

+package com.cnooc.expert.controller.subject.model.request;
+
+import com.cnooc.expert.common.request.BasePageRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CompanyPageReq extends BasePageRequest {
+}

src/main/java/com/cnooc/expert/controller/expert/model/response/CompanyPageResp.java → src/main/java/com/cnooc/expert/controller/subject/model/response/CompanyPageResp.java

-package com.cnooc.expert.controller.expert.model.response;
+package com.cnooc.expert.controller.subject.model.response;
 
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/cnooc/expert/controller/workflow/WorkflowMockController.java

+package com.cnooc.expert.controller.workflow;
+
+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.workflow.model.request.ApprovePathSettingPageReq;
+import com.cnooc.expert.controller.workflow.model.response.ApprovePathSettingPageResp;
+import com.cnooc.expert.service.WorkflowMockService;
+import com.cnooc.expert.service.WorkflowService;
+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;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/mock/workflow")
+public class WorkflowMockController extends AbstractBaseController {
+
+    private final WorkflowMockService workflowMockService;
+
+    // 获取审批路径
+    @PostMapping("/approve-path-setting/page")
+    public ApiResult<BasePageResp<ApprovePathSettingPageResp>> pageApprovePathSetting(@RequestBody @Validated ApprovePathSettingPageReq req) {
+        return ApiResult.successWithResult(workflowMockService.pageApprovePathSetting(req));
+    }
+
+}

src/main/java/com/cnooc/expert/external/common/model/response/ApiBasePageResp.java

@@ -9,11 +9,26 @@ import java.util.List;
 @Builder
 public class ApiBasePageResp<T> {
 
-    private Integer total;
+    private Integer totalCount;
 
-    private Integer pages;
+    private Integer pageSize;
 
-    private Integer current;
+    private Integer pageNum;
+
+    private Integer firstResult;
+
+    private Integer pageNo;
+
+    private Boolean firstPage;
+
+    private Integer totalPage;
+
+    private Boolean lastPage;
+
+    private Integer nextPage;
+
+    private Integer prePage;
+
+    private List<T> list;
 
-    private List<T> data;
 }

src/main/java/com/cnooc/expert/external/common/model/response/ApiBaseResult.java

 package com.cnooc.expert.external.common.model.response;
 
-import com.cnooc.expert.common.exception.GlobalErrorCodeConstants;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
 import java.io.Serializable;
 
-@Setter
-@Getter
+@Data
 public class ApiBaseResult<T> implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private Boolean success;
 
-    /**
-     * 响应码
-     */
-    private Integer httpCode;
+    private String errCode;
 
-    /**
-     * 响应消息
-     */
-    private String message;
+    private String errMessage;
 
-    /**
-     * 响应数据
-     */
-    private T result;
-
-
-    public ApiBaseResult(int httpCode, String message, T result) {
-        this.httpCode = httpCode;
-        this.message = message;
-        this.result = result;
-    }
-
-    /**
-     * 成功返回结果
-     */
-    public static <T> ApiBaseResult<T> successWithResult(T result) {
-        return new ApiBaseResult<>(GlobalErrorCodeConstants.SUCCESS.getCode(), GlobalErrorCodeConstants.SUCCESS.getMsg(), result);
-    }
-
-    /**
-     * 成功返回结果
-     */
-    public static <T> ApiBaseResult<T> success() {
-        return new ApiBaseResult<>(GlobalErrorCodeConstants.SUCCESS.getCode(), GlobalErrorCodeConstants.SUCCESS.getMsg(), null);
-    }
-
-    public static <T> ApiBaseResult<T> success(String message) {
-        return new ApiBaseResult<>(GlobalErrorCodeConstants.SUCCESS.getCode(), message, null);
-    }
-
-    /**
-     * 失败返回结果
-     */
-    public static <T> ApiBaseResult<T> error(String message) {
-        return new ApiBaseResult<>(GlobalErrorCodeConstants.SYSTEM_ERROR.getCode(), message, null);
-    }
-
-    /**
-     * 失败返回结果
-     */
-    public static <T> ApiBaseResult<T> error(int httpCode, String message) {
-        return new ApiBaseResult<>(httpCode, message, null);
-    }
-
-    /**
-     * 失败返回结果,并带有数据
-     */
-    public static <T> ApiBaseResult<T> errorWithResult(int httpCode, String message, T result) {
-
-        return new ApiBaseResult<>(httpCode, message, result);
-    }
-    // Getters and Setters
+    private T data;
 
 }

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

 package com.cnooc.expert.external.expert.api;
 
+import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
 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;
@@ -31,6 +32,9 @@ public interface ExpertServiceApi {
     @POST("/api/mini/zjfw/zggrxxgl/queryInfoForEdit")
     Call<ApiBaseResult<ExpertInfoGetApiResp>> getExpertInfo(@HeaderMap Map<String, Object> headers, @Body ExpertInfoGetApiReq req);
 
+    @POST("/api/mini/saas-expert/zjfw/zggrxxgl/updateAllInfo?type=1")
+    Call<ApiBaseResult<ExpertInfoGetApiResp>> updateExpertInfoApi(@HeaderMap Map<String, Object> headers, @Body ExpertInfoUpdateApiReq req);
+
     /* 字典、枚举 */
     @POST("/api/mini/common/nofilter/getEnum")
     Call<ApiBaseResult<List<CommonNofilterEnumGetApiResp>>> getCommonNofilterEnum(@HeaderMap Map<String, Object> headers, @Body CommonNofilterEnumGetApiReq req);

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

@@ -6,4 +6,7 @@ import lombok.Data;
 @Data
 @Builder
 public class ExpertInfoGetApiReq {
+
+    private String zhuanJiaGuid;
+
 }

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

 package com.cnooc.expert.external.expert.service;
 
+import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
 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;
@@ -43,6 +44,12 @@ public class ExpertServiceClient extends AbstractRetrofitManager {
         return this.getResponseBody(call, "getExpertInfo");
     }
 
+    public ApiBaseResult<ExpertInfoGetApiResp> updateExpertInfo(ExpertInfoUpdateApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ExpertInfoGetApiResp>> call = expertServiceApi.updateExpertInfoApi(headers, req);
+        return this.getResponseBody(call, "updateExpertInfo");
+    }
+
     public ApiBaseResult<List<CommonNofilterEnumGetApiResp>> getCommonNofilterEnum(CommonNofilterEnumGetApiReq req) {
         Map<String, Object> headers = super.getHeaders();
         Call<ApiBaseResult<List<CommonNofilterEnumGetApiResp>>> call = expertServiceApi.getCommonNofilterEnum(headers, req);

src/main/java/com/cnooc/expert/external/subject/model/request/PlatformCompanyPageApiReq.java

@@ -11,10 +11,19 @@ public class PlatformCompanyPageApiReq {
 
     private Integer pageSize;
 
+    // 业务类型 集合 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;
+
 }

src/main/java/com/cnooc/expert/external/subject/service/SubjectServiceClient.java

@@ -3,8 +3,6 @@ package com.cnooc.expert.external.subject.service;
 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;
-import com.cnooc.expert.external.portal.model.request.AgentNumGetApiReq;
-import com.cnooc.expert.external.portal.model.response.AgentNumGetApiResp;
 import com.cnooc.expert.external.subject.api.SubjectServiceApi;
 import com.cnooc.expert.external.subject.model.request.PlatformCompanyPageApiReq;
 import com.cnooc.expert.external.subject.model.response.PlatformCompanyPageApiResp;

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

 package com.cnooc.expert.service;
 
 import com.cnooc.expert.common.response.BasePageResp;
-import com.cnooc.expert.controller.expert.model.request.CompanyPageReq;
 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.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;
@@ -23,39 +23,43 @@ 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.CityTreeNodeResp;
-import com.cnooc.expert.controller.expert.model.response.CompanyPageResp;
-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.ExpertInfoGetResp;
 import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaApplyResp;
 import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaPageResp;
 import com.cnooc.expert.controller.expert.model.response.KaoShiPageResp;
-import com.cnooc.expert.controller.expert.model.response.NofilterListItemResp;
 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.PeiXunKeChengKeJiePageResp;
 import com.cnooc.expert.controller.expert.model.response.PeiXunPageResp;
 import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuByOwnerPageResp;
-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.QingJiaJinJiApplyResp;
 import com.cnooc.expert.controller.expert.model.response.QingJiaJinJiPageResp;
-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.WeiGuiPageResp;
 import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
 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;
+import com.cnooc.expert.external.expert.model.request.CommonJiTuanErJiDanWeiListApiReq;
+import com.cnooc.expert.external.expert.model.request.CommonNofilterEnumGetApiReq;
+import com.cnooc.expert.external.expert.model.request.DictByParentListApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieZhuanYePageApiReq;
+import com.cnooc.expert.external.expert.model.request.ExpertInfoGetApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
 import com.cnooc.expert.external.expert.model.request.ViolationExpertPageApiReq;
+import com.cnooc.expert.external.expert.model.request.XiangMuInfoByChouQuNumGetApiReq;
+import com.cnooc.expert.external.expert.model.response.CityTreeApiResp;
+import com.cnooc.expert.external.expert.model.response.CommonJiTuanErJiDanWeiListApiResp;
+import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiResp;
+import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
+import com.cnooc.expert.external.expert.model.response.DongJieZhuanYePageApiResp;
+import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
 import com.cnooc.expert.external.expert.model.response.ViolationExpertPageApiResp;
+import com.cnooc.expert.external.expert.model.response.XiangMuInfoByChouQuNumGetApiResp;
 import com.cnooc.expert.external.expert.service.ExpertServiceClient;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -70,792 +74,112 @@ import java.util.List;
 @Service
 public class ExpertService {
 
-    private ObjectMapper objectMapper;
-
     private final ExpertServiceClient expertServiceClient;
 
-    private int getTenantId() {
-        return 1;
-    }
-
     public ApproveBusinessIdGetResp getApproveBusinessId() {
-
         return ApproveBusinessIdGetResp.builder()
                 .businessId("1439982443434848257")
                 .build();
     }
 
-    public List<NofilterListItemResp> listDictNofilter(DictNofilterListReq req) {
-//        CommonNofilterEnumGetApiReq apiReq = CommonNofilterEnumGetApiReq.builder()
-//                .name("MinZu")
-//                .build();
-//        ApiBaseResult<List<CommonNofilterEnumGetApiResp>> apiResp = expertServiceClient.getCommonNofilterEnum(apiReq);
-//        return apiResp;
-
-        ArrayList<NofilterListItemResp> result = Lists.newArrayList(
-                NofilterListItemResp.builder()
-                        .id("1")
-                        .text("汉族")
-                        .build(),
-                NofilterListItemResp.builder()
-                        .id("2")
-                        .text("蒙古族")
-                        .build()
-        );
-
-        return result;
-    }
-
-    public List<SecondaryUnitListItemResp> listSecondaryUnit() {
-
-//        CommonJiTuanErJiDanWeiListApiReq apiReq = CommonJiTuanErJiDanWeiListApiReq.builder()
-//                .tenantId(this.getTenantId())
-//                .build();
-//        ApiBaseResult<List<CommonJiTuanErJiDanWeiListApiResp>> apiResp = expertServiceClient.listCommonJiTuanErJiDanWei(apiReq);
-//        return apiResp;
-
-        ArrayList<SecondaryUnitListItemResp> result = Lists.newArrayList(
-                SecondaryUnitListItemResp.builder()
-                        .code("1")
-                        .name("中海油研究总院有限责任公司")
-                        .build(),
-                SecondaryUnitListItemResp.builder()
-                        .code("2")
-                        .name("中海石油化工进出口有限公司")
-                        .build()
-        );
-
-        return result;
-    }
-
-    public List<DictListItemResp> listDict3() {
-//        DictByParentListApiReq apiReq = DictByParentListApiReq.builder()
-//                .parentGuid(3)
-//                .build();
-//        ApiBaseResult<List<DictByParentListApiResp>> apiResp = expertServiceClient.listDictByParent(apiReq);
-//        return apiResp;
-
-        ArrayList<DictListItemResp> result = Lists.newArrayList(
-                DictListItemResp.builder()
-                        .dictGuid("zhicheng-fuwu")
-                        .key("")
-                        .value("服务类")
-                        .typeName("职称")
-                        .build(),
-                DictListItemResp.builder()
-                        .dictGuid("zhicheng-shebei")
-                        .key("")
-                        .typeName("职称")
-                        .value("设备类")
-                        .build()
-        );
-
-        return result;
-    }
-
-    public List<DictListItemResp> listDict4() {
-//        DictByParentListApiReq apiReq = DictByParentListApiReq.builder()
-//                .parentGuid(4)
-//                .build();
-//        ApiBaseResult<List<DictByParentListApiResp>> apiResp = expertServiceClient.listDictByParent(apiReq);
-//        return apiResp;
-
-        ArrayList<DictListItemResp> result = Lists.newArrayList(
-                DictListItemResp.builder()
-                        .dictGuid("00fbea56-22b8-4f6c-842e-b1953f1bf079")
-                        .key("")
-                        .typeName("执业资格")
-                        .value("一级建造师（通信与广电工程）")
-                        .build(),
-                DictListItemResp.builder()
-                        .dictGuid("zhiyezige50")
-                        .key("")
-                        .typeName("执业资格")
-                        .value("其他")
-                        .build()
-        );
+    public List<CommonNofilterEnumGetApiResp> listDictNofilter(DictNofilterListReq req) {
+        CommonNofilterEnumGetApiReq apiReq = CommonNofilterEnumGetApiReq.builder()
+                .name("MinZu")
+                .build();
+        ApiBaseResult<List<CommonNofilterEnumGetApiResp>> apiResp = expertServiceClient.getCommonNofilterEnum(apiReq);
 
-        return result;
+        return apiResp.getData();
     }
 
-    public List<DictListItemResp> listDict5() {
-//        DictByParentListApiReq apiReq = DictByParentListApiReq.builder()
-//                .parentGuid(5)
-//                .build();
-//        ApiBaseResult<List<DictByParentListApiResp>> apiResp = expertServiceClient.listDictByParentGuid(apiReq);
-//        return apiResp;
-
-        ArrayList<DictListItemResp> result = Lists.newArrayList(
-                DictListItemResp.builder()
-                        .dictGuid("625ade01-00f0-4a1f-93d8-66d6b4c5a2b3")
-                        .key("")
-                        .typeName("学历")
-                        .value("博士研究生")
-                        .build(),
-                DictListItemResp.builder()
-                        .dictGuid("708932cc-794c-4d1a-b30e-a16afd364495")
-                        .key("")
-                        .typeName("学历")
-                        .value("硕士研究生")
-                        .build()
-        );
+    public List<CommonJiTuanErJiDanWeiListApiResp> listSecondaryUnit() {
+        CommonJiTuanErJiDanWeiListApiReq apiReq = CommonJiTuanErJiDanWeiListApiReq.builder()
+                .tenantId(UserInfoUtils.TENANT_ID)
+                .build();
+        ApiBaseResult<List<CommonJiTuanErJiDanWeiListApiResp>> apiResp = expertServiceClient.listCommonJiTuanErJiDanWei(apiReq);
 
-        return result;
+        return apiResp.getData();
     }
 
-    public List<DictListItemResp> listDict6() {
-//        DictByParentListApiReq apiReq = DictByParentListApiReq.builder()
-//                .parentGuid(6)
-//                .build();
-//        ApiBaseResult<List<DictByParentListApiResp>> apiResp = expertServiceClient.listDictByParentGuid(apiReq);
-//        return apiResp;
-
-        ArrayList<DictListItemResp> result = Lists.newArrayList(
-                DictListItemResp.builder()
-                        .dictGuid("28a0942a-84ad-4329-8be4-8196ed3164fe")
-                        .key("")
-                        .typeName("学位")
-                        .value("学士")
-                        .build(),
-                DictListItemResp.builder()
-                        .dictGuid("5676942a-84ad-4329-8be4-8196ed3164fe")
-                        .key("")
-                        .typeName("学位")
-                        .value("其他")
-                        .build()
-        );
-
-        return result;
+    public List<DictByParentListApiResp> listDict3() {
+        DictByParentListApiReq apiReq = DictByParentListApiReq.builder()
+                .parentGuid(3)
+                .build();
+        ApiBaseResult<List<DictByParentListApiResp>> apiResp = expertServiceClient.listDictByParent(apiReq);
+        return apiResp.getData();
     }
 
-    public List<DictListItemResp> listDict11() {
-//        DictByParentListApiReq apiReq = DictByParentListApiReq.builder()
-//                .parentGuid(11)
-//                .build();
-//        ApiBaseResult<List<DictByParentListApiResp>> apiResp = expertServiceClient.listDictByParent(apiReq);
-//        return apiResp;
-
-        ArrayList<DictListItemResp> result = Lists.newArrayList(
-                DictListItemResp.builder()
-                        .dictGuid("152cc498-5c44-4fbd-85b9-e6d3653e231b")
-                        .key("")
-                        .typeName("语种")
-                        .value("葡萄牙语")
-                        .build(),
-                DictListItemResp.builder()
-                        .dictGuid("ce221ce6-3649-4d0c-bfc9-10acc9d0595e")
-                        .key("")
-                        .typeName("语种")
-                        .value("英语")
-                        .build()
-        );
-
-        return result;
+    public List<DictByParentListApiResp> listDict4() {
+        DictByParentListApiReq apiReq = DictByParentListApiReq.builder()
+                .parentGuid(4)
+                .build();
+        ApiBaseResult<List<DictByParentListApiResp>> apiResp = expertServiceClient.listDictByParent(apiReq);
+        return apiResp.getData();
     }
 
-    public List<DictListItemResp> listDict12() {
-//        DictByParentListApiReq apiReq = DictByParentListApiReq.builder()
-//                .parentGuid(12)
-//                .build();
-//        ApiBaseResult<List<DictByParentListApiResp>> apiResp = expertServiceClient.listDictByParent(apiReq);
-//        return apiResp;
-
-        ArrayList<DictListItemResp> result = Lists.newArrayList(
-                DictListItemResp.builder()
-                        .dictGuid("1798a3ab-dac0-4f71-967d-1f9242327e98")
-                        .key("")
-                        .typeName("熟练程度")
-                        .value("了解")
-                        .build(),
-                DictListItemResp.builder()
-                        .dictGuid("529ebc4e-b0ff-4fa2-82fa-abf57e6da61f")
-                        .key("")
-                        .typeName("熟练程度")
-                        .value("熟悉")
-                        .build()
-        );
-
-        return result;
+    public List<DictByParentListApiResp> listDict5() {
+        DictByParentListApiReq apiReq = DictByParentListApiReq.builder()
+                .parentGuid(5)
+                .build();
+        ApiBaseResult<List<DictByParentListApiResp>> apiResp = expertServiceClient.listDictByParentGuid(apiReq);
+        return apiResp.getData();
     }
 
-    public List<CityTreeNodeResp> treeCity() {
-//        CityTreeApiReq apiReq = CityTreeApiReq.builder()
-//                .professionLevel(0)
-//                .build();
-//        ApiBaseResult<List<CityTreeApiResp>> apiResp = expertServiceClient.treeCity(apiReq);
-//        return apiResp;
-
-        List<CityTreeNodeResp> level3s = Lists.newArrayList(
-                CityTreeNodeResp.builder()
-                        .dictGuid("1005160904502808576")
-                        .value("东城区")
-                        .parentGuid("1005160904985153536")
-                        .childrenDicts(Collections.emptyList())
-                        .build(),
-                CityTreeNodeResp.builder()
-                        .dictGuid("1005160904817381376")
-                        .value("西城区")
-                        .parentGuid("1005160904985153536")
-                        .childrenDicts(Collections.emptyList())
-                        .build()
-        );
-        List<CityTreeNodeResp> level2s = Lists.newArrayList(
-                CityTreeNodeResp.builder()
-                        .dictGuid("1005160904985153536")
-                        .value("北京市")
-                        .parentGuid("1005160905169702912")
-                        .childrenDicts(level3s)
-                        .build()
-        );
+    public List<DictByParentListApiResp> listDict6() {
+        DictByParentListApiReq apiReq = DictByParentListApiReq.builder()
+                .parentGuid(6)
+                .build();
+        ApiBaseResult<List<DictByParentListApiResp>> apiResp = expertServiceClient.listDictByParentGuid(apiReq);
+        return apiResp.getData();
 
-        List<CityTreeNodeResp> level1s = Lists.newArrayList(
-                CityTreeNodeResp.builder()
-                        .dictGuid("1005160905169702912")
-                        .value("北京市")
-                        .parentGuid("0")
-                        .childrenDicts(level2s)
-                        .build()
-        );
-        return level1s;
     }
 
-    public BasePageResp<Object> pageCompany(CompanyPageReq req) {
-        List<Object> data = Lists.newArrayList(
-                CompanyPageResp.builder()
-                        .id("1420053958893662209")
-                        .subjectId("1420053958767833088")
-                        .subjectName("江苏瑞尔姆电器安安有限公司")
-                        .businessType(5)
-                        .creditCode("91320577MA4Y6K7H0F")
-                        .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.builder()
-                .current(1)
-                .pages(1)
-                .total(2)
-                .data(data)
+    public List<DictByParentListApiResp> listDict11() {
+        DictByParentListApiReq apiReq = DictByParentListApiReq.builder()
+                .parentGuid(11)
                 .build();
+        ApiBaseResult<List<DictByParentListApiResp>> apiResp = expertServiceClient.listDictByParent(apiReq);
+        return apiResp.getData();
     }
 
-    public ExpertInfoGetResp getExpertInfo(ExpertInfoGetReq req) {
-
-        ExpertInfoGetResp.SysShenHeJieGuo sysShenHeJieGuo = ExpertInfoGetResp.SysShenHeJieGuo.builder()
-                .bianGengXuHao("")
-                .businessId("1364891101101371393")
-                .createTime(1745457005237L)
-                .createTimeText("2025-04-24 09:10:05")
-                .creatorName("物装中心十八")
-                .currentNode("")
-                .daiShenRenGuids("")
-                .daiShenRenNames("")
-                .isFinish(true)
-                .mobile("15900000018")
-                .modifierName("物装中心十八")
-                .modifyTime(1747115196797L)
-                .modifyTimeText("2025-05-13 13:46:36")
-                .nengCheHui(false)
-                .photoGuid("")
-                .remark("")
-                .sequence("")
-                .shenFenZheng("15263219990128571X")
-                .shenHeRenGuid("")
-                .shenPiBuMenGuid("")
-                .shenPiBuMenName("")
-                .shenPiJiLuGuid("1402705b-0424-4f39-913c-7793b7b9f5d1")
-                .shenPiRen("")
-                .shenPiShiJian("")
-                .shenPiYiJian("")
-                .shenPiZhuangTai(20)
-                .shenQingLeiXing(105)
-                .shiFouZhuanJiao(false)
-                .shiXiangGuid("")
-                .shiXiangName("")
-                .shiXiangType("")
-                .shouLiRen("")
-                .shouLiTime(null)
-                .shouLiTimeText(null)
-                .shouLiZhuanTai(10)
-                .tiJiaoRenGuid("")
-                .tiJiaoRenName("")
-                .tiJiaoTime(null)
-                .tiJiaoTimeText("")
-                .tuiKuYuanYin("")
-                .workFlowBusinessId("1364891101101371393")
-                .workFlowBusinessIdNew(null)
-                .xiaJiShenHeRenGuid("")
-                .xiaJiShenHeRenName("")
-                .xiangMuGuid("")
-                .zhuanJiaGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                .zhuanJiaShiXiangGuid("cc9d2be2-07a8-4d59-8c61-5c0854ae2bc2")
-                .build();
-
-        List<ExpertInfoGetResp.Zc> zcList = Lists.newArrayList(
-                ExpertInfoGetResp.Zc.builder()
-                        .base64ZcFile("")
-                        .base64ZcFileName("")
-                        .createTime(1745393470354L)
-                        .createTimeText("2025-04-23 15:31:10")
-                        .creatorName("物装中心十八")
-                        .dictGuid("")
-                        .modifierName("物装中心十八")
-                        .modifyTime(1747115258721L)
-                        .modifyTimeText("2025-05-20 16:25:58")
-                        .pingDingTime(1745393470354L)
-                        .pingDingTimeText("2025-04-23 15:31:10")
-                        .zcFileGuid("1420053958893662209")
-                        .zhiChengGuid("28882bfa-afb4-425b-b50e-945a545fdd82")
-                        .zhiChengName("不限")
-                        .zhiChengZhuanYe("12")
-                        .zhuanJiaGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                        .zhuanJiaShiXiangGuid("1402705b-0424-4f39-913c-7793b7b9f5d1")
-                        .ziXinXiGuid("")
-                        .build()
-        );
-
-        List<ExpertInfoGetResp.XueLi> xueLiList = Lists.newArrayList(
-                ExpertInfoGetResp.XueLi.builder()
-                        .biYeTime(1745164800000L)
-                        .biYeYuanXiao("21")
-                        .biYeYuanXiao("")
-                        .biYeYuanXiaoGuid("")
-                        .byzFileGuid("")
-                        .createTime(null)
-                        .creatorGuid("1171528722513702912")
-                        .creatorName("物装中心十八")
-                        .creatorTime(null)
-                        .isImport(false)
-                        .isZuiGaoXueLi(true)
-                        .isZuiGaoXueWei(true)
-                        .modifier("")
-                        .modifierName("")
-                        .modifyTime(1745393482493L)
-                        .suoShuZhaoBiaoDaiLi("")
-                        .xueLiBh("")
-                        .xueLiDictGuid("28a0942a-84ad-4329-8be4-8196ed3164fe")
-                        .xueLiGuid("b471705b-205a-4dee-8f62-ad7d7a7c28ed")
-                        .xueLiName("博士研究生")
-                        .xueLiZhuanYe("12")
-                        .xueLiZhuanYeBh("")
-                        .xueLiZhuanYeGuid("")
-                        .xueWeiBh("")
-                        .xueWeiDictGuid("84dab32c-88e2-4ba1-ae74-a45b7bf75b5e")
-                        .xueWeiName("博士后")
-                        .xwzFileGuid("")
-                        .zhuanJiaGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                        .zhuanJiaShiXiangGuid("1402705b-0424-4f39-913c-7793b7b9f5d1")
-                        .ziXinXiGuid("")
-                        .build()
-        );
-
-        List<ExpertInfoGetResp.Ps> psList = Lists.newArrayList(
-                ExpertInfoGetResp.Ps.builder()
-                        .createTime(1745456982639L)
-                        .creatorGuid("-1")
-                        .creatorName("系统生成")
-                        .modifierGuid("")
-                        .modifierName("")
-                        .modifyTime(null)
-                        .pinQiEndTime(1840064982638L)
-                        .pinQiEndTimeText("2028-04-23")
-                        .pinQiStartTime(1745424000000L)
-                        .pinQiStartTimeText("2025-04-24")
-                        .pinShuFuJianGuid("1364891041086844929")
-                        .pingShuGuid("7f903e09-e86a-4e8e-a7d0-1b2355fdf0d7")
-                        .zhuanJiaGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                        .zhuanJiaQinRenQi(3)
-                        .build()
-        );
-
-        List<ExpertInfoGetResp.Jl> jlList = Lists.newArrayList(
-                ExpertInfoGetResp.Jl.builder()
-                        .buMenName("12")
-                        .createTime(1745393470354L)
-                        .createTimeText("2025-04-23 15:31:10")
-                        .creatorName("物装中心十八")
-                        .danWeiBH("")
-                        .danWeiName("12")
-                        .gongZuoMiaoShu("")
-                        .jingLiGuid("b98559d9-35c7-4569-996f-8885923f503d")
-                        .liZhiTime(1745337600000L)
-                        .liZhiTimeText("2025-04-23 00:00:00")
-                        .modifierName("物装中心十八")
-                        .modifyTime(1747115258721L)
-                        .modifyTimeText("2025-05-13 13:47:38")
-                        .riZhiTime(1744646400000L)
-                        .riZhiTimeText("2025-04-15 00:00:00")
-                        .shenFenZheng("")
-                        .tenantId(892422091105296400L)
-                        .tenantName("")
-                        .zhiWu("12")
-                        .zhuanJiaGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                        .zhuanJiaShiXiangGuid("1402705b-0424-4f39-913c-7793b7b9f5d1")
-                        .ziXinXiGuid("")
-                        .build()
-        );
-
-        List<ExpertInfoGetResp.Pb> pbList = Lists.newArrayList(
-                ExpertInfoGetResp.Pb.builder()
-                        .createTime(1745393470354L)
-                        .createTimeText("2025-04-23 15:31:10")
-                        .creatorName("物装中心十八")
-                        .dongJieEndTime(null)
-                        .dongJieFuJianGuid("")
-                        .dongJieOperator("")
-                        .dongJieReason("")
-                        .dongJieSatrtTime(null)
-                        .dongJieTime(null)
-                        .isPrimary(true)
-                        .isScarce(false)
-                        .jieDongFuJianGuid("")
-                        .jieDongOperator("")
-                        .jieDongReason("")
-                        .jieDongTime(null)
-                        .modifierName("物装中心十八")
-                        .modifyTime(1747115258721L)
-                        .modifyTimeText("2025-05-13 13:47:38")
-                        .parentGuid("0")
-                        .path("$$$001$$$")
-                        .pingBiaoZhuanYeGuid("22d508e7-7776-4b4a-8c97-f12985cdc251")
-                        .professionLevel(1)
-                        .zhuanJiaGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                        .zhuanJiaLeiBie(null)
-                        .zhuanJiaShiXiangGuid("1402705b-0424-4f39-913c-7793b7b9f5d1")
-                        .zhuanYeBH("001")
-                        .zhuanYeGuid("4648caf4-5084-44cd-9120-d18d20950e30")
-                        .zhuanYeJiBie("10")
-                        .zhuanYeName("拟真环境测试专业勿动")
-                        .zhuanYeNianXian(12)
-                        .zhuanYeStatus(10)
-                        .zhuanYeXiangGuanJingLi("12")
-                        .ziXinXiGuid("")
-                        .build()
-        );
-
-        ExpertInfoGetResp.SysShenHeJieGuo rukuShenHeJieGuo = ExpertInfoGetResp.SysShenHeJieGuo.builder()
-                .bianGengXuHao("")
-                .businessId("1371846169935306752")
-                .createTime(1747115219009L)
-                .createTimeText("2025-05-13 13:46:59")
-                .creatorName("物装中心十八")
-                .currentNode("")
-                .daiShenRenGuids("")
-                .daiShenRenNames("")
-                .isFinish(true)
-                .mobile("15900000018")
-                .modifierName("物装中心十八")
-                .modifyTime(1747115261126L)
-                .modifyTimeText("2025-05-13 13:47:41")
-                .nengCheHui(false)
-                .photoGuid("")
-                .remark("")
-                .sequence("")
-                .shenFenZheng("15263219990128571X")
-                .shenHeRenGuid("")
-                .shenPiBuMenGuid("")
-                .shenPiBuMenName("")
-                .shenPiJiLuGuid("60e5723c-6b1c-4022-b34a-ed595d9d6f37")
-                .shenPiRen("")
-                .shenPiShiJian("")
-                .shenPiYiJian("")
-                .shenPiZhuangTai(50)
-                .shenQingLeiXing(101)
-                .shiFouZhuanJiao(false)
-                .shiXiangGuid("")
-                .shiXiangName("")
-                .shiXiangType("")
-                .shouLiRen("")
-                .shouLiTime(null)
-                .shouLiTimeText(null)
-                .shouLiZhuanTai(10)
-                .tiJiaoRenGuid("1171528722513702912")
-                .tiJiaoRenName("物装中心十八")
-                .tiJiaoTime(null)
-                .tiJiaoTimeText("")
-                .tuiKuYuanYin("")
-                .workFlowBusinessId("1364891101101371393")
-                .workFlowBusinessIdNew("1364617369199915009")
-                .xiaJiShenHeRenGuid("")
-                .xiaJiShenHeRenName("")
-                .xiangMuGuid("")
-                .zhuanJiaGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                .zhuanJiaShiXiangGuid("1402705b-0424-4f39-913c-7793b7b9f5d1")
+    public List<DictByParentListApiResp> listDict12() {
+        DictByParentListApiReq apiReq = DictByParentListApiReq.builder()
+                .parentGuid(12)
                 .build();
+        ApiBaseResult<List<DictByParentListApiResp>> apiResp = expertServiceClient.listDictByParent(apiReq);
+        return apiResp.getData();
+    }
 
-        List<ExpertInfoGetResp.Hb> hbList = Lists.newArrayList(
-                ExpertInfoGetResp.Hb.builder()
-                        .createTime(1745393470354L)
-                        .createTimeText("2025-04-23 15:31:10")
-                        .creatorName("物装中心十八")
-                        .danWeiBH("")
-                        .danWeiName("")
-                        .huiBiGuid("03ed2b07-bdf3-4a4d-97b3-bd00050ae634")
-                        .huiBiMiaoShu("12")
-                        .huiBiMiaoShuStr("")
-                        .modifierName("物装中心十八")
-                        .modifyTime(1747115258721L)
-                        .modifyTimeText("2025-05-13 13:47:38")
-                        .zhuanJiaGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                        .zhuanJiaShiXiangGuid("1402705b-0424-4f39-913c-7793b7b9f5d1")
-                        .ziXinXiGuid("")
-                        .build()
-        );
-
-        ExpertInfoGetResp.Bean bean = ExpertInfoGetResp.Bean.builder()
-                .adAccount("wzzx18")
-                .age(26)
-                .authPassWithImport("")
-                .auths(null)
-                .base64FanMianFuJian("")
-                .base64FanMianFuJianName("")
-                .base64FuJian("")
-                .base64FuJianName("")
-                .base64Photo("")
-                .base64PhotoName("")
-                .baseAuths(null)
-                .baseCode("000099")
-                .baseGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                .baseMobile("15900000018")
-                .baseName("物装中心十八")
-                .baseSFZH("15263219990128571X")
-                .baseShenPiZhuangTai("30")
-                .baseZhuangTai("10")
-                .biYeYuanXiao("")
-                .bianGengXuHao(0)
-                .birthday("1999年01月")
-                .buNengRuXuanQingKong("")
-                .byzFileGuid("")
-                .canYuXiangMu("")
-                .city("")
-                .createTime(1745391231935L)
-                .createTimeText("2025-04-23 14:53:51")
-                .creatorName("中国海洋石油集团有限公司")
-                .danRenQiTaZhuanJia("")
-                .danweiGuid("")
-                .department("")
-                .domainName("")
-                .email("1590000021@cnooc.com.cn")
-                .fanMianFuJianGuids("")
-                .fax("")
-                .fuJianGuids("")
-                .gongZuoBeiZhu("")
-                .gongZuoDanWei("中化建国际招标有限责任公司天津分公司")
-                .gongZuoDanWeiBH("")
-                .gongZuoDanWeiDiZhi("12")
-                .gongZuoPhone("")
-                .gongZuoPost("")
-                .gongZuoTime(null)
-                .gongZuoZhiWu("12")
-                .gongZuoZhuanYeName("")
-                .gongZuoZhuanYeYears("")
-                .gongZuoZhuangTai(1)
-                .graduationDate("")
-                .hasLianJieChuLiYiJian(false)
-                .huoJiangQingKuang("")
-                .inGroup(false)
-                .isHasLianJieChuLiYiJian(false)
-                .isQualified(true)
-                .isReadRuKuPromise(true)
-                .isSenior(false)
-                .isZhiYeZiGe(false)
-                .jgdmFileGuid("")
-                .jiTuanErJiDanWeiCode("")
-                .jiTuanErJiDanWeiName("中国海洋石油集团有限公司")
-                .jiaTingDiZhi("")
-                .jiaTingPhone("15900000011")
-                .jiaTingPost("")
-                .jianKangZhuangKuang("")
-                .jinJiLianXiRenGuid("")
-                .jinJiLianXiRenName("")
-                .jinJiLianXiRenPhone("")
-                .kaoShiFenShu(null)
-                .leiJiFenZhi(0)
-                .leiJiZhanTingTime(null)
-                .lianJieYiJianShuFuJianGuid("")
-                .lsFuJian(null)
-                .minZu("")
-                .minZuText("")
-                .mobile("15900000018")
-                .mobileGJQHText("15900000018")
-                .mobileGuoJiQuHao("")
-                .modifierName("杨斌")
-                .modifyTime(1755689152526L)
-                .modifyTimeText("2025-08-20 19:25:52")
-                .needTest(false)
-                .photoGuid("")
-                .pingBiaoChangZhuDiQu("110101")
-                .pingBiaoChangZhuDiQuName("")
-                .pingBiaoIsYingJi(false)
-                .pingBiaoQiTaDiQu("")
-                .pingBiaoTuiJianLX(null)
-                .pingBiaoYingJiDiQu("")
-                .pinqiEndTime(1840064982638L)
-                .pinqiStartTime(1745424000000L)
-                .professionLevel("")
-                .qiTaLianXiFangShi("")
-                .qualified(true)
-                .readRuKuPromise(true)
-                .readRuKuPromiseTime(1745391797759L)
-                .ruKuZhuangTai(900)
-                .senior(false)
-                .sex(true)
-                .sfzFileGuid("")
-                .sfzFuJians(null)
-                .shenFenZheng("15263219990128571X")
-                .shenHeEndTime(null)
-                .shenHeStartTime(null)
-                .shenPiRen("")
-                .shenPiShiJian(null)
-                .shenPiShiJianText("")
-                .shenPiYiJian("")
-                .shenPiZhuangTai(30)
-                .shenQingEndTime(null)
-                .shenQingLeiXing(101)
-                .shenQingStartTime(null)
-                .shiFouYiFaZhuanJia(false)
-                .subjectCode("91120116MA829PHX9X")
-                .subjectId("1355213128952123392")
-                .subjectName("中化建国际招标有限责任公司天津分公司")
-                .subjectType(1)
-                .suoShuBuMeng("12")
-                .suoShuDanWeiName("中国海洋石油集团有限公司")
-                .suoShuHangYe("")
-                .suoShuZhaoBiaoDaiLi("91110000710932216U")
-                .suoZaiQitaZhuanJiaKu("")
-                .tenantId("892422091105296400")
-                .tenantId_("")
-                .tenantName("")
-                .tiJiaoTime(null)
-                .tiJiaoTimeText("")
-                .tuiKuYuanYin("")
-                .waiYuChengDu("")
-                .xueLi("")
-                .xueLiTxt("")
-                .xueLiZhuanYe("")
-                .xueWei("")
-                .xueWeiTxt("")
-                .xueWeiZhuanYe("")
-                .yinHang("12121")
-                .yinHang1("")
-                .yinHangKa("123131311212")
-                .yinHangKaFileGuid("")
-                .yingJiZhuangTai(null)
-                .zhangHao("")
-                .zhaoBiaoDanWeiBianHao("")
-                .zhaoBiaoDanweiMingChen("")
-                .zhengJianType("0")
-                .zhengZhiMianMao("")
-                .zhiYeZiGe(false)
-                .zhuanJiaCode("000099")
-                .zhuanJiaFenJi(30)
-                .zhuanJiaFenLei(2)
-                .zhuanJiaGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                .zhuanJiaName("物装中心十八")
-                .zhuanJiaShiXiangGuid("1402705b-0424-4f39-913c-7793b7b9f5d1")
-                .zhuanJiaSourceType(1)
-                .zhuanJiaSuoZaiDiGuids("110000110100110101")
-                .zhuanJiaSuoZaiDiNames("北京市北京市东城区")
-                .zhuanJiaType(null)
-                .zhuanJiaZhuangTai(10)
-                .zhuanJiaZiZhiTiaoJian("")
-                .zhuanJiaZongHeBianHao("PT000099")
-                .zhuanYeJingLi("")
-                .zhuanYeTeChang("")
-                .zhuanjiaQinRenQi(3)
-                .ziDongZanTingEndTime(null)
-                .ziDongZanTingStartTime(null)
+    public List<CityTreeApiResp> treeCity() {
+        CityTreeApiReq apiReq = CityTreeApiReq.builder()
+                .professionLevel(0)
                 .build();
+        ApiBaseResult<List<CityTreeApiResp>> apiResp = expertServiceClient.treeCity(apiReq);
+        return apiResp.getData();
+    }
 
-        List<ExpertInfoGetResp.FuJian> fuJianList = Lists.newArrayList(
-                ExpertInfoGetResp.FuJian.builder()
-                        .createTime(1745393470744L)
-                        .creatorGuid("1171528722513702912")
-                        .creatorName("物装中心十八")
-                        .downloadUrl("https://purb.m-bid.cnooc.com.cn/bid-mimic-cggl/892422091105296385/2/2025/4/23/1364617976113278976/%E4%BF%9D%E8%AF%81%E9%87%91%E3%80%81%E6%9C%8D%E5%8A%A1%E8%B4%B91.0.7.20250415.pdf?response-content-disposition=attachment%3Bfilename%3D%25E4%25BF%259D%25E8%25AF%2581%25E9%2587%2591%25E3%2580%2581%25E6%259C%258D%25E5%258A%25A1%25E8%25B4%25B91.0.7.20250415.pdf&AWSAccessKeyId=5T0WWU7JAUDUXJ2EG1FB&Expires=1745393679&Signature=N26QXpJBR7EFBi95KCnj6A1gg2w%3D")
-                        .feiQiRenGuid("")
-                        .feiQiRenName("")
-                        .feiQiTime(null)
-                        .fileDescription("")
-                        .fileName("保证金、服务费1.0.7.20250415.pdf")
-                        .fileSize(650921)
-                        .fileType(4)
-                        .fuJianGuid("1364617976113278976")
-                        .isFeiQi(false)
-                        .modifierGuid("")
-                        .modifierName("")
-                        .modifyTime(1745393482507L)
-                        .shenHeRenGuid("")
-                        .shenHeRenName("")
-                        .shenHeStatus(30)
-                        .shenHeTime(null)
-                        .shenHeYiJian("")
-                        .tiJiaoTime(1745391879721L)
-                        .zhuanJiaFuJianGuid("1e2b5d5d-7b3c-4f26-87f0-2c1f45daa982")
-                        .zhuanJiaGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                        .zhuanJiaShiXiangGuid("1402705b-0424-4f39-913c-7793b7b9f5d1")
-                        .ziXinXiGuid("")
-                        .build()
-        );
-
-        ExpertInfoGetResp result = ExpertInfoGetResp.builder()
-                .businessId("1364891101101371393")
-                .bean(bean)
-                .zcList(zcList)
-                .sysShenHeJieGuo(sysShenHeJieGuo)
-                .xueLiList(xueLiList)
-                .zgList(Collections.emptyList())
-                .psList(psList)
-                .jlList(jlList)
-                .pbList(pbList)
-                .rukuShenHeJieGuo(rukuShenHeJieGuo)
-                .hbList(hbList)
-                .pinQiStartTime("2028-04-23")
-                .pinQiEndTime("2028-04-23")
-                .languageList(Collections.emptyList())
-                .fuJianList(fuJianList)
+    public ExpertInfoGetApiResp getExpertInfo(ExpertInfoGetReq req) {
+        ExpertInfoGetApiReq apiReq = ExpertInfoGetApiReq.builder()
+                .zhuanJiaGuid(UserInfoUtils.getExpertInfo().getZhuanJiaGuid())
                 .build();
-
-        return result;
+        ApiBaseResult<ExpertInfoGetApiResp> apiResp = expertServiceClient.getExpertInfo(apiReq);
+        return apiResp.getData();
     }
 
-    public PingBiaoXiangMuInfoGetByChouQuMaResp getPingBiaoXiangMuInfoByChouQuMa(PingBiaoXiangMuInfoGetByChouQuMaReq req) {
-//        XiangMuInfoByChouQuNumGetApiReq apiReq = XiangMuInfoByChouQuNumGetApiReq.builder()
-//                .chouQuNum(req.getChouQuNum())
-//                .build();
-//        ApiBaseResult<XiangMuInfoByChouQuNumGetApiResp> apiResp = expertServiceClient.getXiangMuInfoByChouQuNum(apiReq);
-//        return apiResp;
+    public ExpertInfoGetApiResp updateExpetInfo(ExpertInfoUpdateApiReq req) {
+        ApiBaseResult<ExpertInfoGetApiResp> apiResp = expertServiceClient.updateExpertInfo(req);
+        return apiResp.getData();
+    }
 
-        PingBiaoXiangMuInfoGetByChouQuMaResp result = PingBiaoXiangMuInfoGetByChouQuMaResp.builder()
-                .chouQuQingKuangGuid("5e2f90be-b8ad-4a8e-931d-cdaae5f1c118")
-                .xiangMuNo("XCGSQ2025091236")
-                .xiangMuName("0923采购申请资格审查")
-                .qingJiaTime(null)
-                .chouQuRenWuGuid("6923480b-22ab-4b0d-b7d3-95450d7fed82")
-                .pingBiaoStartTime(1758609816544L)
-                .zhuanJiaName("物装中心十七")
-                .shenHeStatus(null)
-                .pingBiaoAddress("北京市京信大厦28层")
-                .status(10)
+    public XiangMuInfoByChouQuNumGetApiResp getPingBiaoXiangMuInfoByChouQuMa(PingBiaoXiangMuInfoGetByChouQuMaReq req) {
+        XiangMuInfoByChouQuNumGetApiReq apiReq = XiangMuInfoByChouQuNumGetApiReq.builder()
+                .chouQuNum(req.getChouQuNum())
                 .build();
-
-        return result;
+        ApiBaseResult<XiangMuInfoByChouQuNumGetApiResp> apiResp = expertServiceClient.getXiangMuInfoByChouQuNum(apiReq);
+        return apiResp.getData();
     }
 
-    public BasePageResp<Object> pageJinJiQingJia(QingJiaJinJiPageReq req) {
-        List<Object> data = Lists.newArrayList(
+    public BasePageResp<QingJiaJinJiPageResp> pageJinJiQingJia(QingJiaJinJiPageReq req) {
+        List<QingJiaJinJiPageResp> data = Lists.newArrayList(
                 QingJiaJinJiPageResp.builder()
                         .chouQuNum("202509236391")
                         .jinJiQingJiaGuid("800abddb-e866-439b-93e6-2ac3f9dee3c8")
@@ -870,10 +194,9 @@ public class ExpertService {
                         .shenHeStatus(50)
                         .pingBiaoEndTime(1758624216544L)
                         .build()
-
         );
 
-        return BasePageResp.builder()
+        return BasePageResp.<QingJiaJinJiPageResp>builder()
                 .current(1)
                 .pages(1)
                 .total(1)
@@ -881,7 +204,7 @@ public class ExpertService {
                 .build();
     }
 
-    public BasePageResp<Object> pagePingBiaoXiangMu(PingBiaoXiangMuPageReq req) {
+    public BasePageResp<PingBiaoXiangMuPageResp> pagePingBiaoXiangMu(PingBiaoXiangMuPageReq req) {
 
         PingBiaoXiangMuPageResp.ZjcqChouQuQingKuang cqqk = PingBiaoXiangMuPageResp.ZjcqChouQuQingKuang.builder()
                 .adAccount("")
@@ -1064,9 +387,9 @@ public class ExpertService {
                 .dictPingBiaoZhuanYe(dictPingBiaoZhuanYe)
                 .build();
 
-        List<Object> data = Lists.newArrayList(item);
+        List<PingBiaoXiangMuPageResp> data = Lists.newArrayList(item);
 
-        return BasePageResp.builder()
+        return BasePageResp.<PingBiaoXiangMuPageResp>builder()
                 .current(1)
                 .pages(1)
                 .total(1)
@@ -1146,8 +469,8 @@ public class ExpertService {
                 .build();
     }
 
-    public BasePageResp<Object> pageGeRenXiuJia(GeRenXiuJiaPageReq req) {
-        List<Object> data = Lists.newArrayList(
+    public BasePageResp<GeRenXiuJiaPageResp> pageGeRenXiuJia(GeRenXiuJiaPageReq req) {
+        List<GeRenXiuJiaPageResp> data = Lists.newArrayList(
                 GeRenXiuJiaPageResp.builder()
                         .createTime(1761198859239L)
                         .createTimeText("2025-10-23 13:54:19")
@@ -1184,7 +507,7 @@ public class ExpertService {
 
         );
 
-        return BasePageResp.builder()
+        return BasePageResp.<GeRenXiuJiaPageResp>builder()
                 .current(1)
                 .pages(1)
                 .total(1)
@@ -1229,7 +552,7 @@ public class ExpertService {
                 .build();
     }
 
-    public BasePageResp<Object> pagePingBiaoXiangmuByOwner(PingBiaoXiangMuByOwnerPageReq req) {
+    public BasePageResp<PingBiaoXiangMuByOwnerPageResp> pagePingBiaoXiangmuByOwner(PingBiaoXiangMuByOwnerPageReq req) {
 
         PingBiaoXiangMuByOwnerPageResp.ZjcqChouQuQingKuang cqqk = PingBiaoXiangMuByOwnerPageResp.ZjcqChouQuQingKuang.builder()
                 .adAccount("")
@@ -1416,9 +739,9 @@ public class ExpertService {
                 .dictPingBiaoZhuanYe(dictPingBiaoZhuanYe)
                 .build();
 
-        List<Object> data = Lists.newArrayList(item);
+        List<PingBiaoXiangMuByOwnerPageResp> data = Lists.newArrayList(item);
 
-        return BasePageResp.builder()
+        return BasePageResp.<PingBiaoXiangMuByOwnerPageResp>builder()
                 .current(1)
                 .pages(1)
                 .total(1)
@@ -1426,90 +749,37 @@ public class ExpertService {
                 .build();
     }
 
-    public BasePageResp<DongJiePageResp> pageDongJie(DongJiePageReq req) {
-//        DongJieZhuanYePageApiReq apiReq = DongJieZhuanYePageApiReq.builder()
-//                .page(req.getPageNo())
-//                .rows(req.getPageSize())
-//                .zhuanJiaGuid(UserInfoUtils.getExpertInfo().getZhuanJiaGuid())
-//                .build();
-//        ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>> apiResp = expertServiceClient.pageDongJieZhuanYeApi(apiReq);
-//        return apiResp;
-
-        List<DongJiePageResp> list = Lists.newArrayList(
-                DongJiePageResp.builder()
-                        .jiTuanErJiDanWeiName("中化建国际招标有限责任公司")
-                        .adAccount("ex_zhaoning2")
-                        .shenFenZheng("152527199201151000")
-                        .zhuanYeName("测试A00001")
-                        .zhuanYeBH("A00001")
-                        .jieDongTime(null)
-                        .dongJieFuJianGuid("")
-                        .jieDongFuJianGuid("")
-                        .dongJieReason("")
-                        .dongJieTime(null)
-                        .gongZuoDanWei("中化建国际招标有限责任公司天津分公司")
-                        .zhuanJiaGuid("5a479be1-513f-436a-92e7-15cd2d5fae02")
-                        .pingBiaoZhuanYeGuid("2d281ffd-3233-484c-8876-88ed32bd3bba")
-                        .isPrimary(false)
-                        .zhuanJiaCode("000098")
-                        .zhuanYeStatus("10")
-                        .jieDongReason("")
-                        .zhuanJiaName("赵宁")
-                        .build()
-        );
+    public BasePageResp<DongJieZhuanYePageApiResp> pageDongJie(DongJiePageReq req) {
+        DongJieZhuanYePageApiReq apiReq = DongJieZhuanYePageApiReq.builder()
+                .page(req.getPageNo())
+                .rows(req.getPageSize())
+                .zhuanJiaGuid(UserInfoUtils.getExpertInfo().getZhuanJiaGuid())
+                .build();
+        ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>> apiResp = expertServiceClient.pageDongJieZhuanYeApi(apiReq);
 
-        return BasePageResp.<DongJiePageResp>builder()
-                .current(1)
-                .pages(1)
-                .total(1)
-                .data(list)
+        ApiBasePageResp<DongJieZhuanYePageApiResp> pageResp = apiResp.getData();
+
+        return BasePageResp.<DongJieZhuanYePageApiResp>builder()
+                .current(pageResp.getPageNo())
+                .pages(pageResp.getPageSize())
+                .total(pageResp.getTotalCount())
+                .data(pageResp.getList())
                 .build();
     }
 
 
-    public BasePageResp<WeiGuiPageResp> pageWeiGuiList(WeiGuiJiLuPageReq req) {
+    public BasePageResp<ViolationExpertPageApiResp> pageWeiGuiList(WeiGuiJiLuPageReq req) {
+        ViolationExpertPageApiReq apiReq = ViolationExpertPageApiReq.builder()
+                .build();
+        ApiBaseResult<ApiBasePageResp<ViolationExpertPageApiResp>> apiResp = expertServiceClient.pageViolationExpert(apiReq);
 
-//        ViolationExpertPageApiReq  apiReq = ViolationExpertPageApiReq.builder()
-//                .build();
-//        ApiBaseResult<ApiBasePageResp<ViolationExpertPageApiResp>> apiResp = expertServiceClient.pageViolationExpert(apiReq);
-//        return apiResp;
+        ApiBasePageResp<ViolationExpertPageApiResp> pageResp = apiResp.getData();
 
-        List<WeiGuiPageResp> list = Lists.newArrayList(
-                WeiGuiPageResp.builder()
-                        .bidSectionCode("24-CNCCC-GC-GK-5142/01")
-                        .bidSectionName("c测试可视化待办")
-                        .businessId("1241043784526479360")
-                        .chouquRenwuGuid("07072824-728b-417c-add9-17f94f746e10")
-                        .chuliEndTime(1723910399999L)
-                        .chuliPeriod("")
-                        .chuliStartTime(1715929495719L)
-                        .fujianGuid("")
-                        .serialNum(null)
-                        .shenFenZheng("")
-                        .shenheStatus(50)
-                        .shenheStatusName("")
-                        .submitTime(1715929400628L)
-                        .submitTimeStr("")
-                        .submiter("物装中心十四")
-                        .weiguiChuliShichang(3)
-                        .weiguiChuliShichangStr("")
-                        .weiguiReason("4c1102e5-bf31-491d-8879-1ea335f5e40f")
-                        .weiguiReasonName("严重违反评标工作纪律、执业规范或者职业道德")
-                        .weiguiXiangxiMiaoshu("12333")
-                        .zhuanJiaAdAccount("qiaojf")
-                        .zhuanJiaCode("000030")
-                        .zhuanJiaZhuangTai(null)
-                        .zhuanJiaZhuangTaiName("")
-                        .zhuanjiaGuid("8ffb7651-1416-4f74-a590-1f0cf860463b")
-                        .zhuanjiaName("龙测试")
-                        .zhuanjiaWeiguiGuid("316cf113-2233-4118-9bd6-713e75b81363")
-                        .build()
-        );
-        return BasePageResp.<WeiGuiPageResp>builder()
-                .current(1)
-                .pages(1)
-                .total(7)
-                .data(list)
+        return BasePageResp.<ViolationExpertPageApiResp>builder()
+                .current(pageResp.getPageNo())
+                .pages(pageResp.getPageSize())
+                .total(pageResp.getTotalCount())
+                .data(pageResp.getList())
                 .build();
     }
 

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

+package com.cnooc.expert.service;
+
+import com.cnooc.expert.common.response.BasePageResp;
+import com.cnooc.expert.controller.portal.model.request.AgentNumReq;
+import com.cnooc.expert.controller.portal.model.request.AgentPageReq;
+import com.cnooc.expert.controller.portal.model.request.MessageNumReq;
+import com.cnooc.expert.controller.portal.model.request.MessagePageReq;
+import com.cnooc.expert.controller.portal.model.response.AgentNumResp;
+import com.cnooc.expert.controller.portal.model.response.AgentPageResp;
+import com.cnooc.expert.controller.portal.model.response.MessageNumResp;
+import com.cnooc.expert.controller.portal.model.response.MessagePageResp;
+import com.cnooc.expert.external.portal.service.PortalServiceClient;
+import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class PortalMockService {
+
+    private final PortalServiceClient portalServiceClient;
+
+    private String getCurUserAccount() {
+        return "ex_zhanglh15";
+    }
+
+    public AgentNumResp getAgentNum(AgentNumReq req) {
+
+//        AgentNumGetApiReq apiReq = AgentNumGetApiReq.builder()
+//                .account(this.getCurUserAccount())
+//                .title(req.getTitle())
+//                .build();
+//        ApiBaseResult<AgentNumGetApiResp> apiResp = portalServiceClient.getAgentNumApi(apiReq);
+//        return apiResp;
+
+        AgentNumResp result = AgentNumResp.builder()
+                .backlogNum(0)
+                .doneNum(3)
+                .build();
+
+        return result;
+    }
+
+    public BasePageResp<Object> pageAgentNum(AgentPageReq req) {
+
+//        AgentNumPageApiReq apiReq = AgentNumPageApiReq.builder()
+//                .pageNum(req.getPageNo())
+//                .pageSize(req.getPageSize())
+//                .account(this.getCurUserAccount())
+//                .status(req.getStatus())
+//                .title(req.getTitle())
+//                .build();
+//        ApiBaseResult<ApiBasePageResp<AgentNumPageApiResp>> apiResp = portalServiceClient.pageAgentNumApi(apiReq);
+
+        List<Object> data = Lists.newArrayList(
+                AgentPageResp.builder()
+                        .id(182182)
+                        .account("wzzx18")
+                        .content("供应商测试-资格审查评审")
+                        .createName("")
+                        .createTime("2025-10-24T05:49:14.000+0000")
+                        .createdTime("")
+                        .infoId("c0b939e87b29c7bd22197cd95f6e1e84")
+                        .modifyName("")
+                        .pushType(3)
+                        .redirectUrl("https://req-e.m-bid.cnooc.com.cn/workbench/todoEventIndex?id=c0b939e87b29c7bd22197cd95f6e1e84")
+                        .status(true)
+                        .title("供应商测试-资格审查评审")
+                        .type("资格审查评审")
+                        .updatedTime("")
+                        .build(),
+                AgentPageResp.builder()
+                        .id(121804)
+                        .account("wzzx18")
+                        .content("AutoTest_新签单次合同_货物_生产经营_非集采_法定_邀请招标_20250508134836-资格审查评审")
+                        .createName("")
+                        .createTime("2025-05-08T06:07:27.000+0000")
+                        .createdTime("")
+                        .infoId("be027ac3f4a57accb850ae0b2b7fd293")
+                        .modifyName("")
+                        .pushType(3)
+                        .redirectUrl("https://req-e.m-bid.cnooc.com.cn/workbench/todoEventIndex?id=be027ac3f4a57accb850ae0b2b7fd293")
+                        .status(true)
+                        .title("AutoTest_新签单次合同_货物_生产经营_非集采_法定_邀请招标_20250508134836-资格审查评审")
+                        .type("资格审查评审")
+                        .updatedTime("")
+                        .build(),
+                AgentPageResp.builder()
+                        .id(120738)
+                        .account("wzzx18")
+                        .content("物装中心十八已被邀请入库，可进行申请")
+                        .createName("")
+                        .createTime("2025-04-23T06:54:00.000+0000")
+                        .createdTime("")
+                        .infoId("e499147e-ebee-4f3b-a3d4-58e897b8f841")
+                        .modifyName("")
+                        .pushType(3)
+                        .redirectUrl("https://req-e.m-bid.cnooc.com.cn/workbench/todoEventIndex?id=c0b939e87b29c7bd22197cd95f6e1e84")
+                        .status(true)
+                        .title("物装中心十八-专家认证")
+                        .type("专家认证")
+                        .updatedTime("")
+                        .build()
+        );
+
+        return BasePageResp.builder()
+                .current(1)
+                .pages(1)
+                .total(3)
+                .data(data)
+                .build();
+    }
+
+    public MessageNumResp getMessageNum(MessageNumReq req) {
+
+//        MessageNumGetApiReq apiReq = MessageNumGetApiReq.builder()
+//                .receivers(this.getCurUserAccount())
+//                .build();
+//        ApiBaseResult<MessageNumGetApiResp> apiResp = portalServiceClient.getMessageNumApi(apiReq);
+//        return apiResp;
+
+        MessageNumResp result = MessageNumResp.builder()
+                .read(1)
+                .unRead(1)
+                .build();
+
+        return result;
+    }
+
+    public BasePageResp<Object> pageMessageNum(MessagePageReq req) {
+
+//        MessageNumPageApiReq apiReq = MessageNumPageApiReq.builder()
+//                .pageNum(req.getPageNo())
+//                .pageSize(req.getPageSize())
+//                .receivers(this.getCurUserAccount())
+//                .status(req.getStatus())
+//                .build();
+//        ApiBaseResult<ApiBasePageResp<MessageNumPageApiResp>> apiResp = portalServiceClient.pageMessageNumApi(apiReq);
+//        return apiResp;
+
+        List<Object> data = Lists.newArrayList(
+                MessagePageResp.builder()
+                        .id(182182)
+                        .contentId("")
+                        .createBy("")
+                        .createName("")
+                        .createTime("2024-12-30 14:53:49")
+                        .endTime("")
+                        .infoId("c0b939e87b29c7bd22197cd95f6e1e84")
+                        .messageContent("专家状态已修改为: 手动冻结")
+                        .messageHeader("专家状态已修改为: 手动冻结")
+                        .modifyBy("")
+                        .modifyName("")
+                        .orgId("")
+                        .receiver("")
+                        .receivers("")
+                        .redirectUrl("https://req-e.m-bid.cnooc.com.cn/workbench/todoEventIndex?id=c0b939e87b29c7bd22197cd95f6e1e84")
+                        .startTime("")
+                        .status(1)
+                        .updatedTime("")
+                        .visiblePosition("")
+                        .build()
+        );
+
+        return BasePageResp.builder()
+                .current(1)
+                .pages(1)
+                .total(1)
+                .data(data)
+                .build();
+    }
+
+}

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

+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.response.CompanyPageResp;
+import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class SubjectMockService {
+
+    public BasePageResp<CompanyPageResp> pageCompany(CompanyPageReq req) {
+        List<CompanyPageResp> data = Lists.newArrayList(
+                CompanyPageResp.builder()
+                        .id("1420053958893662209")
+                        .subjectId("1420053958767833088")
+                        .subjectName("江苏瑞尔姆电器安安有限公司")
+                        .businessType(5)
+                        .creditCode("91320577MA4Y6K7H0F")
+                        .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();
+    }
+
+}

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

+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.response.CompanyPageResp;
+import com.cnooc.expert.external.subject.service.SubjectServiceClient;
+import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class SubjectService {
+
+    private SubjectServiceClient subjectServiceClient;
+
+    public BasePageResp<CompanyPageResp> pageCompany(CompanyPageReq req) {
+        List<CompanyPageResp> data = Lists.newArrayList(
+                CompanyPageResp.builder()
+                        .id("1420053958893662209")
+                        .subjectId("1420053958767833088")
+                        .subjectName("江苏瑞尔姆电器安安有限公司")
+                        .businessType(5)
+                        .creditCode("91320577MA4Y6K7H0F")
+                        .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();
+    }
+}

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

+package com.cnooc.expert.service;
+
+import com.cnooc.expert.common.response.BasePageResp;
+import com.cnooc.expert.controller.workflow.model.request.ApprovePathSettingPageReq;
+import com.cnooc.expert.controller.workflow.model.response.ApprovePathSettingPageResp;
+import com.cnooc.expert.external.workflow.service.WorkflowServiceClient;
+import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class WorkflowMockService {
+
+    private final WorkflowServiceClient workflowServiceClient;
+
+    public BasePageResp<ApprovePathSettingPageResp> pageApprovePathSetting(ApprovePathSettingPageReq req) {
+
+        List<ApprovePathSettingPageResp.ApprovePathAccount> accountList = Lists.newArrayList(
+                ApprovePathSettingPageResp.ApprovePathAccount.builder()
+                        .account("ex_liujh27")
+                        .name("刘俊")
+                        .subjectName("中国海洋石油集团有限公司")
+                        .email("ex_liujh27@cnooc.com.cn")
+                        .build()
+        );
+
+        List<ApprovePathSettingPageResp.ApprovePath> templatePaths = Lists.newArrayList(
+                ApprovePathSettingPageResp.ApprovePath.builder()
+                        .nodeId("node246ec7f3c7571dd631a93f34fa8aeb4b")
+                        .nodeName("一级")
+                        .approvePersonName("刘俊")
+                        .subjectName("中国海洋石油集团有限公司")
+                        .email("ex_liujh27@cnooc.com.cn")
+                        .accountList(accountList)
+                        .build()
+        );
+
+        List<ApprovePathSettingPageResp> data = Lists.newArrayList(
+                ApprovePathSettingPageResp.builder()
+                        .defId("e2dbccf455ec448b8a8284dc2c6c3b04")
+                        .defName("中移深化-专家审批")
+                        .opinion(null)
+                        .pathId(null)
+                        .useIfream(true)
+                        .engineType(1)
+                        .ifreamUrl("https://flow.t-bid.cnooc.com.cn/deta/scene-talk/approvalFlowChart.html?templateId=e2dbccf455ec448b8a8284dc2c6c3b04&approveId=")
+                        .fileId(null)
+                        .suggestMsg("1111")
+                        .receiveSettingCode(null)
+                        .receiveSettingName(null)
+                        .upSubjectName(null)
+                        .upSubjectId(null)
+                        .needUpApproval(null)
+                        .signingComments(null)
+                        .noNeedUpApprovalCode(null)
+                        .noNeedUpApprovalInfo(null)
+                        .templatePaths(templatePaths)
+                        .build()
+        );
+
+        return BasePageResp.<ApprovePathSettingPageResp>builder()
+                .current(1)
+                .pages(1)
+                .total(1)
+                .data(data)
+                .build();
+    }
+}