优化

# Conflicts:
#	ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleMapper.java
#	ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java
#	ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleMapper.xml

.run/ruoyi-monitor-admin.run.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.1.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-extend/ruoyi-monitor-admin/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-powerjob-server.run.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-powerjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-powerjob-server:5.1.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-extend/ruoyi-powerjob-server/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-server.run.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-server:5.1.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java

@@ -64,6 +64,6 @@ public interface CacheNames {
      * 在线用户
      */
     String ONLINE_TOKEN = "online_tokens";
-    String SYS_QUESTION_ANSWER = "scale:question_answer#3d";
+    String SYS_QUESTION_ANSWER = "scale:question_answer";
 
 }

ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java

@@ -2,6 +2,7 @@ package org.dromara.common.mail.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 
 /**
  * JavaMail 配置属性
@@ -9,6 +10,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @author Michelle.Chung
  */
 @Data
+@Component
 @ConfigurationProperties(prefix = "mail")
 public class MailProperties {
 

ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java

@@ -54,7 +54,9 @@ public class LoginHelper {
         StpUtil.login(loginUser.getLoginId(),
             model.setExtra(USER_KEY, loginUser.getUserId())
                 .setExtra(DEPT_KEY, loginUser.getDeptId()));
-        StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
+        SaSession tokenSession = StpUtil.getTokenSession();
+        tokenSession.updateTimeout(model.getTimeout());
+        tokenSession.set(LOGIN_USER_KEY, loginUser);
     }
 
     /**

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java

@@ -4,6 +4,7 @@ import org.dromara.common.web.enums.CaptchaCategory;
 import org.dromara.common.web.enums.CaptchaType;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 
 /**
  * 验证码 配置属性
@@ -11,6 +12,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @author Lion Li
  */
 @Data
+@Component
 @ConfigurationProperties(prefix = "captcha")
 public class CaptchaProperties {
 

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java

@@ -8,9 +8,11 @@ import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.scale.domain.bo.SysEvaluationAnswerBo;
 import org.dromara.scale.domain.bo.SysEvaluationRecordBo;
 import org.dromara.scale.domain.vo.QuestionAnswerVo;
 import org.dromara.scale.domain.vo.SysScalePublishVo;
+import org.dromara.scale.service.ISysEvaluationConclusionService;
 import org.dromara.scale.service.ISysEvaluationRecordService;
 import org.dromara.scale.service.ISysScaleAnswerService;
 import org.dromara.scale.service.ISysScalePublishService;
@@ -18,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>TODO<p>
@@ -38,6 +41,8 @@ public class WebController extends BaseController {
 
     private final ISysScaleAnswerService scaleAnswerService;
 
+    private final ISysEvaluationConclusionService evaluationConclusionService;
+
 
     /**
      * 查询发布量表
@@ -73,8 +78,8 @@ public class WebController extends BaseController {
     @Log(title = "量测记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/record/answer")
-    public R<Long> add(@Validated(AddGroup.class) @RequestBody SysEvaluationRecordBo bo) {
+    public R<Map<String,Object>> add(@Validated(AddGroup.class) @RequestBody List<SysEvaluationAnswerBo> answerList) {
         //todo
-        return R.ok(evaluationRecordService.insertByBo(bo));
+        return R.ok(evaluationConclusionService.submitAnswer(answerList));
     }
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysEvaluationAnswerBo.java

@@ -1,10 +1,7 @@
 package org.dromara.scale.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import org.dromara.scale.domain.SysEvaluationAnswer;
 
 /**
@@ -20,25 +17,25 @@ public class SysEvaluationAnswerBo {
     /**
      *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    //@NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * td_evaluation_record表id
      */
-    @NotNull(message = "td_evaluation_record表id不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "td_evaluation_record表id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long recordId;
 
     /**
      * 题目id
      */
-    @NotNull(message = "题目id不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "题目id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long questionId;
 
     /**
      * 答案id
      */
-    @NotNull(message = "答案id不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "答案id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long answerId;
 
 

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleVo.java

@@ -136,4 +136,7 @@ public class SysScaleVo implements Serializable {
      */
     @ExcelProperty(value = "测评时间")
     private String scaleTime;
+
+
+    private boolean used;
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationAnswerMapper.java

@@ -1,5 +1,6 @@
 package org.dromara.scale.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.scale.domain.SysEvaluationAnswer;
 import org.dromara.scale.domain.vo.SysEvaluationAnswerVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @author CJW
  * @date 2024-04-07
  */
+@Mapper
 public interface SysEvaluationAnswerMapper extends BaseMapperPlus<SysEvaluationAnswer, SysEvaluationAnswerVo> {
 
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationConclusionMapper.java

@@ -1,5 +1,6 @@
 package org.dromara.scale.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.scale.domain.SysEvaluationConclusion;
 import org.dromara.scale.domain.vo.SysEvaluationConclusionVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @author CJW
  * @date 2024-04-07
  */
+@Mapper
 public interface SysEvaluationConclusionMapper extends BaseMapperPlus<SysEvaluationConclusion, SysEvaluationConclusionVo> {
 
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java

@@ -1,8 +1,12 @@
 package org.dromara.scale.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.scale.domain.SysEvaluationRecord;
 import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+import java.util.List;
 
 /**
  * 量测记录Mapper接口
@@ -10,6 +14,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @author CJW
  * @date 2024-04-07
  */
+@Mapper
 public interface SysEvaluationRecordMapper extends BaseMapperPlus<SysEvaluationRecord, SysEvaluationRecordVo> {
 
+    List<SysEvaluationRecordVo> selectSclaeRecordListByUserAndBatch(@Param("userId") Long userId, @Param("batchNo") Long batchNo);
+
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScaleMapper.java

@@ -1,9 +1,11 @@
 package org.dromara.scale.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.scale.domain.SysScale;
 import org.dromara.scale.domain.vo.SysScaleVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+import java.util.List;
 
 import java.util.List;
 
@@ -16,5 +18,6 @@ import java.util.List;
 @Mapper
 public interface SysScaleMapper extends BaseMapperPlus<SysScale, SysScaleVo> {
 
-    List<SysScale> findSysScaleByIds(String scaleIds);
+    List<SysScaleVo> findSysScaleByIds(String scaleIds);
+
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysEvaluationConclusionService.java

@@ -2,10 +2,12 @@ package org.dromara.scale.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.scale.domain.bo.SysEvaluationAnswerBo;
 import org.dromara.scale.domain.bo.SysEvaluationConclusionBo;
 import org.dromara.scale.domain.vo.SysEvaluationConclusionVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 量测结果Service接口
@@ -30,5 +32,5 @@ public interface ISysEvaluationConclusionService {
      */
     List<SysEvaluationConclusionVo> queryList(SysEvaluationConclusionBo bo);
 
-
+    Map<String,Object> submitAnswer(List<SysEvaluationAnswerBo> answerList);
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java

@@ -7,13 +7,16 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.scale.domain.SysEvaluationConclusion;
+import org.dromara.scale.domain.bo.SysEvaluationAnswerBo;
 import org.dromara.scale.domain.bo.SysEvaluationConclusionBo;
 import org.dromara.scale.domain.vo.SysEvaluationConclusionVo;
+import org.dromara.scale.mapper.SysEvaluationAnswerMapper;
 import org.dromara.scale.mapper.SysEvaluationConclusionMapper;
 import org.dromara.scale.service.ISysEvaluationConclusionService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 量测结果Service业务层处理
@@ -27,11 +30,13 @@ public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclus
 
     private final SysEvaluationConclusionMapper baseMapper;
 
+    private final SysEvaluationAnswerMapper answerMapper;
+
     /**
      * 查询量测结果
      */
     @Override
-    public SysEvaluationConclusionVo queryById(Long id){
+    public SysEvaluationConclusionVo queryById(Long id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -69,8 +74,20 @@ public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclus
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(SysEvaluationConclusion entity){
+    private void validEntityBeforeSave(SysEvaluationConclusion entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
+    @Override
+    public Map<String, Object> submitAnswer(List<SysEvaluationAnswerBo> answerList) {
+
+        //answerMapper.insertBatch();
+        return null;
+    }
+
+    private List<SysEvaluationConclusion> calculateEvaluationResult() {
+        boolean allowQueryResult = true;
+
+        return null;
+    }
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java

@@ -87,6 +87,8 @@ public class SysEvaluationRecordServiceImpl implements ISysEvaluationRecordServi
 
 
 
+
+
     /**
      * 保存前的数据校验
      */

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java

@@ -14,7 +14,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.scale.domain.SysScale;
 import org.dromara.scale.domain.SysScalePublish;
 import org.dromara.scale.domain.bo.SysScalePublishBo;
+import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
 import org.dromara.scale.domain.vo.SysScalePublishVo;
+import org.dromara.scale.domain.vo.SysScaleVo;
+import org.dromara.scale.mapper.SysEvaluationRecordMapper;
 import org.dromara.scale.mapper.SysScaleMapper;
 import org.dromara.scale.mapper.SysScalePublishMapper;
 import org.dromara.scale.service.ISysScalePublishService;
@@ -41,6 +44,10 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
     private final SysScalePublishMapper baseMapper;
     private final SysScaleMapper sysScaleMapper;
 
+    private final SysScaleMapper scaleMapper;
+
+    private final SysEvaluationRecordMapper recordMapper;
+
     /**
      * 查询量发布
      */
@@ -94,8 +101,8 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
         validEntityBeforeSave(add);
 
         if (CollUtil.isNotEmpty(bo.getScaleIds())) {
-            List<SysScale> list = sysScaleMapper.findSysScaleByIds(StrUtil.join(StrUtil.COMMA, bo.getScaleIds()));
-            add.setScaleNames(list.stream().map(SysScale::getScaleName).collect(Collectors.joining(StrUtil.COMMA)));
+            List<SysScaleVo> list = sysScaleMapper.findSysScaleByIds(StrUtil.join(StrUtil.COMMA, bo.getScaleIds()));
+            add.setScaleNames(list.stream().map(SysScaleVo::getScaleName).collect(Collectors.joining(StrUtil.COMMA)));
 
             List<SysScale> scaleList = new ArrayList<>(bo.getScaleIds().size());
             for (String scaleId : bo.getScaleIds()) {
@@ -145,6 +152,7 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
     @Override
     public SysScalePublishVo queryPublishScale() {
         LoginUser loginUser = getLoginUser();
+        Long userId = loginUser.getUserId();
         Long deptId = loginUser.getDeptId();
         SysScalePublishVo sysScalePublishVo = null;
         //先查询有用户组的发布
@@ -161,6 +169,15 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
             lqw.eq(SysScalePublish::getStatus, 0);
             sysScalePublishVo = baseMapper.selectVoOne(lqw);
         }
+        Long batchNo = sysScalePublishVo.getBatchNo();
+        String scaleIds = sysScalePublishVo.getScaleIds();
+        List<SysScaleVo> publishScaleVos = sysScaleMapper.findSysScaleByIds(StrUtil.join(StrUtil.COMMA, scaleIds));
+        List<SysEvaluationRecordVo> recordVos = recordMapper.selectSclaeRecordListByUserAndBatch(userId, batchNo);
+        for (SysEvaluationRecordVo recordVo : recordVos) {
+            publishScaleVos.stream().filter(p -> p.getScaleId().equals(recordVo.getScaleId()))
+                .findFirst().ifPresent(m -> m.setUsed(true));
+        }
+        sysScalePublishVo.setScaleList(publishScaleVos);
         return sysScalePublishVo;
     }
 }

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleQuestionServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -16,6 +17,8 @@ import org.dromara.scale.domain.vo.SysScaleQuestionVo;
 import org.dromara.scale.mapper.SysScaleAnswerMapper;
 import org.dromara.scale.mapper.SysScaleQuestionMapper;
 import org.dromara.scale.service.ISysScaleQuestionService;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -84,11 +87,11 @@ public class SysScaleQuestionServiceImpl implements ISysScaleQuestionService {
     /**
      * 新增量问题内容
      */
+    @CacheEvict(cacheNames = CacheNames.SYS_QUESTION_ANSWER, key = "#bo.scaleId")
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Boolean insertByBo(SysScaleQuestionBo bo) {
         SysScaleQuestion add = MapstructUtils.convert(bo, SysScaleQuestion.class);
-
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
@@ -110,6 +113,9 @@ public class SysScaleQuestionServiceImpl implements ISysScaleQuestionService {
     /**
      * 修改量问题内容
      */
+    @Caching(evict = {
+        @CacheEvict(cacheNames = CacheNames.SYS_QUESTION_ANSWER, key = "#bo.scaleId"),
+        @CacheEvict(cacheNames = CacheNames.SYS_QUESTION_ANSWER, key = "#bo.scaleId")})
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Boolean updateByBo(SysScaleQuestionBo bo) {

ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysEvaluationRecordMapper.xml

@@ -4,4 +4,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.scale.mapper.SysEvaluationRecordMapper">
 
+    <select id="selectSclaeRecordListByUserAndBatch" resultType="org.dromara.scale.domain.vo.SysEvaluationRecordVo">
+        select *
+        from sys_evaluation_record
+        where user_id = #{userId}
+          and batch_no = #{batchNo}
+    </select>
 </mapper>

ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScaleMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.scale.mapper.SysScaleMapper">
 
-    <select id="findSysScaleByIds" resultType="org.dromara.scale.domain.SysScale">
+    <select id="findSysScaleByIds" resultType="org.dromara.scale.domain.vo.SysScaleVo">
         SELECT * FROM sys_scale t WHERE FIND_IN_SET(t.scale_id, #{scaleIds})
     </select>
 </mapper>

ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java

@@ -2,6 +2,7 @@ package org.dromara.generator.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.generator.domain.GenTableColumn;
@@ -13,6 +14,7 @@ import java.util.List;
  *
  * @author Lion Li
  */
+@Mapper
 @InterceptorIgnore(dataPermission = "true", tenantLine = "true")
 public interface GenTableColumnMapper extends BaseMapperPlus<GenTableColumn, GenTableColumn> {
     /**

ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java

@@ -3,6 +3,7 @@ package org.dromara.generator.mapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.generator.domain.GenTable;
 import org.apache.ibatis.annotations.Param;
@@ -14,6 +15,7 @@ import java.util.List;
  *
  * @author Lion Li
  */
+@Mapper
 @InterceptorIgnore(dataPermission = "true", tenantLine = "true")
 public interface GenTableMapper extends BaseMapperPlus<GenTable, GenTable> {