Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
entrance_api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王琮
entrance_api
Commits
8041561c
Commit
8041561c
authored
Dec 13, 2022
by
王琮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改邀访导入
parent
61a9c5fb
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
118 additions
and
42 deletions
+118
-42
OssINfoUtil.java
src/main/java/org/rcisoft/sys/ossinfo/util/OssINfoUtil.java
+1
-1
CyEpExcelUtil.java
...main/java/org/rcisoft/sys/sysuser/util/CyEpExcelUtil.java
+0
-2
VisitInfomationController.java
...isoft/sys/visit/controller/VisitInfomationController.java
+11
-2
ExportVisitInfoDto.java
...in/java/org/rcisoft/sys/visit/dto/ExportVisitInfoDto.java
+0
-1
VisitInfomationService.java
...org/rcisoft/sys/visit/service/VisitInfomationService.java
+2
-0
VisitInfomationServiceImpl.java
...ft/sys/visit/service/impl/VisitInfomationServiceImpl.java
+102
-34
application-dev-conf.yml
src/main/resources/application-dev-conf.yml
+2
-2
No files found.
src/main/java/org/rcisoft/sys/ossinfo/util/OssINfoUtil.java
View file @
8041561c
...
@@ -27,7 +27,7 @@ public class OssINfoUtil {
...
@@ -27,7 +27,7 @@ public class OssINfoUtil {
SEPARATOR
=
File
.
separator
;
SEPARATOR
=
File
.
separator
;
}
}
@Value
(
"${global.
path.
base_upload_location}"
)
@Value
(
"${global.base_upload_location}"
)
private
String
baseUploadLocation
;
private
String
baseUploadLocation
;
public
OssInfo
filePath
(
MultipartFile
multipartFile
,
String
temp
)
{
public
OssInfo
filePath
(
MultipartFile
multipartFile
,
String
temp
)
{
...
...
src/main/java/org/rcisoft/sys/sysuser/util/CyEpExcelUtil.java
View file @
8041561c
...
@@ -210,8 +210,6 @@ public class CyEpExcelUtil {
...
@@ -210,8 +210,6 @@ public class CyEpExcelUtil {
* strings 下拉内容
* strings 下拉内容
*/
*/
public
static
void
selectList
(
Workbook
workbook
,
int
firstRow
,
int
lastRow
,
int
firstCol
,
int
lastCol
,
String
[]
strings
)
{
public
static
void
selectList
(
Workbook
workbook
,
int
firstRow
,
int
lastRow
,
int
firstCol
,
int
lastCol
,
String
[]
strings
)
{
Sheet
sheet
=
workbook
.
getSheetAt
(
0
);
Sheet
sheet
=
workbook
.
getSheetAt
(
0
);
// 生成下拉列表
// 生成下拉列表
// 只对(x,x)单元格有效
// 只对(x,x)单元格有效
...
...
src/main/java/org/rcisoft/sys/visit/controller/VisitInfomationController.java
View file @
8041561c
...
@@ -233,11 +233,20 @@ public class VisitInfomationController extends CyPaginationController<VisitInfoM
...
@@ -233,11 +233,20 @@ public class VisitInfomationController extends CyPaginationController<VisitInfoM
@PostMapping
(
"/importExcel"
)
@PostMapping
(
"/importExcel"
)
@CyEptSm4EnableAnno
@CyEptSm4EnableAnno
public
CyResult
importSysUser
(
MultipartFile
file
,
HttpServletResponse
response
)
throws
ParseException
{
public
CyResult
importSysUser
(
MultipartFile
file
,
HttpServletResponse
response
)
throws
ParseException
{
return
CyResultGenUtil
.
builder
(
new
CyPersistModel
(
1
),
return
CyResultGenUtil
.
builder
(
new
CyPersistModel
(
1
),
CyMessCons
.
MESSAGE_ALERT_SUCCESS
,
CyMessCons
.
MESSAGE_ALERT_SUCCESS
,
CyMessCons
.
MESSAGE_ALERT_ERROR
,
CyMessCons
.
MESSAGE_ALERT_ERROR
,
visitInfomationServiceImpl
.
importUserExcel
(
file
,
response
));
visitInfomationServiceImpl
.
importUserExcel
(
file
,
response
));
}
}
@CyOpeLogAnno
(
title
=
"内勤系统-用户管理-导出用户"
,
businessType
=
CyLogTypeEnum
.
EXPORT
)
@ApiOperation
(
value
=
"下载错误信息"
,
notes
=
"下载错误信息"
)
@PostMapping
(
"/downFalseFile"
)
@CyEptSm4EnableAnno
public
CyResult
downFile
(
String
fileName
,
HttpServletResponse
response
)
throws
Exception
{
return
CyResultGenUtil
.
builder
(
new
CyPersistModel
(
1
),
CyMessCons
.
MESSAGE_ALERT_SUCCESS
,
CyMessCons
.
MESSAGE_ALERT_ERROR
,
visitInfomationServiceImpl
.
download
(
fileName
,
response
));
}
}
}
src/main/java/org/rcisoft/sys/visit/dto/ExportVisitInfoDto.java
View file @
8041561c
...
@@ -4,7 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
...
@@ -4,7 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import
lombok.Data
;
import
lombok.Data
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.util.Date
;
@Data
@Data
public
class
ExportVisitInfoDto
{
public
class
ExportVisitInfoDto
{
...
...
src/main/java/org/rcisoft/sys/visit/service/VisitInfomationService.java
View file @
8041561c
...
@@ -103,4 +103,6 @@ public interface VisitInfomationService {
...
@@ -103,4 +103,6 @@ public interface VisitInfomationService {
* @return
* @return
*/
*/
List
<
VisitInfoMation
>
findByUser
(
VisitUser
visitUser
);
List
<
VisitInfoMation
>
findByUser
(
VisitUser
visitUser
);
int
download
(
String
fileName
,
HttpServletResponse
response
)
throws
Exception
;
}
}
src/main/java/org/rcisoft/sys/visit/service/impl/VisitInfomationServiceImpl.java
View file @
8041561c
This diff is collapsed.
Click to expand it.
src/main/resources/application-dev-conf.yml
View file @
8041561c
...
@@ -85,8 +85,8 @@ logging:
...
@@ -85,8 +85,8 @@ logging:
# com.alibaba.nacos: debug
# com.alibaba.nacos: debug
global
:
global
:
#
base_upload_location: /working/file/
base_upload_location
:
/working/file/
base_upload_location
:
D:\working\file
#
base_upload_location: D:\working\file
base_discovery
:
'
http://124.71.16.228:18088/file/'
base_discovery
:
'
http://124.71.16.228:18088/file/'
code_generate_location
:
/code
code_generate_location
:
/code
video_location
:
/video
video_location
:
/video
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment