Commit 3144c27b authored by litengwei's avatar litengwei

添加任务提交

parent 3f9096f1
...@@ -7,8 +7,8 @@ import com.yeejoin.amos.fas.business.dao.mapper.EmergencyTaskRoleMapper; ...@@ -7,8 +7,8 @@ import com.yeejoin.amos.fas.business.dao.mapper.EmergencyTaskRoleMapper;
import com.yeejoin.amos.fas.business.feign.JcsFeign; import com.yeejoin.amos.fas.business.feign.JcsFeign;
import com.yeejoin.amos.fas.business.service.intfc.IDictService; import com.yeejoin.amos.fas.business.service.intfc.IDictService;
import com.yeejoin.amos.fas.business.service.intfc.IEmergencyTaskService; import com.yeejoin.amos.fas.business.service.intfc.IEmergencyTaskService;
import com.yeejoin.amos.fas.business.service.intfc.IPlanStepService;
import com.yeejoin.amos.fas.business.vo.EmergencyRelationVo; import com.yeejoin.amos.fas.business.vo.EmergencyRelationVo;
import com.yeejoin.amos.fas.common.enums.PlanTypeEnum;
import com.yeejoin.amos.fas.config.Permission; import com.yeejoin.amos.fas.config.Permission;
import com.yeejoin.amos.fas.core.common.request.CommonPageable; import com.yeejoin.amos.fas.core.common.request.CommonPageable;
import com.yeejoin.amos.fas.core.util.CommonResponse; import com.yeejoin.amos.fas.core.util.CommonResponse;
...@@ -55,6 +55,9 @@ public class EmergencyTaskController extends BaseController{ ...@@ -55,6 +55,9 @@ public class EmergencyTaskController extends BaseController{
@Autowired @Autowired
private EmergencyTaskMapper emergencyTaskMapper; private EmergencyTaskMapper emergencyTaskMapper;
@Autowired
private IPlanStepService planStepService;
@ApiOperation(httpMethod = "GET",value = "岗位人员树", notes = "岗位人员树") @ApiOperation(httpMethod = "GET",value = "岗位人员树", notes = "岗位人员树")
@RequestMapping(value = "/tree", method = RequestMethod.GET) @RequestMapping(value = "/tree", method = RequestMethod.GET)
public CommonResponse tree(){ public CommonResponse tree(){
...@@ -156,13 +159,21 @@ public class EmergencyTaskController extends BaseController{ ...@@ -156,13 +159,21 @@ public class EmergencyTaskController extends BaseController{
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} }
@ApiOperation(httpMethod = "POST",value = "新增树人员节点", notes = "新增树人员节点") @ApiOperation(httpMethod = "POST",value = "新增应急任务配置", notes = "新增应急任务配置")
@PostMapping(value = "/saveTaskConfig", produces = "application/json;charset=UTF-8") @PostMapping(value = "/saveTaskConfig", produces = "application/json;charset=UTF-8")
public CommonResponse saveTaskConfig(@RequestBody EmergencyTaskContent emergencyTaskContent){ public CommonResponse saveTaskConfig(@RequestBody EmergencyTaskContent emergencyTaskContent){
iEmergencyTaskService.saveTaskConfig(emergencyTaskContent); iEmergencyTaskService.saveTaskConfig(emergencyTaskContent);
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} }
@ApiOperation(httpMethod = "GET",value = "查询流程节点", notes = "查询流程节点")
@GetMapping(value = "/findStep")
public CommonResponse findStep(@RequestParam String planType){
planStepService.getPlanStepByParam(planType);
return CommonResponseUtil.success(planStepService.getPlanStepByParam(planType));
}
@Permission @Permission
@ApiOperation(value = "根据ID删除数据", notes = "根据ID删除数据") @ApiOperation(value = "根据ID删除数据", notes = "根据ID删除数据")
@DeleteMapping(value = "/deleteById", produces = "application/json;charset=UTF-8") @DeleteMapping(value = "/deleteById", produces = "application/json;charset=UTF-8")
......
...@@ -64,6 +64,13 @@ public class PlanStepServiceImpl implements IPlanStepService { ...@@ -64,6 +64,13 @@ public class PlanStepServiceImpl implements IPlanStepService {
} }
@Override @Override
public List<PlanStepJsonVO> getPlanStepByParam(String planType) {
String json = emergencyTaskRoleMapper.getPlanStepInfoByType(planType);
List<PlanStepJsonVO> result = JSONObject.parseArray(json, PlanStepJsonVO.class);
return result;
}
@Override
public void initPlanStep() { public void initPlanStep() {
redisTemplate.delete("planStep"); redisTemplate.delete("planStep");
redisTemplate.opsForValue().set("planStep", getPlanStep()); redisTemplate.opsForValue().set("planStep", getPlanStep());
......
...@@ -26,6 +26,8 @@ public interface IPlanStepService { ...@@ -26,6 +26,8 @@ public interface IPlanStepService {
String getPlanStep(); String getPlanStep();
List<PlanStepJsonVO> getPlanStepByParam(String planType);
void initPlanStep(); void initPlanStep();
void initPlanTask(); void initPlanTask();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment