用户是否为项目经理

cloud-model/src/main/java/com/hssx/cloudmodel/controller/UserController.java

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.hssx.cloudmodel.service.ProjectService;
 import com.hssx.cloudmodel.service.UserService;
@@ -39,17 +40,17 @@ public class UserController {
 
     /**
      *
-     * @param user
+     * @param userVO
      * 参数：account 账号 password 密码
      * @return
      */
     @ApiOperation(value = "普通用户登录", notes = "登录方法")
     @RequestMapping("/login")
     @ResponseBody
-    public HttpRespMsg sysLogin(User user, HttpServletRequest request,
+    public HttpRespMsg sysLogin(UserVO userVO, HttpServletRequest request,
                                 HttpServletResponse response) {
-        log.info("user"+user);
-        HttpRespMsg msg = userService.login(user,request);
+        log.info("user"+userVO);
+        HttpRespMsg msg = userService.login(userVO,request);
         return msg;
     }
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/ProjectFile.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 
 /**
@@ -16,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-07-30
+ * @since 2019-08-06
  */
 @TableName("tb_project_file")
 public class ProjectFile extends Model<ProjectFile> {
@@ -75,7 +73,6 @@ public class ProjectFile extends Model<ProjectFile> {
      * 上传时间
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/UserVO.java

@@ -1,6 +1,7 @@
 package com.hssx.cloudmodel.entity.vo;
 
 import com.hssx.cloudmodel.entity.User;
+import lombok.Data;
 
 /**
  * Author: 吴涛涛 cuiyi@itany.com
@@ -8,12 +9,14 @@ import com.hssx.cloudmodel.entity.User;
  * Description:<描述>
  * Version: 1.0
  */
+@Data
 public class UserVO extends User {
     private String companyName;
     private String roleName;
     private String keyName;//项目名称
     private Integer searchType;//搜索类型0-模具编号，1-模具名称
     private Integer projectId;
+    private Integer isManager = 0;
 
     public Integer getProjectId() {
         return projectId;

cloud-model/src/main/java/com/hssx/cloudmodel/service/UserService.java

@@ -2,6 +2,7 @@ package com.hssx.cloudmodel.service;
 
 import com.hssx.cloudmodel.entity.User;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 
@@ -19,7 +20,7 @@ public interface UserService extends IService<User> {
 
     HttpRespMsg addAndUpdateUser(User user, Integer flag);
 
-    HttpRespMsg login(User user, HttpServletRequest request);
+    HttpRespMsg login(UserVO userVO, HttpServletRequest request);
 
     HttpRespMsg pageList(PageUtil page,Integer companyId,Integer flag,String keyName,User user,Integer roleType);
 

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/UserServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.MD5Util;
 import com.hssx.cloudmodel.util.PageUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,20 +43,25 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     ProjectMapper projectMapper;
 
     @Override
-    public HttpRespMsg login(User user, HttpServletRequest request) {
-        System.out.println("user" + user);
+    public HttpRespMsg login(UserVO userVO, HttpServletRequest request) {
+        System.out.println("user" + userVO);
         HttpRespMsg msg = new HttpRespMsg();
         //验证用户名是否存在
         QueryWrapper<User> qw = new QueryWrapper<>();
-        qw.eq("account", user.getAccount());
+        qw.eq("account", userVO.getAccount());
         Integer count = userMapper.selectCount(qw);
         //验证用户名是否正确
         if (count > 0) {
             User newUser = userMapper.selectOne(qw);
             //验证密码是否正确
-            if (MD5Util.getPassword(user.getPassword()).equals(newUser.getPassword())) {
+            if (MD5Util.getPassword(userVO.getPassword()).equals(newUser.getPassword())) {
                 newUser.setPassword("");
-                msg.data = newUser;
+                BeanUtils.copyProperties(newUser,userVO);
+                //判断该用户是否为某个项目的项目经理
+                if(projectMapper.selectCount(new QueryWrapper<Project>().eq("manager_id",newUser.getId()))>0){
+                    userVO.setIsManager(1);
+                }
+                msg.data = userVO;
             } else {
                 msg.setError("密码错误");
             }

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_project_approve");
+        strategy.setInclude("tb_power");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);