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
index 8d83195..5a39441 100644
--- 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
@@ -78,6 +78,9 @@
+
+
+
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/hbt-safety-supervision-biz.iml b/hbt-safety-supervision/hbt-safety-supervision-biz/hbt-safety-supervision-biz.iml
index f0dbc4b..c9366f1 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/hbt-safety-supervision-biz.iml
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/hbt-safety-supervision-biz.iml
@@ -223,5 +223,7 @@
+
+
\ No newline at end of file
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
index f535f3f..19f3b1a 100644
--- 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
@@ -16,13 +16,12 @@ import com.hbt.common.core.web.page.TableDataInfo;
/**
* 危险作业Controller
- *
+ *
* @author zhangyu
*/
@RestController
@RequestMapping("/operation")
-public class HazardousOperationController extends BaseController
-{
+public class HazardousOperationController extends BaseController {
@Autowired
private IHazardousOperationService hazardousOperationService;
@@ -30,8 +29,7 @@ public class HazardousOperationController extends BaseController
* 查询危险作业列表
*/
@GetMapping("/list")
- public String list()
- {
+ public String list() {
List list = hazardousOperationService.selectHazardousOperationList();
TableDataInfo tableDataInfo = getDataTable(list);
return JSONObject.toJSONString(tableDataInfo);
@@ -41,8 +39,7 @@ public class HazardousOperationController extends BaseController
* 获取危险作业详细信息
*/
@GetMapping(value = "/getInfo")
- public String getInfo(int id)
- {
+ public String getInfo(int id) {
AjaxResult ajaxResult = success(hazardousOperationService.selectHazardousOperationById(id));
return JSONObject.toJSONString(ajaxResult);
}
@@ -51,8 +48,7 @@ public class HazardousOperationController extends BaseController
* 新增危险作业
*/
@GetMapping(value = "/add")
- public String add(@RequestBody HazardousOperation hazardousOperation)
- {
+ public String add(@RequestBody HazardousOperation hazardousOperation) {
AjaxResult ajaxResult = toAjax(hazardousOperationService.insertHazardousOperation(hazardousOperation));
return JSONObject.toJSONString(ajaxResult);
}
@@ -61,8 +57,7 @@ public class HazardousOperationController extends BaseController
* 修改危险作业
*/
@GetMapping(value = "/edit")
- public String edit(@RequestBody HazardousOperation hazardousOperation)
- {
+ public String edit(@RequestBody HazardousOperation hazardousOperation) {
AjaxResult ajaxResult = toAjax(hazardousOperationService.updateHazardousOperation(hazardousOperation));
return JSONObject.toJSONString(ajaxResult);
}
@@ -71,8 +66,7 @@ public class HazardousOperationController extends BaseController
* 删除危险作业
*/
@GetMapping(value = "/remove")
- public String remove(int[] ids)
- {
+ public String remove(int[] ids) {
AjaxResult ajaxResult = toAjax(hazardousOperationService.deleteHazardousOperationByIds(ids));
return JSONObject.toJSONString(ajaxResult);
}
@@ -81,8 +75,7 @@ public class HazardousOperationController extends BaseController
* 首页危险作业统计
*/
@GetMapping(value = "/hazardousOperationStatistics")
- public String hazardousOperationStatistics()
- {
+ public String hazardousOperationStatistics() {
return hazardousOperationService.hazardousOperationStatistics();
}
@@ -90,8 +83,7 @@ public class HazardousOperationController extends BaseController
* 危险作业统计
*/
@GetMapping(value = "/hazardousOperationManagement")
- public String hazardousOperationManagement()
- {
+ public String hazardousOperationManagement() {
return hazardousOperationService.hazardousOperationManagement();
}
}
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
index 9de430b..6104b21 100644
--- 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
@@ -15,13 +15,12 @@ import com.hbt.common.core.web.domain.AjaxResult;
/**
* 重大危险源Controller
- *
+ *
* @author zhangyu
*/
@RestController
@RequestMapping("/sources")
-public class MajorHazardSourcesController extends BaseController
-{
+public class MajorHazardSourcesController extends BaseController {
@Autowired
private IMajorHazardSourcesService majorHazardSourcesService;
@@ -29,8 +28,7 @@ public class MajorHazardSourcesController extends BaseController
* 查询重大危险源列表
*/
@GetMapping("/list")
- public String list(MajorHazardSources majorHazardSources)
- {
+ public String list(MajorHazardSources majorHazardSources) {
List list = majorHazardSourcesService.selectMajorHazardSourcesList(majorHazardSources);
return JSONObject.toJSONString(list);
}
@@ -39,8 +37,7 @@ public class MajorHazardSourcesController extends BaseController
* 获取重大危险源详细信息
*/
@GetMapping(value = "/getInfo")
- public String getInfo(int id)
- {
+ public String getInfo(int id) {
MajorHazardSources majorHazardSources = majorHazardSourcesService.selectMajorHazardSourcesById(id);
return JSONObject.toJSONString(majorHazardSources);
}
@@ -49,8 +46,7 @@ public class MajorHazardSourcesController extends BaseController
* 新增重大危险源
*/
@GetMapping(value = "/add")
- public String add(@RequestBody MajorHazardSources majorHazardSources)
- {
+ public String add(@RequestBody MajorHazardSources majorHazardSources) {
AjaxResult ajaxResult = toAjax(majorHazardSourcesService.insertMajorHazardSources(majorHazardSources));
return JSONObject.toJSONString(ajaxResult);
}
@@ -59,8 +55,7 @@ public class MajorHazardSourcesController extends BaseController
* 修改重大危险源
*/
@GetMapping(value = "/edit")
- public String edit(@RequestBody MajorHazardSources majorHazardSources)
- {
+ public String edit(@RequestBody MajorHazardSources majorHazardSources) {
AjaxResult ajaxResult = toAjax(majorHazardSourcesService.updateMajorHazardSources(majorHazardSources));
return JSONObject.toJSONString(ajaxResult);
}
@@ -69,8 +64,7 @@ public class MajorHazardSourcesController extends BaseController
* 删除重大危险源
*/
@GetMapping(value = "/remove")
- public String remove(int[] ids)
- {
+ public String remove(int[] ids) {
AjaxResult ajaxResult = toAjax(majorHazardSourcesService.deleteMajorHazardSourcesByIds(ids));
return JSONObject.toJSONString(ajaxResult);
}
@@ -79,8 +73,7 @@ public class MajorHazardSourcesController extends BaseController
* 重大危险源统计
*/
@GetMapping(value = "/majorHazardSourcesStatistics")
- public String 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/PersonController.java
similarity index 64%
rename from hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/PersionController.java
rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/PersonController.java
index 578a8ee..3cacdc5 100644
--- 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/PersonController.java
@@ -3,13 +3,13 @@ package com.hbt.safety.supervision.controller;
import java.util.List;
import com.alibaba.fastjson.JSONObject;
-import com.hbt.safety.supervision.pojo.Persion;
+import com.hbt.safety.supervision.pojo.Person;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
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.safety.supervision.service.IPersonService;
import com.hbt.common.core.web.controller.BaseController;
import com.hbt.common.core.web.domain.AjaxResult;
import com.hbt.common.core.web.page.TableDataInfo;
@@ -20,20 +20,20 @@ import com.hbt.common.core.web.page.TableDataInfo;
* @author 张雨
*/
@RestController
-@RequestMapping("/persion")
-public class PersionController extends BaseController
+@RequestMapping("/person")
+public class PersonController extends BaseController
{
@Autowired
- private IPersionService persionService;
+ private IPersonService personService;
/**
* 查询人员信息列表
*/
@GetMapping("/list")
- public String list(Persion persion)
+ public String list(Person person)
{
startPage();
- List list = persionService.selectPersionList(persion);
+ List list = personService.selectPersonList(person);
TableDataInfo tableDataInfo = getDataTable(list);
return JSONObject.toJSONString(tableDataInfo);
}
@@ -44,17 +44,17 @@ public class PersionController extends BaseController
@GetMapping(value = "/getInfo")
public String getInfo(int id)
{
- Persion persion = persionService.selectPersionById(id);
- return JSONObject.toJSONString(persion);
+ Person person = personService.selectPersonById(id);
+ return JSONObject.toJSONString(person);
}
/**
* 新增人员信息
*/
@GetMapping(value = "/add")
- public String add(@RequestBody Persion persion)
+ public String add(@RequestBody Person person)
{
- AjaxResult ajaxResult = toAjax(persionService.insertPersion(persion));
+ AjaxResult ajaxResult = toAjax(personService.insertPerson(person));
return JSONObject.toJSONString(ajaxResult);
}
@@ -62,9 +62,9 @@ public class PersionController extends BaseController
* 修改人员信息
*/
@GetMapping(value = "/edit")
- public String edit(@RequestBody Persion persion)
+ public String edit(@RequestBody Person person)
{
- AjaxResult ajaxResult = toAjax(persionService.updatePersion(persion));
+ AjaxResult ajaxResult = toAjax(personService.updatePerson(person));
return JSONObject.toJSONString(ajaxResult);
}
@@ -74,7 +74,7 @@ public class PersionController extends BaseController
@GetMapping(value = "/remove")
public String remove(int[] ids)
{
- AjaxResult ajaxResult = toAjax(persionService.deletePersionByIds(ids));
+ AjaxResult ajaxResult = toAjax(personService.deletePersonByIds(ids));
return JSONObject.toJSONString(ajaxResult);
}
}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/PersionMapper.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/PersonMapper.java
similarity index 57%
rename from hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/PersionMapper.java
rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/PersonMapper.java
index 834c97f..4ef4156 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/PersionMapper.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/PersonMapper.java
@@ -2,63 +2,62 @@ package com.hbt.safety.supervision.mapper;
import java.util.List;
-import com.hbt.safety.supervision.pojo.Persion;
+import com.hbt.safety.supervision.pojo.Person;
/**
* 人员信息Mapper接口
- *
+ *
* @author 张雨
* @date 2023-02-14
*/
-public interface PersionMapper
-{
+public interface PersonMapper {
/**
* 查询人员信息
- *
+ *
* @param id 人员信息主键
* @return 人员信息
*/
- Persion selectPersionById(int id);
+ Person selectPersonById(int id);
/**
* 查询人员信息列表
- *
- * @param persion 人员信息
+ *
+ * @param person 人员信息
* @return 人员信息集合
*/
- List selectPersionList(Persion persion);
+ List selectPersonList(Person person);
/**
* 新增人员信息
- *
- * @param persion 人员信息
+ *
+ * @param person 人员信息
* @return 结果
*/
- int insertPersion(Persion persion);
+ int insertPerson(Person person);
/**
* 修改人员信息
- *
- * @param persion 人员信息
+ *
+ * @param person 人员信息
* @return 结果
*/
- int updatePersion(Persion persion);
+ int updatePerson(Person person);
/**
* 删除人员信息
- *
+ *
* @param id 人员信息主键
* @return 结果
*/
- int deletePersionById(int id);
+ int deletePersonById(int id);
/**
* 批量删除人员信息
- *
+ *
* @param ids 需要删除的数据主键集合
* @return 结果
*/
- int deletePersionByIds(int[] ids);
+ int deletePersonByIds(int[] ids);
- int getPersionCount();
+ int getPersonCount();
}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/LawEnforcementInspection.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/LawEnforcementInspection.java
index de1ef90..e3de1ec 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/LawEnforcementInspection.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/LawEnforcementInspection.java
@@ -24,7 +24,7 @@ public class LawEnforcementInspection extends BaseEntity
/** 巡查人员 */
@Excel(name = "巡查人员")
- private String persion;
+ private String person;
/** 巡查名称 */
@Excel(name = "巡查名称")
@@ -58,14 +58,14 @@ public class LawEnforcementInspection extends BaseEntity
{
return inspectionDate;
}
- public void setPersionId(String persion)
+ public void setPersonId(String person)
{
- this.persion = persion;
+ this.person = person;
}
- public String getPersionId()
+ public String getPersonId()
{
- return persion;
+ return person;
}
public void setName(String name)
{
@@ -86,12 +86,12 @@ public class LawEnforcementInspection extends BaseEntity
return remarks;
}
- public String getPersion() {
- return persion;
+ public String getPerson() {
+ return person;
}
- public void setPersion(String persion) {
- this.persion = persion;
+ public void setPerson(String person) {
+ this.person = person;
}
public int getHiddenDangerId() {
@@ -115,7 +115,7 @@ public class LawEnforcementInspection extends BaseEntity
return "LawEnforcementInspection{" +
"id=" + id +
", inspectionDate=" + inspectionDate +
- ", persion='" + persion + '\'' +
+ ", person='" + person + '\'' +
", name='" + name + '\'' +
", remarks='" + remarks + '\'' +
", hiddenDangerId=" + hiddenDangerId +
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/Persion.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/Person.java
similarity index 92%
rename from hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/Persion.java
rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/Person.java
index 4b62d00..ec3e8e1 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/Persion.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/Person.java
@@ -7,13 +7,13 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
- * 人员信息对象 persion
+ * 人员信息对象 person
*
* @author 张雨
* @date 2023-02-14
*/
@Data
-public class Persion extends BaseEntity
+public class Person extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IPersionService.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IPersonService.java
similarity index 63%
rename from hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IPersionService.java
rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IPersonService.java
index 72fefca..0c5eae8 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IPersionService.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IPersonService.java
@@ -2,7 +2,7 @@ package com.hbt.safety.supervision.service;
import java.util.List;
-import com.hbt.safety.supervision.pojo.Persion;
+import com.hbt.safety.supervision.pojo.Person;
/**
* 人员信息Service接口
@@ -10,7 +10,7 @@ import com.hbt.safety.supervision.pojo.Persion;
* @author 张雨
* @date 2023-02-14
*/
-public interface IPersionService
+public interface IPersonService
{
/**
* 查询人员信息
@@ -18,31 +18,31 @@ public interface IPersionService
* @param id 人员信息主键
* @return 人员信息
*/
- Persion selectPersionById(int id);
+ Person selectPersonById(int id);
/**
* 查询人员信息列表
*
- * @param persion 人员信息
+ * @param person 人员信息
* @return 人员信息集合
*/
- List selectPersionList(Persion persion);
+ List selectPersonList(Person person);
/**
* 新增人员信息
*
- * @param persion 人员信息
+ * @param person 人员信息
* @return 结果
*/
- int insertPersion(Persion persion);
+ int insertPerson(Person person);
/**
* 修改人员信息
*
- * @param persion 人员信息
+ * @param person 人员信息
* @return 结果
*/
- int updatePersion(Persion persion);
+ int updatePerson(Person person);
/**
* 批量删除人员信息
@@ -50,7 +50,7 @@ public interface IPersionService
* @param ids 需要删除的人员信息主键集合
* @return 结果
*/
- int deletePersionByIds(int[] ids);
+ int deletePersonByIds(int[] ids);
/**
* 删除人员信息信息
@@ -58,5 +58,5 @@ public interface IPersionService
* @param id 人员信息主键
* @return 结果
*/
- int deletePersionById(int id);
+ int deletePersonById(int id);
}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInfomationServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInfomationServiceImpl.java
index 3e1fbfa..dfcf3e2 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInfomationServiceImpl.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInfomationServiceImpl.java
@@ -8,94 +8,87 @@ import com.alibaba.fastjson.JSONObject;
import com.hbt.safety.supervision.mapper.EnterpriseInfomationMapper;
import com.hbt.safety.supervision.pojo.EnterpriseInfomation;
import com.hbt.safety.supervision.service.IEnterpriseInfomationService;
-import com.hbt.safety.supervision.mapper.PersionMapper;
+import com.hbt.safety.supervision.mapper.PersonMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 企业信息Service业务层处理
- *
+ *
* @author zhangyu
* @date 2023-02-14
*/
@Service
-public class EnterpriseInfomationServiceImpl implements IEnterpriseInfomationService
-{
+public class EnterpriseInfomationServiceImpl implements IEnterpriseInfomationService {
@Autowired
private EnterpriseInfomationMapper enterpriseInfomationMapper;
@Autowired
- PersionMapper persionMapper;
+ PersonMapper personMapper;
/**
* 查询企业信息
- *
+ *
* @param id 企业信息主键
* @return 企业信息
*/
@Override
- public EnterpriseInfomation selectEnterpriseInfomationById(int id)
- {
+ public EnterpriseInfomation selectEnterpriseInfomationById(int id) {
return enterpriseInfomationMapper.selectEnterpriseInfomationById(id);
}
/**
* 查询企业信息列表
- *
+ *
* @param enterpriseInfomation 企业信息
* @return 企业信息
*/
@Override
- public List selectEnterpriseInfomationList(EnterpriseInfomation enterpriseInfomation)
- {
+ public List selectEnterpriseInfomationList(EnterpriseInfomation enterpriseInfomation) {
return enterpriseInfomationMapper.selectEnterpriseInfomationList(enterpriseInfomation);
}
/**
* 新增企业信息
- *
+ *
* @param enterpriseInfomation 企业信息
* @return 结果
*/
@Override
- public int insertEnterpriseInfomation(EnterpriseInfomation enterpriseInfomation)
- {
+ public int insertEnterpriseInfomation(EnterpriseInfomation enterpriseInfomation) {
return enterpriseInfomationMapper.insertEnterpriseInfomation(enterpriseInfomation);
}
/**
* 修改企业信息
- *
+ *
* @param enterpriseInfomation 企业信息
* @return 结果
*/
@Override
- public int updateEnterpriseInfomation(EnterpriseInfomation enterpriseInfomation)
- {
+ public int updateEnterpriseInfomation(EnterpriseInfomation enterpriseInfomation) {
return enterpriseInfomationMapper.updateEnterpriseInfomation(enterpriseInfomation);
}
/**
* 批量删除企业信息
- *
+ *
* @param ids 需要删除的企业信息主键
* @return 结果
*/
@Override
- public int deleteEnterpriseInfomationByIds(int[] ids)
- {
+ public int deleteEnterpriseInfomationByIds(int[] ids) {
return enterpriseInfomationMapper.deleteEnterpriseInfomationByIds(ids);
}
/**
* 删除企业信息信息
- *
+ *
* @param id 企业信息主键
* @return 结果
*/
@Override
- public int deleteEnterpriseInfomationById(int id)
- {
+ public int deleteEnterpriseInfomationById(int id) {
return enterpriseInfomationMapper.deleteEnterpriseInfomationById(id);
}
@@ -112,13 +105,13 @@ public class EnterpriseInfomationServiceImpl implements IEnterpriseInfomationSer
// 在管企业数量
int enterpriseCount = enterpriseInfomationMapper.getEnterpriseCount();
// 企业员工数
- int persionCount = persionMapper.getPersionCount();
+ int personCount = personMapper.getPersonCount();
// 等级车辆数
int carCount = enterpriseInfomationMapper.getCarCount();
map.put("enterpriseClassification", list);
map.put("enterpriseCount", enterpriseCount);
- map.put("personCount", persionCount);
+ map.put("personCount", personCount);
map.put("carCount", carCount);
return JSONObject.toJSONString(map);
}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/PersionServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/PersonServiceImpl.java
similarity index 51%
rename from hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/PersionServiceImpl.java
rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/PersonServiceImpl.java
index ed1e4a9..d22c9f0 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/PersionServiceImpl.java
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/PersonServiceImpl.java
@@ -2,11 +2,11 @@ package com.hbt.safety.supervision.service.impl;
import java.util.List;
-import com.hbt.safety.supervision.pojo.Persion;
+import com.hbt.safety.supervision.pojo.Person;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.hbt.safety.supervision.mapper.PersionMapper;
-import com.hbt.safety.supervision.service.IPersionService;
+import com.hbt.safety.supervision.mapper.PersonMapper;
+import com.hbt.safety.supervision.service.IPersonService;
/**
* 人员信息Service业务层处理
@@ -15,10 +15,10 @@ import com.hbt.safety.supervision.service.IPersionService;
* @date 2023-02-14
*/
@Service
-public class PersionServiceImpl implements IPersionService
+public class PersonServiceImpl implements IPersonService
{
@Autowired
- private PersionMapper persionMapper;
+ private PersonMapper personMapper;
/**
* 查询人员信息
@@ -27,45 +27,45 @@ public class PersionServiceImpl implements IPersionService
* @return 人员信息
*/
@Override
- public Persion selectPersionById(int id)
+ public Person selectPersonById(int id)
{
- return persionMapper.selectPersionById(id);
+ return personMapper.selectPersonById(id);
}
/**
* 查询人员信息列表
*
- * @param persion 人员信息
+ * @param person 人员信息
* @return 人员信息
*/
@Override
- public List selectPersionList(Persion persion)
+ public List selectPersonList(Person person)
{
- return persionMapper.selectPersionList(persion);
+ return personMapper.selectPersonList(person);
}
/**
* 新增人员信息
*
- * @param persion 人员信息
+ * @param person 人员信息
* @return 结果
*/
@Override
- public int insertPersion(Persion persion)
+ public int insertPerson(Person person)
{
- return persionMapper.insertPersion(persion);
+ return personMapper.insertPerson(person);
}
/**
* 修改人员信息
*
- * @param persion 人员信息
+ * @param person 人员信息
* @return 结果
*/
@Override
- public int updatePersion(Persion persion)
+ public int updatePerson(Person person)
{
- return persionMapper.updatePersion(persion);
+ return personMapper.updatePerson(person);
}
/**
@@ -75,9 +75,9 @@ public class PersionServiceImpl implements IPersionService
* @return 结果
*/
@Override
- public int deletePersionByIds(int[] ids)
+ public int deletePersonByIds(int[] ids)
{
- return persionMapper.deletePersionByIds(ids);
+ return personMapper.deletePersonByIds(ids);
}
/**
@@ -87,8 +87,8 @@ public class PersionServiceImpl implements IPersionService
* @return 结果
*/
@Override
- public int deletePersionById(int id)
+ public int deletePersonById(int id)
{
- return persionMapper.deletePersionById(id);
+ return personMapper.deletePersonById(id);
}
}
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml
index b34252c..90b3f99 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
r.name as riskName
from hidden_danger as a
left join enterprise_infomation as b on a.enterprise_id = b.id
- left join persion as p on a.person_id = p.id
+ left join person as p on a.person_id = p.id
left join risk as r on a.risk_id = r.id
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/LawEnforcementInspectionMapper.xml b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/LawEnforcementInspectionMapper.xml
index f804caf..a6bfd1e 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/LawEnforcementInspectionMapper.xml
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/LawEnforcementInspectionMapper.xml
@@ -7,13 +7,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
- select distinct(a.id) id, a.inspection_date, a.inspection_date, a.persion persion, a.name name,
+ select distinct(a.id) id, a.inspection_date, a.inspection_date, a.person person, a.name name,
b.hidden_danger_id hiddenDangerId,
c.risk_id riskId
from law_enforcement_inspection as a
@@ -35,14 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
id,
inspection_date,
- persion,
+ person,
name,
remarks,
#{id},
#{inspectionDate},
- #{persion},
+ #{person},
#{name},
#{remarks},
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update law_enforcement_inspection
inspection_date = #{inspectionDate},
- persion = #{persion},
+ person = #{person},
name = #{name},
remarks = #{remarks},
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/PersionMapper.xml b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/PersonMapper.xml
similarity index 72%
rename from hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/PersionMapper.xml
rename to hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/PersonMapper.xml
index 66bdd6f..0280552 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/PersionMapper.xml
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/PersonMapper.xml
@@ -2,9 +2,9 @@
-
+
-
+
@@ -16,24 +16,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
- select name, phone, addr from persion
+
+ select name, phone, addr from person
-
\ No newline at end of file
diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml
index 2ac5e71..0df3ccf 100644
--- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml
+++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
p.name as responsiblePerson
from risk as a
left join enterprise_infomation as b on a.enterprise_id = b.id
- left join persion as p on a.responsible_person_id = p.id
+ left join person as p on a.responsible_person_id = p.id