commit

jnpf-ftb/jnpf-ftb-api/src/main/java/jnpf/cultivate/FtbCultivateIdentifyApi.java

@@ -0,0 +1,33 @@
+package jnpf.cultivate;
+
+import jnpf.cultivate.fallback.FtbCultivateIdentifyApiFallback;
+import jnpf.util.NoDataSourceBind;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 鉴定api
+ */
+@FeignClient(name = "jnpf-ftb", fallbackFactory = FtbCultivateIdentifyApiFallback.class, path = "/cultivate")
+public interface FtbCultivateIdentifyApi {
+    /**
+     * 处理鉴定逾期数据
+     *
+     * @param tenantId
+     * @return
+     */
+    @PostMapping(value = "/apply/setIdentifyBeOverdue")
+    @NoDataSourceBind
+    Boolean setIdentifyBeOverdue(@RequestParam(value = "tenantId") String tenantId);
+
+    /**
+     * 计划鉴定时间提醒
+     *
+     * @param tenantId
+     * @return
+     */
+    @PostMapping(value = "/apply/setIdentifyRemind")
+    @NoDataSourceBind
+    Boolean setIdentifyRemind(@RequestParam(value = "tenantId") String tenantId);
+}

jnpf-ftb/jnpf-ftb-api/src/main/java/jnpf/cultivate/FtbCultivateLearnTaskListApi.java

@@ -0,0 +1,33 @@
+package jnpf.cultivate;
+
+import jnpf.cultivate.fallback.FtbCultivateLearnTaskApiFallback;
+import jnpf.util.NoDataSourceBind;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * 鉴定api
+ */
+@FeignClient(name = "jnpf-ftb", fallbackFactory = FtbCultivateLearnTaskApiFallback.class, path = "/web/learnTaskList/")
+public interface FtbCultivateLearnTaskListApi {
+
+    /**
+     * 定时加入任务
+     *
+     * @return
+     */
+    @GetMapping("/timing/timingAddNewPersonToTaskNew/{tenantId}")
+    @NoDataSourceBind
+    void timingAddNewPersonToTaskNew(@PathVariable("tenantId") String tenantId);
+
+
+    /**
+     * 定时提醒任务（每天定点）
+     *
+     * @return
+     */
+    @GetMapping("/timing/timingTaskLearningAlertNew/{tenantId}")
+    @NoDataSourceBind
+    void timingTaskLearningAlertNew(@PathVariable("tenantId") String tenantId);
+}

jnpf-ftb/jnpf-ftb-api/src/main/java/jnpf/cultivate/FtbCultivatePromotionApi.java

@@ -0,0 +1,42 @@
+package jnpf.cultivate;
+
+import io.swagger.v3.oas.annotations.Operation;
+import jnpf.base.ActionResult;
+import jnpf.cultivate.fallback.FtbCultivatePromotionFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @Title:FtbCultivatePromotionMemberApi
+ * @Author:peng.hao
+ * @create: 2024/1/1815:58
+ */
+@FeignClient(name = "jnpf-ftb", fallbackFactory = FtbCultivatePromotionFallback.class )
+public interface FtbCultivatePromotionApi {
+
+    /**
+     * 拖动删除成员启用对应晋升通道
+     * @param userIds 用户id
+     * @return
+     */
+    @PutMapping("/cul_pro_member/deleteMembersToProChannel")
+    ActionResult<Boolean> deleteMembersToProChannel(@RequestBody List<String> userIds);
+
+    /**
+     * 获取是否有人岗位职等的晋升申请
+     * @param postId 公司岗位ID
+     * @param grandId 职等ID
+     * @param userId 用户ID
+     * @return 成功结果
+     */
+    @GetMapping("/cul-post-apply/userIsHasApply")
+    @Operation(summary = "查看当前的人岗位职等是否存在晋升申请")
+    ActionResult<Boolean> isThereAnAppForThePosLevel(@RequestParam("postId") String postId,
+                                                            @RequestParam("grandId") String grandId,
+                                                            @RequestParam("userId") String userId);
+}

