Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
device-back
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
device-back
Commits
8ca76ac3
提交
8ca76ac3
authored
12月 01, 2022
作者:
zjm
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(使用请款): 添加使用情况生成word以及修改word接口
添加使用情况生成word以及修改word接口
上级
5ed28e6e
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
180 行增加
和
1 行删除
+180
-1
UseReportFIleServiceImpl.java
...ev/device/file/service/Impl/UseReportFIleServiceImpl.java
+54
-0
UseReportFIleService.java
...om/tykj/dev/device/file/service/UseReportFIleService.java
+4
-0
DeviceUseReportController.java
...evice/usereport/controller/DeviceUseReportController.java
+9
-0
DeviceUseReportService.java
.../dev/device/usereport/service/DeviceUseReportService.java
+8
-0
DeviceUseReportServiceImpl.java
...ce/usereport/service/impl/DeviceUseReportServiceImpl.java
+95
-1
DeviceUseReport.java
...j/dev/device/usereport/subject/domin/DeviceUseReport.java
+10
-0
没有找到文件。
dev-file/src/main/java/com/tykj/dev/device/file/service/Impl/UseReportFIleServiceImpl.java
浏览文件 @
8ca76ac3
package
com
.
tykj
.
dev
.
device
.
file
.
service
.
Impl
;
package
com
.
tykj
.
dev
.
device
.
file
.
service
.
Impl
;
import
com.tykj.dev.device.file.entity.FileRet
;
import
com.tykj.dev.device.file.entity.WrodParameter
;
import
com.tykj.dev.device.file.entity.WrodParameter
;
import
com.tykj.dev.device.file.service.UseReportFIleService
;
import
com.tykj.dev.device.file.service.UseReportFIleService
;
import
com.tykj.dev.device.file.util.WordUtil
;
import
com.tykj.dev.device.file.util.WordUtil
;
...
@@ -125,6 +126,59 @@ public class UseReportFIleServiceImpl implements UseReportFIleService {
...
@@ -125,6 +126,59 @@ public class UseReportFIleServiceImpl implements UseReportFIleService {
}
}
@Override
public
FileRet
findToFileServiceToFileRet
(
WrodParameter
wrodParameter
,
String
docModel
)
throws
IOException
{
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
// 渲染文本
params
.
put
(
"time"
,
wrodParameter
.
getTime
());
//装备类型总数
params
.
put
(
"deviceNumber"
,
wrodParameter
.
getDeviceNumber
());
//入库数量
params
.
put
(
"inLibraryNum"
,
wrodParameter
.
getInLibraryNum
());
//维修数量
params
.
put
(
"sendRepairNum"
,
wrodParameter
.
getSendRepairNum
());
//维修退回
params
.
put
(
"receiveRepairNum"
,
wrodParameter
.
getReceiveRepairNum
());
//销毁数量
params
.
put
(
"destoryNum"
,
wrodParameter
.
getDestoryNum
());
//发起配发数量
params
.
put
(
"sendAllotNum"
,
wrodParameter
.
getSendAllotNum
());
//接收配发数量
params
.
put
(
"receiveAllotNum"
,
wrodParameter
.
getReceiveAllotNum
());
//发起退回数量
params
.
put
(
"sensAllotBackNum"
,
wrodParameter
.
getSendAllotBackNum
());
//接收退回
params
.
put
(
"receiveAllotBackNum"
,
wrodParameter
.
getReceiveAllotBackNum
());
//清退数量
params
.
put
(
"sendBackNum"
,
wrodParameter
.
getSendBackNum
());
//报废数量
params
.
put
(
"scrapStatisticsNum"
,
wrodParameter
.
getScrapStatisticsNum
());
//列装数量
params
.
put
(
"packingNum"
,
wrodParameter
.
getPackingNum
());
//退装数量
params
.
put
(
"retiredNum"
,
wrodParameter
.
getRetiredNum
());
//退役
params
.
put
(
"decommissioningStatisticsNum"
,
wrodParameter
.
getDecommissioningStatisticsNum
());
//向下级进行维修退回
params
.
put
(
"toRepairBackNum"
,
wrodParameter
.
getToRepairBackNum
());
//接收下级进行维修
params
.
put
(
"toRepairNum"
,
wrodParameter
.
getToRepairNum
());
params
.
put
(
"TitleAnnual"
,
wrodParameter
.
getTitleAnnual
());
params
.
put
(
"TitleTimeEnd"
,
wrodParameter
.
getTitleTimeEnd
());
params
.
put
(
"TitleTimeStart"
,
wrodParameter
.
getTitleTimeStart
());
params
.
put
(
"TitleUnitName"
,
wrodParameter
.
getTitleUnitName
());
String
templatePath
=
ResourceUtils
.
getURL
(
"classpath:"
).
getPath
()+
"docTemplate/"
+
docModel
;
url
=
url
+
"report/"
;
String
uuidName
=
UUID
.
randomUUID
().
toString
().
replace
(
"-"
,
""
);
String
fileUrl
=
WordUtil
.
createWord
(
templatePath
,
url
,
uuidName
,
params
);
File
tempFile
=
new
File
(
fileUrl
);
String
fileName
=
tempFile
.
getName
();
FileRet
fileRet
=
new
FileRet
(
fileName
,
fileUrl
,
preview
+
"report/"
+
fileName
);
return
fileRet
;
}
@Override
@Override
public
void
download
(
String
url
,
String
name
,
HttpServletResponse
response
,
HttpServletRequest
httpServletRequest
)
{
public
void
download
(
String
url
,
String
name
,
HttpServletResponse
response
,
HttpServletRequest
httpServletRequest
)
{
// response.setHeader("content-type", "application/octet-stream");
// response.setHeader("content-type", "application/octet-stream");
...
...
dev-file/src/main/java/com/tykj/dev/device/file/service/UseReportFIleService.java
浏览文件 @
8ca76ac3
package
com
.
tykj
.
dev
.
device
.
file
.
service
;
package
com
.
tykj
.
dev
.
device
.
file
.
service
;
import
com.tykj.dev.device.file.entity.FileRet
;
import
com.tykj.dev.device.file.entity.WrodParameter
;
import
com.tykj.dev.device.file.entity.WrodParameter
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
...
@@ -10,6 +11,9 @@ import java.io.IOException;
...
@@ -10,6 +11,9 @@ import java.io.IOException;
public
interface
UseReportFIleService
{
public
interface
UseReportFIleService
{
void
findToFileService
(
WrodParameter
wrodParameter
,
HttpServletResponse
response
,
HttpServletRequest
httpServletRequest
,
String
docModel
)
throws
IOException
;
void
findToFileService
(
WrodParameter
wrodParameter
,
HttpServletResponse
response
,
HttpServletRequest
httpServletRequest
,
String
docModel
)
throws
IOException
;
FileRet
findToFileServiceToFileRet
(
WrodParameter
wrodParameter
,
String
docModel
)
throws
IOException
;
void
download
(
String
url
,
String
name
,
HttpServletResponse
response
,
HttpServletRequest
httpServletRequest
);
void
download
(
String
url
,
String
name
,
HttpServletResponse
response
,
HttpServletRequest
httpServletRequest
);
}
}
dev-usereport/src/main/java/com/tykj/dev/device/usereport/controller/DeviceUseReportController.java
浏览文件 @
8ca76ac3
package
com
.
tykj
.
dev
.
device
.
usereport
.
controller
;
package
com
.
tykj
.
dev
.
device
.
usereport
.
controller
;
import
com.tykj.dev.config.swagger.AutoDocument
;
import
com.tykj.dev.config.swagger.AutoDocument
;
import
com.tykj.dev.device.file.entity.FileRet
;
import
com.tykj.dev.device.file.entity.WrodParameter
;
import
com.tykj.dev.device.file.entity.WrodParameter
;
import
com.tykj.dev.device.file.service.UseReportFIleService
;
import
com.tykj.dev.device.file.service.UseReportFIleService
;
import
com.tykj.dev.device.user.cache.UnitsCache
;
import
com.tykj.dev.device.user.cache.UnitsCache
;
...
@@ -134,4 +135,12 @@ public class DeviceUseReportController {
...
@@ -134,4 +135,12 @@ public class DeviceUseReportController {
}
}
return
ResponseEntity
.
ok
(
"下载成功"
);
return
ResponseEntity
.
ok
(
"下载成功"
);
}
}
@ApiOperation
(
value
=
"装备使用报告文件修改接口"
,
notes
=
"装备使用报告下载"
)
@PostMapping
(
"/updateUseReport/{id}"
)
public
ResponseEntity
getDownloadUrl
(
@PathVariable
(
"id"
)
int
id
,
@RequestBody
List
<
FileRet
>
fileRets
)
throws
IOException
{
deviceUseReportService
.
updateUseReport
(
id
,
fileRets
);
return
ResponseEntity
.
ok
(
"成功"
);
}
}
}
dev-usereport/src/main/java/com/tykj/dev/device/usereport/service/DeviceUseReportService.java
浏览文件 @
8ca76ac3
package
com
.
tykj
.
dev
.
device
.
usereport
.
service
;
package
com
.
tykj
.
dev
.
device
.
usereport
.
service
;
import
com.tykj.dev.device.file.entity.FileRet
;
import
com.tykj.dev.device.usereport.subject.domin.DeviceUseReport
;
import
com.tykj.dev.device.usereport.subject.domin.DeviceUseReport
;
import
com.tykj.dev.device.usereport.subject.vo.DeviceStatistics
;
import
com.tykj.dev.device.usereport.subject.vo.DeviceStatistics
;
import
com.tykj.dev.device.usereport.subject.vo.DeviceUseReportCreateVo
;
import
com.tykj.dev.device.usereport.subject.vo.DeviceUseReportCreateVo
;
...
@@ -140,4 +141,11 @@ public interface DeviceUseReportService {
...
@@ -140,4 +141,11 @@ public interface DeviceUseReportService {
void
delete
(
Integer
id
);
void
delete
(
Integer
id
);
/**
* 更新文件使用情况报告信息
* @param id 业务id
* @param fileRets 新文件集合
*/
void
updateUseReport
(
Integer
id
,
List
<
FileRet
>
fileRets
);
}
}
dev-usereport/src/main/java/com/tykj/dev/device/usereport/service/impl/DeviceUseReportServiceImpl.java
浏览文件 @
8ca76ac3
...
@@ -10,6 +10,10 @@ import com.tykj.dev.device.allot.repository.AllotBillDao;
...
@@ -10,6 +10,10 @@ import com.tykj.dev.device.allot.repository.AllotBillDao;
import
com.tykj.dev.device.allot.subject.domin.AllotBackBill
;
import
com.tykj.dev.device.allot.subject.domin.AllotBackBill
;
import
com.tykj.dev.device.allot.subject.domin.AllotBill
;
import
com.tykj.dev.device.allot.subject.domin.AllotBill
;
import
com.tykj.dev.device.destroy.repository.DeviceDestroyBillDao
;
import
com.tykj.dev.device.destroy.repository.DeviceDestroyBillDao
;
import
com.tykj.dev.device.file.entity.FileRet
;
import
com.tykj.dev.device.file.entity.WrodParameter
;
import
com.tykj.dev.device.file.service.FilesUtil
;
import
com.tykj.dev.device.file.service.UseReportFIleService
;
import
com.tykj.dev.device.library.repository.DeviceLibraryDao
;
import
com.tykj.dev.device.library.repository.DeviceLibraryDao
;
import
com.tykj.dev.device.library.service.DeviceLibraryService
;
import
com.tykj.dev.device.library.service.DeviceLibraryService
;
import
com.tykj.dev.device.library.subject.domin.DeviceLibrary
;
import
com.tykj.dev.device.library.subject.domin.DeviceLibrary
;
...
@@ -38,9 +42,12 @@ import com.tykj.dev.device.usereport.service.DeviceUseReportService;
...
@@ -38,9 +42,12 @@ import com.tykj.dev.device.usereport.service.DeviceUseReportService;
import
com.tykj.dev.device.usereport.subject.domin.DeviceUseReport
;
import
com.tykj.dev.device.usereport.subject.domin.DeviceUseReport
;
import
com.tykj.dev.device.usereport.subject.vo.DeviceStatistics
;
import
com.tykj.dev.device.usereport.subject.vo.DeviceStatistics
;
import
com.tykj.dev.device.usereport.subject.vo.DeviceUseReportCreateVo
;
import
com.tykj.dev.device.usereport.subject.vo.DeviceUseReportCreateVo
;
import
com.tykj.dev.device.usereport.subject.vo.DeviceUseReportDetailVo
;
import
com.tykj.dev.device.usereport.subject.vo.DeviceUseReportSelectVo
;
import
com.tykj.dev.device.usereport.subject.vo.DeviceUseReportSelectVo
;
import
com.tykj.dev.misc.base.ResultObj
;
import
com.tykj.dev.misc.utils.JacksonUtil
;
import
com.tykj.dev.misc.utils.JacksonUtil
;
import
com.tykj.dev.misc.utils.StringSplitUtil
;
import
com.tykj.dev.misc.utils.StringSplitUtil
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
...
@@ -50,7 +57,12 @@ import org.springframework.stereotype.Service;
...
@@ -50,7 +57,12 @@ import org.springframework.stereotype.Service;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.persistence.Transient
;
import
javax.persistence.Transient
;
import
java.io.IOException
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.Field
;
import
java.time.Instant
;
import
java.time.LocalDateTime
;
import
java.time.ZoneId
;
import
java.time.ZoneOffset
;
import
java.util.*
;
import
java.util.*
;
import
static
java
.
util
.
stream
.
Collectors
.
groupingBy
;
import
static
java
.
util
.
stream
.
Collectors
.
groupingBy
;
...
@@ -115,6 +127,9 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
...
@@ -115,6 +127,9 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
@Resource
@Resource
private
UserCache
userCache
;
private
UserCache
userCache
;
@Autowired
UseReportFIleService
useReportFIleService
;
@Override
@Override
public
DeviceUseReport
addEntity
(
DeviceUseReport
deviceUseReportEntity
)
{
public
DeviceUseReport
addEntity
(
DeviceUseReport
deviceUseReportEntity
)
{
...
@@ -137,7 +152,15 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
...
@@ -137,7 +152,15 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
@Override
@Override
public
Page
<
DeviceUseReport
>
getPage
(
DeviceUseReportSelectVo
deviceUseReportSelectVo
,
Pageable
pageable
)
{
public
Page
<
DeviceUseReport
>
getPage
(
DeviceUseReportSelectVo
deviceUseReportSelectVo
,
Pageable
pageable
)
{
return
deviceUseReportDao
.
findAll
(
getSelectSpecification
(
deviceUseReportSelectVo
),
deviceUseReportSelectVo
.
getPageable
());
Page
<
DeviceUseReport
>
all
=
deviceUseReportDao
.
findAll
(
getSelectSpecification
(
deviceUseReportSelectVo
),
deviceUseReportSelectVo
.
getPageable
());
all
.
forEach
(
deviceUseReport
->
{
if
(
deviceUseReport
.
getFileJson
()!=
null
)
{
deviceUseReport
.
setFileRet
(
FilesUtil
.
stringFileToList
(
deviceUseReport
.
getFileJson
()));
}
}
);
return
all
;
}
}
@Override
@Override
...
@@ -569,9 +592,73 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
...
@@ -569,9 +592,73 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
+
"x"
+
sendAllotNum
+
"x"
+
receiveAllotNum
+
"x"
+
sendAllotBackNum
+
"x"
+
sendAllotNum
+
"x"
+
receiveAllotNum
+
"x"
+
sendAllotBackNum
+
"x"
+
receiveAllotBackNum
+
"x"
+
sendBackNum
+
"x"
+
scrapStatisticsNum
+
"x"
+
receiveAllotBackNum
+
"x"
+
sendBackNum
+
"x"
+
scrapStatisticsNum
+
"x"
+
packingNum
+
"x"
+
retiredNum
+
"x"
+
decommissioningStatisticsNum
+
"x"
+
toRepairBackNum
+
"x"
+
toRepairNum
+
"x"
);
+
"x"
+
packingNum
+
"x"
+
retiredNum
+
"x"
+
decommissioningStatisticsNum
+
"x"
+
toRepairBackNum
+
"x"
+
toRepairNum
+
"x"
);
DeviceUseReportDetailVo
deviceUseReportDetailVo
=
toDeviceUseReportDetailVo
(
deviceUseReportEntity
);
try
{
List
<
FileRet
>
fileRets
=
new
ArrayList
<>();
FileRet
fileRet
=
generateWord
(
deviceUseReportDetailVo
);
fileRets
.
add
(
fileRet
);
deviceUseReportEntity
.
setFileJson
(
FilesUtil
.
stringFileToList
(
fileRets
));
}
catch
(
IOException
e
)
{
throw
new
RuntimeException
(
e
);
}
return
deviceUseReportDao
.
save
(
deviceUseReportEntity
);
return
deviceUseReportDao
.
save
(
deviceUseReportEntity
);
}
}
private
DeviceUseReportDetailVo
toDeviceUseReportDetailVo
(
DeviceUseReport
deviceUseReport
){
DeviceUseReportDetailVo
deviceUseReportDetailVo
=
new
DeviceUseReportDetailVo
();
BeanUtils
.
copyProperties
(
deviceUseReport
,
deviceUseReportDetailVo
);
//分解数量详情组合字段
List
<
Integer
>
list
=
StringSplitUtil
.
userIdSplit
(
deviceUseReport
.
getReportDetail
());
if
(
list
.
size
()
>
15
)
{
deviceUseReportDetailVo
.
setDeviceNumber
(
list
.
get
(
0
));
deviceUseReportDetailVo
.
setInLibraryNum
(
list
.
get
(
1
));
deviceUseReportDetailVo
.
setSendRepairNum
(
list
.
get
(
2
));
deviceUseReportDetailVo
.
setReceiveRepairNum
(
list
.
get
(
3
));
deviceUseReportDetailVo
.
setDestoryNum
(
list
.
get
(
4
));
deviceUseReportDetailVo
.
setSendAllotNum
(
list
.
get
(
5
));
deviceUseReportDetailVo
.
setReceiveAllotNum
(
list
.
get
(
6
));
deviceUseReportDetailVo
.
setSendAllotBackNum
(
list
.
get
(
7
));
deviceUseReportDetailVo
.
setReceiveAllotBackNum
(
list
.
get
(
8
));
deviceUseReportDetailVo
.
setSendBackNum
(
list
.
get
(
9
));
deviceUseReportDetailVo
.
setScrapStatisticsNum
(
list
.
get
(
10
));
deviceUseReportDetailVo
.
setPackingNum
(
list
.
get
(
11
));
deviceUseReportDetailVo
.
setRetiredNum
(
list
.
get
(
12
));
deviceUseReportDetailVo
.
setDecommissioningStatisticsNum
(
list
.
get
(
13
));
deviceUseReportDetailVo
.
setToRepairBackNum
(
list
.
get
(
14
));
deviceUseReportDetailVo
.
setToRepairNum
(
list
.
get
(
15
));
}
return
deviceUseReportDetailVo
;
}
private
FileRet
generateWord
(
DeviceUseReportDetailVo
deviceUseReportDetailVo
)
throws
IOException
{
//新建word模板
WrodParameter
wrodParameter
=
deviceUseReportDetailVo
.
toWrodParameter
();
Units
units
=
unitsCache
.
findById
(
deviceUseReportDetailVo
.
getUnitId
());
Instant
instant
=
LocalDateTime
.
now
().
toInstant
(
ZoneOffset
.
ofHours
(
8
));
ZoneId
zone
=
ZoneId
.
systemDefault
();
LocalDateTime
localDateTime
=
LocalDateTime
.
ofInstant
(
instant
,
zone
);
wrodParameter
.
setTime
(
localDateTime
.
getYear
()+
"年"
+
localDateTime
.
getMonthValue
()+
"月"
+
localDateTime
.
getDayOfMonth
()+
"日"
);
wrodParameter
.
setTitleUnitName
(
deviceUseReportDetailVo
.
getUnit
());
Instant
instant1
=
deviceUseReportDetailVo
.
getStartTime
().
toInstant
();
Instant
instant2
=
deviceUseReportDetailVo
.
getEndTime
().
toInstant
();
LocalDateTime
localDateTime1
=
LocalDateTime
.
ofInstant
(
instant1
,
zone
);
LocalDateTime
localDateTime2
=
LocalDateTime
.
ofInstant
(
instant2
,
zone
);
String
startTime
=
localDateTime1
.
getYear
()+
"年"
+
localDateTime1
.
getMonthValue
()+
"月"
+
localDateTime1
.
getDayOfMonth
()+
"日"
;
String
endTime
=
localDateTime2
.
getYear
()+
"年"
+
localDateTime2
.
getMonthValue
()+
"月"
+
localDateTime2
.
getDayOfMonth
()+
"日"
;
wrodParameter
.
setTitleTimeStart
(
startTime
);
wrodParameter
.
setTitleTimeEnd
(
endTime
);
wrodParameter
.
setTitleAnnual
(
localDateTime
.
getYear
());
if
(
units
.
getLevel
()==
1
&&
units
.
getType
()==
1
)
{
return
useReportFIleService
.
findToFileServiceToFileRet
(
wrodParameter
,
"docxModel.docx"
);
}
else
if
(
units
.
getLevel
()==
2
){
return
useReportFIleService
.
findToFileServiceToFileRet
(
wrodParameter
,
"docxModel1.docx"
);
}
else
{
return
useReportFIleService
.
findToFileServiceToFileRet
(
wrodParameter
,
"docxModel2.docx"
);
}
}
/**
/**
* @param startDate 开始时间
* @param startDate 开始时间
* @param endDate 结束时间
* @param endDate 结束时间
...
@@ -748,6 +835,13 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
...
@@ -748,6 +835,13 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
deviceUseReportDao
.
deleteById
(
id
);
deviceUseReportDao
.
deleteById
(
id
);
}
}
@Override
public
void
updateUseReport
(
Integer
id
,
List
<
FileRet
>
fileRets
)
{
DeviceUseReport
one
=
getOne
(
id
);
one
.
setFileJson
(
FilesUtil
.
stringFileToList
(
fileRets
));
deviceUseReportDao
.
save
(
one
);
}
private
Specification
<
DeviceUseReport
>
getSelectSpecification
(
DeviceUseReportSelectVo
deviceUseReportSelectVo
)
{
private
Specification
<
DeviceUseReport
>
getSelectSpecification
(
DeviceUseReportSelectVo
deviceUseReportSelectVo
)
{
PredicateBuilder
<
DeviceUseReport
>
predicateBuilder
=
Specifications
.
and
();
PredicateBuilder
<
DeviceUseReport
>
predicateBuilder
=
Specifications
.
and
();
if
(
deviceUseReportSelectVo
!=
null
)
{
if
(
deviceUseReportSelectVo
!=
null
)
{
...
...
dev-usereport/src/main/java/com/tykj/dev/device/usereport/subject/domin/DeviceUseReport.java
浏览文件 @
8ca76ac3
package
com
.
tykj
.
dev
.
device
.
usereport
.
subject
.
domin
;
package
com
.
tykj
.
dev
.
device
.
usereport
.
subject
.
domin
;
import
com.tykj.dev.device.file.entity.FileRet
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -13,6 +14,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
...
@@ -13,6 +14,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import
javax.persistence.*
;
import
javax.persistence.*
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
/**
/**
* entity class for device_use_report
* entity class for device_use_report
...
@@ -82,4 +84,12 @@ public class DeviceUseReport {
...
@@ -82,4 +84,12 @@ public class DeviceUseReport {
@ApiModelProperty
(
value
=
"报告结束时间"
)
@ApiModelProperty
(
value
=
"报告结束时间"
)
private
Date
endTime
;
private
Date
endTime
;
@ApiModelProperty
(
value
=
"文件json数据"
)
@Column
(
name
=
"file_json"
,
columnDefinition
=
"TEXT"
)
private
String
fileJson
;
@Transient
@ApiModelProperty
(
value
=
"文件信息"
)
private
List
<
FileRet
>
fileRet
;
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论