FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 迁移国内标准法规部分1

Browse Source
This commit is contained in:
super_liu
2021-06-02 21:39:20 +08:00
parent ac33a531ec
commit 4cc558befc
140 changed files with 12514 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
+4 -4
View File
@@ -118,7 +118,7 @@ public class AttFileEOController {
}
/**
* @Author yangxuenan
* @Author super_liu
* @Description 下载文件
* Date 2018/10/10 18:36
* @Param [response, fileId]
@@ -293,7 +293,7 @@ public class AttFileEOController {
}
/**
* @Author yangxuenan
* @Author super_liu
* @Description 根据不同浏览器定义下载文件编码
* Date 2018/10/11 10:40
* @Param [fileName, request]
@@ -316,7 +316,7 @@ public class AttFileEOController {
/**
* @Author yangxuenan
* @Author super_liu
* @Description 查询文件信息
* Date 2018/10/10 18:41
* @Param [fileId]
@@ -330,7 +330,7 @@ public class AttFileEOController {
}
/**
* @Author yangxuenan
* @Author super_liu
* @Description 查询多个文件信息
* Date 2018/10/24 9:47
* @Param [fileIds]
adc-da-sys/src/main/java/com/adc/da/att/entity/AttFileEO.java
+30 -17
View File
@@ -29,12 +29,17 @@ public class AttFileEO extends BaseEntity implements Serializable{
private Date creationTime;
@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
private String tableName;
private String resId;
/**
* 文件下载地址
*/
private String downLoadUrl;
/**
* java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
* <p>字段列表：</p>
@@ -92,26 +97,26 @@ public class AttFileEO extends BaseEntity implements Serializable{
default: return null;
}
}
/** **/
public String getId() {
int tableNameIndex = this.id.lastIndexOf("_");
if(tableNameIndex!= -1){
int tableNameIndex = this.id.lastIndexOf("_");
if(tableNameIndex!= -1){
String tableName = this.id.substring(0, tableNameIndex);
this.tableName=tableName;
}else{
logger.error("文件ID格式错误:"+this.id);
logger.error("文件ID格式错误:"+this.id);
}
return this.id;
}
/** **/
public void setId(String id) {
if(tableName!=null && !tableName.isEmpty()){
this.id = tableName+"_"+id;
}
//此处注意保存时表结构是否存在
this.id=id;
if(tableName!=null && !tableName.isEmpty()){
this.id = tableName+"_"+id;
}
//此处注意保存时表结构是否存在
this.id=id;
}
/** **/
@@ -184,7 +189,7 @@ public class AttFileEO extends BaseEntity implements Serializable{
this.modifyTime = modifyTime;
}
public String getTableName() {
public String getTableName() {
if(this.tableName !=null && !this.tableName.isEmpty()){
return this.tableName;
}else{
@@ -197,11 +202,11 @@ public class AttFileEO extends BaseEntity implements Serializable{
}
return this.tableName;
}
}
}
public void setTableName(String tableName) {
this.tableName = tableName;
}
public void setTableName(String tableName) {
this.tableName = tableName;
}
public static long getSerialVersionUID() {
return serialVersionUID;
@@ -214,4 +219,12 @@ public class AttFileEO extends BaseEntity implements Serializable{
public void setResId(String resId) {
this.resId = resId;
}
public String getDownLoadUrl() {
return downLoadUrl;
}
public void setDownLoadUrl(String downLoadUrl) {
this.downLoadUrl = downLoadUrl;
}
}
adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java
+2 -2
View File
@@ -265,7 +265,7 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> i
/**
* @Author yangxuenan
* @Author super_liu
* @Description 多文件查询
* Date 2018/10/24 11:08
* @Param [fileIds]
@@ -296,7 +296,7 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> i
/**
* @Author yangxuenan
* @Author super_liu
* @Description 获取attId
* Date 2018/10/30 21:05
* @Param [file]
adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
}
/**
* @Author yangxuenan
* @Author super_liu
* @Description 根据当前登录人及资源id查询收藏信息
* Date 2018/10/12 14:31
* @Param [collectResId]
adc-da-sys/src/main/java/com/adc/da/sys/common/ReadExcelName.java
+37
View File
@@ -0,0 +1,37 @@
package com.adc.da.sys.common;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletRequest;
public class ReadExcelName {
private static final Logger logger = LoggerFactory.getLogger(ReadExcelName.class);
/**
*
* @Title: encodeFileName
* @Description: 导出文件转换文件名称编码
* @param @param fileNames
* @param @param request
* @param @return 设定文件
* @return String 返回类型
* @throws
*/
public static String encodeFileName(String fileNames , HttpServletRequest request) {
String codedFilename = null;
try {
String agent = request.getHeader("USER-AGENT");
if (null != agent && -1 != agent.indexOf("MSIE") || null != agent
&& -1 != agent.indexOf("Trident") || null != agent && -1 != agent.indexOf("Edge")) {// ie浏览器及Edge浏览器
String name = java.net.URLEncoder.encode(fileNames, "UTF-8");
codedFilename = name;
} else if (null != agent && -1 != agent.indexOf("Mozilla")) {// 火狐,Chrome等浏览器
codedFilename = new String(fileNames.getBytes("UTF-8"), "iso-8859-1");
}
} catch (Exception e) {
logger.error(e.getMessage(),e);
}
return codedFilename ;
}
}
adc-da-sys/src/main/java/com/adc/da/sys/common/SelectionResult.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.adc.da.sys.common;
/**
* @Description: 用于返回下拉框格式数据
* @Author: yangxuenan
* @Author: super_liu
* date: 2020/9/3 10:05
*/
public class SelectionResult {
adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java
+2 -2
View File
@@ -316,7 +316,7 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
/**
* @return com.adc.da.util.http.ResponseMessage<java.util.Map < java.lang.String , java.lang.String>>
* @Author yangxuenan
* @Author super_liu
* @Description 根据数据字典编码查询字典类型
* Date 2018/9/12 10:12
* @Param [dicCode]
@@ -346,7 +346,7 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
/**
* @return com.adc.da.util.http.ResponseMessage<java.util.List < java.util.Map < java.lang.String , java.lang.String>>>
* @Author yangxuenan
* @Author super_liu
* @Description 根据父级code查询
* Date 2018/10/9 14:11
* @Param [dicTypeCode]
adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java
+1 -1
View File
@@ -24,7 +24,7 @@ public interface DicTypeEODao extends BaseMapper<DicTypeEO> {
public void deleteDicTypeByDicId(String id);
/**
* @Author yangxuenan
* @Author super_liu
* @Description 根据数据字典编码查询字典类型
* Date 2018/9/11 15:09
* @Param [dictionaryCode]
adc-da-sys/src/main/java/com/adc/da/sys/dao/OrgEODao.java
+3
View File
@@ -21,6 +21,9 @@ public interface OrgEODao extends BaseMapper<OrgEO> {
//liwenxuan:判断组织机构简称不重复
public OrgEO getOrgEOByShotNameAndPidAndId(@Param("shotName") String shotName, @Param("pId") String pId, @Param("id") String id);
String getNamesByIds(@Param("list") String[] list);
String getIdsByNames(@Param("list") String[] list, @Param("orgType") String orgType);
public List<OrgEO> getOrgEOByPid(@Param("pId") String pId);
adc-da-sys/src/main/java/com/adc/da/sys/dao/RoleEODao.java
+3
View File
@@ -24,6 +24,9 @@ public interface RoleEODao extends BaseMapper<RoleEO> {
List<RoleEO> queryByPage(BasePage page);
String getNamesByIds(@Param("list") String[] list);
String getIdsByNames(@Param("list") String[] list);
public void save(RoleEO sysRoleEO);
adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java
+4
View File
@@ -23,6 +23,10 @@ public interface UserEODao extends BaseMapper<UserEO> {
public void updateUserEO(UserEO userEO);
String getNamesByIds(@Param("list") String[] list);
String getIdsByNames(@Param("list") String[] list,@Param("orgIdList") String[] orgIdList);
public List<Integer> getRoleIdListByUserId(Integer usid);
public void saveUserRole(@Param("usid") String usid, @Param("roleId") String roleId);
adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java
+1 -1
View File
@@ -24,7 +24,7 @@ public interface IDicTypeEOService extends IService<DicTypeEO> {
public void deleteDicTypeByDicId(String id);
/**
* @Author yangxuenan
* @Author super_liu
* @Description 根据数据字典编码查询字典类型
* Date 2018/9/11 15:09
* @Param [dictionaryCode]
adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicEOServiceImpl.java
+3 -3
View File
@@ -136,7 +136,7 @@ public class DicEOServiceImpl extends ServiceImpl<DicEODao,DictionaryEO> impleme
/***
* @Description: 新增数据字典
* @Author: yangxuenan
* @Author: super_liu
* @Date: 2020/8/21 14:34
* @Param: [dictionaryEO]
* @Return: int
@@ -173,7 +173,7 @@ public class DicEOServiceImpl extends ServiceImpl<DicEODao,DictionaryEO> impleme
/***
* @Description: 修改数据字典
* @Author: yangxuenan
* @Author: super_liu
* @Date: 2020/8/21 15:42
* @Param: [dictionaryEO]
* @Return: java.lang.String
@@ -217,7 +217,7 @@ public class DicEOServiceImpl extends ServiceImpl<DicEODao,DictionaryEO> impleme
/***
* @Description: 以下拉框格式查询所有类别
* @Author: yangxuenan
* @Author: super_liu
* @Date: 2020/9/3 10:08
* @Param: [id]
* @Return: java.util.List<com.adc.da.sys.common.SelectionResult>
adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java
+3 -3
View File
@@ -122,7 +122,7 @@ public class DicTypeEOServiceImpl extends ServiceImpl<DicTypeEODao,DicTypeEO> im
}
/**
* @Author yangxuenan
* @Author super_liu
* @Description 根据数据字典编码查询字典类型
* Date 2018/9/12 10:18
* @Param [dictionaryCode]
@@ -192,7 +192,7 @@ public class DicTypeEOServiceImpl extends ServiceImpl<DicTypeEODao,DicTypeEO> im
}
/**
* @Author yangxuenan
* @Author super_liu
* @Description 根据父级code查询
* Date 2018/10/9 14:08
* @Param [dicTypeCode]
@@ -212,7 +212,7 @@ public class DicTypeEOServiceImpl extends ServiceImpl<DicTypeEODao,DicTypeEO> im
}
/**
* @Author yangxuenan
* @Author super_liu
* @Description 传递多个code值
* Date 2019/1/2 16:38
* @Param [dicTypeCode]