From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/controller/EnterpriseController.java | 58 +++++++++++++++++-----------------------------------------
1 files changed, 17 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/controller/EnterpriseController.java b/src/main/java/com/ots/project/exam/controller/EnterpriseController.java
index ac5a52a..95afff2 100644
--- a/src/main/java/com/ots/project/exam/controller/EnterpriseController.java
+++ b/src/main/java/com/ots/project/exam/controller/EnterpriseController.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.controller;
-
import com.ots.common.utils.StringUtils;
import com.ots.common.utils.security.ShiroUtils;
import com.ots.framework.aspectj.lang.annotation.Log;
@@ -23,30 +22,19 @@
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-/**
- * @Created with IntelliJ IDEA.
- * @User: liguosheng
- * @Date: 2019/11/22
- * @Time: 10:40
- * @description: 浼佷笟鐢ㄦ埛
- */
@Controller
@RequestMapping("/exam/enterprise")
public class EnterpriseController extends BaseController {
-
private String prefix = "exam/enterprise";
@Autowired
private ISysUserExtendService sysUserExtendService;
-
@Autowired
private CountCalculateService calculate;
-
@RequiresPermissions("exam:enterprise:view")
@GetMapping()
public String enterprise(String parentUserId, String userName, ModelMap mmap) {
@@ -61,16 +49,11 @@
if (Objects.nonNull(userName)) {
mmap.put("userNameSend", userName);
}
-
List<SysUserExtend> list = sysUserExtendService.selectSysUserExtendList(sysUserExtend);
-
mmap.put("us", list);
return prefix + "/enterprise";
}
-
- /**
- * 鏌ヨ鐢ㄦ埛淇℃伅鎵╁睍鍒楄〃
- */
+
@RequiresPermissions("exam:enterprise:list")
@PostMapping("/list")
@ResponseBody
@@ -85,10 +68,7 @@
List<SysUserExtend> list = sysUserExtendService.selectSysUserExtendList(sysUserExtend);
return getDataTable(list);
}
-
- /**
- * 鏂板鐢ㄦ埛淇℃伅鎵╁睍
- */
+
@GetMapping("/add")
public String add(ModelMap mmap) {
User sysUser = ShiroUtils.getSysUser();
@@ -102,10 +82,7 @@
mmap.put("us", list);
return prefix + "/add";
}
-
- /**
- * 淇敼鐢ㄦ埛淇℃伅鎵╁睍
- */
+
@GetMapping("/edit/{userId}")
public String edit(@PathVariable("userId") Long userId, ModelMap mmap) {
SysUserExtend sysUserExtend = sysUserExtendService.selectSysUserExtendById(userId);
@@ -121,10 +98,7 @@
mmap.put("us", list);
return prefix + "/edit";
}
-
- /**
- * 娴嬭瘯浜烘暟璁剧疆
- */
+
@RequiresPermissions("exam:enterprise:editUserTimes")
@GetMapping("/operUseTimes/{userId}")
public String operUseTimes(@PathVariable("userId") Long userId, ModelMap mmap) {
@@ -142,15 +116,11 @@
});
systemScore = list.stream().mapToInt(p -> p.intValue()).sum();
}
-
mmap.put("totalNumberOfTesters", systemScore);
-// 鏄剧ず璇ヤ紒涓氬彲鐢ㄦ祴璇曚汉鏁帮紝鎬绘祴璇曚汉鏁�
+
return prefix + "/operUseTimes";
}
-
- /**
- * 鍏呭�兼祴璇曚汉鏁�
- */
+
@RequiresPermissions("exam:enterprise:editUserTimes")
@Log(title = "鍏呭�兼祴璇曚汉鏁�", businessType = BusinessType.UPDATE)
@PostMapping("/operUseTimes/edit/{userId}/{addNum}")
@@ -158,15 +128,23 @@
public AjaxResult editSave(@PathVariable("userId") Long userId, @PathVariable("addNum") Long addNum) {
return toAjax(sysUserExtendService.updateTestNum(userId, addNum));
}
-
+ @PostMapping("/checkUser")
+ @ResponseBody
+ public AjaxResult checkUser() {
+ User sysUser = ShiroUtils.getSysUser();
+ int result = 0;
+ if ("02".equals(sysUser.getUserType())) {
+ result = 1;
+ }
+ return toAjax(result);
+ }
@RequiresPermissions("exam:enterprise:remove")
@PostMapping("/remove")
@ResponseBody
public AjaxResult remove(String ids) {
return toAjax(sysUserExtendService.deleteSysUserExtendByIds(ids));
}
-
- // 鍏嶅瘑鐧诲綍
+
@RequiresPermissions("exam:enterprise:freelogin")
@PostMapping("/freelogin")
@ResponseBody
@@ -185,7 +163,6 @@
return error(msg);
}
}
-
@PostMapping("/freeloginback")
@ResponseBody
public AjaxResult freeLoginBack(Long userId) {
@@ -204,7 +181,6 @@
}
}
-// @RequiresPermissions("exam:extend:resetpwd")
@Log(title = "鐢ㄦ埛閲嶇疆瀵嗙爜", businessType = BusinessType.UPDATE)
@PostMapping("/resetpwd")
@ResponseBody
--
Gitblit v1.9.1