登录注册

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -67,6 +67,19 @@ public class SysDeptController extends BaseController
         return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
     }
 
+    /**
+     * 加载对应角色部门列表树
+     */
+    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
+    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
+    {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+        ajax.put("depts", deptService.buildDeptTreeSelect(depts));
+        return ajax;
+    }
+
     /**
      * 根据部门编号获取详细信息
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -51,6 +51,22 @@ public class SysLoginController
         return ajax;
     }
 
+    /**
+     * 登录方法
+     *
+     * @param username 登录信息
+     * @return 结果
+     */
+    @GetMapping("/akm/login")
+    public AjaxResult akmLogin(String username)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.akmLogin(username);
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
+
     /**
      * 获取用户信息
      * 

ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowDefinitionController.java

@@ -154,12 +154,19 @@ public class FlowDefinitionController extends BaseController {
     }
 
 
-    @ApiOperation(value = "发起流程")
+    /*@ApiOperation(value = "发起流程")
     @PostMapping("/start/{procDefId}")
     public AjaxResult start(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
                             @ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) {
         return flowDefinitionService.startProcessInstanceById(procDefId, variables);
 
+    }*/
+
+    @ApiOperation(value = "发起流程")
+    @PostMapping("/start")
+    public AjaxResult start(@ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) {
+        return flowDefinitionService.startProcessInstanceById("", variables);
+
     }
 
     @ApiOperation(value = "激活或挂起流程定义")

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage").permitAll()
+                .antMatchers("/login", "/register", "/captchaImage","/akm/login","/common/upload").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -1,6 +1,10 @@
 package com.ruoyi.framework.web.service;
 
 import javax.annotation.Resource;
+
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.mapper.SysRoleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -29,6 +33,8 @@ import com.ruoyi.framework.security.context.AuthenticationContextHolder;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 
+import java.util.List;
+
 /**
  * 登录校验方法
  * 
@@ -52,6 +58,12 @@ public class SysLoginService
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private SysPermissionService permissionService;
+
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
     /**
      * 登录验证
      * 
@@ -100,6 +112,41 @@ public class SysLoginService
         return tokenService.createToken(loginUser);
     }
 
+    public String akmLogin(String username) {
+        // 验证码校验
+        //validateCaptcha(username, code, uuid);
+        // 登录前置校验
+        String password = "1qaz!QAZ";
+        //loginPreCheck(username, password);
+        // 用户验证
+        Authentication authentication = null;
+        SysUser user = userService.selectUserByUserName(username);
+        if(user == null){
+            // 新增用户信息
+            user = new SysUser();
+            user.setUserName(username);
+            user.setNickName("用户");
+            user.setPassword(SecurityUtils.encryptPassword("1qaz!QAZ"));
+            Long[] roleIds = {2L};
+            user.setRoleIds(roleIds);
+            //查询普通角色
+            SysRole role = new SysRole();
+            role.setRoleId(2L);
+            List<SysRole> roles = sysRoleMapper.selectRoleList(role);
+            user.setRoles(roles);
+            userService.insertUser(user);
+        }
+        LoginUser loginUser = createLoginUser(user);
+        recordLoginInfo(loginUser.getUserId());
+        // 生成token
+        return tokenService.createToken(loginUser);
+    }
+
+    public LoginUser createLoginUser(SysUser user)
+    {
+        return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
+    }
+
     /**
      * 校验验证码
      * 
@@ -178,4 +225,5 @@ public class SysLoginService
         sysUser.setLoginDate(DateUtils.getNowDate());
         userService.updateUserProfile(sysUser);
     }
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/DkFj.java

@@ -38,11 +38,24 @@ public class DkFj extends BaseEntity
     @Excel(name = "附件档次 1:10万元以下 2:10-20 3:20-50 ")
     private String grade;
 
+    /***
+     * 附件类型名称
+     */
+    private String name;
+
     /** 附件类型 1: 身份证正面 2(身份证反面) 3配偶身份证正面 4配偶身份证反面 5:结婚证 6:户口本首页 7:户口本单页(本人) 8:户口本单页(配偶) 9:申请人征信报告(本人) 10:申请人征信报告(配偶) 11:担保人身份证正面 12:担保人身份证反面 13:担保人收入证明 14:推荐表 15: 创业担保贷款担保合同 16:营业执照 17:工资表 18:带动就业人员名单 19 房产抵押担保合同 20 房产土地证明 21:房产所属人身份证正面 22:房产所属人身份证反面 23:担保人2身份证正面 24:担保人2身份证反面 25:担保人2收入证明 */
     @Excel(name = "附件类型 1: 身份证正面 2(身份证反面) 3配偶身份证正面 4配偶身份证反面 5:结婚证 6:户口本首页 7:户口本单页(本人) 8:户口本单页(配偶) 9:申请人征信报告(本人) 10:申请人征信报告(配偶) 11:担保人身份证正面 12:担保人身份证反面 13:担保人收入证明 14:推荐表 15: 创业担保贷款担保合同 16:营业执照 17:工资表 18:带动就业人员名单 19 房产抵押担保合同 20 房产土地证明 21:房产所属人身份证正面 22:房产所属人身份证反面 23:担保人2身份证正面 24:担保人2身份证反面 25:担保人2收入证明")
     private String type;
 
-    public void setId(Long id) 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

ruoyi-system/src/main/resources/mapper/system/DkFjMapper.xml

@@ -11,13 +11,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="path"    column="path"    />
         <result property="status"    column="status"    />
         <result property="grade"    column="grade"    />
+        <result property="name"    column="name"    />
+
         <result property="type"    column="type"    />
         <result property="remark"    column="remark"    />
         <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectDkFjVo">
-        select id, dk_id, fj_name, path, status, grade, type, remark, create_time from dk_fj
+        select id, dk_id, fj_name, path, status, grade,name, type, remark, create_time from dk_fj
     </sql>
 
     <select id="selectDkFjList" parameterType="DkFj" resultMap="DkFjResult">
@@ -45,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="path != null">path,</if>
             <if test="status != null">status,</if>
             <if test="grade != null">grade,</if>
+            <if test="name != null">name,</if>
             <if test="type != null">type,</if>
             <if test="remark != null">remark,</if>
             <if test="createTime != null">create_time,</if>
@@ -55,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="path != null">#{path},</if>
             <if test="status != null">#{status},</if>
             <if test="grade != null">#{grade},</if>
+            <if test="name != null">#{name},</if>
             <if test="type != null">#{type},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -69,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="path != null">path = #{path},</if>
             <if test="status != null">status = #{status},</if>
             <if test="grade != null">grade = #{grade},</if>
+            <if test="name != null">name = #{name},</if>
             <if test="type != null">type = #{type},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createTime != null">create_time = #{createTime},</if>