日志管理

api-common/src/main/java/api/common/pojo/constants/LogConstants.java

@@ -29,10 +29,8 @@ public class LogConstants {
     public static final String SYS_LOG_USER_STOP = "0105";//用户管理-停用
     public static final String SYS_LOG_PARAM = "02";//参数管理
     public static final String SYS_LOG_PARAM_INSERT = "0201";//参数管理-编辑即新增
-    public static final String SYS_LOG_PARAM_DELETE = "0202";//集群管理-删除
     public static final String SYS_LOG_CLUSTER = "03";//集群管理
     public static final String SYS_LOG_CLUSTER_INSERT = "0301";//集群管理-编辑即新增
-    public static final String SYS_LOG_CLUSTER_DELETE = "0302";//集群管理-删除
     public static final String SYS_LOG_VEHICLE = "04";//车辆模板管理
     public static final String SYS_LOG_VEHICLE_INSERT = "0401";//车辆模板管理-新增
     public static final String SYS_LOG_VEHICLE_UPDATE = "0402";//车辆模板管理-修改
@@ -40,8 +38,7 @@ public class LogConstants {
     public static final String SYS_LOG_SCENE_TASK = "05";//场景上传
     public static final String SYS_LOG_SCENE_TASK_INSERT = "0501";//上传场景
     public static final String SYS_LOG_SCENE = "06";//场景库管理
-    public static final String SYS_LOG_SCENE_INSERT = "0601";//场景库管理-编辑即新增
-    public static final String SYS_LOG_SCENE_DELETE = "0602";//场景库管理-删除
+    public static final String SYS_LOG_SCENE_DELETE = "0601";//场景库管理-删除
     public static final String SYS_LOG_PACKAGE = "07";//场景包管理
     public static final String SYS_LOG_PACKAGE_INSERT = "0701";//场景包管理-新增
     public static final String SYS_LOG_PACKAGE_UPDATE = "0702";//场景包管理-修改

simulation-resource-server/src/main/java/com/css/simulation/resource/log/service/LogService.java

@@ -3,6 +3,7 @@ package com.css.simulation.resource.log.service;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.log.LogPageParam;
+import api.common.pojo.param.model.VehiclePageParam;
 import api.common.pojo.param.scene.SystemUserSceneParam;
 import api.common.pojo.po.log.LogLoginPO;
 import api.common.pojo.po.log.LogOperationPO;
@@ -12,13 +13,17 @@ import api.common.pojo.po.scene.SystemScenePackagePO;
 import api.common.pojo.po.system.ClusterPO;
 import api.common.pojo.po.system.ParameterPO;
 import api.common.pojo.po.system.UserPO;
+import api.common.pojo.vo.model.VehicleTempVO;
 import api.common.pojo.vo.scene.UserSceneVO;
+import api.common.pojo.vo.system.UserVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PageUtil;
 import com.css.simulation.resource.log.mapper.LogMapper;
+import com.css.simulation.resource.model.mapper.VehicleTempMapper;
+import com.css.simulation.resource.system.mapper.UserMapper;
 import com.css.simulation.resource.system.service.DictService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +44,12 @@ public class LogService {
     @Autowired
     DictService dictService;
 
+    @Autowired
+    UserMapper userMapper;
+
+    @Autowired
+    VehicleTempMapper vehicleTempMapper;
+
     /**
      * 保存普通操作日志（异步）
      */
@@ -106,7 +117,8 @@ public class LogService {
             String userId = userPO.getId();
             String username = userPO.getUsername();
             if(ObjectUtil.isNull(username)){
-                username = "XX";
+                UserVO userVO = userMapper.getUserInfo(userId);
+                username = userVO.getUsername();
             }
             String content = username + " ( ID: " + userId + " )";
             po.setContent(content);
@@ -123,8 +135,14 @@ public class LogService {
         try {
             LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_VEHICLE, operationType);
             String vehicleTempId = vehicleTempPO.getId();
-            String vehicleName = vehicleTempPO.getVehicleName();
-            String content = vehicleName + " ( ID: " + vehicleTempId + " )";
+            String modelLabel = vehicleTempPO.getModelLabel();
+            if(ObjectUtil.isNull(modelLabel)){
+                VehiclePageParam param = new VehiclePageParam();
+                param.setId(vehicleTempId);
+                VehicleTempVO vehicleTempInfo = vehicleTempMapper.getVehicleTempInfo(param);
+                modelLabel = vehicleTempInfo.getModelLabel();
+            }
+            String content = modelLabel + " ( ID: " + vehicleTempId + " )";
             po.setContent(content);
             logMapper.insertSystemLog(po);
         }catch (Exception e){
@@ -166,12 +184,6 @@ public class LogService {
         }
     }
 
-
-
-
-
-
-
     /**
      * 获取系统管理日志对象
      */
@@ -187,70 +199,50 @@ public class LogService {
         return po;
     }
 
-
     /**
      * 记录场景包模块日志
      */
-    public void logScenePackage(String operationType, SystemScenePackagePO systemScenePackagePO,Map map) {
-            try {
-                LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_PACKAGE, operationType);
-                //获取当前登录人姓名
-                //String userName= AuthUtil.getCurrentUsername();
-                String content=null;
-                if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_DELETE)){
-                    content = "删除场景包："+systemScenePackagePO.getPackageName()+"(ID:"+systemScenePackagePO.getId()+")";
-                }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_UPDATE)){
-                    content = "编辑场景包："+systemScenePackagePO.getPackageName()+"(ID:"+systemScenePackagePO.getId()+")";
-                }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_INSERT)){
-                    content = "创建场景包："+systemScenePackagePO.getPackageName()+"(ID:"+systemScenePackagePO.getId()+")";
-                }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION)){
-                    SystemUserSceneParam params=(SystemUserSceneParam)map.get("params");
-                   List<UserSceneVO> userIds= params.getUserIds();
-                   String userCount=null;
-                    for (UserSceneVO vo:userIds) {
-                        if (ObjectUtil.isNull(userCount)){
-                            userCount= vo.getUserName() +"(ID:"+vo.getUserId()+")";
-                        }else{
-                            userCount= userCount+"、"+vo.getUserName() +"(ID:"+vo.getUserId()+")";
-                        }
-
-                    }
-                    userCount=userCount+")";
-                    content = "分配场景包："+params.getPackageName()+"(ID:"+params.getPackageId()+")给用户："+userCount;
-                }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION_DELETE)){
-                    SystemUserSceneParam params=(SystemUserSceneParam)map.get("params");
-                    List<UserSceneVO> userIds= params.getUserIds();
-                    String userCount=null;
-                    for (UserSceneVO vo:userIds) {
-                        if (ObjectUtil.isNull(userCount)){
-                            userCount= vo.getUserName() +"(ID:"+vo.getUserId()+")";
-                        }else{
-                            userCount= userCount+"、"+vo.getUserName() +"(ID:"+vo.getUserId()+")";
-                        }
-
-                    }
-                    userCount=userCount+")";
-                    content = "分配场景包："+params.getPackageName()+"(ID:"+params.getPackageId()+")时移除用户："+userCount;
+    public void logScenePackage(String operationType, SystemScenePackagePO packagePO,SystemUserSceneParam params) {
+        try {
+            LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_PACKAGE, operationType);
+            //获取当前登录人姓名
+            String content=null;
+            if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_DELETE)){
+                content = "删除场景包："+packagePO.getPackageName()+"(ID:"+packagePO.getId()+")";
+            }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_UPDATE)){
+                content = "编辑场景包："+packagePO.getPackageName()+"(ID:"+packagePO.getId()+")";
+            }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_INSERT)){
+                content = "创建场景包："+packagePO.getPackageName()+"(ID:"+packagePO.getId()+")";
+            }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION)){
+                List<UserSceneVO> users = params.getUserIds();
+                StringBuffer sb = new StringBuffer();
+                for (UserSceneVO vo : users) {
+                    sb.append("、").append(vo.getUserName()).append("((ID:").append(vo.getUserId()).append(")");
+                }
+                sb.deleteCharAt(0);
+                content = "分配场景包："+params.getPackageName()+"(ID:"+params.getPackageId()+")给用户："+sb.toString();
+            }else if(operationType.equals(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION_DELETE)){
+                List<UserSceneVO> users= params.getUserIds();
+                StringBuffer sb = new StringBuffer();
+                for (UserSceneVO vo : users) {
+                    sb.append("、").append(vo.getUserName()).append("((ID:").append(vo.getUserId()).append(")");
                 }
-                System.out.println("记录场景包模块日志：---"+content);
-                po.setContent(content);
-                logMapper.insertSystemLog(po);
-            }catch (Exception e){
-                e.printStackTrace();
+                sb.deleteCharAt(0);
+                content = "分配场景包："+params.getPackageName()+"(ID:"+params.getPackageId()+")时移除用户："+sb.toString();
             }
