user表id改为String类型 snowflake

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/PicContentKeywordsController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2020-01-08
+ */
+@RestController
+@RequestMapping("/pic-content-keywords")
+public class PicContentKeywordsController {
+
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/PicContentKeywords.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2020-01-03
+ * @since 2020-01-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -42,6 +42,12 @@ public class PicContentKeywords extends Model<PicContentKeywords> {
     @TableField("type")
     private Integer type;
 
+    /**
+     * 对应进程(多个)如：‘idea64.exe,idea32.exe’
+     */
+    @TableField("process_name")
+    private String processName;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Project.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2020-01-03
+ * @since 2020-01-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Report.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2020-01-06
+ * @since 2020-01-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -36,7 +36,7 @@ public class Report extends Model<Report> {
      * user表外键 报告的作者
      */
     @TableField("creator_id")
-    private Integer creatorId;
+    private String creatorId;
 
     /**
      * project表外键 相关项目

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Screenshot.java

@@ -9,7 +9,6 @@ import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -17,7 +16,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author 吴涛涛
- * @since 2020-01-03
+ * @since 2020-01-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -36,7 +35,7 @@ public class Screenshot extends Model<Screenshot> {
      * 用户id
      */
     @TableField("uid")
-    private Integer uid;
+    private String uid;
 
     /**
      * 图片url
@@ -48,7 +47,6 @@ public class Screenshot extends Model<Screenshot> {
      * 截图时间
      */
     @TableField("indate")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime indate;
 
     /**
@@ -58,7 +56,7 @@ public class Screenshot extends Model<Screenshot> {
     private Integer isNormal;
 
     /**
-     * 是否检测 0-否 1-是
+     * 定时任务是否检测 0-否 1-是
      */
     @TableField("is_handle")
     private Integer isHandle;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/User.java

@@ -1,6 +1,5 @@
 package com.management.platform.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -16,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2020-01-03
+ * @since 2020-01-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -26,10 +25,10 @@ public class User extends Model<User> {
     private static final long serialVersionUID=1L;
 
     /**
-     * 主键
+     * 主键 雪花算法生成
      */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    @TableId("id")
+    private String id;
 
     /**
      * 名字

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/PicContentKeywordsMapper.xml

@@ -7,11 +7,12 @@
         <id column="id" property="id" />
         <result column="content" property="content" />
         <result column="type" property="type" />
+        <result column="process_name" property="processName" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, content, type
+        id, content, type, process_name
     </sql>
 
 </mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ScreenshotMapper.xml

@@ -4,15 +4,15 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.management.platform.entity.Screenshot">
-        <id column="id" property="id" />
-        <result column="uid" property="uid" />
-        <result column="pic_url" property="picUrl" />
-        <result column="indate" property="indate" />
-        <result column="is_normal" property="isNormal" />
-        <result column="is_handle" property="isHandle" />
-        <result column="date_str" property="dateStr" />
-        <result column="pic_type" property="picType" />
-        <result column="pic_context" property="picContext" />
+        <id column="id" property="id"/>
+        <result column="uid" property="uid"/>
+        <result column="pic_url" property="picUrl"/>
+        <result column="indate" property="indate"/>
+        <result column="is_normal" property="isNormal"/>
+        <result column="is_handle" property="isHandle"/>
+        <result column="date_str" property="dateStr"/>
+        <result column="pic_type" property="picType"/>
+        <result column="pic_context" property="picContext"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->

fhKeeper/formulahousekeeper/timesheet/package-lock.json

@@ -3625,12 +3625,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3645,17 +3647,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3772,7 +3777,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3784,6 +3790,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3798,6 +3805,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3805,12 +3813,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3829,6 +3839,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3909,7 +3920,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3921,6 +3933,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4042,6 +4055,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",