Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

修改参数比较的bug

Browse Source
This commit is contained in:
weidong 2024-06-30 07:12:40 +08:00
parent f69c36e32f
commit b402cdcf20
20 changed files with 83 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sec-beidou/src/main/java/com/imdroid/beidou/entity/Tenant.java → sec-api/src/main/java/com/imdroid/secapi/dto/Tenant.java
View File

@ -1,4 +1,4 @@
package com.imdroid.beidou.entity;
package com.imdroid.secapi.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
sec-beidou/src/main/java/com/imdroid/beidou/entity/TenantMapper.java → sec-api/src/main/java/com/imdroid/secapi/dto/TenantMapper.java
View File

@ -1,4 +1,4 @@
package com.imdroid.beidou.entity;
package com.imdroid.secapi.dto;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.*;

2
sec-beidou/src/main/java/com/imdroid/beidou/entity/User.java → sec-api/src/main/java/com/imdroid/secapi/dto/User.java
View File

@ -1,4 +1,4 @@
package com.imdroid.beidou.entity;
package com.imdroid.secapi.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
sec-beidou/src/main/java/com/imdroid/beidou/entity/UserMapper.java → sec-api/src/main/java/com/imdroid/secapi/dto/UserMapper.java
View File

@ -1,4 +1,4 @@
package com.imdroid.beidou.entity;
package com.imdroid.secapi.dto;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.*;

4
sec-beidou/src/main/java/com/imdroid/beidou/auth/SessionUtils.java
View File

@ -1,7 +1,7 @@
package com.imdroid.beidou.auth;
import com.imdroid.beidou.entity.Tenant;
import com.imdroid.beidou.entity.User;
import com.imdroid.secapi.dto.Tenant;
import com.imdroid.secapi.dto.User;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;

4
sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java
View File

@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper;
import com.imdroid.beidou.entity.Tenant;
import com.imdroid.beidou.entity.TenantMapper;
import com.imdroid.secapi.dto.Tenant;
import com.imdroid.secapi.dto.TenantMapper;
import com.imdroid.beidou.service.CommonExcelService;
import com.imdroid.secapi.dto.*;
import org.springframework.beans.factory.annotation.Autowired;

11
sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java
View File

