feature(*): 重新处理上报的业务绩效

- 重新处理上报的业务绩效 - 删除不需要的类 - 持久话上报的数据 - 升级pom版本号

feature(*): 重新处理上报的业务绩效
- 重新处理上报的业务绩效 - 删除不需要的类 - 持久话上报的数据 - 升级pom版本号
张志伟
1 parent 718f8378
Showing 41 changed files with 293 additions and 352 deletions
fw-morax-common/pom.xml
fw-morax-dao/pom.xml
fw-morax-dao/src/main/java/cn/fw/morax/dao/kpi/KpiGroupIndicatorHitLogDao.java
fw-morax-dao/src/main/java/cn/fw/morax/dao/kpi/KpiGroupIndicatorPreconditionHitLogDao.java
fw-morax-dao/src/main/java/cn/fw/morax/dao/kpi/KpiGroupIndicatorScoreLogDao.java
fw-morax-dao/src/main/java/cn/fw/morax/dao/kpi/KpiGroupIndicatorTargetHitLogDao.java
fw-morax-dao/src/main/java/cn/fw/morax/dao/kpi/KpiMqLogDao.java → fw-morax-dao/src/main/java/cn/fw/morax/dao/kpi/KpiIndicatorUserValueDao.java
fw-morax-dao/src/main/resources/mapper/kpi/KpiMqLogMapper.xml → fw-morax-dao/src/main/resources/mapper/kpi/KpiIndicatorUserValueMapper.xml
fw-morax-domain/pom.xml
fw-morax-domain/src/main/java/cn/fw/morax/domain/bo/kpi/UserIndicatorBO.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiGroupIndicatorHitLog.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiGroupIndicatorPreconditionHitLog.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiGroupIndicatorScoreLog.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiGroupIndicatorTargetHitLog.java
fw-morax-sdk/src/main/java/cn/fw/morax/sdk/dto/kpi/KpiReportNoticeMQ.java → fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiIndicatorUserValue.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiMqLog.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/kpi/KpiPoolIndicatorValue.java
fw-morax-rpc/pom.xml
fw-morax-sdk/pom.xml
fw-morax-sdk/src/main/java/cn/fw/morax/sdk/api/IKpiReportService.java
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fw-morax</artifactId>
         <groupId>cn.fw</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fw-morax</artifactId>
         <groupId>cn.fw</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository;
  * 指标命中记录
  *
  * @author : kurisu
- * @version : 1.0
+ * @version : 2.0
  * @className : KpiGroupIndicatorHitLogDao
  * @description : 指标命中记录
  * @date : 2022-12-13 17:54
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository;
  * 绩效组指标前置条件命中记录
  *
  * @author : kurisu
- * @version : 1.0
+ * @version : 2.0
  * @className : KpiGroupIndicatorPreconditionHitLogDao
  * @description : 绩效组指标前置条件命中记录
  * @date : 2022-12-13 17:58
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository;
  * 绩效组指标得分记录
  *
  * @author : kurisu
- * @version : 1.0
+ * @version : 2.0
  * @className : KpiGroupIndicatorScoreLogDao
  * @description : 绩效组指标得分记录
  * @date : 2022-12-14 10:14
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository;
  * 绩效组配置目标命中记录
  *
  * @author : kurisu
- * @version : 1.0
+ * @version : 2.0
  * @className : KpiGroupIndicatorTargetHitLogDao
  * @description : 绩效组配置目标命中记录
  * @date : 2022-12-14 10:45
 package cn.fw.morax.dao.kpi;
  
-import cn.fw.morax.domain.db.kpi.KpiMqLog;
+import cn.fw.morax.domain.db.kpi.KpiIndicatorUserValue;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
  
 /**
+ * 用户指标上报数据
+ *
  * @author : kurisu
- * @version : 1.0
- * @className : KpiMqLogDao
- * @description : 绩效mq发送记录
- * @date : 2022-04-12 18:19
+ * @version : 2.0
+ * @className : KpiIndicatorUserValueDao
+ * @description : 用户指标上报数据
+ * @date : 2022-12-15 11:22
  */
 @Repository
