Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ScreenshotServiceImpl.java

@@ -16,6 +16,7 @@ import com.management.platform.mapper.PicContentKeywordsMapper;
 import com.management.platform.service.ScreenshotService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.util.*;
+import net.sourceforge.tess4j.Word;
 import org.apache.log4j.Logger;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -121,6 +122,7 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
 
     @Override
     public HttpRespMsg saveAndProcessImage(ScreenshotVO screenshotvo) {
+        System.out.println("uid==="+screenshotvo.getUid());
         String filePath = UploadFileToFileNameUtil.uploadFile(screenshotvo.getFile(), path);
         Screenshot screenshot = new Screenshot();
         BeanUtils.copyProperties(screenshotvo, screenshot);
@@ -156,6 +158,8 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
 
         if (isNovel(textContents)) {
             screenshot.setPicType(6);
+        } else if (isDocument(textContents)) {
+            screenshot.setPicType(2);//看文档
         } else {
 
             List<String> exeprocessList = ProcessUtil.getExeprocessListfromProcessStr(screenshotvo.getProcessList());
@@ -297,16 +301,15 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
 //        String str = "中文";
 //        System.out.println(str.toCharArray().length);
 //        isEntertainment(new File("C://Users/seya/Desktop/1.jpg"));
-        String browserName = null;
-        try {
-            browserName = isBrowser(new File("C://Users/seya/Desktop/chrome.jpg"));
-            System.out.println(
-                    "找到浏览器==" + browserName
-            );
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
+//        String browserName = null;
+//        try {
+//            browserName = isBrowser(new File("C://Users/seya/Desktop/chrome.jpg"));
+//            System.out.println(
+//                    "找到浏览器==" + browserName
+//            );
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
     }
 
     //娱乐类： 电影+游戏； 画面比较丰富的
@@ -524,4 +527,24 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
             return browserName;
         }
     }
+
+    /**
+     * 判断是否是看文档， 具体类型为word, excel, pdf, ppt
+     * @param textContents
+     * @return
+     */
+    public static boolean isDocument(List<String> textContents) {
+        boolean find = false;
+        for (int i=0;i<textContents.size() && i <= 2; i++) {//出现在前三行
+            String text = textContents.get(i);
+            if (text.endsWith("Word")
+                    || text.endsWith("Excel")
+                    || text.endsWith("Power Point")
+                    || text.endsWith("Adobe Reader")) {
+                find = true;
+                break;
+            }
+        }
+        return find;
+    }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/ImageReconizeUtil.java

@@ -18,8 +18,8 @@ public class ImageReconizeUtil {
         //-Djava.library.path=$PROJECT_DIR$\opencv\x64
     }
     public static void main(String[] args) {
-        boolean match = isTemplateMatch("C:\\Users\\seya\\Desktop\\loading.jpg",
-                "C:\\\\picrecongnize\\\\Chrome\\\\4-125.jpg");
+        boolean match = isTemplateMatch("C:\\upload\\98529fd7931b412cb740237d4bb6ff24.jpg",
+                "C:\\\\picrecongnize\\\\360\\\\1.jpg");
 //        match = isTemplateMatch("C:\\Users\\seya\\Desktop\\chrome_gray.jpg",
 //                "C:\\\\picrecongnize\\\\Chrome\\\\4-125.jpg");
 //        match = isTemplateMatch("C:\\Users\\seya\\Desktop\\chrome_gray.jpg",

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

@@ -14,7 +14,7 @@ spring:
       location: C:/upload/
   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
+    url: jdbc:mysql://118.190.47.230:3306/man2?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
     password: p011430seya1026
     hikari:

fhKeeper/formulahousekeeper/mywork/home.cpp

@@ -198,7 +198,11 @@ void Home::captureScreen() {
     //text paramter
     QHttpPart textPart;
     textPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"uid\""));
-    textPart.setBody("2");
+    QSettings *qs = new QSettings("MyManager",QSettings::IniFormat,this);
+    qs->beginGroup("user");
+    QString id = qs->value("id").toString();
+
+    textPart.setBody(id.toUtf8());
     multiPart->append(textPart);
     QHttpPart textPart2;
     textPart2.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"indate\""));
@@ -238,7 +242,7 @@ Home::~Home()
 void Home::closeEvent ( QCloseEvent * e )
 {
     if( QMessageBox::question(this,
-                             tr("退出"),
+                             tr("Quit"),
                              tr("Are you sure to quit this application?"),
                               QMessageBox::Yes, QMessageBox::No )
                    == QMessageBox::Yes){

fhKeeper/formulahousekeeper/mywork/httpapi.h

@@ -6,8 +6,8 @@
 #include <QPair>
 #include <QJsonObject>
 #include "baseapi.h"
-//const QString SERVER_URL = QString("http://127.0.0.1:10010");
-const QString SERVER_URL = QString("http://118.190.47.230:10010");
+const QString SERVER_URL = QString("http://127.0.0.1:10010");
+//const QString SERVER_URL = QString("http://118.190.47.230:10010");
 class HttpAPI: public BaseAPI
 {
 public: