工单管理

linwei

2026-01-14 91fe9c347fda7468524ed51974b8441166ebdc81

工单管理

 drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/controller/GdImplementationListController.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementationList/controller/GdImplementationListController.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.implementationList.controller;
package org.sxkj.gd.implementation.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,11 +31,11 @@
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.implementationList.entity.GdImplementationListEntity;
import org.sxkj.gd.implementationList.vo.GdImplementationListVO;
import org.sxkj.gd.implementationList.excel.GdImplementationListExcel;
import org.sxkj.gd.implementationList.wrapper.GdImplementationListWrapper;
import org.sxkj.gd.implementationList.service.IGdImplementationListService;
import org.sxkj.gd.implementation.entity.GdImplementationListEntity;
import org.sxkj.gd.implementation.vo.GdImplementationListVO;
import org.sxkj.gd.implementation.excel.GdImplementationListExcel;
import org.sxkj.gd.implementation.wrapper.GdImplementationListWrapper;
import org.sxkj.gd.implementation.service.IGdImplementationListService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -53,7 +53,7 @@
 */
@RestController
@AllArgsConstructor
@RequestMapping("implementationList/gdImplementationList")
@RequestMapping("implementation/gdImplementationList")
@Api(value = "实施清单表（实时清单管理）", tags = "实施清单表（实时清单管理）接口")
public class GdImplementationListController extends BladeController {


 drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/dto/GdImplementationListDTO.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementationList/dto/GdImplementationListDTO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.implementationList.dto;
package org.sxkj.gd.implementation.dto;

import org.sxkj.gd.implementationList.entity.GdImplementationListEntity;
import org.sxkj.gd.implementation.entity.GdImplementationListEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/entity/GdImplementationListEntity.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementationList/entity/GdImplementationListEntity.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.implementationList.entity;
package org.sxkj.gd.implementation.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -22,7 +22,6 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;

/**
 * 实施清单表（实时清单管理） 实体类

 drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/excel/GdImplementationListExcel.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementationList/excel/GdImplementationListExcel.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.implementationList.excel;
package org.sxkj.gd.implementation.excel;


import com.alibaba.excel.annotation.ExcelProperty;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/mapper/GdImplementationListMapper.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementationList/mapper/GdImplementationListMapper.java
@@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.implementationList.mapper;
package org.sxkj.gd.implementation.mapper;

import org.sxkj.gd.implementationList.entity.GdImplementationListEntity;
import org.sxkj.gd.implementationList.vo.GdImplementationListVO;
import org.sxkj.gd.implementationList.excel.GdImplementationListExcel;
import org.sxkj.gd.implementation.entity.GdImplementationListEntity;
import org.sxkj.gd.implementation.vo.GdImplementationListVO;
import org.sxkj.gd.implementation.excel.GdImplementationListExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/mapper/GdImplementationListMapper.xml

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementationList/mapper/GdImplementationListMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.sxkj.gd.implementationList.mapper.GdImplementationListMapper">
<mapper namespace="org.sxkj.gd.implementation.mapper.GdImplementationListMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="gdImplementationListResultMap" type="org.sxkj.gd.implementationList.entity.GdImplementationListEntity">
    <resultMap id="gdImplementationListResultMap" type="org.sxkj.gd.implementation.entity.GdImplementationListEntity">
        <result column="id" property="id"/>
        <result column="implementation_code" property="implementationCode"/>
        <result column="list_name" property="listName"/>
@@ -29,7 +29,7 @@
    </select>


    <select id="exportGdImplementationList" resultType="org.sxkj.gd.implementationList.excel.GdImplementationListExcel">
    <select id="exportGdImplementationList" resultType="org.sxkj.gd.implementation.excel.GdImplementationListExcel">
        SELECT * FROM ja_gd_implementation_list ${ew.customSqlSegment}
    </select>


 drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/service/IGdImplementationListService.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementationList/service/IGdImplementationListService.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.implementationList.service;
package org.sxkj.gd.implementation.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.gd.implementationList.entity.GdImplementationListEntity;
import org.sxkj.gd.implementationList.vo.GdImplementationListVO;
import org.sxkj.gd.implementationList.excel.GdImplementationListExcel;
import org.sxkj.gd.implementation.entity.GdImplementationListEntity;
import org.sxkj.gd.implementation.vo.GdImplementationListVO;
import org.sxkj.gd.implementation.excel.GdImplementationListExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/service/impl/GdImplementationListServiceImpl.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementationList/service/impl/GdImplementationListServiceImpl.java
@@ -14,13 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.implementationList.service.impl;
package org.sxkj.gd.implementation.service.impl;

import org.sxkj.gd.implementationList.entity.GdImplementationListEntity;
import org.sxkj.gd.implementationList.vo.GdImplementationListVO;
import org.sxkj.gd.implementationList.excel.GdImplementationListExcel;
import org.sxkj.gd.implementationList.mapper.GdImplementationListMapper;
import org.sxkj.gd.implementationList.service.IGdImplementationListService;
import org.sxkj.gd.implementation.entity.GdImplementationListEntity;
import org.sxkj.gd.implementation.vo.GdImplementationListVO;
import org.sxkj.gd.implementation.excel.GdImplementationListExcel;
import org.sxkj.gd.implementation.mapper.GdImplementationListMapper;
import org.sxkj.gd.implementation.service.IGdImplementationListService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/vo/GdImplementationListVO.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementationList/vo/GdImplementationListVO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.implementationList.vo;
package org.sxkj.gd.implementation.vo;

import org.sxkj.gd.implementationList.entity.GdImplementationListEntity;
import org.sxkj.gd.implementation.entity.GdImplementationListEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/wrapper/GdImplementationListWrapper.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementationList/wrapper/GdImplementationListWrapper.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.implementationList.wrapper;
package org.sxkj.gd.implementation.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.sxkj.gd.implementationList.entity.GdImplementationListEntity;
import org.sxkj.gd.implementationList.vo.GdImplementationListVO;
import org.sxkj.gd.implementation.entity.GdImplementationListEntity;
import org.sxkj.gd.implementation.vo.GdImplementationListVO;
import java.util.Objects;

/**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/GdClueEventController.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/clueEvent/controller/GdClueEventController.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.clueEvent.controller;
package org.sxkj.gd.workOrder.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,11 +31,11 @@
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.clueEvent.entity.GdClueEventEntity;
import org.sxkj.gd.clueEvent.vo.GdClueEventVO;
import org.sxkj.gd.clueEvent.excel.GdClueEventExcel;
import org.sxkj.gd.clueEvent.wrapper.GdClueEventWrapper;
import org.sxkj.gd.clueEvent.service.IGdClueEventService;
import org.sxkj.gd.workOrder.entity.GdClueEventEntity;
import org.sxkj.gd.workOrder.vo.GdClueEventVO;
import org.sxkj.gd.workOrder.excel.GdClueEventExcel;
import org.sxkj.gd.workOrder.wrapper.GdClueEventWrapper;
import org.sxkj.gd.workOrder.service.IGdClueEventService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -53,7 +53,7 @@
 */
@RestController
@AllArgsConstructor
@RequestMapping("clueEvent/gdClueEvent")
@RequestMapping("workOrder/gdClueEvent")
@Api(value = "事件表（线索事件）", tags = "事件表（线索事件）接口")
public class GdClueEventController extends BladeController {


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/GdPatrolTaskController.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/patrolTask/controller/GdPatrolTaskController.java
@@ -14,9 +14,8 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.patrolTask.controller;
package org.sxkj.gd.workOrder.controller;

import com.github.xiaoymin.knife4j.annotations.Ignore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -32,11 +31,11 @@
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.patrolTask.entity.GdPatrolTaskEntity;
import org.sxkj.gd.patrolTask.vo.GdPatrolTaskVO;
import org.sxkj.gd.patrolTask.excel.GdPatrolTaskExcel;
import org.sxkj.gd.patrolTask.wrapper.GdPatrolTaskWrapper;
import org.sxkj.gd.patrolTask.service.IGdPatrolTaskService;
import org.sxkj.gd.workOrder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workOrder.vo.GdPatrolTaskVO;
import org.sxkj.gd.workOrder.excel.GdPatrolTaskExcel;
import org.sxkj.gd.workOrder.wrapper.GdPatrolTaskWrapper;
import org.sxkj.gd.workOrder.service.IGdPatrolTaskService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -54,7 +53,7 @@
 */
@RestController
@AllArgsConstructor
@RequestMapping("gdPatrolTask/gdPatrolTask")
@RequestMapping("workOrder/gdPatrolTask")
@Api(value = "巡查任务表", tags = "巡查任务表接口")
public class GdPatrolTaskController extends BladeController {

@@ -73,13 +72,13 @@
    /**
     * 巡查任务表 分页
     */
    // @GetMapping("/list")
    // @ApiOperationSupport(order = 2)
    // @ApiOperation(value = "分页", notes = "传入gdPatrolTask")
    // public R<IPage<GdPatrolTaskVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdPatrolTask, Query query) {
    //     IPage<GdPatrolTaskEntity> pages = gdPatrolTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(gdPatrolTask, GdPatrolTaskEntity.class));
    //     return R.data(GdPatrolTaskWrapper.build().pageVO(pages));
    // }
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入gdPatrolTask")
    public R<IPage<GdPatrolTaskVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdPatrolTask, Query query) {
        IPage<GdPatrolTaskEntity> pages = gdPatrolTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(gdPatrolTask, GdPatrolTaskEntity.class));
        return R.data(GdPatrolTaskWrapper.build().pageVO(pages));
    }