+            po.setContent(content);
+            logMapper.insertSystemLog(po);
+        }catch (Exception e){
+            e.printStackTrace();
         }
+    }
     /**
      * 记录场景包分配模块日志
      */
     public void logSystemUserSceneByPackageId(String operationType, SystemUserSceneParam param,String packageCount) {
         try {
             LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_PACKAGE_GRANT, operationType);
-            /*//获取当前登录人姓名
-            String userName= AuthUtil.getCurrentUsername();*/
-            String content=null;
-            content = param.getUserName()+"(ID"+param.getUserId()+")"+"分配场景包："+packageCount;
-
-            System.out.println("记录场景包分配模块日志：----"+content);
+            String content = param.getUserName()+"(ID"+param.getUserId()+")"+"分配场景包："+packageCount;
             po.setContent(content);
             logMapper.insertSystemLog(po);
         }catch (Exception e){
@@ -265,10 +257,7 @@ public class LogService {
         try {
             LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_SCENE, operationType);
             Map<String,String>  mapType= dictService.getDictMapByType(DictConstants.SCENE_TYPE);
-            //获取当前登录人姓名
-            String userName= AuthUtil.getCurrentUsername();
-            String content=null;
-            content = "删除"+mapType.get(map.get("type"))+":"+map.get("sceneName")+"(ID："+map.get("sceneId")+")" ;
+            String content = "删除"+mapType.get(map.get("type"))+":"+map.get("sceneName")+"(ID："+map.get("sceneId")+")" ;
             po.setContent(content);
             logMapper.insertSystemLog(po);
         }catch (Exception e){

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SystemScenePackageService.java

@@ -2,11 +2,9 @@ package com.css.simulation.resource.scene.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
-import api.common.pojo.param.scene.ScoringRulesParam;
 import api.common.pojo.param.scene.SystemScenePackageParam;
 import api.common.pojo.param.scene.SystemUserSceneParam;
 import api.common.pojo.po.scene.*;
-import api.common.pojo.vo.scene.PackageVO;
 import api.common.pojo.vo.scene.SystemScenePackageVO;
 import api.common.pojo.vo.scene.SystemUserSceneVO;
 import api.common.pojo.vo.scene.UserSceneVO;
@@ -15,14 +13,11 @@ import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.log.service.LogService;
-import com.css.simulation.resource.scene.mapper.ScoringRulesMapper;
 import com.css.simulation.resource.scene.mapper.SystemScenePackageMapper;
 import com.css.simulation.resource.scene.mapper.SystemScenePackageSublistMapper;
 import com.css.simulation.resource.scene.mapper.SystemUserSceneMapper;
-import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -342,11 +337,8 @@ public class SystemScenePackageService {
             list.add(po);
         }
         systemUserSceneMapper.saveSystemUserScene(list);
-        Map map=new HashMap();
-        map.put("params",params);
-
-        //记录场景包
-       logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION, null,map);
+        //记录日志
+       logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION, null,params);
     }
     //根据场景包删除配置账号
     @SneakyThrows
