Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
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
项目统一框架
amos-boot-biz
Commits
5560ae62
Commit
5560ae62
authored
Aug 05, 2021
by
tianbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修改
parent
7759df1c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
57 additions
and
28 deletions
+57
-28
ExcelDto.java
...com/yeejoin/amos/boot/module/common/api/dto/ExcelDto.java
+5
-0
EquipFeignClient.java
...n/amos/boot/module/common/api/feign/EquipFeignClient.java
+8
-0
EquipFeignService.java
...n/amos/boot/module/tzs/api/service/EquipFeignService.java
+25
-25
ExcelController.java
.../amos/boot/module/jcs/biz/controller/ExcelController.java
+15
-0
UseUnitController.java
...mos/boot/module/tzs/biz/controller/UseUnitController.java
+4
-3
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ExcelDto.java
View file @
5560ae62
...
@@ -19,6 +19,7 @@ public class ExcelDto {
...
@@ -19,6 +19,7 @@ public class ExcelDto {
private
String
type
;
private
String
type
;
public
ExcelDto
(
String
fileName
,
String
sheetName
,
String
classUrl
,
String
type
)
{
public
ExcelDto
(
String
fileName
,
String
sheetName
,
String
classUrl
,
String
type
)
{
super
();
this
.
fileName
=
fileName
;
this
.
fileName
=
fileName
;
this
.
sheetName
=
sheetName
;
this
.
sheetName
=
sheetName
;
this
.
classUrl
=
classUrl
;
this
.
classUrl
=
classUrl
;
...
@@ -31,6 +32,10 @@ public class ExcelDto {
...
@@ -31,6 +32,10 @@ public class ExcelDto {
this
.
type
=
type
;
this
.
type
=
type
;
}
}
public
ExcelDto
()
{
}
public
String
getFileName
()
{
public
String
getFileName
()
{
return
StringUtils
.
isEmpty
(
fileName
)
?
DateUtils
.
convertDateToString
(
new
Date
(),
"yyyyMMddHHmmss"
)
:
fileName
;
return
StringUtils
.
isEmpty
(
fileName
)
?
DateUtils
.
convertDateToString
(
new
Date
(),
"yyyyMMddHHmmss"
)
:
fileName
;
}
}
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java
View file @
5560ae62
...
@@ -122,4 +122,12 @@ public interface EquipFeignClient {
...
@@ -122,4 +122,12 @@ public interface EquipFeignClient {
**/
**/
@RequestMapping
(
value
=
"/car/getCarDetailById/{id}"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/car/getCarDetailById/{id}"
,
method
=
RequestMethod
.
GET
)
ResponseModel
<
Map
<
String
,
Object
>>
getCarDetailById
(
@PathVariable
Long
id
);
ResponseModel
<
Map
<
String
,
Object
>>
getCarDetailById
(
@PathVariable
Long
id
);
/**
* 获取消防建筑树
*
* @return
*/
@RequestMapping
(
value
=
"/building/BuildingtreeAndEquip"
,
method
=
RequestMethod
.
GET
)
ResponseModel
<
Object
>
getBuildingTreeAndEquip
();
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/EquipFeignService.java
View file @
5560ae62
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
api
.
service
;
//
package com.yeejoin.amos.boot.module.tzs.api.service;
//
import
org.springframework.cloud.openfeign.FeignClient
;
//
import org.springframework.cloud.openfeign.FeignClient;
import
org.springframework.web.bind.annotation.RequestMapping
;
//
import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RequestMethod
;
//
import org.springframework.web.bind.annotation.RequestMethod;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
//
import org.typroject.tyboot.core.restful.utils.ResponseModel;
//
//
/**
/
//
**
* 装备服务feign
//
* 装备服务feign
*
//
*
* @author Dell
//
* @author Dell
*/
//
*/
@FeignClient
(
name
=
"AMOS-EQUIPMANAGE"
,
path
=
"equip"
)
//
@FeignClient(name = "AMOS-EQUIPMANAGE", path = "equip")
//@FeignClient(name = "AMOS-AUTOSYS", url = "http://172.16.10.66:8085", path = "fireAutoSys")
//
//
@FeignClient(name = "AMOS-AUTOSYS", url = "http://172.16.10.66:8085", path = "fireAutoSys")
public
interface
EquipFeignService
{
//
public interface EquipFeignService {
//
/**
//
/**
* 获取消防建筑树
//
* 获取消防建筑树
*
//
*
* @return
//
* @return
*/
//
*/
@RequestMapping
(
value
=
"/building/BuildingtreeAndEquip"
,
method
=
RequestMethod
.
GET
)
//
@RequestMapping(value = "/building/BuildingtreeAndEquip", method = RequestMethod.GET)
ResponseModel
<
Object
>
getBuildingTreeAndEquip
();
//
ResponseModel<Object> getBuildingTreeAndEquip();
}
//
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java
View file @
5560ae62
...
@@ -97,6 +97,21 @@ public class ExcelController extends BaseController {
...
@@ -97,6 +97,21 @@ public class ExcelController extends BaseController {
}
}
}
}
@TycloudOperation
(
needAuth
=
false
,
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
value
=
"上传文件数据-2"
)
@PostMapping
(
"/upload2"
)
public
void
upload2
(
@RequestPart
(
"file"
)
MultipartFile
multipartFile
,
@RequestParam
(
required
=
false
)
String
fileName
,
@RequestParam
(
required
=
false
)
String
sheetName
,
@RequestParam
String
type
)
{
try
{
excelService
.
commonUpload
(
multipartFile
,
new
ExcelDto
(
fileName
,
sheetName
,
type
));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
throw
new
RuntimeException
(
"系统异常!"
);
}
}
/**
/**
* 导出值班模板
* 导出值班模板
*
*
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/UseUnitController.java
View file @
5560ae62
...
@@ -6,8 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...
@@ -6,8 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.feign.AmosFeignService
;
import
com.yeejoin.amos.boot.biz.common.feign.AmosFeignService
;
import
com.yeejoin.amos.boot.biz.common.utils.NameUtils
;
import
com.yeejoin.amos.boot.biz.common.utils.NameUtils
;
import
com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit
;
import
com.yeejoin.amos.boot.module.tzs.api.service.EquipFeignService
;
//
import com.yeejoin.amos.boot.module.tzs.api.service.EquipFeignService;
import
com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService
;
import
com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService
;
import
com.yeejoin.amos.boot.module.tzs.api.vo.UseUnitVo
;
import
com.yeejoin.amos.boot.module.tzs.api.vo.UseUnitVo
;
import
com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils
;
import
com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils
;
...
@@ -42,7 +43,7 @@ public class UseUnitController extends BaseController {
...
@@ -42,7 +43,7 @@ public class UseUnitController extends BaseController {
IUseUnitService
iUseUnitService
;
IUseUnitService
iUseUnitService
;
@Autowired
@Autowired
EquipFeign
Service
equipFeignService
;
EquipFeign
Client
equipFeignClient
;
@Autowired
@Autowired
AmosFeignService
amosFeignService
;
AmosFeignService
amosFeignService
;
...
@@ -98,7 +99,7 @@ public class UseUnitController extends BaseController {
...
@@ -98,7 +99,7 @@ public class UseUnitController extends BaseController {
@RequestMapping
(
value
=
"/buildingTree"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/buildingTree"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"获取消防建筑树"
,
notes
=
"获取消防建筑树"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"获取消防建筑树"
,
notes
=
"获取消防建筑树"
)
public
ResponseModel
<
Object
>
getBuildingTreeAndEquip
()
{
public
ResponseModel
<
Object
>
getBuildingTreeAndEquip
()
{
return
equipFeign
Service
.
getBuildingTreeAndEquip
();
return
equipFeign
Client
.
getBuildingTreeAndEquip
();
}
}
/**
/**
...
...
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