修改字典和token过期时间
This commit is contained in:
songjinsheng
parent
bd12230d7e
commit
a4976eff13
@ -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<UploadFile> eastVOSList= service.selectUpload(upload);
|
||||
List<UploadFile> 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<Dictionary> diclist=service.selectDic(dic);
|
||||
List<Dictionary> diclist=service.selectDic(dic.getCodingType(),dic.getCodingType1(), dic.getCodingType2());
|
||||
return AjaxResult.success(diclist);
|
||||
}
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -35,6 +35,14 @@
|
||||
<artifactId>druid-spring-boot-starter</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- <!– 滑块验证码 –>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.github.anji-plus</groupId>-->
|
||||
<!-- <artifactId>captcha-spring-boot-starter</artifactId>-->
|
||||
<!-- <version>1.2.7</version>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
|
||||
<!-- 验证码 -->
|
||||
<dependency>
|
||||
<groupId>com.github.penggle</groupId>
|
||||
|
||||
@ -21,7 +21,8 @@ public interface AorestCoverageMapper {
|
||||
|
||||
Integer IntoUpload(UploadFile file);
|
||||
|
||||
List<UploadFile> selectUpload(UploadFile file);
|
||||
List<UploadFile> selectUpload(@Param("fileId") String fileId,@Param("fileName") String fileName);
|
||||
|
||||
List<Dictionary> selectDic(Dictionary dic);
|
||||
List<Dictionary> selectDic(@Param("codingType") String codingType,@Param("codingType1") String codingType1,
|
||||
@Param("codingType2") String codingType2);
|
||||
}
|
||||
|
||||
@ -18,13 +18,14 @@ public interface IAorestCoverageService {
|
||||
|
||||
public List<AorestCoverageVO> 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<UploadFile> selectUpload(UploadFile file);
|
||||
public List<UploadFile> selectUpload(String fileId,String fileName);
|
||||
|
||||
public List<Dictionary> selectDic(Dictionary dic);
|
||||
List<Dictionary> selectDic(String codingType,String codingType1,
|
||||
String codingType2);
|
||||
}
|
||||
|
||||
@ -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<UploadFile> selectUpload(UploadFile file) {
|
||||
return coverageMapper.selectUpload(file);
|
||||
public List<UploadFile> selectUpload(String fileId, String fileName) {
|
||||
return coverageMapper.selectUpload(fileId,fileName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Dictionary> selectDic(Dictionary dic) {
|
||||
return coverageMapper.selectDic(dic);
|
||||
public List<Dictionary> selectDic(String codingType,String codingType1,
|
||||
String codingType2) {
|
||||
return coverageMapper.selectDic(codingType,codingType1,codingType2);
|
||||
}
|
||||
}
|
||||
|
||||
@ -96,11 +96,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<select id="selectUpload" resultMap="RM_Upload">
|
||||
SELECT file_id,file_name,file_size,file_path,created_by,created_time FROM sys_file_info
|
||||
WHERE 1=1
|
||||
<if test="@Ognl@isNotEmpty(paramBean.fileId)">
|
||||
AND fileId = #{paramBean.fileId}
|
||||
<if test="fileId!= null and fileId !=''">
|
||||
AND fileId = #{fileId}
|
||||
</if>
|
||||
<if test="@Ognl@isNotEmpty(paramBean.fileName)">
|
||||
AND file_name = #{paramBean.fileName}
|
||||
<if test="fileName!= null and fileName !=''">
|
||||
AND file_name = #{fileName}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
@ -117,26 +117,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
<sql id="columnsdic">
|
||||
<![CDATA[
|
||||
coding_type,dictionary,name,nameEn,created_by,created_time
|
||||
coding_type,dictionary,name,name_En,created_by,created_time
|
||||
]]>
|
||||
</sql>
|
||||
|
||||
<select id="selectDic" resultMap="RM_Dictionary">
|
||||
select <include refid="columns"/> from dictionary
|
||||
where coding_type in
|
||||
(SELECT A.coding_type FROM dictionary a
|
||||
select <include refid="columnsdic"/> from dictionary
|
||||
where dictionary in
|
||||
(SELECT A.dictionary FROM dictionary a
|
||||
join (select dictionary from dictionary
|
||||
where 1=1
|
||||
<if test="@Ognl@isNotEmpty(paramBean.codingType)">
|
||||
AND coding_type = #{paramBean.codingType}
|
||||
<if test="codingType!= null and codingType !=''">
|
||||
AND coding_type = #{codingType}
|
||||
</if>
|
||||
<if test="@Ognl@isNotEmpty(paramBean.codingType1)">
|
||||
AND dictionary = #{paramBean.codingType1}
|
||||
<if test="codingType1!= null and codingType1 !=''">
|
||||
AND dictionary = #{codingType1}
|
||||
</if>
|
||||
) b on a.coding_type=b.dictionary
|
||||
and
|
||||
<if test="@Ognl@isNotEmpty(paramBean.codingType2)">
|
||||
AND a.dictionary = #{paramBean.codingType2}
|
||||
<if test="codingType2!= null and codingType2 !=''">
|
||||
AND a.dictionary = #{codingType2}
|
||||
</if>
|
||||
)
|
||||
</select>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user