Skip to content

S
smart_gov_platform
Commit 82b85ea9 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改操作日志过滤

parent 19b65bc5
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 49 deletions
base-manager/db/base_modules.sql
View file @ 82b85ea9
......@@ -289,39 +289,39 @@ CREATE TABLE mortals_sys_window_matter
-- ----------------------------
DROP TABLE IF EXISTS `mortals_sys_workman`;
CREATE TABLE mortals_sys_workman(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`loginName` varchar(64) COMMENT '登录用户名',
`loginPwd` varchar(255) COMMENT '密码',
`deptId` bigint(20) COMMENT '部门id号',
`deptName` varchar(64) COMMENT '部门名称',
`windowId` bigint(20) COMMENT '窗口id号',
`windowName` varchar(64) COMMENT '窗口名称',
`siteId` bigint(20) COMMENT '站点ID',
`siteName` varchar(255) COMMENT '站点名称',
`name` varchar(64) COMMENT '姓名',
`number` varchar(64) COMMENT '工号',
`userpost` varchar(64) COMMENT '职务',
`posttitle` varchar(64) COMMENT '职称',
`politicalstatus` tinyint(2) DEFAULT '0' COMMENT '政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)',
`dangyuan` tinyint(2) DEFAULT '0' COMMENT '党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)',
`dangyuanext` varchar(64) COMMENT '党员扩展',
`idCard` varchar(32) COMMENT '身份证',
`phone` varchar(64) COMMENT '电话',
`mobile` varchar(64) COMMENT '手机',
`starlevel` tinyint(2) DEFAULT '0' COMMENT '星级',
`summary` varchar(255) COMMENT '个人简介',
`photoPath` varchar(255) COMMENT '照片',
`duty` mediumtext COMMENT '岗位职责',
`promise` mediumtext COMMENT '服务承诺',
`business` mediumtext COMMENT '办理事项',
`online` tinyint(2) DEFAULT '1' COMMENT '是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）',
`modelIds` varchar(256) COMMENT '配置站点模块，逗号分隔',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
`lastLoginTime` datetime COMMENT '最后一次登录时间',
`lastLoginAddress` varchar(21) COMMENT '最后一次登录地址',
PRIMARY KEY (`id`)
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`loginName` varchar(64) COMMENT '登录用户名',
`loginPwd` varchar(255) COMMENT '密码',
`deptId` bigint(20) COMMENT '部门id号',
`deptName` varchar(64) COMMENT '部门名称',
`windowId` bigint(20) COMMENT '窗口id号',
`windowName` varchar(64) COMMENT '窗口名称',
`siteId` bigint(20) COMMENT '站点ID',
`siteName` varchar(255) COMMENT '站点名称',
`name` varchar(64) COMMENT '姓名',
`number` varchar(64) COMMENT '工号',
`userpost` varchar(64) COMMENT '职务',
`posttitle` varchar(64) COMMENT '职称',
`politicalstatus` tinyint(2) DEFAULT '0' COMMENT '政治面貌 （0.中共党员，1.中共预备党员，2.共青团员，3.普通居民，4.其它)',
`dangyuan` tinyint(2) DEFAULT '0' COMMENT '党员 （0.非党员，1.党员，2.党员示范岗，3.党员先锋岗)',
`dangyuanext` varchar(64) COMMENT '党员扩展',
`idCard` varchar(32) COMMENT '身份证',
`phone` varchar(64) COMMENT '电话',
`mobile` varchar(64) COMMENT '手机',
`starlevel` tinyint(2) DEFAULT '0' COMMENT '星级',
`summary` varchar(255) COMMENT '个人简介',
`photoPath` varchar(255) COMMENT '照片',
`duty` mediumtext COMMENT '岗位职责',
`promise` mediumtext COMMENT '服务承诺',
`business` mediumtext COMMENT '办理事项',
`online` tinyint(2) DEFAULT '1' COMMENT '是否在线（0.离线，1.在线，2.暂离,3.点击暂离,4.回归,5.登陆）',
`modelIds` varchar(256) COMMENT '配置站点模块，逗号分隔',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
`lastLoginTime` datetime COMMENT '最后一次登录时间',
`lastLoginAddress` varchar(21) COMMENT '最后一次登录地址',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='工作人员';
......
base-manager/src/main/java/com/mortals/xhx/base/framework/aspect/OperlogAspect.java
View file @ 82b85ea9
......@@ -41,8 +41,9 @@ public class OperlogAspect extends FileLogServiceImpl implements ILogService {
public void doHandlerLog(String platformMark, Long userId, String userName, String loginName, String requestUrl,
String content, String ip, Date logDate) {
super.doHandlerLog(platformMark, userId, userName, loginName, requestUrl, content, ip, logDate);
//操作日志 只记录用户侧
if(userId==null) return;
operLogService.insertOperLog(ip, requestUrl, userId, userName, loginName, content);
OperateLogPdu operateLogPdu = new OperateLogPdu();
operateLogPdu.initAttrValue();
operateLogPdu.setIp(ip);
......
base-manager/src/test/java/com/mortals/httpclient/holiday/HolidayController.http
View file @ 82b85ea9
......@@ -14,16 +14,17 @@ Content-Type: application/json
###节假日更新与保存
POST {{baseUrl}}/holiday/save
Authorization: {{authToken}}
Content-Type: application/json
{
"siteId":3374,
"siteId":1,
"name":"rlubyj",
"summary":"70cuql",
"year":2788,
"year":2023,
"startTime":"2022-01-20",
"endTime":"2022-01-20",
"workorholiday":9809
"workorholiday":1
}
> {%
......
base-manager/src/test/java/com/mortals/httpclient/workman/WorkmanController.http
View file @ 82b85ea9
......@@ -13,14 +13,6 @@ POST {{baseUrl}}/workman/list
Content-Type: application/json
{
"deptId":6389 ,
"deptName":"ne8rqn" ,
"windowId":4325 ,
"windowName":"xrj91w" ,
"siteId":6949 ,
"siteName":"ifug3n" ,
"name":"fujlcs" ,
"number":"kpg7fk" ,
"page":1,
"size":10
}
......
common-lib/src/main/java/com/mortals/xhx/system/MessageProducer.java
View file @ 82b85ea9
......@@ -25,12 +25,10 @@ public class MessageProducer implements IMessageProduceService {
private RabbitTemplate rabbitTemplate;
public void syncAccessSend(AccessLogPdu accessLogPdu) {
// new Message()
//new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8))
rabbitTemplate.send(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE,new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8)));
//rabbitTemplate.send(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE,new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8)));
//rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
//rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, accessLogPdu);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment