ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -4,10 +4,7 @@
import com.ycl.platform.domain.entity.WorkOrderAuditingRecord;
import com.ycl.platform.domain.entity.WorkOrderWhite;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
import com.ycl.platform.domain.query.WorkOrderExportQuery;
import com.ycl.platform.domain.query.WorkOrderQuery;
import com.ycl.platform.domain.query.WorkOrderWhiteQuery;
import com.ycl.platform.domain.query.*;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
@@ -28,6 +25,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.List;
/**
@@ -82,35 +80,46 @@
    @PutMapping("/yw-condition")
    @ApiOperation(value = "运维情况", notes = "运维情况")
    public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWConditionForm form) {
    public Result ywCondition(@RequestBody @Validated WorkOrderYWConditionForm form) {
        return workOrderService.ywCondition(form);
    }
    @PutMapping("/yw-condition-list")
    @ApiOperation(value = "运维情况", notes = "运维情况")
    public Result ywConditionList(@RequestBody @Validated WorkOrderYWConditionsForm form) {
        System.out.println(form);
//        return workOrderService.ywCondition(form);
        return workOrderService.ywConditionList(form);
    }
    //现在没用
    @PutMapping("/yw-result")
    @ApiOperation(value = "运维结果", notes = "运维结果")
    public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWResultForm form) {
    public Result ywResult(@RequestBody @Validated WorkOrderYWResultForm form) {
        return workOrderService.ywResult(form);
    }
    //现在没用
    @PutMapping("/check-result")
    @ApiOperation(value = "检测结果", notes = "检测结果")
    public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderCheckResultForm form) {
    public Result ywCheckResult(@RequestBody @Validated WorkOrderCheckResultForm form) {
        return workOrderService.checkResult(form);
    }
    @DeleteMapping("/{id}")
    @ApiOperation(value = "ID删除", notes = "ID删除")
    @PreAuthorize("@ss.hasPermi('work:order:remove')")
    @Log(title = "删除工单", businessType = BusinessType.DELETE)
    public Result removeById(@PathVariable("id") String id) {
        return workOrderService.removeById(id);
    }
    @DeleteMapping("/batch")
    @ApiOperation(value = "批量删除", notes = "批量删除")
    @PreAuthorize("@ss.hasPermi('work:order:remove')")
    public Result remove(@RequestBody @NotEmpty(message = "请选择数据") List<String> ids) {
        return workOrderService.remove(ids);
    }
//    @DeleteMapping("/batch")
//    @ApiOperation(value = "批量删除", notes = "批量删除")
//    @PreAuthorize("@ss.hasPermi('work:order:remove')")
//    public Result remove(@RequestBody @NotEmpty(message = "请选择数据") List<String> ids) {
//        return workOrderService.remove(ids);
//    }
    @PostMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
@@ -156,6 +165,13 @@
        return workOrderService.detail(id);
    }
    @GetMapping("/check")
    @ApiOperation(value = "图片检测", notes = "图片检测")
    @PreAuthorize("@ss.hasPermi('work:order:check')")
    public Result check(String workOrderNo,String serialNumber) {
        return workOrderService.checkImage(workOrderNo,serialNumber);
    }
    @GetMapping("/list")
    @ApiOperation(value = "列表", notes = "列表")
    @PreAuthorize("@ss.hasPermi('work:order:list')")
@@ -163,6 +179,12 @@
        return workOrderService.all();
    }
    @GetMapping("/errorType/list")
    @ApiOperation(value = "故障列表", notes = "故障列表")
    @PreAuthorize("@ss.hasPermi('work:order:list')")
    public Result errorList() {
        return workOrderService.errorAll();
    }
    @GetMapping("/detail/info/{workOrderNo}")
    @ApiOperation(value = "详情", notes = "详情")
    @PreAuthorize("@ss.hasPermi('work:order:detail')")
@@ -183,40 +205,18 @@
        List<WorkOrderAuditingRecord> data = workOrderService.selectYwAuditingListByYwId(workOrderNo);
        return Result.ok().data(data);
    }
    /**
     * 工单白名单列表
     */
    @PostMapping("/white/page")
    @ApiOperation(value = "工单白名单列表", notes = "工单白名单列表")
    public Result whitePage(@RequestBody WorkOrderWhiteQuery workOrderWhiteQuery)
    {
        return workOrderService.selectWorkOrderWhiteList(workOrderWhiteQuery);
    }
    /**
     * 添加工单白名单
     * 批量删除工单
     *
     * @param workOrderWhite 白色工单
     * @return {@link Result }
     * @author
     */
    @PostMapping("/white/add")
    @ApiOperation(value = "新增工单白名单", notes = "新增工单白名单")
    public Result addWorkOrderWhite(@RequestBody WorkOrderWhite workOrderWhite) {
        return workOrderService.addWorkOrderWhite(workOrderWhite);
    @DeleteMapping("/batchDelete")
    @PreAuthorize("@ss.hasPermi('work:order:delete')")
    @ApiOperation(value = "批量删除工单", notes = "批量删除工单")
    @Log(title = "批量删除工单", businessType = BusinessType.DELETE)
    public Result batchDeleteWorkOrder(@RequestBody List<String> workOrderNos) {
        return workOrderService.batchDeleteWorkOrder(workOrderNos);
    }
    /**
     * 批量删除工单白名单
     *
     * @param ids ids
     * @return {@link Result }
     * @author
     */
    @DeleteMapping("/white/batchDelete")
    @ApiOperation(value = "批量删除工单白名单", notes = "批量删除工单白名单")
    public Result batchDeleteWorkOrderWhite(@RequestBody List<String> ids) {
        return workOrderService.batchDeleteWorkOrderWhite(ids);
    }
}