jnpf-ftb/jnpf-ftb-api/src/main/java/jnpf/cultivate/FtbCultivateStoreStatisticApi.java

@@ -0,0 +1,101 @@
+package jnpf.cultivate;
+
+import jnpf.base.ActionResult;
+import jnpf.cultivate.fallback.FtbCultivateStoreStatisticApiFallback;
+import jnpf.model.cultivate.dto.storestatistics.*;
+import jnpf.model.cultivate.vo.position.*;
+import jnpf.model.thousandsfaces.TodayWorkVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * 鉴定api
+ */
+@FeignClient(name = "jnpf-ftb", fallbackFactory = FtbCultivateStoreStatisticApiFallback.class, path = "/web/store-index-statistics")
+public interface FtbCultivateStoreStatisticApi {
+    /**
+     * 店长页面 培训统计数量
+     */
+    @PostMapping("/get-cultivate-count")
+    ActionResult<FtbCultivateStoreCountVO> getCultivateCount(@RequestBody FtbCultivateStoreStatisticsReq req);
+
+    /**
+     * 查询我的考试列表
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/queryMyExamList")
+    ActionResult<List<TodayWorkVo>> queryMyExamList(@RequestBody StoreStatisticsMyExamReq req);
+
+
+    /**
+     * 待我批阅(下属的)
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/queryWaitMyReadOver")
+    ActionResult<List<TodayWorkVo>> queryWaitMyReadOver(@RequestBody StoreStatisticsWaitMyCheckExamReq req);
+
+
+    /**
+     * 今日工作-待参与及参与中的线下培训<负责人及参与人均属于相关人员>列表
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/queryOfflineTrainList")
+    ActionResult<List<TodayWorkVo>> queryOfflineTrainList(@RequestBody StoreOfflineTrainReq req);
+
+
+    /**
+     * 今日工作-我的任务（当日开始的培训任务）列表
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/myTaskList")
+    ActionResult<List<TodayWorkVo>> storeMyTaskList(@RequestBody StoreOfflineTrainReq req);
+
+    /**
+     * 今日工作-鉴定他人（当日的待鉴定）列表
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/myIdentityList")
+    ActionResult<List<TodayWorkVo>> storeMyIdentityList(@RequestBody StoreIdentityReq req);
+
+    /**
+     * 员工界面 查询未学习的通用课程数量
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/get-worker-cultivate-count")
+    ActionResult<FtbCultivateWorkerCountVO> getWorkerCultivateCount(@RequestBody FtbCultivateStoreStatisticsReq req);
+
+
+    /**
+     * 工作台-员工
+     */
+    @PostMapping("/person/training-statistics")
+    ActionResult<FtbPersonTrainingStatisticsVO> personTrainingStatistics(@RequestBody FtbCultivateStoreStatisticsReq req);
+
+
+    /**
+     * 工作台-店长
+     */
+    @PostMapping("/store-manager/training-statistics")
+    ActionResult<FtbStoreManagerTrainingStatisticsVO> storeManagerTrainingStatistics(@RequestBody FtbCultivateStoreStatisticsReq req);
+
+    /**
+     * 工作台-管理层
+     */
+    @PostMapping("/manager/training-statistics")
+    ActionResult<FtbManagerTrainingStatisticsVO> managerTrainingStatistics(@RequestBody FtbCultivateStoreStatisticsReq req);
+}

jnpf-ftb/jnpf-ftb-api/src/main/java/jnpf/cultivate/FtbCultivateTeachingApi.java