@@ -361,12 +353,8 @@ public class SystemScenePackageService {
             po.setUserId(userScene.getUserId());
             systemUserSceneMapper.deleteSystemUserScene(po);
         }
-       // systemUserSceneMapper.deleteSystemUserSceneList(list);
-        //记录场景包删除
-        Map map=new HashMap();
-        map.put("params",params);
-        //记录场景包
-        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION_DELETE, null,map);
+        //记录日志
+        logService.logScenePackage(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION_DELETE, null,params);
     }
     //人员表查询测试包详情
     @SneakyThrows

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/DictCtrl.java

@@ -6,6 +6,7 @@ import api.common.pojo.vo.system.DictVO;
 import com.css.simulation.resource.system.service.DictService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -33,6 +34,7 @@ public class DictCtrl {
      */
     @RequestMapping("/refreshDictsByTypes")
     @ResponseBody
+    @PreAuthorize("@AuthorityCheck.admin()")
     public ResponseBodyVO refreshDictsByTypes(@RequestBody @Validated DictParam param) throws JsonProcessingException {
         ResponseBodyVO<String> response = new ResponseBodyVO<String>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(dictService.refreshDicts(param));

simulation-resource-server/src/main/resources/simulation.sql

@@ -0,0 +1,103 @@
+-- ####### 升级部署执行 SQL 文件，迭代更新
+-- 2022-07-07
+
+DROP TABLE IF EXISTS `relation_user_scene`;
+
+ALTER TABLE model_vehicle ADD COLUMN model_label varchar(100) DEFAULT NULL COMMENT '模型标识' AFTER description;
+
+ALTER TABLE model_vehicle_template ADD COLUMN model_label varchar(100) DEFAULT NULL COMMENT '模型标识' AFTER description;
+
+UPDATE model_vehicle_template SET model_label = CONCAT(vehicle_type,'_',vehicle_model,'_',vehicle_colour);
+
+UPDATE model_vehicle v SET v.model_label = (SELECT m.model_label FROM model_vehicle_template m WHERE v.vehicle_type = m.vehicle_type);
+
+UPDATE model_vehicle SET vehicle_type = CONCAT(vehicle_type,',',vehicle_model,',',vehicle_colour);
+
+ALTER TABLE algorithm ADD COLUMN git_version varchar(128) DEFAULT NULL COMMENT 'git算法版本号' AFTER docker_image;
+
+
+DROP TABLE IF EXISTS `simulation_automatic_project`;
+CREATE TABLE `simulation_automatic_project` (
+`id`  varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'id' ,
+`project_date`  int(10) NULL DEFAULT NULL COMMENT '项目日期' ,
+`project_num`  int(10) NULL DEFAULT NULL COMMENT '项目序号' ,
+`project_id`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '项目id' ,
+`project_name`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '项目名称' ,
+`project_describe`  varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '项目描述' ,
+`algorithm`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '算法 id' ,
+`algorithm_type`  varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '算法类型' ,
+`vehicle`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '车辆模型 id' ,
+`scene`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '场景测试包 id' ,
+`operation_cycle`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '运行周期' ,
+`parallelism`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '并行度' ,
+`rule_view`  varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '规则查看' ,
+`max_simulation_time`  bigint(15) NULL DEFAULT NULL COMMENT '最大仿真时间，单位秒' ,
+`is_choice_gpu`  varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否选择gpu(0:是，1：否)' ,
+`automatic_run_times`  bigint(15) NULL DEFAULT NULL COMMENT '自动运行次数' ,
+`last_run_time`  datetime NULL DEFAULT NULL COMMENT '最近运行时间' ,
+`automatic_run_state`  varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '自动运行状态(0：开启，1：关闭)' ,
+`create_time`  datetime NULL DEFAULT NULL ,
+`create_user_id`  varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' ,
+`modify_time`  datetime NULL DEFAULT NULL ,
+`modify_user_id`  varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ,
+`is_deleted`  varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ,
+PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB
+DEFAULT CHARACTER SET=utf8 COLLATE=utf8_general_ci
+COMMENT='自动运行项目表';
+
+DROP TABLE IF EXISTS `simulation_automatic_subproject`;
+CREATE TABLE `simulation_automatic_subproject` (
+`id`  varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'id' ,
+`parent_id`  varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主项目表id' ,
+`parent_project_id`  varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主项目表项目id' ,
+`project_date`  int(10) NULL DEFAULT NULL COMMENT '项目日期' ,
+`project_num`  int(10) NULL DEFAULT NULL COMMENT '项目序号' ,
+`project_id`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '项目id' ,
+`project_name`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '项目名称' ,
+`now_run_state`  varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '当前运行状态(10：未执行，20：执行中，30：执行完成，40：已中止)' ,
+`evaluation_level`  varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '评测等级(G,A,M,P)' ,
+`start_time`  datetime NULL DEFAULT NULL COMMENT '开始时间' ,
+`finish_time`  datetime NULL DEFAULT NULL COMMENT '完成时间' ,
+`algorithm_score`  double NULL DEFAULT NULL COMMENT '算法得分' ,
+`task_number`  int(11) NULL DEFAULT NULL COMMENT '任务数量' ,
+`task_completed`  int(11) NULL DEFAULT NULL COMMENT '\'Aborted\', \'PendingAnalysis\', \'Terminated\'任务个数' ,
+`create_time`  datetime NULL DEFAULT NULL ,
+`create_user_id`  varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' ,
+`modify_time`  datetime NULL DEFAULT NULL ,
+`modify_user_id`  varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ,
+`is_deleted`  varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ,
+PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB
+DEFAULT CHARACTER SET=utf8 COLLATE=utf8_general_ci
+COMMENT='自动运行子项目子表';
+
+ALTER TABLE system_menu ADD COLUMN icon varchar(50) DEFAULT NULL COMMENT '图标' AFTER router;
+
+DROP TABLE IF EXISTS `system_parameter`;
+CREATE TABLE `system_parameter` (
+`id`  varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '参数id' ,
+`user_id`  varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '账户id' ,
+`num_create_user`  int(32) NULL DEFAULT NULL COMMENT '可创建子账户数量' ,
+`num_create_scene_package`  int(32) NULL DEFAULT NULL COMMENT '最多可创建场景测试包数量' ,
+`num_scene_per_package`  int(32) NULL DEFAULT NULL COMMENT '场景测试包最大场景数量' ,
+`create_time`  datetime NULL DEFAULT NULL ,
+`modify_time`  datetime NULL DEFAULT NULL ,
+`create_user_id`  varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ,
+`modify_user_id`  varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ,
+`is_deleted`  varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ,
+PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB
+DEFAULT CHARACTER SET=utf8 COLLATE=utf8_general_ci;
+
+
+ALTER TABLE system_role ADD COLUMN sort int(11) DEFAULT NULL COMMENT '排序号' AFTER visible;
+
+INSERT INTO `system_user` (`id`, `username`, `password`, `nickname`, `photo`, `phone`, `company`, `role_code`, `use_type`, `visible`, `openid`, `create_time`, `modify_time`, `create_user_id`, `modify_user_id`, `is_deleted`) VALUES ('510f29c5af754429a7a2a02f8275e506', 'sysadmin', 'e10adc3949ba59abbe56e057f20f883e', '超级管理员', NULL, '12345678912', '国汽', '0', '1', '1', NULL, '2022-5-16 10:19:46', '2022-6-13 10:01:42', '510f29c5af754429a7a2a02f8275e506', '510f29c5af754429a7a2a02f8275e506', '0');
+INSERT INTO `system_user` (`id`, `username`, `password`, `nickname`, `photo`, `phone`, `company`, `role_code`, `use_type`, `visible`, `openid`, `create_time`, `modify_time`, `create_user_id`, `modify_user_id`, `is_deleted`) VALUES ('545d4914865d4a3cb6398fc25ffbc1b5', 'admin', 'e10adc3949ba59abbe56e057f20f883e', '子管理员', NULL, '090-00000000', '国汽', '1', '1', '1', '', '2022-5-10 10:36:11', '2022-7-6 15:11:40', '510f29c5af754429a7a2a02f8275e506', '545d4914865d4a3cb6398fc25ffbc1b5', '0');
+INSERT INTO `system_user` (`id`, `username`, `password`, `nickname`, `photo`, `phone`, `company`, `role_code`, `use_type`, `visible`, `openid`, `create_time`, `modify_time`, `create_user_id`, `modify_user_id`, `is_deleted`) VALUES ('aaaaaaaaaabbbbbbbbbbcccccccc1001', '1001', 'e10adc3949ba59abbe56e057f20f883e', '索为普通用户1', NULL, '112', '国汽', '2', '1', '1', '', '2022-6-15 16:05:53', '2022-6-22 17:15:14', '510f29c5af754429a7a2a02f8275e506', 'aaaaaaaaaabbbbbbbbbbcccccccc1001', '0');
+
+