    /**
     * 巡查任务表 自定义分页
@@ -95,22 +94,22 @@
    /**
     * 巡查任务表 新增
     */
    // @PostMapping("/save")
    // @ApiOperationSupport(order = 4)
    // @ApiOperation(value = "新增", notes = "传入gdPatrolTask")
    // public R save(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
    //     return R.status(gdPatrolTaskService.save(gdPatrolTask));
    // }
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入gdPatrolTask")
    public R save(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
        return R.status(gdPatrolTaskService.save(gdPatrolTask));
    }

    /**
     * 巡查任务表 修改
     */
    // @PostMapping("/update")
    // @ApiOperationSupport(order = 5)
    // @ApiOperation(value = "修改", notes = "传入gdPatrolTask")
    // public R update(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
    //     return R.status(gdPatrolTaskService.updateById(gdPatrolTask));
    // }
    @PostMapping("/update")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入gdPatrolTask")
    public R update(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
        return R.status(gdPatrolTaskService.updateById(gdPatrolTask));
    }

    /**
     * 巡查任务表 新增或修改
@@ -138,7 +137,6 @@
     */
    @GetMapping("/export-gdPatrolTask")
    @ApiOperationSupport(order = 9)
    @Ignore
    @ApiOperation(value = "导出数据", notes = "传入gdPatrolTask")
    public void exportGdPatrolTask(@ApiIgnore @RequestParam Map<String, Object> gdPatrolTask, BladeUser bladeUser, HttpServletResponse response) {
        QueryWrapper<GdPatrolTaskEntity> queryWrapper = Condition.getQueryWrapper(gdPatrolTask, GdPatrolTaskEntity.class);

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/GdTaskResultController.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/taskResult/controller/GdTaskResultController.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.taskResult.controller;
package org.sxkj.gd.workOrder.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,11 +31,11 @@
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.taskResult.entity.GdTaskResultEntity;
import org.sxkj.gd.taskResult.vo.GdTaskResultVO;
import org.sxkj.gd.taskResult.excel.GdTaskResultExcel;
import org.sxkj.gd.taskResult.wrapper.GdTaskResultWrapper;
import org.sxkj.gd.taskResult.service.IGdTaskResultService;
import org.sxkj.gd.workOrder.entity.GdTaskResultEntity;
import org.sxkj.gd.workOrder.vo.GdTaskResultVO;
import org.sxkj.gd.workOrder.excel.GdTaskResultExcel;
import org.sxkj.gd.workOrder.wrapper.GdTaskResultWrapper;
import org.sxkj.gd.workOrder.service.IGdTaskResultService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -53,7 +53,7 @@
 */
@RestController
@AllArgsConstructor
@RequestMapping("taskResult/gdTaskResult")
@RequestMapping("workOrder/gdTaskResult")
@Api(value = "成果表", tags = "成果表接口")
public class GdTaskResultController extends BladeController {


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/GdWorkOrderController.java

@@ -16,7 +16,6 @@
 */
package org.sxkj.gd.workOrder.controller;

import com.github.xiaoymin.knife4j.annotations.Ignore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -54,7 +53,7 @@
 */
@RestController
@AllArgsConstructor
@RequestMapping("gdWorkOrder/gdWorkOrder")
@RequestMapping("workOrder/gdWorkOrder")
@Api(value = "工单任务表", tags = "工单任务表接口")
public class GdWorkOrderController extends BladeController {

@@ -73,13 +72,13 @@
    /**
     * 工单任务表 分页
     */
    // @GetMapping("/list")
    // @ApiOperationSupport(order = 2)
    // @ApiOperation(value = "分页", notes = "传入gdWorkOrder")
    // public R<IPage<GdWorkOrderVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrder, Query query) {
    //     IPage<GdWorkOrderEntity> pages = gdWorkOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(gdWorkOrder, GdWorkOrderEntity.class));
    //     return R.data(GdWorkOrderWrapper.build().pageVO(pages));
    // }
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入gdWorkOrder")
    public R<IPage<GdWorkOrderVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrder, Query query) {
        IPage<GdWorkOrderEntity> pages = gdWorkOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(gdWorkOrder, GdWorkOrderEntity.class));
        return R.data(GdWorkOrderWrapper.build().pageVO(pages));
    }

    /**
     * 工单任务表 自定义分页
@@ -95,22 +94,22 @@
    /**
     * 工单任务表 新增
     */
    // @PostMapping("/save")
    // @ApiOperationSupport(order = 4)
    // @ApiOperation(value = "新增", notes = "传入gdWorkOrder")
    // public R save(@Valid @RequestBody GdWorkOrderEntity gdWorkOrder) {
    //     return R.status(gdWorkOrderService.save(gdWorkOrder));
    // }
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入gdWorkOrder")
    public R save(@Valid @RequestBody GdWorkOrderEntity gdWorkOrder) {
        return R.status(gdWorkOrderService.save(gdWorkOrder));
    }

    /**
     * 工单任务表 修改
     */
    // @PostMapping("/update")
    // @ApiOperationSupport(order = 5)
    // @ApiOperation(value = "修改", notes = "传入gdWorkOrder")
    // public R update(@Valid @RequestBody GdWorkOrderEntity gdWorkOrder) {
    //     return R.status(gdWorkOrderService.updateById(gdWorkOrder));
    // }
    @PostMapping("/update")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入gdWorkOrder")
    public R update(@Valid @RequestBody GdWorkOrderEntity gdWorkOrder) {
        return R.status(gdWorkOrderService.updateById(gdWorkOrder));
    }

    /**
     * 工单任务表 新增或修改
@@ -138,7 +137,6 @@
     */
    @GetMapping("/export-gdWorkOrder")
    @ApiOperationSupport(order = 9)
    @ApiIgnore
    @ApiOperation(value = "导出数据", notes = "传入gdWorkOrder")
    public void exportGdWorkOrder(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrder, BladeUser bladeUser, HttpServletResponse response) {
        QueryWrapper<GdWorkOrderEntity> queryWrapper = Condition.getQueryWrapper(gdWorkOrder, GdWorkOrderEntity.class);

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/GdWorkOrderFlowController.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrderFlow/controller/GdWorkOrderFlowController.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.workOrderFlow.controller;
package org.sxkj.gd.workOrder.controller;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,11 +31,11 @@
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.workOrderFlow.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workOrderFlow.vo.GdWorkOrderFlowVO;
import org.sxkj.gd.workOrderFlow.excel.GdWorkOrderFlowExcel;
import org.sxkj.gd.workOrderFlow.wrapper.GdWorkOrderFlowWrapper;
import org.sxkj.gd.workOrderFlow.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workOrder.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workOrder.vo.GdWorkOrderFlowVO;
import org.sxkj.gd.workOrder.excel.GdWorkOrderFlowExcel;
import org.sxkj.gd.workOrder.wrapper.GdWorkOrderFlowWrapper;
import org.sxkj.gd.workOrder.service.IGdWorkOrderFlowService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -53,7 +53,7 @@
 */
@RestController
@AllArgsConstructor
@RequestMapping("gdWorkOrderFlow/gdWorkOrderFlow")
@RequestMapping("workOrder/gdWorkOrderFlow")
@Api(value = "流程记录表", tags = "流程记录表接口")
public class GdWorkOrderFlowController extends BladeController {


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/dto/GdClueEventDTO.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/clueEvent/dto/GdClueEventDTO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.clueEvent.dto;
package org.sxkj.gd.workOrder.dto;

import org.sxkj.gd.clueEvent.entity.GdClueEventEntity;
import org.sxkj.gd.workOrder.entity.GdClueEventEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/dto/GdPatrolTaskDTO.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/patrolTask/dto/GdPatrolTaskDTO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.patrolTask.dto;
package org.sxkj.gd.workOrder.dto;

import org.sxkj.gd.patrolTask.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workOrder.entity.GdPatrolTaskEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/dto/GdTaskResultDTO.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/taskResult/dto/GdTaskResultDTO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.taskResult.dto;
package org.sxkj.gd.workOrder.dto;

import org.sxkj.gd.taskResult.entity.GdTaskResultEntity;
import org.sxkj.gd.workOrder.entity.GdTaskResultEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/dto/GdWorkOrderFlowDTO.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrderFlow/dto/GdWorkOrderFlowDTO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.workOrderFlow.dto;
package org.sxkj.gd.workOrder.dto;

import org.sxkj.gd.workOrderFlow.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workOrder.entity.GdWorkOrderFlowEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/entity/GdClueEventEntity.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/clueEvent/entity/GdClueEventEntity.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.clueEvent.entity;
package org.sxkj.gd.workOrder.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -22,6 +22,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;

import java.util.Date;


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/entity/GdPatrolTaskEntity.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/patrolTask/entity/GdPatrolTaskEntity.java
@@ -14,16 +14,16 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.patrolTask.entity;
package org.sxkj.gd.workOrder.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;

import java.util.Date;

/**
 * 巡查任务表 实体类

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/entity/GdTaskResultEntity.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/taskResult/entity/GdTaskResultEntity.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.taskResult.entity;
package org.sxkj.gd.workOrder.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/entity/GdWorkOrderEntity.java

@@ -17,13 +17,13 @@
package org.sxkj.gd.workOrder.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;

import java.util.Date;

/**
 * 工单任务表 实体类

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/entity/GdWorkOrderFlowEntity.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrderFlow/entity/GdWorkOrderFlowEntity.java
@@ -14,15 +14,14 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.workOrderFlow.entity;
package org.sxkj.gd.workOrder.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.tenant.mp.TenantEntity;

/**
 * 流程记录表 实体类

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/excel/GdClueEventExcel.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/clueEvent/excel/GdClueEventExcel.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.clueEvent.excel;
package org.sxkj.gd.workOrder.excel;


import com.alibaba.excel.annotation.ExcelProperty;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/excel/GdPatrolTaskExcel.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/patrolTask/excel/GdPatrolTaskExcel.java
@@ -14,17 +14,17 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.patrolTask.excel;
package org.sxkj.gd.workOrder.excel;


import lombok.Data;

import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/excel/GdTaskResultExcel.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/taskResult/excel/GdTaskResultExcel.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.taskResult.excel;
package org.sxkj.gd.workOrder.excel;


import com.alibaba.excel.annotation.ExcelProperty;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/excel/GdWorkOrderExcel.java

@@ -17,14 +17,14 @@
package org.sxkj.gd.workOrder.excel;


import lombok.Data;

import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/excel/GdWorkOrderFlowExcel.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrderFlow/excel/GdWorkOrderFlowExcel.java
@@ -14,15 +14,15 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.workOrderFlow.excel;
package org.sxkj.gd.workOrder.excel;


import lombok.Data;

import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;

import java.io.Serializable;



 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/mapper/GdClueEventMapper.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/clueEvent/mapper/GdClueEventMapper.java
@@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.clueEvent.mapper;
package org.sxkj.gd.workOrder.mapper;

import org.sxkj.gd.clueEvent.entity.GdClueEventEntity;
import org.sxkj.gd.clueEvent.vo.GdClueEventVO;
import org.sxkj.gd.clueEvent.excel.GdClueEventExcel;
import org.sxkj.gd.workOrder.entity.GdClueEventEntity;
import org.sxkj.gd.workOrder.vo.GdClueEventVO;
import org.sxkj.gd.workOrder.excel.GdClueEventExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/mapper/GdClueEventMapper.xml

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/clueEvent/mapper/GdClueEventMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.sxkj.gd.clueEvent.mapper.GdClueEventMapper">
<mapper namespace="org.sxkj.gd.workOrder.mapper.GdClueEventMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="gdClueEventResultMap" type="org.sxkj.gd.clueEvent.entity.GdClueEventEntity">
    <resultMap id="gdClueEventResultMap" type="org.sxkj.gd.workOrder.entity.GdClueEventEntity">
        <result column="id" property="id"/>
        <result column="result_id" property="resultId"/>
        <result column="work_order_id" property="workOrderId"/>
@@ -30,7 +30,7 @@
    </select>


    <select id="exportGdClueEvent" resultType="org.sxkj.gd.clueEvent.excel.GdClueEventExcel">
    <select id="exportGdClueEvent" resultType="org.sxkj.gd.workOrder.excel.GdClueEventExcel">
        SELECT * FROM ja_gd_clue_event ${ew.customSqlSegment}
    </select>


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/mapper/GdPatrolTaskMapper.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/patrolTask/mapper/GdPatrolTaskMapper.java
@@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.patrolTask.mapper;
package org.sxkj.gd.workOrder.mapper;

import org.sxkj.gd.patrolTask.entity.GdPatrolTaskEntity;
import org.sxkj.gd.patrolTask.vo.GdPatrolTaskVO;
import org.sxkj.gd.patrolTask.excel.GdPatrolTaskExcel;
import org.sxkj.gd.workOrder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workOrder.vo.GdPatrolTaskVO;
import org.sxkj.gd.workOrder.excel.GdPatrolTaskExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/mapper/GdPatrolTaskMapper.xml

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/patrolTask/mapper/GdPatrolTaskMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.sxkj.gd.patrolTask.mapper.GdPatrolTaskMapper">
<mapper namespace="org.sxkj.gd.workOrder.mapper.GdPatrolTaskMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="gdPatrolTaskResultMap" type="org.sxkj.gd.patrolTask.entity.GdPatrolTaskEntity">
    <resultMap id="gdPatrolTaskResultMap" type="org.sxkj.gd.workOrder.entity.GdPatrolTaskEntity">
        <result column="id" property="id"/>
        <result column="work_order_id" property="workOrderId"/>
        <result column="patrol_task_name" property="patrolTaskName"/>
@@ -30,7 +30,7 @@
    </select>


    <select id="exportGdPatrolTask" resultType="org.sxkj.gd.patrolTask.excel.GdPatrolTaskExcel">
    <select id="exportGdPatrolTask" resultType="org.sxkj.gd.workOrder.excel.GdPatrolTaskExcel">
        SELECT * FROM ja_gd_patrol_task ${ew.customSqlSegment}
    </select>


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/mapper/GdTaskResultMapper.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/taskResult/mapper/GdTaskResultMapper.java
@@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.taskResult.mapper;
package org.sxkj.gd.workOrder.mapper;

import org.sxkj.gd.taskResult.entity.GdTaskResultEntity;
import org.sxkj.gd.taskResult.vo.GdTaskResultVO;
import org.sxkj.gd.taskResult.excel.GdTaskResultExcel;
import org.sxkj.gd.workOrder.entity.GdTaskResultEntity;
import org.sxkj.gd.workOrder.vo.GdTaskResultVO;
import org.sxkj.gd.workOrder.excel.GdTaskResultExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/mapper/GdTaskResultMapper.xml

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/taskResult/mapper/GdTaskResultMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.sxkj.gd.taskResult.mapper.GdTaskResultMapper">
<mapper namespace="org.sxkj.gd.workOrder.mapper.GdTaskResultMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="gdTaskResultResultMap" type="org.sxkj.gd.taskResult.entity.GdTaskResultEntity">
    <resultMap id="gdTaskResultResultMap" type="org.sxkj.gd.workOrder.entity.GdTaskResultEntity">
        <result column="id" property="id"/>
        <result column="patrol_task_id" property="patrolTaskId"/>
        <result column="result_code" property="resultCode"/>
@@ -28,7 +28,7 @@
    </select>


    <select id="exportGdTaskResult" resultType="org.sxkj.gd.taskResult.excel.GdTaskResultExcel">
    <select id="exportGdTaskResult" resultType="org.sxkj.gd.workOrder.excel.GdTaskResultExcel">
        SELECT * FROM ja_gd_task_result ${ew.customSqlSegment}
    </select>


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/mapper/GdWorkOrderFlowMapper.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrderFlow/mapper/GdWorkOrderFlowMapper.java
@@ -14,11 +14,11 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.workOrderFlow.mapper;
package org.sxkj.gd.workOrder.mapper;

import org.sxkj.gd.workOrderFlow.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workOrderFlow.vo.GdWorkOrderFlowVO;
import org.sxkj.gd.workOrderFlow.excel.GdWorkOrderFlowExcel;
import org.sxkj.gd.workOrder.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workOrder.vo.GdWorkOrderFlowVO;
import org.sxkj.gd.workOrder.excel.GdWorkOrderFlowExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/mapper/GdWorkOrderFlowMapper.xml

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrderFlow/mapper/GdWorkOrderFlowMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.sxkj.gd.workOrderFlow.mapper.GdWorkOrderFlowMapper">
<mapper namespace="org.sxkj.gd.workOrder.mapper.GdWorkOrderFlowMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="gdWorkOrderFlowResultMap" type="org.sxkj.gd.workOrderFlow.entity.GdWorkOrderFlowEntity">
    <resultMap id="gdWorkOrderFlowResultMap" type="org.sxkj.gd.workOrder.entity.GdWorkOrderFlowEntity">
        <result column="id" property="id"/>
        <result column="flow_name" property="flowName"/>
        <result column="flow_desc" property="flowDesc"/>
@@ -26,7 +26,7 @@
    </select>


    <select id="exportGdWorkOrderFlow" resultType="org.sxkj.gd.workOrderFlow.excel.GdWorkOrderFlowExcel">
    <select id="exportGdWorkOrderFlow" resultType="org.sxkj.gd.workOrder.excel.GdWorkOrderFlowExcel">
        SELECT * FROM ja_gd_work_order_flow ${ew.customSqlSegment}
    </select>


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/service/IGdClueEventService.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/clueEvent/service/IGdClueEventService.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.clueEvent.service;
package org.sxkj.gd.workOrder.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.gd.clueEvent.entity.GdClueEventEntity;
import org.sxkj.gd.clueEvent.vo.GdClueEventVO;
import org.sxkj.gd.clueEvent.excel.GdClueEventExcel;
import org.sxkj.gd.workOrder.entity.GdClueEventEntity;
import org.sxkj.gd.workOrder.vo.GdClueEventVO;
import org.sxkj.gd.workOrder.excel.GdClueEventExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/service/IGdPatrolTaskService.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/patrolTask/service/IGdPatrolTaskService.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.patrolTask.service;
package org.sxkj.gd.workOrder.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.gd.patrolTask.entity.GdPatrolTaskEntity;
import org.sxkj.gd.patrolTask.vo.GdPatrolTaskVO;
import org.sxkj.gd.patrolTask.excel.GdPatrolTaskExcel;
import org.sxkj.gd.workOrder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workOrder.vo.GdPatrolTaskVO;
import org.sxkj.gd.workOrder.excel.GdPatrolTaskExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/service/IGdTaskResultService.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/taskResult/service/IGdTaskResultService.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.taskResult.service;
package org.sxkj.gd.workOrder.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.gd.taskResult.entity.GdTaskResultEntity;
import org.sxkj.gd.taskResult.vo.GdTaskResultVO;
import org.sxkj.gd.taskResult.excel.GdTaskResultExcel;
import org.sxkj.gd.workOrder.entity.GdTaskResultEntity;
import org.sxkj.gd.workOrder.vo.GdTaskResultVO;
import org.sxkj.gd.workOrder.excel.GdTaskResultExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/service/IGdWorkOrderFlowService.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrderFlow/service/IGdWorkOrderFlowService.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.workOrderFlow.service;
package org.sxkj.gd.workOrder.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.gd.workOrderFlow.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workOrderFlow.vo.GdWorkOrderFlowVO;
import org.sxkj.gd.workOrderFlow.excel.GdWorkOrderFlowExcel;
import org.sxkj.gd.workOrder.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workOrder.vo.GdWorkOrderFlowVO;
import org.sxkj.gd.workOrder.excel.GdWorkOrderFlowExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/service/impl/GdClueEventServiceImpl.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/clueEvent/service/impl/GdClueEventServiceImpl.java
@@ -14,13 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.clueEvent.service.impl;
package org.sxkj.gd.workOrder.service.impl;

import org.sxkj.gd.clueEvent.entity.GdClueEventEntity;
import org.sxkj.gd.clueEvent.vo.GdClueEventVO;
import org.sxkj.gd.clueEvent.excel.GdClueEventExcel;
import org.sxkj.gd.clueEvent.mapper.GdClueEventMapper;
import org.sxkj.gd.clueEvent.service.IGdClueEventService;
import org.sxkj.gd.workOrder.entity.GdClueEventEntity;
import org.sxkj.gd.workOrder.vo.GdClueEventVO;
import org.sxkj.gd.workOrder.excel.GdClueEventExcel;
import org.sxkj.gd.workOrder.mapper.GdClueEventMapper;
import org.sxkj.gd.workOrder.service.IGdClueEventService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/service/impl/GdPatrolTaskServiceImpl.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/patrolTask/service/impl/GdPatrolTaskServiceImpl.java
@@ -14,13 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.patrolTask.service.impl;
package org.sxkj.gd.workOrder.service.impl;

import org.sxkj.gd.patrolTask.entity.GdPatrolTaskEntity;
import org.sxkj.gd.patrolTask.vo.GdPatrolTaskVO;
import org.sxkj.gd.patrolTask.excel.GdPatrolTaskExcel;
import org.sxkj.gd.patrolTask.mapper.GdPatrolTaskMapper;
import org.sxkj.gd.patrolTask.service.IGdPatrolTaskService;
import org.sxkj.gd.workOrder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workOrder.vo.GdPatrolTaskVO;
import org.sxkj.gd.workOrder.excel.GdPatrolTaskExcel;
import org.sxkj.gd.workOrder.mapper.GdPatrolTaskMapper;
import org.sxkj.gd.workOrder.service.IGdPatrolTaskService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/service/impl/GdTaskResultServiceImpl.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/taskResult/service/impl/GdTaskResultServiceImpl.java
@@ -14,13 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.taskResult.service.impl;
package org.sxkj.gd.workOrder.service.impl;

import org.sxkj.gd.taskResult.entity.GdTaskResultEntity;
import org.sxkj.gd.taskResult.vo.GdTaskResultVO;
import org.sxkj.gd.taskResult.excel.GdTaskResultExcel;
import org.sxkj.gd.taskResult.mapper.GdTaskResultMapper;
import org.sxkj.gd.taskResult.service.IGdTaskResultService;
import org.sxkj.gd.workOrder.entity.GdTaskResultEntity;
import org.sxkj.gd.workOrder.vo.GdTaskResultVO;
import org.sxkj.gd.workOrder.excel.GdTaskResultExcel;
import org.sxkj.gd.workOrder.mapper.GdTaskResultMapper;
import org.sxkj.gd.workOrder.service.IGdTaskResultService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/service/impl/GdWorkOrderFlowServiceImpl.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrderFlow/service/impl/GdWorkOrderFlowServiceImpl.java
@@ -14,13 +14,13 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.workOrderFlow.service.impl;
package org.sxkj.gd.workOrder.service.impl;

import org.sxkj.gd.workOrderFlow.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workOrderFlow.vo.GdWorkOrderFlowVO;
import org.sxkj.gd.workOrderFlow.excel.GdWorkOrderFlowExcel;
import org.sxkj.gd.workOrderFlow.mapper.GdWorkOrderFlowMapper;
import org.sxkj.gd.workOrderFlow.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workOrder.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workOrder.vo.GdWorkOrderFlowVO;
import org.sxkj.gd.workOrder.excel.GdWorkOrderFlowExcel;
import org.sxkj.gd.workOrder.mapper.GdWorkOrderFlowMapper;
import org.sxkj.gd.workOrder.service.IGdWorkOrderFlowService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/vo/GdClueEventVO.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/clueEvent/vo/GdClueEventVO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.clueEvent.vo;
package org.sxkj.gd.workOrder.vo;

import org.sxkj.gd.clueEvent.entity.GdClueEventEntity;
import org.sxkj.gd.workOrder.entity.GdClueEventEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/vo/GdPatrolTaskVO.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/patrolTask/vo/GdPatrolTaskVO.java
@@ -14,9 +14,10 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.patrolTask.vo;
package org.sxkj.gd.workOrder.vo;

import org.sxkj.gd.patrolTask.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workOrder.entity.GdPatrolTaskEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/vo/GdTaskResultVO.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/taskResult/vo/GdTaskResultVO.java
@@ -14,9 +14,9 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.taskResult.vo;
package org.sxkj.gd.workOrder.vo;

import org.sxkj.gd.taskResult.entity.GdTaskResultEntity;
import org.sxkj.gd.workOrder.entity.GdTaskResultEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/vo/GdWorkOrderFlowVO.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrderFlow/vo/GdWorkOrderFlowVO.java
@@ -14,9 +14,10 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.workOrderFlow.vo;
package org.sxkj.gd.workOrder.vo;

import org.sxkj.gd.workOrderFlow.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workOrder.entity.GdWorkOrderFlowEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/vo/GdWorkOrderVO.java

@@ -17,6 +17,7 @@
package org.sxkj.gd.workOrder.vo;

import org.sxkj.gd.workOrder.entity.GdWorkOrderEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/wrapper/GdClueEventWrapper.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/clueEvent/wrapper/GdClueEventWrapper.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.clueEvent.wrapper;
package org.sxkj.gd.workOrder.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.sxkj.gd.clueEvent.entity.GdClueEventEntity;
import org.sxkj.gd.clueEvent.vo.GdClueEventVO;
import org.sxkj.gd.workOrder.entity.GdClueEventEntity;
import org.sxkj.gd.workOrder.vo.GdClueEventVO;
import java.util.Objects;

/**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/wrapper/GdPatrolTaskWrapper.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/patrolTask/wrapper/GdPatrolTaskWrapper.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.patrolTask.wrapper;
package org.sxkj.gd.workOrder.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.sxkj.gd.patrolTask.entity.GdPatrolTaskEntity;
import org.sxkj.gd.patrolTask.vo.GdPatrolTaskVO;
import org.sxkj.gd.workOrder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workOrder.vo.GdPatrolTaskVO;
import java.util.Objects;

/**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/wrapper/GdTaskResultWrapper.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/taskResult/wrapper/GdTaskResultWrapper.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.taskResult.wrapper;
package org.sxkj.gd.workOrder.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.sxkj.gd.taskResult.entity.GdTaskResultEntity;
import org.sxkj.gd.taskResult.vo.GdTaskResultVO;
import org.sxkj.gd.workOrder.entity.GdTaskResultEntity;
import org.sxkj.gd.workOrder.vo.GdTaskResultVO;
import java.util.Objects;

/**

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/wrapper/GdWorkOrderFlowWrapper.java

File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrderFlow/wrapper/GdWorkOrderFlowWrapper.java
@@ -14,12 +14,12 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.workOrderFlow.wrapper;
package org.sxkj.gd.workOrder.wrapper;

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.sxkj.gd.workOrderFlow.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workOrderFlow.vo.GdWorkOrderFlowVO;
import org.sxkj.gd.workOrder.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workOrder.vo.GdWorkOrderFlowVO;
import java.util.Objects;

/**