@@ -0,0 +1,51 @@
+package jnpf.cultivate;
+
+import jnpf.cultivate.fallback.FtbCultivateTeachingApiFallback;
+import jnpf.model.cultivate.vo.teaching.MyPracticeSummaryVo;
+import jnpf.model.cultivate.vo.teaching.SuperiorTeachingSummaryVo;
+import jnpf.model.cultivate.vo.teaching.TeachingStoreCountVo;
+import jnpf.model.cultivate.vo.teaching.TodaySummaryDataVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 带教api
+ */
+@FeignClient(name = "jnpf-ftb", fallbackFactory = FtbCultivateTeachingApiFallback.class, path = "/")
+public interface FtbCultivateTeachingApi {
+
+    /**
+     * 店长界面我的带教统计
+     * @param storeId 门店id
+     * @return TeachingStoreCountVo
+     */
+    @GetMapping("app/teachingRecord/storeTeachingCount")
+    TeachingStoreCountVo storeTeachingCount(@RequestParam("storeId") String storeId);
+
+    /**
+     * App店长界面-今日练习汇总数据
+     *
+     * @param storeId 查询参数
+     * @return 练习汇总数据
+     */
+    @GetMapping("teachingRecord/app/getTodaySummary")
+    TodaySummaryDataVo getTodaySummary(@RequestParam("storeId") String storeId);
+
+    /**
+     * 员工界面-上级带教统计
+     * @param storeId 门店id
+     * @return TeachingStoreCountVo
+     */
+    @GetMapping("app/teachingRecord/getSuperiorTeachingSummary")
+    SuperiorTeachingSummaryVo getSuperiorTeachingSummary(@RequestParam("storeId") String storeId);
+
+    /**
+     * 员工界面--我的练习汇总数据
+     *
+     * @param storeId 查询参数
+     * @return 练习汇总数据
+     */
+    @GetMapping("teachingRecord/app/getMyPracticeSummary")
+    MyPracticeSummaryVo getMyPracticeSummary(@RequestParam("storeId") String storeId);
+}

jnpf-ftb/jnpf-ftb-api/src/main/java/jnpf/cultivate/V2CultivateOldDealApi.java

@@ -0,0 +1,51 @@
+package jnpf.cultivate;
+
+import jnpf.base.ActionResult;
+import jnpf.cultivate.fallback.V2CultivateOldDealApiFallback;
+import jnpf.util.NoDataSourceBind;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "jnpf-ftb", fallbackFactory = V2CultivateOldDealApiFallback.class, path = "/v2/cultivate/old")
+public interface V2CultivateOldDealApi {
+
+    /**
+     * 课程心得评论旧数据处理
+     *
+     * @param tenantId 租户ID
+     * @return 响应
+     */
+    @NoDataSourceBind
+    @GetMapping("/gained/comment")
+    ActionResult<Boolean> dealOldData(@RequestParam("tenantId") String tenantId);
+
+    @NoDataSourceBind
+    @GetMapping("/identify/deal-old")
+    ActionResult<Boolean> identifyDealOldData(@RequestParam("tenantId") String tenantId);
+
+    /**
+     * 迁移旧培训任务数据到新的任务日志表
+     *
+     * @param tenantId 租户ID
+     * @return 响应
+     */
+    @NoDataSourceBind
+    @GetMapping("/task/old-data")
+    ActionResult<String> migrateOldTaskData(@RequestParam("tenantId") String tenantId);
+
+    /**
+     * 旧晋升通道成员数据迁移接口
+     * 将 ftb_cultivate_promotion_member_new 表中的用户数据迁移到
+     * ftb_cultivate_promotion_user 和 ftb_cultivate_promotion_setting 表中
+     * 同时校验用户是否为正常状态（enabledMark = 1）
+     *
+     * @param tenantId 租户ID
+     * @param promotionId 晋升通道ID（可选，如果传入则只迁移指定通道的数据）
+     * @return 响应结果
+     */
+    @NoDataSourceBind
+    @GetMapping("/promotion/migrate-old-data")
+    ActionResult<String> migratePromotionOldData(@RequestParam("tenantId") String tenantId,
+                                                  @RequestParam(value = "promotionId", required = false) String promotionId);
+}

jnpf-ftb/jnpf-ftb-api/src/main/java/jnpf/cultivate/fallback/FtbCultivateIdentifyApiFallback.java

