Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改字典和token过期时间

Browse Source
This commit is contained in:
songjinsheng
2022-05-31 10:47:05 +08:00
parent bd12230d7e
commit a4976eff13
8 changed files with 58 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java
View File

@ -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);
}

7
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java
View File

@ -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);
}

10
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java
View File

@ -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);
}
}

29
ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
View File

@ -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>