@ -1,8 +1,8 @@
package com.imdroid.beidou.controller;
import com.imdroid.beidou.common.Role;
import com.imdroid.beidou.entity.TenantMapper;
import com.imdroid.beidou.entity.Tenant;
import com.imdroid.secapi.dto.TenantMapper;
import com.imdroid.secapi.dto.Tenant;
import com.imdroid.beidou.service.OpLogManager;
import com.imdroid.common.util.NumberUtils;
import com.imdroid.common.util.ObjUtil;
@ -174,14 +174,17 @@ public class GnssDeviceController extends BasicController{
device.setUpdateuser(getLoginUser(session));
device.setUpdatetime(old_device.getUpdatetime());
device.setSyn(old_device.getSyn());
String diff=ObjUtil.compare(old_device,device);
if(!diff.isBlank()) {
opLogManager.addLog(getLoginUser(session), getTenantId(session),
OpLogManager.OP_TYPE_UPDATE,
OpLogManager.OP_OBJ_DEVICE,
device.getDeviceid()+" update: "+ObjUtil.compare(old_device,device));
device.getDeviceid() + " update: " + diff);
device.setUpdatetime(LocalDateTime.now());
device.setSyn(false);
num = gnssDeviceMapper.updateById(device);
}
}
else{
device.setCreatetime(LocalDateTime.now());
device.setCreateuser((String) session.getAttribute("login_user"));

10
sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java
View File

@ -74,11 +74,14 @@ public class GnssGroupController extends BasicController {
if(null != oldGroup) {
group.setDevice_num(oldGroup.getDevice_num());
String diff = ObjUtil.compare(oldGroup,group);
if(!diff.isBlank()) {
num = gnssGroupMapper.updateById(group);
opLogManager.addLog(getLoginUser(session), getTenantId(session),
OpLogManager.OP_TYPE_UPDATE,
OpLogManager.OP_OBJ_GROUP,
group.getName()+" changed:"+ObjUtil.compare(oldGroup,group));
group.getName() + " changed:" + diff);
}
}
else{
num = gnssGroupMapper.insert(group);
@ -139,11 +142,14 @@ public class GnssGroupController extends BasicController {
GnssGroupCalc oldGroup = gnssGroupCalcMapper.selectById(group.getId());
if(null != oldGroup) {
group.setDevice_num(oldGroup.getDevice_num());
String diff = ObjUtil.compare(oldGroup,group);
if(!diff.isBlank()) {
num = gnssGroupCalcMapper.updateById(group);
opLogManager.addLog(getLoginUser(session), getTenantId(session),
OpLogManager.OP_TYPE_UPDATE,
OpLogManager.OP_OBJ_GROUP,
group.getName()+" changed:"+ObjUtil.compare(oldGroup,group));
group.getName() + " changed:" + diff);
}
}
else{
num = gnssGroupCalcMapper.insert(group);

4
sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java
View File

@ -3,8 +3,8 @@ package com.imdroid.beidou.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.query.MPJQueryWrapper;
import com.imdroid.beidou.entity.Tenant;
import com.imdroid.beidou.entity.TenantMapper;
import com.imdroid.secapi.dto.Tenant;
import com.imdroid.secapi.dto.TenantMapper;
import com.imdroid.beidou.service.CommonExcelService;
import com.imdroid.secapi.dto.GnssStatus;
import com.imdroid.secapi.dto.GnssStatusJoin;

2
sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java
View File

@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper;
import com.imdroid.beidou.entity.Tenant;
import com.imdroid.secapi.dto.Tenant;
import com.imdroid.secapi.dto.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;

8
sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java
View File

@ -6,10 +6,10 @@ import com.imdroid.beidou.data.WxMiniUserSession;
import com.imdroid.beidou.data.vo.MiniUserRegisterVO;
import com.imdroid.beidou.data.vo.MiniUserVO;
import com.imdroid.beidou.data.vo.UserLoginVO;
import com.imdroid.beidou.entity.Tenant;
import com.imdroid.beidou.entity.TenantMapper;
import com.imdroid.beidou.entity.User;
import com.imdroid.beidou.entity.UserMapper;
import com.imdroid.secapi.dto.Tenant;
import com.imdroid.secapi.dto.TenantMapper;
import com.imdroid.secapi.dto.User;
import com.imdroid.secapi.dto.UserMapper;
import com.imdroid.beidou.service.OpLogManager;
import com.imdroid.beidou.utils.BCryptPasswordEncoderUtil;
import com.imdroid.beidou.utils.WXUtils;

9
sec-beidou/src/main/java/com/imdroid/beidou/controller/TenantController.java
View File

@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.imdroid.beidou.common.HttpResult;
import com.imdroid.beidou.entity.Tenant;
import com.imdroid.beidou.entity.TenantMapper;
import com.imdroid.secapi.dto.Tenant;
import com.imdroid.secapi.dto.TenantMapper;
import com.imdroid.beidou.service.OpLogManager;
import com.imdroid.common.util.ObjUtil;
import org.springframework.beans.factory.annotation.Autowired;
@ -74,10 +74,13 @@ public class TenantController extends BasicController{
if(null != tenantOld) {
tenantNew.setCreate_time(tenantOld.getCreate_time());
tenantNew.setUpdate_time(tenantOld.getUpdate_time());
String diff = ObjUtil.compare(tenantOld,tenantNew);
if(!diff.isBlank()) {
opLogManager.addLog(getLoginUser(session), getTenantId(session),
OpLogManager.OP_TYPE_UPDATE,
OpLogManager.OP_OBJ_TENANT,
tenantNew.getName()+" changed:"+ObjUtil.compare(tenantOld,tenantNew));
tenantNew.getName() + " changed:" + diff);
}
tenantNew.setUpdate_time(now);
num = tenantMapper.updateById(tenantNew);
}

13
sec-beidou/src/main/java/com/imdroid/beidou/controller/UserController.java
View File

@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.imdroid.beidou.common.HttpResult;
import com.imdroid.beidou.entity.Tenant;
import com.imdroid.beidou.entity.TenantMapper;
import com.imdroid.beidou.entity.User;
import com.imdroid.beidou.entity.UserMapper;
import com.imdroid.secapi.dto.Tenant;
import com.imdroid.secapi.dto.TenantMapper;
import com.imdroid.secapi.dto.User;
import com.imdroid.secapi.dto.UserMapper;
import com.imdroid.beidou.service.OpLogManager;
import com.imdroid.common.util.ObjUtil;
import org.springframework.beans.factory.annotation.Autowired;
@ -114,11 +114,14 @@ public class UserController extends BasicController {
userNew.setId(userOld.getId());
userNew.setPwd(userOld.getPwd());
userNew.setInit_pwd(userOld.getInit_pwd());
String diff = ObjUtil.compare(userOld,userNew);
if(!diff.isBlank()) {
num = userMapper.updateById(userNew);
opLogManager.addLog(getLoginUser(session), getTenantId(session),
OpLogManager.OP_TYPE_UPDATE,
OpLogManager.OP_OBJ_USER,
userNew.getName()+" changed:"+ObjUtil.compare(userOld,userNew));
userNew.getName() + " changed:" + diff);
}
}
else{
userNew.setPwd(new BCryptPasswordEncoder().encode(default_pwd));

5
sec-beidou/src/main/java/com/imdroid/beidou/controller/WarningController.java
View File

@ -125,11 +125,14 @@ public class WarningController extends BasicController implements CommonExcelSer
OpLogManager.OP_OBJ_WARNING,
cfg.getTypename()+" create new");
} else {
String diff = ObjUtil.compare(oldCfg, cfg);
if(!diff.isBlank()) {
num = warningCfgMapper.update(cfg, queryWrapper);
opLogManager.addLog(getLoginUser(session), getTenantId(session),
OpLogManager.OP_TYPE_ADD,
OpLogManager.OP_OBJ_WARNING,
cfg.getTypename() +" update: " + ObjUtil.compare(oldCfg, cfg));
cfg.getTypename() + " update: " + diff);
}
}
if (num == 0) {

26
sec-beidou/src/main/java/com/imdroid/beidou/entity/UserService.java
View File

@ -1,26 +0,0 @@
package com.imdroid.beidou.entity;//package com.imdroid.beidou.entity;
//
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.security.core.userdetails.UserDetails;
//import org.springframework.security.core.userdetails.UserDetailsService;
//import org.springframework.security.core.userdetails.UsernameNotFoundException;
//import org.springframework.stereotype.Service;
//
//@Service
//public class UserService implements UserDetailsService {
// @Autowired
// UserMapper userMapper;
//
// @Override
// public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
// User user = userMapper.queryByName(username);
// if (user == null) {
// throw new UsernameNotFoundException("账户不存在!");
// }
// //user.setRoles(userMapper.getUserRolesByUid(user.getId()));
// return user;
//
// }
//
//}
//

2
sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java
View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseMapper;
import com.github.yulichang.query.MPJQueryWrapper;
import com.imdroid.beidou.auth.SessionUtils;
import com.imdroid.beidou.entity.Tenant;
import com.imdroid.secapi.dto.Tenant;
import org.springframework.util.StringUtils;
import javax.servlet.http.HttpServletRequest;

4
sec-beidou/src/main/java/com/imdroid/beidou/service/NotificationService.java
View File

@ -1,8 +1,8 @@
package com.imdroid.beidou.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.imdroid.beidou.entity.User;
import com.imdroid.beidou.entity.UserMapper;
import com.imdroid.secapi.dto.User;
import com.imdroid.secapi.dto.UserMapper;
import com.imdroid.secapi.dto.WarningCfg;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

8
sec-beidou/src/main/java/com/imdroid/beidou/service/ServiceEnvInit.java
View File

@ -2,10 +2,10 @@ package com.imdroid.beidou.service;
import com.imdroid.beidou.common.Role;
import com.imdroid.beidou.entity.Tenant;
import com.imdroid.beidou.entity.TenantMapper;
import com.imdroid.beidou.entity.User;
import com.imdroid.beidou.entity.UserMapper;
import com.imdroid.secapi.dto.Tenant;
import com.imdroid.secapi.dto.TenantMapper;
import com.imdroid.secapi.dto.User;
import com.imdroid.secapi.dto.UserMapper;
import com.imdroid.beidou.utils.BCryptPasswordEncoderUtil;
import com.imdroid.secapi.dto.WarningCfg;
import com.imdroid.secapi.dto.WarningCfgMapper;

2
sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java
View File

@ -2,7 +2,7 @@ package com.imdroid.beidou.task;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.query.MPJQueryWrapper;
import com.imdroid.beidou.entity.Tenant;
import com.imdroid.secapi.dto.Tenant;
import com.imdroid.beidou.service.NotificationService;
import com.imdroid.secapi.dto.*;
import lombok.extern.slf4j.Slf4j;

5
sec-common/src/main/java/com/imdroid/common/util/ObjUtil.java
View File

@ -4,8 +4,9 @@ public class ObjUtil {
public static String compare(Object obj1, Object obj2){
if(!obj1.getClass().equals(obj2.getClass())) return "";
String[] items = obj1.toString().split(",|:|\\s+");
String[] items2 = obj2.toString().split(",|:|\\s+");
String[] items = obj1.toString().replaceAll(" +","").split(",|:");
String[] items2 = obj2.toString().replaceAll(" +","").split(",|:");
String diff = "";
for(int i=0; i<items.length; i++){
if(!items[i].equals(items2[i])){