fix:删除没有用的表和相关代码

资源移动端查询也可以模糊仓库名称

ruoyi-admin/nacos/yjzh-sq-test.yaml

@@ -160,4 +160,4 @@ third:
     keepalive: http://10.55.134.3:6699/videoService/accounts/token/keepalive # 大华会话保活
     dhDeviceTree: http://10.55.134.3:6699/videoService/devicesManager/deviceTree # 大华设备树
     incidentUrl: http://sqmb.xt.wenhq.top:8083/#/status/3/detail?id=#incidentId&taskid=#taskId # 移动端待办跳转链接
-    resourceUrl: http://sqmb.xt.wenhq.top:8083/#/warehouse/detail # 移动端资源跳转链接
+    resourceUrl: http://sqmb.xt.wenhq.top:8083/#/warehouse/list?taskid=#taskId # 移动端资源跳转链接

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/BigScreenController.java

@@ -1,30 +1,14 @@
 package com.ruoyi.web.controller.zhdd;
 
-import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.zhdd.domain.Incident;
-import com.ruoyi.zhdd.domain.IncidentProcess;
-import com.ruoyi.zhdd.domain.IncidentTask;
-import com.ruoyi.zhdd.domain.IncidentTaskPerson;
-import com.ruoyi.zhdd.domain.Plan;
 import com.ruoyi.zhdd.domain.bo.IncidentBo;
-import com.ruoyi.zhdd.domain.bo.IncidentTaskBo;
-import com.ruoyi.zhdd.domain.bo.IncidentTasksBo;
 import com.ruoyi.zhdd.domain.vo.IncidentVo;
-import com.ruoyi.zhdd.domain.vo.PlanVo;
 import com.ruoyi.zhdd.service.IIncidentProcessService;
 import com.ruoyi.zhdd.service.IIncidentService;
-import com.ruoyi.zhdd.service.IIncidentTaskPersonService;
 import com.ruoyi.zhdd.service.IIncidentTaskService;
 import com.ruoyi.zhdd.service.IPlanService;
 import com.ruoyi.zhdd.service.IPlanTaskService;
