Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

# Conflicts:
#	fhKeeper/formulahousekeeper/management-platform/target/classes/com/management/platform/util/FileUtil.class
#	fhKeeper/formulahousekeeper/management-platform/target/classes/com/management/platform/util/ProcessUtil.class

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/constant/Constant.java

@@ -1,14 +1,19 @@
 package com.management.platform.constant;
 
+import org.springframework.stereotype.Component;
+
 /**
  * Author: 吴涛涛
  * Date : 2019 - 07 - 24 16:00
  * Description:<描述>常量配置类
  * Version: 1.0
  */
+@Component
 public class Constant {
     public static final String API_KEY = "gtImOYhgcFBzwuT29tB7tM0Z";//百度文字识别apiKey
     public static final String SECRET_KEY = "RipT5kfF3Zqp7S2vTXPlNcMiYcA76jfq";//百度文字识别secretKey
+    public static final Integer UN_HANDLE = 0;//定时任务未处理的状态码
+    public static final String PIC_PATH_PREFIX = "";//定时任务未处理的状态码
 //    public static final String ACCESS_KEY = "280d6f0e4a774117905ba789a9f0b978";//百度图像识别accessKey
 //    public static final String SECRET_KEY = "43b460e124eb474c8cdb7441dc30d66d";//百度图像识别secretKey
 }

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -1,13 +1,25 @@
 package com.management.platform.task;
+import	java.time.format.DateTimeFormatter;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.constant.Constant;
+import com.management.platform.entity.Screenshot;
+import com.management.platform.mapper.ScreenshotMapper;
+import com.management.platform.service.ScreenshotService;
 import com.management.platform.util.AuthService;
+import com.management.platform.util.CheckPicUtil;
 import com.management.platform.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,6 +34,12 @@ public class TimingTask {
     @Autowired
     private RedisUtil redisUtil;
 
+    @Resource
+    private ScreenshotMapper screenshotMapper;
+
+    @Value(value = "${upload.path}")
+    private String  path;
+
 //    @Scheduled(cron = "0 */5 * * * ?")//配置时间段触发(每五分钟触发一次)
     public void pictureDetectionTask(){
         String accessToken = "";
@@ -35,6 +53,15 @@ public class TimingTask {
             redisUtil.setKeyWithExpireTime("accessToken",accessToken,expiresTimeOut);
         }
         //利用token去检测
+//        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//        LocalDateTime l = LocalDateTime.parse("2019-02-03",dateTimeFormatter);
+        List<Screenshot> screenshots = screenshotMapper.selectList(new QueryWrapper<Screenshot>()
+                .eq("date_str", DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDateTime.now()))
+                .eq("is_handle", Constant.UN_HANDLE));
+        for (Screenshot screenshot : screenshots) {
+            String general = CheckPicUtil.general(path + screenshot.getPicUrl().substring("/upload/".length()), accessToken);
+        }
+
 
     }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/test/TestApplicationTests.java

