Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
A
aroad_aqsc
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
许言琪
aroad_aqsc
Commits
2bdd98f2
提交
2bdd98f2
authored
5月 16, 2019
作者:
宋文杰
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(emergency event): add upload summary file
上级
89359ca0
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
83 行增加
和
10 行删除
+83
-10
EmergencyEventController.java
...e/emergencyevent/controller/EmergencyEventController.java
+12
-0
EmergencyEvent.java
...xy/aroad/module/emergencyevent/entity/EmergencyEvent.java
+12
-1
EmergencyEventMapper.java
...ad/module/emergencyevent/mapper/EmergencyEventMapper.java
+18
-0
EmergencyEventService.java
.../module/emergencyevent/service/EmergencyEventService.java
+9
-0
EmergencyEventServiceImpl.java
...mergencyevent/service/impl/EmergencyEventServiceImpl.java
+11
-1
WebSecurityConfigurer.java
...k/galaxy/aroad/security/config/WebSecurityConfigurer.java
+8
-8
EmergencyEventMapper.xml
.../resources/mapper/emergencyevent/EmergencyEventMapper.xml
+13
-0
没有找到文件。
src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/controller/EmergencyEventController.java
浏览文件 @
2bdd98f2
...
...
@@ -79,4 +79,16 @@ public class EmergencyEventController extends BaseController {
return
new
R
<>(
emergencyEventService
.
removeById
(
eventId
));
}
/**
* @Description: 更新评估总结文档信息
* @param: [event]
* @return: com.elephant.framework.galaxy.aroad.response.R
* @Author: songwenjie
* @Date: 2019/5/16
*/
@PutMapping
(
"/updateFile"
)
public
R
updateFile
(
@RequestBody
EmergencyEvent
event
){
return
new
R
<>(
emergencyEventService
.
updateFile
(
event
));
}
}
src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/entity/EmergencyEvent.java
浏览文件 @
2bdd98f2
...
...
@@ -79,5 +79,16 @@ private static final long serialVersionUID = 1L;
* 状态
*/
private
String
status
;
/**
* 评估总结文件名称
*/
private
String
fileName
;
/**
* 评估总结文件url
*/
private
String
fileUrl
;
/**
* 是否归档
*/
private
Boolean
isFile
;
}
src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/mapper/EmergencyEventMapper.java
浏览文件 @
2bdd98f2
...
...
@@ -41,4 +41,22 @@ public interface EmergencyEventMapper extends BaseMapper<EmergencyEvent> {
* @Date: 2019/5/15
*/
Page
<
EmergencyEvent
>
getEventPage
(
Page
page
,
String
reportingDept
);
/**
* @Description: 更新评估总结文档信息
* @param: [event]
* @return: boolean
* @Author: songwenjie
* @Date: 2019/5/16
*/
boolean
updateFile
(
EmergencyEvent
event
);
/**
* @Description: 归档评估总结文档
* @param: [enevtId]
* @return: boolean
* @Author: songwenjie
* @Date: 2019/5/16
*/
boolean
updateIsFile
(
@Param
(
"eventId"
)
Integer
enevtId
);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/EmergencyEventService.java
浏览文件 @
2bdd98f2
...
...
@@ -38,4 +38,13 @@ public interface EmergencyEventService extends IService<EmergencyEvent> {
* @Date: 2019/5/15
*/
boolean
updateStatus
(
Integer
eventId
,
String
status
);
/**
* @Description: 更新评估总结文档信息
* @param: [event]
* @return: boolean
* @Author: songwenjie
* @Date: 2019/5/16
*/
boolean
updateFile
(
EmergencyEvent
event
);
}
src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/impl/EmergencyEventServiceImpl.java
浏览文件 @
2bdd98f2
...
...
@@ -8,7 +8,6 @@ import com.elephant.framework.galaxy.aroad.module.emergencyevent.mapper.Emergenc
import
com.elephant.framework.galaxy.aroad.module.emergencyevent.service.EmergencyEventService
;
import
com.elephant.framework.galaxy.aroad.module.emergencyevent.service.EvendealService
;
import
com.elephant.framework.galaxy.aroad.module.system.service.DeptService
;
import
com.sun.xml.internal.bind.v2.TODO
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -81,4 +80,15 @@ public class EmergencyEventServiceImpl extends ServiceImpl<EmergencyEventMapper,
public
boolean
updateStatus
(
Integer
eventId
,
String
status
){
return
baseMapper
.
updateStatus
(
eventId
,
status
);
}
/**
* @Description: 更新评估总结文档信息
* @param: [event]
* @return: boolean
* @Author: songwenjie
* @Date: 2019/5/16
*/
public
boolean
updateFile
(
EmergencyEvent
event
){
return
baseMapper
.
updateFile
(
event
);
}
}
src/main/java/com/elephant/framework/galaxy/aroad/security/config/WebSecurityConfigurer.java
浏览文件 @
2bdd98f2
...
...
@@ -25,14 +25,14 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter {
@Override
protected
void
configure
(
HttpSecurity
http
)
throws
Exception
{
http
.
formLogin
()
.
loginPage
(
"/token/login"
)
.
loginProcessingUrl
(
"/token/form"
)
.
and
()
.
authorizeRequests
()
.
antMatchers
(
new
String
[]{
"/token/**"
,
"/images/**"
}).
permitAll
()
.
anyRequest
().
authenticated
()
.
and
().
csrf
().
disable
();
.
formLogin
()
.
loginPage
(
"/token/login"
)
.
loginProcessingUrl
(
"/token/form"
)
.
and
()
.
authorizeRequests
()
.
antMatchers
(
new
String
[]{
"/token/**"
,
"/images/**"
}).
permitAll
()
.
anyRequest
().
authenticated
()
.
and
().
csrf
().
disable
();
}
/**
...
...
src/main/resources/mapper/emergencyevent/EmergencyEventMapper.xml
浏览文件 @
2bdd98f2
...
...
@@ -17,6 +17,9 @@
<result
property=
"reporterId"
column=
"reporter_id"
/>
<result
property=
"reportingTime"
column=
"reporting_time"
/>
<result
property=
"status"
column=
"status"
/>
<result
property=
"fileName"
column=
"file_name"
/>
<result
property=
"fileUrl"
column=
"file_url"
/>
<result
property=
"isFile"
column=
"is_file"
/>
</resultMap>
<insert
id=
"saveEvent"
useGeneratedKeys=
"true"
keyProperty=
"eventId"
>
...
...
@@ -39,4 +42,14 @@
</if>
order by reporting_time desc
</select>
<update
id=
"updateFile"
>
update emergency_event set file_name=#{fileName},file_url=#{fileUrl}
where event_id=#{eventId}
</update>
<update
id=
"updateIsFile"
>
update emergency_event set is_file= 1
where event_id=#{eventId}
</update>
</mapper>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论