@@ -0,0 +1,29 @@
+package jnpf.cultivate.fallback;
+
+import jnpf.cultivate.FtbCultivateIdentifyApi;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class FtbCultivateIdentifyApiFallback implements FallbackFactory<FtbCultivateIdentifyApi> {
+
+    @Override
+    public FtbCultivateIdentifyApi create(Throwable cause) {
+        cause.printStackTrace();
+        return new FtbCultivateIdentifyApi() {
+            @Override
+            public Boolean setIdentifyBeOverdue(String tenantId) {
+                log.error("setIdentifyBeOverdue调用失败...");
+                return false;
+            }
+
+            @Override
+            public Boolean setIdentifyRemind(String tenantId) {
+                log.error("setIdentifyRemind调用失败...");
+                return false;
+            }
+        };
+    }
+}

jnpf-ftb/jnpf-ftb-api/src/main/java/jnpf/cultivate/fallback/FtbCultivateLearnTaskApiFallback.java

@@ -0,0 +1,31 @@
+package jnpf.cultivate.fallback;
+
+import jnpf.cultivate.FtbCultivateLearnTaskListApi;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class FtbCultivateLearnTaskApiFallback implements FallbackFactory<FtbCultivateLearnTaskListApi> {
+
+
+    @Override
+    public FtbCultivateLearnTaskListApi create(Throwable cause) {
+        log.error("进入 FtbCultivateLearnTaskApiFallback 的 fallback，降级原因：", cause); // 打印降级原因
+
+        return new FtbCultivateLearnTaskListApi() {
+
+
+            @Override
+            public void timingAddNewPersonToTaskNew(String tenantId) {
+
+            }
+
+            @Override
+            public void timingTaskLearningAlertNew(String tenantId) {
+
+            }
+        };
+    }
+}

jnpf-ftb/jnpf-ftb-api/src/main/java/jnpf/cultivate/fallback/FtbCultivatePromotionFallback.java

@@ -0,0 +1,34 @@
+package jnpf.cultivate.fallback;
+
+import jnpf.base.ActionResult;
+import jnpf.cultivate.FtbCultivatePromotionApi;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Slf4j
+@Component
+public class FtbCultivatePromotionFallback implements FallbackFactory<FtbCultivatePromotionApi> {
+
+
+    @Override
+    public FtbCultivatePromotionApi create(Throwable cause) {
+        cause.printStackTrace();
+        return new FtbCultivatePromotionApi() {
+            @Override
+            public ActionResult<Boolean> deleteMembersToProChannel(List<String> userIds) {
+                log.error("deleteMembersToProChannel 调用失败...");
+                return null;
+            }
+
+            @Override
+            public ActionResult<Boolean> isThereAnAppForThePosLevel(String postId, String grandId, String userId) {
+                log.error("isThereAnAppForThePosLevel 调用失败...");
+                return null;
+            }
+        };
+    }
+
+}

jnpf-ftb/jnpf-ftb-api/src/main/java/jnpf/cultivate/fallback/FtbCultivateStoreStatisticApiFallback.java

@@ -0,0 +1,76 @@
+package jnpf.cultivate.fallback;
+
+import jnpf.base.ActionResult;
+import jnpf.cultivate.FtbCultivateStoreStatisticApi;
+import jnpf.model.cultivate.dto.storestatistics.*;
+import jnpf.model.cultivate.vo.position.*;
+import jnpf.model.thousandsfaces.TodayWorkVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Slf4j
+@Component
+public class FtbCultivateStoreStatisticApiFallback implements FallbackFactory<FtbCultivateStoreStatisticApi> {
+
+
+    @Override
+    public FtbCultivateStoreStatisticApi create(Throwable cause) {
+        log.error("进入 FtbCultivateStoreStatisticApi 的 fallback，降级原因：", cause); // 打印降级原因
+
+        return new FtbCultivateStoreStatisticApi() {
+
+            @Override
+            public ActionResult<FtbCultivateStoreCountVO> getCultivateCount(FtbCultivateStoreStatisticsReq req) {
+                return null;
+            }
+
+            @Override
+            public ActionResult<List<TodayWorkVo>> queryMyExamList(StoreStatisticsMyExamReq req) {
+                return null;
+            }
+
+            @Override
+            public ActionResult<List<TodayWorkVo>> queryWaitMyReadOver(StoreStatisticsWaitMyCheckExamReq req) {
+                return null;
+            }
+
+            @Override
+            public ActionResult<List<TodayWorkVo>> queryOfflineTrainList(StoreOfflineTrainReq req) {
+                return null;
+            }
+
+            @Override
+            public ActionResult<List<TodayWorkVo>> storeMyTaskList(StoreOfflineTrainReq req) {
+                return null;
+            }
+
+            @Override
+            public ActionResult<List<TodayWorkVo>> storeMyIdentityList(StoreIdentityReq req) {
+                return null;
+            }
+
+            @Override
+            public ActionResult<FtbCultivateWorkerCountVO> getWorkerCultivateCount(FtbCultivateStoreStatisticsReq req) {
+                return null;
+            }
+
+            @Override
+            public ActionResult<FtbPersonTrainingStatisticsVO> personTrainingStatistics(FtbCultivateStoreStatisticsReq req) {
+                return null;
+            }
+
+            @Override
+            public ActionResult<FtbStoreManagerTrainingStatisticsVO> storeManagerTrainingStatistics(FtbCultivateStoreStatisticsReq req) {
+                return null;
+            }
+
+            @Override
+            public ActionResult<FtbManagerTrainingStatisticsVO> managerTrainingStatistics(FtbCultivateStoreStatisticsReq req) {
+                return null;
+            }
+        };
+    }
+}

jnpf-ftb/jnpf-ftb-api/src/main/java/jnpf/cultivate/fallback/FtbCultivateTeachingApiFallback.java

@@ -0,0 +1,42 @@
+package jnpf.cultivate.fallback;
+
+import jnpf.cultivate.FtbCultivateTeachingApi;
+import jnpf.model.cultivate.vo.teaching.MyPracticeSummaryVo;
+import jnpf.model.cultivate.vo.teaching.SuperiorTeachingSummaryVo;
+import jnpf.model.cultivate.vo.teaching.TeachingStoreCountVo;
+import jnpf.model.cultivate.vo.teaching.TodaySummaryDataVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class FtbCultivateTeachingApiFallback implements FallbackFactory<FtbCultivateTeachingApi> {
+
+    @Override
+    public FtbCultivateTeachingApi create(Throwable cause) {
+        cause.printStackTrace();
+        return new FtbCultivateTeachingApi() {
+
+            @Override
+            public TeachingStoreCountVo storeTeachingCount(String storeId) {
+                return null;
+            }
+
+            @Override
+            public TodaySummaryDataVo getTodaySummary(String storeId) {
+                return new TodaySummaryDataVo();
+            }
+
+            @Override
+            public SuperiorTeachingSummaryVo getSuperiorTeachingSummary(String storeId) {
+                return null;
+            }
+
+            @Override
+            public MyPracticeSummaryVo getMyPracticeSummary(String storeId) {
+                return null;
+            }
+        };
+    }
+}

jnpf-ftb/jnpf-ftb-api/src/main/java/jnpf/cultivate/fallback/V2CultivateOldDealApiFallback.java

@@ -0,0 +1,39 @@
+package jnpf.cultivate.fallback;
+
+import jnpf.base.ActionResult;
+import jnpf.cultivate.V2CultivateOldDealApi;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class V2CultivateOldDealApiFallback implements FallbackFactory<V2CultivateOldDealApi> {
+
+    @Override
+    public V2CultivateOldDealApi create(Throwable cause) {
+        cause.printStackTrace();
+        return new V2CultivateOldDealApi() {
+            @Override
+            public ActionResult<Boolean> dealOldData(String tenantId) {
+                return null;
+            }
+
+            @Override
+            public ActionResult<Boolean> identifyDealOldData(String tenantId) {
+                return null;
+            }
+
+            @Override
+            public ActionResult<String> migrateOldTaskData(String tenantId) {
+                return null;
+            }
+
+            @Override
+            public ActionResult<String> migratePromotionOldData(String tenantId, String promotionId) {
+                return null;
+            }
+
+        };
+    }
+}