@@ -5,6 +5,7 @@ import com.management.platform.util.AuthService;
 import com.management.platform.util.RedisUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -16,13 +17,16 @@ import java.util.Map;
 public class TestApplicationTests {
     @Resource
     private RedisUtil redisUtil;
+    @Value(value = "${upload.path}")
+    private String  path;
     @Test
     public void contextLoads() {
 //        Map<String,Object> map = AuthService.getAuth(Constant.API_KEY, Constant.SECRET_KEY);
 //        String accessToken = (String)map.get("access_token");
 //        Long expiresTimeOut = (Long)map.get("expires_in");
 //        redisUtil.setKeyWithExpireTime("accessToken",accessToken,expiresTimeOut);
-        System.out.println(redisUtil.getKey("accessToken"));
+//        System.out.println(redisUtil.getKey("accessToken"));
+//        System.out.println(path);
 
     }
 

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application-prod.yml

@@ -33,6 +33,16 @@ spring:
         maxIdle: 10
         maxWait: 3
         maxActive: 8
+    ####全局配置时间返回格式#####
+  jackson:
+    #参数意义：
+    #JsonInclude.Include.ALWAYS       默认
+    #JsonInclude.Include.NON_DEFAULT   属性为默认值不序列化
+    #JsonInclude.Include.NON_EMPTY     属性为 空（””） 或者为 NULL 都不序列化
+    #JsonInclude.Include.NON_NULL      属性为NULL  不序列化
+    default-property-inclusion: ALWAYS
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
 
 ##########日志配置
 logging:
@@ -63,8 +73,13 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false
+######mybstis配置#######
 mybatis:
   type-aliases-package: com.management.platform.entity
   mapper-locations: mappers/*Mapper.xml
-######mybstis配置#######
+#####配置图片上传路径####
+upload:
+  path: E:/staticproject/manhourhousekeeper/upload/
+
+
 

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml

@@ -33,6 +33,16 @@ spring:
         maxIdle: 10
         maxWait: 3
         maxActive: 8
+  ####全局配置时间返回格式#####
+  jackson:
+    #参数意义：
+    #JsonInclude.Include.ALWAYS       默认
+    #JsonInclude.Include.NON_DEFAULT   属性为默认值不序列化
+    #JsonInclude.Include.NON_EMPTY     属性为 空（””） 或者为 NULL 都不序列化
+    #JsonInclude.Include.NON_NULL      属性为NULL  不序列化
+    default-property-inclusion: ALWAYS
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
 
 ##########日志配置
 logging:
@@ -63,8 +73,12 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false
+######mybstis配置#######
 mybatis:
   type-aliases-package: com.management.platform.entity
   mapper-locations: mappers/*Mapper.xml
-######mybstis配置#######
+#####配置图片上传路径####
+upload:
+  path: D:/upload/
+
 

fhKeeper/formulahousekeeper/management-platform/target/classes/application-prod.yml

@@ -1,70 +0,0 @@
-server:
-  port: 10010
-  tomcat:
-    uri-encoding: utf-8
-    max-http-form-post-size: -1
-    connection-timeout: 18000000s
-spring:
-  servlet:
-    multipart:
-      # 配置上传文件的大小设置
-      # Single file max size  即单个文件大小
-      max-file-size: 10000MB
-      max-request-size: 10000MB
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://118.190.47.230:3306/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: root
-    password: p011430seya1026
-    hikari:
-      maximum-pool-size: 10
-      minimum-idle: 3
-      max-lifetime: 30000
-      connection-test-query: SELECT 1
-    #######redis配置######
-    # redis
-    redis:
-      host: 118.190.47.230
-      port: 6379
-      timeout: 3
-      # password:
-      pool:
-        minIdle: 1
-        maxIdle: 10
-        maxWait: 3
-        maxActive: 8
-
-##########日志配置
-logging:
-  level:
-    root: info
-    org.mybatis: debug
-    java.sql: debug
-    org.springframework.web: trace
-    #打印sql语句
-    com.management.platform.mapper: debug
-  path: E:/
-##########
-mybatis-plus:
-  #  mapper-locations: classpath:mapper/*/*.xml
-  #  #实体扫描，多个package用逗号或者分号分隔
-  #  typeAliasesPackage: com.hssx.cloudmodel
-  global-config:
-    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-    id-type: 0
-    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-    field-strategy: 2
-    db-column-underline: true
-    refresh-mapper:
-    #################插入和更新非null判断
-    db-config:
-      insert-strategy: not_null
-      update-strategy: not_null
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-mybatis:
-  type-aliases-package: com.management.platform.entity
-  mapper-locations: mappers/*Mapper.xml
-######mybstis配置#######
-

fhKeeper/formulahousekeeper/management-platform/target/classes/application.yml

@@ -1,70 +0,0 @@
-server:
-  port: 10010
-  tomcat:
-    uri-encoding: utf-8
-    max-http-form-post-size: -1
-    connection-timeout: 18000000s
-spring:
-  servlet:
-    multipart:
-      # 配置上传文件的大小设置
-      # Single file max size  即单个文件大小
-      max-file-size: 10000MB
-      max-request-size: 10000MB
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://118.190.47.230:3306/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: root
-    password: p011430seya1026
-    hikari:
-      maximum-pool-size: 10
-      minimum-idle: 3
-      max-lifetime: 30000
-      connection-test-query: SELECT 1
-  #######redis配置######
-    # redis
-    redis:
-      host: 127.0.0.1
-      port: 6379
-      timeout: 3
-      # password:
-      pool:
-        minIdle: 1
-        maxIdle: 10
-        maxWait: 3
-        maxActive: 8
-
-##########日志配置
-logging:
-  level:
-    root: info
-    org.mybatis: debug
-    java.sql: debug
-    org.springframework.web: trace
-    #打印sql语句
-    com.management.platform.mapper: debug
-  path: E:/
-##########
-mybatis-plus:
-#  mapper-locations: classpath:mapper/*/*.xml
-#  #实体扫描，多个package用逗号或者分号分隔
-#  typeAliasesPackage: com.hssx.cloudmodel
-  global-config:
-    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-    id-type: 0
-    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-    field-strategy: 2
-    db-column-underline: true
-    refresh-mapper:
-#################插入和更新非null判断
-    db-config:
-      insert-strategy: not_null
-      update-strategy: not_null
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-mybatis:
-  type-aliases-package: com.management.platform.entity
-  mapper-locations: mappers/*Mapper.xml
-######mybstis配置#######
-

fhKeeper/formulahousekeeper/management-platform/target/classes/mapper/ReportMapper.xml

@@ -1,20 +0,0 @@
-<?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="com.management.platform.mapper.ReportMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.management.platform.entity.Report">
-        <id column="id" property="id" />
-        <result column="creator_id" property="creatorId" />
-        <result column="report_type" property="reportType" />
-        <result column="create_date" property="createDate" />
-        <result column="content" property="content" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, creator_id, report_type, create_date, content, create_time
-    </sql>
-
-</mapper>

fhKeeper/formulahousekeeper/management-platform/target/classes/mapper/UserMapper.xml

@@ -1,21 +0,0 @@
-<?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="com.management.platform.mapper.UserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.management.platform.entity.User">
-        <id column="id" property="id" />
-        <result column="name" property="name" />
-        <result column="phone" property="phone" />
-        <result column="password" property="password" />
-        <result column="portrait_url" property="portraitUrl" />
-        <result column="create_time" property="createTime" />
-        <result column="role" property="role" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, name, phone, password, portrait_url, create_time, role
-    </sql>
-
-</mapper>