diff --git a/hbt-ep/src/main/resources/banner.txt b/hbt-ep/src/main/resources/banner.txt
deleted file mode 100644
index 33e2030..0000000
--- a/hbt-ep/src/main/resources/banner.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- __ __ __
- / /_ / /_ / /_ ___ ____
- / __ \/ __ \/ __/_____/ _ \/ __ \
- / / / / /_/ / /_/_____/ __/ /_/ /
-/_/ /_/_.___/\__/ \___/ .___/
- /_/
\ No newline at end of file
diff --git a/hbt-safety-supervision/hbt-safety-supervision-api/hbt-safety-supervision-api.iml b/hbt-safety-supervision/hbt-safety-supervision-api/hbt-safety-supervision-api.iml
new file mode 100644
index 0000000..8d83195
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-api/hbt-safety-supervision-api.iml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hbt-safety-supervision/hbt-safety-supervision-api/pom.xml b/hbt-safety-supervision/hbt-safety-supervision-api/pom.xml
new file mode 100644
index 0000000..5e460f6
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-api/pom.xml
@@ -0,0 +1,33 @@
+
+
+
+ com.hbt
+ hbt-safety-supervision
+ 1.0-SNAPSHOT
+
+ 4.0.0
+
+ hbt-safety-supervision-api
+
+
+ hbt-safety-supervision-api系统接口模块
+
+
+
+
+
+ com.hbt
+ hbt-common-security
+
+
+
+
+ joda-time
+ joda-time
+
+
+
+
+
\ No newline at end of file
diff --git a/hbt-ep/.gitignore b/hbt-safety-supervision/hbt-safety-supervision-biz/.gitignore
similarity index 100%
rename from hbt-ep/.gitignore
rename to hbt-safety-supervision/hbt-safety-supervision-biz/.gitignore
diff --git a/hbt-ep/Dockerfile b/hbt-safety-supervision/hbt-safety-supervision-biz/Dockerfile
similarity index 62%
rename from hbt-ep/Dockerfile
rename to hbt-safety-supervision/hbt-safety-supervision-biz/Dockerfile
index e0394be..bec67b9 100644
--- a/hbt-ep/Dockerfile
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/Dockerfile
@@ -1,4 +1,4 @@
FROM 119.45.158.12:5000/mini-java8:latest
-COPY target/hbt-ep-1.0-SNAPSHOT.jar /app/app.jar
+COPY target/hbt-safety-supervision-biz-1.0-SNAPSHOT.jar /app/app.jar
ENV NACOSIP=""
ENTRYPOINT ["sh","-c","java -Dnacos.ip=$NACOSIP -jar /app/app.jar"]
\ No newline at end of file
diff --git a/hbt-ep/hbt-ep.iml b/hbt-safety-supervision/hbt-safety-supervision-biz/hbt-safety-supervision-biz.iml
similarity index 98%
rename from hbt-ep/hbt-ep.iml
rename to hbt-safety-supervision/hbt-safety-supervision-biz/hbt-safety-supervision-biz.iml
index 31ef613..f0dbc4b 100644
--- a/hbt-ep/hbt-ep.iml
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/hbt-safety-supervision-biz.iml
@@ -4,10 +4,6 @@
-
-
-
-
@@ -20,7 +16,6 @@
-
@@ -100,49 +95,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -227,5 +179,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hbt-ep/pom.xml b/hbt-safety-supervision/hbt-safety-supervision-biz/pom.xml
similarity index 90%
rename from hbt-ep/pom.xml
rename to hbt-safety-supervision/hbt-safety-supervision-biz/pom.xml
index 7d9a62c..ac42b53 100644
--- a/hbt-ep/pom.xml
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/pom.xml
@@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- wit-park-backend
+ hbt-safety-supervision
com.hbt
1.0-SNAPSHOT
4.0.0
- hbt-ep
+ hbt-safety-supervision-biz
@@ -81,8 +81,15 @@
org.projectlombok
lombok
+
+
+ com.hbt
+ hbt-msds-api
+ 1.0-SNAPSHOT
+
+ ${project.artifactId}
org.springframework.boot
diff --git a/hbt-ep/src/main/java/com/hbt/wit/park/backend/ep/EpApplication.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/SafetySupervisionApplication.java
similarity index 66%
rename from hbt-ep/src/main/java/com/hbt/wit/park/backend/ep/EpApplication.java
rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/SafetySupervisionApplication.java
index f2cdecc..296570f 100644
--- a/hbt-ep/src/main/java/com/hbt/wit/park/backend/ep/EpApplication.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/SafetySupervisionApplication.java
@@ -1,4 +1,4 @@
-package com.hbt.wit.park.backend.ep;
+package com.hbt.safety.supervision;
import com.hbt.common.security.annotation.EnableCustomConfig;
import com.hbt.common.security.annotation.EnableRyFeignClients;
@@ -13,11 +13,11 @@ import org.springframework.cloud.client.SpringCloudApplication;
@SpringCloudApplication
@EnableCustomSwagger2
@EnableRyFeignClients
-public class EpApplication {
+public class SafetySupervisionApplication {
public static void main(String[] args)
{
- SpringApplication.run(com.hbt.wit.park.backend.ep.EpApplication.class, args);
- System.out.println("(♥◠‿◠)ノ゙ 智慧环保知识server启动成功 ლ(´ڡ`ლ)゙ ");
+ SpringApplication.run(SafetySupervisionApplication.class, args);
+ System.out.println("(♥◠‿◠)ノ゙ 智慧安监server启动成功 ლ(´ڡ`ლ)゙ ");
}
}
diff --git a/hbt-ep/src/main/java/com/hbt/wit/park/backend/ep/controller/CommonController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/CommonController.java
similarity index 93%
rename from hbt-ep/src/main/java/com/hbt/wit/park/backend/ep/controller/CommonController.java
rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/CommonController.java
index 9b1eddd..d4c980d 100644
--- a/hbt-ep/src/main/java/com/hbt/wit/park/backend/ep/controller/CommonController.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/CommonController.java
@@ -1,4 +1,4 @@
-package com.hbt.wit.park.backend.ep.controller;
+package com.hbt.safety.supervision.controller;
import com.hbt.common.core.domain.R;
import com.hbt.common.core.web.controller.BaseController;
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInfomationController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInfomationController.java
new file mode 100644
index 0000000..b8e01ff
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInfomationController.java
@@ -0,0 +1,93 @@
+package com.hbt.safety.supervision.controller;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hbt.safety.supervision.pojo.EnterpriseInfomation;
+import com.hbt.safety.supervision.service.IEnterpriseInfomationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+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.hbt.common.security.annotation.RequiresPermissions;
+import com.hbt.common.core.web.controller.BaseController;
+import com.hbt.common.core.web.domain.AjaxResult;
+import com.hbt.common.core.web.page.TableDataInfo;
+
+/**
+ * 企业信息Controller
+ *
+ * @author zhangyu
+ * @date 2023-02-14
+ */
+@RestController
+@RequestMapping("/infomation")
+public class EnterpriseInfomationController extends BaseController
+{
+ @Autowired
+ private IEnterpriseInfomationService enterpriseInfomationService;
+
+ /**
+ * 查询企业信息列表
+ */
+ @GetMapping("/list")
+ public String list(EnterpriseInfomation enterpriseInfomation)
+ {
+ startPage();
+ List list = enterpriseInfomationService.selectEnterpriseInfomationList(enterpriseInfomation);
+ TableDataInfo tableDataInfo = getDataTable(list);
+ return JSONObject.toJSONString(tableDataInfo);
+ }
+
+ /**
+ * 获取企业信息详细信息
+ */
+ @RequiresPermissions("ep:infomation:query")
+ @GetMapping(value = "/{id}")
+ public String getInfo(@PathVariable("id") int id)
+ {
+ AjaxResult ajaxResult = success(enterpriseInfomationService.selectEnterpriseInfomationById(id));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 新增企业信息
+ */
+ @GetMapping("/add")
+ public String add(@RequestBody EnterpriseInfomation enterpriseInfomation)
+ {
+ AjaxResult ajaxResult = toAjax(enterpriseInfomationService.insertEnterpriseInfomation(enterpriseInfomation));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 修改企业信息
+ */
+ @GetMapping("/edit")
+ public String edit(@RequestBody EnterpriseInfomation enterpriseInfomation)
+ {
+ AjaxResult ajaxResult = toAjax(enterpriseInfomationService.updateEnterpriseInfomation(enterpriseInfomation));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 删除企业信息
+ */
+ @GetMapping("/remove")
+ public String remove(@PathVariable int[] ids)
+ {
+ AjaxResult ajaxResult = toAjax(enterpriseInfomationService.deleteEnterpriseInfomationByIds(ids));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 在管企业分类统计
+ */
+ @GetMapping("/enterpriseStatistics")
+ public String enterpriseStatistics()
+ {
+ return enterpriseInfomationService.enterpriseStatistics();
+ }
+}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java
new file mode 100644
index 0000000..3e3d8ed
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java
@@ -0,0 +1,82 @@
+package com.hbt.safety.supervision.controller;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hbt.safety.supervision.pojo.EscalateHiddenDanger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+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.hbt.safety.supervision.service.IEscalateHiddenDangerService;
+import com.hbt.common.core.web.controller.BaseController;
+import com.hbt.common.core.web.domain.AjaxResult;
+import com.hbt.common.core.web.page.TableDataInfo;
+
+/**
+ * 上报隐患Controller
+ *
+ * @author 张雨
+ * @date 2023-02-14
+ */
+@RestController
+@RequestMapping("/danger")
+public class EscalateHiddenDangerController extends BaseController
+{
+ @Autowired
+ private IEscalateHiddenDangerService escalateHiddenDangerService;
+
+ /**
+ * 查询上报隐患列表
+ */
+ @GetMapping("/list")
+ public String list(EscalateHiddenDanger escalateHiddenDanger)
+ {
+ startPage();
+ List list = escalateHiddenDangerService.selectEscalateHiddenDangerList(escalateHiddenDanger);
+ TableDataInfo tableDataInfo = getDataTable(list);
+ return JSONObject.toJSONString(tableDataInfo);
+ }
+
+ /**
+ * 获取上报隐患详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public String getInfo(@PathVariable("id") int id)
+ {
+ AjaxResult ajaxResult = success(escalateHiddenDangerService.selectEscalateHiddenDangerById(id));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 新增上报隐患
+ */
+ @GetMapping(value = "/add")
+ public String add(@RequestBody EscalateHiddenDanger escalateHiddenDanger)
+ {
+ AjaxResult ajaxResult = toAjax(escalateHiddenDangerService.insertEscalateHiddenDanger(escalateHiddenDanger));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 修改上报隐患
+ */
+ @GetMapping(value = "/edit")
+ public String edit(@RequestBody EscalateHiddenDanger escalateHiddenDanger)
+ {
+ AjaxResult ajaxResult = toAjax(escalateHiddenDangerService.updateEscalateHiddenDanger(escalateHiddenDanger));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 删除上报隐患
+ */
+ @GetMapping(value = "/remove")
+ public String remove(@PathVariable int[] ids)
+ {
+ AjaxResult ajaxResult = toAjax(escalateHiddenDangerService.deleteEscalateHiddenDangerByIds(ids));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateRiskController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateRiskController.java
new file mode 100644
index 0000000..18f8063
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateRiskController.java
@@ -0,0 +1,82 @@
+package com.hbt.safety.supervision.controller;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hbt.safety.supervision.pojo.EscalateRisk;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+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.hbt.safety.supervision.service.IEscalateRiskService;
+import com.hbt.common.core.web.controller.BaseController;
+import com.hbt.common.core.web.domain.AjaxResult;
+import com.hbt.common.core.web.page.TableDataInfo;
+
+/**
+ * 上报风险Controller
+ *
+ * @author 张雨
+ * @date 2023-02-14
+ */
+@RestController
+@RequestMapping("/escalateRisk")
+public class EscalateRiskController extends BaseController
+{
+ @Autowired
+ private IEscalateRiskService escalateRiskService;
+
+ /**
+ * 查询上报风险列表
+ */
+ @GetMapping("/list")
+ public String list(EscalateRisk escalateRisk)
+ {
+ startPage();
+ List list = escalateRiskService.selectEscalateRiskList(escalateRisk);
+ TableDataInfo tableDataInfo = getDataTable(list);
+ return JSONObject.toJSONString(tableDataInfo);
+ }
+
+ /**
+ * 获取上报风险详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public String getInfo(@PathVariable("id") int id)
+ {
+ AjaxResult ajaxResult = success(escalateRiskService.selectEscalateRiskById(id));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 新增上报风险
+ */
+ @GetMapping(value = "/add")
+ public String add(@RequestBody EscalateRisk escalateRisk)
+ {
+ AjaxResult ajaxResult = toAjax(escalateRiskService.insertEscalateRisk(escalateRisk));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 修改上报风险
+ */
+ @GetMapping(value = "/edit")
+ public String edit(@RequestBody EscalateRisk escalateRisk)
+ {
+ AjaxResult ajaxResult = toAjax(escalateRiskService.updateEscalateRisk(escalateRisk));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 删除上报风险
+ */
+ @GetMapping(value = "/remove")
+ public String remove(@PathVariable int[] ids)
+ {
+ AjaxResult ajaxResult = toAjax(escalateRiskService.deleteEscalateRiskByIds(ids));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HazardousChemicalsController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HazardousChemicalsController.java
new file mode 100644
index 0000000..05e5f47
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HazardousChemicalsController.java
@@ -0,0 +1,28 @@
+package com.hbt.safety.supervision.controller;
+
+import com.hbt.common.core.constant.SecurityConstants;
+import com.hbt.common.core.domain.R;
+import com.hbt.msds.api.RemoteMsdsService;
+import com.hbt.msds.api.domain.Msds;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 危化品controller
+ * 调用msds服务
+ */
+@RestController
+@RequestMapping("/chemicals")
+public class HazardousChemicalsController {
+ @Autowired
+ private RemoteMsdsService remoteMsdsService;
+
+ @GetMapping("/getHazardousChemicals")
+ public R getHazardousChemicals(@Param("name") String name) {
+ return remoteMsdsService.getInfo(name, SecurityConstants.INNER);
+ }
+
+}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HazardousOperationController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HazardousOperationController.java
new file mode 100644
index 0000000..1c1eefc
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HazardousOperationController.java
@@ -0,0 +1,91 @@
+package com.hbt.safety.supervision.controller;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hbt.safety.supervision.pojo.HazardousOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+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.hbt.safety.supervision.service.IHazardousOperationService;
+import com.hbt.common.core.web.controller.BaseController;
+import com.hbt.common.core.web.domain.AjaxResult;
+import com.hbt.common.core.web.page.TableDataInfo;
+
+/**
+ * 危险作业Controller
+ *
+ * @author zhangyu
+ * @date 2023-02-14
+ */
+@RestController
+@RequestMapping("/operation")
+public class HazardousOperationController extends BaseController
+{
+ @Autowired
+ private IHazardousOperationService hazardousOperationService;
+
+ /**
+ * 查询危险作业列表
+ */
+ @GetMapping("/list")
+ public String list(HazardousOperation hazardousOperation)
+ {
+ startPage();
+ List list = hazardousOperationService.selectHazardousOperationList(hazardousOperation);
+ TableDataInfo tableDataInfo = getDataTable(list);
+ return JSONObject.toJSONString(tableDataInfo);
+ }
+
+ /**
+ * 获取危险作业详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public String getInfo(@PathVariable("id") int id)
+ {
+ AjaxResult ajaxResult = success(hazardousOperationService.selectHazardousOperationById(id));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 新增危险作业
+ */
+ @GetMapping(value = "/add")
+ public String add(@RequestBody HazardousOperation hazardousOperation)
+ {
+ AjaxResult ajaxResult = toAjax(hazardousOperationService.insertHazardousOperation(hazardousOperation));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 修改危险作业
+ */
+ @GetMapping(value = "/edit")
+ public String edit(@RequestBody HazardousOperation hazardousOperation)
+ {
+ AjaxResult ajaxResult = toAjax(hazardousOperationService.updateHazardousOperation(hazardousOperation));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 删除危险作业
+ */
+ @GetMapping(value = "/remove")
+ public String remove(@PathVariable int[] ids)
+ {
+ AjaxResult ajaxResult = toAjax(hazardousOperationService.deleteHazardousOperationByIds(ids));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 危险作业统计
+ */
+ @GetMapping(value = "/hazardousOperationStatistics")
+ public String hazardousOperationStatistics()
+ {
+ return hazardousOperationService.hazardousOperationStatistics();
+ }
+}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HiddenDangerController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HiddenDangerController.java
new file mode 100644
index 0000000..512de1c
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HiddenDangerController.java
@@ -0,0 +1,91 @@
+package com.hbt.safety.supervision.controller;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hbt.safety.supervision.pojo.HiddenDanger;
+import com.hbt.safety.supervision.service.IHiddenDangerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+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.hbt.common.core.web.controller.BaseController;
+import com.hbt.common.core.web.domain.AjaxResult;
+import com.hbt.common.core.web.page.TableDataInfo;
+
+/**
+ * 隐患Controller
+ *
+ * @author hbt
+ * @date 2023-02-14
+ */
+@RestController
+@RequestMapping("/hiddenDanger")
+public class HiddenDangerController extends BaseController
+{
+ @Autowired
+ private IHiddenDangerService hiddenDangerService;
+
+ /**
+ * 查询隐患列表
+ */
+ @GetMapping("/list")
+ public String list(HiddenDanger hiddenDanger)
+ {
+ startPage();
+ List list = hiddenDangerService.selectHiddenDangerList(hiddenDanger);
+ TableDataInfo tableDataInfo = getDataTable(list);
+ return JSONObject.toJSONString(tableDataInfo);
+ }
+
+ /**
+ * 获取隐患详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public String getInfo(@PathVariable("id") int id)
+ {
+ AjaxResult ajaxResult = success(hiddenDangerService.selectHiddenDangerById(id));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 新增隐患
+ */
+ @GetMapping(value = "/add")
+ public String add(@RequestBody HiddenDanger hiddenDanger)
+ {
+ AjaxResult ajaxResult = toAjax(hiddenDangerService.insertHiddenDanger(hiddenDanger));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 修改隐患
+ */
+ @GetMapping(value = "/edit")
+ public String edit(@RequestBody HiddenDanger hiddenDanger)
+ {
+ AjaxResult ajaxResult = toAjax(hiddenDangerService.updateHiddenDanger(hiddenDanger));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 删除隐患
+ */
+ @GetMapping(value = "/remove")
+ public String remove(@PathVariable int[] ids)
+ {
+ AjaxResult ajaxResult = toAjax(hiddenDangerService.deleteHiddenDangerByIds(ids));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 隐患统计信息
+ */
+ @GetMapping(value = "/hiddenDangerStatistics")
+ public String hiddenDangerStatistics()
+ {
+ return hiddenDangerService.hiddenDangerStatistics();
+ }
+}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/LawEnforcementInspectionController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/LawEnforcementInspectionController.java
new file mode 100644
index 0000000..8f4fff0
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/LawEnforcementInspectionController.java
@@ -0,0 +1,91 @@
+package com.hbt.safety.supervision.controller;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hbt.safety.supervision.pojo.LawEnforcementInspection;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+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.hbt.safety.supervision.service.ILawEnforcementInspectionService;
+import com.hbt.common.core.web.controller.BaseController;
+import com.hbt.common.core.web.domain.AjaxResult;
+import com.hbt.common.core.web.page.TableDataInfo;
+
+/**
+ * 执法巡查Controller
+ *
+ * @author zhangyu
+ * @date 2023-02-14
+ */
+@RestController
+@RequestMapping("/inspection")
+public class LawEnforcementInspectionController extends BaseController
+{
+ @Autowired
+ private ILawEnforcementInspectionService lawEnforcementInspectionService;
+
+ /**
+ * 查询执法巡查列表
+ */
+ @GetMapping("/list")
+ public String list(LawEnforcementInspection lawEnforcementInspection)
+ {
+ startPage();
+ List list = lawEnforcementInspectionService.selectLawEnforcementInspectionList(lawEnforcementInspection);
+ TableDataInfo tableDataInfo = getDataTable(list);
+ return JSONObject.toJSONString(tableDataInfo);
+ }
+
+ /**
+ * 获取执法巡查详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public String getInfo(@PathVariable("id") int id)
+ {
+ AjaxResult ajaxResult = success(lawEnforcementInspectionService.selectLawEnforcementInspectionById(id));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 新增执法巡查
+ */
+ @GetMapping(value = "/add")
+ public String add(@RequestBody LawEnforcementInspection lawEnforcementInspection)
+ {
+ AjaxResult ajaxResult = toAjax(lawEnforcementInspectionService.insertLawEnforcementInspection(lawEnforcementInspection));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 修改执法巡查
+ */
+ @GetMapping(value = "/edit")
+ public String edit(@RequestBody LawEnforcementInspection lawEnforcementInspection)
+ {
+ AjaxResult ajaxResult = toAjax(lawEnforcementInspectionService.updateLawEnforcementInspection(lawEnforcementInspection));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 删除执法巡查
+ */
+ @GetMapping(value = "/remove")
+ public String remove(@PathVariable int[] ids)
+ {
+ AjaxResult ajaxResult = toAjax(lawEnforcementInspectionService.deleteLawEnforcementInspectionByIds(ids));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 按月统计巡查信息
+ */
+ @GetMapping(value = "/monthStatistics")
+ public String monthStatistics()
+ {
+ return lawEnforcementInspectionService.monthStatistics();
+ }
+}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/MajorHazardSourcesController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/MajorHazardSourcesController.java
new file mode 100644
index 0000000..069f968
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/MajorHazardSourcesController.java
@@ -0,0 +1,89 @@
+package com.hbt.safety.supervision.controller;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hbt.safety.supervision.pojo.MajorHazardSources;
+import com.hbt.safety.supervision.service.IMajorHazardSourcesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+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.hbt.common.core.web.controller.BaseController;
+import com.hbt.common.core.web.domain.AjaxResult;
+
+/**
+ * 重大危险源Controller
+ *
+ * @author zhangyu
+ * @date 2023-02-14
+ */
+@RestController
+@RequestMapping("/sources")
+public class MajorHazardSourcesController extends BaseController
+{
+ @Autowired
+ private IMajorHazardSourcesService majorHazardSourcesService;
+
+ /**
+ * 查询重大危险源列表
+ */
+ @GetMapping("/list")
+ public String list(MajorHazardSources majorHazardSources)
+ {
+ List list = majorHazardSourcesService.selectMajorHazardSourcesList(majorHazardSources);
+ return JSONObject.toJSONString(list);
+ }
+
+ /**
+ * 获取重大危险源详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public String getInfo(@PathVariable("id") int id)
+ {
+ MajorHazardSources majorHazardSources = majorHazardSourcesService.selectMajorHazardSourcesById(id);
+ return JSONObject.toJSONString(majorHazardSources);
+ }
+
+ /**
+ * 新增重大危险源
+ */
+ @GetMapping(value = "/add")
+ public String add(@RequestBody MajorHazardSources majorHazardSources)
+ {
+ AjaxResult ajaxResult = toAjax(majorHazardSourcesService.insertMajorHazardSources(majorHazardSources));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 修改重大危险源
+ */
+ @GetMapping(value = "/edit")
+ public String edit(@RequestBody MajorHazardSources majorHazardSources)
+ {
+ AjaxResult ajaxResult = toAjax(majorHazardSourcesService.updateMajorHazardSources(majorHazardSources));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 删除重大危险源
+ */
+ @GetMapping(value = "/remove")
+ public String remove(@PathVariable int[] ids)
+ {
+ AjaxResult ajaxResult = toAjax(majorHazardSourcesService.deleteMajorHazardSourcesByIds(ids));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 重大危险源统计
+ */
+ @GetMapping(value = "/majorHazardSourcesStatistics")
+ public String majorHazardSourcesStatistics()
+ {
+ return majorHazardSourcesService.majorHazardSourcesStatistics();
+ }
+
+}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/PersionController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/PersionController.java
new file mode 100644
index 0000000..65b7eea
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/PersionController.java
@@ -0,0 +1,82 @@
+package com.hbt.safety.supervision.controller;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hbt.safety.supervision.pojo.Persion;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+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.hbt.safety.supervision.service.IPersionService;
+import com.hbt.common.core.web.controller.BaseController;
+import com.hbt.common.core.web.domain.AjaxResult;
+import com.hbt.common.core.web.page.TableDataInfo;
+
+/**
+ * 人员信息Controller
+ *
+ * @author 张雨
+ * @date 2023-02-14
+ */
+@RestController
+@RequestMapping("/persion")
+public class PersionController extends BaseController
+{
+ @Autowired
+ private IPersionService persionService;
+
+ /**
+ * 查询人员信息列表
+ */
+ @GetMapping("/list")
+ public String list(Persion persion)
+ {
+ startPage();
+ List list = persionService.selectPersionList(persion);
+ TableDataInfo tableDataInfo = getDataTable(list);
+ return JSONObject.toJSONString(tableDataInfo);
+ }
+
+ /**
+ * 获取人员信息详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public String getInfo(@PathVariable("id") int id)
+ {
+ Persion persion = persionService.selectPersionById(id);
+ return JSONObject.toJSONString(persion);
+ }
+
+ /**
+ * 新增人员信息
+ */
+ @GetMapping(value = "/add")
+ public String add(@RequestBody Persion persion)
+ {
+ AjaxResult ajaxResult = toAjax(persionService.insertPersion(persion));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 修改人员信息
+ */
+ @GetMapping(value = "/edit")
+ public String edit(@RequestBody Persion persion)
+ {
+ AjaxResult ajaxResult = toAjax(persionService.updatePersion(persion));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 删除人员信息
+ */
+ @GetMapping(value = "/remove")
+ public String remove(@PathVariable int[] ids)
+ {
+ AjaxResult ajaxResult = toAjax(persionService.deletePersionByIds(ids));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/RiskAreaController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/RiskAreaController.java
new file mode 100644
index 0000000..bf8162a
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/RiskAreaController.java
@@ -0,0 +1,83 @@
+package com.hbt.safety.supervision.controller;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hbt.safety.supervision.pojo.RiskArea;
+import com.hbt.safety.supervision.service.IRiskAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+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.hbt.common.core.web.controller.BaseController;
+import com.hbt.common.core.web.domain.AjaxResult;
+import com.hbt.common.core.web.page.TableDataInfo;
+
+/**
+ * 风险区域Controller
+ *
+ * @author 张雨
+ * @date 2023-02-14
+ */
+@RestController
+@RequestMapping("/area")
+public class RiskAreaController extends BaseController
+{
+ @Autowired
+ private IRiskAreaService riskAreaService;
+
+ /**
+ * 查询风险区域列表
+ */
+ @GetMapping("/list")
+ public String list(RiskArea riskArea)
+ {
+ startPage();
+ List list = riskAreaService.selectRiskAreaList(riskArea);
+ TableDataInfo tableDataInfo = getDataTable(list);
+ return JSONObject.toJSONString(tableDataInfo);
+ }
+
+
+ /**
+ * 获取风险区域详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public String getInfo(@PathVariable("id") int id)
+ {
+ AjaxResult ajaxResult = success(riskAreaService.selectRiskAreaById(id));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 新增风险区域
+ */
+ @GetMapping(value = "/add")
+ public String add(@RequestBody RiskArea riskArea)
+ {
+ AjaxResult ajaxResult = toAjax(riskAreaService.insertRiskArea(riskArea));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 修改风险区域
+ */
+ @GetMapping(value = "/edit")
+ public String edit(@RequestBody RiskArea riskArea)
+ {
+ AjaxResult ajaxResult = toAjax(riskAreaService.updateRiskArea(riskArea));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 删除风险区域
+ */
+ @GetMapping(value = "/remove")
+ public String remove(@PathVariable int[] ids)
+ {
+ AjaxResult ajaxResult = toAjax(riskAreaService.deleteRiskAreaByIds(ids));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/RiskController.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/RiskController.java
new file mode 100644
index 0000000..906a2a1
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/RiskController.java
@@ -0,0 +1,91 @@
+package com.hbt.safety.supervision.controller;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hbt.safety.supervision.pojo.Risk;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+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.hbt.safety.supervision.service.IRiskService;
+import com.hbt.common.core.web.controller.BaseController;
+import com.hbt.common.core.web.domain.AjaxResult;
+import com.hbt.common.core.web.page.TableDataInfo;
+
+/**
+ * 风险Controller
+ *
+ * @author 张雨
+ * @date 2023-02-14
+ */
+@RestController
+@RequestMapping("/risk")
+public class RiskController extends BaseController
+{
+ @Autowired
+ private IRiskService riskService;
+
+ /**
+ * 查询风险列表
+ */
+ @GetMapping("/list")
+ public String list(Risk risk)
+ {
+ startPage();
+ List list = riskService.selectRiskList(risk);
+ TableDataInfo tableDataInfo = getDataTable(list);
+ return JSONObject.toJSONString(tableDataInfo);
+ }
+
+ /**
+ * 获取风险详细信息
+ */
+ @GetMapping(value = "/{id}")
+ public String getInfo(@PathVariable("id") int id)
+ {
+ AjaxResult ajaxResult = success(riskService.selectRiskById(id));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 新增风险
+ */
+ @GetMapping("/add")
+ public String add(@RequestBody Risk risk)
+ {
+ AjaxResult ajaxResult = toAjax(riskService.insertRisk(risk));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 修改风险
+ */
+ @GetMapping("/edit")
+ public String edit(@RequestBody Risk risk)
+ {
+ AjaxResult ajaxResult = toAjax(riskService.updateRisk(risk));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 删除风险
+ */
+ @GetMapping("/{ids}")
+ public String remove(@PathVariable int[] ids)
+ {
+ AjaxResult ajaxResult = toAjax(riskService.deleteRiskByIds(ids));
+ return JSONObject.toJSONString(ajaxResult);
+ }
+
+ /**
+ * 风险统计
+ * @return
+ */
+ @GetMapping("/riskStatistics")
+ public String riskStatistics() {
+ return riskService.riskStatistics();
+ }
+}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInfomationMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInfomationMapper.java
new file mode 100644
index 0000000..403e2d7
--- /dev/null
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInfomationMapper.java
@@ -0,0 +1,76 @@
+package com.hbt.safety.supervision.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.hbt.safety.supervision.pojo.EnterpriseInfomation;
+
+/**
+ * 企业信息Mapper接口
+ *
+ * @author zhangyu
+ * @date 2023-02-14
+ */
+public interface EnterpriseInfomationMapper
+{
+ /**
+ * 查询企业信息
+ *
+ * @param id 企业信息主键
+ * @return 企业信息
+ */
+ EnterpriseInfomation selectEnterpriseInfomationById(int id);
+
+ /**
+ * 查询企业信息列表
+ *
+ * @param enterpriseInfomation 企业信息
+ * @return 企业信息集合
+ */
+ List selectEnterpriseInfomationList(EnterpriseInfomation enterpriseInfomation);
+
+ /**
+ * 新增企业信息
+ *
+ * @param enterpriseInfomation 企业信息
+ * @return 结果
+ */
+ int insertEnterpriseInfomation(EnterpriseInfomation enterpriseInfomation);
+
+ /**
+ * 修改企业信息
+ *
+ * @param enterpriseInfomation 企业信息
+ * @return 结果
+ */
+ int updateEnterpriseInfomation(EnterpriseInfomation enterpriseInfomation);
+
+ /**
+ * 删除企业信息
+ *
+ * @param id 企业信息主键
+ * @return 结果
+ */
+ int deleteEnterpriseInfomationById(int id);
+
+ /**
+ * 批量删除企业信息
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ int deleteEnterpriseInfomationByIds(int[] ids);
+
+ /**
+ * 查询企业信息列表
+ *
+ * @return 企业信息集合
+ */
+ List selectEnterpriseInfomations();
+
+ List