id类型修改

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EnterpriseInformationController.java

@@ -46,7 +46,7 @@ public class EnterpriseInformationController extends BaseController
      */
     @ApiOperation("获取企业信息详细信息")
     @GetMapping(value = "/getInfo")
-    public String getInfo(int id)
+    public String getInfo(String id)
     {
         AjaxResult ajaxResult = success(enterpriseInformationService.selectEnterpriseInformationById(id));
         return JSONObject.toJSONString(ajaxResult);
@@ -79,7 +79,7 @@ public class EnterpriseInformationController extends BaseController
      */
     @ApiOperation("删除企业信息")
     @GetMapping("/remove")
-    public String remove(int[] ids)
+    public String remove(String[] ids)
     {
         AjaxResult ajaxResult = toAjax(enterpriseInformationService.deleteEnterpriseInformationByIds(ids));
         return JSONObject.toJSONString(ajaxResult);

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java

@@ -33,7 +33,7 @@ public class EscalateHiddenDangerController extends BaseController
      * @param id 巡检执法id
      */
     @GetMapping("/list")
-    public String list(int id)
+    public String list(String id)
     {
         List<EscalateHiddenDanger> list = escalateHiddenDangerService.selectEscalateHiddenDangerList(id);
         return JSONObject.toJSONString(list);
@@ -73,7 +73,7 @@ public class EscalateHiddenDangerController extends BaseController
      * 删除上报隐患
      */
     @GetMapping(value = "/remove")
-    public String remove(int[] ids)
+    public String remove(String[] ids)
     {
         AjaxResult ajaxResult = toAjax(escalateHiddenDangerService.deleteEscalateHiddenDangerByIds(ids));
         return JSONObject.toJSONString(ajaxResult);

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateRiskController.java

@@ -12,7 +12,6 @@ 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
@@ -32,7 +31,7 @@ public class EscalateRiskController extends BaseController
      * @param id 巡检执法id
      */
     @GetMapping("/list")
-    public String list(int id)
+    public String list(String id)
     {
         List<EscalateRisk> list = escalateRiskService.selectEscalateRiskList(id);
         return JSONObject.toJSONString(list);
@@ -72,7 +71,7 @@ public class EscalateRiskController extends BaseController
      * 删除上报风险
      */
     @GetMapping(value = "/remove")
-    public String remove(int[] ids)
+    public String remove(String[] ids)
     {
         AjaxResult ajaxResult = toAjax(escalateRiskService.deleteEscalateRiskByIds(ids));
         return JSONObject.toJSONString(ajaxResult);

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HazardousOperationController.java

@@ -44,7 +44,7 @@ public class HazardousOperationController extends BaseController {
      */
     @ApiOperation("获取危险作业详细信息")
     @GetMapping(value = "/getInfo")
-    public String getInfo(int id) {
+    public String getInfo(String id) {
         AjaxResult ajaxResult = success(hazardousOperationService.selectHazardousOperationById(id));
         return JSONObject.toJSONString(ajaxResult);
     }
@@ -71,7 +71,7 @@ public class HazardousOperationController extends BaseController {
      * 删除危险作业
      */
     @GetMapping(value = "/remove")
-    public String remove(int[] ids) {
+    public String remove(String[] ids) {
         AjaxResult ajaxResult = toAjax(hazardousOperationService.deleteHazardousOperationByIds(ids));
         return JSONObject.toJSONString(ajaxResult);
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/HiddenDangerController.java

@@ -47,7 +47,7 @@ public class HiddenDangerController extends BaseController
      */
     @ApiOperation("获取隐患详细信息")
     @GetMapping(value = "/getInfo")
-    public String getInfo(int id)
+    public String getInfo(String id)
     {
         AjaxResult ajaxResult = success(hiddenDangerService.selectHiddenDangerById(id));
         return JSONObject.toJSONString(ajaxResult);
@@ -77,7 +77,7 @@ public class HiddenDangerController extends BaseController
      * 删除隐患
      */
     @GetMapping(value = "/remove")
-    public String remove(int[] ids)
+    public String remove(String[] ids)
     {
         AjaxResult ajaxResult =  toAjax(hiddenDangerService.deleteHiddenDangerByIds(ids));
         return JSONObject.toJSONString(ajaxResult);

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/LawEnforcementInspectionController.java

@@ -46,7 +46,7 @@ public class LawEnforcementInspectionController extends BaseController
      */
     @ApiOperation("获取执法巡查详细信息")
     @GetMapping(value = "/getInfo")
-    public String getInfo(int id)
+    public String getInfo(String id)
     {
         AjaxResult ajaxResult = success(lawEnforcementInspectionService.selectLawEnforcementInspectionById(id));
         return JSONObject.toJSONString(ajaxResult);
@@ -76,7 +76,7 @@ public class LawEnforcementInspectionController extends BaseController
      * 删除执法巡查
      */
     @GetMapping(value = "/remove")
-    public String remove(int[] ids)
+    public String remove(String[] ids)
     {
         AjaxResult ajaxResult = toAjax(lawEnforcementInspectionService.deleteLawEnforcementInspectionByIds(ids));
         return JSONObject.toJSONString(ajaxResult);

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/MajorHazardSourcesController.java

@@ -42,7 +42,7 @@ public class MajorHazardSourcesController extends BaseController {
      */
     @ApiOperation("获取重大危险源详细信息")
     @GetMapping(value = "/getInfo")
-    public String getInfo(int id) {
+    public String getInfo(String id) {
         MajorHazardSources majorHazardSources = majorHazardSourcesService.selectMajorHazardSourcesById(id);
         return JSONObject.toJSONString(majorHazardSources);
     }
@@ -69,7 +69,7 @@ public class MajorHazardSourcesController extends BaseController {
      * 删除重大危险源
      */
     @GetMapping(value = "/remove")
-    public String remove(int[] ids) {
+    public String remove(String[] ids) {
         AjaxResult ajaxResult = toAjax(majorHazardSourcesService.deleteMajorHazardSourcesByIds(ids));
         return JSONObject.toJSONString(ajaxResult);
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/PersonController.java

@@ -39,7 +39,7 @@ public class PersonController extends BaseController
      * 获取人员信息详细信息
      */
     @GetMapping(value = "/getInfo")
-    public String getInfo(int id)
+    public String getInfo(String id)
     {
         Person person = personService.selectPersonById(id);
         return JSONObject.toJSONString(person);
@@ -69,7 +69,7 @@ public class PersonController extends BaseController
      * 删除人员信息
      */
     @GetMapping(value = "/remove")
-    public String remove(int[] ids)
+    public String remove(String[] ids)
     {
         AjaxResult ajaxResult = toAjax(personService.deletePersonByIds(ids));
         return JSONObject.toJSONString(ajaxResult);

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/RiskAreaController.java

@@ -41,7 +41,7 @@ public class RiskAreaController extends BaseController
      * 获取风险区域详细信息
      */
     @GetMapping(value = "/getInfo")
-    public String getInfo(int id)
+    public String getInfo(String id)
     {
         AjaxResult ajaxResult = success(riskAreaService.selectRiskAreaById(id));
         return JSONObject.toJSONString(ajaxResult);
@@ -71,7 +71,7 @@ public class RiskAreaController extends BaseController
      * 删除风险区域
      */
     @GetMapping(value = "/remove")
-    public String remove(int[] ids)
+    public String remove(String[] ids)
     {
         AjaxResult ajaxResult = toAjax(riskAreaService.deleteRiskAreaByIds(ids));
         return JSONObject.toJSONString(ajaxResult);

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/RiskController.java

@@ -44,7 +44,7 @@ public class RiskController extends BaseController
      */
     @ApiOperation("获取风险详细信息")
     @GetMapping(value = "/getInfo")
-    public String getInfo(int id)
+    public String getInfo(String id)
     {
         AjaxResult ajaxResult = success(riskService.selectRiskById(id));
         return JSONObject.toJSONString(ajaxResult);
@@ -74,7 +74,7 @@ public class RiskController extends BaseController
      * 删除风险
      */
 	@GetMapping("/remove")
-    public String remove(int[] ids)
+    public String remove(String[] ids)
     {
         AjaxResult ajaxResult = toAjax(riskService.deleteRiskByIds(ids));
         return JSONObject.toJSONString(ajaxResult);

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EnterpriseInformationMapper.java

@@ -18,7 +18,7 @@ public interface EnterpriseInformationMapper
      * @param id 企业信息主键
      * @return 企业信息
      */
-    EnterpriseInformation selectEnterpriseInformationById(int id);
+    EnterpriseInformation selectEnterpriseInformationById(String id);
 
     /**
      * 查询企业信息列表
@@ -57,7 +57,7 @@ public interface EnterpriseInformationMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteEnterpriseInformationByIds(int[] ids);
+    int deleteEnterpriseInformationByIds(String[] ids);
 
     /**
      * 查询企业信息列表

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateHiddenDangerMapper.java

@@ -26,7 +26,7 @@ public interface EscalateHiddenDangerMapper
      *
      * @return 上报隐患集合
      */
-    List<EscalateHiddenDanger> selectEscalateHiddenDangerList(int id);
+    List<EscalateHiddenDanger> selectEscalateHiddenDangerList(String id);
 
     /**
      * 新增上报隐患
@@ -58,7 +58,7 @@ public interface EscalateHiddenDangerMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteEscalateHiddenDangerByIds(int[] ids);
+    int deleteEscalateHiddenDangerByIds(String[] ids);
 
     /**
      * 获取上报隐患id集合

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateRiskMapper.java

@@ -24,7 +24,7 @@ public interface EscalateRiskMapper
      *
      * @return 上报风险集合
      */
-    List<EscalateRisk> selectEscalateRiskList(int id);
+    List<EscalateRisk> selectEscalateRiskList(String id);
 
     /**
      * 新增上报风险
@@ -56,7 +56,7 @@ public interface EscalateRiskMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteEscalateRiskByIds(int[] ids);
+    int deleteEscalateRiskByIds(String[] ids);
 
     /**
      * 查询上报风险id集合

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HazardousOperationMapper.java

@@ -19,7 +19,7 @@ public interface HazardousOperationMapper
      * @param id 危险作业主键
      * @return 危险作业
      */
-    HazardousOperation selectHazardousOperationById(int id);
+    HazardousOperation selectHazardousOperationById(String id);
 
     /**
      * 查询危险作业列表
@@ -58,7 +58,7 @@ public interface HazardousOperationMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteHazardousOperationByIds(int[] ids);
+    int deleteHazardousOperationByIds(String[] ids);
 
     /**
      * 查询统计所需数据

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/HiddenDangerMapper.java

@@ -20,7 +20,7 @@ public interface HiddenDangerMapper
      * @param id 隐患主键
      * @return 隐患
      */
-    HiddenDanger selectHiddenDangerById(int id);
+    HiddenDanger selectHiddenDangerById(String id);
 
     /**
      * 查询隐患列表
@@ -59,7 +59,7 @@ public interface HiddenDangerMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteHiddenDangerByIds(int[] ids);
+    int deleteHiddenDangerByIds(String[] ids);
 
     /**
      * 隐患信息列表

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/LawEnforcementInspectionMapper.java

@@ -20,7 +20,7 @@ public interface LawEnforcementInspectionMapper
      * @param id 执法巡查主键
      * @return 执法巡查
      */
-    LawEnforcementInspection selectLawEnforcementInspectionById(int id);
+    LawEnforcementInspection selectLawEnforcementInspectionById(String id);
 
     /**
      * 查询执法巡查列表
@@ -51,7 +51,7 @@ public interface LawEnforcementInspectionMapper
      * @param id 执法巡查主键
      * @return 结果
      */
-    int deleteLawEnforcementInspectionById(int id);
+    int deleteLawEnforcementInspectionById(String id);
 
     /**
      * 批量删除执法巡查
@@ -59,7 +59,7 @@ public interface LawEnforcementInspectionMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteLawEnforcementInspectionByIds(int[] ids);
+    int deleteLawEnforcementInspectionByIds(String[] ids);
 
     List<LawEnforcementInspectionVo> selectLawEnforcementInspections(Date yearAgo);
 }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/MajorHazardSourcesMapper.java

@@ -18,7 +18,7 @@ public interface MajorHazardSourcesMapper
      * @param id 重大危险源主键
      * @return 重大危险源
      */
-    MajorHazardSources selectMajorHazardSourcesById(int id);
+    MajorHazardSources selectMajorHazardSourcesById(String id);
 
     /**
      * 查询重大危险源列表
@@ -57,7 +57,7 @@ public interface MajorHazardSourcesMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteMajorHazardSourcesByIds(int[] ids);
+    int deleteMajorHazardSourcesByIds(String[] ids);
 
     List<MajorHazardSources> majorHazardSourcesStatistics();
 }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/PersonMapper.java

@@ -17,7 +17,7 @@ public interface PersonMapper {
      * @param id 人员信息主键
      * @return 人员信息
      */
-    Person selectPersonById(int id);
+    Person selectPersonById(String id);
 
     /**
      * 查询人员信息列表
@@ -56,7 +56,7 @@ public interface PersonMapper {
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deletePersonByIds(int[] ids);
+    int deletePersonByIds(String[] ids);
 
     int getPersonCount();
 }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/RiskAreaMapper.java

@@ -17,7 +17,7 @@ public interface RiskAreaMapper
      * @param id 风险区域主键
      * @return 风险区域
      */
-    RiskArea selectRiskAreaById(int id);
+    RiskArea selectRiskAreaById(String id);
 
     /**
      * 查询风险区域列表
@@ -56,5 +56,5 @@ public interface RiskAreaMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteRiskAreaByIds(int[] ids);
+    int deleteRiskAreaByIds(String[] ids);
 }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/RiskMapper.java

@@ -23,7 +23,7 @@ public interface RiskMapper
      * @param id 风险主键
      * @return 风险
      */
-    Risk selectRiskById(int id);
+    Risk selectRiskById(String id);
 
     /**
      * 查询风险列表
@@ -62,7 +62,7 @@ public interface RiskMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteRiskByIds(int[] ids);
+    int deleteRiskByIds(String[] ids);
 
     /**
      * 查询风险统计

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EnterpriseInformation.java

@@ -3,8 +3,7 @@ package com.hbt.safety.supervision.pojo;
 import com.hbt.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 企业信息对象 enterprise_information
@@ -13,13 +12,14 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @date 2023-02-14
  */
 @ApiModel
+@Data
 public class EnterpriseInformation extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 企业id */
     @ApiModelProperty(value = "企业id")
-    private int id;
+    private String id;
 
     /** 统一社会信用代码 */
     @ApiModelProperty(value = "统一社会信用代码")
@@ -68,141 +68,4 @@ public class EnterpriseInformation extends BaseEntity
     /** 经营范围 */
     @ApiModelProperty(value = "经营范围")
     private String businessScope;
-
-    public void setId(int id)
-    {
-        this.id = id;
-    }
-
-    public int getId()
-    {
-        return id;
-    }
-    public void setUnifySocialCreditCode(String unifySocialCreditCode) 
-    {
-        this.unifySocialCreditCode = unifySocialCreditCode;
-    }
-
-    public String getUnifySocialCreditCode() 
-    {
-        return unifySocialCreditCode;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setRegistrationNumber(String registrationNumber) 
-    {
-        this.registrationNumber = registrationNumber;
-    }
-
-    public String getRegistrationNumber() 
-    {
-        return registrationNumber;
-    }
-    public void setLegalRepresentative(String legalRepresentative) 
-    {
-        this.legalRepresentative = legalRepresentative;
-    }
-
-    public String getLegalRepresentative() 
-    {
-        return legalRepresentative;
-    }
-    public void setType(int type)
-    {
-        this.type = type;
-    }
-
-    public int getType()
-    {
-        return type;
-    }
-    public void setEstablishmentDate(String establishmentDate) 
-    {
-        this.establishmentDate = establishmentDate;
-    }
-
-    public String getEstablishmentDate() 
-    {
-        return establishmentDate;
-    }
-    public void setFundAmount(String fundAmount) 
-    {
-        this.fundAmount = fundAmount;
-    }
-
-    public String getFundAmount() 
-    {
-        return fundAmount;
-    }
-    public void setApprovalDate(String approvalDate) 
-    {
-        this.approvalDate = approvalDate;
-    }
-
-    public String getApprovalDate() 
-    {
-        return approvalDate;
-    }
-    public void setRegistrationAuthority(String registrationAuthority) 
-    {
-        this.registrationAuthority = registrationAuthority;
-    }
-
-    public String getRegistrationAuthority() 
-    {
-        return registrationAuthority;
-    }
-    public void setRegistrationStatus(String registrationStatus) 
-    {
-        this.registrationStatus = registrationStatus;
-    }
-
-    public String getRegistrationStatus() 
-    {
-        return registrationStatus;
-    }
-    public void setDwellingPlace(String dwellingPlace) 
-    {
-        this.dwellingPlace = dwellingPlace;
-    }
-
-    public String getDwellingPlace() 
-    {
-        return dwellingPlace;
-    }
-    public void setBusinessScope(String businessScope) 
-    {
-        this.businessScope = businessScope;
-    }
-
-    public String getBusinessScope() 
-    {
-        return businessScope;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("unifySocialCreditCode", getUnifySocialCreditCode())
-            .append("name", getName())
-            .append("registrationNumber", getRegistrationNumber())
-            .append("legalRepresentative", getLegalRepresentative())
-            .append("type", getType())
-            .append("establishmentDate", getEstablishmentDate())
-            .append("fundAmount", getFundAmount())
-            .append("approvalDate", getApprovalDate())
-            .append("registrationAuthority", getRegistrationAuthority())
-            .append("registrationStatus", getRegistrationStatus())
-            .append("dwellingPlace", getDwellingPlace())
-            .append("businessScope", getBusinessScope())
-            .toString();
-    }
 }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EscalateHiddenDanger.java

@@ -16,7 +16,7 @@ public class EscalateHiddenDanger extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 上报风险主键 */
-    private int id;
+    private String id;
 
     /** 巡检执法id */
     @Excel(name = "巡检执法id")
@@ -24,13 +24,13 @@ public class EscalateHiddenDanger extends BaseEntity
 
     /** 隐患表id */
     @Excel(name = "隐患表id")
-    private int hiddenDangerId;
+    private String hiddenDangerId;
 
     /** 责任企业 */
     private String enterprise;
 
     /** 责任人id */
-    private int personId;
+    private String personId;
 
     /** 隐患名称 */
     private String name;

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EscalateRisk.java

@@ -16,22 +16,22 @@ public class EscalateRisk extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 上报风险id */
-    private int id;
+    private String id;
 
     /** 执法巡检id */
     @Excel(name = "执法巡检id")
-    private int enforcementId;
+    private String enforcementId;
 
     /** 风险表id */
     @Excel(name = "风险表id")
-    private int riskId;
+    private String riskId;
 
     /** 责任企业 */
     private String enterprise;
 
     /** 责任人id */
 
-    private int personId;
+    private String personId;
 
     /** 风险名称 */
     private String name;

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HazardousOperation.java

@@ -1,6 +1,5 @@
 package com.hbt.safety.supervision.pojo;
 
-import java.util.Date;
 import com.hbt.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,7 +19,7 @@ public class HazardousOperation extends BaseEntity
 
     /** 危险作业id */
     @ApiModelProperty(value = "危险作业id")
-    private int id;
+    private String id;
 
     /** 危险作业名称 */
     @ApiModelProperty(value = "危险作业名称")
@@ -32,7 +31,7 @@ public class HazardousOperation extends BaseEntity
 
     /** 责任企业id */
     @ApiModelProperty(value = "责任企业id")
-    private int enterpriseId;
+    private String enterpriseId;
 
     /** 责任企业 */
     @ApiModelProperty(value = "责任企业")

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HiddenDanger.java

@@ -1,6 +1,5 @@
 package com.hbt.safety.supervision.pojo;
 
-import java.util.Date;
 import com.hbt.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,7 +19,7 @@ public class HiddenDanger extends BaseEntity
 
     /** 主键id */
     @ApiModelProperty(value = "隐患治理id")
-    private int id;
+    private String id;
 
     /** 隐患名称 */
     @ApiModelProperty(value = "隐患名称")
@@ -32,7 +31,7 @@ public class HiddenDanger extends BaseEntity
 
     /** 风险表id */
     @ApiModelProperty(value = "风险表id")
-    private int riskId;
+    private String riskId;
 
     /** 风险名称 */
     @ApiModelProperty(value = "风险名称")
@@ -44,10 +43,10 @@ public class HiddenDanger extends BaseEntity
 
     /** 上报人id */
     @ApiModelProperty(value = "上报人id")
-    private int submitPersonId;
+    private String submitPersonId;
 
     @ApiModelProperty(value = "上报企业id")
-    private int submitEnterpriseId;
+    private String submitEnterpriseId;
 
     /** 隐患整改措施 */
     @ApiModelProperty(value = "隐患整改措施")
@@ -63,7 +62,7 @@ public class HiddenDanger extends BaseEntity
 
     /** 责任企业id */
     @ApiModelProperty(value = "责任企业id")
-    private int enterpriseId;
+    private String enterpriseId;
 
     /** 责任企业 */
     @ApiModelProperty(value = "责任企业")
@@ -71,7 +70,7 @@ public class HiddenDanger extends BaseEntity
 
     /** 责任人id */
     @ApiModelProperty(value = "责任人id")
-    private int personId;
+    private String personId;
 
     /** 责任人 */
     @ApiModelProperty(value = "责任人")

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/LawEnforcementInspection.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import com.hbt.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 执法巡查对象 law_enforcement_inspection
@@ -11,13 +12,14 @@ import io.swagger.annotations.ApiModelProperty;
  * @author zhangyu
  */
 @ApiModel
+@Data
 public class LawEnforcementInspection extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
     @ApiModelProperty(value = "执法巡查id")
-    private int id;
+    private String id;
 
     /** 巡查日期 */
     @ApiModelProperty(value = "巡查日期")
@@ -37,92 +39,9 @@ public class LawEnforcementInspection extends BaseEntity
 
     /** 上报隐患id */
     @ApiModelProperty(value = "上报隐患id")
-    private int hiddenDangerId;
+    private String hiddenDangerId;
 
     /** 上报风险id */
     @ApiModelProperty(value = "上报风险id")
-    private int riskId;
+    private String riskId;
-
-    public void setId(int id)
-    {
-        this.id = id;
-    }
-
-    public int getId()
-    {
-        return id;
-    }
-    public void setInspectionDate(Date inspectionDate) 
-    {
-        this.inspectionDate = inspectionDate;
-    }
-
-    public Date getInspectionDate() 
-    {
-        return inspectionDate;
-    }
-    public void setPersonId(String person)
-    {
-        this.person = person;
-    }
-
-    public String getPersonId()
-    {
-        return person;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setRemarks(String remarks) 
-    {
-        this.remarks = remarks;
-    }
-
-    public String getRemarks() 
-    {
-        return remarks;
-    }
-
-    public String getPerson() {
-        return person;
-    }
-
-    public void setPerson(String person) {
-        this.person = person;
-    }
-
-    public int getHiddenDangerId() {
-        return hiddenDangerId;
-    }
-
-    public void setHiddenDangerId(int hiddenDangerId) {
-        this.hiddenDangerId = hiddenDangerId;
-    }
-
-    public int getRiskId() {
-        return riskId;
-    }
-
-    public void setRiskId(int riskId) {
-        this.riskId = riskId;
-    }
-
-    @Override
-    public String toString() {
-        return "LawEnforcementInspection{" +
-                "id=" + id +
-                ", inspectionDate=" + inspectionDate +
-                ", person='" + person + '\'' +
-                ", name='" + name + '\'' +
-                ", remarks='" + remarks + '\'' +
-                ", hiddenDangerId=" + hiddenDangerId +
-                ", riskId=" + riskId +
-                '}';
-    }
 }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/MajorHazardSources.java

@@ -3,6 +3,7 @@ package com.hbt.safety.supervision.pojo;
 import com.hbt.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 重大危险源对象 major_hazard_sources
@@ -11,17 +12,18 @@ import io.swagger.annotations.ApiModelProperty;
  * @date 2023-02-14
  */
 @ApiModel
+@Data
 public class MajorHazardSources extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 主键id */
     @ApiModelProperty(value = "重大危险源id")
-    private int id;
+    private String id;
 
     /** 主要负责人id */
     @ApiModelProperty(value = "主要负责人id")
-    private int mainResponsiblePersonId;
+    private String mainResponsiblePersonId;
 
     /** 主要负责人 */
     @ApiModelProperty(value = "主要负责人")
@@ -29,7 +31,7 @@ public class MajorHazardSources extends BaseEntity
 
     /** 技术负责人id */
     @ApiModelProperty(value = "技术负责人id")
-    private int technologyResponsiblePersonId;
+    private String technologyResponsiblePersonId;
 
     /** 技术负责人 */
     @ApiModelProperty(value = "技术负责人")
@@ -37,7 +39,7 @@ public class MajorHazardSources extends BaseEntity
 
     /** 操作负责人id */
     @ApiModelProperty(value = "操作负责人id")
-    private int operateResponsiblePersonId;
+    private String operateResponsiblePersonId;
 
     /** 操作负责人 */
     @ApiModelProperty(value = "操作负责人")
@@ -85,7 +87,7 @@ public class MajorHazardSources extends BaseEntity
 
     /** 责任公司id */
     @ApiModelProperty(value = "责任公司id")
-    private int enterpriseId;
+    private String enterpriseId;
 
     /** 责任公司 */
     @ApiModelProperty(value = "责任公司")
@@ -94,190 +96,4 @@ public class MajorHazardSources extends BaseEntity
     /** 管理危化品名称 */
     @ApiModelProperty(value = "管理危化品名称")
     private String hazardousChemicalsName;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public int getMainResponsiblePersonId() {
-        return mainResponsiblePersonId;
-    }
-
-    public void setMainResponsiblePersonId(int mainResponsiblePersonId) {
-        this.mainResponsiblePersonId = mainResponsiblePersonId;
-    }
-
-    public String getMainResponsiblePerson() {
-        return mainResponsiblePerson;
-    }
-
-    public void setMainResponsiblePerson(String mainResponsiblePerson) {
-        this.mainResponsiblePerson = mainResponsiblePerson;
-    }
-
-    public int getTechnologyResponsiblePersonId() {
-        return technologyResponsiblePersonId;
-    }
-
-    public void setTechnologyResponsiblePersonId(int technologyResponsiblePersonId) {
-        this.technologyResponsiblePersonId = technologyResponsiblePersonId;
-    }
-
-    public String getTechnologyResponsiblePerson() {
-        return technologyResponsiblePerson;
-    }
-
-    public void setTechnologyResponsiblePerson(String technologyResponsiblePerson) {
-        this.technologyResponsiblePerson = technologyResponsiblePerson;
-    }
-
-    public int getOperateResponsiblePersonId() {
-        return operateResponsiblePersonId;
-    }
-
-    public void setOperateResponsiblePersonId(int operateResponsiblePersonId) {
-        this.operateResponsiblePersonId = operateResponsiblePersonId;
-    }
-
-    public String getOperateResponsiblePerson() {
-        return operateResponsiblePerson;
-    }
-
-    public void setOperateResponsiblePerson(String operateResponsiblePerson) {
-        this.operateResponsiblePerson = operateResponsiblePerson;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getRiskFactor() {
-        return riskFactor;
-    }
-
-    public void setRiskFactor(String riskFactor) {
-        this.riskFactor = riskFactor;
-    }
-
-    public String getConsequence() {
-        return consequence;
-    }
-
-    public void setConsequence(String consequence) {
-        this.consequence = consequence;
-    }
-
-    public Integer getDangerLevel() {
-        return dangerLevel;
-    }
-
-    public void setDangerLevel(Integer dangerLevel) {
-        this.dangerLevel = dangerLevel;
-    }
-
-    public String getControlMeasures() {
-        return controlMeasures;
-    }
-
-    public void setControlMeasures(String controlMeasures) {
-        this.controlMeasures = controlMeasures;
-    }
-
-    public String getUnifiedCoding() {
-        return unifiedCoding;
-    }
-
-    public void setUnifiedCoding(String unifiedCoding) {
-        this.unifiedCoding = unifiedCoding;
-    }
-
-    public int getUnitType() {
-        return unitType;
-    }
-
-    public void setUnitType(int unitType) {
-        this.unitType = unitType;
-    }
-
-    public String getMemorySpace() {
-        return memorySpace;
-    }
-
-    public void setMemorySpace(String memorySpace) {
-        this.memorySpace = memorySpace;
-    }
-
-    public String getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
-    }
-
-    public String getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
-    }
-
-    public int getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(int enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public String getEnterprise() {
-        return enterprise;
-    }
-
-    public void setEnterprise(String enterprise) {
-        this.enterprise = enterprise;
-    }
-
-    public String getHazardousChemicalsName() {
-        return hazardousChemicalsName;
-    }
-
-    public void setHazardousChemicalsName(String hazardousChemicalsName) {
-        this.hazardousChemicalsName = hazardousChemicalsName;
-    }
-
-    @Override
-    public String toString() {
-        return "MajorHazardSources{" +
-                "id=" + id +
-                ", mainResponsiblePersonId=" + mainResponsiblePersonId +
-                ", mainResponsiblePerson='" + mainResponsiblePerson + '\'' +
-                ", technologyResponsiblePersonId=" + technologyResponsiblePersonId +
-                ", technologyResponsiblePerson='" + technologyResponsiblePerson + '\'' +
-                ", operateResponsiblePersonId=" + operateResponsiblePersonId +
-                ", operateResponsiblePerson='" + operateResponsiblePerson + '\'' +
-                ", name='" + name + '\'' +
-                ", riskFactor='" + riskFactor + '\'' +
-                ", consequence='" + consequence + '\'' +
-                ", dangerLevel=" + dangerLevel +
-                ", controlMeasures='" + controlMeasures + '\'' +
-                ", unifiedCoding='" + unifiedCoding + '\'' +
-                ", unitType='" + unitType + '\'' +
-                ", memorySpace='" + memorySpace + '\'' +
-                ", longitude='" + longitude + '\'' +
-                ", latitude='" + latitude + '\'' +
-                ", enterpriseId=" + enterpriseId +
-                ", enterprise='" + enterprise + '\'' +
-                ", hazardousChemicalsName='" + hazardousChemicalsName + '\'' +
-                '}';
-    }
 }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/Person.java

@@ -15,7 +15,7 @@ public class Person extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 人员信息表id */
-    private int id;
+    private String id;
 
     /** 人员名称 */
     private String name;
@@ -30,7 +30,7 @@ public class Person extends BaseEntity
     private String identityCard;
 
     /** 企业id */
-    private int enterpriseId;
+    private String enterpriseId;
 
     /** 联系电话 */
     private String phone;

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/Risk.java

@@ -19,7 +19,7 @@ public class Risk extends BaseEntity
 
     /** 主键 */
     @ApiModelProperty(value = "风险管控id")
-    private int id;
+    private String id;
 
     /** 风险名称 */
     @ApiModelProperty(value = "风险管控id")
@@ -43,7 +43,7 @@ public class Risk extends BaseEntity
 
     /** 责任企业id */
     @ApiModelProperty(value = "责任企业id")
-    private int enterpriseId;
+    private String enterpriseId;
 
     /** 责任企业 */
     @ApiModelProperty(value = "责任企业")
@@ -51,7 +51,7 @@ public class Risk extends BaseEntity
 
     /** 责任人id */
     @ApiModelProperty(value = "责任人id")
-    private int responsiblePersonId;
+    private String responsiblePersonId;
 
     /** 责任人id */
     @ApiModelProperty(value = "责任人")
@@ -67,7 +67,7 @@ public class Risk extends BaseEntity
 
     /** 重大危险源id */
     @ApiModelProperty(value = "重大危险源id")
-    private int majorHazardSourcesId;
+    private String majorHazardSourcesId;
 
     /** 重大危险源名称 */
     @ApiModelProperty(value = "重大危险源名称")
@@ -79,5 +79,5 @@ public class Risk extends BaseEntity
 
     /** 上报人id */
     @ApiModelProperty(value = "上报人id")
-    private int submitPersonId;
+    private String submitPersonId;
 }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/RiskArea.java

@@ -2,8 +2,7 @@ package com.hbt.safety.supervision.pojo;
 
 import com.hbt.common.core.annotation.Excel;
 import com.hbt.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 风险区域对象 risk_area
@@ -11,12 +10,13 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author 张雨
  * @date 2023-02-14
  */
+@Data
 public class RiskArea extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 主键id */
-    private int id;
+    private String id;
 
     /** 风险区域名称 */
     @Excel(name = "风险区域名称")
@@ -29,51 +29,4 @@ public class RiskArea extends BaseEntity
     /** 风险等级 */
     @Excel(name = "风险等级")
     private Integer riskLevel;
-
-    public void setId(int id)
-    {
-        this.id = id;
-    }
-
-    public int getId()
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setPolgyn(String polgyn) 
-    {
-        this.polgyn = polgyn;
-    }
-
-    public String getPolgyn() 
-    {
-        return polgyn;
-    }
-    public void setRiskLevel(Integer riskLevel) 
-    {
-        this.riskLevel = riskLevel;
-    }
-
-    public Integer getRiskLevel() 
-    {
-        return riskLevel;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("polgyn", getPolgyn())
-            .append("riskLevel", getRiskLevel())
-            .toString();
-    }
 }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEnterpriseInformationService.java

@@ -18,7 +18,7 @@ public interface IEnterpriseInformationService
      * @param id 企业信息主键
      * @return 企业信息
      */
-    EnterpriseInformation selectEnterpriseInformationById(int id);
+    EnterpriseInformation selectEnterpriseInformationById(String id);
 
     /**
      * 查询企业信息列表
@@ -49,7 +49,7 @@ public interface IEnterpriseInformationService
      * @param ids 需要删除的企业信息主键集合
      * @return 结果
      */
-    int deleteEnterpriseInformationByIds(int[] ids);
+    int deleteEnterpriseInformationByIds(String[] ids);
 
     /**
      * 删除企业信息信息

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateHiddenDangerService.java

@@ -26,7 +26,7 @@ public interface IEscalateHiddenDangerService
      *
      * @return 上报隐患集合
      */
-    List<EscalateHiddenDanger> selectEscalateHiddenDangerList(int id);
+    List<EscalateHiddenDanger> selectEscalateHiddenDangerList(String id);
 
     /**
      * 新增上报隐患
@@ -50,7 +50,7 @@ public interface IEscalateHiddenDangerService
      * @param ids 需要删除的上报隐患主键集合
      * @return 结果
      */
-    int deleteEscalateHiddenDangerByIds(int[] ids);
+    int deleteEscalateHiddenDangerByIds(String[] ids);
 
     /**
      * 删除上报隐患信息

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateRiskService.java

@@ -26,7 +26,7 @@ public interface IEscalateRiskService
      * @param id 巡检执法id
      * @return 上报风险集合
      */
-    List<EscalateRisk> selectEscalateRiskList(int id);
+    List<EscalateRisk> selectEscalateRiskList(String id);
 
     /**
      * 新增上报风险
@@ -50,7 +50,7 @@ public interface IEscalateRiskService
      * @param ids 需要删除的上报风险主键集合
      * @return 结果
      */
-    int deleteEscalateRiskByIds(int[] ids);
+    int deleteEscalateRiskByIds(String[] ids);
 
     /**
      * 删除上报风险信息

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IHazardousOperationService.java

@@ -18,7 +18,7 @@ public interface IHazardousOperationService
      * @param id 危险作业主键
      * @return 危险作业
      */
-    HazardousOperation selectHazardousOperationById(int id);
+    HazardousOperation selectHazardousOperationById(String id);
 
     /**
      * 查询危险作业列表
@@ -49,7 +49,7 @@ public interface IHazardousOperationService
      * @param ids 需要删除的危险作业主键集合
      * @return 结果
      */
-    int deleteHazardousOperationByIds(int[] ids);
+    int deleteHazardousOperationByIds(String[] ids);
 
     /**
      * 删除危险作业信息

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IHiddenDangerService.java

@@ -18,7 +18,7 @@ public interface IHiddenDangerService
      * @param id 隐患主键
      * @return 隐患
      */
-    HiddenDanger selectHiddenDangerById(int id);
+    HiddenDanger selectHiddenDangerById(String id);
 
     /**
      * 查询隐患列表
@@ -49,7 +49,7 @@ public interface IHiddenDangerService
      * @param ids 需要删除的隐患主键集合
      * @return 结果
      */
-    int deleteHiddenDangerByIds(int[] ids);
+    int deleteHiddenDangerByIds(String[] ids);
 
     /**
      * 删除隐患信息

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/ILawEnforcementInspectionService.java

@@ -18,7 +18,7 @@ public interface ILawEnforcementInspectionService
      * @param id 执法巡查主键
      * @return 执法巡查
      */
-    LawEnforcementInspection selectLawEnforcementInspectionById(int id);
+    LawEnforcementInspection selectLawEnforcementInspectionById(String id);
 
     /**
      * 查询执法巡查列表
@@ -49,7 +49,7 @@ public interface ILawEnforcementInspectionService
      * @param ids 需要删除的执法巡查主键集合
      * @return 结果
      */
-    int deleteLawEnforcementInspectionByIds(int[] ids);
+    int deleteLawEnforcementInspectionByIds(String[] ids);
 
     /**
      * 删除执法巡查信息
@@ -57,7 +57,7 @@ public interface ILawEnforcementInspectionService
      * @param id 执法巡查主键
      * @return 结果
      */
-    int deleteLawEnforcementInspectionById(int id);
+    int deleteLawEnforcementInspectionById(String id);
 
     /**
      * 按月统计巡查信息

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IMajorHazardSourcesService.java

@@ -17,7 +17,7 @@ public interface IMajorHazardSourcesService
      * @param id 重大危险源主键
      * @return 重大危险源
      */
-    MajorHazardSources selectMajorHazardSourcesById(int id);
+    MajorHazardSources selectMajorHazardSourcesById(String id);
 
     /**
      * 查询重大危险源列表
@@ -48,7 +48,7 @@ public interface IMajorHazardSourcesService
      * @param ids 需要删除的重大危险源主键集合
      * @return 结果
      */
-    int deleteMajorHazardSourcesByIds(int[] ids);
+    int deleteMajorHazardSourcesByIds(String[] ids);
 
     /**
      * 删除重大危险源信息

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IPersonService.java

@@ -18,7 +18,7 @@ public interface IPersonService
      * @param id 人员信息主键
      * @return 人员信息
      */
-    Person selectPersonById(int id);
+    Person selectPersonById(String id);
 
     /**
      * 查询人员信息列表
@@ -49,7 +49,7 @@ public interface IPersonService
      * @param ids 需要删除的人员信息主键集合
      * @return 结果
      */
-    int deletePersonByIds(int[] ids);
+    int deletePersonByIds(String[] ids);
 
     /**
      * 删除人员信息信息

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IRiskAreaService.java

@@ -17,7 +17,7 @@ public interface IRiskAreaService
      * @param id 风险区域主键
      * @return 风险区域
      */
-    RiskArea selectRiskAreaById(int id);
+    RiskArea selectRiskAreaById(String id);
 
     /**
      * 查询风险区域列表
@@ -48,7 +48,7 @@ public interface IRiskAreaService
      * @param ids 需要删除的风险区域主键集合
      * @return 结果
      */
-    int deleteRiskAreaByIds(int[] ids);
+    int deleteRiskAreaByIds(String[] ids);
 
     /**
      * 删除风险区域信息

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IRiskService.java

@@ -18,7 +18,7 @@ public interface IRiskService
      * @param id 风险主键
      * @return 风险
      */
-    Risk selectRiskById(int id);
+    Risk selectRiskById(String id);
 
     /**
      * 查询风险列表
@@ -49,7 +49,7 @@ public interface IRiskService
      * @param ids 需要删除的风险主键集合
      * @return 结果
      */
-    int deleteRiskByIds(int[] ids);
+    int deleteRiskByIds(String[] ids);
 
     /**
      * 删除风险信息

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EnterpriseInformationServiceImpl.java

@@ -33,7 +33,7 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
      * @return 企业信息
      */
     @Override
-    public EnterpriseInformation selectEnterpriseInformationById(int id) {
+    public EnterpriseInformation selectEnterpriseInformationById(String id) {
         return enterpriseInformationMapper.selectEnterpriseInformationById(id);
     }
 
@@ -76,7 +76,7 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
      * @return 结果
      */
     @Override
-    public int deleteEnterpriseInformationByIds(int[] ids) {
+    public int deleteEnterpriseInformationByIds(String[] ids) {
         return enterpriseInformationMapper.deleteEnterpriseInformationByIds(ids);
     }
 

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateHiddenDangerServiceImpl.java

@@ -39,7 +39,7 @@ public class EscalateHiddenDangerServiceImpl implements IEscalateHiddenDangerSer
      * @return 上报隐患
      */
     @Override
-    public List<EscalateHiddenDanger> selectEscalateHiddenDangerList(int id)
+    public List<EscalateHiddenDanger> selectEscalateHiddenDangerList(String id)
     {
         return escalateHiddenDangerMapper.selectEscalateHiddenDangerList(id);
     }
@@ -75,7 +75,7 @@ public class EscalateHiddenDangerServiceImpl implements IEscalateHiddenDangerSer
      * @return 结果
      */
     @Override
-    public int deleteEscalateHiddenDangerByIds(int[] ids)
+    public int deleteEscalateHiddenDangerByIds(String[] ids)
     {
         return escalateHiddenDangerMapper.deleteEscalateHiddenDangerByIds(ids);
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateRiskServiceImpl.java

@@ -38,7 +38,7 @@ public class EscalateRiskServiceImpl implements IEscalateRiskService
      * @return 上报风险
      */
     @Override
-    public List<EscalateRisk> selectEscalateRiskList(int id)
+    public List<EscalateRisk> selectEscalateRiskList(String id)
     {
         return escalateRiskMapper.selectEscalateRiskList(id);
     }
@@ -74,7 +74,7 @@ public class EscalateRiskServiceImpl implements IEscalateRiskService
      * @return 结果
      */
     @Override
-    public int deleteEscalateRiskByIds(int[] ids)
+    public int deleteEscalateRiskByIds(String[] ids)
     {
         return escalateRiskMapper.deleteEscalateRiskByIds(ids);
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HazardousOperationServiceImpl.java

@@ -34,7 +34,7 @@ public class HazardousOperationServiceImpl implements IHazardousOperationService
      * @return 危险作业
      */
     @Override
-    public HazardousOperation selectHazardousOperationById(int id)
+    public HazardousOperation selectHazardousOperationById(String id)
     {
         return hazardousOperationMapper.selectHazardousOperationById(id);
     }
@@ -81,7 +81,7 @@ public class HazardousOperationServiceImpl implements IHazardousOperationService
      * @return 结果
      */
     @Override
-    public int deleteHazardousOperationByIds(int[] ids)
+    public int deleteHazardousOperationByIds(String[] ids)
     {
         return hazardousOperationMapper.deleteHazardousOperationByIds(ids);
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HiddenDangerServiceImpl.java

@@ -32,7 +32,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService
      * @return 隐患
      */
     @Override
-    public HiddenDanger selectHiddenDangerById(int id)
+    public HiddenDanger selectHiddenDangerById(String id)
     {
         return hiddenDangerMapper.selectHiddenDangerById(id);
     }
@@ -79,7 +79,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService
      * @return 结果
      */
     @Override
-    public int deleteHiddenDangerByIds(int[] ids)
+    public int deleteHiddenDangerByIds(String[] ids)
     {
         return hiddenDangerMapper.deleteHiddenDangerByIds(ids);
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/LawEnforcementInspectionServiceImpl.java

@@ -40,7 +40,7 @@ public class LawEnforcementInspectionServiceImpl implements ILawEnforcementInspe
      * @return 执法巡查
      */
     @Override
-    public LawEnforcementInspection selectLawEnforcementInspectionById(int id)
+    public LawEnforcementInspection selectLawEnforcementInspectionById(String id)
     {
         return lawEnforcementInspectionMapper.selectLawEnforcementInspectionById(id);
     }
@@ -87,7 +87,7 @@ public class LawEnforcementInspectionServiceImpl implements ILawEnforcementInspe
      * @return 结果
      */
     @Override
-    public int deleteLawEnforcementInspectionByIds(int[] ids)
+    public int deleteLawEnforcementInspectionByIds(String[] ids)
     {
         return lawEnforcementInspectionMapper.deleteLawEnforcementInspectionByIds(ids);
     }
@@ -99,7 +99,7 @@ public class LawEnforcementInspectionServiceImpl implements ILawEnforcementInspe
      * @return 结果
      */
     @Override
-    public int deleteLawEnforcementInspectionById(int id)
+    public int deleteLawEnforcementInspectionById(String id)
     {
         return lawEnforcementInspectionMapper.deleteLawEnforcementInspectionById(id);
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java

@@ -32,7 +32,7 @@ public class MajorHazardSourcesServiceImpl implements IMajorHazardSourcesService
      * @return 重大危险源
      */
     @Override
-    public MajorHazardSources selectMajorHazardSourcesById(int id)
+    public MajorHazardSources selectMajorHazardSourcesById(String id)
     {
         return majorHazardSourcesMapper.selectMajorHazardSourcesById(id);
     }
@@ -79,7 +79,7 @@ public class MajorHazardSourcesServiceImpl implements IMajorHazardSourcesService
      * @return 结果
      */
     @Override
-    public int deleteMajorHazardSourcesByIds(int[] ids)
+    public int deleteMajorHazardSourcesByIds(String[] ids)
     {
         return majorHazardSourcesMapper.deleteMajorHazardSourcesByIds(ids);
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/PersonServiceImpl.java

@@ -27,7 +27,7 @@ public class PersonServiceImpl implements IPersonService
      * @return 人员信息
      */
     @Override
-    public Person selectPersonById(int id)
+    public Person selectPersonById(String id)
     {
         return personMapper.selectPersonById(id);
     }
@@ -74,7 +74,7 @@ public class PersonServiceImpl implements IPersonService
      * @return 结果
      */
     @Override
-    public int deletePersonByIds(int[] ids)
+    public int deletePersonByIds(String[] ids)
     {
         return personMapper.deletePersonByIds(ids);
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/RiskAreaServiceImpl.java

@@ -27,7 +27,7 @@ public class RiskAreaServiceImpl implements IRiskAreaService
      * @return 风险区域
      */
     @Override
-    public RiskArea selectRiskAreaById(int id)
+    public RiskArea selectRiskAreaById(String id)
     {
         return riskAreaMapper.selectRiskAreaById(id);
     }
@@ -74,7 +74,7 @@ public class RiskAreaServiceImpl implements IRiskAreaService
      * @return 结果
      */
     @Override
-    public int deleteRiskAreaByIds(int[] ids)
+    public int deleteRiskAreaByIds(String[] ids)
     {
         return riskAreaMapper.deleteRiskAreaByIds(ids);
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/RiskServiceImpl.java

@@ -31,7 +31,7 @@ public class RiskServiceImpl implements IRiskService
      * @return 风险
      */
     @Override
-    public Risk selectRiskById(int id)
+    public Risk selectRiskById(String id)
     {
         return riskMapper.selectRiskById(id);
     }
@@ -78,7 +78,7 @@ public class RiskServiceImpl implements IRiskService
      * @return 结果
      */
     @Override
-    public int deleteRiskByIds(int[] ids)
+    public int deleteRiskByIds(String[] ids)
     {
         return riskMapper.deleteRiskByIds(ids);
     }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EnterpriseInformationMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectEnterpriseInformationVo"/>
     </select>
     
-    <select id="selectEnterpriseInformationById" parameterType="Integer" resultMap="EnterpriseInformationResult">
+    <select id="selectEnterpriseInformationById" parameterType="String" resultMap="EnterpriseInformationResult">
         <include refid="selectEnterpriseInformationVo"/>
         where id = #{id}
     </select>

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EscalateHiddenDangerMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join enterprise_information as c on b.enterprise_id = c.id
     </sql>
 
-    <select id="selectEscalateHiddenDangerList" parameterType="Integer" resultType="com.hbt.safety.supervision.pojo.EscalateHiddenDanger">
+    <select id="selectEscalateHiddenDangerList" parameterType="String" resultType="com.hbt.safety.supervision.pojo.EscalateHiddenDanger">
         <include refid="selectEscalateHiddenDangerVo"/>
         <where>
             a.enforcement_id = #{id}

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EscalateRiskMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join enterprise_information as c on b.enterprise_id = c.id
     </sql>
 
-    <select id="selectEscalateRiskList" parameterType="Integer" resultType="com.hbt.safety.supervision.pojo.EscalateRisk">
+    <select id="selectEscalateRiskList" parameterType="String" resultType="com.hbt.safety.supervision.pojo.EscalateRisk">
         <include refid="selectEscalateRiskVo"/>
         <where>
             a.enforcement_id = #{id}

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HazardousOperationMapper.xml

@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join enterprise_information as e on a.enterprise_id = e.id
     </sql>
 
-    <select id="selectHazardousOperationById" parameterType="Integer" resultType="HazardousOperation">
+    <select id="selectHazardousOperationById" parameterType="String" resultType="HazardousOperation">
         <include refid="selectHazardousOperation"/>
         where a.id = #{id}
     </select>

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join person as n on a.investigator_id = n.id
     </sql>
 
-    <select id="selectHiddenDangerById" parameterType="Integer" resultType="HiddenDanger">
+    <select id="selectHiddenDangerById" parameterType="String" resultType="HiddenDanger">
         <include refid="selectHiddenDanger"/>
         where a.id = #{id}
     </select>

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/LawEnforcementInspectionMapper.xml

@@ -25,9 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectLawEnforcementInspectionVo"/>
     </select>
     
-    <select id="selectLawEnforcementInspectionById" parameterType="Integer" resultMap="LawEnforcementInspectionResult">
+    <select id="selectLawEnforcementInspectionById" parameterType="String" resultType="LawEnforcementInspection">
         <include refid="selectLawEnforcementInspectionVo"/>
-        where id = #{id}
+        where a.id = #{id}
     </select>
         
     <insert id="insertLawEnforcementInspection" parameterType="com.hbt.safety.supervision.pojo.LawEnforcementInspection">
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteLawEnforcementInspectionById" parameterType="Integer">
+    <delete id="deleteLawEnforcementInspectionById" parameterType="String">
         delete from law_enforcement_inspection where id = #{id}
     </delete>
 

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/MajorHazardSourcesMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, name, danger_level, unified_coding, hazardous_chemicals_name,risk_factor, consequence ,control_measures ,enterprise, main_responsible_person_id, main_responsible_person ,technology_responsible_person,technology_responsible_person_id,operate_responsible_person_id,operate_responsible_person from major_hazard_sources
     </sql>
 
-    <select id="selectMajorHazardSourcesById" parameterType="Integer" resultMap="MajorHazardSourcesResult">
+    <select id="selectMajorHazardSourcesById" parameterType="String" resultMap="MajorHazardSourcesResult">
         <include refid="selectMajorHazardVo"/>
         where id = #{id}
     </select>

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/PersonMapper.xml

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectPersonVo"/>
     </select>
     
-    <select id="selectPersonById" parameterType="Integer" resultMap="PersonResult">
+    <select id="selectPersonById" parameterType="String" resultMap="PersonResult">
         <include refid="selectPersonVo"/>
         where id = #{id}
     </select>

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskAreaMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectRiskAreaById" parameterType="Integer" resultMap="RiskAreaResult">
+    <select id="selectRiskAreaById" parameterType="String" resultMap="RiskAreaResult">
         <include refid="selectRiskAreaVo"/>
         where id = #{id}
     </select>

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/RiskMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRiskVo">
-        select id, name, risk_probability, risk_factor, affect_consequences, level, enterprise_id, responsible_person_id, risk_control_measures, DATE_FORMAT(a.last_review_date,'%Y-%m-%d %H:%i:%S') lastReviewDate, major_hazard_sources_id from risk
+        select id, name, risk_probability, risk_factor, affect_consequences, level, enterprise_id, responsible_person_id, risk_control_measures, DATE_FORMAT(last_review_date,'%Y-%m-%d %H:%i:%S') lastReviewDate, major_hazard_sources_id from risk
     </sql>
 
     <select id="selectRiskList" parameterType="com.hbt.safety.supervision.pojo.Risk" resultMap="RiskResult">
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join person as p on a.responsible_person_id = p.id
         left join major_hazard_sources as m on m.id = a.major_hazard_sources_id
     </sql>
-    <select id="selectRiskById" parameterType="Integer" resultType="Risk">
+    <select id="selectRiskById" parameterType="String" resultType="Risk">
         <include refid="selectRisk"/>
         where a.id = #{id}
     </select>