01

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

@@ -7,6 +7,7 @@ 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;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -65,6 +66,45 @@ public class UserController {
         return userService.deleteUser(userId, request);
     }
 
+    /**
+     * 修改密码
+     * originPassword 原密码
+     * newPassword 新密码
+     */
+    @RequestMapping("/editPassword")
+    HttpRespMsg editPassword(@RequestParam String originPassword, @RequestParam String newPassword) {
+        return userService.editPassword(originPassword, newPassword, request);
+    }
+
+    /**
+     * 新增公司和负责人
+     * companyName 公司名
+     * name 姓名
+     * phone 电话号码
+     */
+    @RequestMapping("/createCompany")
+    HttpRespMsg createCompany(@RequestParam String companyName, @RequestParam String name, @RequestParam String phone) {
+        return userService.createCompany(companyName, name, phone);
+    }
 
+    /**
+     * 新增用户
+     * name 用户名
+     * phone 电话号码
+     * role 角色 0-普通员工 2-管理员
+     */
+    @RequestMapping("/insertUser")
+    HttpRespMsg insertUser(@RequestParam String name, @RequestParam String phone, @RequestParam Integer role) {
+        return userService.insertUser(name, phone, role, request);
+    }
+
+    /**
+     * 使用文件导入用户信息
+     * file Excel文件
+     */
+    @RequestMapping("/importUser")
+    HttpRespMsg importUser(@RequestParam MultipartFile file) {
+        return userService.importUser(file, request);
+    }
 }
 

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

@@ -3,6 +3,7 @@ package com.management.platform.service;
 import com.management.platform.entity.User;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.management.platform.util.HttpRespMsg;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -28,4 +29,6 @@ public interface UserService extends IService<User> {
     HttpRespMsg createCompany(String companyName, String name, String phone);
 
     HttpRespMsg insertUser(String name, String phone, Integer role, HttpServletRequest request);
+
+    HttpRespMsg importUser(MultipartFile file, HttpServletRequest request);
 }

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

@@ -10,10 +10,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MD5Util;
 import com.management.platform.util.SnowFlake;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -154,8 +160,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             //然后生成一个负责人
             Long id = SnowFlake.nextId();
             User user = new User()
-                    .setName(name)
                     .setId(id.toString())
+                    .setName(name)
                     .setPassword(MD5Util.getPassword("000000"))
                     .setPhone(phone)
                     .setRole(1)
@@ -187,8 +193,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 } else {
                     Long id = SnowFlake.nextId();
                     User user = new User()
-                            .setName(name)
                             .setId(id.toString())
+                            .setName(name)
                             .setPassword(MD5Util.getPassword("000000"))
                             .setPhone(phone)
                             .setRole(role)
@@ -203,4 +209,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         }
         return httpRespMsg;
     }
+
+    //导入用户
+    @Override
+    public HttpRespMsg importUser(MultipartFile file, HttpServletRequest request) {
+        HttpRespMsg httpRespMsg = new HttpRespMsg();
+        httpRespMsg.setError("现在不能导入");
+        return httpRespMsg;
+    }
 }