fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TblFacilitiesController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.TblFacilities;
+import com.ruoyi.system.service.ITblFacilitiesService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 设施Controller
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+@RestController
+@RequestMapping("/system/facilities")
+public class TblFacilitiesController extends BaseController
+{
+    @Autowired
+    private ITblFacilitiesService tblFacilitiesService;
+
+    /**
+     * 查询设施列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:facilities:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TblFacilities tblFacilities)
+    {
+        startPage();
+        List<TblFacilities> list = tblFacilitiesService.selectTblFacilitiesList(tblFacilities);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设施列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:facilities:export')")
+    @Log(title = "设施", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TblFacilities tblFacilities)
+    {
+        List<TblFacilities> list = tblFacilitiesService.selectTblFacilitiesList(tblFacilities);
+        ExcelUtil<TblFacilities> util = new ExcelUtil<TblFacilities>(TblFacilities.class);
+        util.exportExcel(response, list, "设施数据");
+    }
+
+    /**
+     * 获取设施详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:facilities:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tblFacilitiesService.selectTblFacilitiesById(id));
+    }
+
+    /**
+     * 新增设施
+     */
+    @PreAuthorize("@ss.hasPermi('system:facilities:add')")
+    @Log(title = "设施", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TblFacilities tblFacilities)
+    {
+        return toAjax(tblFacilitiesService.insertTblFacilities(tblFacilities));
+    }
+
+    /**
+     * 修改设施
+     */
+    @PreAuthorize("@ss.hasPermi('system:facilities:edit')")
+    @Log(title = "设施", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TblFacilities tblFacilities)
+    {
+        return toAjax(tblFacilitiesService.updateTblFacilities(tblFacilities));
+    }
+
+    /**
+     * 删除设施
+     */
+    @PreAuthorize("@ss.hasPermi('system:facilities:remove')")
+    @Log(title = "设施", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tblFacilitiesService.deleteTblFacilitiesByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TblTaskController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.TblTask;
+import com.ruoyi.system.service.ITblTaskService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 工单任务Controller
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+@RestController
+@RequestMapping("/system/task")
+public class TblTaskController extends BaseController
+{
+    @Autowired
+    private ITblTaskService tblTaskService;
+
+    /**
+     * 查询工单任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:task:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TblTask tblTask)
+    {
+        startPage();
+        List<TblTask> list = tblTaskService.selectTblTaskList(tblTask);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出工单任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:task:export')")
+    @Log(title = "工单任务", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TblTask tblTask)
+    {
+        List<TblTask> list = tblTaskService.selectTblTaskList(tblTask);
+        ExcelUtil<TblTask> util = new ExcelUtil<TblTask>(TblTask.class);
+        util.exportExcel(response, list, "工单任务数据");
+    }
+
+    /**
+     * 获取工单任务详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:task:query')")
+    @GetMapping(value = "/{taskId}")
+    public AjaxResult getInfo(@PathVariable("taskId") Long taskId)
+    {
+        return AjaxResult.success(tblTaskService.selectTblTaskByTaskId(taskId));
+    }
+
+    /**
+     * 新增工单任务
+     */
+    @PreAuthorize("@ss.hasPermi('system:task:add')")
+    @Log(title = "工单任务", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TblTask tblTask)
+    {
+        return toAjax(tblTaskService.insertTblTask(tblTask));
+    }
+
+    /**
+     * 修改工单任务
+     */
+    @PreAuthorize("@ss.hasPermi('system:task:edit')")
+    @Log(title = "工单任务", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TblTask tblTask)
+    {
+        return toAjax(tblTaskService.updateTblTask(tblTask));
+    }
+
+    /**
+     * 删除工单任务
+     */
+    @PreAuthorize("@ss.hasPermi('system:task:remove')")
+    @Log(title = "工单任务", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{taskIds}")
+    public AjaxResult remove(@PathVariable Long[] taskIds)
+    {
+        return toAjax(tblTaskService.deleteTblTaskByTaskIds(taskIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TblTaskLogController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.TblTaskLog;
+import com.ruoyi.system.service.ITblTaskLogService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】Controller
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+@RestController
+@RequestMapping("/system/log")
+public class TblTaskLogController extends BaseController
+{
+    @Autowired
+    private ITblTaskLogService tblTaskLogService;
+
+    /**
+     * 查询任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:log:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TblTaskLog tblTaskLog)
+    {
+        startPage();
+        List<TblTaskLog> list = tblTaskLogService.selectTblTaskLogList(tblTaskLog);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:log:export')")
+    @Log(title = "任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TblTaskLog tblTaskLog)
+    {
+        List<TblTaskLog> list = tblTaskLogService.selectTblTaskLogList(tblTaskLog);
+        ExcelUtil<TblTaskLog> util = new ExcelUtil<TblTaskLog>(TblTaskLog.class);
+        util.exportExcel(response, list, "任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】数据");
+    }
+
+    /**
+     * 获取任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:log:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tblTaskLogService.selectTblTaskLogById(id));
+    }
+
+    /**
+     * 新增任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     */
+    @PreAuthorize("@ss.hasPermi('system:log:add')")
+    @Log(title = "任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TblTaskLog tblTaskLog)
+    {
+        return toAjax(tblTaskLogService.insertTblTaskLog(tblTaskLog));
+    }
+
+    /**
+     * 修改任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     */
+    @PreAuthorize("@ss.hasPermi('system:log:edit')")
+    @Log(title = "任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TblTaskLog tblTaskLog)
+    {
+        return toAjax(tblTaskLogService.updateTblTaskLog(tblTaskLog));
+    }
+
+    /**
+     * 删除任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     */
+    @PreAuthorize("@ss.hasPermi('system:log:remove')")
+    @Log(title = "任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tblTaskLogService.deleteTblTaskLogByIds(ids));
+    }
+}

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://${DATABASE_HOST:xt.wenhq.top}:${DATABASE_PORT:8583}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: ${DATABASE_USER:root}
                 password: ${DATABASE_PWD:root}
             # 从库数据源

ruoyi-admin/src/main/resources/application.yml

@@ -111,7 +111,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping: /
 
 # 防止XSS攻击
 xss: 

ruoyi-system/src/main/java/com/ruoyi/system/domain/TblFacilities.java

@@ -0,0 +1,163 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设施对象 tbl_facilities
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+public class TblFacilities extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Long id;
+
+    /** 区属（资料） */
+    @Excel(name = "区属", readConverterExp = "资=料")
+    private String areaDes;
+
+    /** 行政区属 */
+    @Excel(name = "行政区属")
+    private String areaAdDes;
+
+    /** 扩展序号 */
+    @Excel(name = "扩展序号")
+    private Long exId;
+
+    /** 设施名称 */
+    @Excel(name = "设施名称")
+    private String name;
+
+    /** 路名 */
+    @Excel(name = "路名")
+    private String roadName;
+
+    /** 性质(雨水、污水) */
+    @Excel(name = "性质(雨水、污水)")
+    private String nature;
+
+    /** 设施起点 */
+    @Excel(name = "设施起点")
+    private String addrFrom;
+
+    /** 设施终点 */
+    @Excel(name = "设施终点")
+    private String addrEnd;
+
+    /** 扩展编号1 */
+    @Excel(name = "扩展编号1")
+    private String exId1;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setAreaDes(String areaDes) 
+    {
+        this.areaDes = areaDes;
+    }
+
+    public String getAreaDes() 
+    {
+        return areaDes;
+    }
+    public void setAreaAdDes(String areaAdDes) 
+    {
+        this.areaAdDes = areaAdDes;
+    }
+
+    public String getAreaAdDes() 
+    {
+        return areaAdDes;
+    }
+    public void setExId(Long exId) 
+    {
+        this.exId = exId;
+    }
+
+    public Long getExId() 
+    {
+        return exId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setRoadName(String roadName) 
+    {
+        this.roadName = roadName;
+    }
+
+    public String getRoadName() 
+    {
+        return roadName;
+    }
+    public void setNature(String nature) 
+    {
+        this.nature = nature;
+    }
+
+    public String getNature() 
+    {
+        return nature;
+    }
+    public void setAddrFrom(String addrFrom) 
+    {
+        this.addrFrom = addrFrom;
+    }
+
+    public String getAddrFrom() 
+    {
+        return addrFrom;
+    }
+    public void setAddrEnd(String addrEnd) 
+    {
+        this.addrEnd = addrEnd;
+    }
+
+    public String getAddrEnd() 
+    {
+        return addrEnd;
+    }
+    public void setExId1(String exId1) 
+    {
+        this.exId1 = exId1;
+    }
+
+    public String getExId1() 
+    {
+        return exId1;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("areaDes", getAreaDes())
+            .append("areaAdDes", getAreaAdDes())
+            .append("exId", getExId())
+            .append("name", getName())
+            .append("roadName", getRoadName())
+            .append("nature", getNature())
+            .append("addrFrom", getAddrFrom())
+            .append("addrEnd", getAddrEnd())
+            .append("exId1", getExId1())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/TblTask.java

@@ -0,0 +1,310 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工单任务对象 tbl_task
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+public class TblTask extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 任务编号 */
+    private Long taskId;
+
+    /** 任务名称 */
+    @Excel(name = "任务名称")
+    private String taskName;
+
+    /** 任务内容 */
+    @Excel(name = "任务内容")
+    private String taskContent;
+
+    /** 任务地址 */
+    @Excel(name = "任务地址")
+    private String taskAddr;
+
+    /** 任务经纬度 */
+    @Excel(name = "任务经纬度")
+    private String taskLocation;
+
+    /** 任务编号 */
+    @Excel(name = "任务编号")
+    private String taskCode;
+
+    /** 任务类型 参见字典task_type */
+    @Excel(name = "任务类型 参见字典task_type")
+    private Long taskType;
+
+    /** 任务事件类型 参见字典task_event_type */
+    @Excel(name = "任务事件类型 参见字典task_event_type")
+    private Long taskEventType;
+
+    /** 任务事件类型 参见字典task_event_category */
+    @Excel(name = "任务事件类型 参见字典task_event_category")
+    private Long taskEventCategory;
+
+    /** 任务接收时备注 */
+    @Excel(name = "任务接收时备注")
+    private String taskFromRemark;
+
+    /** 任务发生道路 */
+    @Excel(name = "任务发生道路")
+    private String taskAddrRoad;
+
+    /** 其他工单号 */
+    @Excel(name = "其他工单号")
+    private String taskOtherId;
+
+    /** 任务时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "任务时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date taskTime;
+
+    /** 任务要求完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "任务要求完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date taskReqCompleteTime;
+
+    /** 任务状态 */
+    @Excel(name = "任务状态")
+    private Long status;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String taskCreater;
+
+    /** 上报人 */
+    @Excel(name = "上报人")
+    private String taskReporter;
+
+    /** 图片 */
+    @Excel(name = "图片")
+    private String taskPics;
+
+    /** 视频 */
+    @Excel(name = "视频")
+    private String taskVideos;
+
+    /** 任务投诉人电话 */
+    @Excel(name = "任务投诉人电话")
+    private String taskComplainConnect;
+
+    public void setTaskId(Long taskId) 
+    {
+        this.taskId = taskId;
+    }
+
+    public Long getTaskId() 
+    {
+        return taskId;
+    }
+    public void setTaskName(String taskName) 
+    {
+        this.taskName = taskName;
+    }
+
+    public String getTaskName() 
+    {
+        return taskName;
+    }
+    public void setTaskContent(String taskContent) 
+    {
+        this.taskContent = taskContent;
+    }
+
+    public String getTaskContent() 
+    {
+        return taskContent;
+    }
+    public void setTaskAddr(String taskAddr) 
+    {
+        this.taskAddr = taskAddr;
+    }
+
+    public String getTaskAddr() 
+    {
+        return taskAddr;
+    }
+    public void setTaskLocation(String taskLocation) 
+    {
+        this.taskLocation = taskLocation;
+    }
+
+    public String getTaskLocation() 
+    {
+        return taskLocation;
+    }
+    public void setTaskCode(String taskCode) 
+    {
+        this.taskCode = taskCode;
+    }
+
+    public String getTaskCode() 
+    {
+        return taskCode;
+    }
+    public void setTaskType(Long taskType) 
+    {
+        this.taskType = taskType;
+    }
+
+    public Long getTaskType() 
+    {
+        return taskType;
+    }
+    public void setTaskEventType(Long taskEventType) 
+    {
+        this.taskEventType = taskEventType;
+    }
+
+    public Long getTaskEventType() 
+    {
+        return taskEventType;
+    }
+    public void setTaskEventCategory(Long taskEventCategory) 
+    {
+        this.taskEventCategory = taskEventCategory;
+    }
+
+    public Long getTaskEventCategory() 
+    {
+        return taskEventCategory;
+    }
+    public void setTaskFromRemark(String taskFromRemark) 
+    {
+        this.taskFromRemark = taskFromRemark;
+    }
+
+    public String getTaskFromRemark() 
+    {
+        return taskFromRemark;
+    }
+    public void setTaskAddrRoad(String taskAddrRoad) 
+    {
+        this.taskAddrRoad = taskAddrRoad;
+    }
+
+    public String getTaskAddrRoad() 
+    {
+        return taskAddrRoad;
+    }
+    public void setTaskOtherId(String taskOtherId) 
+    {
+        this.taskOtherId = taskOtherId;
+    }
+
+    public String getTaskOtherId() 
+    {
+        return taskOtherId;
+    }
+    public void setTaskTime(Date taskTime) 
+    {
+        this.taskTime = taskTime;
+    }
+
+    public Date getTaskTime() 
+    {
+        return taskTime;
+    }
+    public void setTaskReqCompleteTime(Date taskReqCompleteTime) 
+    {
+        this.taskReqCompleteTime = taskReqCompleteTime;
+    }
+
+    public Date getTaskReqCompleteTime() 
+    {
+        return taskReqCompleteTime;
+    }
+    public void setStatus(Long status) 
+    {
+        this.status = status;
+    }
+
+    public Long getStatus() 
+    {
+        return status;
+    }
+    public void setTaskCreater(String taskCreater) 
+    {
+        this.taskCreater = taskCreater;
+    }
+
+    public String getTaskCreater() 
+    {
+        return taskCreater;
+    }
+    public void setTaskReporter(String taskReporter) 
+    {
+        this.taskReporter = taskReporter;
+    }
+
+    public String getTaskReporter() 
+    {
+        return taskReporter;
+    }
+    public void setTaskPics(String taskPics) 
+    {
+        this.taskPics = taskPics;
+    }
+
+    public String getTaskPics() 
+    {
+        return taskPics;
+    }
+    public void setTaskVideos(String taskVideos) 
+    {
+        this.taskVideos = taskVideos;
+    }
+
+    public String getTaskVideos() 
+    {
+        return taskVideos;
+    }
+    public void setTaskComplainConnect(String taskComplainConnect) 
+    {
+        this.taskComplainConnect = taskComplainConnect;
+    }
+
+    public String getTaskComplainConnect() 
+    {
+        return taskComplainConnect;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("taskId", getTaskId())
+            .append("taskName", getTaskName())
+            .append("taskContent", getTaskContent())
+            .append("taskAddr", getTaskAddr())
+            .append("taskLocation", getTaskLocation())
+            .append("taskCode", getTaskCode())
+            .append("taskType", getTaskType())
+            .append("taskEventType", getTaskEventType())
+            .append("taskEventCategory", getTaskEventCategory())
+            .append("taskFromRemark", getTaskFromRemark())
+            .append("taskAddrRoad", getTaskAddrRoad())
+            .append("taskOtherId", getTaskOtherId())
+            .append("taskTime", getTaskTime())
+            .append("createTime", getCreateTime())
+            .append("taskReqCompleteTime", getTaskReqCompleteTime())
+            .append("updateTime", getUpdateTime())
+            .append("status", getStatus())
+            .append("taskCreater", getTaskCreater())
+            .append("taskReporter", getTaskReporter())
+            .append("taskPics", getTaskPics())
+            .append("taskVideos", getTaskVideos())
+            .append("taskComplainConnect", getTaskComplainConnect())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/TblTaskLog.java

@@ -0,0 +1,110 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】对象 tbl_task_log
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+public class TblTaskLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 任务编号 */
+    @Excel(name = "任务编号")
+    private Long taskId;
+
+    /** 任务状态 */
+    @Excel(name = "任务状态")
+    private Long taskStatus;
+
+    /** 任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容均以json记录【该数据为内容数据】 */
+    @Excel(name = "任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容均以json记录【该数据为内容数据】")
+    private String logDes;
+
+    /** 日志图片 */
+    @Excel(name = "日志图片")
+    private String logPics;
+
+    /** 日志视频 */
+    @Excel(name = "日志视频")
+    private String logVideos;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setTaskId(Long taskId) 
+    {
+        this.taskId = taskId;
+    }
+
+    public Long getTaskId() 
+    {
+        return taskId;
+    }
+    public void setTaskStatus(Long taskStatus) 
+    {
+        this.taskStatus = taskStatus;
+    }
+
+    public Long getTaskStatus() 
+    {
+        return taskStatus;
+    }
+    public void setLogDes(String logDes) 
+    {
+        this.logDes = logDes;
+    }
+
+    public String getLogDes() 
+    {
+        return logDes;
+    }
+    public void setLogPics(String logPics) 
+    {
+        this.logPics = logPics;
+    }
+
+    public String getLogPics() 
+    {
+        return logPics;
+    }
+    public void setLogVideos(String logVideos) 
+    {
+        this.logVideos = logVideos;
+    }
+
+    public String getLogVideos() 
+    {
+        return logVideos;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("taskId", getTaskId())
+            .append("taskStatus", getTaskStatus())
+            .append("logDes", getLogDes())
+            .append("logPics", getLogPics())
+            .append("logVideos", getLogVideos())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TblFacilitiesMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.TblFacilities;
+
+/**
+ * 设施Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+public interface TblFacilitiesMapper 
+{
+    /**
+     * 查询设施
+     * 
+     * @param id 设施主键
+     * @return 设施
+     */
+    public TblFacilities selectTblFacilitiesById(Long id);
+
+    /**
+     * 查询设施列表
+     * 
+     * @param tblFacilities 设施
+     * @return 设施集合
+     */
+    public List<TblFacilities> selectTblFacilitiesList(TblFacilities tblFacilities);
+
+    /**
+     * 新增设施
+     * 
+     * @param tblFacilities 设施
+     * @return 结果
+     */
+    public int insertTblFacilities(TblFacilities tblFacilities);
+
+    /**
+     * 修改设施
+     * 
+     * @param tblFacilities 设施
+     * @return 结果
+     */
+    public int updateTblFacilities(TblFacilities tblFacilities);
+
+    /**
+     * 删除设施
+     * 
+     * @param id 设施主键
+     * @return 结果
+     */
+    public int deleteTblFacilitiesById(Long id);
+
+    /**
+     * 批量删除设施
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTblFacilitiesByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TblTaskLogMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.TblTaskLog;
+
+/**
+ * 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+public interface TblTaskLogMapper 
+{
+    /**
+     * 查询任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param id 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】主键
+     * @return 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     */
+    public TblTaskLog selectTblTaskLogById(Long id);
+
+    /**
+     * 查询任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】列表
+     * 
+     * @param tblTaskLog 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * @return 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】集合
+     */
+    public List<TblTaskLog> selectTblTaskLogList(TblTaskLog tblTaskLog);
+
+    /**
+     * 新增任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param tblTaskLog 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * @return 结果
+     */
+    public int insertTblTaskLog(TblTaskLog tblTaskLog);
+
+    /**
+     * 修改任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param tblTaskLog 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * @return 结果
+     */
+    public int updateTblTaskLog(TblTaskLog tblTaskLog);
+
+    /**
+     * 删除任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param id 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】主键
+     * @return 结果
+     */
+    public int deleteTblTaskLogById(Long id);
+
+    /**
+     * 批量删除任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTblTaskLogByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TblTaskMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.TblTask;
+
+/**
+ * 工单任务Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+public interface TblTaskMapper 
+{
+    /**
+     * 查询工单任务
+     * 
+     * @param taskId 工单任务主键
+     * @return 工单任务
+     */
+    public TblTask selectTblTaskByTaskId(Long taskId);
+
+    /**
+     * 查询工单任务列表
+     * 
+     * @param tblTask 工单任务
+     * @return 工单任务集合
+     */
+    public List<TblTask> selectTblTaskList(TblTask tblTask);
+
+    /**
+     * 新增工单任务
+     * 
+     * @param tblTask 工单任务
+     * @return 结果
+     */
+    public int insertTblTask(TblTask tblTask);
+
+    /**
+     * 修改工单任务
+     * 
+     * @param tblTask 工单任务
+     * @return 结果
+     */
+    public int updateTblTask(TblTask tblTask);
+
+    /**
+     * 删除工单任务
+     * 
+     * @param taskId 工单任务主键
+     * @return 结果
+     */
+    public int deleteTblTaskByTaskId(Long taskId);
+
+    /**
+     * 批量删除工单任务
+     * 
+     * @param taskIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTblTaskByTaskIds(Long[] taskIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ITblFacilitiesService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.TblFacilities;
+
+/**
+ * 设施Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+public interface ITblFacilitiesService 
+{
+    /**
+     * 查询设施
+     * 
+     * @param id 设施主键
+     * @return 设施
+     */
+    public TblFacilities selectTblFacilitiesById(Long id);
+
+    /**
+     * 查询设施列表
+     * 
+     * @param tblFacilities 设施
+     * @return 设施集合
+     */
+    public List<TblFacilities> selectTblFacilitiesList(TblFacilities tblFacilities);
+
+    /**
+     * 新增设施
+     * 
+     * @param tblFacilities 设施
+     * @return 结果
+     */
+    public int insertTblFacilities(TblFacilities tblFacilities);
+
+    /**
+     * 修改设施
+     * 
+     * @param tblFacilities 设施
+     * @return 结果
+     */
+    public int updateTblFacilities(TblFacilities tblFacilities);
+
+    /**
+     * 批量删除设施
+     * 
+     * @param ids 需要删除的设施主键集合
+     * @return 结果
+     */
+    public int deleteTblFacilitiesByIds(Long[] ids);
+
+    /**
+     * 删除设施信息
+     * 
+     * @param id 设施主键
+     * @return 结果
+     */
+    public int deleteTblFacilitiesById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ITblTaskLogService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.TblTaskLog;
+
+/**
+ * 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+public interface ITblTaskLogService 
+{
+    /**
+     * 查询任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param id 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】主键
+     * @return 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     */
+    public TblTaskLog selectTblTaskLogById(Long id);
+
+    /**
+     * 查询任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】列表
+     * 
+     * @param tblTaskLog 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * @return 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】集合
+     */
+    public List<TblTaskLog> selectTblTaskLogList(TblTaskLog tblTaskLog);
+
+    /**
+     * 新增任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param tblTaskLog 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * @return 结果
+     */
+    public int insertTblTaskLog(TblTaskLog tblTaskLog);
+
+    /**
+     * 修改任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param tblTaskLog 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * @return 结果
+     */
+    public int updateTblTaskLog(TblTaskLog tblTaskLog);
+
+    /**
+     * 批量删除任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param ids 需要删除的任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】主键集合
+     * @return 结果
+     */
+    public int deleteTblTaskLogByIds(Long[] ids);
+
+    /**
+     * 删除任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】信息
+     * 
+     * @param id 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】主键
+     * @return 结果
+     */
+    public int deleteTblTaskLogById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ITblTaskService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.TblTask;
+
+/**
+ * 工单任务Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+public interface ITblTaskService 
+{
+    /**
+     * 查询工单任务
+     * 
+     * @param taskId 工单任务主键
+     * @return 工单任务
+     */
+    public TblTask selectTblTaskByTaskId(Long taskId);
+
+    /**
+     * 查询工单任务列表
+     * 
+     * @param tblTask 工单任务
+     * @return 工单任务集合
+     */
+    public List<TblTask> selectTblTaskList(TblTask tblTask);
+
+    /**
+     * 新增工单任务
+     * 
+     * @param tblTask 工单任务
+     * @return 结果
+     */
+    public int insertTblTask(TblTask tblTask);
+
+    /**
+     * 修改工单任务
+     * 
+     * @param tblTask 工单任务
+     * @return 结果
+     */
+    public int updateTblTask(TblTask tblTask);
+
+    /**
+     * 批量删除工单任务
+     * 
+     * @param taskIds 需要删除的工单任务主键集合
+     * @return 结果
+     */
+    public int deleteTblTaskByTaskIds(Long[] taskIds);
+
+    /**
+     * 删除工单任务信息
+     * 
+     * @param taskId 工单任务主键
+     * @return 结果
+     */
+    public int deleteTblTaskByTaskId(Long taskId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TblFacilitiesServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.TblFacilitiesMapper;
+import com.ruoyi.system.domain.TblFacilities;
+import com.ruoyi.system.service.ITblFacilitiesService;
+
+/**
+ * 设施Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+@Service
+public class TblFacilitiesServiceImpl implements ITblFacilitiesService 
+{
+    @Autowired
+    private TblFacilitiesMapper tblFacilitiesMapper;
+
+    /**
+     * 查询设施
+     * 
+     * @param id 设施主键
+     * @return 设施
+     */
+    @Override
+    public TblFacilities selectTblFacilitiesById(Long id)
+    {
+        return tblFacilitiesMapper.selectTblFacilitiesById(id);
+    }
+
+    /**
+     * 查询设施列表
+     * 
+     * @param tblFacilities 设施
+     * @return 设施
+     */
+    @Override
+    public List<TblFacilities> selectTblFacilitiesList(TblFacilities tblFacilities)
+    {
+        return tblFacilitiesMapper.selectTblFacilitiesList(tblFacilities);
+    }
+
+    /**
+     * 新增设施
+     * 
+     * @param tblFacilities 设施
+     * @return 结果
+     */
+    @Override
+    public int insertTblFacilities(TblFacilities tblFacilities)
+    {
+        return tblFacilitiesMapper.insertTblFacilities(tblFacilities);
+    }
+
+    /**
+     * 修改设施
+     * 
+     * @param tblFacilities 设施
+     * @return 结果
+     */
+    @Override
+    public int updateTblFacilities(TblFacilities tblFacilities)
+    {
+        return tblFacilitiesMapper.updateTblFacilities(tblFacilities);
+    }
+
+    /**
+     * 批量删除设施
+     * 
+     * @param ids 需要删除的设施主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTblFacilitiesByIds(Long[] ids)
+    {
+        return tblFacilitiesMapper.deleteTblFacilitiesByIds(ids);
+    }
+
+    /**
+     * 删除设施信息
+     * 
+     * @param id 设施主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTblFacilitiesById(Long id)
+    {
+        return tblFacilitiesMapper.deleteTblFacilitiesById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TblTaskLogServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.TblTaskLogMapper;
+import com.ruoyi.system.domain.TblTaskLog;
+import com.ruoyi.system.service.ITblTaskLogService;
+
+/**
+ * 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+@Service
+public class TblTaskLogServiceImpl implements ITblTaskLogService 
+{
+    @Autowired
+    private TblTaskLogMapper tblTaskLogMapper;
+
+    /**
+     * 查询任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param id 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】主键
+     * @return 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     */
+    @Override
+    public TblTaskLog selectTblTaskLogById(Long id)
+    {
+        return tblTaskLogMapper.selectTblTaskLogById(id);
+    }
+
+    /**
+     * 查询任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】列表
+     * 
+     * @param tblTaskLog 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * @return 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     */
+    @Override
+    public List<TblTaskLog> selectTblTaskLogList(TblTaskLog tblTaskLog)
+    {
+        return tblTaskLogMapper.selectTblTaskLogList(tblTaskLog);
+    }
+
+    /**
+     * 新增任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param tblTaskLog 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * @return 结果
+     */
+    @Override
+    public int insertTblTaskLog(TblTaskLog tblTaskLog)
+    {
+        tblTaskLog.setCreateTime(DateUtils.getNowDate());
+        return tblTaskLogMapper.insertTblTaskLog(tblTaskLog);
+    }
+
+    /**
+     * 修改任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param tblTaskLog 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * @return 结果
+     */
+    @Override
+    public int updateTblTaskLog(TblTaskLog tblTaskLog)
+    {
+        tblTaskLog.setUpdateTime(DateUtils.getNowDate());
+        return tblTaskLogMapper.updateTblTaskLog(tblTaskLog);
+    }
+
+    /**
+     * 批量删除任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】
+     * 
+     * @param ids 需要删除的任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTblTaskLogByIds(Long[] ids)
+    {
+        return tblTaskLogMapper.deleteTblTaskLogByIds(ids);
+    }
+
+    /**
+     * 删除任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】信息
+     * 
+     * @param id 任务日志【任务日志内容 ,任务派发内容，任务驳回内容，任务跟踪内容，任务处置内容，任务核查内容】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTblTaskLogById(Long id)
+    {
+        return tblTaskLogMapper.deleteTblTaskLogById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TblTaskServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.TblTaskMapper;
+import com.ruoyi.system.domain.TblTask;
+import com.ruoyi.system.service.ITblTaskService;
+
+/**
+ * 工单任务Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-05-25
+ */
+@Service
+public class TblTaskServiceImpl implements ITblTaskService 
+{
+    @Autowired
+    private TblTaskMapper tblTaskMapper;
+
+    /**
+     * 查询工单任务
+     * 
+     * @param taskId 工单任务主键
+     * @return 工单任务
+     */
+    @Override
+    public TblTask selectTblTaskByTaskId(Long taskId)
+    {
+        return tblTaskMapper.selectTblTaskByTaskId(taskId);
+    }
+
+    /**
+     * 查询工单任务列表
+     * 
+     * @param tblTask 工单任务
+     * @return 工单任务
+     */
+    @Override
+    public List<TblTask> selectTblTaskList(TblTask tblTask)
+    {
+        return tblTaskMapper.selectTblTaskList(tblTask);
+    }
+
+    /**
+     * 新增工单任务
+     * 
+     * @param tblTask 工单任务
+     * @return 结果
+     */
+    @Override
+    public int insertTblTask(TblTask tblTask)
+    {
+        tblTask.setCreateTime(DateUtils.getNowDate());
+        return tblTaskMapper.insertTblTask(tblTask);
+    }
+
+    /**
+     * 修改工单任务
+     * 
+     * @param tblTask 工单任务
+     * @return 结果
+     */
+    @Override
+    public int updateTblTask(TblTask tblTask)
+    {
+        tblTask.setUpdateTime(DateUtils.getNowDate());
+        return tblTaskMapper.updateTblTask(tblTask);
+    }
+
+    /**
+     * 批量删除工单任务
+     * 
+     * @param taskIds 需要删除的工单任务主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTblTaskByTaskIds(Long[] taskIds)
+    {
+        return tblTaskMapper.deleteTblTaskByTaskIds(taskIds);
+    }
+
+    /**
+     * 删除工单任务信息
+     * 
+     * @param taskId 工单任务主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTblTaskByTaskId(Long taskId)
+    {
+        return tblTaskMapper.deleteTblTaskByTaskId(taskId);
+    }
+}

ruoyi-system/src/main/resources/mapper/system/TblFacilitiesMapper.xml

@@ -0,0 +1,96 @@
+<?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="com.ruoyi.system.mapper.TblFacilitiesMapper">
+    
+    <resultMap type="TblFacilities" id="TblFacilitiesResult">
+        <result property="id"    column="id"    />
+        <result property="areaDes"    column="area_des"    />
+        <result property="areaAdDes"    column="area_ad_des"    />
+        <result property="exId"    column="ex_id"    />
+        <result property="name"    column="name"    />
+        <result property="roadName"    column="road_name"    />
+        <result property="nature"    column="nature"    />
+        <result property="addrFrom"    column="addr_from"    />
+        <result property="addrEnd"    column="addr_end"    />
+        <result property="exId1"    column="ex_id_1"    />
+    </resultMap>
+
+    <sql id="selectTblFacilitiesVo">
+        select id, area_des, area_ad_des, ex_id, name, road_name, nature, addr_from, addr_end, ex_id_1 from tbl_facilities
+    </sql>
+
+    <select id="selectTblFacilitiesList" parameterType="TblFacilities" resultMap="TblFacilitiesResult">
+        <include refid="selectTblFacilitiesVo"/>
+        <where>  
+            <if test="areaDes != null  and areaDes != ''"> and area_des = #{areaDes}</if>
+            <if test="areaAdDes != null  and areaAdDes != ''"> and area_ad_des = #{areaAdDes}</if>
+            <if test="exId != null "> and ex_id = #{exId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="roadName != null  and roadName != ''"> and road_name like concat('%', #{roadName}, '%')</if>
+            <if test="nature != null  and nature != ''"> and nature = #{nature}</if>
+            <if test="addrFrom != null  and addrFrom != ''"> and addr_from = #{addrFrom}</if>
+            <if test="addrEnd != null  and addrEnd != ''"> and addr_end = #{addrEnd}</if>
+            <if test="exId1 != null  and exId1 != ''"> and ex_id_1 = #{exId1}</if>
+        </where>
+    </select>
+    
+    <select id="selectTblFacilitiesById" parameterType="Long" resultMap="TblFacilitiesResult">
+        <include refid="selectTblFacilitiesVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTblFacilities" parameterType="TblFacilities" useGeneratedKeys="true" keyProperty="id">
+        insert into tbl_facilities
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="areaDes != null">area_des,</if>
+            <if test="areaAdDes != null">area_ad_des,</if>
+            <if test="exId != null">ex_id,</if>
+            <if test="name != null">name,</if>
+            <if test="roadName != null">road_name,</if>
+            <if test="nature != null">nature,</if>
+            <if test="addrFrom != null">addr_from,</if>
+            <if test="addrEnd != null">addr_end,</if>
+            <if test="exId1 != null">ex_id_1,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="areaDes != null">#{areaDes},</if>
+            <if test="areaAdDes != null">#{areaAdDes},</if>
+            <if test="exId != null">#{exId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="roadName != null">#{roadName},</if>
+            <if test="nature != null">#{nature},</if>
+            <if test="addrFrom != null">#{addrFrom},</if>
+            <if test="addrEnd != null">#{addrEnd},</if>
+            <if test="exId1 != null">#{exId1},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTblFacilities" parameterType="TblFacilities">
+        update tbl_facilities
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="areaDes != null">area_des = #{areaDes},</if>
+            <if test="areaAdDes != null">area_ad_des = #{areaAdDes},</if>
+            <if test="exId != null">ex_id = #{exId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="roadName != null">road_name = #{roadName},</if>
+            <if test="nature != null">nature = #{nature},</if>
+            <if test="addrFrom != null">addr_from = #{addrFrom},</if>
+            <if test="addrEnd != null">addr_end = #{addrEnd},</if>
+            <if test="exId1 != null">ex_id_1 = #{exId1},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTblFacilitiesById" parameterType="Long">
+        delete from tbl_facilities where id = #{id}
+    </delete>
+
+    <delete id="deleteTblFacilitiesByIds" parameterType="String">
+        delete from tbl_facilities where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/TblTaskLogMapper.xml

@@ -0,0 +1,88 @@
+<?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="com.ruoyi.system.mapper.TblTaskLogMapper">
+    
+    <resultMap type="TblTaskLog" id="TblTaskLogResult">
+        <result property="id"    column="id"    />
+        <result property="taskId"    column="task_id"    />
+        <result property="taskStatus"    column="task_status"    />
+        <result property="logDes"    column="log_des"    />
+        <result property="logPics"    column="log_pics"    />
+        <result property="logVideos"    column="log_videos"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTblTaskLogVo">
+        select id, task_id, task_status, log_des, log_pics, log_videos, create_time, update_time, remark from tbl_task_log
+    </sql>
+
+    <select id="selectTblTaskLogList" parameterType="TblTaskLog" resultMap="TblTaskLogResult">
+        <include refid="selectTblTaskLogVo"/>
+        <where>  
+            <if test="taskId != null "> and task_id = #{taskId}</if>
+            <if test="taskStatus != null "> and task_status = #{taskStatus}</if>
+            <if test="logDes != null  and logDes != ''"> and log_des = #{logDes}</if>
+            <if test="logPics != null  and logPics != ''"> and log_pics = #{logPics}</if>
+            <if test="logVideos != null  and logVideos != ''"> and log_videos = #{logVideos}</if>
+        </where>
+    </select>
+    
+    <select id="selectTblTaskLogById" parameterType="Long" resultMap="TblTaskLogResult">
+        <include refid="selectTblTaskLogVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTblTaskLog" parameterType="TblTaskLog" useGeneratedKeys="true" keyProperty="id">
+        insert into tbl_task_log
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">task_id,</if>
+            <if test="taskStatus != null">task_status,</if>
+            <if test="logDes != null">log_des,</if>
+            <if test="logPics != null">log_pics,</if>
+            <if test="logVideos != null">log_videos,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="taskId != null">#{taskId},</if>
+            <if test="taskStatus != null">#{taskStatus},</if>
+            <if test="logDes != null">#{logDes},</if>
+            <if test="logPics != null">#{logPics},</if>
+            <if test="logVideos != null">#{logVideos},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTblTaskLog" parameterType="TblTaskLog">
+        update tbl_task_log
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="taskId != null">task_id = #{taskId},</if>
+            <if test="taskStatus != null">task_status = #{taskStatus},</if>
+            <if test="logDes != null">log_des = #{logDes},</if>
+            <if test="logPics != null">log_pics = #{logPics},</if>
+            <if test="logVideos != null">log_videos = #{logVideos},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTblTaskLogById" parameterType="Long">
+        delete from tbl_task_log where id = #{id}
+    </delete>
+
+    <delete id="deleteTblTaskLogByIds" parameterType="String">
+        delete from tbl_task_log where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/TblTaskMapper.xml

@@ -0,0 +1,158 @@
+<?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="com.ruoyi.system.mapper.TblTaskMapper">
+    
+    <resultMap type="TblTask" id="TblTaskResult">
+        <result property="taskId"    column="task_id"    />
+        <result property="taskName"    column="task_name"    />
+        <result property="taskContent"    column="task_content"    />
+        <result property="taskAddr"    column="task_addr"    />
+        <result property="taskLocation"    column="task_location"    />
+        <result property="taskCode"    column="task_code"    />
+        <result property="taskType"    column="task_type"    />
+        <result property="taskEventType"    column="task_event_type"    />
+        <result property="taskEventCategory"    column="task_event_category"    />
+        <result property="taskFromRemark"    column="task_from_remark"    />
+        <result property="taskAddrRoad"    column="task_addr_road"    />
+        <result property="taskOtherId"    column="task_other_id"    />
+        <result property="taskTime"    column="task_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="taskReqCompleteTime"    column="task_req_complete_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="status"    column="status"    />
+        <result property="taskCreater"    column="task_creater"    />
+        <result property="taskReporter"    column="task_reporter"    />
+        <result property="taskPics"    column="task_pics"    />
+        <result property="taskVideos"    column="task_videos"    />
+        <result property="taskComplainConnect"    column="task_complain_connect"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTblTaskVo">
+        select task_id, task_name, task_content, task_addr, task_location, task_code, task_type, task_event_type, task_event_category, task_from_remark, task_addr_road, task_other_id, task_time, create_time, task_req_complete_time, update_time, status, task_creater, task_reporter, task_pics, task_videos, task_complain_connect, remark from tbl_task
+    </sql>
+
+    <select id="selectTblTaskList" parameterType="TblTask" resultMap="TblTaskResult">
+        <include refid="selectTblTaskVo"/>
+        <where>  
+            <if test="taskName != null  and taskName != ''"> and task_name like concat('%', #{taskName}, '%')</if>
+            <if test="taskContent != null  and taskContent != ''"> and task_content = #{taskContent}</if>
+            <if test="taskAddr != null  and taskAddr != ''"> and task_addr = #{taskAddr}</if>
+            <if test="taskLocation != null  and taskLocation != ''"> and task_location = #{taskLocation}</if>
+            <if test="taskCode != null  and taskCode != ''"> and task_code = #{taskCode}</if>
+            <if test="taskType != null "> and task_type = #{taskType}</if>
+            <if test="taskEventType != null "> and task_event_type = #{taskEventType}</if>
+            <if test="taskEventCategory != null "> and task_event_category = #{taskEventCategory}</if>
+            <if test="taskFromRemark != null  and taskFromRemark != ''"> and task_from_remark = #{taskFromRemark}</if>
+            <if test="taskAddrRoad != null  and taskAddrRoad != ''"> and task_addr_road = #{taskAddrRoad}</if>
+            <if test="taskOtherId != null  and taskOtherId != ''"> and task_other_id = #{taskOtherId}</if>
+            <if test="taskTime != null "> and task_time = #{taskTime}</if>
+            <if test="taskReqCompleteTime != null "> and task_req_complete_time = #{taskReqCompleteTime}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="taskCreater != null  and taskCreater != ''"> and task_creater = #{taskCreater}</if>
+            <if test="taskReporter != null  and taskReporter != ''"> and task_reporter = #{taskReporter}</if>
+            <if test="taskPics != null  and taskPics != ''"> and task_pics = #{taskPics}</if>
+            <if test="taskVideos != null  and taskVideos != ''"> and task_videos = #{taskVideos}</if>
+            <if test="taskComplainConnect != null  and taskComplainConnect != ''"> and task_complain_connect = #{taskComplainConnect}</if>
+        </where>
+    </select>
+    
+    <select id="selectTblTaskByTaskId" parameterType="Long" resultMap="TblTaskResult">
+        <include refid="selectTblTaskVo"/>
+        where task_id = #{taskId}
+    </select>
+        
+    <insert id="insertTblTask" parameterType="TblTask" useGeneratedKeys="true" keyProperty="taskId">
+        insert into tbl_task
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="taskName != null">task_name,</if>
+            <if test="taskContent != null">task_content,</if>
+            <if test="taskAddr != null">task_addr,</if>
+            <if test="taskLocation != null">task_location,</if>
+            <if test="taskCode != null">task_code,</if>
+            <if test="taskType != null">task_type,</if>
+            <if test="taskEventType != null">task_event_type,</if>
+            <if test="taskEventCategory != null">task_event_category,</if>
+            <if test="taskFromRemark != null">task_from_remark,</if>
+            <if test="taskAddrRoad != null">task_addr_road,</if>
+            <if test="taskOtherId != null">task_other_id,</if>
+            <if test="taskTime != null">task_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="taskReqCompleteTime != null">task_req_complete_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="status != null">status,</if>
+            <if test="taskCreater != null">task_creater,</if>
+            <if test="taskReporter != null">task_reporter,</if>
+            <if test="taskPics != null">task_pics,</if>
+            <if test="taskVideos != null">task_videos,</if>
+            <if test="taskComplainConnect != null">task_complain_connect,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="taskName != null">#{taskName},</if>
+            <if test="taskContent != null">#{taskContent},</if>
+            <if test="taskAddr != null">#{taskAddr},</if>
+            <if test="taskLocation != null">#{taskLocation},</if>
+            <if test="taskCode != null">#{taskCode},</if>
+            <if test="taskType != null">#{taskType},</if>
+            <if test="taskEventType != null">#{taskEventType},</if>
+            <if test="taskEventCategory != null">#{taskEventCategory},</if>
+            <if test="taskFromRemark != null">#{taskFromRemark},</if>
+            <if test="taskAddrRoad != null">#{taskAddrRoad},</if>
+            <if test="taskOtherId != null">#{taskOtherId},</if>
+            <if test="taskTime != null">#{taskTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="taskReqCompleteTime != null">#{taskReqCompleteTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="status != null">#{status},</if>
+            <if test="taskCreater != null">#{taskCreater},</if>
+            <if test="taskReporter != null">#{taskReporter},</if>
+            <if test="taskPics != null">#{taskPics},</if>
+            <if test="taskVideos != null">#{taskVideos},</if>
+            <if test="taskComplainConnect != null">#{taskComplainConnect},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTblTask" parameterType="TblTask">
+        update tbl_task
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="taskName != null">task_name = #{taskName},</if>
+            <if test="taskContent != null">task_content = #{taskContent},</if>
+            <if test="taskAddr != null">task_addr = #{taskAddr},</if>
+            <if test="taskLocation != null">task_location = #{taskLocation},</if>
+            <if test="taskCode != null">task_code = #{taskCode},</if>
+            <if test="taskType != null">task_type = #{taskType},</if>
+            <if test="taskEventType != null">task_event_type = #{taskEventType},</if>
+            <if test="taskEventCategory != null">task_event_category = #{taskEventCategory},</if>
+            <if test="taskFromRemark != null">task_from_remark = #{taskFromRemark},</if>
+            <if test="taskAddrRoad != null">task_addr_road = #{taskAddrRoad},</if>
+            <if test="taskOtherId != null">task_other_id = #{taskOtherId},</if>
+            <if test="taskTime != null">task_time = #{taskTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="taskReqCompleteTime != null">task_req_complete_time = #{taskReqCompleteTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="taskCreater != null">task_creater = #{taskCreater},</if>
+            <if test="taskReporter != null">task_reporter = #{taskReporter},</if>
+            <if test="taskPics != null">task_pics = #{taskPics},</if>
+            <if test="taskVideos != null">task_videos = #{taskVideos},</if>
+            <if test="taskComplainConnect != null">task_complain_connect = #{taskComplainConnect},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where task_id = #{taskId}
+    </update>
+
+    <delete id="deleteTblTaskByTaskId" parameterType="Long">
+        delete from tbl_task where task_id = #{taskId}
+    </delete>
+
+    <delete id="deleteTblTaskByTaskIds" parameterType="String">
+        delete from tbl_task where task_id in 
+        <foreach item="taskId" collection="array" open="(" separator="," close=")">
+            #{taskId}
+        </foreach>
+    </delete>
+</mapper>