修改参数比较的bug

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;

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.*;

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;

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.*;

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.secapi.dto.Tenant;
-import com.imdroid.beidou.entity.User;
+import com.imdroid.secapi.dto.User;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;

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.secapi.dto.Tenant;
-import com.imdroid.beidou.entity.TenantMapper;
+import com.imdroid.secapi.dto.TenantMapper;
 import com.imdroid.beidou.service.CommonExcelService;
 import com.imdroid.secapi.dto.*;
 import org.springframework.beans.factory.annotation.Autowired;

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.secapi.dto.TenantMapper;
-import com.imdroid.beidou.entity.Tenant;
+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),
+            String diff=ObjUtil.compare(old_device,device);
-                    OpLogManager.OP_TYPE_UPDATE,
+            if(!diff.isBlank()) {
-                    OpLogManager.OP_OBJ_DEVICE,
+                opLogManager.addLog(getLoginUser(session), getTenantId(session),
-                    device.getDeviceid()+" update: "+ObjUtil.compare(old_device,device));
+                        OpLogManager.OP_TYPE_UPDATE,
-
+                        OpLogManager.OP_OBJ_DEVICE,
-            device.setUpdatetime(LocalDateTime.now());
+                        device.getDeviceid() + " update: " + diff);
-            num = gnssDeviceMapper.updateById(device);
+                device.setUpdatetime(LocalDateTime.now());
+                device.setSyn(false);
+                num = gnssDeviceMapper.updateById(device);
+            }
         }
         else{
             device.setCreatetime(LocalDateTime.now());

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);
+            String diff = ObjUtil.compare(oldGroup,group);
-            opLogManager.addLog(getLoginUser(session),getTenantId(session),
+            if(!diff.isBlank()) {
-                    OpLogManager.OP_TYPE_UPDATE,
+                num = gnssGroupMapper.updateById(group);
-                    OpLogManager.OP_OBJ_GROUP,
+                opLogManager.addLog(getLoginUser(session), getTenantId(session),
-                    group.getName()+" changed:"+ObjUtil.compare(oldGroup,group));
+                        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);
+            String diff = ObjUtil.compare(oldGroup,group);
-            opLogManager.addLog(getLoginUser(session),getTenantId(session),
+            if(!diff.isBlank()) {
-                    OpLogManager.OP_TYPE_UPDATE,
+                num = gnssGroupCalcMapper.updateById(group);
-                    OpLogManager.OP_OBJ_GROUP,
+                opLogManager.addLog(getLoginUser(session), getTenantId(session),
-                    group.getName()+" changed:"+ObjUtil.compare(oldGroup,group));
+                        OpLogManager.OP_TYPE_UPDATE,
+                        OpLogManager.OP_OBJ_GROUP,
+                        group.getName() + " changed:" + diff);
+            }
         }
         else{
             num = gnssGroupCalcMapper.insert(group);

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.secapi.dto.Tenant;
-import com.imdroid.beidou.entity.TenantMapper;
+import com.imdroid.secapi.dto.TenantMapper;
 import com.imdroid.beidou.service.CommonExcelService;
 import com.imdroid.secapi.dto.GnssStatus;
 import com.imdroid.secapi.dto.GnssStatusJoin;

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;

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.secapi.dto.Tenant;
-import com.imdroid.beidou.entity.TenantMapper;
+import com.imdroid.secapi.dto.TenantMapper;
-import com.imdroid.beidou.entity.User;
+import com.imdroid.secapi.dto.User;
-import com.imdroid.beidou.entity.UserMapper;
+import com.imdroid.secapi.dto.UserMapper;
 import com.imdroid.beidou.service.OpLogManager;
 import com.imdroid.beidou.utils.BCryptPasswordEncoderUtil;
 import com.imdroid.beidou.utils.WXUtils;

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.secapi.dto.Tenant;
-import com.imdroid.beidou.entity.TenantMapper;
+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),
+            String diff = ObjUtil.compare(tenantOld,tenantNew);
-                    OpLogManager.OP_TYPE_UPDATE,
+            if(!diff.isBlank()) {
-                    OpLogManager.OP_OBJ_TENANT,
+                opLogManager.addLog(getLoginUser(session), getTenantId(session),
-                    tenantNew.getName()+" changed:"+ObjUtil.compare(tenantOld,tenantNew));
+                        OpLogManager.OP_TYPE_UPDATE,
+                        OpLogManager.OP_OBJ_TENANT,
+                        tenantNew.getName() + " changed:" + diff);
+            }
             tenantNew.setUpdate_time(now);
             num = tenantMapper.updateById(tenantNew);
         }

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.secapi.dto.Tenant;
-import com.imdroid.beidou.entity.TenantMapper;
+import com.imdroid.secapi.dto.TenantMapper;
-import com.imdroid.beidou.entity.User;
+import com.imdroid.secapi.dto.User;
-import com.imdroid.beidou.entity.UserMapper;
+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);
+            String diff = ObjUtil.compare(userOld,userNew);
-            opLogManager.addLog(getLoginUser(session),getTenantId(session),
+            if(!diff.isBlank()) {
-                    OpLogManager.OP_TYPE_UPDATE,
+                num = userMapper.updateById(userNew);
-                    OpLogManager.OP_OBJ_USER,
+                opLogManager.addLog(getLoginUser(session), getTenantId(session),
-                    userNew.getName()+" changed:"+ObjUtil.compare(userOld,userNew));
+                        OpLogManager.OP_TYPE_UPDATE,
+                        OpLogManager.OP_OBJ_USER,
+                        userNew.getName() + " changed:" + diff);
+            }
         }
         else{
             userNew.setPwd(new BCryptPasswordEncoder().encode(default_pwd));

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);
+            String diff = ObjUtil.compare(oldCfg, cfg);
-            opLogManager.addLog(getLoginUser(session),getTenantId(session),
+            if(!diff.isBlank()) {
-                    OpLogManager.OP_TYPE_ADD,
+                num = warningCfgMapper.update(cfg, queryWrapper);
-                    OpLogManager.OP_OBJ_WARNING,
+                opLogManager.addLog(getLoginUser(session), getTenantId(session),
-                    cfg.getTypename() +" update: " + ObjUtil.compare(oldCfg, cfg));
+                        OpLogManager.OP_TYPE_ADD,
+                        OpLogManager.OP_OBJ_WARNING,
+                        cfg.getTypename() + " update: " + diff);
+            }
         }
 
         if (num == 0) {

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

@@ -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;
-//
-//    }
-//
-//}
-//

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;

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.secapi.dto.User;
-import com.imdroid.beidou.entity.UserMapper;
+import com.imdroid.secapi.dto.UserMapper;
 import com.imdroid.secapi.dto.WarningCfg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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.secapi.dto.Tenant;
-import com.imdroid.beidou.entity.TenantMapper;
+import com.imdroid.secapi.dto.TenantMapper;
-import com.imdroid.beidou.entity.User;
+import com.imdroid.secapi.dto.User;
-import com.imdroid.beidou.entity.UserMapper;
+import com.imdroid.secapi.dto.UserMapper;
 import com.imdroid.beidou.utils.BCryptPasswordEncoderUtil;
 import com.imdroid.secapi.dto.WarningCfg;
 import com.imdroid.secapi.dto.WarningCfgMapper;

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;

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[] items = obj1.toString().replaceAll(" +","").split(",|:");
-        String[] items2 = obj2.toString().split(",|:|\\s+");
+        String[] items2 = obj2.toString().replaceAll(" +","").split(",|:");
+
         String diff = "";
         for(int i=0; i<items.length; i++){
             if(!items[i].equals(items2[i])){