添加外部数据来源实现

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/BaseReq.java

@@ -6,11 +6,10 @@ import com.mortals.xhx.common.code.ProcessStatusEnum;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
 public abstract class BaseReq implements Serializable {
-
-
     /**
      * 当前页
      */
@@ -21,4 +20,35 @@ public abstract class BaseReq implements Serializable {
     private Integer size;
 
 
+
+
+
+    /**
+     * 工号
+     */
+    private String workNum;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 扣分时间
+     */
+    private Date happenTime;
+
+    /**
+     * 规则编码
+     */
+    private String ruleCode;
+    private String phone;
+
+
+    /**
+     * 类型
+     */
+    private String performType;
+
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/api/TalkApiController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.service.ICacheService;
 import com.mortals.xhx.busiz.dingtalk.config.TalkConfiguration;
 import com.mortals.xhx.busiz.dingtalk.req.DingTalkBaseReq;
 import com.mortals.xhx.common.code.YesNoEnum;
@@ -29,6 +30,7 @@ public class TalkApiController {
     private TalkConfiguration talkConfiguration;
 
 
+
     /**
      * 获取token
      *
@@ -39,8 +41,6 @@ public class TalkApiController {
         log.info("收到【getToken】请求【请求体】--> {}", JSON.toJSONString(dingTalkBaseReq));
         try {
 
-
-
          //   DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/gettoken");
 //            OapiGettokenRequest req = new OapiGettokenRequest();
 //            req.setHttpMethod("GET");

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/AttendSaveReq.java

+package com.mortals.xhx.busiz.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.xhx.busiz.BaseReq;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class AttendSaveReq extends BaseReq {
+    /**
+     * 所属考勤组ID
+     */
+    private Long attendanceGroupId;
+    /**
+     * 所属考勤组名称
+     */
+    private String attendanceGroupName;
+    /**
+     * 考勤时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date attendanceDate;
+
+    /**
+     * 异常时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date errorTime;
+    /**
+     * 上下班时间
+     */
+    private String goOffTimeStr;
+    /**
+     * 实际打卡时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date actualAttendTime;
+    /**
+     * 异常处理结果
+     */
+    private String errorResult;
+
+
+    /**
+     * 扩展字段
+     */
+    private String ext;
+
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/ComplainSaveReq.java

+package com.mortals.xhx.busiz.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.xhx.busiz.BaseReq;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class ComplainSaveReq extends BaseReq {
+
+
+    /**
+     * 投诉标题
+     */
+    private String complainTitle;
+    /**
+     * 投诉内容
+     */
+    private String complainContent;
+    /**
+     * 投诉人真实姓名
+     */
+    private String complainRealName;
+    /**
+     * 联系电话
+     */
+    private String contact;
+    /**
+     * 投诉时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date complainTime;
+    /**
+     * 投诉来源
+     */
+    private String complainSource;
+    /**
+     * 投诉设备
+     */
+
+    private String complainDevice;
+
+
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/EffectSaveReq.java

+package com.mortals.xhx.busiz.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.xhx.busiz.BaseReq;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class EffectSaveReq extends BaseReq {
+    /**
+     * 违规类型(1.脱岗,2.离岗,3.玩手机,4.睡觉)
+     */
+    private Integer irregularType;
+    /**
+     * 发生时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date happenTime;
+    /**
+     * 持续时间，秒
+     */
+    private Integer duration;
+    /**
+     * 报警时间
+     */
+    private Date alarmTime;
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/GoWorkSaveReq.java

+package com.mortals.xhx.busiz.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.xhx.busiz.BaseReq;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class GoWorkSaveReq extends BaseReq {
+
+    /**
+     * 办件编码
+     */
+    private String goworkCode;
+    /**
+     * 办件所属部门
+     */
+    private String goworkDepts;
+    /**
+     * 事项名称
+     */
+    private String matterlName;
+    /**
+     * 办理时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date goworkTime;
+
+    /**
+     * 扩展字段
+     */
+    private String ext;
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/OtherSaveReq.java

+package com.mortals.xhx.busiz.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.xhx.busiz.BaseReq;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class OtherSaveReq extends BaseReq {
+
+    /**
+     * 违规类型(1.工作纪律)
+     */
+    private Integer irregularOtherType;
+    /**
+     * 发生时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date happenTime;
+
+    /**
+     * 评分标准
+     */
+    private String ruleDesc;
+
+    /**
+     * 扩展字段
+     */
+    private String ext;
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/PerformSaveReq.java → attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/ReviewSaveReq.java

 package com.mortals.xhx.busiz.req;
 
-import com.mortals.framework.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.xhx.busiz.BaseReq;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 
 @Data
-public class PerformSaveReq extends BaseReq {
-
-    /**
-     * 工号
-     */
-    private String workNum;
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 扣分时间
-     */
-    private Date happenTime;
-
-    /**
-     * 规则编码
-     */
-    private String ruleCode;
-    private String phone;
-
-
-    /**
-     * 类型
-     */
-    private String performType;
-
-
+public class ReviewSaveReq extends BaseReq {
 
     /**
      * 评价结果(1.非常不满意,2.差评)
@@ -47,6 +17,7 @@ public class PerformSaveReq extends BaseReq {
     /**
      * 评价时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date reviewTime;
     /**
      * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
@@ -57,4 +28,6 @@ public class PerformSaveReq extends BaseReq {
      */
     private String reviewDevice;
 
+
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformDetailInfo.java

@@ -119,6 +119,8 @@ public class PerformDetailInfo {
      */
     private String filePaths;
 
+
+
     /**
      * 评价结果(1.非常不满意,2.差评)
      */

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/TestController.java

@@ -34,8 +34,7 @@ public class TestController {
     public String idGens() {
         log.info("测试id生成");
 
-        String stringId = idgeneratorService.getLongId(IdgeneratorServiceImpl.IdGeneratorKey.EFFECT).toString();
-
+        String stringId = idgeneratorService.getLongId(IdgeneratorServiceImpl.IdGeneratorKey.EFFECT_KEY).toString();
 
         return stringId;
     }