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
686769f4
Commit
686769f4
authored
Jul 20, 2021
by
李腾威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
维保单位相关接口 维保合同相关接口
parent
1c4b57e2
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
378 additions
and
27 deletions
+378
-27
ContractDto.java
.../yeejoin/amos/boot/module/common/api/dto/ContractDto.java
+2
-0
MaintenanceCompanyMapper.java
...ot/module/common/api/mapper/MaintenanceCompanyMapper.java
+19
-0
MaintenanceCompanyMapper.xml
...pi/src/main/resources/mapper/MaintenanceCompanyMapper.xml
+37
-1
ContractController.java
...boot/module/common/biz/controller/ContractController.java
+20
-19
MaintenanceCompanyController.java
...e/common/biz/controller/MaintenanceCompanyController.java
+37
-0
ContractServiceImpl.java
...t/module/common/biz/service/impl/ContractServiceImpl.java
+152
-6
MaintenanceCompanyServiceImpl.java
...ommon/biz/service/impl/MaintenanceCompanyServiceImpl.java
+111
-1
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/ContractDto.java
View file @
686769f4
...
@@ -66,4 +66,6 @@ public class ContractDto extends BaseDto {
...
@@ -66,4 +66,6 @@ public class ContractDto extends BaseDto {
@ApiModelProperty
(
value
=
"服务内容"
)
@ApiModelProperty
(
value
=
"服务内容"
)
private
String
serviceContent
;
private
String
serviceContent
;
@ApiModelProperty
(
value
=
"合同附件"
)
private
String
contractAttachment
;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/MaintenanceCompanyMapper.java
View file @
686769f4
package
com
.
yeejoin
.
amos
.
boot
.
module
.
common
.
api
.
mapper
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
common
.
api
.
mapper
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto
;
import
com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany
;
import
com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/**
/**
* 维保单位 Mapper 接口
* 维保单位 Mapper 接口
...
@@ -10,5 +15,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...
@@ -10,5 +15,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @date 2021-07-16
* @date 2021-07-16
*/
*/
public
interface
MaintenanceCompanyMapper
extends
BaseMapper
<
MaintenanceCompany
>
{
public
interface
MaintenanceCompanyMapper
extends
BaseMapper
<
MaintenanceCompany
>
{
/**
* 查询机场单位信息 (不带分页)
* @param seq
* @return
*/
public
List
<
OrgUsrDto
>
selectOrgUsrList
(
@Param
(
"seq"
)
Long
seq
);
/**
* 查询机场单位信息 (带分页)
* @param pageNum
* @param pageSize
* @param seq
* @return
*/
public
List
<
OrgUsrDto
>
selectOrgUsrPageList
(
@Param
(
"pageNum"
)
int
pageNum
,
@Param
(
"pageSize"
)
int
pageSize
,
@Param
(
"seq"
)
Long
seq
);
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/MaintenanceCompanyMapper.xml
View file @
686769f4
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper"
>
<mapper
namespace=
"com.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper"
>
<select
id=
"selectOrgUsrList"
resultType=
"com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto"
>
SELECT DISTINCT
sequence_nbr,
biz_org_name,
biz_org_code,
amos_org_id,
amos_org_code,
biz_org_type,
build_name,
build_id,
parent_id
FROM
cb_org_usr
WHERE
sequence_nbr IN ( SELECT DISTINCT signed_company_id FROM cb_contract WHERE company_id = 1 )
AND biz_org_type = "COMPANY"
AND is_delete = 0
</select>
<select
id=
"selectOrgUsrPageList"
resultType=
"com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto"
>
SELECT DISTINCT
sequence_nbr,
biz_org_name,
biz_org_code,
amos_org_id,
amos_org_code,
biz_org_type,
build_name,
build_id,
parent_id
FROM
cb_org_usr
WHERE
sequence_nbr IN ( SELECT DISTINCT signed_company_id FROM cb_contract WHERE company_id = 1 )
AND biz_org_type = "COMPANY"
AND is_delete = 0
limit #{pageNum},#{pageSize}
</select>
</mapper>
</mapper>
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/ContractController.java
View file @
686769f4
...
@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.RestController;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
java.util.List
;
import
java.util.List
;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.ContractServiceImpl
;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.ContractServiceImpl
;
import
org.typroject.tyboot.core.foundation.context.RequestContext
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -39,36 +40,36 @@ public class ContractController extends BaseController {
...
@@ -39,36 +40,36 @@ public class ContractController extends BaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/save"
)
@PostMapping
(
value
=
"/save"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增维保合同"
,
notes
=
"新增维保合同"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增维保合同"
,
notes
=
"新增维保合同"
)
public
ResponseModel
<
ContractDto
>
save
(
@RequestBody
ContractDto
model
)
{
public
ResponseModel
<
ContractDto
>
save
(
@RequestBody
ContractDto
model
)
throws
Exception
{
model
=
contractServiceImpl
.
createWithModel
(
model
);
model
=
contractServiceImpl
.
saveContractDto
(
RequestContext
.
getAgencyCode
(),
model
);
return
ResponseHelper
.
buildResponse
(
model
);
return
ResponseHelper
.
buildResponse
(
model
);
}
}
/**
/**
*
根据sequenceNbr更新
*
更新合同信息及附件
*
*
* @param
sequenceNbr 主键
* @param
model
* @return
* @return
*/
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PutMapping
(
value
=
"/{sequenceNbr}"
)
@PutMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"
根据sequenceNbr更新维保合同"
,
notes
=
"根据sequenceNbr更新维保合同
"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"
更新合同信息及附件"
,
notes
=
"更新合同信息及附件
"
)
public
ResponseModel
<
ContractDto
>
updateBySequenceNbrContract
(
@RequestBody
ContractDto
model
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
public
ResponseModel
<
ContractDto
>
updateBySequenceNbrContract
(
@RequestBody
ContractDto
model
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
throws
Exception
{
model
.
setSequenceNbr
(
sequenceNbr
);
model
.
setSequenceNbr
(
sequenceNbr
);
return
ResponseHelper
.
buildResponse
(
contractServiceImpl
.
update
WithModel
(
model
));
return
ResponseHelper
.
buildResponse
(
contractServiceImpl
.
update
Aircraft
(
RequestContext
.
getAgencyCode
(),
model
));
}
}
/**
/**
*
根据sequenceNbr删除
*
删除合同信息 (无约束)
*
*
* @param
sequenceNbr 主键
* @param
* @return
* @return
*/
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@DeleteMapping
(
value
=
"/
{sequenceNbr}
"
)
@DeleteMapping
(
value
=
"/
batch
"
)
@ApiOperation
(
httpMethod
=
"DELETE"
,
value
=
"
根据sequenceNbr删除维保合同"
,
notes
=
"根据sequenceNbr删除维保合同
"
)
@ApiOperation
(
httpMethod
=
"DELETE"
,
value
=
"
删除合同信息 (无约束)"
,
notes
=
"删除合同信息 (无约束)
"
)
public
ResponseModel
<
Boolean
>
deleteBySequenceNbr
(
HttpServletRequest
request
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
public
ResponseModel
<
List
<
Long
>>
deleteBySequenceNbr
(
@RequestParam
(
value
=
"ids"
)
String
ids
)
throws
Exception
{
return
ResponseHelper
.
buildResponse
(
contractServiceImpl
.
removeById
(
sequenceNbr
));
return
ResponseHelper
.
buildResponse
(
contractServiceImpl
.
multDeleteAircraft
(
RequestContext
.
getAgencyCode
(),
ids
));
}
}
/**
/**
...
@@ -79,9 +80,9 @@ public class ContractController extends BaseController {
...
@@ -79,9 +80,9 @@ public class ContractController extends BaseController {
*/
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"
根据sequenceNbr查询单个维保合同"
,
notes
=
"根据sequenceNbr
查询单个维保合同"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"
查询单个维保合同"
,
notes
=
"
查询单个维保合同"
)
public
ResponseModel
<
ContractDto
>
selectOne
(
@PathVariable
Long
sequenceNbr
)
{
public
ResponseModel
<
ContractDto
>
selectOne
(
String
agencyCode
,
@PathVariable
Long
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
contractServiceImpl
.
queryBy
Seq
(
sequenceNbr
));
return
ResponseHelper
.
buildResponse
(
contractServiceImpl
.
queryBy
AircraftSeq
(
RequestContext
.
getAgencyCode
(),
sequenceNbr
));
}
}
/**
/**
...
@@ -99,7 +100,7 @@ public class ContractController extends BaseController {
...
@@ -99,7 +100,7 @@ public class ContractController extends BaseController {
Page
<
ContractDto
>
page
=
new
Page
<
ContractDto
>();
Page
<
ContractDto
>
page
=
new
Page
<
ContractDto
>();
page
.
setCurrent
(
current
);
page
.
setCurrent
(
current
);
page
.
setSize
(
size
);
page
.
setSize
(
size
);
return
ResponseHelper
.
buildResponse
(
contractServiceImpl
.
queryForContractPage
(
page
));
return
ResponseHelper
.
buildResponse
(
contractServiceImpl
.
queryForContractPage
(
page
,
false
));
}
}
/**
/**
...
@@ -111,6 +112,6 @@ public class ContractController extends BaseController {
...
@@ -111,6 +112,6 @@ public class ContractController extends BaseController {
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"维保合同列表全部数据查询"
,
notes
=
"维保合同列表全部数据查询"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"维保合同列表全部数据查询"
,
notes
=
"维保合同列表全部数据查询"
)
@GetMapping
(
value
=
"/list"
)
@GetMapping
(
value
=
"/list"
)
public
ResponseModel
<
List
<
ContractDto
>>
selectForList
()
{
public
ResponseModel
<
List
<
ContractDto
>>
selectForList
()
{
return
ResponseHelper
.
buildResponse
(
contractServiceImpl
.
queryForContractList
());
return
ResponseHelper
.
buildResponse
(
contractServiceImpl
.
queryForContractList
(
false
));
}
}
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/MaintenanceCompanyController.java
View file @
686769f4
...
@@ -23,6 +23,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
...
@@ -23,6 +23,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
...
@@ -120,4 +121,40 @@ public class MaintenanceCompanyController extends BaseController {
...
@@ -120,4 +121,40 @@ public class MaintenanceCompanyController extends BaseController {
public
ResponseModel
<
List
<
MaintenanceCompanyDto
>>
selectForList
()
{
public
ResponseModel
<
List
<
MaintenanceCompanyDto
>>
selectForList
()
{
return
ResponseHelper
.
buildResponse
(
maintenanceCompanyServiceImpl
.
queryForMaintenanceCompanyList
());
return
ResponseHelper
.
buildResponse
(
maintenanceCompanyServiceImpl
.
queryForMaintenanceCompanyList
());
}
}
/**
* 根据维保单位查询所有机场单位(不带分页)
*
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"queryCompany/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据维保单位查询所有机场单位(不带分页)"
,
notes
=
"根据维保单位查询所有机场单位(不带分页)"
)
public
ResponseModel
<
List
<
Map
<
String
,
Object
>>>
seleteCompanys
(
@PathVariable
Long
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
maintenanceCompanyServiceImpl
.
queryOrgUsrMsg
(
sequenceNbr
));
}
/**
* 根据维保单位查询所有机场单位(带分页)
*
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"queryCompanyPages/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据维保单位查询所有机场单位(带分页)"
,
notes
=
"根据维保单位查询所有机场单位(带分页)"
)
public
ResponseModel
<
List
<
Map
<
String
,
Object
>>>
seleteCompanyPages
(
@RequestParam
(
value
=
"pageNum"
)
int
pageNum
,
@RequestParam
(
value
=
"pageSize"
)
int
pageSize
,
@PathVariable
Long
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
maintenanceCompanyServiceImpl
.
queryOrgUsrMsgPage
(
pageNum
,
pageSize
,
sequenceNbr
));
}
/**
*
* 查询维保单位、业主单位信息
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"查询维保单位、业主单位信息"
,
notes
=
"查询维保单位、业主单位信息"
)
@GetMapping
(
value
=
"/companyLlist"
)
public
ResponseModel
<
List
<
Map
<
String
,
Object
>>>
selectCompanyList
()
{
return
ResponseHelper
.
buildResponse
(
maintenanceCompanyServiceImpl
.
queryCompanyMsg
());
}
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/ContractServiceImpl.java
View file @
686769f4
...
@@ -5,10 +5,22 @@ import com.yeejoin.amos.boot.module.common.api.dto.ContractDto;
...
@@ -5,10 +5,22 @@ import com.yeejoin.amos.boot.module.common.api.dto.ContractDto;
import
com.yeejoin.amos.boot.module.common.api.entity.Contract
;
import
com.yeejoin.amos.boot.module.common.api.entity.Contract
;
import
com.yeejoin.amos.boot.module.common.api.mapper.ContractMapper
;
import
com.yeejoin.amos.boot.module.common.api.mapper.ContractMapper
;
import
com.yeejoin.amos.boot.module.common.api.service.IContractService
;
import
com.yeejoin.amos.boot.module.common.api.service.IContractService
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.feign.systemctl.Systemctl
;
import
com.yeejoin.amos.feign.systemctl.model.FileInfoModel
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.typroject.tyboot.core.foundation.exception.BaseException
;
import
org.typroject.tyboot.core.foundation.utils.Bean
;
import
org.typroject.tyboot.core.foundation.utils.StringUtil
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.restful.exception.instance.DataNotFound
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
/**
/**
* 维保合同服务实现类
* 维保合同服务实现类
...
@@ -21,14 +33,149 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
...
@@ -21,14 +33,149 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
/**
/**
* 分页查询
* 分页查询
*/
*/
public
Page
<
ContractDto
>
queryForContractPage
(
Page
<
ContractDto
>
page
)
{
public
Page
<
ContractDto
>
queryForContractPage
(
Page
<
ContractDto
>
page
,
Boolean
isDelete
)
{
return
this
.
queryForPage
(
page
,
null
,
false
);
return
this
.
queryForPage
(
page
,
null
,
false
,
isDelete
);
}
}
/**
/**
* 列表查询 示例
* 列表查询 示例
*/
*/
public
List
<
ContractDto
>
queryForContractList
()
{
public
List
<
ContractDto
>
queryForContractList
(
Boolean
isDelete
)
{
return
this
.
queryForList
(
""
,
false
);
return
this
.
queryForList
(
"rec_date"
,
false
,
isDelete
);
}
/**
* 保存附件信息
* @param agencyCode
* @param attachments
* @param contractDto
* @param fileCategory
* @return
* @throws Exception
*/
private
List
<
FileInfoModel
>
buildFileInfo
(
String
agencyCode
,
List
<
String
>
attachments
,
ContractDto
contractDto
,
String
fileCategory
)
throws
Exception
{
List
<
FileInfoModel
>
fileInfoModelList
=
new
ArrayList
<>();
for
(
String
attachment
:
attachments
)
{
FileInfoModel
fileInfoModel
=
new
FileInfoModel
();
fileInfoModel
.
setEntityId
(
String
.
valueOf
(
contractDto
.
getSequenceNbr
()));
fileInfoModel
.
setEntityType
(
Contract
.
class
.
getSimpleName
());
fileInfoModel
.
setFileCategory
(
fileCategory
);
fileInfoModel
.
setFilename
(
attachment
);
fileInfoModel
.
setAgencyCode
(
agencyCode
);
fileInfoModelList
.
add
(
fileInfoModel
);
}
return
fileInfoModelList
;
}
/**
* 保存附件
* @param agencyCode
* @param contractDto
* @return
* @throws Exception
*/
private
boolean
saveAircraftFile
(
String
agencyCode
,
ContractDto
contractDto
)
throws
Exception
{
List
<
FileInfoModel
>
fileInfoModelList
=
new
ArrayList
<
FileInfoModel
>();
// 获取附件信息
if
(!
ValidationUtil
.
isEmpty
(
contractDto
.
getContractAttachment
()))
{
List
<
String
>
attachments
=
StringUtil
.
String2List
(
contractDto
.
getContractAttachment
());
for
(
String
attachment
:
attachments
)
{
String
format
=
attachment
.
substring
(
attachment
.
lastIndexOf
(
"."
)
+
1
,
attachment
.
length
());
fileInfoModelList
.
addAll
(
buildFileInfo
(
agencyCode
,
attachments
,
contractDto
,
format
));
}
}
// 保存附件
if
(!
ValidationUtil
.
isEmpty
(
fileInfoModelList
))
{
Systemctl
.
fileInfoClient
.
batchCreateByEntity
(
fileInfoModelList
);
}
return
true
;
}
/**
* 保存合同信息
* @param agencyCode
* @param contractDto
* @return
* @throws Exception
*/
public
ContractDto
saveContractDto
(
String
agencyCode
,
ContractDto
contractDto
)
throws
Exception
{
contractDto
.
setIsDelete
(
false
);
// 保存合同基本信息
contractDto
=
this
.
createWithModel
(
contractDto
);
// 保存附件信息
saveAircraftFile
(
agencyCode
,
contractDto
);
return
contractDto
;
}
}
}
\ No newline at end of file
/**
* 更新合同信息及附件
* @param agencyCode
* @param model
* @return
* @throws Exception
*/
public
ContractDto
updateAircraft
(
String
agencyCode
,
ContractDto
model
)
throws
Exception
{
ContractDto
oldModel
=
this
.
queryBySeq
(
model
.
getSequenceNbr
());
if
(
ValidationUtil
.
isEmpty
(
oldModel
))
{
throw
new
DataNotFound
(
"找不到指定的合同信息."
);
}
//删除附件信息
Systemctl
.
fileInfoClient
.
deleteByAlias
(
agencyCode
,
ContractDto
.
class
.
getSimpleName
(),
String
.
valueOf
(
model
.
getSequenceNbr
()),
null
);
//保存合同信息
saveAircraftFile
(
agencyCode
,
model
);
return
this
.
updateWithModel
(
Bean
.
copyExistPropertis
(
model
,
oldModel
));
}
/**
* 附件转成逗号分割String
*
* @param fileInfoModels
* @return
*/
private
String
processToStr
(
List
<
FileInfoModel
>
fileInfoModels
)
{
return
fileInfoModels
.
stream
().
map
(
FileInfoModel:
:
getFilename
).
collect
(
Collectors
.
joining
(
","
));
}
/**
* 根据主键查询合同信息
* @param agencyCode
* @param seq
* @return
*/
public
ContractDto
queryByAircraftSeq
(
String
agencyCode
,
Long
seq
)
{
ContractDto
contractDto
=
this
.
queryBySeq
(
seq
);
// 填充合同附件信息
FeignClientResult
<
List
<
FileInfoModel
>>
fileInfoModelResult
=
Systemctl
.
fileInfoClient
.
queryByEntity
(
agencyCode
,
ContractDto
.
class
.
getSimpleName
(),
String
.
valueOf
(
seq
));
List
<
FileInfoModel
>
fileInfoModels
=
fileInfoModelResult
.
getResult
();
// 填充合同信息
if
(!
ValidationUtil
.
isEmpty
(
fileInfoModels
))
{
contractDto
.
setContractAttachment
(
processToStr
(
fileInfoModels
));
}
return
contractDto
;
}
/**
* 删除合同信息 (无约束)
* @param agencyCode
* @param ids
* @return
* @throws Exception
*/
@Transactional
(
rollbackFor
=
{
Exception
.
class
,
BaseException
.
class
})
public
List
<
Long
>
multDeleteAircraft
(
String
agencyCode
,
String
ids
)
throws
Exception
{
List
<
Long
>
seqs
=
StringUtil
.
String2LongList
(
ids
);
for
(
Long
id
:
seqs
)
{
//删除附件信息
Systemctl
.
fileInfoClient
.
deleteByAlias
(
agencyCode
,
ContractDto
.
class
.
getSimpleName
(),
String
.
valueOf
(
id
),
null
);
//删除合同信息
this
.
deleteBySeq
(
id
);
}
return
seqs
;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java
View file @
686769f4
package
com
.
yeejoin
.
amos
.
boot
.
module
.
common
.
biz
.
service
.
impl
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
common
.
biz
.
service
.
impl
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto
;
import
com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany
;
import
com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany
;
import
com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum
;
import
com.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper
;
import
com.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper
;
import
com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService
;
import
com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService
;
import
com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.typroject.tyboot.core.foundation.utils.Bean
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.typroject.tyboot.core.restful.exception.instance.BadRequest
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 维保单位服务实现类
* 维保单位服务实现类
...
@@ -17,6 +28,8 @@ import java.util.List;
...
@@ -17,6 +28,8 @@ import java.util.List;
*/
*/
@Service
@Service
public
class
MaintenanceCompanyServiceImpl
extends
BaseService
<
MaintenanceCompanyDto
,
MaintenanceCompany
,
MaintenanceCompanyMapper
>
implements
IMaintenanceCompanyService
{
public
class
MaintenanceCompanyServiceImpl
extends
BaseService
<
MaintenanceCompanyDto
,
MaintenanceCompany
,
MaintenanceCompanyMapper
>
implements
IMaintenanceCompanyService
{
@Autowired
DynamicFormInstanceServiceImpl
dynamicFormInstanceService
;
/**
/**
* 分页查询
* 分页查询
*/
*/
...
@@ -24,10 +37,106 @@ public class MaintenanceCompanyServiceImpl extends BaseService<MaintenanceCompan
...
@@ -24,10 +37,106 @@ public class MaintenanceCompanyServiceImpl extends BaseService<MaintenanceCompan
return
this
.
queryForPage
(
page
,
null
,
false
);
return
this
.
queryForPage
(
page
,
null
,
false
);
}
}
/**
/**
en
* 列表查询 示例
* 列表查询 示例
*/
*/
public
List
<
MaintenanceCompanyDto
>
queryForMaintenanceCompanyList
()
{
public
List
<
MaintenanceCompanyDto
>
queryForMaintenanceCompanyList
()
{
return
this
.
queryForList
(
""
,
false
);
return
this
.
queryForList
(
""
,
false
);
}
}
/**
* 根据维保单位查询所有机场单位(返回List<Map>类型) 不带分页
* @param seq
* @return
*/
public
List
<
Map
<
String
,
Object
>>
queryOrgUsrMsg
(
Long
seq
){
if
(
ValidationUtil
.
isEmpty
(
this
.
queryBySeq
(
seq
))){
throw
new
BadRequest
(
"参数校验失败."
);
}
else
{
List
<
Map
<
String
,
Object
>>
companys
=
new
ArrayList
<>();
// 机场单位列表基本信息
List
<
OrgUsrDto
>
orgUsrDtos
=
this
.
baseMapper
.
selectOrgUsrList
(
seq
);
// 机场组装单位动态表单数据
orgUsrDtos
.
forEach
(
orgUsrDto
->
{
Map
<
String
,
Object
>
map
=
Bean
.
BeantoMap
(
orgUsrDto
);
mapCopy
(
dynamicFormInstanceService
.
getOneMap
(
orgUsrDto
.
getSequenceNbr
(),
OrgPersonEnum
.
公司
.
getKey
()),
map
);
companys
.
add
(
map
);
});
return
companys
;
}
}
/**
* 根据维保单位查询所有机场单位(返回List<Map>类型) 带分页
* @param pageNum
* @param pageSize
* @param seq
* @return
*/
public
List
<
Map
<
String
,
Object
>>
queryOrgUsrMsgPage
(
int
pageNum
,
int
pageSize
,
Long
seq
){
if
(
ValidationUtil
.
isEmpty
(
this
.
queryBySeq
(
seq
))){
throw
new
BadRequest
(
"参数校验失败."
);
}
else
{
List
<
Map
<
String
,
Object
>>
companys
=
new
ArrayList
<>();
// 机场单位列表基本信息
List
<
OrgUsrDto
>
orgUsrDtos
=
this
.
baseMapper
.
selectOrgUsrPageList
(
pageNum
,
pageSize
,
seq
);
// 机场组装单位动态表单数据
orgUsrDtos
.
forEach
(
orgUsrDto
->
{
Map
<
String
,
Object
>
map
=
Bean
.
BeantoMap
(
orgUsrDto
);
mapCopy
(
dynamicFormInstanceService
.
getOneMap
(
orgUsrDto
.
getSequenceNbr
(),
OrgPersonEnum
.
公司
.
getKey
()),
map
);
companys
.
add
(
map
);
});
return
companys
;
}
}
public
List
<
Map
<
String
,
Object
>>
queryCompanyMsg
(){
List
<
Map
<
String
,
Object
>>
companysMsg
=
new
ArrayList
<>();
// 查询所有维保单位信息
List
<
MaintenanceCompany
>
lists
=
this
.
list
();
lists
.
forEach
(
list
->{
Map
<
String
,
Object
>
maintenanceCompany
=
new
HashMap
<>();
maintenanceCompany
.
put
(
"id"
,
list
.
getSequenceNbr
());
maintenanceCompany
.
put
(
"code"
,
list
.
getCode
());
maintenanceCompany
.
put
(
"name"
,
list
.
getName
());
maintenanceCompany
.
put
(
"type"
,
1
);
maintenanceCompany
.
put
(
"parentId"
,
null
);
// 查询该维保单位下的业主信息
List
<
OrgUsrDto
>
orgUsrDtos
=
this
.
baseMapper
.
selectOrgUsrList
(
list
.
getSequenceNbr
());
orgUsrDtos
.
forEach
(
orgUsrDto
->
{
Map
<
String
,
Object
>
airCompany
=
new
HashMap
<>();
airCompany
.
put
(
"id"
,
orgUsrDto
.
getSequenceNbr
());
airCompany
.
put
(
"code"
,
orgUsrDto
.
getBizOrgCode
());
airCompany
.
put
(
"name"
,
orgUsrDto
.
getBizOrgName
());
airCompany
.
put
(
"type"
,
2
);
airCompany
.
put
(
"parentId"
,
list
.
getSequenceNbr
());
companysMsg
.
add
(
airCompany
);
});
companysMsg
.
add
(
maintenanceCompany
);
});
return
companysMsg
;
}
/**
* 复制map对象
* @explain 将paramsMap中的键值对全部拷贝到resultMap中;
* @param paramsMap
* 被拷贝对象
* @param resultMap
* 拷贝后的对象
*/
private
static
void
mapCopy
(
Map
paramsMap
,
Map
resultMap
)
{
if
(
resultMap
==
null
)
{
return
;
}
if
(
paramsMap
==
null
)
{
return
;
}
Iterator
it
=
paramsMap
.
entrySet
().
iterator
();
while
(
it
.
hasNext
())
{
Map
.
Entry
entry
=
(
Map
.
Entry
)
it
.
next
();
Object
key
=
entry
.
getKey
();
resultMap
.
put
(
key
,
paramsMap
.
get
(
key
)
!=
null
?
paramsMap
.
get
(
key
)
:
""
);
}
}
}
}
\ No newline at end of file
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