From eaf842d3224720dca6c0267cf9f13f7b72f49a89 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 03 一月 2026 00:48:10 +0800
Subject: [PATCH] 调增工单页面，调整登录验证功能
---
fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml | 17 +++++++-
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java | 33 ++++++++++++++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java | 4 +
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysLoginController.java | 55 +++++++++++++++++++++++++--
5 files changed, 102 insertions(+), 9 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
index 6cb5550..146f30f 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.DepotConf;
import com.fzzy.igds.mapper.DepotConfMapper;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
@@ -53,6 +55,35 @@
queryWrapper.eq("dept_id", deptId);
}
return depotConfMapper.selectList(queryWrapper);
+ }
+
+ /**
+ * 鏍规嵁鐢ㄦ埛绫诲瀷鏌ヨ閰嶇疆淇℃伅
+ * @return
+ */
+ public List<DepotConf> getConfListByUserType() {
+ //鑾峰彇褰撳墠鐧诲綍浜�
+ SysUser user = ContextUtil.getLoginUser();
+
+ QueryWrapper<DepotConf> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("company_id", user.getCompanyId());
+
+ //鐩戠鐢ㄦ埛-榛樿鏌ョ湅鎵�鏈変俊鎭笉澧炲姞鏉′欢
+ if (Constant.USER_TYPE_10.equals(user.getUserType())) {
+ //涓嶅鍔犳潯浠�
+ }
+
+ //閾惰鐢ㄦ埛锛屾牴鎹悎鍚屾煡璇㈤摱琛屼笅鎵�鏈夊簱鍖�
+ if (Constant.USER_TYPE_20.equals(user.getUserType())) {
+
+ return this.getDeptByContract(user.getUserData());
+ }
+
+
+
+
+
+ return null;
}
/**
@@ -236,4 +267,6 @@
updateWrapper.eq("dept_id", ContextUtil.subDeptId(null)).set("pos_x", freq);
depotConfMapper.update(null, updateWrapper);
}
+
+
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java
index fc9555d..e9dadfc 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotConfPR.java
@@ -32,7 +32,7 @@
*/
@DataProvider
public List<DepotConf> getConfList() {
- return depotConfService.getConfList(null, ContextUtil.subDeptId(null));
+ return depotConfService.getConfListByUserType();
}
/**
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
index ee8a188..7a1d369 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
@@ -23,13 +23,15 @@
private CoreDeptService coreDeptService;
/**
+ *
+ * ${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}
* 鏍规嵁鐢ㄦ埛绫诲瀷鑾峰彇瀵瑰簲搴撳尯鍒楄〃淇℃伅
* deptPR#getDeptByUserType
+ *
* @return
*/
@DataProvider
public List<Dept> getDeptByUserType(String parentId) {
-
return coreDeptService.getDeptByUserType(parentId);
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
index 174c171..3fc6cc8 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
@@ -72,6 +72,11 @@
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</Property>
+ </Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -82,6 +87,11 @@
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="name">
<Property></Property>
@@ -103,13 +113,13 @@
<DataType name="dtWordProcess">
<Property name="creationType">com.fzzy.work.domain.WorkOrderProcess</Property>
<PropertyDef name="orderId">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="action">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="remark">
- <Property/>
+ <Property></Property>
</PropertyDef>
</DataType>
</Model>
@@ -346,6 +356,7 @@
<AutoFormElement>
<Property name="name">deptId</Property>
<Property name="property">deptId</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysLoginController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysLoginController.java
index 876ffa5..6c4f866 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysLoginController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysLoginController.java
@@ -1,5 +1,6 @@
package com.fzzy.sys.controller;
+import com.fzzy.sys.LoginCheckManager;
import com.fzzy.sys.service.LoginService;
import com.ruoyi.common.config.FrameworkConfig;
import com.ruoyi.common.core.controller.BaseController;
@@ -12,6 +13,7 @@
import com.ruoyi.framework.shiro.token.PhoneToken;
import com.ruoyi.framework.web.service.ConfigService;
import com.ruoyi.system.service.ISysUserService;
+import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.UsernamePasswordToken;
@@ -33,6 +35,7 @@
*
* @author ruoyi
*/
+@Slf4j
@Controller
public class SysLoginController extends BaseController {
/**
@@ -49,6 +52,9 @@
@Resource
private RedisCache redisCache;
+ @Resource
+ private LoginCheckManager loginCheckManager;
+
@GetMapping("/login")
public String login(HttpServletRequest request, HttpServletResponse response, ModelMap mmap) {
// 濡傛灉鏄疉jax璇锋眰锛岃繑鍥濲son瀛楃涓层��
@@ -64,19 +70,60 @@
return "login";
}
+ /**
+ * 鐧诲綍鏂规硶 ---绯荤粺鑷甫
+ *
+ * @param username 鐢ㄦ埛鍚�
+ * @param password 瀵嗙爜
+ * @param rememberMe 璁颁綇鎴�
+ * @return 缁撴灉
+
+ @PostMapping("/login")
+ @ResponseBody
+ public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe) {
+ UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe);
+ Subject subject = SecurityUtils.getSubject();
+
+ try {
+ subject.login(token);
+ return success();
+ } catch (AuthenticationException e) {
+ log.error("鐧诲綍寮傚父", e);
+ String msg = "鐢ㄦ埛鍚嶆垨鑰呭瘑鐮侀敊璇紝璇锋牳瀵�";
+ return error(msg);
+ }
+ }
+ */
+ /**
+ * 鐧诲綍鏂规硶 ---鑷畾涔夎皟鏁�
+ *
+ * @param username 鐢ㄦ埛鍚�
+ * @param password 瀵嗙爜
+ * @param rememberMe 璁颁綇鎴�
+ * @return 缁撴灉
+ */
@PostMapping("/login")
@ResponseBody
public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe) {
+
UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe);
Subject subject = SecurityUtils.getSubject();
try {
subject.login(token);
+ //娓呴櫎閿欒淇℃伅
+ loginCheckManager.clearCheckError(username);
return success();
} catch (AuthenticationException e) {
- String msg = "璐﹀彿銆佸瘑鐮佹垨楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�";
-// if (StringUtils.isNotEmpty(e.getMessage())) {
-// msg = e.getMessage();
-// }
+
+ //鏍规嵁鑷畾涔夋崲缂撳瓨鍒ゆ柇淇℃伅
+ String errorMsg = loginCheckManager.getCheckError(username);
+ if(StringUtils.isNotBlank(errorMsg)){
+ //loginCheckManager.clearCheckError(username);
+ return error(errorMsg);
+ }
+
+ log.error("鐢ㄦ埛[" + username + "]鐧诲綍寮傚父,{}", e.getMessage());
+ String msg = "鐧诲綍寮傚父锛屼俊鎭細"+e.getMessage();
return error(msg);
}
}
--
Gitblit v1.9.3