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
79b73a8e
Commit
79b73a8e
authored
Nov 22, 2021
by
tianbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
全寿期生成代码;
ControllerAop过滤不校验的方法; 隐患bug修改
parent
db8cdec7
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
633 additions
and
3 deletions
+633
-3
ControllerAop.java
...a/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
+13
-2
LatentDangerTypeEnum.java
.../amos/latentdanger/common/enums/LatentDangerTypeEnum.java
+1
-1
PersonEducationDto.java
.../amos/boot/module/tzs/flc/api/dto/PersonEducationDto.java
+33
-0
PersonQualityDto.java
...in/amos/boot/module/tzs/flc/api/dto/PersonQualityDto.java
+54
-0
PersonEducation.java
.../amos/boot/module/tzs/flc/api/entity/PersonEducation.java
+43
-0
PersonQuality.java
...in/amos/boot/module/tzs/flc/api/entity/PersonQuality.java
+85
-0
PersonEducationMapper.java
...boot/module/tzs/flc/api/mapper/PersonEducationMapper.java
+14
-0
PersonQualityMapper.java
...s/boot/module/tzs/flc/api/mapper/PersonQualityMapper.java
+14
-0
IPersonEducationService.java
...t/module/tzs/flc/api/service/IPersonEducationService.java
+12
-0
IPersonQualityService.java
...oot/module/tzs/flc/api/service/IPersonQualityService.java
+12
-0
PersonEducationMapper.xml
...s-api/src/main/resources/mapper/PersonEducationMapper.xml
+5
-0
PersonQualityMapper.xml
...tzs-api/src/main/resources/mapper/PersonQualityMapper.xml
+5
-0
LatentDangerServiceImpl.java
...danger/business/service/impl/LatentDangerServiceImpl.java
+5
-0
PersonEducationController.java
...ule/tzs/flc/biz/controller/PersonEducationController.java
+116
-0
PersonQualityController.java
...odule/tzs/flc/biz/controller/PersonQualityController.java
+116
-0
PersonEducationServiceImpl.java
.../tzs/flc/biz/service/impl/PersonEducationServiceImpl.java
+35
-0
PersonQualityServiceImpl.java
...le/tzs/flc/biz/service/impl/PersonQualityServiceImpl.java
+35
-0
mt-1.0.0.xml
...-supervision/src/main/resources/db/changelog/mt-1.0.0.xml
+35
-0
No files found.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @
79b73a8e
...
...
@@ -18,6 +18,7 @@ import org.aspectj.lang.annotation.AfterReturning;
import
org.aspectj.lang.annotation.Aspect
;
import
org.aspectj.lang.annotation.Before
;
import
org.aspectj.lang.annotation.Pointcut
;
import
org.aspectj.lang.reflect.MethodSignature
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.core.annotation.Order
;
...
...
@@ -28,6 +29,7 @@ import org.typroject.tyboot.core.auth.exception.AuthException;
import
org.typroject.tyboot.core.foundation.context.RequestContext
;
import
org.typroject.tyboot.core.foundation.utils.Bean
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.List
;
...
...
@@ -51,7 +53,7 @@ public class ControllerAop {
@Autowired
private
RedisUtils
redisUtils
;
@Pointcut
(
"(execution(public * com.yeejoin.amos.boot.module.*.biz.controller..*(..)) "
@Pointcut
(
"(execution(public * com.yeejoin.amos.boot.module.
.
*.biz.controller..*(..)) "
+
"|| execution(public * com.yeejoin.amos.*.business.controller..*(..)))"
+
" && !@annotation(org.springframework.scheduling.annotation.Scheduled))"
)
public
void
userCache
()
{
...
...
@@ -63,13 +65,22 @@ public class ControllerAop {
ServletRequestAttributes
attributes
=
(
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
();
HttpServletRequest
request
=
attributes
.
getRequest
();
// 不需要添加请求头的接口
String
[]
url
=
new
String
[]{
"/api/user/selectInfo"
,
"/api/user/save/curCompany"
,
"/jcs/command/lookHtmlText"
,
"/jcs/common/duty-person/findByDutyAreaId"
,
"/tzs/wechatBack"
,
"/tzs/elevator/getElevatorInfo"
};
String
[]
url
=
new
String
[]{
"/api/user/selectInfo"
,
"/api/user/save/curCompany"
,
"/jcs/command/lookHtmlText"
,
"/jcs/common/duty-person/findByDutyAreaId"
,
"/tzs/wechatBack"
,
"/tzs/elevator/getElevatorInfo"
};
// 获取请求路径
for
(
String
uri
:
url
)
{
if
(
request
.
getRequestURI
().
indexOf
(
uri
)
!=
-
1
)
{
return
;
}
}
// 不需要校验token的接口直接返回
if
(
joinPoint
.
getSignature
()
instanceof
MethodSignature
)
{
if
(!((
MethodSignature
)
joinPoint
.
getSignature
()).
getMethod
().
getAnnotation
(
TycloudOperation
.
class
).
needAuth
())
{
return
;
}
}
//TODO tyboot 框架拦截器已缓存数据
String
token
=
RequestContext
.
getToken
();
// 平台studio配置的下载接口token从url里取
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerTypeEnum.java
View file @
79b73a8e
...
...
@@ -57,7 +57,7 @@ public enum LatentDangerTypeEnum {
public
static
String
getEnumName
(
String
code
)
{
String
name
=
""
;
for
(
LatentDangerTypeEnum
type:
LatentDangerTypeEnum
.
values
())
{
if
(
type
.
getCode
()
==
code
)
{
if
(
type
.
getCode
()
.
equals
(
code
)
)
{
name
=
type
.
getName
();
break
;
}
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/PersonEducationDto.java
0 → 100644
View file @
79b73a8e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
api
.
dto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.util.Date
;
/**
* 企业人员资质信息表
*
* @author system_generator
* @date 2021-11-22
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@ApiModel
(
value
=
"PersonEducationDto"
,
description
=
"企业人员资质信息表"
)
public
class
PersonEducationDto
extends
BaseDto
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
value
=
"org_user_id"
)
private
Long
psersonId
;
@ApiModelProperty
(
value
=
"教育记录"
)
private
String
educationRecord
;
@ApiModelProperty
(
value
=
"备注"
)
private
String
remark
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/PersonQualityDto.java
0 → 100644
View file @
79b73a8e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
api
.
dto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.util.Date
;
/**
* 企业人员资质信息表
*
* @author system_generator
* @date 2021-11-22
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@ApiModel
(
value
=
"PersonQualityDto"
,
description
=
"企业人员资质信息表"
)
public
class
PersonQualityDto
extends
BaseDto
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
value
=
"org_user_id"
)
private
Long
psersonId
;
@ApiModelProperty
(
value
=
"档案编号"
)
private
String
recordNum
;
@ApiModelProperty
(
value
=
"证书类型"
)
private
String
licenceType
;
@ApiModelProperty
(
value
=
"证书类型编码"
)
private
String
licenceTypeCode
;
@ApiModelProperty
(
value
=
"发证机关id"
)
private
Long
licenceIssueOrgId
;
@ApiModelProperty
(
value
=
"发证机关"
)
private
String
licenceIssueOrg
;
@ApiModelProperty
(
value
=
"作业项目"
)
private
String
projectWork
;
@ApiModelProperty
(
value
=
"复审记录"
)
private
String
recheckRecord
;
@ApiModelProperty
(
value
=
"聘用记录"
)
private
String
hireRecord
;
@ApiModelProperty
(
value
=
"备注"
)
private
String
remark
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/PersonEducation.java
0 → 100644
View file @
79b73a8e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
api
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
java.util.Date
;
/**
* 企业人员资质信息表
*
* @author system_generator
* @date 2021-11-22
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"tz_flc_person_education"
)
public
class
PersonEducation
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* org_user_id
*/
@TableField
(
"pserson_id"
)
private
Long
psersonId
;
/**
* 教育记录
*/
@TableField
(
"education_record"
)
private
String
educationRecord
;
/**
* 备注
*/
@TableField
(
"remark"
)
private
String
remark
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/PersonQuality.java
0 → 100644
View file @
79b73a8e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
api
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
java.util.Date
;
/**
* 企业人员资质信息表
*
* @author system_generator
* @date 2021-11-22
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"tz_flc_person_quality"
)
public
class
PersonQuality
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* org_user_id
*/
@TableField
(
"pserson_id"
)
private
Long
psersonId
;
/**
* 档案编号
*/
@TableField
(
"record_num"
)
private
String
recordNum
;
/**
* 证书类型
*/
@TableField
(
"licence_type"
)
private
String
licenceType
;
/**
* 证书类型编码
*/
@TableField
(
"licence_type_code"
)
private
String
licenceTypeCode
;
/**
* 发证机关id
*/
@TableField
(
"licence_issue_org_id"
)
private
Long
licenceIssueOrgId
;
/**
* 发证机关
*/
@TableField
(
"licence_issue_org"
)
private
String
licenceIssueOrg
;
/**
* 作业项目
*/
@TableField
(
"project_work"
)
private
String
projectWork
;
/**
* 复审记录
*/
@TableField
(
"recheck_record"
)
private
String
recheckRecord
;
/**
* 聘用记录
*/
@TableField
(
"hire_record"
)
private
String
hireRecord
;
/**
* 备注
*/
@TableField
(
"remark"
)
private
String
remark
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/PersonEducationMapper.java
0 → 100644
View file @
79b73a8e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
api
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.entity.PersonEducation
;
/**
* 企业人员资质信息表 Mapper 接口
*
* @author system_generator
* @date 2021-11-22
*/
public
interface
PersonEducationMapper
extends
BaseMapper
<
PersonEducation
>
{
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/PersonQualityMapper.java
0 → 100644
View file @
79b73a8e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
api
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.entity.PersonQuality
;
/**
* 企业人员资质信息表 Mapper 接口
*
* @author system_generator
* @date 2021-11-22
*/
public
interface
PersonQualityMapper
extends
BaseMapper
<
PersonQuality
>
{
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IPersonEducationService.java
0 → 100644
View file @
79b73a8e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
api
.
service
;
/**
* 企业人员资质信息表接口类
*
* @author system_generator
* @date 2021-11-22
*/
public
interface
IPersonEducationService
{
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IPersonQualityService.java
0 → 100644
View file @
79b73a8e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
api
.
service
;
/**
* 企业人员资质信息表接口类
*
* @author system_generator
* @date 2021-11-22
*/
public
interface
IPersonQualityService
{
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/PersonEducationMapper.xml
0 → 100644
View file @
79b73a8e
<?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">
<mapper
namespace=
"com.yeejoin.amos.boot.module.tzs.flc.api.mapper.PersonEducationMapper"
>
</mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/PersonQualityMapper.xml
0 → 100644
View file @
79b73a8e
<?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">
<mapper
namespace=
"com.yeejoin.amos.boot.module.tzs.flc.api.mapper.PersonQualityMapper"
>
</mapper>
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java
View file @
79b73a8e
...
...
@@ -1868,14 +1868,19 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
danger
.
setProcessStateName
(
processStateEnum
.
getName
());
}
if
(
LatentDangerBizTypeEnum
.
巡检
.
getCode
().
equals
(
danger
.
getBizType
()))
{
// 巡检隐患等级
LatentDangerLevelEnum
levelEnum
=
Arrays
.
stream
(
LatentDangerLevelEnum
.
values
()).
filter
(
l
->
l
.
getCode
().
equals
(
danger
.
getDangerLevel
())).
findFirst
().
get
();
danger
.
setDangerLevelName
(
levelEnum
.
getName
());
// 巡检整改方式
if
(!
ValidationUtil
.
isEmpty
(
danger
.
getReformType
()))
{
LatentDangerReformTypeEnum
reformTypeEnum
=
Arrays
.
stream
(
LatentDangerReformTypeEnum
.
values
()).
filter
(
l
->
l
.
getCode
().
equals
(
danger
.
getReformType
())).
findFirst
().
get
();
danger
.
setReformTypeName
(
reformTypeEnum
.
getName
());
}
// 巡检隐患状态
LatentDangerState
.
PatrolDangerStateEnum
patrolDangerStateEnum
=
Arrays
.
stream
(
LatentDangerState
.
PatrolDangerStateEnum
.
values
()).
filter
(
l
->
l
.
getCode
().
equals
(
danger
.
getDangerState
())).
findFirst
().
get
();
danger
.
setDangerStateName
(
patrolDangerStateEnum
.
getName
());
// 巡检隐患来源
danger
.
setDangerTypeName
(
LatentDangerTypeEnum
.
getEnumName
(
danger
.
getDangerType
()));
}
danger
.
setBizTypeName
(
bizTypeEnum
.
getName
());
});
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/PersonEducationController.java
0 → 100644
View file @
79b73a8e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
biz
.
controller
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.dto.PersonEducationDto
;
import
com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.PersonEducationServiceImpl
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
java.util.List
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
javax.servlet.http.HttpServletRequest
;
import
org.springframework.web.bind.annotation.*
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
/**
* 企业人员资质信息表
*
* @author system_generator
* @date 2021-11-22
*/
@RestController
@Api
(
tags
=
"企业人员资质信息表Api"
)
@RequestMapping
(
value
=
"/flc-person-education"
)
public
class
PersonEducationController
extends
BaseController
{
@Autowired
PersonEducationServiceImpl
personEducationServiceImpl
;
/**
* 新增企业人员资质信息表
*
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/save"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增企业人员资质信息表"
,
notes
=
"新增企业人员资质信息表"
)
public
ResponseModel
<
PersonEducationDto
>
save
(
@RequestBody
PersonEducationDto
model
)
{
model
=
personEducationServiceImpl
.
createWithModel
(
model
);
return
ResponseHelper
.
buildResponse
(
model
);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PutMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"根据sequenceNbr更新企业人员资质信息表"
,
notes
=
"根据sequenceNbr更新企业人员资质信息表"
)
public
ResponseModel
<
PersonEducationDto
>
updateBySequenceNbrFlcPersonEducation
(
@RequestBody
PersonEducationDto
model
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
model
.
setSequenceNbr
(
sequenceNbr
);
return
ResponseHelper
.
buildResponse
(
personEducationServiceImpl
.
updateWithModel
(
model
));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@DeleteMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"DELETE"
,
value
=
"根据sequenceNbr删除企业人员资质信息表"
,
notes
=
"根据sequenceNbr删除企业人员资质信息表"
)
public
ResponseModel
<
Boolean
>
deleteBySequenceNbr
(
HttpServletRequest
request
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
){
return
ResponseHelper
.
buildResponse
(
personEducationServiceImpl
.
removeById
(
sequenceNbr
));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个企业人员资质信息表"
,
notes
=
"根据sequenceNbr查询单个企业人员资质信息表"
)
public
ResponseModel
<
PersonEducationDto
>
selectOne
(
@PathVariable
Long
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
personEducationServiceImpl
.
queryBySeq
(
sequenceNbr
));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/page"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"企业人员资质信息表分页查询"
,
notes
=
"企业人员资质信息表分页查询"
)
public
ResponseModel
<
Page
<
PersonEducationDto
>>
queryForPage
(
@RequestParam
(
value
=
"current"
)
int
current
,
@RequestParam
(
value
=
"size"
)
int
size
)
{
Page
<
PersonEducationDto
>
page
=
new
Page
<
PersonEducationDto
>();
page
.
setCurrent
(
current
);
page
.
setSize
(
size
);
return
ResponseHelper
.
buildResponse
(
personEducationServiceImpl
.
queryForFlcPersonEducationPage
(
page
));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"企业人员资质信息表列表全部数据查询"
,
notes
=
"企业人员资质信息表列表全部数据查询"
)
@GetMapping
(
value
=
"/list"
)
public
ResponseModel
<
List
<
PersonEducationDto
>>
selectForList
()
{
return
ResponseHelper
.
buildResponse
(
personEducationServiceImpl
.
queryForFlcPersonEducationList
());
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/PersonQualityController.java
0 → 100644
View file @
79b73a8e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
biz
.
controller
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.dto.PersonQualityDto
;
import
com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.PersonQualityServiceImpl
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
java.util.List
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
javax.servlet.http.HttpServletRequest
;
import
org.springframework.web.bind.annotation.*
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
/**
* 企业人员资质信息表
*
* @author system_generator
* @date 2021-11-22
*/
@RestController
@Api
(
tags
=
"企业人员资质信息表Api"
)
@RequestMapping
(
value
=
"/flc-person-quality"
)
public
class
PersonQualityController
extends
BaseController
{
@Autowired
PersonQualityServiceImpl
flcPersonQualityServiceImpl
;
/**
* 新增企业人员资质信息表
*
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/save"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增企业人员资质信息表"
,
notes
=
"新增企业人员资质信息表"
)
public
ResponseModel
<
PersonQualityDto
>
save
(
@RequestBody
PersonQualityDto
model
)
{
model
=
flcPersonQualityServiceImpl
.
createWithModel
(
model
);
return
ResponseHelper
.
buildResponse
(
model
);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PutMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"根据sequenceNbr更新企业人员资质信息表"
,
notes
=
"根据sequenceNbr更新企业人员资质信息表"
)
public
ResponseModel
<
PersonQualityDto
>
updateBySequenceNbrFlcPersonQuality
(
@RequestBody
PersonQualityDto
model
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
model
.
setSequenceNbr
(
sequenceNbr
);
return
ResponseHelper
.
buildResponse
(
flcPersonQualityServiceImpl
.
updateWithModel
(
model
));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@DeleteMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"DELETE"
,
value
=
"根据sequenceNbr删除企业人员资质信息表"
,
notes
=
"根据sequenceNbr删除企业人员资质信息表"
)
public
ResponseModel
<
Boolean
>
deleteBySequenceNbr
(
HttpServletRequest
request
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
){
return
ResponseHelper
.
buildResponse
(
flcPersonQualityServiceImpl
.
removeById
(
sequenceNbr
));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个企业人员资质信息表"
,
notes
=
"根据sequenceNbr查询单个企业人员资质信息表"
)
public
ResponseModel
<
PersonQualityDto
>
selectOne
(
@PathVariable
Long
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
flcPersonQualityServiceImpl
.
queryBySeq
(
sequenceNbr
));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/page"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"企业人员资质信息表分页查询"
,
notes
=
"企业人员资质信息表分页查询"
)
public
ResponseModel
<
Page
<
PersonQualityDto
>>
queryForPage
(
@RequestParam
(
value
=
"current"
)
int
current
,
@RequestParam
(
value
=
"size"
)
int
size
)
{
Page
<
PersonQualityDto
>
page
=
new
Page
<
PersonQualityDto
>();
page
.
setCurrent
(
current
);
page
.
setSize
(
size
);
return
ResponseHelper
.
buildResponse
(
flcPersonQualityServiceImpl
.
queryForFlcPersonQualityPage
(
page
));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"企业人员资质信息表列表全部数据查询"
,
notes
=
"企业人员资质信息表列表全部数据查询"
)
@GetMapping
(
value
=
"/list"
)
public
ResponseModel
<
List
<
PersonQualityDto
>>
selectForList
()
{
return
ResponseHelper
.
buildResponse
(
flcPersonQualityServiceImpl
.
queryForFlcPersonQualityList
());
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/PersonEducationServiceImpl.java
0 → 100644
View file @
79b73a8e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
biz
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.dto.PersonEducationDto
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.entity.PersonEducation
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.mapper.PersonEducationMapper
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.service.IPersonEducationService
;
import
org.springframework.stereotype.Service
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
java.util.List
;
/**
* 企业人员资质信息表服务实现类
*
* @author system_generator
* @date 2021-11-22
*/
@Service
public
class
PersonEducationServiceImpl
extends
BaseService
<
PersonEducationDto
,
PersonEducation
,
PersonEducationMapper
>
implements
IPersonEducationService
{
/**
* 分页查询
*/
public
Page
<
PersonEducationDto
>
queryForFlcPersonEducationPage
(
Page
<
PersonEducationDto
>
page
)
{
return
this
.
queryForPage
(
page
,
null
,
false
);
}
/**
* 列表查询 示例
*/
public
List
<
PersonEducationDto
>
queryForFlcPersonEducationList
()
{
return
this
.
queryForList
(
""
,
false
);
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/PersonQualityServiceImpl.java
0 → 100644
View file @
79b73a8e
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
biz
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.dto.PersonQualityDto
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.entity.PersonQuality
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.mapper.PersonQualityMapper
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.service.IPersonQualityService
;
import
org.springframework.stereotype.Service
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
java.util.List
;
/**
* 企业人员资质信息表服务实现类
*
* @author system_generator
* @date 2021-11-22
*/
@Service
public
class
PersonQualityServiceImpl
extends
BaseService
<
PersonQualityDto
,
PersonQuality
,
PersonQualityMapper
>
implements
IPersonQualityService
{
/**
* 分页查询
*/
public
Page
<
PersonQualityDto
>
queryForFlcPersonQualityPage
(
Page
<
PersonQualityDto
>
page
)
{
return
this
.
queryForPage
(
page
,
null
,
false
);
}
/**
* 列表查询 示例
*/
public
List
<
PersonQualityDto
>
queryForFlcPersonQualityList
()
{
return
this
.
queryForList
(
""
,
false
);
}
}
\ No newline at end of file
amos-boot-system-supervision/src/main/resources/db/changelog/mt-1.0.0.xml
View file @
79b73a8e
...
...
@@ -260,4 +260,38 @@
ALTER TABLE `p_input_item` ADD COLUMN `item_type_classify_ids` varchar(64) DEFAULT NULL COMMENT '检查类别IDS';
</sql>
</changeSet>
<changeSet
author=
"tb"
id=
"2021-11-19-01"
>
<preConditions
onFail=
"MARK_RAN"
>
<not>
<tableExists
tableName=
"p_check_report"
/>
</not>
</preConditions>
<comment>
add p_check_report table
</comment>
<sql>
CREATE TABLE `p_check_report` (
`id` bigint(30) NOT NULL COMMENT '主键',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '报告名称',
`plan_type` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '计划类型(0单位级/1公司级)',
`plan_task_id` bigint(30) NULL DEFAULT NULL COMMENT '关联计划任务id',
`check_user` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '执行人',
`start_check_date` datetime NULL DEFAULT NULL COMMENT '检查实际开始时间',
`end_check_date` datetime NULL DEFAULT NULL COMMENT '检查实际结束时间',
`company_count` int(255) NULL DEFAULT 0 COMMENT '检查单位数量',
`problem_company_count` int(255) NULL DEFAULT 0 COMMENT '存在问题单位数量',
`has_major_danger` bit(1) NULL DEFAULT b'0' COMMENT '是否有重大隐患(1有,0无)',
`danger_ids` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '隐患id(,逗号分割)',
`danger_count` int(255) NULL DEFAULT 0 COMMENT '存在安全隐患数量',
`review_danger_ids` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '复查隐患id(,逗号分割)',
`onsite_reform_count` int(255) NULL DEFAULT 0 COMMENT '现场已整改隐患数量',
`review_danger_count` int(255) NULL DEFAULT 0 COMMENT '复查隐患数量',
`review_reformed_count` int(255) NULL DEFAULT 0 COMMENT '复查已整改隐患数量',
`review_reforming_count` int(255) NULL DEFAULT 0 COMMENT '复查整改中隐患数量',
`remaining_danger_count` int(255) NULL DEFAULT NULL COMMENT '剩余隐患数量',
`org_code` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机构代码',
`create_date` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建日期',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
</sql>
</changeSet>
</databaseChangeLog>
\ 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