补充id生成

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/ExamRecOptServiceImpl.java

@@ -2,6 +2,7 @@ package com.sundot.airport.common.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.sundot.airport.common.service.ExamRecOptService;
 import com.sundot.airport.entity.ExamRecOpt;
 import com.sundot.airport.mapper.ExamRecOptMapper;
@@ -28,8 +29,8 @@ public class ExamRecOptServiceImpl extends ServiceImpl<ExamRecOptMapper, ExamRec
 
     @Override
     public void setServiceId(ExamRecOpt entity) {
-        //todo 生成id
-        entity.setEroId("");
+
+        entity.setEroId(IdUtils.fastUUID());
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/ExamRecServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.sundot.airport.common.model.params.ExamRecPageParam;
 import com.sundot.airport.common.model.result.ExamCountResult;
 import com.sundot.airport.common.service.ExamRecService;
@@ -35,8 +36,8 @@ public class ExamRecServiceImpl extends ServiceImpl<ExamRecMapper, ExamRec> impl
 
     @Override
     public void setServiceId(ExamRec entity) {
-        //todo 替换成新的id
-        entity.setErId("");
+
+        entity.setErId(IdUtils.fastUUID());
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/ExamServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.sundot.airport.common.model.result.ExamAndTpResult;
 import com.sundot.airport.common.service.ExamService;
 import com.sundot.airport.entity.Exam;
@@ -36,8 +37,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements Ex
 
     @Override
     public void setServiceId(Exam entity) {
-        //todo 新的id生成
-        entity.setExId("");
+        entity.setExId(IdUtils.fastUUID());
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/QuesCatServiceImpl.java

@@ -3,6 +3,7 @@ package com.sundot.airport.common.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.sundot.airport.common.model.result.QuesCatPageResult;
 import com.sundot.airport.common.service.QuesCatService;
 import com.sundot.airport.entity.QuesCat;
@@ -33,8 +34,8 @@ public class QuesCatServiceImpl extends ServiceImpl<QuesCatMapper, QuesCat> impl
 
     @Override
     public void setServiceId(QuesCat entity) {
-        //todo 生成新的id
-        entity.setQcId("");
+
+        entity.setQcId(IdUtils.fastUUID());
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/QuesOptServiceImpl.java

@@ -2,6 +2,7 @@ package com.sundot.airport.common.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.sundot.airport.common.service.QuesOptService;
 import com.sundot.airport.entity.QuesOpt;
 import com.sundot.airport.mapper.QuesOptMapper;
@@ -29,8 +30,8 @@ public class QuesOptServiceImpl extends ServiceImpl<QuesOptMapper, QuesOpt> impl
 
     @Override
     public void setServiceId(QuesOpt entity) {
-        //todo 生成新的id
-        entity.setQoId("");
+
+        entity.setQoId(IdUtils.fastUUID());
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/QuesServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.sundot.airport.common.service.QuesService;
 import com.sundot.airport.constant.QuesCatConstant;
 import com.sundot.airport.entity.Ques;
@@ -35,8 +36,7 @@ public class QuesServiceImpl extends ServiceImpl<QuesMapper, Ques> implements Qu
 
     @Override
     public void setServiceId(Ques entity) {
-        //todo 生成新的id
-        entity.setQuId("");
+        entity.setQuId(IdUtils.fastUUID());
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/TestPaperCatServiceImpl.java

@@ -3,6 +3,7 @@ package com.sundot.airport.common.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.sundot.airport.common.model.result.TestPaperCatPageResult;
 import com.sundot.airport.common.service.TestPaperCatService;
 import com.sundot.airport.entity.TestPaperCat;
@@ -33,8 +34,7 @@ public class TestPaperCatServiceImpl extends ServiceImpl<TestPaperCatMapper, Tes
 
     @Override
     public void setServiceId(TestPaperCat entity) {
-        //todo 生成新的id
-        entity.setTpcId("");
+        entity.setTpcId(IdUtils.fastUUID());
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/TestPaperQuesServiceImpl.java

@@ -3,6 +3,7 @@ package com.sundot.airport.common.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.sundot.airport.common.model.result.TestPaperQuesAndQues;
 import com.sundot.airport.common.service.TestPaperQuesService;
 import com.sundot.airport.entity.TestPaperQues;
@@ -30,8 +31,8 @@ public class TestPaperQuesServiceImpl extends ServiceImpl<TestPaperQuesMapper, T
 
     @Override
     public void setServiceId(TestPaperQues entity) {
-        //todo 生成新的id
-        entity.setTpqId("");
+
+        entity.setTpqId(IdUtils.fastUUID());
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/common/service/impl/TestPaperServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.sundot.airport.common.service.TestPaperService;
 import com.sundot.airport.constant.TestPaperCatConstant;
 import com.sundot.airport.entity.TestPaper;
@@ -36,8 +37,8 @@ public class TestPaperServiceImpl extends ServiceImpl<TestPaperMapper, TestPaper
 
     @Override
     public void setServiceId(TestPaper entity) {
-        //todo 生成新的id
-        entity.setTpId("");
+
+        entity.setTpId(IdUtils.fastUUID());
     }
 
     @Override

ruoyi-modules/airport-exam/src/main/java/com/sundot/airport/handler/MyMetaObjectHandler.java

@@ -3,11 +3,14 @@ package com.sundot.airport.handler;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
 import org.springframework.stereotype.Component;
 
+import java.security.Security;
+
 /**
  * <b>功能名：</b>MyMetaObjectHandler<br>
  * <b>说明：</b> 生成公共字段填充 <br>
@@ -70,7 +73,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
     private String getUserUniqueId() {
         try {
             //todo 通过新的方式获取当前用户
-            return  "";
+            return String.valueOf(SecurityUtils.getUserId());
 
 //            return ObjectUtil.isNull(ThreadContext.get()) || StrUtil.isBlank(ThreadContext.get().getUsrId()) ? ""
 //                    : ThreadContext.get().getUsrId();