提交 2bdd98f2 authored 作者: 宋文杰's avatar 宋文杰

feat(emergency event): add upload summary file

上级 89359ca0
...@@ -79,4 +79,16 @@ public class EmergencyEventController extends BaseController { ...@@ -79,4 +79,16 @@ public class EmergencyEventController extends BaseController {
return new R<>(emergencyEventService.removeById(eventId)); 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));
}
} }
...@@ -79,5 +79,16 @@ private static final long serialVersionUID = 1L; ...@@ -79,5 +79,16 @@ private static final long serialVersionUID = 1L;
* 状态 * 状态
*/ */
private String status; private String status;
/**
* 评估总结文件名称
*/
private String fileName;
/**
* 评估总结文件url
*/
private String fileUrl;
/**
* 是否归档
*/
private Boolean isFile;
} }
...@@ -41,4 +41,22 @@ public interface EmergencyEventMapper extends BaseMapper<EmergencyEvent> { ...@@ -41,4 +41,22 @@ public interface EmergencyEventMapper extends BaseMapper<EmergencyEvent> {
* @Date: 2019/5/15 * @Date: 2019/5/15
*/ */
Page<EmergencyEvent> getEventPage (Page page,String reportingDept); 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);
} }
...@@ -38,4 +38,13 @@ public interface EmergencyEventService extends IService<EmergencyEvent> { ...@@ -38,4 +38,13 @@ public interface EmergencyEventService extends IService<EmergencyEvent> {
* @Date: 2019/5/15 * @Date: 2019/5/15
*/ */
boolean updateStatus(Integer eventId,String status); boolean updateStatus(Integer eventId,String status);
/**
* @Description: 更新评估总结文档信息
* @param: [event]
* @return: boolean
* @Author: songwenjie
* @Date: 2019/5/16
*/
boolean updateFile(EmergencyEvent event);
} }
...@@ -8,7 +8,6 @@ import com.elephant.framework.galaxy.aroad.module.emergencyevent.mapper.Emergenc ...@@ -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.EmergencyEventService;
import com.elephant.framework.galaxy.aroad.module.emergencyevent.service.EvendealService; import com.elephant.framework.galaxy.aroad.module.emergencyevent.service.EvendealService;
import com.elephant.framework.galaxy.aroad.module.system.service.DeptService; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -81,4 +80,15 @@ public class EmergencyEventServiceImpl extends ServiceImpl<EmergencyEventMapper, ...@@ -81,4 +80,15 @@ public class EmergencyEventServiceImpl extends ServiceImpl<EmergencyEventMapper,
public boolean updateStatus(Integer eventId,String status){ public boolean updateStatus(Integer eventId,String status){
return baseMapper.updateStatus(eventId,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);
}
} }
...@@ -25,14 +25,14 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter { ...@@ -25,14 +25,14 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter {
@Override @Override
protected void configure(HttpSecurity http) throws Exception { protected void configure(HttpSecurity http) throws Exception {
http http
.formLogin() .formLogin()
.loginPage("/token/login") .loginPage("/token/login")
.loginProcessingUrl("/token/form") .loginProcessingUrl("/token/form")
.and() .and()
.authorizeRequests() .authorizeRequests()
.antMatchers(new String[]{"/token/**","/images/**"}).permitAll() .antMatchers(new String[]{"/token/**","/images/**"}).permitAll()
.anyRequest().authenticated() .anyRequest().authenticated()
.and().csrf().disable(); .and().csrf().disable();
} }
/** /**
......
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
<result property="reporterId" column="reporter_id"/> <result property="reporterId" column="reporter_id"/>
<result property="reportingTime" column="reporting_time"/> <result property="reportingTime" column="reporting_time"/>
<result property="status" column="status"/> <result property="status" column="status"/>
<result property="fileName" column="file_name"/>
<result property="fileUrl" column="file_url"/>
<result property="isFile" column="is_file"/>
</resultMap> </resultMap>
<insert id="saveEvent" useGeneratedKeys="true" keyProperty="eventId"> <insert id="saveEvent" useGeneratedKeys="true" keyProperty="eventId">
...@@ -39,4 +42,14 @@ ...@@ -39,4 +42,14 @@
</if> </if>
order by reporting_time desc order by reporting_time desc
</select> </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> </mapper>
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论