From 481f138ef89978752b6ee2b7f3c892bef2a58990 Mon Sep 17 00:00:00 2001 From: zccbbg Date: Wed, 10 May 2023 13:18:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mybatis-plus-api/pom.xml | 25 - .../main/java/com/cyl/demo/domain/User.java | 11 - mybatis-plus-demo/pom.xml | 70 - .../cyl/demo/controller/TaskController.java | 102 - .../com/cyl/demo/convert/TaskConvert.java | 29 - .../main/java/com/cyl/demo/domain/Task.java | 106 - .../main/java/com/cyl/demo/domain/User2.java | 7 - .../java/com/cyl/demo/mapper/TaskMapper.java | 20 - .../java/com/cyl/demo/mapper/UserMapper.java | 10 - .../java/com/cyl/demo/pojo/dto/TaskDTO.java | 34 - .../cyl/demo/pojo/example/TaskExample.java | 1734 ----------------- .../com/cyl/demo/pojo/query/TaskQuery.java | 70 - .../java/com/cyl/demo/pojo/vo/TaskVO.java | 34 - .../com/cyl/demo/service/ITaskService.java | 63 - .../demo/service/impl/TaskServiceImpl.java | 188 -- .../src/main/resources/mapper/TaskMapper.xml | 67 - .../src/main/resources/mapper/UserMapper.xml | 11 - .../java/com/cyl/demo/TestApplication.java | 13 - .../java/com/cyl/demo/mapper/TaskTest.java | 31 - .../src/test/resources/application.yml | 14 - .../src/test/resources/db/data-h2.sql | 8 - .../src/test/resources/db/schema-h2.sql | 10 - .../src/test/resources/logback.xml | 88 - pom.xml | 2 - wms/pom.xml | 5 - 25 files changed, 2752 deletions(-) delete mode 100644 mybatis-plus-api/pom.xml delete mode 100644 mybatis-plus-api/src/main/java/com/cyl/demo/domain/User.java delete mode 100644 mybatis-plus-demo/pom.xml delete mode 100644 mybatis-plus-demo/src/main/java/com/cyl/demo/controller/TaskController.java delete mode 100644 mybatis-plus-demo/src/main/java/com/cyl/demo/convert/TaskConvert.java delete mode 100644 mybatis-plus-demo/src/main/java/com/cyl/demo/domain/Task.java delete mode 100644 mybatis-plus-demo/src/main/java/com/cyl/demo/domain/User2.java delete mode 100644 mybatis-plus-demo/src/main/java/com/cyl/demo/mapper/TaskMapper.java delete mode 100644 mybatis-plus-demo/src/main/java/com/cyl/demo/mapper/UserMapper.java delete mode 100644 mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/dto/TaskDTO.java delete mode 100644 mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/example/TaskExample.java delete mode 100644 mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/query/TaskQuery.java delete mode 100644 mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/vo/TaskVO.java delete mode 100644 mybatis-plus-demo/src/main/java/com/cyl/demo/service/ITaskService.java delete mode 100644 mybatis-plus-demo/src/main/java/com/cyl/demo/service/impl/TaskServiceImpl.java delete mode 100644 mybatis-plus-demo/src/main/resources/mapper/TaskMapper.xml delete mode 100644 mybatis-plus-demo/src/main/resources/mapper/UserMapper.xml delete mode 100644 mybatis-plus-demo/src/test/java/com/cyl/demo/TestApplication.java delete mode 100644 mybatis-plus-demo/src/test/java/com/cyl/demo/mapper/TaskTest.java delete mode 100644 mybatis-plus-demo/src/test/resources/application.yml delete mode 100644 mybatis-plus-demo/src/test/resources/db/data-h2.sql delete mode 100644 mybatis-plus-demo/src/test/resources/db/schema-h2.sql delete mode 100644 mybatis-plus-demo/src/test/resources/logback.xml diff --git a/mybatis-plus-api/pom.xml b/mybatis-plus-api/pom.xml deleted file mode 100644 index ef8ad51..0000000 --- a/mybatis-plus-api/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - ruoyi - com.ruoyi - 3.7.0 - - 4.0.0 - - mybatis-plus-api - - - 8 - 8 - - - - com.ruoyi - ruoyi-common - - - - \ No newline at end of file diff --git a/mybatis-plus-api/src/main/java/com/cyl/demo/domain/User.java b/mybatis-plus-api/src/main/java/com/cyl/demo/domain/User.java deleted file mode 100644 index b646306..0000000 --- a/mybatis-plus-api/src/main/java/com/cyl/demo/domain/User.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.cyl.demo.domain; - -import lombok.Data; - -@Data -public class User { - private Long id; - private String name; - private Integer age; - private String email; -} \ No newline at end of file diff --git a/mybatis-plus-demo/pom.xml b/mybatis-plus-demo/pom.xml deleted file mode 100644 index 55a4ef2..0000000 --- a/mybatis-plus-demo/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - ruoyi - com.ruoyi - 3.7.0 - - 4.0.0 - - mybatis-plus-demo - - - 8 - 8 - - - - com.ruoyi - ruoyi-common - ${ruoyi.version} - - - com.ruoyi - mybatis-plus-api - ${ruoyi.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis.plus.version} - - - org.mapstruct - mapstruct - - - org.springframework.boot - spring-boot-starter - test - - - org.springframework.boot - spring-boot-starter-test - test - - - com.h2database - h2 - test - - - org.springframework.boot - spring-boot-test - test - - - junit - junit - test - - - org.springframework - spring-test - test - - - - \ No newline at end of file diff --git a/mybatis-plus-demo/src/main/java/com/cyl/demo/controller/TaskController.java b/mybatis-plus-demo/src/main/java/com/cyl/demo/controller/TaskController.java deleted file mode 100644 index d2fbffd..0000000 --- a/mybatis-plus-demo/src/main/java/com/cyl/demo/controller/TaskController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.cyl.demo.controller; - -import java.util.List; - -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Page; -import org.springframework.http.ResponseEntity; -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.enums.BusinessType; -import com.cyl.demo.convert.TaskConvert; -import com.cyl.demo.domain.Task; -import com.cyl.demo.pojo.query.TaskQuery; -import com.cyl.demo.service.ITaskService; -import com.cyl.demo.pojo.vo.TaskVO; -import com.ruoyi.common.utils.poi.ExcelUtil; -/** - * 任务Controller - * - * @author feijinping - * @date 2022-06-20 - */ -@RestController -@RequestMapping("/demo/cscdcTask") -public class TaskController extends BaseController { - @Autowired - private ITaskService service; - @Autowired - private TaskConvert convert; - - /** - * 查询任务列表 - */ - @PreAuthorize("@ss.hasPermi('demo:cscdcTask:list')") - @PostMapping("/list") - public ResponseEntity> list(@RequestBody TaskQuery query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); - } - - /** - * 导出任务列表 - */ - @PreAuthorize("@ss.hasPermi('demo:cscdcTask:export')") - @Log(title = "任务", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public ResponseEntity export(TaskQuery query) { - List list = service.selectList(query, null); - ExcelUtil util = new ExcelUtil<>(TaskVO.class); - return ResponseEntity.ok(util.writeExcel(convert.dos2vos(list), "任务数据")); - } - - /** - * 获取任务详细信息 - */ - @PreAuthorize("@ss.hasPermi('demo:cscdcTask:query')") - @GetMapping(value = "/{id}") - public ResponseEntity getInfo(@PathVariable("id") Long id) { - return ResponseEntity.ok(service.selectById(id)); - } - - /** - * 新增任务 - */ - @PreAuthorize("@ss.hasPermi('demo:cscdcTask:add')") - @Log(title = "任务", businessType = BusinessType.INSERT) - @PostMapping - public ResponseEntity add(@RequestBody Task task) { - return ResponseEntity.ok(service.insert(task)); - } - - /** - * 修改任务 - */ - @PreAuthorize("@ss.hasPermi('demo:cscdcTask:edit')") - @Log(title = "任务", businessType = BusinessType.UPDATE) - @PutMapping - public ResponseEntity edit(@RequestBody Task task) { - return ResponseEntity.ok(service.update(task)); - } - - /** - * 删除任务 - */ - @PreAuthorize("@ss.hasPermi('demo:cscdcTask:remove')") - @Log(title = "任务", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public ResponseEntity remove(@PathVariable Long[] ids) { - return ResponseEntity.ok(service.deleteByIds(ids)); - } -} diff --git a/mybatis-plus-demo/src/main/java/com/cyl/demo/convert/TaskConvert.java b/mybatis-plus-demo/src/main/java/com/cyl/demo/convert/TaskConvert.java deleted file mode 100644 index 588e672..0000000 --- a/mybatis-plus-demo/src/main/java/com/cyl/demo/convert/TaskConvert.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.cyl.demo.convert; - -import org.mapstruct.Mapper; -import com.cyl.demo.domain.Task; -import com.cyl.demo.pojo.dto.TaskDTO; -import com.cyl.demo.pojo.vo.TaskVO; -import java.util.List; -/** - * 任务 DO <=> DTO <=> VO / BO / Query - * - * @author feijinping - */ -@Mapper(componentModel = "spring") -public interface TaskConvert { - - /** - * @param source DO - * @return DTO - */ - TaskDTO do2dto(Task source); - - /** - * @param source DTO - * @return DO - */ - Task dto2do(TaskDTO source); - - List dos2vos(List list); -} diff --git a/mybatis-plus-demo/src/main/java/com/cyl/demo/domain/Task.java b/mybatis-plus-demo/src/main/java/com/cyl/demo/domain/Task.java deleted file mode 100644 index 6e2a4d1..0000000 --- a/mybatis-plus-demo/src/main/java/com/cyl/demo/domain/Task.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.cyl.demo.domain; - -import java.time.LocalDateTime; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseAudit; -import lombok.Data; -/** - * 任务对象 cscdc_task - * - * @author feijinping - */ -@Data -@TableName("cscdc_task") -public class Task extends BaseAudit { - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ - private Long id; - - /** 事件编码 */ - @Excel(name = "事件编码") - private String taskNo; - - /** 事件名称 */ - @Excel(name = "事件名称") - private String taskName; - - /** 事发地点 */ - @Excel(name = "事发地点") - private String taskAddress; - - /** 事发时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "事发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime incidentTime; - - /** 病例数 */ - @Excel(name = "病例数") - private Integer numberOfCases; - - /** 接报部门id */ - @Excel(name = "接报部门id") - private Long receiveDepartmentId; - - /** 报告单位id */ - @Excel(name = "报告单位id") - private Long reportDepartmentId; - - /** 接报人id */ - @Excel(name = "接报人id") - private Long receiveUserId; - - /** 报告人id */ - @Excel(name = "报告人id") - private Long reportUserId; - - /** 报告来源 */ - @Excel(name = "报告来源") - private Integer taskSource; - - /** 报告电话 */ - @Excel(name = "报告电话") - private String phone; - - /** 接报时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "接报时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime receiveTime; - - /** 事件描述 */ - @Excel(name = "事件描述") - private String remark; - - /** 事件状态(发布状态) */ - @Excel(name = "事件状态(发布状态)") - private Integer taskStatus; - - /** 事件性质 */ - @Excel(name = "事件性质") - private Integer natureOfEvent; - - /** 事件类型 */ - @Excel(name = "事件类型") - private Integer taskType; - - /** 事发场所 */ - @Excel(name = "事发场所") - private Integer incidentPlace; - - /** 事件分级 */ - @Excel(name = "事件分级") - private Integer eventLevel; - - /** 发布时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime publishTime; - - /** 软删除 */ - @Excel(name = "软删除") - private Integer disabled; - -} diff --git a/mybatis-plus-demo/src/main/java/com/cyl/demo/domain/User2.java b/mybatis-plus-demo/src/main/java/com/cyl/demo/domain/User2.java deleted file mode 100644 index fde9b21..0000000 --- a/mybatis-plus-demo/src/main/java/com/cyl/demo/domain/User2.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.cyl.demo.domain; - -import com.baomidou.mybatisplus.annotation.TableName; - -@TableName("cyl_user") -public class User2 extends User { -} \ No newline at end of file diff --git a/mybatis-plus-demo/src/main/java/com/cyl/demo/mapper/TaskMapper.java b/mybatis-plus-demo/src/main/java/com/cyl/demo/mapper/TaskMapper.java deleted file mode 100644 index 07ff13d..0000000 --- a/mybatis-plus-demo/src/main/java/com/cyl/demo/mapper/TaskMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.cyl.demo.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.demo.domain.Task; - -/** - * 任务Mapper接口 - * - * @author feijinping - */ -public interface TaskMapper extends BaseMapper { - /** - * 查询任务列表 - * - * @param task 任务 - * @return 任务集合 - */ - List selectList1(Task task); -} diff --git a/mybatis-plus-demo/src/main/java/com/cyl/demo/mapper/UserMapper.java b/mybatis-plus-demo/src/main/java/com/cyl/demo/mapper/UserMapper.java deleted file mode 100644 index 8120534..0000000 --- a/mybatis-plus-demo/src/main/java/com/cyl/demo/mapper/UserMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.cyl.demo.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.demo.domain.User2; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface UserMapper extends BaseMapper { - int countByExample(); -} diff --git a/mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/dto/TaskDTO.java b/mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/dto/TaskDTO.java deleted file mode 100644 index c2f5da4..0000000 --- a/mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/dto/TaskDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cyl.demo.pojo.dto; - -import java.time.LocalDateTime; -import com.ruoyi.common.core.domain.BaseAudit; -import lombok.Data; -/** - * 任务 DTO 对象 - * - * @author feijinping - */ -@Data -public class TaskDTO extends BaseAudit { - private Long id; - private String taskNo; - private String taskName; - private String taskAddress; - private LocalDateTime incidentTime; - private Integer numberOfCases; - private Long receiveDepartmentId; - private Long reportDepartmentId; - private Long receiveUserId; - private Long reportUserId; - private Integer taskSource; - private String phone; - private LocalDateTime receiveTime; - private String remark; - private Integer taskStatus; - private Integer natureOfEvent; - private Integer taskType; - private Integer incidentPlace; - private Integer eventLevel; - private LocalDateTime publishTime; - private Integer disabled; -} diff --git a/mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/example/TaskExample.java b/mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/example/TaskExample.java deleted file mode 100644 index d9b29b6..0000000 --- a/mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/example/TaskExample.java +++ /dev/null @@ -1,1734 +0,0 @@ -package com.cyl.demo.pojo.example; - -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.time.LocalDate; -import java.time.LocalDateTime; - -public class TaskExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public TaskExample() { - oredCriteria = new ArrayList<>(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList<>(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - protected void addCriterionForJDBCDate(String condition, Date value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - addCriterion(condition, new java.sql.Date(value.getTime()), property); - } - - protected void addCriterionForJDBCDate(String condition, List values, String property) { - if (values == null || values.size() == 0) { - throw new RuntimeException("Value list for " + property + " cannot be null or empty"); - } - List dateList = new ArrayList<>(); - Iterator iter = values.iterator(); - while (iter.hasNext()) { - dateList.add(new java.sql.Date(iter.next().getTime())); - } - addCriterion(condition, dateList, property); - } - - protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property); - } - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - public Criteria andTaskNoIsNull() { - addCriterion("task_no is null"); - return (Criteria) this; - } - - public Criteria andTaskNoIsNotNull() { - addCriterion("task_no is not null"); - return (Criteria) this; - } - - public Criteria andTaskNoEqualTo(String value) { - addCriterion("task_no =", value, "taskNo"); - return (Criteria) this; - } - - public Criteria andTaskNoNotEqualTo(String value) { - addCriterion("task_no <>", value, "taskNo"); - return (Criteria) this; - } - - public Criteria andTaskNoGreaterThan(String value) { - addCriterion("task_no >", value, "taskNo"); - return (Criteria) this; - } - - public Criteria andTaskNoGreaterThanOrEqualTo(String value) { - addCriterion("task_no >=", value, "taskNo"); - return (Criteria) this; - } - - public Criteria andTaskNoLessThan(String value) { - addCriterion("task_no <", value, "taskNo"); - return (Criteria) this; - } - - public Criteria andTaskNoLessThanOrEqualTo(String value) { - addCriterion("task_no <=", value, "taskNo"); - return (Criteria) this; - } - - public Criteria andTaskNoLike(String value) { - addCriterion("task_no like", value, "taskNo"); - return (Criteria) this; - } - - public Criteria andTaskNoNotLike(String value) { - addCriterion("task_no not like", value, "taskNo"); - return (Criteria) this; - } - - public Criteria andTaskNoIn(List values) { - addCriterion("task_no in", values, "taskNo"); - return (Criteria) this; - } - - public Criteria andTaskNoNotIn(List values) { - addCriterion("task_no not in", values, "taskNo"); - return (Criteria) this; - } - - public Criteria andTaskNoBetween(String value1, String value2) { - addCriterion("task_no between", value1, value2, "taskNo"); - return (Criteria) this; - } - - public Criteria andTaskNoNotBetween(String value1, String value2) { - addCriterion("task_no not between", value1, value2, "taskNo"); - return (Criteria) this; - } - public Criteria andTaskNameIsNull() { - addCriterion("task_name is null"); - return (Criteria) this; - } - - public Criteria andTaskNameIsNotNull() { - addCriterion("task_name is not null"); - return (Criteria) this; - } - - public Criteria andTaskNameEqualTo(String value) { - addCriterion("task_name =", value, "taskName"); - return (Criteria) this; - } - - public Criteria andTaskNameNotEqualTo(String value) { - addCriterion("task_name <>", value, "taskName"); - return (Criteria) this; - } - - public Criteria andTaskNameGreaterThan(String value) { - addCriterion("task_name >", value, "taskName"); - return (Criteria) this; - } - - public Criteria andTaskNameGreaterThanOrEqualTo(String value) { - addCriterion("task_name >=", value, "taskName"); - return (Criteria) this; - } - - public Criteria andTaskNameLessThan(String value) { - addCriterion("task_name <", value, "taskName"); - return (Criteria) this; - } - - public Criteria andTaskNameLessThanOrEqualTo(String value) { - addCriterion("task_name <=", value, "taskName"); - return (Criteria) this; - } - - public Criteria andTaskNameLike(String value) { - addCriterion("task_name like", value, "taskName"); - return (Criteria) this; - } - - public Criteria andTaskNameNotLike(String value) { - addCriterion("task_name not like", value, "taskName"); - return (Criteria) this; - } - - public Criteria andTaskNameIn(List values) { - addCriterion("task_name in", values, "taskName"); - return (Criteria) this; - } - - public Criteria andTaskNameNotIn(List values) { - addCriterion("task_name not in", values, "taskName"); - return (Criteria) this; - } - - public Criteria andTaskNameBetween(String value1, String value2) { - addCriterion("task_name between", value1, value2, "taskName"); - return (Criteria) this; - } - - public Criteria andTaskNameNotBetween(String value1, String value2) { - addCriterion("task_name not between", value1, value2, "taskName"); - return (Criteria) this; - } - public Criteria andTaskAddressIsNull() { - addCriterion("task_address is null"); - return (Criteria) this; - } - - public Criteria andTaskAddressIsNotNull() { - addCriterion("task_address is not null"); - return (Criteria) this; - } - - public Criteria andTaskAddressEqualTo(String value) { - addCriterion("task_address =", value, "taskAddress"); - return (Criteria) this; - } - - public Criteria andTaskAddressNotEqualTo(String value) { - addCriterion("task_address <>", value, "taskAddress"); - return (Criteria) this; - } - - public Criteria andTaskAddressGreaterThan(String value) { - addCriterion("task_address >", value, "taskAddress"); - return (Criteria) this; - } - - public Criteria andTaskAddressGreaterThanOrEqualTo(String value) { - addCriterion("task_address >=", value, "taskAddress"); - return (Criteria) this; - } - - public Criteria andTaskAddressLessThan(String value) { - addCriterion("task_address <", value, "taskAddress"); - return (Criteria) this; - } - - public Criteria andTaskAddressLessThanOrEqualTo(String value) { - addCriterion("task_address <=", value, "taskAddress"); - return (Criteria) this; - } - - public Criteria andTaskAddressLike(String value) { - addCriterion("task_address like", value, "taskAddress"); - return (Criteria) this; - } - - public Criteria andTaskAddressNotLike(String value) { - addCriterion("task_address not like", value, "taskAddress"); - return (Criteria) this; - } - - public Criteria andTaskAddressIn(List values) { - addCriterion("task_address in", values, "taskAddress"); - return (Criteria) this; - } - - public Criteria andTaskAddressNotIn(List values) { - addCriterion("task_address not in", values, "taskAddress"); - return (Criteria) this; - } - - public Criteria andTaskAddressBetween(String value1, String value2) { - addCriterion("task_address between", value1, value2, "taskAddress"); - return (Criteria) this; - } - - public Criteria andTaskAddressNotBetween(String value1, String value2) { - addCriterion("task_address not between", value1, value2, "taskAddress"); - return (Criteria) this; - } - public Criteria andIncidentTimeIsNull() { - addCriterion("incident_time is null"); - return (Criteria) this; - } - - public Criteria andIncidentTimeIsNotNull() { - addCriterion("incident_time is not null"); - return (Criteria) this; - } - - public Criteria andIncidentTimeEqualTo(LocalDateTime value) { - addCriterion("incident_time =", value, "incidentTime"); - return (Criteria) this; - } - - public Criteria andIncidentTimeNotEqualTo(LocalDateTime value) { - addCriterion("incident_time <>", value, "incidentTime"); - return (Criteria) this; - } - - public Criteria andIncidentTimeGreaterThan(LocalDateTime value) { - addCriterion("incident_time >", value, "incidentTime"); - return (Criteria) this; - } - - public Criteria andIncidentTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("incident_time >=", value, "incidentTime"); - return (Criteria) this; - } - - public Criteria andIncidentTimeLessThan(LocalDateTime value) { - addCriterion("incident_time <", value, "incidentTime"); - return (Criteria) this; - } - - public Criteria andIncidentTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("incident_time <=", value, "incidentTime"); - return (Criteria) this; - } - public Criteria andIncidentTimeIn(List values) { - addCriterion("incident_time in", values, "incidentTime"); - return (Criteria) this; - } - - public Criteria andIncidentTimeNotIn(List values) { - addCriterion("incident_time not in", values, "incidentTime"); - return (Criteria) this; - } - - public Criteria andIncidentTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("incident_time between", value1, value2, "incidentTime"); - return (Criteria) this; - } - - public Criteria andIncidentTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("incident_time not between", value1, value2, "incidentTime"); - return (Criteria) this; - } - public Criteria andNumberOfCasesIsNull() { - addCriterion("number_of_cases is null"); - return (Criteria) this; - } - - public Criteria andNumberOfCasesIsNotNull() { - addCriterion("number_of_cases is not null"); - return (Criteria) this; - } - - public Criteria andNumberOfCasesEqualTo(Integer value) { - addCriterion("number_of_cases =", value, "numberOfCases"); - return (Criteria) this; - } - - public Criteria andNumberOfCasesNotEqualTo(Integer value) { - addCriterion("number_of_cases <>", value, "numberOfCases"); - return (Criteria) this; - } - - public Criteria andNumberOfCasesGreaterThan(Integer value) { - addCriterion("number_of_cases >", value, "numberOfCases"); - return (Criteria) this; - } - - public Criteria andNumberOfCasesGreaterThanOrEqualTo(Integer value) { - addCriterion("number_of_cases >=", value, "numberOfCases"); - return (Criteria) this; - } - - public Criteria andNumberOfCasesLessThan(Integer value) { - addCriterion("number_of_cases <", value, "numberOfCases"); - return (Criteria) this; - } - - public Criteria andNumberOfCasesLessThanOrEqualTo(Integer value) { - addCriterion("number_of_cases <=", value, "numberOfCases"); - return (Criteria) this; - } - public Criteria andNumberOfCasesIn(List values) { - addCriterion("number_of_cases in", values, "numberOfCases"); - return (Criteria) this; - } - - public Criteria andNumberOfCasesNotIn(List values) { - addCriterion("number_of_cases not in", values, "numberOfCases"); - return (Criteria) this; - } - - public Criteria andNumberOfCasesBetween(Integer value1, Integer value2) { - addCriterion("number_of_cases between", value1, value2, "numberOfCases"); - return (Criteria) this; - } - - public Criteria andNumberOfCasesNotBetween(Integer value1, Integer value2) { - addCriterion("number_of_cases not between", value1, value2, "numberOfCases"); - return (Criteria) this; - } - public Criteria andReceiveDepartmentIdIsNull() { - addCriterion("receive_department_id is null"); - return (Criteria) this; - } - - public Criteria andReceiveDepartmentIdIsNotNull() { - addCriterion("receive_department_id is not null"); - return (Criteria) this; - } - - public Criteria andReceiveDepartmentIdEqualTo(Long value) { - addCriterion("receive_department_id =", value, "receiveDepartmentId"); - return (Criteria) this; - } - - public Criteria andReceiveDepartmentIdNotEqualTo(Long value) { - addCriterion("receive_department_id <>", value, "receiveDepartmentId"); - return (Criteria) this; - } - - public Criteria andReceiveDepartmentIdGreaterThan(Long value) { - addCriterion("receive_department_id >", value, "receiveDepartmentId"); - return (Criteria) this; - } - - public Criteria andReceiveDepartmentIdGreaterThanOrEqualTo(Long value) { - addCriterion("receive_department_id >=", value, "receiveDepartmentId"); - return (Criteria) this; - } - - public Criteria andReceiveDepartmentIdLessThan(Long value) { - addCriterion("receive_department_id <", value, "receiveDepartmentId"); - return (Criteria) this; - } - - public Criteria andReceiveDepartmentIdLessThanOrEqualTo(Long value) { - addCriterion("receive_department_id <=", value, "receiveDepartmentId"); - return (Criteria) this; - } - public Criteria andReceiveDepartmentIdIn(List values) { - addCriterion("receive_department_id in", values, "receiveDepartmentId"); - return (Criteria) this; - } - - public Criteria andReceiveDepartmentIdNotIn(List values) { - addCriterion("receive_department_id not in", values, "receiveDepartmentId"); - return (Criteria) this; - } - - public Criteria andReceiveDepartmentIdBetween(Long value1, Long value2) { - addCriterion("receive_department_id between", value1, value2, "receiveDepartmentId"); - return (Criteria) this; - } - - public Criteria andReceiveDepartmentIdNotBetween(Long value1, Long value2) { - addCriterion("receive_department_id not between", value1, value2, "receiveDepartmentId"); - return (Criteria) this; - } - public Criteria andReportDepartmentIdIsNull() { - addCriterion("report_department_id is null"); - return (Criteria) this; - } - - public Criteria andReportDepartmentIdIsNotNull() { - addCriterion("report_department_id is not null"); - return (Criteria) this; - } - - public Criteria andReportDepartmentIdEqualTo(Long value) { - addCriterion("report_department_id =", value, "reportDepartmentId"); - return (Criteria) this; - } - - public Criteria andReportDepartmentIdNotEqualTo(Long value) { - addCriterion("report_department_id <>", value, "reportDepartmentId"); - return (Criteria) this; - } - - public Criteria andReportDepartmentIdGreaterThan(Long value) { - addCriterion("report_department_id >", value, "reportDepartmentId"); - return (Criteria) this; - } - - public Criteria andReportDepartmentIdGreaterThanOrEqualTo(Long value) { - addCriterion("report_department_id >=", value, "reportDepartmentId"); - return (Criteria) this; - } - - public Criteria andReportDepartmentIdLessThan(Long value) { - addCriterion("report_department_id <", value, "reportDepartmentId"); - return (Criteria) this; - } - - public Criteria andReportDepartmentIdLessThanOrEqualTo(Long value) { - addCriterion("report_department_id <=", value, "reportDepartmentId"); - return (Criteria) this; - } - public Criteria andReportDepartmentIdIn(List values) { - addCriterion("report_department_id in", values, "reportDepartmentId"); - return (Criteria) this; - } - - public Criteria andReportDepartmentIdNotIn(List values) { - addCriterion("report_department_id not in", values, "reportDepartmentId"); - return (Criteria) this; - } - - public Criteria andReportDepartmentIdBetween(Long value1, Long value2) { - addCriterion("report_department_id between", value1, value2, "reportDepartmentId"); - return (Criteria) this; - } - - public Criteria andReportDepartmentIdNotBetween(Long value1, Long value2) { - addCriterion("report_department_id not between", value1, value2, "reportDepartmentId"); - return (Criteria) this; - } - public Criteria andReceiveUserIdIsNull() { - addCriterion("receive_user_id is null"); - return (Criteria) this; - } - - public Criteria andReceiveUserIdIsNotNull() { - addCriterion("receive_user_id is not null"); - return (Criteria) this; - } - - public Criteria andReceiveUserIdEqualTo(Long value) { - addCriterion("receive_user_id =", value, "receiveUserId"); - return (Criteria) this; - } - - public Criteria andReceiveUserIdNotEqualTo(Long value) { - addCriterion("receive_user_id <>", value, "receiveUserId"); - return (Criteria) this; - } - - public Criteria andReceiveUserIdGreaterThan(Long value) { - addCriterion("receive_user_id >", value, "receiveUserId"); - return (Criteria) this; - } - - public Criteria andReceiveUserIdGreaterThanOrEqualTo(Long value) { - addCriterion("receive_user_id >=", value, "receiveUserId"); - return (Criteria) this; - } - - public Criteria andReceiveUserIdLessThan(Long value) { - addCriterion("receive_user_id <", value, "receiveUserId"); - return (Criteria) this; - } - - public Criteria andReceiveUserIdLessThanOrEqualTo(Long value) { - addCriterion("receive_user_id <=", value, "receiveUserId"); - return (Criteria) this; - } - public Criteria andReceiveUserIdIn(List values) { - addCriterion("receive_user_id in", values, "receiveUserId"); - return (Criteria) this; - } - - public Criteria andReceiveUserIdNotIn(List values) { - addCriterion("receive_user_id not in", values, "receiveUserId"); - return (Criteria) this; - } - - public Criteria andReceiveUserIdBetween(Long value1, Long value2) { - addCriterion("receive_user_id between", value1, value2, "receiveUserId"); - return (Criteria) this; - } - - public Criteria andReceiveUserIdNotBetween(Long value1, Long value2) { - addCriterion("receive_user_id not between", value1, value2, "receiveUserId"); - return (Criteria) this; - } - public Criteria andReportUserIdIsNull() { - addCriterion("report_user_id is null"); - return (Criteria) this; - } - - public Criteria andReportUserIdIsNotNull() { - addCriterion("report_user_id is not null"); - return (Criteria) this; - } - - public Criteria andReportUserIdEqualTo(Long value) { - addCriterion("report_user_id =", value, "reportUserId"); - return (Criteria) this; - } - - public Criteria andReportUserIdNotEqualTo(Long value) { - addCriterion("report_user_id <>", value, "reportUserId"); - return (Criteria) this; - } - - public Criteria andReportUserIdGreaterThan(Long value) { - addCriterion("report_user_id >", value, "reportUserId"); - return (Criteria) this; - } - - public Criteria andReportUserIdGreaterThanOrEqualTo(Long value) { - addCriterion("report_user_id >=", value, "reportUserId"); - return (Criteria) this; - } - - public Criteria andReportUserIdLessThan(Long value) { - addCriterion("report_user_id <", value, "reportUserId"); - return (Criteria) this; - } - - public Criteria andReportUserIdLessThanOrEqualTo(Long value) { - addCriterion("report_user_id <=", value, "reportUserId"); - return (Criteria) this; - } - public Criteria andReportUserIdIn(List values) { - addCriterion("report_user_id in", values, "reportUserId"); - return (Criteria) this; - } - - public Criteria andReportUserIdNotIn(List values) { - addCriterion("report_user_id not in", values, "reportUserId"); - return (Criteria) this; - } - - public Criteria andReportUserIdBetween(Long value1, Long value2) { - addCriterion("report_user_id between", value1, value2, "reportUserId"); - return (Criteria) this; - } - - public Criteria andReportUserIdNotBetween(Long value1, Long value2) { - addCriterion("report_user_id not between", value1, value2, "reportUserId"); - return (Criteria) this; - } - public Criteria andTaskSourceIsNull() { - addCriterion("task_source is null"); - return (Criteria) this; - } - - public Criteria andTaskSourceIsNotNull() { - addCriterion("task_source is not null"); - return (Criteria) this; - } - - public Criteria andTaskSourceEqualTo(Integer value) { - addCriterion("task_source =", value, "taskSource"); - return (Criteria) this; - } - - public Criteria andTaskSourceNotEqualTo(Integer value) { - addCriterion("task_source <>", value, "taskSource"); - return (Criteria) this; - } - - public Criteria andTaskSourceGreaterThan(Integer value) { - addCriterion("task_source >", value, "taskSource"); - return (Criteria) this; - } - - public Criteria andTaskSourceGreaterThanOrEqualTo(Integer value) { - addCriterion("task_source >=", value, "taskSource"); - return (Criteria) this; - } - - public Criteria andTaskSourceLessThan(Integer value) { - addCriterion("task_source <", value, "taskSource"); - return (Criteria) this; - } - - public Criteria andTaskSourceLessThanOrEqualTo(Integer value) { - addCriterion("task_source <=", value, "taskSource"); - return (Criteria) this; - } - public Criteria andTaskSourceIn(List values) { - addCriterion("task_source in", values, "taskSource"); - return (Criteria) this; - } - - public Criteria andTaskSourceNotIn(List values) { - addCriterion("task_source not in", values, "taskSource"); - return (Criteria) this; - } - - public Criteria andTaskSourceBetween(Integer value1, Integer value2) { - addCriterion("task_source between", value1, value2, "taskSource"); - return (Criteria) this; - } - - public Criteria andTaskSourceNotBetween(Integer value1, Integer value2) { - addCriterion("task_source not between", value1, value2, "taskSource"); - return (Criteria) this; - } - public Criteria andPhoneIsNull() { - addCriterion("phone is null"); - return (Criteria) this; - } - - public Criteria andPhoneIsNotNull() { - addCriterion("phone is not null"); - return (Criteria) this; - } - - public Criteria andPhoneEqualTo(String value) { - addCriterion("phone =", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotEqualTo(String value) { - addCriterion("phone <>", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneGreaterThan(String value) { - addCriterion("phone >", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneGreaterThanOrEqualTo(String value) { - addCriterion("phone >=", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLessThan(String value) { - addCriterion("phone <", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLessThanOrEqualTo(String value) { - addCriterion("phone <=", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLike(String value) { - addCriterion("phone like", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotLike(String value) { - addCriterion("phone not like", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneIn(List values) { - addCriterion("phone in", values, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotIn(List values) { - addCriterion("phone not in", values, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneBetween(String value1, String value2) { - addCriterion("phone between", value1, value2, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotBetween(String value1, String value2) { - addCriterion("phone not between", value1, value2, "phone"); - return (Criteria) this; - } - public Criteria andReceiveTimeIsNull() { - addCriterion("receive_time is null"); - return (Criteria) this; - } - - public Criteria andReceiveTimeIsNotNull() { - addCriterion("receive_time is not null"); - return (Criteria) this; - } - - public Criteria andReceiveTimeEqualTo(LocalDateTime value) { - addCriterion("receive_time =", value, "receiveTime"); - return (Criteria) this; - } - - public Criteria andReceiveTimeNotEqualTo(LocalDateTime value) { - addCriterion("receive_time <>", value, "receiveTime"); - return (Criteria) this; - } - - public Criteria andReceiveTimeGreaterThan(LocalDateTime value) { - addCriterion("receive_time >", value, "receiveTime"); - return (Criteria) this; - } - - public Criteria andReceiveTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("receive_time >=", value, "receiveTime"); - return (Criteria) this; - } - - public Criteria andReceiveTimeLessThan(LocalDateTime value) { - addCriterion("receive_time <", value, "receiveTime"); - return (Criteria) this; - } - - public Criteria andReceiveTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("receive_time <=", value, "receiveTime"); - return (Criteria) this; - } - public Criteria andReceiveTimeIn(List values) { - addCriterion("receive_time in", values, "receiveTime"); - return (Criteria) this; - } - - public Criteria andReceiveTimeNotIn(List values) { - addCriterion("receive_time not in", values, "receiveTime"); - return (Criteria) this; - } - - public Criteria andReceiveTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("receive_time between", value1, value2, "receiveTime"); - return (Criteria) this; - } - - public Criteria andReceiveTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("receive_time not between", value1, value2, "receiveTime"); - return (Criteria) this; - } - public Criteria andRemarkIsNull() { - addCriterion("remark is null"); - return (Criteria) this; - } - - public Criteria andRemarkIsNotNull() { - addCriterion("remark is not null"); - return (Criteria) this; - } - - public Criteria andRemarkEqualTo(String value) { - addCriterion("remark =", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotEqualTo(String value) { - addCriterion("remark <>", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkGreaterThan(String value) { - addCriterion("remark >", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkGreaterThanOrEqualTo(String value) { - addCriterion("remark >=", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLessThan(String value) { - addCriterion("remark <", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLessThanOrEqualTo(String value) { - addCriterion("remark <=", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkLike(String value) { - addCriterion("remark like", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotLike(String value) { - addCriterion("remark not like", value, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkIn(List values) { - addCriterion("remark in", values, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotIn(List values) { - addCriterion("remark not in", values, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkBetween(String value1, String value2) { - addCriterion("remark between", value1, value2, "remark"); - return (Criteria) this; - } - - public Criteria andRemarkNotBetween(String value1, String value2) { - addCriterion("remark not between", value1, value2, "remark"); - return (Criteria) this; - } - public Criteria andTaskStatusIsNull() { - addCriterion("task_status is null"); - return (Criteria) this; - } - - public Criteria andTaskStatusIsNotNull() { - addCriterion("task_status is not null"); - return (Criteria) this; - } - - public Criteria andTaskStatusEqualTo(Integer value) { - addCriterion("task_status =", value, "taskStatus"); - return (Criteria) this; - } - - public Criteria andTaskStatusNotEqualTo(Integer value) { - addCriterion("task_status <>", value, "taskStatus"); - return (Criteria) this; - } - - public Criteria andTaskStatusGreaterThan(Integer value) { - addCriterion("task_status >", value, "taskStatus"); - return (Criteria) this; - } - - public Criteria andTaskStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("task_status >=", value, "taskStatus"); - return (Criteria) this; - } - - public Criteria andTaskStatusLessThan(Integer value) { - addCriterion("task_status <", value, "taskStatus"); - return (Criteria) this; - } - - public Criteria andTaskStatusLessThanOrEqualTo(Integer value) { - addCriterion("task_status <=", value, "taskStatus"); - return (Criteria) this; - } - public Criteria andTaskStatusIn(List values) { - addCriterion("task_status in", values, "taskStatus"); - return (Criteria) this; - } - - public Criteria andTaskStatusNotIn(List values) { - addCriterion("task_status not in", values, "taskStatus"); - return (Criteria) this; - } - - public Criteria andTaskStatusBetween(Integer value1, Integer value2) { - addCriterion("task_status between", value1, value2, "taskStatus"); - return (Criteria) this; - } - - public Criteria andTaskStatusNotBetween(Integer value1, Integer value2) { - addCriterion("task_status not between", value1, value2, "taskStatus"); - return (Criteria) this; - } - public Criteria andNatureOfEventIsNull() { - addCriterion("nature_of_event is null"); - return (Criteria) this; - } - - public Criteria andNatureOfEventIsNotNull() { - addCriterion("nature_of_event is not null"); - return (Criteria) this; - } - - public Criteria andNatureOfEventEqualTo(Integer value) { - addCriterion("nature_of_event =", value, "natureOfEvent"); - return (Criteria) this; - } - - public Criteria andNatureOfEventNotEqualTo(Integer value) { - addCriterion("nature_of_event <>", value, "natureOfEvent"); - return (Criteria) this; - } - - public Criteria andNatureOfEventGreaterThan(Integer value) { - addCriterion("nature_of_event >", value, "natureOfEvent"); - return (Criteria) this; - } - - public Criteria andNatureOfEventGreaterThanOrEqualTo(Integer value) { - addCriterion("nature_of_event >=", value, "natureOfEvent"); - return (Criteria) this; - } - - public Criteria andNatureOfEventLessThan(Integer value) { - addCriterion("nature_of_event <", value, "natureOfEvent"); - return (Criteria) this; - } - - public Criteria andNatureOfEventLessThanOrEqualTo(Integer value) { - addCriterion("nature_of_event <=", value, "natureOfEvent"); - return (Criteria) this; - } - public Criteria andNatureOfEventIn(List values) { - addCriterion("nature_of_event in", values, "natureOfEvent"); - return (Criteria) this; - } - - public Criteria andNatureOfEventNotIn(List values) { - addCriterion("nature_of_event not in", values, "natureOfEvent"); - return (Criteria) this; - } - - public Criteria andNatureOfEventBetween(Integer value1, Integer value2) { - addCriterion("nature_of_event between", value1, value2, "natureOfEvent"); - return (Criteria) this; - } - - public Criteria andNatureOfEventNotBetween(Integer value1, Integer value2) { - addCriterion("nature_of_event not between", value1, value2, "natureOfEvent"); - return (Criteria) this; - } - public Criteria andTaskTypeIsNull() { - addCriterion("task_type is null"); - return (Criteria) this; - } - - public Criteria andTaskTypeIsNotNull() { - addCriterion("task_type is not null"); - return (Criteria) this; - } - - public Criteria andTaskTypeEqualTo(Integer value) { - addCriterion("task_type =", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeNotEqualTo(Integer value) { - addCriterion("task_type <>", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeGreaterThan(Integer value) { - addCriterion("task_type >", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("task_type >=", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeLessThan(Integer value) { - addCriterion("task_type <", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeLessThanOrEqualTo(Integer value) { - addCriterion("task_type <=", value, "taskType"); - return (Criteria) this; - } - public Criteria andTaskTypeIn(List values) { - addCriterion("task_type in", values, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeNotIn(List values) { - addCriterion("task_type not in", values, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeBetween(Integer value1, Integer value2) { - addCriterion("task_type between", value1, value2, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeNotBetween(Integer value1, Integer value2) { - addCriterion("task_type not between", value1, value2, "taskType"); - return (Criteria) this; - } - public Criteria andIncidentPlaceIsNull() { - addCriterion("incident_place is null"); - return (Criteria) this; - } - - public Criteria andIncidentPlaceIsNotNull() { - addCriterion("incident_place is not null"); - return (Criteria) this; - } - - public Criteria andIncidentPlaceEqualTo(Integer value) { - addCriterion("incident_place =", value, "incidentPlace"); - return (Criteria) this; - } - - public Criteria andIncidentPlaceNotEqualTo(Integer value) { - addCriterion("incident_place <>", value, "incidentPlace"); - return (Criteria) this; - } - - public Criteria andIncidentPlaceGreaterThan(Integer value) { - addCriterion("incident_place >", value, "incidentPlace"); - return (Criteria) this; - } - - public Criteria andIncidentPlaceGreaterThanOrEqualTo(Integer value) { - addCriterion("incident_place >=", value, "incidentPlace"); - return (Criteria) this; - } - - public Criteria andIncidentPlaceLessThan(Integer value) { - addCriterion("incident_place <", value, "incidentPlace"); - return (Criteria) this; - } - - public Criteria andIncidentPlaceLessThanOrEqualTo(Integer value) { - addCriterion("incident_place <=", value, "incidentPlace"); - return (Criteria) this; - } - public Criteria andIncidentPlaceIn(List values) { - addCriterion("incident_place in", values, "incidentPlace"); - return (Criteria) this; - } - - public Criteria andIncidentPlaceNotIn(List values) { - addCriterion("incident_place not in", values, "incidentPlace"); - return (Criteria) this; - } - - public Criteria andIncidentPlaceBetween(Integer value1, Integer value2) { - addCriterion("incident_place between", value1, value2, "incidentPlace"); - return (Criteria) this; - } - - public Criteria andIncidentPlaceNotBetween(Integer value1, Integer value2) { - addCriterion("incident_place not between", value1, value2, "incidentPlace"); - return (Criteria) this; - } - public Criteria andEventLevelIsNull() { - addCriterion("event_level is null"); - return (Criteria) this; - } - - public Criteria andEventLevelIsNotNull() { - addCriterion("event_level is not null"); - return (Criteria) this; - } - - public Criteria andEventLevelEqualTo(Integer value) { - addCriterion("event_level =", value, "eventLevel"); - return (Criteria) this; - } - - public Criteria andEventLevelNotEqualTo(Integer value) { - addCriterion("event_level <>", value, "eventLevel"); - return (Criteria) this; - } - - public Criteria andEventLevelGreaterThan(Integer value) { - addCriterion("event_level >", value, "eventLevel"); - return (Criteria) this; - } - - public Criteria andEventLevelGreaterThanOrEqualTo(Integer value) { - addCriterion("event_level >=", value, "eventLevel"); - return (Criteria) this; - } - - public Criteria andEventLevelLessThan(Integer value) { - addCriterion("event_level <", value, "eventLevel"); - return (Criteria) this; - } - - public Criteria andEventLevelLessThanOrEqualTo(Integer value) { - addCriterion("event_level <=", value, "eventLevel"); - return (Criteria) this; - } - public Criteria andEventLevelIn(List values) { - addCriterion("event_level in", values, "eventLevel"); - return (Criteria) this; - } - - public Criteria andEventLevelNotIn(List values) { - addCriterion("event_level not in", values, "eventLevel"); - return (Criteria) this; - } - - public Criteria andEventLevelBetween(Integer value1, Integer value2) { - addCriterion("event_level between", value1, value2, "eventLevel"); - return (Criteria) this; - } - - public Criteria andEventLevelNotBetween(Integer value1, Integer value2) { - addCriterion("event_level not between", value1, value2, "eventLevel"); - return (Criteria) this; - } - public Criteria andPublishTimeIsNull() { - addCriterion("publish_time is null"); - return (Criteria) this; - } - - public Criteria andPublishTimeIsNotNull() { - addCriterion("publish_time is not null"); - return (Criteria) this; - } - - public Criteria andPublishTimeEqualTo(LocalDateTime value) { - addCriterion("publish_time =", value, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeNotEqualTo(LocalDateTime value) { - addCriterion("publish_time <>", value, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeGreaterThan(LocalDateTime value) { - addCriterion("publish_time >", value, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("publish_time >=", value, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeLessThan(LocalDateTime value) { - addCriterion("publish_time <", value, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("publish_time <=", value, "publishTime"); - return (Criteria) this; - } - public Criteria andPublishTimeIn(List values) { - addCriterion("publish_time in", values, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeNotIn(List values) { - addCriterion("publish_time not in", values, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("publish_time between", value1, value2, "publishTime"); - return (Criteria) this; - } - - public Criteria andPublishTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("publish_time not between", value1, value2, "publishTime"); - return (Criteria) this; - } - public Criteria andDisabledIsNull() { - addCriterion("disabled is null"); - return (Criteria) this; - } - - public Criteria andDisabledIsNotNull() { - addCriterion("disabled is not null"); - return (Criteria) this; - } - - public Criteria andDisabledEqualTo(Integer value) { - addCriterion("disabled =", value, "disabled"); - return (Criteria) this; - } - - public Criteria andDisabledNotEqualTo(Integer value) { - addCriterion("disabled <>", value, "disabled"); - return (Criteria) this; - } - - public Criteria andDisabledGreaterThan(Integer value) { - addCriterion("disabled >", value, "disabled"); - return (Criteria) this; - } - - public Criteria andDisabledGreaterThanOrEqualTo(Integer value) { - addCriterion("disabled >=", value, "disabled"); - return (Criteria) this; - } - - public Criteria andDisabledLessThan(Integer value) { - addCriterion("disabled <", value, "disabled"); - return (Criteria) this; - } - - public Criteria andDisabledLessThanOrEqualTo(Integer value) { - addCriterion("disabled <=", value, "disabled"); - return (Criteria) this; - } - public Criteria andDisabledIn(List values) { - addCriterion("disabled in", values, "disabled"); - return (Criteria) this; - } - - public Criteria andDisabledNotIn(List values) { - addCriterion("disabled not in", values, "disabled"); - return (Criteria) this; - } - - public Criteria andDisabledBetween(Integer value1, Integer value2) { - addCriterion("disabled between", value1, value2, "disabled"); - return (Criteria) this; - } - - public Criteria andDisabledNotBetween(Integer value1, Integer value2) { - addCriterion("disabled not between", value1, value2, "disabled"); - return (Criteria) this; - } - public Criteria andCreateByIsNull() { - addCriterion("create_by is null"); - return (Criteria) this; - } - - public Criteria andCreateByIsNotNull() { - addCriterion("create_by is not null"); - return (Criteria) this; - } - - public Criteria andCreateByEqualTo(Long value) { - addCriterion("create_by =", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotEqualTo(Long value) { - addCriterion("create_by <>", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByGreaterThan(Long value) { - addCriterion("create_by >", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByGreaterThanOrEqualTo(Long value) { - addCriterion("create_by >=", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByLessThan(Long value) { - addCriterion("create_by <", value, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByLessThanOrEqualTo(Long value) { - addCriterion("create_by <=", value, "createBy"); - return (Criteria) this; - } - public Criteria andCreateByIn(List values) { - addCriterion("create_by in", values, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotIn(List values) { - addCriterion("create_by not in", values, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByBetween(Long value1, Long value2) { - addCriterion("create_by between", value1, value2, "createBy"); - return (Criteria) this; - } - - public Criteria andCreateByNotBetween(Long value1, Long value2) { - addCriterion("create_by not between", value1, value2, "createBy"); - return (Criteria) this; - } - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(LocalDateTime value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(LocalDateTime value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(LocalDateTime value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(LocalDateTime value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - public Criteria andUpdateByIsNull() { - addCriterion("update_by is null"); - return (Criteria) this; - } - - public Criteria andUpdateByIsNotNull() { - addCriterion("update_by is not null"); - return (Criteria) this; - } - - public Criteria andUpdateByEqualTo(Long value) { - addCriterion("update_by =", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByNotEqualTo(Long value) { - addCriterion("update_by <>", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByGreaterThan(Long value) { - addCriterion("update_by >", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByGreaterThanOrEqualTo(Long value) { - addCriterion("update_by >=", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByLessThan(Long value) { - addCriterion("update_by <", value, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByLessThanOrEqualTo(Long value) { - addCriterion("update_by <=", value, "updateBy"); - return (Criteria) this; - } - public Criteria andUpdateByIn(List values) { - addCriterion("update_by in", values, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByNotIn(List values) { - addCriterion("update_by not in", values, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByBetween(Long value1, Long value2) { - addCriterion("update_by between", value1, value2, "updateBy"); - return (Criteria) this; - } - - public Criteria andUpdateByNotBetween(Long value1, Long value2) { - addCriterion("update_by not between", value1, value2, "updateBy"); - return (Criteria) this; - } - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(LocalDateTime value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(LocalDateTime value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(LocalDateTime value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(LocalDateTime value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} diff --git a/mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/query/TaskQuery.java b/mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/query/TaskQuery.java deleted file mode 100644 index 1879b2d..0000000 --- a/mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/query/TaskQuery.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.cyl.demo.pojo.query; - -import java.time.LocalDateTime; -import lombok.Data; - -/** - * 任务 查询 对象 - * - * @author feijinping - */ -@Data -public class TaskQuery { - /** 事件编码 精确匹配 */ - private String taskNo; - - /** 事件名称 模糊匹配 */ - private String taskNameLike; - - /** 事发地点 不等于 */ - private String taskAddressNotEqual; - - /** 事发时间 大于 */ - private LocalDateTime incidentTimeGreatThan; - - /** 病例数 大于等于 */ - private Integer numberOfCasesGreatThanOrEqual; - - /** 接报部门id 小于 */ - private Long receiveDepartmentIdLessThan; - - /** 报告单位id 小于 */ - private Long reportDepartmentIdLessThan; - - /** 接报人id 范围 */ - private Long[] receiveUserIdRange; - - /** 报告人id 精确匹配 */ - private Long reportUserId; - - /** 报告来源 精确匹配 */ - private Integer taskSource; - - /** 报告电话 精确匹配 */ - private String phone; - - /** 接报时间 精确匹配 */ - private LocalDateTime receiveTime; - - /** 事件状态 精确匹配 */ - private Integer taskStatus; - - /** 事件性质 精确匹配 */ - private Integer natureOfEvent; - - /** 事件类型 精确匹配 */ - private Integer taskType; - - /** 事发场所 精确匹配 */ - private Integer incidentPlace; - - /** 事件分级 精确匹配 */ - private Integer eventLevel; - - /** 发布时间 范围 */ - private LocalDateTime[] publishTimeRange; - - /** 软删除 精确匹配 */ - private Integer disabled; - -} diff --git a/mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/vo/TaskVO.java b/mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/vo/TaskVO.java deleted file mode 100644 index 4b49074..0000000 --- a/mybatis-plus-demo/src/main/java/com/cyl/demo/pojo/vo/TaskVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cyl.demo.pojo.vo; - -import java.time.LocalDateTime; -import com.ruoyi.common.core.domain.BaseAudit; -import lombok.Data; -/** - * 任务 数据视图对象 - * - * @author feijinping - */ -@Data -public class TaskVO extends BaseAudit { - private Long id; - private String taskNo; - private String taskName; - private String taskAddress; - private LocalDateTime incidentTime; - private Integer numberOfCases; - private Long receiveDepartmentId; - private Long reportDepartmentId; - private Long receiveUserId; - private Long reportUserId; - private Integer taskSource; - private String phone; - private LocalDateTime receiveTime; - private String remark; - private Integer taskStatus; - private Integer natureOfEvent; - private Integer taskType; - private Integer incidentPlace; - private Integer eventLevel; - private LocalDateTime publishTime; - private Integer disabled; -} diff --git a/mybatis-plus-demo/src/main/java/com/cyl/demo/service/ITaskService.java b/mybatis-plus-demo/src/main/java/com/cyl/demo/service/ITaskService.java deleted file mode 100644 index 0b6490e..0000000 --- a/mybatis-plus-demo/src/main/java/com/cyl/demo/service/ITaskService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.cyl.demo.service; - -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Page; -import java.util.List; -import com.cyl.demo.domain.Task; -import com.cyl.demo.pojo.query.TaskQuery; - -/** - * 任务Service接口 - * - * @author feijinping - */ -public interface ITaskService { - /** - * 查询任务 - * - * @param id 任务主键 - * @return 任务 - */ - Task selectById(Long id); - - /** - * 查询任务列表 - * - * @param query 查询条件 - * @param page 分页条件 - * @return 任务集合 - */ - List selectList(TaskQuery query, Pageable page); - - /** - * 新增任务 - * - * @param task 任务 - * @return 结果 - */ - int insert(Task task); - - /** - * 修改任务 - * - * @param task 任务 - * @return 结果 - */ - int update(Task task); - - /** - * 批量删除任务 - * - * @param ids 需要删除的任务主键集合 - * @return 结果 - */ - int deleteByIds(Long[] ids); - - /** - * 删除任务信息 - * - * @param id 任务主键 - * @return 结果 - */ - int deleteById(Long id); -} diff --git a/mybatis-plus-demo/src/main/java/com/cyl/demo/service/impl/TaskServiceImpl.java b/mybatis-plus-demo/src/main/java/com/cyl/demo/service/impl/TaskServiceImpl.java deleted file mode 100644 index 80490b1..0000000 --- a/mybatis-plus-demo/src/main/java/com/cyl/demo/service/impl/TaskServiceImpl.java +++ /dev/null @@ -1,188 +0,0 @@ -package com.cyl.demo.service.impl; - -import java.util.Arrays; -import java.util.List; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.apache.commons.lang3.StringUtils; -import com.cyl.demo.mapper.TaskMapper; -import com.cyl.demo.domain.Task; -import com.cyl.demo.pojo.query.TaskQuery; -import com.cyl.demo.service.ITaskService; - -/** - * 任务Service业务层处理 - * - * @author feijinping - */ -@Service -public class TaskServiceImpl implements ITaskService { - @Autowired - private TaskMapper taskMapper; - - /** - * 查询任务 - * - * @param id 任务主键 - * @return 任务 - */ - @Override - public Task selectById(Long id) { - return taskMapper.selectById(id); - } - - /** - * 查询任务列表 - * - * @param query 查询条件 - * @param page 分页条件 - * @return 任务 - */ - @Override - public List selectList(TaskQuery query, Pageable page) { - if (page != null) { - PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize()); - } - QueryWrapper qw = new QueryWrapper<>(); - String taskNo = query.getTaskNo(); - if (!StringUtils.isEmpty(taskNo)) { - qw.eq("task_no", taskNo); - } - String taskNameLike = query.getTaskNameLike(); - if (!StringUtils.isEmpty(taskNameLike)) { - qw.like("task_name", taskNameLike); - } - String taskAddressNotEqual = query.getTaskAddressNotEqual(); - if (!StringUtils.isEmpty(taskAddressNotEqual)) { - qw.ne("task_address", taskAddressNotEqual); - } - LocalDateTime incidentTimeGreatThan = query.getIncidentTimeGreatThan(); - if (incidentTimeGreatThan != null) { - qw.gt("incident_time", incidentTimeGreatThan); - } - Integer numberOfCasesGreatThanOrEqual = query.getNumberOfCasesGreatThanOrEqual(); - if (numberOfCasesGreatThanOrEqual != null) { - qw.ge("number_of_cases", numberOfCasesGreatThanOrEqual); - } - Long receiveDepartmentIdLessThan = query.getReceiveDepartmentIdLessThan(); - if (receiveDepartmentIdLessThan != null) { - qw.lt("receive_department_id", receiveDepartmentIdLessThan); - } - Long reportDepartmentIdLessThan = query.getReportDepartmentIdLessThan(); - if (reportDepartmentIdLessThan != null) { - qw.lt("report_department_id", reportDepartmentIdLessThan); - } - Long[] receiveUserIdRange = query.getReceiveUserIdRange(); - if (receiveUserIdRange != null && receiveUserIdRange.length == 2) { - Long start = receiveUserIdRange[0]; - if (start != null) { - qw.ge("receive_user_id", start); - } - Long end = receiveUserIdRange[0]; - if (end != null) { - qw.le("receive_user_id", end); - } - } - Long reportUserId = query.getReportUserId(); - if (reportUserId != null) { - qw.eq("report_user_id", reportUserId); - } - Integer taskSource = query.getTaskSource(); - if (taskSource != null) { - qw.eq("task_source", taskSource); - } - String phone = query.getPhone(); - if (!StringUtils.isEmpty(phone)) { - qw.eq("phone", phone); - } - LocalDateTime receiveTime = query.getReceiveTime(); - if (receiveTime != null) { - qw.eq("receive_time", receiveTime); - } - Integer taskStatus = query.getTaskStatus(); - if (taskStatus != null) { - qw.eq("task_status", taskStatus); - } - Integer natureOfEvent = query.getNatureOfEvent(); - if (natureOfEvent != null) { - qw.eq("nature_of_event", natureOfEvent); - } - Integer taskType = query.getTaskType(); - if (taskType != null) { - qw.eq("task_type", taskType); - } - Integer incidentPlace = query.getIncidentPlace(); - if (incidentPlace != null) { - qw.eq("incident_place", incidentPlace); - } - Integer eventLevel = query.getEventLevel(); - if (eventLevel != null) { - qw.eq("event_level", eventLevel); - } - LocalDateTime[] publishTimeRange = query.getPublishTimeRange(); - if (publishTimeRange != null && publishTimeRange.length == 2) { - LocalDateTime start = publishTimeRange[0]; - if (start != null) { - qw.ge("publish_time", start); - } - LocalDateTime end = publishTimeRange[0]; - if (end != null) { - qw.le("publish_time", end); - } - } - Integer disabled = query.getDisabled(); - if (disabled != null) { - qw.eq("disabled", disabled); - } - return taskMapper.selectList(qw); - } - - /** - * 新增任务 - * - * @param task 任务 - * @return 结果 - */ - @Override - public int insert(Task task) { - task.setCreateTime(LocalDateTime.now()); - return taskMapper.insert(task); - } - - /** - * 修改任务 - * - * @param task 任务 - * @return 结果 - */ - @Override - public int update(Task task) { - return taskMapper.updateById(task); - } - - /** - * 批量删除任务 - * - * @param ids 需要删除的任务主键 - * @return 结果 - */ - @Override - public int deleteByIds(Long[] ids) { - return taskMapper.deleteBatchIds(Arrays.asList(ids)); - } - - /** - * 删除任务信息 - * - * @param id 任务主键 - * @return 结果 - */ - @Override - public int deleteById(Long id) { - return taskMapper.deleteById(id); - } -} diff --git a/mybatis-plus-demo/src/main/resources/mapper/TaskMapper.xml b/mybatis-plus-demo/src/main/resources/mapper/TaskMapper.xml deleted file mode 100644 index b7d8407..0000000 --- a/mybatis-plus-demo/src/main/resources/mapper/TaskMapper.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, task_no, task_name, task_address, incident_time, number_of_cases, receive_department_id, report_department_id, receive_user_id, report_user_id, task_source, phone, receive_time, remark, task_status, nature_of_event, task_type, incident_place, event_level, publish_time, disabled, create_by, create_time, update_by, update_time , create_by, create_time, update_by, update_time from cscdc_task - - - - diff --git a/mybatis-plus-demo/src/main/resources/mapper/UserMapper.xml b/mybatis-plus-demo/src/main/resources/mapper/UserMapper.xml deleted file mode 100644 index 251fd93..0000000 --- a/mybatis-plus-demo/src/main/resources/mapper/UserMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/mybatis-plus-demo/src/test/java/com/cyl/demo/TestApplication.java b/mybatis-plus-demo/src/test/java/com/cyl/demo/TestApplication.java deleted file mode 100644 index 0b91aec..0000000 --- a/mybatis-plus-demo/src/test/java/com/cyl/demo/TestApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cyl.demo; - -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -@MapperScan("com.cyl.demo.mapper") -public class TestApplication { - public static void main(String[] args) { - SpringApplication.run(TestApplication.class, args); - } -} diff --git a/mybatis-plus-demo/src/test/java/com/cyl/demo/mapper/TaskTest.java b/mybatis-plus-demo/src/test/java/com/cyl/demo/mapper/TaskTest.java deleted file mode 100644 index 9cd2484..0000000 --- a/mybatis-plus-demo/src/test/java/com/cyl/demo/mapper/TaskTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.cyl.demo.mapper; - - -import com.cyl.demo.TestApplication; -import com.cyl.demo.domain.User2; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import java.util.List; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.NONE) -public class TaskTest { - - @Autowired - private UserMapper userMapper; - - @Test - public void testSelect() { - System.out.println(("----- selectAll method test ------")); - List userList = userMapper.selectList(null); - Assert.assertEquals(5, userList.size()); - userList.forEach(System.out::println); - assert userMapper.countByExample() == 5; - } - -} \ No newline at end of file diff --git a/mybatis-plus-demo/src/test/resources/application.yml b/mybatis-plus-demo/src/test/resources/application.yml deleted file mode 100644 index dabc111..0000000 --- a/mybatis-plus-demo/src/test/resources/application.yml +++ /dev/null @@ -1,14 +0,0 @@ -# DataSource Config -spring: - datasource: - driver-class-name: org.h2.Driver - schema: classpath:db/schema-h2.sql - data: classpath:db/data-h2.sql - url: jdbc:h2:mem:test - username: root - password: test - -mybatis-plus: - global-config: - db-config: - tablePrefix: dmt_ \ No newline at end of file diff --git a/mybatis-plus-demo/src/test/resources/db/data-h2.sql b/mybatis-plus-demo/src/test/resources/db/data-h2.sql deleted file mode 100644 index 9926d3b..0000000 --- a/mybatis-plus-demo/src/test/resources/db/data-h2.sql +++ /dev/null @@ -1,8 +0,0 @@ -DELETE FROM cyl_user; - -INSERT INTO cyl_user (id, name, age, email) -VALUES (1, 'Jone', 18, 'test1@baomidou.com'), - (2, 'Jack', 20, 'test2@baomidou.com'), - (3, 'Tom', 28, 'test3@baomidou.com'), - (4, 'Sandy', 21, 'test4@baomidou.com'), - (5, 'Billie', 24, 'test5@baomidou.com'); \ No newline at end of file diff --git a/mybatis-plus-demo/src/test/resources/db/schema-h2.sql b/mybatis-plus-demo/src/test/resources/db/schema-h2.sql deleted file mode 100644 index 5d7e7c6..0000000 --- a/mybatis-plus-demo/src/test/resources/db/schema-h2.sql +++ /dev/null @@ -1,10 +0,0 @@ -DROP TABLE IF EXISTS cyl_user; - -CREATE TABLE cyl_user -( - id BIGINT(20) NOT NULL COMMENT '主键ID', - name VARCHAR(30) NULL DEFAULT NULL COMMENT '姓名', - age INT(11) NULL DEFAULT NULL COMMENT '年龄', - email VARCHAR(50) NULL DEFAULT NULL COMMENT '邮箱', - PRIMARY KEY (id) -); \ No newline at end of file diff --git a/mybatis-plus-demo/src/test/resources/logback.xml b/mybatis-plus-demo/src/test/resources/logback.xml deleted file mode 100644 index 928e99e..0000000 --- a/mybatis-plus-demo/src/test/resources/logback.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/lc.current.log - - - - ${log.path}/lc.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - - - - ${log.path}/lc-error.log - - - - ${log.path}/lc-error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - - - - - ${log.path}/sys-user.log - - - ${log.path}/sys-user.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index b92357c..247c6c2 100644 --- a/pom.xml +++ b/pom.xml @@ -236,8 +236,6 @@ ruoyi-quartz ruoyi-generator ruoyi-common - mybatis-plus-demo - mybatis-plus-api pom diff --git a/wms/pom.xml b/wms/pom.xml index 1d6265e..ef45566 100644 --- a/wms/pom.xml +++ b/wms/pom.xml @@ -26,11 +26,6 @@ ruoyi-system ${ruoyi.version} - - com.ruoyi - mybatis-plus-api - ${ruoyi.version} - com.baomidou mybatis-plus-boot-starter