Commit b79bc032 authored by 王蔡翾's avatar 王蔡翾
Browse files

工单新增报错次数

parent 912bddfd
......@@ -22,6 +22,7 @@ public class BsWorkController extends BaseController {
private BsWorkService bsWorkService;
@Resource
private JwtUtil jwtUtil;
private BsWorkDTO bsWorkDTO;
@PostMapping("/page")
public TableDataInfo page(@RequestBody BsWorkDTO bsWorkDTO,@RequestHeader("Authorization") String token) {
......@@ -41,9 +42,7 @@ public class BsWorkController extends BaseController {
@ApiOperation("新增工单(自动获取处理人)")
@PostMapping("/addByOperationTable")
public Result<Boolean> addByOperationTable(@RequestBody BsWorkDTO bsWorkDTO,@RequestHeader("Authorization") String token) {
String name = jwtUtil.getUserNameFromToken(token);
bsWorkDTO.setLoginName(name);
public Result<Boolean> addByOperationTable(@RequestBody BsWorkDTO bsWorkDTO) {
return Result.data(bsWorkService.addWorkByOperationTable(bsWorkDTO));
}
......
......@@ -56,6 +56,9 @@ public class BsWorkEntity {
@ApiModelProperty("工单处理附件")
@TableField("file_path")
private String filePath;
@ApiModelProperty("报错次数")
@TableField("error_count")
private Integer errorCount;
}
......@@ -132,47 +132,60 @@ public class BsWorkServiceImpl extends ServiceImpl <BsWorkMapper, BsWorkEntity>
*/
@Override
public Boolean addWorkByOperationTable(BsWorkDTO bsWorkDTO){
BsWorkLevelVO bsWorkLevelVO = bsWorkLevelService.queryByLevel(bsWorkDTO.getLevel());
UserEntity userEntity = userService.getOne(new QueryWrapper<UserEntity>().eq("name", bsWorkDTO.getLoginName()));
bsWorkDTO.setCreateBy(userEntity.getId());
bsWorkDTO.setCreateBy("1829053579758981121");
bsWorkDTO.setCreateTime( new Date());
bsWorkDTO.setStatus("待处理");
//查询本月维护人的信息
ScheduleEntity scheduleEntity = scheduleService.getUser();
bsWorkDTO.setHandleBy(scheduleEntity.getUserId());
//查找处理人电话
String phone = scheduleEntity.getPhone();
//获取处理时长
Integer handleTime = bsWorkLevelVO.getHandleTime();
//设置工单结束时间
if (handleTime == null){
handleTime =0;
BsProjectEntity bsProjectEntity = bsProjectService.getOne(new QueryWrapper<BsProjectEntity>().eq("project_name", bsWorkDTO.getProjectName()));
if (bsProjectEntity!=null){
bsWorkDTO.setProjectId(bsProjectEntity.getId());
}
long endTimeMillis = bsWorkDTO.getCreateTime().getTime() + handleTime * 60 * 60 * 1000L;
bsWorkDTO.setEndTime(new java.util.Date(endTimeMillis));
String code = "T" + System.currentTimeMillis() % 10000000000L;
bsWorkDTO.setCode(code);
save(bsWorkDTO);
//查询新增工单id
BsWorkEntity bsWorkEntity = getOne(new QueryWrapper<BsWorkEntity>().eq("code", bsWorkDTO.getCode()));
//创建操作记录数据
BsWorkOperationEntity bsWorkOperationEntity =new BsWorkOperationEntity();
bsWorkOperationEntity.setWorkId(bsWorkEntity.getId());
bsWorkOperationEntity.setHandleTime( new Date());
bsWorkOperationEntity.setHandler(bsWorkDTO.getLoginName());
bsWorkOperationEntity.setRemark("新增工单");
bsWorkOperationEntity.setWorkId(bsWorkDTO.getId());
// 构造短信参数
// 格式化 endTime
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String endTimeStr = sdf.format(bsWorkDTO.getEndTime());
Map<String, String> map = new HashMap<>();
map.put("code",bsWorkDTO.getCode());
map.put("endTime", endTimeStr);
//先检查项目中是否存在相同错误,若存在则原来错误次数+1,不创建新工单,若不存在则创建工单
BsWorkEntity bsWork = getOne(new QueryWrapper<BsWorkEntity>().eq("project_id", bsWorkDTO.getProjectId()).eq("detail", bsWorkDTO.getDetail()));
if (bsWork==null) {
//设置错误次数
bsWorkDTO.setErrorCount(1);
//查询本月维护人的信息
ScheduleEntity scheduleEntity = scheduleService.getUser();
bsWorkDTO.setHandleBy(scheduleEntity.getUserId());
//查找处理人电话
String phone = scheduleEntity.getPhone();
//获取处理时长
Integer handleTime = bsWorkLevelVO.getHandleTime();
//设置工单结束时间
if (handleTime == null) {
handleTime = 0;
}
long endTimeMillis = bsWorkDTO.getCreateTime().getTime() + handleTime * 60 * 60 * 1000L;
bsWorkDTO.setEndTime(new java.util.Date(endTimeMillis));
String code = "T" + System.currentTimeMillis() % 10000000000L;
bsWorkDTO.setCode(code);
save(bsWorkDTO);
//查询新增工单id
BsWorkEntity bsWorkEntity = getOne(new QueryWrapper<BsWorkEntity>().eq("code", bsWorkDTO.getCode()));
//创建操作记录数据
BsWorkOperationEntity bsWorkOperationEntity = new BsWorkOperationEntity();
bsWorkOperationEntity.setWorkId(bsWorkEntity.getId());
bsWorkOperationEntity.setHandleTime(new Date());
bsWorkOperationEntity.setHandler(DEPT_LEADER);
bsWorkOperationEntity.setRemark("新增工单");
bsWorkOperationEntity.setWorkId(bsWorkDTO.getId());
// 构造短信参数
// 格式化 endTime
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String endTimeStr = sdf.format(bsWorkDTO.getEndTime());
Map<String, String> map = new HashMap<>();
map.put("code", bsWorkDTO.getCode());
map.put("endTime", endTimeStr);
//发送工单处理提醒
smsSendUtils.sendMsg(phone,"SMS_500840272",map);
return bsWorkOperationService .save(bsWorkOperationEntity);
//发送工单处理提醒
smsSendUtils.sendMsg(phone, "SMS_500840272", map);
return bsWorkOperationService.save(bsWorkOperationEntity);
}else {
bsWork.setErrorCount(bsWork.getErrorCount()+1);
return updateById(bsWork);
}
}
/*
......
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