Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cms
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
cms
Commits
29b8c0b3
提交
29b8c0b3
authored
8月 03, 2023
作者:
张小凤
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
PilotReasonDO
上级
2a9c419d
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
100 行增加
和
4 行删除
+100
-4
PilotReasonDTO.java
...om/mmc/iuav/user/model/dto/dronepilot/PilotReasonDTO.java
+29
-0
PilotCertificationController.java
...r/controller/dronepilot/PilotCertificationController.java
+11
-0
PilotCertificationDao.java
...m/mmc/iuav/user/dao/dronepilot/PilotCertificationDao.java
+3
-0
PilotReasonDO.java
...va/com/mmc/iuav/user/entity/dronepilot/PilotReasonDO.java
+39
-0
PilotCertificationService.java
...av/user/service/dronepilot/PilotCertificationService.java
+3
-0
PilotCertificationServiceImpl.java
...ervice/dronepilot/impl/PilotCertificationServiceImpl.java
+10
-4
PilotCertificationDao.xml
...ain/resources/mapper/dronepilot/PilotCertificationDao.xml
+5
-0
没有找到文件。
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/dronepilot/PilotReasonDTO.java
0 → 100644
浏览文件 @
29b8c0b3
package
com
.
mmc
.
iuav
.
user
.
model
.
dto
.
dronepilot
;
import
com.mmc.iuav.group.Update
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
javax.validation.constraints.NotNull
;
/**
* @Author small
* @Date 2023/8/3 16:25
* @Version 1.0
*/
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
PilotReasonDTO
{
@ApiModelProperty
(
value
=
"原因id"
,
example
=
"1"
)
@NotNull
(
message
=
"原因id"
,
groups
=
Update
.
class
)
private
Integer
id
;
@ApiModelProperty
(
value
=
"原因"
,
example
=
"1"
)
private
String
reason
;
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/dronepilot/PilotCertificationController.java
浏览文件 @
29b8c0b3
...
@@ -9,6 +9,7 @@ import com.mmc.iuav.user.model.dto.RoleInfoDTO;
...
@@ -9,6 +9,7 @@ import com.mmc.iuav.user.model.dto.RoleInfoDTO;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotAbilityDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotAbilityDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationLogDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationLogDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotReasonDTO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotAuditStatusQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotAuditStatusQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationLogQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationLogQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationQO
;
...
@@ -66,6 +67,7 @@ public class PilotCertificationController extends BaseController {
...
@@ -66,6 +67,7 @@ public class PilotCertificationController extends BaseController {
return
ResultBody
.
success
(
certificationService
.
pilotList
(
param
));
return
ResultBody
.
success
(
certificationService
.
pilotList
(
param
));
}
}
@ApiOperation
(
value
=
"小程序——详情————飞手执照及能力认证"
)
@ApiOperation
(
value
=
"小程序——详情————飞手执照及能力认证"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
PilotCertificationDTO
.
class
)})
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
PilotCertificationDTO
.
class
)})
@GetMapping
(
"/detailPilot"
)
@GetMapping
(
"/detailPilot"
)
...
@@ -89,6 +91,15 @@ public class PilotCertificationController extends BaseController {
...
@@ -89,6 +91,15 @@ public class PilotCertificationController extends BaseController {
return
ResultBody
.
success
(
certificationService
.
backListPilot
(
param
,
this
.
getUserLoginInfoFromRedis
(
request
)));
return
ResultBody
.
success
(
certificationService
.
backListPilot
(
param
,
this
.
getUserLoginInfoFromRedis
(
request
)));
}
}
@ApiOperation
(
value
=
"后台管理——审批不通过原因————飞手执照及能力认证"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
PilotCertificationDTO
.
class
)})
@GetMapping
(
"/backListReason"
)
public
ResultBody
<
PilotReasonDTO
>
backListReason
()
{
return
certificationService
.
backListReason
();
}
@ApiOperation
(
value
=
"后台管理——详情————飞手执照及能力认证"
)
@ApiOperation
(
value
=
"后台管理——详情————飞手执照及能力认证"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
PilotCertificationDTO
.
class
)})
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
PilotCertificationDTO
.
class
)})
@GetMapping
(
"/backDetailPilot"
)
@GetMapping
(
"/backDetailPilot"
)
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/dronepilot/PilotCertificationDao.java
浏览文件 @
29b8c0b3
...
@@ -4,6 +4,7 @@ import com.mmc.iuav.user.entity.UserAccountDO;
...
@@ -4,6 +4,7 @@ import com.mmc.iuav.user.entity.UserAccountDO;
import
com.mmc.iuav.user.entity.dronepilot.PilotAbilityDO
;
import
com.mmc.iuav.user.entity.dronepilot.PilotAbilityDO
;
import
com.mmc.iuav.user.entity.dronepilot.PilotCertificationDO
;
import
com.mmc.iuav.user.entity.dronepilot.PilotCertificationDO
;
import
com.mmc.iuav.user.entity.dronepilot.PilotCertificationLogDO
;
import
com.mmc.iuav.user.entity.dronepilot.PilotCertificationLogDO
;
import
com.mmc.iuav.user.entity.dronepilot.PilotReasonDO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotAuditStatusQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotAuditStatusQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationLogQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationLogQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationQO
;
...
@@ -53,4 +54,6 @@ public interface PilotCertificationDao {
...
@@ -53,4 +54,6 @@ public interface PilotCertificationDao {
UserAccountDO
selectUserAccountId
(
PilotAuditStatusQO
param
);
UserAccountDO
selectUserAccountId
(
PilotAuditStatusQO
param
);
List
<
PilotCertificationLogDO
>
backPilotLogList
(
PilotCertificationLogQO
param
);
List
<
PilotCertificationLogDO
>
backPilotLogList
(
PilotCertificationLogQO
param
);
List
<
PilotReasonDO
>
backListReason
();
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/dronepilot/PilotReasonDO.java
0 → 100644
浏览文件 @
29b8c0b3
package
com
.
mmc
.
iuav
.
user
.
entity
.
dronepilot
;
import
com.mmc.iuav.group.Update
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotReasonDTO
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
javax.validation.constraints.NotNull
;
/**
* @Author small
* @Date 2023/8/3 16:29
* @Version 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public
class
PilotReasonDO
{
@ApiModelProperty
(
value
=
"原因id"
,
example
=
"1"
)
@NotNull
(
message
=
"原因id"
,
groups
=
Update
.
class
)
private
Integer
id
;
@ApiModelProperty
(
value
=
"原因"
,
example
=
"请提供有效期内的执照"
)
private
String
reason
;
public
PilotReasonDTO
buildPilotReasonDTO
()
{
return
PilotReasonDTO
.
builder
()
.
id
(
this
.
id
)
.
reason
(
this
.
reason
)
.
build
();
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/dronepilot/PilotCertificationService.java
浏览文件 @
29b8c0b3
...
@@ -5,6 +5,7 @@ import com.mmc.iuav.response.ResultBody;
...
@@ -5,6 +5,7 @@ import com.mmc.iuav.response.ResultBody;
import
com.mmc.iuav.user.model.dto.LoginSuccessDTO
;
import
com.mmc.iuav.user.model.dto.LoginSuccessDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotAbilityDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotAbilityDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotReasonDTO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotAuditStatusQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotAuditStatusQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationLogQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationLogQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationQO
;
...
@@ -39,4 +40,6 @@ public interface PilotCertificationService {
...
@@ -39,4 +40,6 @@ public interface PilotCertificationService {
ResultBody
updateAuditStatus
(
PilotAuditStatusQO
param
,
LoginSuccessDTO
userLoginInfoFromRedis
);
ResultBody
updateAuditStatus
(
PilotAuditStatusQO
param
,
LoginSuccessDTO
userLoginInfoFromRedis
);
PageResult
backPilotLogList
(
PilotCertificationLogQO
param
,
LoginSuccessDTO
userLoginInfoFromRedis
);
PageResult
backPilotLogList
(
PilotCertificationLogQO
param
,
LoginSuccessDTO
userLoginInfoFromRedis
);
ResultBody
<
PilotReasonDTO
>
backListReason
();
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/dronepilot/impl/PilotCertificationServiceImpl.java
浏览文件 @
29b8c0b3
...
@@ -10,14 +10,12 @@ import com.mmc.iuav.user.constant.WxConstant;
...
@@ -10,14 +10,12 @@ import com.mmc.iuav.user.constant.WxConstant;
import
com.mmc.iuav.user.controller.wx.*
;
import
com.mmc.iuav.user.controller.wx.*
;
import
com.mmc.iuav.user.dao.dronepilot.PilotCertificationDao
;
import
com.mmc.iuav.user.dao.dronepilot.PilotCertificationDao
;
import
com.mmc.iuav.user.entity.UserAccountDO
;
import
com.mmc.iuav.user.entity.UserAccountDO
;
import
com.mmc.iuav.user.entity.dronepilot.CertificationMessage
;
import
com.mmc.iuav.user.entity.dronepilot.*
;
import
com.mmc.iuav.user.entity.dronepilot.PilotAbilityDO
;
import
com.mmc.iuav.user.entity.dronepilot.PilotCertificationDO
;
import
com.mmc.iuav.user.entity.dronepilot.PilotCertificationLogDO
;
import
com.mmc.iuav.user.model.dto.LoginSuccessDTO
;
import
com.mmc.iuav.user.model.dto.LoginSuccessDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotAbilityDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotAbilityDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationLogDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationLogDTO
;
import
com.mmc.iuav.user.model.dto.dronepilot.PilotReasonDTO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotAuditStatusQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotAuditStatusQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationLogQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationLogQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationQO
;
import
com.mmc.iuav.user.model.qo.dronepilot.PilotCertificationQO
;
...
@@ -189,6 +187,14 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
...
@@ -189,6 +187,14 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
return
pageResult
;
return
pageResult
;
}
}
@Override
public
ResultBody
<
PilotReasonDTO
>
backListReason
()
{
List
<
PilotReasonDO
>
pilotReasonDOS
=
certificationDao
.
backListReason
();
List
<
PilotReasonDTO
>
collect
=
pilotReasonDOS
.
stream
().
map
(
PilotReasonDO:
:
buildPilotReasonDTO
).
collect
(
Collectors
.
toList
());
return
ResultBody
.
success
(
collect
);
}
@Override
@Override
public
ResultBody
updateRemark
(
PilotRemarkQO
param
,
LoginSuccessDTO
userLoginInfoFromRedis
)
{
public
ResultBody
updateRemark
(
PilotRemarkQO
param
,
LoginSuccessDTO
userLoginInfoFromRedis
)
{
certificationDao
.
updateRemark
(
param
);
certificationDao
.
updateRemark
(
param
);
...
...
csm-service/cms-service-user/src/main/resources/mapper/dronepilot/PilotCertificationDao.xml
浏览文件 @
29b8c0b3
...
@@ -293,4 +293,9 @@
...
@@ -293,4 +293,9 @@
</if>
</if>
order by pcl.create_time desc
order by pcl.create_time desc
</select>
</select>
<select
id=
"backListReason"
resultType=
"com.mmc.iuav.user.entity.dronepilot.PilotReasonDO"
>
select id, reason
from pilot_reason
</select>
</mapper>
</mapper>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论