-public interface KpiMqLogDao extends BaseMapper<KpiMqLog> {
+public interface KpiIndicatorUserValueDao extends BaseMapper<KpiIndicatorUserValue> {
 }
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.fw.morax.dao.kpi.KpiMqLogDao">
+<mapper namespace="cn.fw.morax.dao.kpi.KpiIndicatorUserValueDao">
  
 </mapper>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fw-morax</artifactId>
         <groupId>cn.fw</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -7,7 +7,7 @@ import java.util.Date;
  
 /**
  * @author : kurisu
- * @version : 1.0
+ * @version : 2.0
  * @className : UserIndicatorBO
  * @description : 人员绩效值
  * @date : 2022-04-13 17:21
@@ -19,10 +19,6 @@ public class UserIndicatorBO {
      */
     private String indicatorCode;
     /**
-     * 岗位id
-     */
-    private Long postId;
-    /**
      * 人员id
      */
     private Long userId;
@@ -31,15 +27,11 @@ public class UserIndicatorBO {
      */
     private BigDecimal value;
     /**
-     * 门店id
-     */
-    private Long shopId;
-    /**
      * 数据日期
      */
     private Date dataDate;
     /**
-     * 唯一标识
+     * 集团id
      */
-    private Long uid;
+    private Long groupId;
 }
@@ -12,7 +12,7 @@ import java.time.LocalDate;
  * 指标命中记录
  *
  * @author : kurisu
- * @version : 1.0
+ * @version : 2.0
  * @className : KpiGroupIndicatorHitLog
  * @description : 指标命中记录
  * @date : 2022-12-13 10:27
@@ -13,7 +13,7 @@ import java.time.LocalDate;
  * 绩效组指标前置条件命中记录
  *
  * @author : kurisu
- * @version : 1.0
+ * @version : 2.0
  * @className : KpiGroupIndicatorPreconditionHitLog
  * @description : 绩效组指标前置条件命中记录
  * @date : 2022-12-13 10:44
@@ -12,7 +12,7 @@ import java.time.LocalDate;
  * 绩效组指标得分记录
  *
  * @author : kurisu
- * @version : 1.0
+ * @version : 2.0
  * @className : KpiGroupIndicatorScoreLog
  * @description : 绩效组指标得分记录
  * @date : 2022-12-13 15:00
@@ -13,7 +13,7 @@ import java.time.LocalDate;
  * 绩效组指标得分命中记录
  *
  * @author : kurisu
- * @version : 1.0
+ * @version : 2.0
  * @className : KpiGroupIndicatorTargetHitLog
  * @description : 绩效组指标目标命中记录
  * @date : 2022-12-13 15:09
-package cn.fw.morax.sdk.dto.kpi;
+package cn.fw.morax.domain.db.kpi;
  
-import lombok.AllArgsConstructor;
-import lombok.Builder;
+import cn.fw.common.data.entity.BaseAuditableTimeEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
  
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
  
 /**
+ * 用户绩效指标上报数据类
+ *
  * @author : kurisu
- * @className : KpiIndicator
- * @description :
- * @date : 2022-04-07 15:29
+ * @version : 2.0
+ * @className : KpiIndicatorUserValue
+ * @description : 用户绩效指标上报数据类
+ * @date : 2022-12-15 11:19
  */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class KpiReportNoticeMQ {
+@EqualsAndHashCode(callSuper = true)
+public class KpiIndicatorUserValue extends BaseAuditableTimeEntity<KpiIndicatorUserValue, Long> {
+
     /**
-     * topic
+     * 人员id
      */
-    public final static String TOPIC = "kpi_report";
+    private Long userId;
     /**
      * 指标编码
      */
@@ -32,23 +33,19 @@ public class KpiReportNoticeMQ {
      */
     private String indicatorName;
     /**
-     * 岗位id
-     */
-    private Long postId;
-    /**
-     * 岗位名称
+     * 指标业务值
      */
-    private String postName;
+    private BigDecimal indicatorValue;
     /**
-     * 需要上报日期
+     * 数据日期
      */
-    private Date uploadDate;
+    private LocalDate dataDate;
     /**
      * 集团id
      */
     private Long groupId;
     /**
-     * 唯一标识
+     * 逻辑删除
      */
-    private Long uid;
+    private Boolean yn;
 }
-package cn.fw.morax.domain.db.kpi;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDate;
-import java.util.Date;
-
-/**
- * @author : kurisu
- * @version : 1.0
- * @className : KpiMqLog
- * @description : 绩效上报mq发送记录
- * @date : 2022-04-12 18:10
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@TableName(autoResultMap = true)
-public class KpiMqLog extends Model<KpiMqLog> {
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
-    /**
-     * 指标编号
-     */
-    private String indicatorCode;
-    /**
-     * 岗位id
-     */
-    private Long postId;
-    /**
-     * 发送时间
-     * 可能为过去时间
-     */
-    private LocalDate sendDate;
-    /**
-     * 集团id
-     */
-    private Long groupId;
-    /**
-     * 创建时间
-     */
-    @TableField(insertStrategy = FieldStrategy.NOT_NULL, fill = FieldFill.INSERT)
-    private Date createTime;
-}
@@ -42,10 +42,6 @@ public class KpiPoolIndicatorValue extends BaseAuditableTimeEntity&lt;KpiPoolIndica
      */
     private LocalDate dataDate;
     /**
-     * mq记录id
-     */
-    private Long mqLogId;
-    /**
      * 集团id
      */
     private Long groupId;
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fw-morax</artifactId>
         <groupId>cn.fw</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fw-morax</artifactId>
         <groupId>cn.fw</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,7 +13,7 @@
     <artifactId>fw-morax-sdk</artifactId>
     <packaging>jar</packaging>
     <name>fw-morax-sdk</name>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
  
     <properties>
         <hibernate.validator>5.3.6.Final</hibernate.validator>
@@ -21,24 +21,27 @@ import java.util.List;
  * @className : KpiReportApi
  * @description : 绩效处理接口
  * @date: 2022-04-07 15:35
+ * @version : 2.0
  */
 @FeignClient(value = "fw-morax", path = "/api/morax/kpi")
 public interface IKpiReportService {
     /**
      * 查询绩效组人员
-     *
+     * @Deprecated 已过时 此方法不在维护，将在2.1.0移除
      * @param kpiGroupUserQuery 查询参数
      * @return 分组人员
      */
+    @Deprecated
     @GetMapping("/query/user")
     Message<List<KpiGroupUserResult>> queryKpiGroupUser(@Validated({KpiGroupUserQuery.Query.class}) @SpringQueryMap KpiGroupUserQuery kpiGroupUserQuery);
  
     /**
      * 实时查询绩效组人员
-     *
+     * @Deprecated 已过时 此方法不在维护，将在2.1.0移除
      * @param kpiGroupUserQuery 查询参数
      * @return 分组人员
      */
+    @Deprecated
     @GetMapping("/real-time/query/user")
     Message<List<KpiGroupUserResult>> realTimeQueryKpiGroupUser(@Validated({KpiGroupUserQuery.RealTimeQuery.class}) @SpringQueryMap KpiGroupUserQuery kpiGroupUserQuery);
  
@@ -2,13 +2,16 @@ package cn.fw.morax.sdk.dto.kpi;
  
 import lombok.*;
  
-import javax.validation.constraints.*;
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Past;
 import java.math.BigDecimal;
 import java.util.Date;
  
 /**
  * @author : kurisu
- * @version : 1.0
+ * @version : 2.0
  * @className : UserIndicatorReq
  * @description : 人员绩效指标上报
  * @date : 2022-04-13 16:45
@@ -26,11 +29,6 @@ public class UserIndicatorReq {
     @NotBlank(message = "指标编码不能为空")
     private String indicatorCode;
     /**
-     * 岗位id
-     */
-    @NotNull(message = "岗位ID不能为空")
-    private Long postId;
-    /**
      * 人员id
      */
     @NotNull(message = "人员id不能为空")
@@ -43,21 +41,15 @@ public class UserIndicatorReq {
     @DecimalMin(value = "0", message = "指标值必须大于等于0")
     private BigDecimal value;
     /**
-     * 门店id
-     */
-    @NotNull(message = "门店id不能为空")
-    private Long shopId;
-    /**
      * 数据日期
      */
     @NotNull(message = "数据日期不能为空")
     @Past(message = "数据日期必须为过去的时间")
     private Date dataDate;
     /**
-     * 唯一标识
+     * 集团id
      */
-    @NotNull(message = "标识码不能为空")
-    @Min(value = 1, message = "标识码不合法")
-    private Long uid;
+    @NotNull(message = "集团id不能为空")
+    private Long groupId;
 }
  
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>fw-morax</artifactId>
         <groupId>cn.fw</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@ import static cn.fw.morax.common.utils.MessageFormatUtil.MessageFormatTransfer;
  * 绩效上报api
  *
  * @author : kurisu
- * @version : 1.0
+ * @version : 2.0
  * @className : KpiReportServiceImpl
  * @description : 绩效上报api
  * @date : 2022-04-11 17:21
@@ -44,12 +44,7 @@ public class KpiReportServiceImpl implements IKpiReportService {
     private final int maxSize = 1000;
     private final KpiReportService kpiReportService;
  
-    /**
-     * 查询绩效组人员
-     *
-     * @param kpiGroupUserQuery 查询参数
-     * @return 分组人员
-     */
+    @Deprecated
     @GetMapping("/query/user")
     @Override
     @ControllerMethod("查询绩效组人员")
@@ -57,12 +52,7 @@ public class KpiReportServiceImpl implements IKpiReportService {
         return success(kpiReportService.getIndicatorUser(kpiGroupUserQuery));
     }
  
-    /**
-     * 实时查询绩效组人员
-     *
-     * @param kpiGroupUserQuery 查询参数
-     * @return 分组人员
-     */
+    @Deprecated
     @GetMapping("/real-time/query/user")
     @Override
     @ControllerMethod("实时查询绩效组人员")
@@ -7,13 +7,8 @@ import cn.fw.morax.common.utils.EventBusUtil;
 import cn.fw.morax.common.utils.PublicUtil;
 import cn.fw.morax.domain.bo.kpi.KpiGroupCalculableBO;
 import cn.fw.morax.domain.db.kpi.KpiGroupUser;
-import cn.fw.morax.domain.db.kpi.KpiIndicatorHitLog;
 import cn.fw.morax.domain.db.kpi.KpiPool;
-import cn.fw.morax.domain.db.kpi.KpiPoolIndicatorValue;
 import cn.fw.morax.domain.enums.KpiIgnoreCauseEnum;
-import cn.fw.morax.domain.enums.StarLevelEnum;
-import cn.fw.morax.domain.vo.kpi.KpiGroupIndicatorVO;
-import cn.fw.morax.domain.vo.kpi.KpiGroupVO;
 import cn.fw.morax.rpc.ehr.EhrRpcService;
 import cn.fw.morax.rpc.ehr.dto.StaffBaseInfoDTO;
 import cn.fw.morax.service.biz.CommonService;
@@ -22,7 +17,6 @@ import cn.fw.morax.service.data.kpi.*;
 import cn.fw.security.auth.client.annotation.Authorization;
 import cn.fw.security.auth.client.enums.AuthType;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -31,10 +25,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.YearMonth;
-import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -80,23 +72,6 @@ public class KpiDebugController {
         return success();
     }
  
-    @GetMapping("/indicator/report")
-    @ControllerMethod("发送指标上报mq")
-    public Message<Void> sendReportIndicator(@RequestParam("indicatorCode") String indicatorCode,
-                                             @RequestParam("postId") Long postId,
-                                             @RequestParam("postName") String postName,
-                                             @RequestParam("groupId") Long groupId,
-                                             @RequestParam("reportDate") LocalDate reportDate) {
-        kpiReportService.sendNotice(indicatorCode, postId, postName, groupId, reportDate);
-        return success();
-    }
-
-    @GetMapping("/indicator/report-task")
-    @ControllerMethod("发送指标上报mq")
-    public Message<Void> sendReportIndicator() {
-        kpiReportService.sendNotice();
-        return success();
-    }
  
     @GetMapping("/indicator/calc/score")
     @ControllerMethod("计算绩效得分")
@@ -144,6 +119,7 @@ public class KpiDebugController {
     }
  
     private final EhrRpcService ehrRpcService;
+
     @GetMapping("/manage-staff1")
     @ControllerMethod("查询管理员工")
     public Message<List<StaffBaseInfoDTO>> initKgc1(Long userId) {
@@ -161,7 +137,7 @@ public class KpiDebugController {
                 .eq(KpiGroupUser::getIgnoreCause, KpiIgnoreCauseEnum.PROBATION)
                 .eq(KpiGroupUser::getYn, Boolean.TRUE)
         );
-        if (PublicUtil.isEmpty(userList)){
+        if (PublicUtil.isEmpty(userList)) {
             return success();
         }
  
@@ -40,7 +40,7 @@ public class KpiCalcTask {
     /**
      * 持久化业务系统上报的数据
      */
-    @Scheduled(initialDelay = 1000 * 10, fixedRate = 1000 * 60)
+    @Scheduled(initialDelay = 1000 * 10, fixedRate = 1000 * 15)
     public void persistence() {
         kpiReportService.persistenceUserKpiData();
     }
@@ -5,7 +5,8 @@
     <parent>
         <artifactId>fw-morax</artifactId>
         <groupId>cn.fw</groupId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
 package cn.fw.morax.service.biz.kpi;
  
-import cn.fw.common.exception.BusinessException;
 import cn.fw.morax.common.utils.DateUtil;
 import cn.fw.morax.common.utils.PublicUtil;
 import cn.fw.morax.common.utils.ThreadPoolUtil;
-import cn.fw.morax.domain.bo.kpi.KpiIndicatorBO;
 import cn.fw.morax.domain.bo.kpi.UserIndicatorBO;
 import cn.fw.morax.domain.db.kpi.*;
-import cn.fw.morax.domain.enums.KpiTargetTypeEnum;
 import cn.fw.morax.sdk.dto.CustomList;
-import cn.fw.morax.sdk.dto.kpi.*;
-import cn.fw.morax.service.component.KpiIndicatorReportProducer;
+import cn.fw.morax.sdk.dto.kpi.KpiGroupUserQuery;
+import cn.fw.morax.sdk.dto.kpi.KpiGroupUserResult;
+import cn.fw.morax.sdk.dto.kpi.KpiPointRewardReq;
+import cn.fw.morax.sdk.dto.kpi.UserIndicatorReq;
 import cn.fw.morax.service.data.kpi.*;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.Getter;
@@ -54,88 +52,20 @@ public class KpiReportService {
     private final KpiGroupService kpiGroupService;
     private final KpiGroupIndicatorService kpiGroupIndicatorService;
     private final KpiGroupUserService kpiGroupUserService;
-    private final KpiMqLogService kpiMqLogService;
-    private final KpiIndicatorReportProducer kpiIndicatorReportProducer;
     private final KpiPoolIndicatorValueService kpiPoolIndicatorValueService;
+    private final KpiIndicatorUserValueService kpiIndicatorUserValueService;
     private final KpiPoolService kpiPoolService;
     private final KpiRewardPointService kpiRewardPointService;
     private final StringRedisTemplate stringRedisTemplate;
     private final KpiGroupUserBizService kpiGroupUserBizService;
     private final KpiPoolCommonService kpiPoolCommonService;
+    /**
+     * 绩效指标数据上报redis-key
+     */
     @Value("${spring.cache.custom.global-prefix}:indicator-value")
     @Getter
     private String indicatorKeyPref;
  
-    /**
-     * 通知业务系统上报数据
-     * 有一天的延迟
-     */
-    public void sendNotice() {
-        final Set<KpiIndicatorBO> set = kpiGroupIndicatorService.allIndicators(DateUtil.localDate2Date(LocalDate.now().minusDays(1L)));
-        if (CollectionUtils.isEmpty(set)) {
-            return;
-        }
-        for (KpiIndicatorBO bo : set) {
-            try {
-                sendNotice(bo, LocalDate.now().minusDays(1L));
-            } catch (Exception e) {
-                log.error("发送绩效上报mq失败: [{}]", JSON.toJSONString(bo), e);
-            }
-        }
-    }
-
-    /**
-     * 手动 发送绩效数据上报mq
-     *
-     * @param indicatorCode
-     * @param postId
-     * @param groupId
-     * @param localDate
-     */
-    public void sendNotice(final String indicatorCode, final Long postId, final String postName, final Long groupId, final LocalDate localDate) {
-//        List<KpiGroupIndicator> kpiGroupIndicators = kpiGroupIndicatorService.list(Wrappers.<KpiGroupIndicator>lambdaQuery()
-//                .eq(KpiGroupIndicator::getIndicatorCode, indicatorCode)
-//                .eq(KpiGroupIndicator::getYn, Boolean.TRUE)
-//        );
-//        if (PublicUtil.isEmpty(kpiGroupIndicators)) {
-//            throw new BusinessException("指标不存在");
-//        }
-//        KpiIndicatorBO bo = KpiIndicatorBO.builder()
-//                .indicatorCode(indicatorCode)
-//                .indicatorName(kpiGroupIndicators.get(0).getIndicatorName())
-//                .postId(postId)
-//                .postName(postName)
-//                .groupId(groupId)
-//                .build();
-//        sendNotice(bo, localDate);
-    }
-
-    /**
-     * 发送绩效数据上报mq
-     *
-     * @param indicatorBO
-     * @param localDate
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void sendNotice(KpiIndicatorBO indicatorBO, final LocalDate localDate) {
-        KpiMqLog mqlog = new KpiMqLog();
-        mqlog.setIndicatorCode(indicatorBO.getIndicatorCode());
-        mqlog.setPostId(indicatorBO.getPostId());
-        mqlog.setSendDate(localDate);
-        mqlog.setGroupId(indicatorBO.getGroupId());
-        kpiMqLogService.save(mqlog);
-
-        kpiIndicatorReportProducer.send(KpiReportNoticeMQ.builder()
-                .indicatorCode(indicatorBO.getIndicatorCode())
-                .indicatorName(indicatorBO.getIndicatorName())
-                .postId(indicatorBO.getPostId())
-                .postName(indicatorBO.getPostName())
-                .groupId(indicatorBO.getGroupId())
-                .uploadDate(DateUtil.localDate2Date(localDate))
-                .uid(mqlog.getId())
-                .build());
-
-    }
  
     @Transactional(rollbackFor = Exception.class)
     public void reportKpiReward(KpiPointRewardReq req) {
@@ -172,7 +102,7 @@ public class KpiReportService {
     public void persistenceUserKpiData() {
         ThreadPoolExecutor threadPool = ThreadPoolUtil.getInstance().getThreadPool();
         ListOperations<String, String> opsForList = stringRedisTemplate.opsForList();
-        List<String> overflowsList = new ArrayList<>();
+        List<String> overflowsOrFailList = new ArrayList<>();
         String jsonStr;
         while ((jsonStr = opsForList.leftPop(getIndicatorKeyPref())) != null) {
             final UserIndicatorBO bo = JSONObject.parseObject(jsonStr, UserIndicatorBO.class);
@@ -181,21 +111,21 @@ public class KpiReportService {
             }
             try {
                 //保存业务系统绩效指标值
-                String finalJsonStr = jsonStr;
+                final String finalJsonStr = jsonStr;
                 threadPool.execute(() -> {
                     try {
                         saveUserIndicator(bo);
                     } catch (Exception e) {
                         log.error("保存业务系统绩效指标值失败：{}", bo, e);
-                        opsForList.rightPushAll(getIndicatorKeyPref(), finalJsonStr);
+                        overflowsOrFailList.add(finalJsonStr);
                     }
                 });
             } catch (RejectedExecutionException re) {
-                overflowsList.add(jsonStr);
+                overflowsOrFailList.add(jsonStr);
             }
         }
-        if (!CollectionUtils.isEmpty(overflowsList)) {
-            opsForList.rightPushAll(getIndicatorKeyPref(), overflowsList);
+        if (!CollectionUtils.isEmpty(overflowsOrFailList)) {
+            opsForList.rightPushAll(getIndicatorKeyPref(), overflowsOrFailList);
         }
     }
  
@@ -323,7 +253,7 @@ public class KpiReportService {
             return;
         }
         Set<Long> userIds = userList.stream().map(KpiGroupUser::getUserId).collect(Collectors.toSet());
-        List<KpiGroupUser> notExistUser = groupUsers.stream().filter(user -> (! userIds.contains(user.getUserId()))).collect(Collectors.toList());
+        List<KpiGroupUser> notExistUser = groupUsers.stream().filter(user -> (!userIds.contains(user.getUserId()))).collect(Collectors.toList());
         userList.addAll(notExistUser);
     }
  
@@ -331,51 +261,29 @@ public class KpiReportService {
      * 持久化业务系统上报的指标数据
      *
      * @param bo
-     * @throws cn.fw.common.exception.BusinessException 校验数据异常
      */
     @Transactional(rollbackFor = Exception.class)
-    protected void saveUserIndicator(UserIndicatorBO bo) {
-        LocalDate dataDate = DateUtil.date2LocalDate(bo.getDataDate());
-        //先通过绩效组获取绩效池，绩效池不存在就创建，绩效池存在检查绩效池在职门店与员工在职门店是否一致
-        KpiGroup kpiGroup = kpiGroupService.getEffectGroup(bo.getShopId(), bo.getPostId(), bo.getDataDate());
-        if (PublicUtil.isEmpty(kpiGroup)) {
-            log.error("上报门店、岗位不存在绩效组，上报数据：{}", JSON.toJSONString(bo));
-            throw new BusinessException("绩效数据上报，绩效组不存在");
-        }
-
-        KpiGroupUser groupUser = kpiGroupUserService.getOne(Wrappers.<KpiGroupUser>lambdaQuery()
-                .eq(KpiGroupUser::getShopId, bo.getShopId())
-                .eq(KpiGroupUser::getPostId, bo.getPostId())
-                .eq(KpiGroupUser::getUserId, bo.getUserId())
-                .eq(KpiGroupUser::getDataDate, dataDate)
-                .eq(KpiGroupUser::getYn, Boolean.TRUE)
-        );
-
-        KpiPool kpiPool = kpiPoolCommonService.inspectionPool(groupUser);
-        BV.notNull(kpiPool, () -> "用户绩效池不存在");
-
-        if (PublicUtil.isEmpty(groupUser)) {
-            log.error("上报门店、岗位不存在绩效人员，上报数据：{}", JSON.toJSONString(bo));
-            throw new BusinessException("绩效数据上报，绩效人员不存在");
+    public void saveUserIndicator(UserIndicatorBO bo) {
+        final LocalDate dataDate = DateUtil.date2LocalDate(bo.getDataDate());
+        Indicators indicator = indicatorsService.queryByCode(bo.getIndicatorCode(), Boolean.FALSE);
+        if (Objects.isNull(indicator)) {
+            return;
         }
-
-        kpiPoolIndicatorValueService.update(Wrappers.<KpiPoolIndicatorValue>lambdaUpdate()
-                .set(KpiPoolIndicatorValue::getYn, Boolean.FALSE)
-                .eq(KpiPoolIndicatorValue::getUserId, bo.getUserId())
-                .eq(KpiPoolIndicatorValue::getDataDate, DateUtil.date2LocalDate(bo.getDataDate()))
-                .eq(KpiPoolIndicatorValue::getIndicatorCode, bo.getIndicatorCode())
+        KpiIndicatorUserValue value = new KpiIndicatorUserValue();
+        value.setUserId(bo.getUserId());
+        value.setIndicatorCode(indicator.getIndicatorCode());
+        value.setIndicatorName(indicator.getIndicatorName());
+        value.setIndicatorValue(bo.getValue());
+        value.setDataDate(dataDate);
+        value.setGroupId(bo.getGroupId());
+        value.setYn(Boolean.TRUE);
+        kpiIndicatorUserValueService.remove(Wrappers.<KpiIndicatorUserValue>lambdaQuery()
+                .eq(KpiIndicatorUserValue::getUserId, value.getUserId())
+                .eq(KpiIndicatorUserValue::getIndicatorCode, value.getIndicatorCode())
+                .eq(KpiIndicatorUserValue::getDataDate, dataDate)
+                .eq(KpiIndicatorUserValue::getGroupId, value.getGroupId())
         );
-        KpiPoolIndicatorValue kpiValue = new KpiPoolIndicatorValue();
-        kpiValue.setKpiPoolId(kpiPool.getId());
-        kpiValue.setUserId(bo.getUserId());
-        kpiValue.setIndicatorCode(bo.getIndicatorCode());
-        kpiValue.setIndicatorValue(bo.getValue());
-        kpiValue.setDataDate(dataDate);
-        kpiValue.setMqLogId(bo.getUid());
-        kpiValue.setGroupId(kpiPool.getGroupId());
-        kpiValue.setYn(Boolean.TRUE);
-        kpiValue.setIndicatorScore(BigDecimal.ZERO);
-        kpiPoolIndicatorValueService.save(kpiValue);
+        kpiIndicatorUserValueService.save(value);
     }
  
     /**
-package cn.fw.morax.service.component;
-
-import cn.fw.morax.sdk.dto.kpi.KpiReportNoticeMQ;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author kurisu
- */
-@Slf4j
-@Component
-public class KpiIndicatorReportProducer {
-    @Autowired
-    private RocketMQTemplate rocketMQTemplate;
-
-    @RequestMapping(value = "send")
-    public void send(KpiReportNoticeMQ dto) {
-        log.info("指标业务数据上报通知mq: body:[{}]", dto);
-        rocketMQTemplate.syncSend(KpiReportNoticeMQ.TOPIC + ":*", dto);
-    }
-}
 \ No newline at end of file
+package cn.fw.morax.service.data.kpi;
+
+import cn.fw.morax.domain.db.kpi.KpiGroupIndicatorHitLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 指标配置命中记录
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : KpiGroupIndicatorHitLogService
+ * @description : 指标配置命中记录
+ * @date : 2022-12-15 10:07
+ */
+public interface KpiGroupIndicatorHitLogService extends IService<KpiGroupIndicatorHitLog> {
+}
+package cn.fw.morax.service.data.kpi;
+
+import cn.fw.morax.domain.db.kpi.KpiGroupIndicatorPreconditionHitLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 前置条件命中记录
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : KpiGroupIndicatorPreconditionHitLogService
+ * @description : 前置条件命中记录
+ * @date : 2022-12-15 10:18
+ */
+public interface KpiGroupIndicatorPreconditionHitLogService extends IService<KpiGroupIndicatorPreconditionHitLog> {
+}
+package cn.fw.morax.service.data.kpi;
+
+import cn.fw.morax.domain.db.kpi.KpiGroupIndicatorScoreLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 得分记录
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : KpiGroupIndicatorScoreLogService
+ * @description : 得分记录
+ * @date : 2022-12-15 10:22
+ */
+public interface KpiGroupIndicatorScoreLogService extends IService<KpiGroupIndicatorScoreLog> {
+}
+package cn.fw.morax.service.data.kpi;
+
+import cn.fw.morax.domain.db.kpi.KpiGroupIndicatorTargetHitLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author : kurisu
+ * @version : 2.0
+ * @className : KpiGroupIndicatorTargetHitLogService
+ * @description : 目标命中记录
+ * @date : 2022-12-15 10:21
+ */
+public interface KpiGroupIndicatorTargetHitLogService extends IService<KpiGroupIndicatorTargetHitLog> {
+}
+package cn.fw.morax.service.data.kpi;
+
+import cn.fw.morax.domain.db.kpi.KpiIndicatorUserValue;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 用户上报的绩效数据
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : KpiIndicatorUserValueService
+ * @description : 用户上报的绩效数据
+ * @date : 2022-12-15 11:24
+ */
+public interface KpiIndicatorUserValueService extends IService<KpiIndicatorUserValue> {
+}
-package cn.fw.morax.service.data.kpi;
-
-import cn.fw.morax.domain.db.kpi.KpiMqLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @author : kurisu
- * @version : 1.0
- * @className : KpiMqLogService
- * @description : 绩效mq发送记录
- * @date : 2022-04-12 18:22
- */
-public interface KpiMqLogService extends IService<KpiMqLog> {
-}
+package cn.fw.morax.service.data.kpi.impl;
+
+import cn.fw.morax.dao.kpi.KpiGroupIndicatorHitLogDao;
+import cn.fw.morax.domain.db.kpi.KpiGroupIndicatorHitLog;
+import cn.fw.morax.service.data.kpi.KpiGroupIndicatorHitLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 指标命中记录
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : KpiGroupIndicatorHitLogServiceImpl
+ * @description : 指标命中记录
+ * @date : 2022-12-15 10:24
+ */
+@Service
+@Slf4j
+public class KpiGroupIndicatorHitLogServiceImpl extends ServiceImpl<KpiGroupIndicatorHitLogDao, KpiGroupIndicatorHitLog> implements KpiGroupIndicatorHitLogService {
+}
+package cn.fw.morax.service.data.kpi.impl;
+
+import cn.fw.morax.dao.kpi.KpiGroupIndicatorPreconditionHitLogDao;
+import cn.fw.morax.domain.db.kpi.KpiGroupIndicatorPreconditionHitLog;
+import cn.fw.morax.service.data.kpi.KpiGroupIndicatorPreconditionHitLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 前置条件命中记录
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : KpiGroupIndicatorPreconditionHitLogServiceImpl
+ * @description : 前置条件命中记录
+ * @date : 2022-12-15 10:25
+ */
+@Service
+@Slf4j
+public class KpiGroupIndicatorPreconditionHitLogServiceImpl extends ServiceImpl<KpiGroupIndicatorPreconditionHitLogDao, KpiGroupIndicatorPreconditionHitLog> implements KpiGroupIndicatorPreconditionHitLogService {
+}
+package cn.fw.morax.service.data.kpi.impl;
+
+import cn.fw.morax.dao.kpi.KpiGroupIndicatorScoreLogDao;
+import cn.fw.morax.domain.db.kpi.KpiGroupIndicatorScoreLog;
+import cn.fw.morax.service.data.kpi.KpiGroupIndicatorScoreLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 得分命中记录
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : KpiGroupIndicatorScoreLogServiceImpl
+ * @description : 得分命中记录
+ * @date : 2022-12-15 10:25
+ */
+@Service
+@Slf4j
+public class KpiGroupIndicatorScoreLogServiceImpl extends ServiceImpl<KpiGroupIndicatorScoreLogDao, KpiGroupIndicatorScoreLog> implements KpiGroupIndicatorScoreLogService {
+}
+package cn.fw.morax.service.data.kpi.impl;
+
+import cn.fw.morax.dao.kpi.KpiGroupIndicatorTargetHitLogDao;
+import cn.fw.morax.domain.db.kpi.KpiGroupIndicatorTargetHitLog;
+import cn.fw.morax.service.data.kpi.KpiGroupIndicatorTargetHitLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 目标命中记录
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : KpiGroupIndicatorTargetHitLogServiceImpl
+ * @description : 目标命中记录
+ * @date : 2022-12-15 10:26
+ */
+@Service
+@Slf4j
+public class KpiGroupIndicatorTargetHitLogServiceImpl extends ServiceImpl<KpiGroupIndicatorTargetHitLogDao, KpiGroupIndicatorTargetHitLog> implements KpiGroupIndicatorTargetHitLogService {
+}
+package cn.fw.morax.service.data.kpi.impl;
+
+import cn.fw.morax.dao.kpi.KpiIndicatorUserValueDao;
+import cn.fw.morax.domain.db.kpi.KpiIndicatorUserValue;
+import cn.fw.morax.service.data.kpi.KpiIndicatorUserValueService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 绩效上报的数据
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : KpiIndicatorUserValueServiceImpl
+ * @description : 绩效上报的数据
+ * @date : 2022-12-15 11:25
+ */
+@Service
+@Slf4j
+public class KpiIndicatorUserValueServiceImpl extends ServiceImpl<KpiIndicatorUserValueDao, KpiIndicatorUserValue> implements KpiIndicatorUserValueService {
+}
-package cn.fw.morax.service.data.kpi.impl;
-
-import cn.fw.morax.dao.kpi.KpiMqLogDao;
-import cn.fw.morax.domain.db.kpi.KpiMqLog;
-import cn.fw.morax.service.data.kpi.KpiMqLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * @author : kurisu
- * @version : 1.0
- * @className : KpiMqLogServiceImpl
- * @description : 绩效mq发送记录
- * @date : 2022-04-12 18:23
- */
-@Service
-public class KpiMqLogServiceImpl extends ServiceImpl<KpiMqLogDao, KpiMqLog> implements KpiMqLogService {
-}
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fw-morax</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
     <packaging>pom</packaging>
     <name>fw-morax</name>
     <description>绩效薪酬系统</description>
@@ -32,7 +32,7 @@
         <mysql-connector-java.version>5.1.47</mysql-connector-java.version>
         <HikariCP.version>3.3.1</HikariCP.version>
         <!-- fw -->
-        <fw.morax.sdk.version>1.0.0</fw.morax.sdk.version>
+        <fw.morax.sdk.version>2.0.0</fw.morax.sdk.version>
         <rocketmq-spring-boot-starter.version>2.1.0</rocketmq-spring-boot-starter.version>
         <redis.spring.boot.starter>2.0</redis.spring.boot.starter>
         <fw-approval-sdk.version>1.0.0</fw-approval-sdk.version>