Browse Source

1、工单的修改页面打开后需要根据sid调用接口(v1/dispatchorderinfo/fetchDetailsBySid/{sid})查询工单信息字段

根据工单主键(orderid)调用接口(v1/dispatchworker/listPage)分页查询运维人员信息。
根据工单主键(orderid)调用接口(v1/dispatchorderstandards/listPage)分页查询任务项列表信息。
2、关联任务项接口(v1/dispatchmodletemplate/save)数据格式:{'templateid':'12345690','taskid':[1,2,3,4,5,6,7,8]}
master
djz8236 2 years ago
parent
commit
9cca2cb7d9
  1. 8
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDetailsVo.java
  2. 4
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDto.java
  3. 4
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeign.java
  4. 5
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeignFallback.java
  5. 8
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateVo.java
  6. 16
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java
  7. 40
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java
  8. 3
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java
  9. 1
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchplanworker/DispatchPlanWorkerService.java
  10. 1
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerService.java

8
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDetailsVo.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: supervise-dispatchcenter(工单系统) <br/>
* File: DispatchModleTemplateVo.java <br/>
@ -51,9 +53,9 @@ public class DispatchModleTemplateDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("模板id")
@ApiModelProperty("模板id")
private String templateid; // 模板id
@ApiModelProperty("任务项标准库id")
private String taskid; // 任务项标准库id
@ApiModelProperty("任务项标准库id")
private List<String> taskid; // 任务项标准库id
}

4
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDto.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: supervise-dispatchcenter(工单系统) <br/>
* File: DispatchModleTemplateDto.java <br/>
@ -54,6 +56,6 @@ public class DispatchModleTemplateDto implements Dto {
@ApiModelProperty("模板id")
private String templateid; // 模板id
@ApiModelProperty("任务项标准库id")
private String taskid; // 任务项标准库id
private List<String> taskid; // 任务项标准库id
}

4
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeign.java

@ -79,5 +79,7 @@ public interface DispatchModleTemplateFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<DispatchModleTemplateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("根据模板SID获取一条记录")
@GetMapping("/fetchDetailsByTemplateSid/{sid}")
public ResultBean<DispatchModleTemplateDetailsVo> fetchDetailsByTemplateSid(@PathVariable("sid") String sid);
}

5
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeignFallback.java

@ -74,4 +74,9 @@ public class DispatchModleTemplateFeignFallback implements DispatchModleTemplate
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口supervise-dispatchcenter/dispatchmodletemplate/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<DispatchModleTemplateDetailsVo> fetchDetailsByTemplateSid(String sid) {
return null;
}
}

8
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateVo.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: supervise-dispatchcenter(工单系统) <br/>
* File: DispatchModleTemplateVo.java <br/>
@ -51,9 +53,9 @@ public class DispatchModleTemplateVo implements Vo {
private String sid; // sid
@ApiModelProperty("模板id")
@ApiModelProperty("模板id")
private String templateid; // 模板id
@ApiModelProperty("任务项标准库id")
private String taskid; // 任务项标准库id
@ApiModelProperty("任务项标准库id")
private List<String> taskid; // 任务项标准库id
}

16
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java

@ -98,8 +98,8 @@ public class DispatchModleTemplateRest implements DispatchModleTemplateFeign {
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<DispatchModleTemplateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<DispatchModleTemplateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
DispatchModleTemplateDetailsVo vo = dispatchModleTemplateService.fetchDetailsVoBySid(sid);
if (vo==null)
@ -107,4 +107,16 @@ public class DispatchModleTemplateRest implements DispatchModleTemplateFeign {
return rb.success().setData(vo);
}
@Override
@ApiOperation("根据模板SID获取一条记录")
@GetMapping("/fetchDetailsByTemplateSid/{sid}")
public ResultBean<DispatchModleTemplateDetailsVo> fetchDetailsByTemplateSid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
DispatchModleTemplateDetailsVo vo = dispatchModleTemplateService.fetchDetailsByTemplateSid(sid);
// if (vo==null)
// return rb.setMsg("查询不到数据");
return rb.success().setData(vo);
}
}

40
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java

@ -44,6 +44,7 @@ import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleT
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@ -85,14 +86,22 @@ public class DispatchModleTemplateService extends MybatisBaseService<DispatchMod
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
QueryWrapper<DispatchModleTemplate> qw = new QueryWrapper<>();
qw.eq("templateid",dto.getTemplateid());
baseMapper.delete(qw);
this.insertByDto(dto);
}
public void insertByDto(DispatchModleTemplateDto dto){
DispatchModleTemplate entity = new DispatchModleTemplate();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
List<String> taskid = dto.getTaskid();
for (String s : taskid) {
DispatchModleTemplate entity = new DispatchModleTemplate();
//BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setTemplateid(dto.getTemplateid());
entity.setTaskid(s);
baseMapper.insert(entity);
}
}
public void updateByDto(DispatchModleTemplateDto dto){
@ -104,7 +113,7 @@ public class DispatchModleTemplateService extends MybatisBaseService<DispatchMod
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public DispatchModleTemplateDetailsVo fetchDetailsVoBySid(String sid){
DispatchModleTemplate entity = fetchBySid(sid);
if (entity==null)
@ -113,7 +122,22 @@ public class DispatchModleTemplateService extends MybatisBaseService<DispatchMod
BeanUtil.copyProperties(entity, vo);
return vo;
}
public DispatchModleTemplateDetailsVo fetchDetailsByTemplateSid(String templateSid) {
QueryWrapper<DispatchModleTemplate> qw = new QueryWrapper<>();
qw.eq("templateid",templateSid);
List<DispatchModleTemplateVo> dispatchModleTemplateVos = baseMapper.selectListAllVo(qw);
if(dispatchModleTemplateVos==null||dispatchModleTemplateVos.size()==0){
return null;
}
DispatchModleTemplateDetailsVo vo = new DispatchModleTemplateDetailsVo();
vo.setTemplateid(dispatchModleTemplateVos.get(0).getTemplateid());
List<String> ss=new ArrayList<>();
dispatchModleTemplateVos.forEach(d->{
ss.add(d.getTaskid()+"");
});
vo.setTaskid(ss);
return vo;
}
public void delByTemplateSid(String templateSid) {
if(StringUtils.isBlank(templateSid)){
return;
@ -131,4 +155,6 @@ public class DispatchModleTemplateService extends MybatisBaseService<DispatchMod
public List<DispatchStandardsVo> getStandardsByTemplateSid(String templatesid) {
return baseMapper.getStandardsByTemplateSid(templatesid);
}
}

3
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java

@ -76,6 +76,9 @@ public class DispatchOrderStandardsService extends MybatisBaseService<DispatchOr
if (StringUtils.isNotBlank(query.getTasktype())) {
qw.eq("tasktype", query.getTasktype());
}
if (StringUtils.isNotBlank(query.getOrdersid())) {
qw.eq("ordersid", query.getOrdersid());
}
return qw;
}

1
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchplanworker/DispatchPlanWorkerService.java

@ -66,6 +66,7 @@ public class DispatchPlanWorkerService extends MybatisBaseService<DispatchPlanWo
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<DispatchPlanWorker> qw = new QueryWrapper<>();
qw.eq("planid",query.getPlanid());
return qw;
}

1
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerService.java

@ -64,6 +64,7 @@ public class DispatchWorkerService extends MybatisBaseService<DispatchWorkerMapp
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<DispatchWorker> qw = new QueryWrapper<>();
qw.eq("orderid",query.getOrderid());
return qw;
}

Loading…
Cancel
Save