登录和报告

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

@@ -1,13 +1,17 @@
 package com.management.platform.controller;
 
 
+import com.management.platform.service.ReportService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author 吴涛涛
@@ -16,6 +20,41 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/report")
 public class ReportController {
+    @Autowired
+    private ReportService reportService;
 
+    /**
+     * 分页获取报告列表
+     * 分页页数 pageIndex
+     * 分页大小 pageSize
+     * 可传 报告人id id
+     * 可传 报告种类 type 0-日报 1-月报
+     * 可传 检索开始时间 startDate
+     * 可传 检索结束时间 endDate
+     */
+    @RequestMapping("/getReportList")
+    public HttpRespMsg getReportList(@RequestParam Integer pageIndex, @RequestParam Integer pageSize,
+                                     Integer id, Integer type, String startDate, String endDate) {
+        return reportService.getReportList(pageIndex, pageSize, id, type, startDate, endDate);
+    }
+
+    /**
+     * 根据id编辑报告
+     * 报告id id
+     * 报告内容 content
+     */
+    @RequestMapping("/editReport")
+    public HttpRespMsg editReport(@RequestParam Integer id, @RequestParam String content) {
+        return reportService.editReport(id, content);
+    }
+
+    /**
+     * 根据id删除报告
+     * 报告id id
+     */
+    @RequestMapping("/deleteReport")
+    public HttpRespMsg deleteReport(@RequestParam Integer id) {
+        return reportService.deleteReport(id);
+    }
 }
 

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

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author 吴涛涛
@@ -25,14 +25,22 @@ public class UserController {
 
     /**
      * 管理员登录网页端
-     *
-     * @param username  用户名
-     * @param password  密码
-     * @return
+     * username 用户名
+     * password 密码
      */
-    @RequestMapping("/login")
-    public HttpRespMsg login(@RequestParam String username, @RequestParam String password){
-        return userService.login(username, password);
+    @RequestMapping("/loginAdmin")
+    public HttpRespMsg loginAdmin(@RequestParam String username, @RequestParam String password) {
+        return userService.loginAdmin(username, password);
+    }
+
+    /**
+     * 员工登录PC端
+     * username 用户名
+     * password 密码
+     */
+    @RequestMapping("/loginEmployee")
+    public HttpRespMsg loginEmployee(@RequestParam String username, @RequestParam String password) {
+        return userService.loginEmployee(username, password);
     }
 }
 

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

@@ -6,14 +6,17 @@ import com.management.platform.util.HttpRespMsg;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 吴涛涛
  * @since 2019-12-31
  */
 public interface ReportService extends IService<Report> {
-    HttpRespMsg getReportList(Integer creatorId, Integer reportType, String startDate, String end);
+    HttpRespMsg getReportList(Integer pageIndex, Integer pageSize, Integer creatorId, Integer reportType,
+                              String startDate, String endDate);
+
     HttpRespMsg editReport(Integer reportId, String content);
+
     HttpRespMsg deleteReport(Integer reportId);
 }

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

@@ -6,12 +6,14 @@ import com.management.platform.util.HttpRespMsg;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 吴涛涛
  * @since 2019-12-31
  */
 public interface UserService extends IService<User> {
-    HttpRespMsg login(String username, String password);
+    HttpRespMsg loginAdmin(String username, String password);
+
+    HttpRespMsg loginEmployee(String username, String password);
 }

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

@@ -1,6 +1,7 @@
 package com.management.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.management.platform.entity.Report;
 import com.management.platform.mapper.ReportMapper;
 import com.management.platform.service.ReportService;
@@ -28,22 +29,34 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     /**
      * 获取报告列表
      * 可以基于报告者id 报告种类 报告日期来筛选
+     *
      * @param creatorId
      * @param reportType
      * @param startDate
-     * @param end
+     * @param endDate
      * @return
      */
     @Override
-    public HttpRespMsg getReportList(Integer creatorId, Integer reportType, String startDate, String end) {
-        //以上筛选目前都没卵用
+    public HttpRespMsg getReportList(Integer pageIndex, Integer pageSize, Integer creatorId, Integer reportType,
+                                     String startDate, String endDate) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
-        httpRespMsg.data = reportMapper.selectList(new QueryWrapper<>());
+        QueryWrapper<Report> queryWrapper = new QueryWrapper<>();
+        if (creatorId != null) {
+            queryWrapper.eq("creator_id", creatorId);
+        }
+        if (reportType != null) {
+            queryWrapper.eq("report_type", reportType);
+        }
+        if (startDate != null && endDate != null) {
+            queryWrapper.between("create_date", startDate, endDate);
+        }
+        httpRespMsg.data = reportMapper.selectPage(new Page<>(pageIndex, pageSize), new QueryWrapper<>());
         return httpRespMsg;
     }
 
     /**
      * 基于id修改报告内容
+     *
      * @param reportId
      * @param content
      * @return
@@ -66,6 +79,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
     /**
      * 基于id删除报告
+     *
      * @param reportId
      * @return
      */

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

@@ -29,12 +29,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     /**
      * 管理员登录网页端
-     * @param username
-     * @param password
-     * @return
      */
     @Override
-    public HttpRespMsg login(String username, String password) {
+    public HttpRespMsg loginAdmin(String username, String password) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         //根据电话号码获取账号信息
         List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("phone", username));
@@ -58,4 +55,33 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         }
         return httpRespMsg;
     }
+
+    /**
+     * 员工登录网页端
+     */
+    @Override
+    public HttpRespMsg loginEmployee(String username, String password) {
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        //根据电话号码获取账号信息
+        List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("phone", username));
+        if (userList.size() == 0) {
+            //未检索到账号时
+            httpRespMsg.setError("账号未注册");
+        } else if (userList.size() > 1) {
+            //检索到两个及以上账号时
+            httpRespMsg.setError("账号重名");
+        } else if (!userList.get(0).getRole().equals(0)) {
+            //检索的账号role不是1 即不是管理员时
+            httpRespMsg.setError("管理员无法登陆本端");
+        } else if (MD5Util.getPassword(password).equals(userList.get(0).getPassword())) {
+            //检测密码正确时
+            Map<String, Object> resultMap = new HashMap<>();
+            resultMap.put("portraitUrl", userList.get(0).getPortraitUrl());
+            //将头像的url返回回去
+            httpRespMsg.data = resultMap;
+        } else {
+            httpRespMsg.setError("密码错误");
+        }
+        return httpRespMsg;
+    }
 }