@@ -33,24 +17,11 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 事件基础Controller
@@ -69,8 +40,6 @@ public class BigScreenController extends BaseController {
 
     private final IIncidentTaskService incidentTaskService;
 
-    private final IIncidentTaskPersonService incidentTaskPersonService;
-
     private final IIncidentProcessService iIncidentProcessService;
 
     private final IPlanTaskService planTaskService;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/IncidentController.java

@@ -342,7 +342,7 @@ public class IncidentController extends BaseController {
             map.put("name", incidentVo.getName());
             map.put("nowDate", DateUtil.today());
             if (ObjectUtil.isNotEmpty(incidentVo.getType())) {
-                map.put("type", sysDictDataService.selectDictLabel("zhdd_plan_type", Convert.toStr(incidentVo.getType())));
+                map.put("type", sysDictDataService.selectDictLabel("zhdd_incident_type", Convert.toStr(incidentVo.getType())));
             } else {
                 map.put("type", "-");
             }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/IncidentTaskPersonController.java

@@ -1,113 +0,0 @@
-package com.ruoyi.web.controller.zhdd;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.zhdd.domain.vo.IncidentTaskPersonVo;
-import com.ruoyi.zhdd.domain.bo.IncidentTaskPersonBo;
-import com.ruoyi.zhdd.service.IIncidentTaskPersonService;
-import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 事件处置方案人员Controller
- *
- * @author xintong
- * @date 2021-11-27
- */
-@Validated
-@Api(value = "事件处置方案人员控制器", tags = {"事件处置方案人员管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/zhdd/incidentTaskPerson")
-public class IncidentTaskPersonController extends BaseController {
-
-    private final IIncidentTaskPersonService iIncidentTaskPersonService;
-
-    /**
-     * 查询事件处置方案人员列表
-     */
-    @ApiOperation("查询事件处置方案人员列表")
-    @PreAuthorize("@ss.hasPermi('zhdd:incidentTaskPerson:list')")
-    @GetMapping("/list")
-    public TableDataInfo<IncidentTaskPersonVo> list(@Validated(QueryGroup.class) IncidentTaskPersonBo bo) {
-        return iIncidentTaskPersonService.queryPageList(bo);
-    }
-
-    /**
-     * 导出事件处置方案人员列表
-     */
-    @ApiOperation("导出事件处置方案人员列表")
-    @PreAuthorize("@ss.hasPermi('zhdd:incidentTaskPerson:export')")
-    @Log(title = "事件处置方案人员", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public void export(@Validated IncidentTaskPersonBo bo, HttpServletResponse response) {
-        List<IncidentTaskPersonVo> list = iIncidentTaskPersonService.queryList(bo);
-        ExcelUtil.exportExcel(list, "事件处置方案人员", IncidentTaskPersonVo.class, response);
-    }
-
-    /**
-     * 获取事件处置方案人员详细信息
-     */
-    @ApiOperation("获取事件处置方案人员详细信息")
-    @PreAuthorize("@ss.hasPermi('zhdd:incidentTaskPerson:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<IncidentTaskPersonVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("id") String id) {
-        return AjaxResult.success(iIncidentTaskPersonService.queryById(id));
-    }
-
-    /**
-     * 新增事件处置方案人员
-     */
-    @ApiOperation("新增事件处置方案人员")
-    @PreAuthorize("@ss.hasPermi('zhdd:incidentTaskPerson:add')")
-    @Log(title = "事件处置方案人员", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody IncidentTaskPersonBo bo) {
-        return toAjax(iIncidentTaskPersonService.insertByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改事件处置方案人员
-     */
-    @ApiOperation("修改事件处置方案人员")
-    @PreAuthorize("@ss.hasPermi('zhdd:incidentTaskPerson:edit')")
-    @Log(title = "事件处置方案人员", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody IncidentTaskPersonBo bo) {
-        return toAjax(iIncidentTaskPersonService.updateByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除事件处置方案人员
-     */
-    @ApiOperation("删除事件处置方案人员")
-    @PreAuthorize("@ss.hasPermi('zhdd:incidentTaskPerson:remove')")
-    @Log(title = "事件处置方案人员" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable String[] ids) {
-        return toAjax(iIncidentTaskPersonService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
-}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/ResourceController.java

@@ -105,10 +105,25 @@ public class ResourceController extends BaseController {
         List<Object> objects = iResourceDetailService.listObjs(new QueryWrapper<ResourceDetail>()
             .select("distinct resource_id")
             .like(StrUtil.isNotBlank(bo.getGoodsName()), "name", bo.getGoodsName()));
+        List<ResourceVo> resourceDetail = new ArrayList<>();
         if (objects != null && objects.size() > 0) {
             bo.setResourceIds(objects);
+            resourceDetail = iResourceService.queryPageList(bo).getRows();
         }
-        return iResourceService.queryPageList(bo);
+        if (StrUtil.isNotBlank(bo.getGoodsName())) {
+            List<ResourceVo> resourceList = iResourceService.listVo(Wrappers.<Resource>lambdaQuery()
+                .eq(Resource::getResourceType, 1)
+                .like(Resource::getName, bo.getGoodsName())
+                .notIn(CollUtil.isNotEmpty(objects), Resource::getId, objects));
+            resourceDetail = CollUtil.unionAll(resourceDetail, resourceList);
+        }
+
+        TableDataInfo<ResourceVo> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setRows(resourceDetail);
+        rspData.setTotal(resourceDetail.size());
+        return rspData;
     }
 
     /**

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/Incident.java

@@ -171,4 +171,6 @@ public class Incident implements Serializable {
     // 忽略说明
     private String ignores;
 
+    private Date happenTime;
+
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/IncidentTaskCommand.java

@@ -1,56 +0,0 @@
-package com.ruoyi.zhdd.domain;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 事件处置方案指令对象 b_incident_process
- *
- * @author xitong
- * @date 2021-09-28
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("b_incident_task_command")
-public class IncidentTaskCommand implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private String id;
-
-    /**
-     * 所属事件id
-     */
-    private String incidentTaskId;
-
-    private String command;
-
-    /**
-     * 过程创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /**
-     * 过程创建人
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/IncidentTaskPerson.java

@@ -1,59 +0,0 @@
-package com.ruoyi.zhdd.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-/**
- * 事件处置方案人员对象 b_incident_task_person
- *
- * @author xintong
- * @date 2021-11-27
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("b_incident_task_person")
-public class IncidentTaskPerson implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private String id;
-
-    /**
-     * 事件id
-     */
-    private String incidentTaskId;
-
-    /**
-     * 人员职位
-     */
-    private String position;
-
-    /**
-     * 人员姓名
-     */
-    private String person;
-
-    /**
-     * $column.columnComment
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /**
-     * $column.columnComment
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/IncidentBo.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
@@ -203,4 +204,6 @@ public class IncidentBo extends BaseEntity {
     private String ignores;
 
     private Set<Object> ids;
+
+    private Date happenTime;
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/IncidentTaskCommandBo.java

@@ -1,63 +0,0 @@
-package com.ruoyi.zhdd.domain.bo;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 事件处置方案人员业务对象 b_incident_task_person
- *
- * @author xintong
- * @date 2021-11-27
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("事件处置方案指令业务对象")
-public class IncidentTaskCommandBo extends BaseEntity {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "主键")
-    private String id;
-
-    /**
-     * 事件方案id
-     */
-    @ApiModelProperty(value = "事件方案id")
-    private String incidentTaskId;
-
-    /**
-     * 指令
-     */
-    @ApiModelProperty(value = "指令")
-    private String command;
-
-    /**
-     * 分页大小
-     */
-    @ApiModelProperty("分页大小")
-    private Integer pageSize;
-
-    /**
-     * 当前页数
-     */
-    @ApiModelProperty("当前页数")
-    private Integer pageNum;
-
-    /**
-     * 排序列
-     */
-    @ApiModelProperty("排序列")
-    private String orderByColumn;
-
-    /**
-     * 排序的方向desc或者asc
-     */
-    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
-    private String isAsc;
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/IncidentTaskPersonBo.java

@@ -1,76 +0,0 @@
-package com.ruoyi.zhdd.domain.bo;
-
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 事件处置方案人员业务对象 b_incident_task_person
- *
- * @author xintong
- * @date 2021-11-27
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("事件处置方案人员业务对象")
-public class IncidentTaskPersonBo extends BaseEntity {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty(value = "主键")
-    private String id;
-
-    /**
-     * 事件id
-     */
-    @ApiModelProperty(value = "事件id")
-    private String incidentTaskId;
-
-    /**
-     * 人员职位
-     */
-    @ApiModelProperty(value = "人员职位")
-    private String position;
-
-    /**
-     * 人员姓名
-     */
-    @ApiModelProperty(value = "人员姓名")
-    private String person;
-
-
-    /**
-     * 分页大小
-     */
-    @ApiModelProperty("分页大小")
-    private Integer pageSize;
-
-    /**
-     * 当前页数
-     */
-    @ApiModelProperty("当前页数")
-    private Integer pageNum;
-
-    /**
-     * 排序列
-     */
-    @ApiModelProperty("排序列")
-    private String orderByColumn;
-
-    /**
-     * 排序的方向desc或者asc
-     */
-    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
-    private String isAsc;
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/IncidentTaskCommandVo.java

@@ -1,44 +0,0 @@
-package com.ruoyi.zhdd.domain.vo;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-/**
- * 事件处置方案人员视图对象 b_incident_task_person
- *
- * @author xintong
- * @date 2021-11-27
- */
-@Data
-@ApiModel("事件处置方案指令视图对象")
-public class IncidentTaskCommandVo {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("主键")
-    private String id;
-
-    /**
-     * 事件id
-     */
-    @Excel(name = "事件方案id")
-    @ApiModelProperty("事件方案id")
-    private String incidentTaskId;
-
-    /**
-     * 指令
-     */
-    @Excel(name = "指令")
-    @ApiModelProperty("指令")
-    private String command;
-
-    private int index;
-
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/IncidentTaskPersonVo.java

@@ -1,49 +0,0 @@
-package com.ruoyi.zhdd.domain.vo;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-/**
- * 事件处置方案人员视图对象 b_incident_task_person
- *
- * @author xintong
- * @date 2021-11-27
- */
-@Data
-@ApiModel("事件处置方案人员视图对象")
-public class IncidentTaskPersonVo {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("主键")
-    private String id;
-
-    /**
-     * 事件id
-     */
-    @Excel(name = "事件id")
-    @ApiModelProperty("事件id")
-    private String incidentTaskId;
-
-    /**
-     * 人员职位
-     */
-    @Excel(name = "人员职位")
-    @ApiModelProperty("人员职位")
-    private String position;
-
-    /**
-     * 人员姓名
-     */
-    @Excel(name = "人员姓名")
-    @ApiModelProperty("人员姓名")
-    private String person;
-
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/IncidentVo.java

@@ -188,4 +188,7 @@ public class IncidentVo {
     private String typeText;
 
     private String levelText;
+
+    @ApiModelProperty("事件发生时间")
+    private Date happenTime;
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/IncidentTaskCommandMapper.java

@@ -1,15 +0,0 @@
-package com.ruoyi.zhdd.mapper;
-
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
-import com.ruoyi.zhdd.domain.IncidentTaskCommand;
-import com.ruoyi.zhdd.domain.IncidentTaskPerson;
-
-/**
- * 事件处置方案人员Mapper接口
- *
- * @author xintong
- * @date 2021-11-27
- */
-public interface IncidentTaskCommandMapper extends BaseMapperPlus<IncidentTaskCommand> {
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/IncidentTaskPersonMapper.java

@@ -1,16 +0,0 @@
-package com.ruoyi.zhdd.mapper;
-
-import com.ruoyi.zhdd.domain.IncidentTaskPerson;
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
-import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * 事件处置方案人员Mapper接口
- *
- * @author xintong
- * @date 2021-11-27
- */
-public interface IncidentTaskPersonMapper extends BaseMapperPlus<IncidentTaskPerson> {
-
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IIncidentTaskCommandService.java

@@ -1,59 +0,0 @@
-package com.ruoyi.zhdd.service;
-
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.zhdd.domain.IncidentTaskCommand;
-import com.ruoyi.zhdd.domain.IncidentTaskPerson;
-import com.ruoyi.zhdd.domain.bo.IncidentTaskCommandBo;
-import com.ruoyi.zhdd.domain.bo.IncidentTaskPersonBo;
-import com.ruoyi.zhdd.domain.vo.IncidentTaskCommandVo;
-import com.ruoyi.zhdd.domain.vo.IncidentTaskPersonVo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 事件处置方案人员Service接口
- *
- * @author xintong
- * @date 2021-11-27
- */
-public interface IIncidentTaskCommandService extends IServicePlus<IncidentTaskCommand, IncidentTaskCommandVo> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	IncidentTaskCommandVo queryById(String id);
-
-	/**
-	 * 查询列表
-	 */
-    TableDataInfo<IncidentTaskCommandVo> queryPageList(IncidentTaskCommandBo bo);
-
-	/**
-	 * 查询列表
-	 */
-	List<IncidentTaskCommandVo> queryList(IncidentTaskCommandBo bo);
-
-	/**
-	 * 根据新增业务对象插入事件处置方案人员
-	 * @param bo 事件处置方案人员新增业务对象
-	 * @return
-	 */
-	Boolean insertByBo(IncidentTaskCommandBo bo);
-
-	/**
-	 * 根据编辑业务对象修改事件处置方案人员
-	 * @param bo 事件处置方案人员编辑业务对象
-	 * @return
-	 */
-	Boolean updateByBo(IncidentTaskCommandBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IIncidentTaskPersonService.java

@@ -1,56 +0,0 @@
-package com.ruoyi.zhdd.service;
-
-import com.ruoyi.zhdd.domain.IncidentTaskPerson;
-import com.ruoyi.zhdd.domain.vo.IncidentTaskPersonVo;
-import com.ruoyi.zhdd.domain.bo.IncidentTaskPersonBo;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 事件处置方案人员Service接口
- *
- * @author xintong
- * @date 2021-11-27
- */
-public interface IIncidentTaskPersonService extends IServicePlus<IncidentTaskPerson, IncidentTaskPersonVo> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	IncidentTaskPersonVo queryById(String id);
-
-	/**
-	 * 查询列表
-	 */
-    TableDataInfo<IncidentTaskPersonVo> queryPageList(IncidentTaskPersonBo bo);
-
-	/**
-	 * 查询列表
-	 */
-	List<IncidentTaskPersonVo> queryList(IncidentTaskPersonBo bo);
-
-	/**
-	 * 根据新增业务对象插入事件处置方案人员
-	 * @param bo 事件处置方案人员新增业务对象
-	 * @return
-	 */
-	Boolean insertByBo(IncidentTaskPersonBo bo);
-
-	/**
-	 * 根据编辑业务对象修改事件处置方案人员
-	 * @param bo 事件处置方案人员编辑业务对象
-	 * @return
-	 */
-	Boolean updateByBo(IncidentTaskPersonBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/IncidentTaskCommandServiceImpl.java

@@ -1,90 +0,0 @@
-package com.ruoyi.zhdd.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.zhdd.domain.IncidentTaskCommand;
-import com.ruoyi.zhdd.domain.IncidentTaskPerson;
-import com.ruoyi.zhdd.domain.bo.IncidentTaskCommandBo;
-import com.ruoyi.zhdd.domain.bo.IncidentTaskPersonBo;
-import com.ruoyi.zhdd.domain.vo.IncidentTaskCommandVo;
-import com.ruoyi.zhdd.domain.vo.IncidentTaskPersonVo;
-import com.ruoyi.zhdd.mapper.IncidentTaskCommandMapper;
-import com.ruoyi.zhdd.mapper.IncidentTaskPersonMapper;
-import com.ruoyi.zhdd.service.IIncidentTaskCommandService;
-import com.ruoyi.zhdd.service.IIncidentTaskPersonService;
-import org.springframework.stereotype.Service;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 事件处置方案人员Service业务层处理
- *
- * @author xintong
- * @date 2021-11-27
- */
-@Service
-public class IncidentTaskCommandServiceImpl extends ServicePlusImpl<IncidentTaskCommandMapper, IncidentTaskCommand, IncidentTaskCommandVo> implements IIncidentTaskCommandService {
-
-    @Override
-    public IncidentTaskCommandVo queryById(String id){
-        return getVoById(id);
-    }
-
-    @Override
-    public TableDataInfo<IncidentTaskCommandVo> queryPageList(IncidentTaskCommandBo bo) {
-        PagePlus<IncidentTaskCommand, IncidentTaskCommandVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
-        return PageUtils.buildDataInfo(result);
-    }
-
-    @Override
-    public List<IncidentTaskCommandVo> queryList(IncidentTaskCommandBo bo) {
-        return listVo(buildQueryWrapper(bo));
-    }
-
-    private LambdaQueryWrapper<IncidentTaskCommand> buildQueryWrapper(IncidentTaskCommandBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<IncidentTaskCommand> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getIncidentTaskId()), IncidentTaskCommand::getIncidentTaskId, bo.getIncidentTaskId());
-        lqw.eq(StringUtils.isNotBlank(bo.getCommand()), IncidentTaskCommand::getCommand, bo.getCommand());
-        return lqw;
-    }
-
-    @Override
-    public Boolean insertByBo(IncidentTaskCommandBo bo) {
-        IncidentTaskCommand add = BeanUtil.toBean(bo, IncidentTaskCommand.class);
-        validEntityBeforeSave(add);
-        return save(add);
-    }
-
-    @Override
-    public Boolean updateByBo(IncidentTaskCommandBo bo) {
-        IncidentTaskCommand update = BeanUtil.toBean(bo, IncidentTaskCommand.class);
-        validEntityBeforeSave(update);
-        return updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(IncidentTaskCommand entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return removeByIds(ids);
-    }
-}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/IncidentTaskPersonServiceImpl.java

@@ -1,86 +0,0 @@
-package com.ruoyi.zhdd.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.zhdd.domain.bo.IncidentTaskPersonBo;
-import com.ruoyi.zhdd.domain.vo.IncidentTaskPersonVo;
-import com.ruoyi.zhdd.domain.IncidentTaskPerson;
-import com.ruoyi.zhdd.mapper.IncidentTaskPersonMapper;
-import com.ruoyi.zhdd.service.IIncidentTaskPersonService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 事件处置方案人员Service业务层处理
- *
- * @author xintong
- * @date 2021-11-27
- */
-@Service
-public class IncidentTaskPersonServiceImpl extends ServicePlusImpl<IncidentTaskPersonMapper, IncidentTaskPerson, IncidentTaskPersonVo> implements IIncidentTaskPersonService {
-
-    @Override
-    public IncidentTaskPersonVo queryById(String id){
-        return getVoById(id);
-    }
-
-    @Override
-    public TableDataInfo<IncidentTaskPersonVo> queryPageList(IncidentTaskPersonBo bo) {
-        PagePlus<IncidentTaskPerson, IncidentTaskPersonVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
-        return PageUtils.buildDataInfo(result);
-    }
-
-    @Override
-    public List<IncidentTaskPersonVo> queryList(IncidentTaskPersonBo bo) {
-        return listVo(buildQueryWrapper(bo));
-    }
-
-    private LambdaQueryWrapper<IncidentTaskPerson> buildQueryWrapper(IncidentTaskPersonBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<IncidentTaskPerson> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getIncidentTaskId()), IncidentTaskPerson::getIncidentTaskId, bo.getIncidentTaskId());
-        lqw.eq(StringUtils.isNotBlank(bo.getPosition()), IncidentTaskPerson::getPosition, bo.getPosition());
-        lqw.eq(StringUtils.isNotBlank(bo.getPerson()), IncidentTaskPerson::getPerson, bo.getPerson());
-        return lqw;
-    }
-
-    @Override
-    public Boolean insertByBo(IncidentTaskPersonBo bo) {
-        IncidentTaskPerson add = BeanUtil.toBean(bo, IncidentTaskPerson.class);
-        validEntityBeforeSave(add);
-        return save(add);
-    }
-
-    @Override
-    public Boolean updateByBo(IncidentTaskPersonBo bo) {
-        IncidentTaskPerson update = BeanUtil.toBean(bo, IncidentTaskPerson.class);
-        validEntityBeforeSave(update);
-        return updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(IncidentTaskPerson entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return removeByIds(ids);
-    }
-}

ruoyi-zhdd/src/main/resources/mapper/zhdd/IncidentTaskCommandMapper.xml

@@ -1,16 +0,0 @@
-<?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.zhdd.mapper.IncidentTaskCommandMapper">
-
-    <resultMap type="com.ruoyi.zhdd.domain.IncidentTaskCommand" id="IncidentTaskCommandResult">
-        <result property="id" column="id"/>
-        <result property="incidentTaskId" column="incident_task_id"/>
-        <result property="command" column="command"/>
-        <result property="createTime" column="create_time"/>
-        <result property="createBy" column="create_by"/>
-    </resultMap>
-
-
-</mapper>

ruoyi-zhdd/src/main/resources/mapper/zhdd/IncidentTaskPersonMapper.xml

@@ -1,17 +0,0 @@
-<?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.zhdd.mapper.IncidentTaskPersonMapper">
-
-    <resultMap type="com.ruoyi.zhdd.domain.IncidentTaskPerson" id="IncidentTaskPersonResult">
-        <result property="id" column="id"/>
-        <result property="incidentTaskId" column="incident_task_id"/>
-        <result property="position" column="position"/>
-        <result property="person" column="person"/>
-        <result property="createTime" column="create_time"/>
-        <result property="createBy" column="create_by"/>
-    </resultMap>
-
-
-</mapper>