|
@@ -149,21 +149,21 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
|
|
|
* @param relType 关系类型
|
|
|
* @param zoneType 业务空间类型
|
|
|
*/
|
|
|
- fun reportDownloads(response: HttpServletResponse, relType: String, zoneType: String? = null) {
|
|
|
+ fun reportDownloads(response: HttpServletResponse, graphCode: String,relType: String, zoneType: String? = null) {
|
|
|
val zone = if (zoneType != null) {
|
|
|
"_${zoneType}"
|
|
|
} else {
|
|
|
""
|
|
|
}
|
|
|
val projectId = SPageContext.getHeader("projectId")
|
|
|
- val file = File("/tmp/relation-$projectId-${relType}${zone}.xlsx")
|
|
|
+ val file = File("/tmp/relation-$projectId-${graphCode}${relType}${zone}.xlsx")
|
|
|
val workbook = if (file.exists()) {
|
|
|
XSSFWorkbook(file)
|
|
|
} else {
|
|
|
XSSFWorkbook(RelationTypeProjectService::class.java.classLoader.getResourceAsStream("excel/relation-template.xlsx"))
|
|
|
}
|
|
|
response.contentType = "application/octet-stream"
|
|
|
- response.setHeader("Content-disposition", "attachment;filename=report-${relType}${zone}.xlsx")
|
|
|
+ response.setHeader("Content-disposition", "attachment;filename=report-${graphCode}${relType}${zone}.xlsx")
|
|
|
response.flushBuffer()
|
|
|
workbook.write(response.outputStream)
|
|
|
} // Function templateDownloads()
|
|
@@ -301,7 +301,7 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
|
|
|
|
|
|
readExcelRelation(sheet, projectId, relType, zoneType,graphCode)
|
|
|
|
|
|
- val outFile = File("/tmp/relation-$projectId-${relType}${zone}.xlsx")
|
|
|
+ val outFile = File("/tmp/relation-$projectId-${graphCode}${relType}${zone}.xlsx")
|
|
|
workbook.write(outFile.outputStream())
|
|
|
/** 发送消息 */
|
|
|
rabbitMqService.sendRel(Opt.projectId!!, relType,"20","123","456")
|
|
@@ -404,9 +404,9 @@ object RelationTypeProjectService : RService<RelationTypeProject>(SMybatisDao(Re
|
|
|
val type = relType
|
|
|
|
|
|
val importMethod = if (relType == RelationType.Eq2Bd || relType == RelationType.Eq2Fl) {
|
|
|
- excelImport.javaClass.getDeclaredMethod("${relType}In", String::class.java, String::class.java, String::class.java, String::class.java)
|
|
|
+ excelImport.javaClass.getDeclaredMethod("${relType}In", String::class.java, String::class.java, String::class.java, String::class.java, String::class.java)
|
|
|
}else if(relType == RelationType.Bd2Sp || relType == RelationType.Fl2Sp){
|
|
|
- excelImport.javaClass.getDeclaredMethod(relType, String::class.java, String::class.java, String::class.java, String::class.java)
|
|
|
+ excelImport.javaClass.getDeclaredMethod(relType, String::class.java, String::class.java, String::class.java, String::class.java, String::class.java)
|
|
|
}
|
|
|
else {
|
|
|
if(zoneType.isNullOrEmpty()) {
|