diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java index 6da94fe94..00447d8ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java @@ -120,10 +120,6 @@ public class AorestCoverageController { int NUM = service.IntoUpload(value); domain.setPictureCode(value.getFileId()); -// domain.setCreatedTime(LocalDateTime.now()); -// -// -// thematicMapService.save(domain); if (NUM>0) { return AjaxResult.success(); @@ -142,7 +138,7 @@ public class AorestCoverageController { @ApiOperation(value = "文件查询",httpMethod = "GET") public AjaxResult selectUpload(HttpServletResponse response, HttpServletRequest request,@RequestBody UploadFile upload) { - List eastVOSList= service.selectUpload(upload); + List eastVOSList= service.selectUpload(upload.getFileId(),upload.getFileName()); return AjaxResult.success(eastVOSList); } @@ -167,7 +163,7 @@ public class AorestCoverageController { @ApiOperation(value = "字典查询",httpMethod = "POST") public AjaxResult Dictionary(@RequestBody Dictionary dic) { - List diclist=service.selectDic(dic); + List diclist=service.selectDic(dic.getCodingType(),dic.getCodingType1(), dic.getCodingType2()); return AjaxResult.success(diclist); } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 08ec999a1..603a382ed 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -103,6 +103,23 @@ mybatis: # 加载全局的配置文件 configLocation: classpath:mybatis/mybatis-config.xml +## 滑块验证码 +#aj: +# captcha: +# # 缓存类型 +# cache-type: redis +# # blockPuzzle 滑块 clickWord 文字点选 default默认两者都实例化 +# type: blockPuzzle +# # 右下角显示字 +# water-mark: ruoyi.vip +# # 校验滑动拼图允许误差偏移量(默认5像素) +# slip-offset: 5 +# # aes加密坐标开启或者禁用(true|false) +# aes-status: true +# # 滑动干扰项(0/1/2) +# interference-options: 2 + + # PageHelper分页插件 pagehelper: helperDialect: mysql diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 39b2d88cf..fd4fa2e42 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -35,6 +35,14 @@ druid-spring-boot-starter + + + + + + + + com.github.penggle diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index 6f8b9aa5c..1f937ef75 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -27,7 +27,7 @@ import com.ruoyi.system.service.ISysUserService; /** * 登录校验方法 - * + * * @author ruoyi */ @Component @@ -41,7 +41,7 @@ public class SysLoginService @Autowired private RedisCache redisCache; - + @Autowired private ISysUserService userService; @@ -50,7 +50,7 @@ public class SysLoginService /** * 登录验证 - * + * * @param username 用户名 * @param password 密码 * @param code 验证码 @@ -95,7 +95,7 @@ public class SysLoginService /** * 校验验证码 - * + * * @param username 用户名 * @param code 验证码 * @param uuid 唯一标识 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java index bf9d00c02..77aa5bbfc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java @@ -21,7 +21,8 @@ public interface AorestCoverageMapper { Integer IntoUpload(UploadFile file); - List selectUpload(UploadFile file); + List selectUpload(@Param("fileId") String fileId,@Param("fileName") String fileName); - List selectDic(Dictionary dic); + List selectDic(@Param("codingType") String codingType,@Param("codingType1") String codingType1, + @Param("codingType2") String codingType2); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java index 0e53908a9..362f9ff7a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java @@ -18,13 +18,14 @@ public interface IAorestCoverageService { public List selectAorestCoverage(); - public Integer DelAorestCoverage(@Param("id") String id); + public Integer DelAorestCoverage(String id); public Integer IntoAorestCoverage(AorestCoverageVO eastVO); public Integer IntoUpload(UploadFile file); - public List selectUpload(UploadFile file); + public List selectUpload(String fileId,String fileName); - public List selectDic(Dictionary dic); + List selectDic(String codingType,String codingType1, + String codingType2); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java index 6f0271493..206152212 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java @@ -7,6 +7,7 @@ import com.ruoyi.system.domain_yada.UploadFile; import com.ruoyi.system.mapper_yada.AorestCoverageMapper; import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; import com.ruoyi.system.service_yada.IAorestCoverageService; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,12 +46,13 @@ public class AorestCoverageServiceimpl implements IAorestCoverageService { } @Override - public List selectUpload(UploadFile file) { - return coverageMapper.selectUpload(file); + public List selectUpload(String fileId, String fileName) { + return coverageMapper.selectUpload(fileId,fileName); } @Override - public List selectDic(Dictionary dic) { - return coverageMapper.selectDic(dic); + public List selectDic(String codingType,String codingType1, + String codingType2) { + return coverageMapper.selectDic(codingType,codingType1,codingType2); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml index 378f41646..ee9470fb8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml @@ -96,11 +96,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -117,26 +117,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"