From 478d3eccedacea938d48fed2274048035dfa640c Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 01 七月 2022 17:14:04 +0800
Subject: [PATCH] 应急预案一览
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java | 83 ++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java | 117 +++++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java | 14 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyPlanDBQuery.java | 14 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java | 29 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java | 30 ++
/dev/null | 14 -
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml | 33 ++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyPlanInfoServiceImpl.java | 28 ++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java | 70 +++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java | 48 ++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java | 16 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanInfoService.java | 15 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java | 14 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java | 172 ++++++++++++++
16 files changed, 671 insertions(+), 30 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
new file mode 100644
index 0000000..9643425
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
@@ -0,0 +1,30 @@
+package com.gkhy.safePlatform.emergency.controller;
+
+import com.gkhy.safePlatform.commons.query.PageQuery;
+import com.gkhy.safePlatform.commons.utils.PageUtils;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanPageRespDTO;
+import com.gkhy.safePlatform.emergency.query.EmergencyPlanQuery;
+import com.gkhy.safePlatform.emergency.service.EmergencyPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/emergencyPlan")
+public class EmergencyPlanController {
+
+ @Autowired
+ private EmergencyPlanService emergencyPlanService;
+
+ /**
+ * 应急预案列表
+ */
+ @RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
+ private ResultVO<List<EmergencyPlanPageRespDTO>> list (@RequestBody PageQuery<EmergencyPlanQuery> pageQuery){
+ PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize());
+ return emergencyPlanService.selectEmergencyPlanList(pageQuery);
+ }
+
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java
index d26310d..d50e075 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java
@@ -1,10 +1,7 @@
package com.gkhy.safePlatform.emergency.controller;
import com.gkhy.safePlatform.account.rpc.apimodel.UserAccountService;
-import com.gkhy.safePlatform.emergency.service.DemoService;
import org.apache.dubbo.config.annotation.DubboReference;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -17,17 +14,17 @@
@DubboReference(check = false)
private UserAccountService userAccountService;
- @Autowired
- private DemoService demoService;
-
- @RequestMapping(value = "/t/rpc",method = RequestMethod.GET)
- public Object testRpc(String id){
- String resp = userAccountService.sayName(id);
- return resp;
- }
-
- @RequestMapping(value = "/t/get",method = RequestMethod.GET)
- public Object testEmergencyGetById(Long id){
- return demoService.getById(id);
- }
+// @Autowired
+// private DemoService demoService;
+//
+// @RequestMapping(value = "/t/rpc",method = RequestMethod.GET)
+// public Object testRpc(String id){
+// String resp = userAccountService.sayName(id);
+// return resp;
+// }
+//
+// @RequestMapping(value = "/t/get",method = RequestMethod.GET)
+// public Object testEmergencyGetById(Long id){
+// return demoService.getById(id);
+// }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/dto/req/demoReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/dto/req/demoReqDTO.java
deleted file mode 100644
index 4aa5580..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/dto/req/demoReqDTO.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.gkhy.safePlatform.emergency.dto.req;
-
-public class demoReqDTO {
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/dto/resp/demoRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/dto/resp/demoRespDTO.java
deleted file mode 100644
index b23c666..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/dto/resp/demoRespDTO.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.gkhy.safePlatform.emergency.dto.resp;
-
-public class demoRespDTO {
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfo.java
deleted file mode 100644
index 0294c35..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.gkhy.safePlatform.emergency.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@TableName("demo_table")
-public class DemoInfo implements Serializable {
-
- @TableId(type = IdType.AUTO)
- private Long id;
-
- private String name;
-
- private Date gmtCreate;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Date getGmtCreate() {
- return gmtCreate;
- }
-
- public void setGmtCreate(Date gmtCreate) {
- this.gmtCreate = gmtCreate;
- }
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfoDo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfoDo.java
deleted file mode 100644
index 9992934..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/DemoInfoDo.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.gkhy.safePlatform.emergency.entity;
-
-public class DemoInfoDo {
-
- private String name;
-
- private Byte status;
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
new file mode 100644
index 0000000..6c5eb1d
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
@@ -0,0 +1,172 @@
+package com.gkhy.safePlatform.emergency.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("emergency_plan")
+public class EmergencyPlanInfo {
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ private Byte delFlag;
+
+ private Date gmtCreate;
+
+ private Date gmtModitify;
+
+ private String createUid;
+
+ private String updateUid;
+
+ private Byte statue;
+
+ private Date releaseDate;
+
+ private String authorUid;
+
+ private Long authorDeptId;
+
+ private Byte associatedDanger;
+
+ private String type;
+
+ private String level;
+
+ private String name ;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Byte getDelFlag() {
+ return delFlag;
+ }
+
+ public void setDelFlag(Byte delFlag) {
+ this.delFlag = delFlag;
+ }
+
+ public Date getGmtCreate() {
+ return gmtCreate;
+ }
+
+ public void setGmtCreate(Date gmtCreate) {
+ this.gmtCreate = gmtCreate;
+ }
+
+ public Date getGmtModitify() {
+ return gmtModitify;
+ }
+
+ public void setGmtModitify(Date gmtModitify) {
+ this.gmtModitify = gmtModitify;
+ }
+
+ public String getCreateUid() {
+ return createUid;
+ }
+
+ public void setCreateUid(String createUid) {
+ this.createUid = createUid;
+ }
+
+ public String getUpdateUid() {
+ return updateUid;
+ }
+
+ public void setUpdateUid(String updateUid) {
+ this.updateUid = updateUid;
+ }
+
+ public Byte getStatue() {
+ return statue;
+ }
+
+ public void setStatue(Byte statue) {
+ this.statue = statue;
+ }
+
+ public Date getReleaseDate() {
+ return releaseDate;
+ }
+
+ public void setReleaseDate(Date releaseDate) {
+ this.releaseDate = releaseDate;
+ }
+
+ public String getAuthorUid() {
+ return authorUid;
+ }
+
+ public void setAuthorUid(String authorUid) {
+ this.authorUid = authorUid;
+ }
+
+ public Long getAuthorDeptId() {
+ return authorDeptId;
+ }
+
+ public void setAuthorDeptId(Long authorDeptId) {
+ this.authorDeptId = authorDeptId;
+ }
+
+ public Byte getAssociatedDanger() {
+ return associatedDanger;
+ }
+
+ public void setAssociatedDanger(Byte associatedDanger) {
+ this.associatedDanger = associatedDanger;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getLevel() {
+ return level;
+ }
+
+ public void setLevel(String level) {
+ this.level = level;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String toString() {
+ return "EmergencyPlanInfo{" +
+ "id=" + id +
+ ", delFlag=" + delFlag +
+ ", gmtCreate=" + gmtCreate +
+ ", gmtModitify=" + gmtModitify +
+ ", createUid='" + createUid + '\'' +
+ ", updateUid='" + updateUid + '\'' +
+ ", statue=" + statue +
+ ", releaseDate=" + releaseDate +
+ ", authorUid='" + authorUid + '\'' +
+ ", authorDeptId=" + authorDeptId +
+ ", associatedDanger=" + associatedDanger +
+ ", type='" + type + '\'' +
+ ", level='" + level + '\'' +
+ ", name='" + name + '\'' +
+ '}';
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java
new file mode 100644
index 0000000..c397f55
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java
@@ -0,0 +1,117 @@
+package com.gkhy.safePlatform.emergency.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("emergency_plan")
+public class EmergencyPlanInfoDetailDO {
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ private Byte status;
+
+ private Date releaseDate;
+
+ private String authorUid;
+
+ private Long authorDeptId;
+
+ private Byte associatedDanger;
+
+ private String type;
+
+ private String level;
+
+ private String name ;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Byte getStatus() {
+ return status;
+ }
+
+ public void setStatus(Byte status) {
+ this.status = status;
+ }
+
+ public Date getReleaseDate() {
+ return releaseDate;
+ }
+
+ public void setReleaseDate(Date releaseDate) {
+ this.releaseDate = releaseDate;
+ }
+
+ public String getAuthorUid() {
+ return authorUid;
+ }
+
+ public void setAuthorUid(String authorUid) {
+ this.authorUid = authorUid;
+ }
+
+ public Long getAuthorDeptId() {
+ return authorDeptId;
+ }
+
+ public void setAuthorDeptId(Long authorDeptId) {
+ this.authorDeptId = authorDeptId;
+ }
+
+ public Byte getAssociatedDanger() {
+ return associatedDanger;
+ }
+
+ public void setAssociatedDanger(Byte associatedDanger) {
+ this.associatedDanger = associatedDanger;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getLevel() {
+ return level;
+ }
+
+ public void setLevel(String level) {
+ this.level = level;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String toString() {
+ return "EmergencyPlanInfoDetailDO{" +
+ "id=" + id +
+ ", status=" + status +
+ ", releaseDate=" + releaseDate +
+ ", authorUid='" + authorUid + '\'' +
+ ", authorDeptId=" + authorDeptId +
+ ", associatedDanger=" + associatedDanger +
+ ", type='" + type + '\'' +
+ ", level='" + level + '\'' +
+ ", name='" + name + '\'' +
+ '}';
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java
new file mode 100644
index 0000000..eb31fa8
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java
@@ -0,0 +1,83 @@
+package com.gkhy.safePlatform.emergency.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+@TableName("emergency_plan")
+public class EmergencyPlanInfoPageDO {
+
+ private Long id;
+
+ private String name ;
+
+ private Byte status ;
+
+ private String type;
+
+ private String level;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date releaseDate;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Byte getStatus() {
+ return status;
+ }
+
+ public void setStatus(Byte status) {
+ this.status = status;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getLevel() {
+ return level;
+ }
+
+ public void setLevel(String level) {
+ this.level = level;
+ }
+
+ public Date getReleaseDate() {
+ return releaseDate;
+ }
+
+ public void setReleaseDate(Date releaseDate) {
+ this.releaseDate = releaseDate;
+ }
+
+ @Override
+ public String toString() {
+ return "EmergencyPlanInfoPageDO{" +
+ "id=" + id +
+ ", name='" + name + '\'' +
+ ", status=" + status +
+ ", type='" + type + '\'' +
+ ", level='" + level + '\'' +
+ ", releaseDate=" + releaseDate +
+ '}';
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java
new file mode 100644
index 0000000..77776e2
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java
@@ -0,0 +1,4 @@
+package com.gkhy.safePlatform.emergency.model.dto.req;
+
+public class EmergencyPlanReqDTO {
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
new file mode 100644
index 0000000..16ab82a
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
@@ -0,0 +1,70 @@
+package com.gkhy.safePlatform.emergency.model.dto.resp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+public class EmergencyPlanPageRespDTO {
+
+ private Long id;
+
+ private String name ;
+
+ private Byte status ;
+
+ private String type;
+
+ private String level;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date releaseDate;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Byte getStatus() {
+ return status;
+ }
+
+ public void setStatus(Byte status) {
+ this.status = status;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getLevel() {
+ return level;
+ }
+
+ public void setLevel(String level) {
+ this.level = level;
+ }
+
+ public Date getReleaseDate() {
+ return releaseDate;
+ }
+
+ public void setReleaseDate(Date releaseDate) {
+ this.releaseDate = releaseDate;
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java
new file mode 100644
index 0000000..1ed6de9
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java
@@ -0,0 +1,14 @@
+package com.gkhy.safePlatform.emergency.query;
+
+public class EmergencyPlanQuery {
+
+ private String name ;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyPlanDBQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyPlanDBQuery.java
new file mode 100644
index 0000000..e0af8b7
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyPlanDBQuery.java
@@ -0,0 +1,14 @@
+package com.gkhy.safePlatform.emergency.query.db;
+
+public class EmergencyPlanDBQuery {
+
+ private String name ;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java
deleted file mode 100644
index 659fb42..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/DemoInfoRepository.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.gkhy.safePlatform.emergency.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gkhy.safePlatform.emergency.entity.DemoInfo;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface DemoInfoRepository extends BaseMapper<DemoInfo> {
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java
new file mode 100644
index 0000000..416eeb0
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java
@@ -0,0 +1,16 @@
+package com.gkhy.safePlatform.emergency.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfo;
+import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoPageDO;
+import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface EmergencyPlanInfoRepository extends BaseMapper<EmergencyPlanInfo> {
+ List<EmergencyPlanInfoPageDO> selectEmergencyPlanList(Page<EmergencyPlanInfoPageDO> page, @Param("query") EmergencyPlanDBQuery emergencyPlanDBQuery);
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/DemoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/DemoService.java
deleted file mode 100644
index 54975dd..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/DemoService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.gkhy.safePlatform.emergency.service;
-
-import com.gkhy.safePlatform.commons.vo.ResultVO;
-import com.gkhy.safePlatform.emergency.entity.DemoInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public interface DemoService {
-
- ResultVO<DemoInfo> getById(Long id);
-
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java
new file mode 100644
index 0000000..0a36070
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java
@@ -0,0 +1,14 @@
+package com.gkhy.safePlatform.emergency.service;
+
+import com.gkhy.safePlatform.commons.query.PageQuery;
+import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanPageRespDTO;
+import com.gkhy.safePlatform.emergency.query.EmergencyPlanQuery;
+
+import java.util.List;
+
+public interface EmergencyPlanService {
+
+ SearchResultVO<List<EmergencyPlanPageRespDTO>> selectEmergencyPlanList(PageQuery<EmergencyPlanQuery> query);
+
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/DemoInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/DemoInfoService.java
deleted file mode 100644
index 71c4f5b..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/DemoInfoService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.gkhy.safePlatform.emergency.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gkhy.safePlatform.emergency.entity.DemoInfo;
-import org.springframework.stereotype.Repository;
-
-public interface DemoInfoService extends IService<DemoInfo> {
-
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanInfoService.java
new file mode 100644
index 0000000..d47839f
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanInfoService.java
@@ -0,0 +1,15 @@
+package com.gkhy.safePlatform.emergency.service.baseService;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfo;
+import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoPageDO;
+import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery;
+
+import java.util.List;
+
+
+public interface EmergencyPlanInfoService extends IService<EmergencyPlanInfo> {
+
+ List<EmergencyPlanInfoPageDO> selectEmergencyPlanList(Page<EmergencyPlanInfoPageDO> page, EmergencyPlanDBQuery emergencyPlanDBQuery);
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java
deleted file mode 100644
index 47d5511..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/DemoInfoServiceImpl.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.gkhy.safePlatform.emergency.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gkhy.safePlatform.emergency.entity.DemoInfo;
-import com.gkhy.safePlatform.emergency.repository.DemoInfoRepository;
-import com.gkhy.safePlatform.emergency.service.baseService.DemoInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service("demoInfoService")
-public class DemoInfoServiceImpl extends ServiceImpl<DemoInfoRepository, DemoInfo> implements DemoInfoService {
-
- @Autowired
- private DemoInfoRepository demoInfoRepository;
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyPlanInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyPlanInfoServiceImpl.java
new file mode 100644
index 0000000..16e8cca
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyPlanInfoServiceImpl.java
@@ -0,0 +1,28 @@
+package com.gkhy.safePlatform.emergency.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfo;
+import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoPageDO;
+import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery;
+import com.gkhy.safePlatform.emergency.repository.EmergencyPlanInfoRepository;
+import com.gkhy.safePlatform.emergency.service.baseService.EmergencyPlanInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("emergencyPlanInfoService")
+public class EmergencyPlanInfoServiceImpl extends ServiceImpl<EmergencyPlanInfoRepository, EmergencyPlanInfo> implements EmergencyPlanInfoService {
+
+ @Autowired
+ private EmergencyPlanInfoRepository emergencyPlanInfoRepository;
+
+ @Override
+ public List<EmergencyPlanInfoPageDO> selectEmergencyPlanList(Page<EmergencyPlanInfoPageDO> page, EmergencyPlanDBQuery emergencyPlanDBQuery) {
+ return emergencyPlanInfoRepository.selectEmergencyPlanList(page,emergencyPlanDBQuery);
+ }
+
+
+
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
deleted file mode 100644
index 16c5b6b..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.gkhy.safePlatform.emergency.service.impl;
-
-import com.gkhy.safePlatform.commons.enums.ResultCodes;
-import com.gkhy.safePlatform.commons.vo.ResultVO;
-import com.gkhy.safePlatform.emergency.entity.DemoInfo;
-import com.gkhy.safePlatform.emergency.service.DemoService;
-import com.gkhy.safePlatform.emergency.service.baseService.DemoInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service("demoService")
-public class DemoServiceImpl implements DemoService {
-
- @Autowired
- private DemoInfoService demoInfoService;
-
- @Override
- public ResultVO<DemoInfo> getById(Long id) {
- ResultVO<DemoInfo> resultVO = new ResultVO<>();
- DemoInfo demoInfo = demoInfoService.getById(id);
- if(demoInfo != null && demoInfo.getId() > 0){
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setData(demoInfo);
- }else {
- resultVO.setCode(ResultCodes.OK.getCode());
- }
- return resultVO;
- }
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
new file mode 100644
index 0000000..095e7e7
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
@@ -0,0 +1,48 @@
+package com.gkhy.safePlatform.emergency.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
+import com.gkhy.safePlatform.commons.query.PageQuery;
+import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
+import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoPageDO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanPageRespDTO;
+import com.gkhy.safePlatform.emergency.query.EmergencyPlanQuery;
+import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery;
+import com.gkhy.safePlatform.emergency.service.EmergencyPlanService;
+import com.gkhy.safePlatform.emergency.service.baseService.EmergencyPlanInfoService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("emergencyPlanService")
+public class EmergencyPlanServiceImpl implements EmergencyPlanService {
+
+ @Autowired
+ private EmergencyPlanInfoService emergencyPlanInfoService;
+
+ @Override
+ public SearchResultVO<List<EmergencyPlanPageRespDTO>> selectEmergencyPlanList(PageQuery<EmergencyPlanQuery> query) {
+ Long pageIndex = query.getPageIndex();
+ Long pageSize = query.getPageSize();
+ Page<EmergencyPlanInfoPageDO> page = new Page<>(pageIndex, pageSize);
+
+ EmergencyPlanDBQuery emergencyPlanDBQuery = new EmergencyPlanDBQuery();
+ if (query.getSearchParams() != null) {
+ BeanUtils.copyProperties(query.getSearchParams(), emergencyPlanDBQuery);
+ }
+ List<EmergencyPlanInfoPageDO> emergencyPlanListDoInfoList = emergencyPlanInfoService.selectEmergencyPlanList(page,emergencyPlanDBQuery);
+ List<EmergencyPlanPageRespDTO> respList = BeanCopyUtils.copyBeanList(emergencyPlanListDoInfoList, EmergencyPlanPageRespDTO.class);
+
+ return new SearchResultVO<>(
+ true,
+ pageIndex,
+ pageSize,
+ page.getTotal(),
+ respList,
+ ResultCodes.OK
+ );
+ }
+}
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
new file mode 100644
index 0000000..2a46366
--- /dev/null
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
@@ -0,0 +1,33 @@
+<?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.gkhy.safePlatform.emergency.repository.EmergencyPlanInfoRepository">
+
+ <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoPageDO" id="pageResult">
+ <id column="id" property="id" jdbcType="BIGINT"/>
+ <result column="name" property="name" />
+ <result column="status" property="status" />
+ <result column="type" property="type" />
+ <result column="level" property="level" />
+ <result column="release_date" property="releaseDate" />
+ </resultMap>
+
+ <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfoDetailDO" id="detailResult">
+ <id column="id" property="id" jdbcType="BIGINT"/>
+ <result column="name" property="name" />
+ <result column="status" property="status" />
+ <result column="type" property="type" />
+ <result column="level" property="level" />
+ <result column="release_date" property="releaseDate" />
+ <result column="author_uid" property="authorUid" />
+ <result column="author_dept_id" property="authorDeptId" />
+ <result column="associated_danger" property="associatedDanger" />
+ </resultMap>
+
+ <select id="selectEmergencyPlanList" resultMap="pageResult">
+ select id,`name`,`type`,`level`,release_date from emergency_plan where del_flag = 0
+ <if test="query.name != null and query.name != ''"> and `name` like concat('%', #{query.name}, '%')</if>
+ </select>
+
+</mapper>
diff --git a/emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml b/emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml
deleted file mode 100644
index 37ba791..0000000
--- a/emergency/emergency-service/src/main/resource/mapper/emergency/DemoInfoRepository.xml
+++ /dev/null
@@ -1,14 +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.gkhy.safePlatform.emergency.repository.DemoInfoRepository">
-
- <resultMap type="com.gkhy.safePlatform.emergency.entity.DemoInfo" id="DemoInfoResult">
- <id column="id" property="id" jdbcType="BIGINT"/>
- <result column="name" property="name" jdbcType="VARCHAR"/>
- <result column="gmt_create" property="gmtCreate" jdbcType="TIMESTAMP"/>
- </resultMap>
-
-
-</mapper>
--
Gitblit v1.9.2