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

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

@@ -97,14 +97,16 @@ public class UserController {
     }
 
     /**
-     * 新增用户
+     * 新增或修改用户
+     * id 要修改的用户id 修改时传
      * name 用户名
      * phone 电话号码
      * role 角色 0-普通员工 2-管理员
      */
     @RequestMapping("/insertUser")
-    public HttpRespMsg insertUser(@RequestParam String name, @RequestParam String phone, @RequestParam Integer role) {
-        return userService.insertUser(name, phone, role, request);
+    public HttpRespMsg insertUser(String id,
+                                  @RequestParam String name, @RequestParam String phone, @RequestParam Integer role) {
+        return userService.insertUser(id, name, phone, role, request);
     }
 
     /**

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

@@ -0,0 +1,9 @@
+package com.management.platform.entity.vo;
+
+import com.management.platform.entity.User;
+import lombok.Data;
+
+@Data
+public class UserVO extends User {
+    private String companyName;
+}

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

@@ -30,7 +30,7 @@ public interface UserService extends IService<User> {
 
     HttpRespMsg insertCompany(String companyName, String name, String phone);
 
-    HttpRespMsg insertUser(String name, String phone, Integer role, HttpServletRequest request);
+    HttpRespMsg insertUser(String id, String name, String phone, Integer role, HttpServletRequest request);
 
     HttpRespMsg importUser(MultipartFile multipartFile, HttpServletRequest request);
 

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());
@@ -296,16 +300,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();
+//        }
     }
 
     //娱乐类： 电影+游戏； 画面比较丰富的
@@ -523,4 +526,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/service/impl/UserServiceImpl.java

@@ -3,6 +3,7 @@ package com.management.platform.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.Company;
 import com.management.platform.entity.User;
+import com.management.platform.entity.vo.UserVO;
 import com.management.platform.mapper.CompanyMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.UserService;
@@ -17,6 +18,7 @@ import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -58,7 +60,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             httpRespMsg.setError("非管理员不能登陆系统");
         } else if (MD5Util.getPassword(password).equals(userList.get(0).getPassword())) {
             //检测密码正确时
-            httpRespMsg.data = userList.get(0);
+            UserVO userVO = new UserVO();
+            System.out.println("userList.get(0):" + userList.get(0));
+            BeanUtils.copyProperties(userList.get(0), userVO);
+            userVO.setCompanyName(companyMapper.selectById(userVO.getCompanyId()).getCompanyName());
+            httpRespMsg.data = userVO;
         } else {
             httpRespMsg.setError("密码错误");
         }
@@ -102,10 +108,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public HttpRespMsg getEmployeeList(HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
+            User requester = userMapper.selectById(request.getHeader("Token"));
             //获取本公司除负责人以外全部的信息
             httpRespMsg.data = userMapper.selectList(new QueryWrapper<User>()
                     .ne("role", 1)
-                    .eq("company_id", userMapper.selectById(request.getHeader("Token")).getCompanyId()));
+                    .ne("id", requester.getId())
+                    .eq("company_id", requester.getCompanyId()));
         } catch (NullPointerException e) {
             httpRespMsg.setError("验证失败");
             return httpRespMsg;
@@ -190,37 +198,42 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return httpRespMsg;
     }
 
-    //新增用户
+    //新增或修改用户
     @Override
-    public HttpRespMsg insertUser(String name, String phone, Integer role, HttpServletRequest request) {
+    public HttpRespMsg insertUser(String targetId, String name, String phone, Integer role, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             User creator = userMapper.selectById(request.getHeader("Token"));
-            //管理员只能新增员工
-            if (creator.getRole() == 2 && role != 0) {
-                httpRespMsg.setError("管理员只能新增普通员工");
-            } else if (role == 3) {
-                httpRespMsg.setError("不可新增负责人");
-            } else {
-                //电话号码列 检测重名
-                if (userMapper.selectList(new QueryWrapper<User>().eq("phone", phone)).size() > 0) {
-                    httpRespMsg.setError("电话号码重复");
+            if (targetId == null) {
+                //新增
+                if (creator.getRole() == 2 && role != 0) {
+                    httpRespMsg.setError("管理员只能新增普通员工");
+                } else if (role == 3) {
+                    httpRespMsg.setError("不可新增负责人");
                 } else {
-                    Long id = SnowFlake.nextId();
-                    User user = new User()
-                            .setId(id.toString())
-                            .setName(name)
-                            .setPassword(MD5Util.getPassword("000000"))
-                            .setPhone(phone)
-                            .setRole(role)
-                            .setCompanyId(creator.getCompanyId());
-                    if (userMapper.insert(user) == 0) {
-                        httpRespMsg.setError("操作失败");
+                    //电话号码列 检测重名
+                    if (userMapper.selectList(new QueryWrapper<User>().eq("phone", phone)).size() > 0) {
+                        httpRespMsg.setError("电话号码重复");
+                    } else {
+                        Long id = SnowFlake.nextId();
+                        User user = new User()
+                                .setId(id.toString())
+                                .setName(name)
+                                .setPassword(MD5Util.getPassword("000000"))
+                                .setPhone(phone)
+                                .setRole(role)
+                                .setCompanyId(creator.getCompanyId());
+                        if (userMapper.insert(user) == 0) {
+                            httpRespMsg.setError("操作失败");
+                        }
                     }
                 }
+            } else {
+                //修改
+                userMapper.updateById(userMapper.selectById(targetId).setName(name).setPhone(phone).setRole(role));
             }
         } catch (NullPointerException e) {
-            httpRespMsg.setError("验证失败");
+            httpRespMsg.setError("数据有误 验证失败");
             return httpRespMsg;
         }
         return httpRespMsg;

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

@@ -16,8 +16,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: