01

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

@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  * 前端控制器
@@ -22,13 +24,15 @@ import org.springframework.web.bind.annotation.RestController;
 public class ProjectController {
     @Autowired
     private ProjectService projectService;
+    @Autowired
+    private HttpServletRequest request;
 
     /**
      * 获取项目列表
      */
     @RequestMapping("/getProjectList")
     public HttpRespMsg getProjectList() {
-        return projectService.getProjectList();
+        return projectService.getProjectList(request);
     }
 
     /**
@@ -38,7 +42,7 @@ public class ProjectController {
      */
     @RequestMapping("/editProject")
     public HttpRespMsg editProject(Integer id, @RequestParam String name) {
-        return projectService.editProject(id, name);
+        return projectService.editProject(id, name, request);
     }
 
     /**

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

@@ -82,9 +82,9 @@ public class UserController {
      * name 姓名
      * phone 电话号码
      */
-    @RequestMapping("/createCompany")
-    HttpRespMsg createCompany(@RequestParam String companyName, @RequestParam String name, @RequestParam String phone) {
-        return userService.createCompany(companyName, name, phone);
+    @RequestMapping("/insertCompany")
+    HttpRespMsg insertCompany(@RequestParam String companyName, @RequestParam String name, @RequestParam String phone) {
+        return userService.insertCompany(companyName, name, phone);
     }
 
     /**

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

@@ -4,6 +4,8 @@ import com.management.platform.entity.Project;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.management.platform.util.HttpRespMsg;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  * 服务类
@@ -13,9 +15,9 @@ import com.management.platform.util.HttpRespMsg;
  * @since 2020-01-03
  */
 public interface ProjectService extends IService<Project> {
-    HttpRespMsg getProjectList();
+    HttpRespMsg getProjectList(HttpServletRequest request);
 
-    HttpRespMsg editProject(Integer id, String name);
+    HttpRespMsg editProject(Integer id, String name, HttpServletRequest request);
 
     HttpRespMsg deleteProject(Integer id);
 }

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

@@ -26,7 +26,7 @@ public interface UserService extends IService<User> {
 
     HttpRespMsg editPassword(String originPassword, String newPassword, HttpServletRequest request);
 
-    HttpRespMsg createCompany(String companyName, String name, String phone);
+    HttpRespMsg insertCompany(String companyName, String name, String phone);
 
     HttpRespMsg insertUser(String name, String phone, Integer role, HttpServletRequest request);
 

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

@@ -3,14 +3,17 @@ package com.management.platform.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.Project;
 import com.management.platform.entity.Report;
+import com.management.platform.entity.User;
 import com.management.platform.mapper.ProjectMapper;
 import com.management.platform.mapper.ReportMapper;
+import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * <p>
@@ -25,35 +28,48 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     @Resource
     private ProjectMapper projectMapper;
     @Resource
+    private UserMapper userMapper;
+    @Resource
     private ReportMapper reportMapper;
 
     //获取项目列表
     @Override
-    public HttpRespMsg getProjectList() {
+    public HttpRespMsg getProjectList(HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
-        httpRespMsg.data = projectMapper.selectList(new QueryWrapper<>());
+        try {
+            Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
+            httpRespMsg.data = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", companyId));
+        } catch (NullPointerException e) {
+            httpRespMsg.setError("验证失败");
+        }
         return httpRespMsg;
     }
 
     //添加或编辑项目
     @Override
-    public HttpRespMsg editProject(Integer id, String name) {
+    public HttpRespMsg editProject(Integer id, String name, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
-        if (id == null) {
-            //新增项目
-            if (name == null) {
-                httpRespMsg.setError("请填写项目名称");
+        try {
+            Integer companyId = userMapper.selectById(request.getHeader("Token")).getCompanyId();
+            if (id == null) {
+                //新增项目
+                if (name == null) {
+                    httpRespMsg.setError("请填写项目名称");
+                } else {
+                    if (projectMapper.insert(new Project().setProjectName(name).setCompanyId(companyId)) == 0) {
+                        httpRespMsg.setError("操作失败");
+                    }
+                }
             } else {
-                if (projectMapper.insert(new Project().setProjectName(name)) == 0) {
+                //修改项目
+                if (projectMapper.updateById(new Project().setProjectName(name).setId(id).setCompanyId(companyId)) == 0) {
                     httpRespMsg.setError("操作失败");
                 }
             }
-        } else {
-            //修改项目
-            if (projectMapper.updateById(new Project().setProjectName(name).setId(id)) == 0) {
-                httpRespMsg.setError("操作失败");
-            }
+        } catch (NullPointerException e) {
+            httpRespMsg.setError("验证失败");
         }
+
         return httpRespMsg;
     }
 

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

@@ -401,12 +401,14 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
             //单独记录当前的时间以便使用
             LocalTime currentTime = screenshot.getIndate().toLocalTime();
             if (latestRecord != null) {
-                //如果有记录的话 单独记录原来时间并加上间隔时间 准备进行对比
-                LocalTime estimatedTime = latestRecord.getEndTime().plusSeconds(DETECTION_INTERVAL);
-                //和当前时间进行对比 如果在小时和分数数相同则认为是连续的 秒和毫秒不考虑
-                if (estimatedTime.getHour() == currentTime.getHour()
-                        && estimatedTime.getMinute() == currentTime.getMinute()) {
-                    //确认连续 此时将状态改为连续
+                //如果有记录的话 准备计算上次结束和新的开始的时间差
+                LocalTime estimatedTime = latestRecord.getEndTime();
+                Integer durationSecond = ((currentTime.getHour() - estimatedTime.getHour()) * 3600
+                        + (currentTime.getMinute() - estimatedTime.getMinute()) * 60
+                        + (currentTime.getSecond() - estimatedTime.getSecond()));
+                //如果断层不大于600秒的话
+                if (durationSecond <= DETECTION_INTERVAL) {
+                    //确认连续 将状态改为连续
                     isConsecutive = true;
                 }
             }

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

@@ -148,7 +148,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     //新增公司和负责人
     @Override
-    public HttpRespMsg createCompany(String companyName, String name, String phone) {
+    public HttpRespMsg insertCompany(String companyName, String name, String phone) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         //首先检测用户名是否重复
         if (userMapper.selectList(new QueryWrapper<User>().eq("phone", phone)).size() > 0) {