登录接口

inventory-ent/src/main/java/com/rzyc/advice/SaticScheduleTask.java

@@ -1,7 +1,5 @@
 package com.rzyc.advice;
 
-import com.rzyc.mapper.*;
-import com.rzyc.model.*;
 import com.rzyc.service.TaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

inventory-ent/src/main/java/com/rzyc/controller/BaseController.java

@@ -2609,9 +2609,6 @@ public class BaseController {
                 sysUserMapper.insert(sysUser);
             }else{
 
-                String password = PasswdFactory.decryptPasswd(sysUser.getSysuserid(),sysUser.getSyspassword());
-                System.out.println(password);
-                sysUser.setSyspassword(PasswdFactory.encryptPasswd(sysUser.getSysuserid(), enterprese.getEntname(), password));
                 sysUser.setSysusername(enterprese.getEntname());
                 sysUser.setChinaname(enterprese.getEntname());
                 sysUserMapper.changeUserName(sysUser);

inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java

@@ -2,11 +2,15 @@ package com.rzyc.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.common.utils.StringUtils;
+import com.common.utils.encryption.PasswdFactory;
+import com.common.utils.jwt.JwtUtil;
 import com.common.utils.model.Code;
 import com.common.utils.model.Message;
 import com.common.utils.model.SingleResult;
+import com.rzyc.bean.user.dto.LoginDto;
 import com.rzyc.model.ent.SysEnterprise;
 import com.rzyc.model.user.SysUnit;
+import com.rzyc.model.user.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -18,6 +22,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -104,4 +109,63 @@ public class PcCompanyController extends BaseController{
         return  singleResult;
     }
 
+    /**
+     * PC登录
+     * @param loginDto
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation(value = "PC登录", notes = "PC登录")
+    @PostMapping(value = "/pclogin")
+    @ResponseBody
+    public SingleResult<SysUser> pclogin(@Valid LoginDto loginDto)throws Exception{
+        SingleResult<SysUser> result = new SingleResult<>();
+        System.out.println("loginDto -> "+JSONArray.toJSONString(loginDto));
+        String sysusername = loginDto.getSysusername();
+        String syspassword = loginDto.getSyspassword();
+
+        String generateCode = request.getSession().getAttribute(constantsConfigure.getGenerateCodeKey())+"";
+        //验证码只能使用一次
+        request.getSession().removeAttribute(constantsConfigure.getGenerateCodeKey());
+
+        if(loginDto.getGenerateCode().equals(generateCode)){
+            SysUser sysUser = sysUserMapper.findBySysUserName(sysusername);
+            if(null != sysUser && StringUtils.isNotBlank(sysUser.getUsertype()) && sysUser.getUsertype().equals("政府用户")){
+                String ps = PasswdFactory.encryptPasswd(sysUser.getSysuserid(), sysusername, syspassword);
+                System.out.println("========" + ps);
+                if(sysUser.getSyspassword().equals(ps)){
+                    sysUser.setSyspassword("");
+
+                    //获取职务
+                    sysUser = getUserDuty(sysUser);
+
+                    //通过角色判断是否为安办 或者 部门管理员
+                    if(StringUtils.isNotBlank(sysUser.getUserroles())){
+                        Integer userRole = this.getUserRole(sysUser.getUserroles());
+                        sysUser.setUserRole(userRole);
+                    }
+
+                    //获取用户令牌
+                    String userToken = JwtUtil.createToken(sysUser.getSysuserid());
+                    sysUser.setUserToken(userToken);
+
+                    this.addLogAuth(sysUser.getSysuserid(),"登录","成功","");
+                    result.setData(sysUser);
+
+                }else{
+                    this.addLogAuth(sysUser.getSysuserid(),"登录","失败","");
+                    result.setCode(Code.PASSWORD_ERROR.getCode());
+                    result.setMessage(Message.PASSWORD_ERROR);
+                }
+            }else{
+                result.setCode(Code.PASSWORD_ERROR.getCode());
+                result.setMessage(Message.PASSWORD_ERROR);
+            }
+        }else{
+            result.setCode(Code.CODE_ERROT.getCode());
+            result.setMessage(Message.CODE_ERROT);
+        }
+        return result;
+    }
+
 }

inventory-ent/src/main/java/com/rzyc/controller/PersonalController.java

@@ -1,12 +1,24 @@
 package com.rzyc.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.common.utils.StringUtils;
+import com.common.utils.encryption.PasswdFactory;
+import com.common.utils.jwt.JwtUtil;
+import com.common.utils.model.Code;
+import com.common.utils.model.Message;
 import com.common.utils.model.SingleResult;
+import com.rzyc.bean.user.dto.LoginDto;
+import com.rzyc.bean.user.dto.WeChartLoginDto;
+import com.rzyc.model.ent.SysEnterprise;
+import com.rzyc.model.user.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 /**
  * 个人中心系统
  * @author dong
@@ -21,15 +33,66 @@ import org.springframework.web.bind.annotation.*;
 public class PersonalController extends BaseController{
 
     /**
-     * 用户登录
+     * 企业登录
-     * @version v1.0
+     * @param loginDto
-     * @author dong
+     * @return
-     * @date 2022/9/16 14:21
+     * @throws Exception
      */
-    @ApiOperation(value = "用户登录", notes = "用户登录")
+    @ApiOperation(value = "企业登录", notes = "企业登录")
-    @PostMapping(value = "/login")
+    @PostMapping(value = "/entlogin")
-    public SingleResult<String> login()throws Exception{
+    @ResponseBody
-        SingleResult<String> result = new SingleResult<>();
+    public SingleResult<SysUser> applogin(@Valid WeChartLoginDto loginDto)throws Exception{
+        SingleResult<SysUser> result = new SingleResult<>();
+        System.out.println("loginDto -> "+JSONArray.toJSONString(loginDto));
+        String sysusername = loginDto.getSysusername();
+        String syspassword = loginDto.getSyspassword();
+        System.out.println("sessionid -> "+request.getSession().getId());
+        SysUser sysUser = sysUserMapper.findBySysUserName(sysusername);
+        if(null != sysUser && StringUtils.isNotBlank(sysUser.getUsertype())){
+            if("企业用户".equals(sysUser)){
+                //如果企业被禁用 直接返回登录失败
+                SysEnterprise sysEnterprise = sysEnterpriseMapper.selectByPrimaryKey(sysUser.getSysunitorentid());
+                if(null == sysEnterprise){
+                    result.setCode(Code.TOKEN_EXPIRE.getCode());
+                    result.setMessage(Message.TOKEN_EXPIRE);
+                    return result;
+                }
+            }
+            String ps = PasswdFactory.encryptPasswd(sysUser.getSysuserid(), sysusername, syspassword);
+            if(sysUser.getSyspassword().equals(ps) || "guest".equals(sysUser.getUsertype())){
+                sysUser.setSyspassword("");
+
+
+                sysUser.setSyspassword("");
+
+                //获取职务
+                sysUser = getUserDuty(sysUser);
+
+//                if(StringUtils.isNotBlank())
+
+                //通过角色判断是否为安办 或者 部门管理员
+                if(StringUtils.isNotBlank(sysUser.getUserroles())){
+                    Integer userRole = this.getUserRole(sysUser.getUserroles());
+                    sysUser.setUserRole(userRole);
+                }
+
+                //用户权限
+                userAuth(sysUser);
+
+                this.addLogAuth(sysUser.getSysuserid(),"登录","成功","");
+                String userToken = JwtUtil.createToken(sysUser.getSysuserid());
+                sysUser.setUserToken(userToken);
+                result.setData(sysUser);
+
+            }else{
+                this.addLogAuth(sysUser.getSysuserid(),"登录","失败","");
+                result.setCode(Code.PASSWORD_ERROR.getCode());
+                result.setMessage(Message.PASSWORD_ERROR);
+            }
+        }else{
+            result.setCode(Code.PASSWORD_ERROR.getCode());
+            result.setMessage(Message.PASSWORD_ERROR);
+        }
         return result;
     }
 

inventory-ent/src/main/resources/application-dev.yml

@@ -56,18 +56,18 @@ logging:
     com.rzyc.mapper: debug
 
 
-#文件上传的配置
+#自定义配置
 onstants:
   #上传文件存放地址
-  file_location: /mnt/rzyc/resource/inventory/uploadFile/
+  file_location: /home/rzyc/resource/inventory/uploadFile/
   #上传文件公共地址
   file_header: /resource/inventory/uploadFile/
   #上传文件基础路径
-  service_file_header: http://42.193.40.239/
+  service_file_header: http://192.168.31.253/
   #父级地区id
   superior_org_code: 512000
   #动态详情基础地址
-  html_header: http://42.193.40.239:7010/
+  html_header: http://192.168.31.253:7010/
   #logourl
   logo_url: http://42.193.40.239/resource/inventory/citysafe_logo.png
   #政府端帮助文档url
@@ -83,11 +83,11 @@ onstants:
   #企业账号默认密码
   default_passwd: csaq512000
   #公示牌
-  gsp_path: /mnt/rzyc/resource/inventory/gsp.xlsx
+  gsp_path: /home/rzyc/resource/inventory/gsp.xlsx
   #zip下载地址
-  zip_path: /mnt/rzyc/resource/inventory/zip
+  zip_path: /home/rzyc/resource/inventory/zip
   #导出word模板路径
-  word_tmp: /mnt/rzyc/resource/inventory/wordtmp
+  word_tmp: /home/rzyc/resource/inventory/wordtmp