From 3daf0c8d0a538ad30c79b336a40423f80330fc96 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 二月 2024 20:00:54 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java | 24 +++++---
zy-asrs-flow/src/App.jsx | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/PageParam.java | 23 +++++++
zy-asrs-flow/src/pages/system/role/index.jsx | 36 +++--------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/aspect/OperationLogAspect.java | 2
zy-asrs-flow/src/services/monitor/logininfor.ts | 70 +++++++++++++++++++++++
7 files changed, 121 insertions(+), 38 deletions(-)
diff --git a/zy-asrs-flow/src/App.jsx b/zy-asrs-flow/src/App.jsx
index b1a2c96..6892f48 100644
--- a/zy-asrs-flow/src/App.jsx
+++ b/zy-asrs-flow/src/App.jsx
@@ -207,7 +207,7 @@
if (token) {
setToken(token);
}
- console.log(response);
+ console.log(response?.data);
return response;
}
]
diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index 2419489..77e7b12 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/zy-asrs-flow/src/pages/system/role/index.jsx
@@ -5,8 +5,6 @@
import { ActionType, FooterToolbar, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
import { PlusOutlined, DeleteOutlined, ExclamationCircleOutlined, UnlockOutlined } from '@ant-design/icons';
import { getLogininforList, removeLogininfor, exportLogininfor, unlockLogininfor, cleanLogininfor } from '@/services/monitor/logininfor';
-import DictTag from '@/components/DictTag';
-import { getDictValueEnum } from '@/services/system/dict';
import { request } from '@umijs/max';
@@ -98,15 +96,13 @@
const [selectedRows, setSelectedRows] = useState([]);
const [statusOptions, setStatusOptions] = useState([]);
- const access = useAccess();
-
/** 鍥介檯鍖栭厤缃� */
const intl = useIntl();
useEffect(() => {
- getDictValueEnum('sys_common_status', true).then((data) => {
- setStatusOptions(data);
- });
+ // getDictValueEnum('sys_common_status', true).then((data) => {
+ // setStatusOptions(data);
+ // });
}, []);
const columns = [
@@ -149,9 +145,9 @@
dataIndex: 'status',
valueType: 'select',
valueEnum: statusOptions,
- render: (_, record) => {
- return (<DictTag enums={statusOptions} value={record.status} />);
- },
+ // render: (_, record) => {
+ // return (<DictTag enums={statusOptions} value={record.status} />);
+ // },
},
{
title: <FormattedMessage id="monitor.logininfor.msg" defaultMessage="鎻愮ず娑堟伅" />,
@@ -185,7 +181,7 @@
<Button
key="remove"
danger
- hidden={selectedRows?.length === 0 || !access.hasPerms('monitor:logininfor:remove')}
+ hidden={selectedRows?.length === 0}
onClick={async () => {
Modal.confirm({
title: '鏄惁纭鍒犻櫎鎵�閫夋暟鎹」?',
@@ -209,7 +205,7 @@
type="primary"
key="clean"
danger
- hidden={selectedRows?.length === 0 || !access.hasPerms('monitor:logininfor:remove')}
+ hidden={selectedRows?.length === 0}
onClick={async () => {
Modal.confirm({
title: '鏄惁纭娓呯┖鎵�鏈夋暟鎹」?',
@@ -232,7 +228,7 @@
<Button
type="primary"
key="unlock"
- hidden={selectedRows?.length === 0 || !access.hasPerms('monitor:logininfor:unlock')}
+ hidden={selectedRows?.length === 0}
onClick={async () => {
Modal.confirm({
title: '鏄惁纭瑙ｉ攣璇ョ敤鎴风殑鏁版嵁椤�?',
@@ -255,7 +251,6 @@
<Button
type="primary"
key="export"
- hidden={!access.hasPerms('monitor:logininfor:export')}
onClick={async () => {
handleExport();
}}
@@ -264,7 +259,7 @@
<FormattedMessage id="pages.searchTable.export" defaultMessage="瀵煎嚭" />
</Button>,
]}
- request={(params) =>
+ request={(params) => {
request('/api/role/page', {
method: 'POST',
headers: {
@@ -279,15 +274,7 @@
};
return result;
})
-
- // getLogininforList({ ...params }).then((res) => {
- // const result = {
- // data: res.rows,
- // total: res.total,
- // success: true,
- // };
- // return result;
- // })
+ }
}
columns={columns}
rowSelection={{
@@ -309,7 +296,6 @@
>
<Button
key="remove"
- hidden={!access.hasPerms('monitor:logininfor:remove')}
onClick={async () => {
Modal.confirm({
title: '鍒犻櫎',
diff --git a/zy-asrs-flow/src/services/monitor/logininfor.ts b/zy-asrs-flow/src/services/monitor/logininfor.ts
new file mode 100644
index 0000000..868a471
--- /dev/null
+++ b/zy-asrs-flow/src/services/monitor/logininfor.ts
@@ -0,0 +1,70 @@
+import { request } from '@umijs/max';
+
+// 鏌ヨ绯荤粺璁块棶璁板綍鍒楄〃
+export async function getLogininforList(params?: API.Monitor.LogininforListParams) {
+ return request<API.Monitor.LogininforPageResult>('/api/system/logininfor/list', {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json;charset=UTF-8',
+ },
+ params
+ });
+}
+
+// 鏌ヨ绯荤粺璁块棶璁板綍璇︾粏
+export function getLogininfor(infoId: number) {
+ return request<API.Monitor.LogininforInfoResult>(`/api/system/logininfor/${infoId}`, {
+ method: 'GET'
+ });
+}
+
+// 鏂板绯荤粺璁块棶璁板綍
+export async function addLogininfor(params: API.Monitor.Logininfor) {
+ return request<API.Result>('/api/system/logininfor', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json;charset=UTF-8',
+ },
+ data: params
+ });
+}
+
+// 淇敼绯荤粺璁块棶璁板綍
+export async function updateLogininfor(params: API.Monitor.Logininfor) {
+ return request<API.Result>('/api/system/logininfor', {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json;charset=UTF-8',
+ },
+ data: params
+ });
+}
+
+// 鍒犻櫎绯荤粺璁块棶璁板綍
+export async function removeLogininfor(ids: string) {
+ return request<API.Result>(`/api/system/logininfor/${ids}`, {
+ method: 'DELETE'
+ });
+}
+
+// 瀵煎嚭绯荤粺璁块棶璁板綍
+export function exportLogininfor(params?: API.Monitor.LogininforListParams) {
+ return request<API.Result>(`/api/system/logininfor/export`, {
+ method: 'GET',
+ params
+ });
+}
+
+// 瑙ｉ攣鐢ㄦ埛鐧诲綍鐘舵��
+export function unlockLogininfor(userName: string) {
+ return request<API.Result>('/api/system/logininfor/unlock/' + userName, {
+ method: 'get'
+ })
+}
+
+// 娓呯┖鐧诲綍鏃ュ織
+export function cleanLogininfor() {
+ return request<API.Result>('/api/system/logininfor/clean', {
+ method: 'delete'
+ })
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/aspect/OperationLogAspect.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/aspect/OperationLogAspect.java
index 3e11121..54ac18f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/aspect/OperationLogAspect.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/aspect/OperationLogAspect.java
@@ -23,6 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.util.Collections;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -68,6 +69,7 @@
private void saveLog(JoinPoint joinPoint, Object result, Exception e) {
OperationRecord record = new OperationRecord();
Long endTime = startTime.get();
+ record.setCreateTime(new Date());
// 璁板綍鎿嶄綔鑰楁椂
if (endTime != null) {
record.setSpendTime((int) (System.currentTimeMillis() - endTime));
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java
index a957f20..bfb8500 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/AuthController.java
@@ -56,7 +56,7 @@
return R.error("瀵嗙爜閿欒");
}
userLoginService.saveAsync(user.getId(), UserLogin.TYPE_LOGIN, null, hostId, request);
- String accessToken = JwtUtil.buildToken(new JwtSubject(username, hostId),
+ String accessToken = JwtUtil.buildToken(new JwtSubject(username, user.getHostId()),
configProperties.getTokenExpireTime(), configProperties.getTokenKey());
return R.ok("鐧诲綍鎴愬姛").add(new LoginResult(accessToken, user));
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
index 244ef07..00bfda1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
@@ -2,12 +2,14 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.common.annotation.OperationLog;
-import com.zy.asrs.wcs.sys.entity.User;
+import com.zy.asrs.wcs.sys.controller.param.PageParam;
+import com.zy.asrs.wcs.sys.entity.Role;
+import com.zy.asrs.wcs.sys.service.RoleService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* Created by vincent on 2/13/2024
@@ -16,11 +18,15 @@
@RequestMapping("/api")
public class RoleController extends BaseController {
- @PreAuthorize("hasAuthority('sys:auth:user')")
+ @Autowired
+ private RoleService roleService;
+
+ @PreAuthorize("hasAuthority('sys:role:list')")
@OperationLog
- @PutMapping("/role/page")
- public R updateInfo(@RequestBody User user) {
- return R.ok();
+ @PostMapping("/role/page")
+ public R updateInfo(@RequestBody PageParam param) {
+ List<Role> list = roleService.list();
+ return R.ok().add(list);
}
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/PageParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/PageParam.java
index 70e78f6..58b9d3f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/PageParam.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/PageParam.java
@@ -1,13 +1,32 @@
package com.zy.asrs.wcs.sys.controller.param;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
+
+import java.io.Serializable;
+import java.util.HashMap;
/**
* Created by vincent on 2/13/2024
*/
@Data
-public class PageParam {
+public class PageParam extends HashMap<String, Object> implements Serializable {
-
+ private static final long serialVersionUID = 1L;
+
+ @TableField(exist = false)
+ private Integer pageIdx;
+
+ @TableField(exist = false)
+ private Integer pageSize;
+
+ @TableField(exist = false)
+ private String timeStart;
+
+ @TableField(exist = false)
+ private String timeEnd;
+
+ @TableField(exist = false)
+ private String condition;
}
--
Gitblit v1.9.1