From b402cdcf203c49104274d2fd8372f75124fd5584 Mon Sep 17 00:00:00 2001 From: weidong Date: Sun, 30 Jun 2024 07:12:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=AF=94?= =?UTF-8?q?=E8=BE=83=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/imdroid/secapi/dto}/Tenant.java | 2 +- .../com/imdroid/secapi/dto}/TenantMapper.java | 2 +- .../java/com/imdroid/secapi/dto}/User.java | 2 +- .../com/imdroid/secapi/dto}/UserMapper.java | 2 +- .../com/imdroid/beidou/auth/SessionUtils.java | 4 +-- .../controller/GnssCalcDataController.java | 4 +-- .../controller/GnssDeviceController.java | 21 ++++++++------- .../controller/GnssGroupController.java | 26 ++++++++++++------- .../controller/GnssStatusController.java | 4 +-- .../beidou/controller/IndexController.java | 2 +- .../beidou/controller/LoginController.java | 8 +++--- .../beidou/controller/TenantController.java | 15 ++++++----- .../beidou/controller/UserController.java | 21 ++++++++------- .../beidou/controller/WarningController.java | 13 ++++++---- .../imdroid/beidou/entity/UserService.java | 26 ------------------- .../beidou/service/CommonExcelService.java | 2 +- .../beidou/service/NotificationService.java | 4 +-- .../beidou/service/ServiceEnvInit.java | 8 +++--- .../beidou/task/DeviceStatusChecker.java | 2 +- .../java/com/imdroid/common/util/ObjUtil.java | 5 ++-- 20 files changed, 83 insertions(+), 90 deletions(-) rename {sec-beidou/src/main/java/com/imdroid/beidou/entity => sec-api/src/main/java/com/imdroid/secapi/dto}/Tenant.java (94%) rename {sec-beidou/src/main/java/com/imdroid/beidou/entity => sec-api/src/main/java/com/imdroid/secapi/dto}/TenantMapper.java (87%) rename {sec-beidou/src/main/java/com/imdroid/beidou/entity => sec-api/src/main/java/com/imdroid/secapi/dto}/User.java (97%) rename {sec-beidou/src/main/java/com/imdroid/beidou/entity => sec-api/src/main/java/com/imdroid/secapi/dto}/UserMapper.java (93%) delete mode 100644 sec-beidou/src/main/java/com/imdroid/beidou/entity/UserService.java diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/entity/Tenant.java b/sec-api/src/main/java/com/imdroid/secapi/dto/Tenant.java similarity index 94% rename from sec-beidou/src/main/java/com/imdroid/beidou/entity/Tenant.java rename to sec-api/src/main/java/com/imdroid/secapi/dto/Tenant.java index b8a2951e..f1397870 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/entity/Tenant.java +++ b/sec-api/src/main/java/com/imdroid/secapi/dto/Tenant.java @@ -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; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/entity/TenantMapper.java b/sec-api/src/main/java/com/imdroid/secapi/dto/TenantMapper.java similarity index 87% rename from sec-beidou/src/main/java/com/imdroid/beidou/entity/TenantMapper.java rename to sec-api/src/main/java/com/imdroid/secapi/dto/TenantMapper.java index 4ea95617..9350775c 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/entity/TenantMapper.java +++ b/sec-api/src/main/java/com/imdroid/secapi/dto/TenantMapper.java @@ -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.*; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/entity/User.java b/sec-api/src/main/java/com/imdroid/secapi/dto/User.java similarity index 97% rename from sec-beidou/src/main/java/com/imdroid/beidou/entity/User.java rename to sec-api/src/main/java/com/imdroid/secapi/dto/User.java index 5910f62f..95a3729f 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/entity/User.java +++ b/sec-api/src/main/java/com/imdroid/secapi/dto/User.java @@ -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; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/entity/UserMapper.java b/sec-api/src/main/java/com/imdroid/secapi/dto/UserMapper.java similarity index 93% rename from sec-beidou/src/main/java/com/imdroid/beidou/entity/UserMapper.java rename to sec-api/src/main/java/com/imdroid/secapi/dto/UserMapper.java index 732a6254..ec031a8e 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/entity/UserMapper.java +++ b/sec-api/src/main/java/com/imdroid/secapi/dto/UserMapper.java @@ -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.*; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/auth/SessionUtils.java b/sec-beidou/src/main/java/com/imdroid/beidou/auth/SessionUtils.java index d0160a87..1afe63b1 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/auth/SessionUtils.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/auth/SessionUtils.java @@ -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; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java index 18ddba37..7cf8993f 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java @@ -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; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java index 06833b7e..88d68a44 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java @@ -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,13 +174,16 @@ public class GnssDeviceController extends BasicController{ device.setUpdateuser(getLoginUser(session)); device.setUpdatetime(old_device.getUpdatetime()); device.setSyn(old_device.getSyn()); - opLogManager.addLog(getLoginUser(session),getTenantId(session), - OpLogManager.OP_TYPE_UPDATE, - OpLogManager.OP_OBJ_DEVICE, - device.getDeviceid()+" update: "+ObjUtil.compare(old_device,device)); - - device.setUpdatetime(LocalDateTime.now()); - num = gnssDeviceMapper.updateById(device); + 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: " + diff); + device.setUpdatetime(LocalDateTime.now()); + device.setSyn(false); + num = gnssDeviceMapper.updateById(device); + } } else{ device.setCreatetime(LocalDateTime.now()); diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java index 180761f8..2ce0e1d0 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssGroupController.java @@ -74,11 +74,14 @@ public class GnssGroupController extends BasicController { if(null != oldGroup) { group.setDevice_num(oldGroup.getDevice_num()); - 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)); + 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:" + 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()); - 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)); + 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:" + diff); + } } else{ num = gnssGroupCalcMapper.insert(group); diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java index 3f449b4e..78d6d501 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java @@ -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; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java index 0a1ab1f8..70157db5 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java @@ -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; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java index 5f49a68a..68adbd2c 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/LoginController.java @@ -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; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/TenantController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/TenantController.java index 59773571..e81112c9 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/TenantController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/TenantController.java @@ -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()); - opLogManager.addLog(getLoginUser(session),getTenantId(session), - OpLogManager.OP_TYPE_UPDATE, - OpLogManager.OP_OBJ_TENANT, - tenantNew.getName()+" changed:"+ObjUtil.compare(tenantOld,tenantNew)); + 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:" + diff); + } tenantNew.setUpdate_time(now); num = tenantMapper.updateById(tenantNew); } diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/UserController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/UserController.java index 5924ed46..5c123a99 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/UserController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/UserController.java @@ -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()); - 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)); + 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:" + diff); + } } else{ userNew.setPwd(new BCryptPasswordEncoder().encode(default_pwd)); diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/WarningController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/WarningController.java index d81137c6..ca170028 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/WarningController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/WarningController.java @@ -125,11 +125,14 @@ public class WarningController extends BasicController implements CommonExcelSer OpLogManager.OP_OBJ_WARNING, cfg.getTypename()+" create new"); } else { - 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)); + 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: " + diff); + } } if (num == 0) { diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/entity/UserService.java b/sec-beidou/src/main/java/com/imdroid/beidou/entity/UserService.java deleted file mode 100644 index 1caaeeb4..00000000 --- a/sec-beidou/src/main/java/com/imdroid/beidou/entity/UserService.java +++ /dev/null @@ -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; -// -// } -// -//} -// diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java b/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java index 85aa475d..7bc8300c 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java @@ -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; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/service/NotificationService.java b/sec-beidou/src/main/java/com/imdroid/beidou/service/NotificationService.java index d48edee4..ad893c8a 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/service/NotificationService.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/service/NotificationService.java @@ -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; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/service/ServiceEnvInit.java b/sec-beidou/src/main/java/com/imdroid/beidou/service/ServiceEnvInit.java index d13674fe..d8904c9f 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/service/ServiceEnvInit.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/service/ServiceEnvInit.java @@ -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; diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java b/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java index 5f2240e4..6d2b59f1 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/task/DeviceStatusChecker.java @@ -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; diff --git a/sec-common/src/main/java/com/imdroid/common/util/ObjUtil.java b/sec-common/src/main/java/com/imdroid/common/util/ObjUtil.java index b995d576..3743b19e 100644 --- a/sec-common/src/main/java/com/imdroid/common/util/ObjUtil.java +++ b/sec-common/src/main/java/com/imdroid/common/util/ObjUtil.java @@ -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