密闭空间和人员密集场所模块和重要风险点模块

zh-baseversion-admin/src/main/java/com/zehong/web/controller/operationMonitor/TDeviceReportDataController.java

@@ -61,6 +61,22 @@ public class TDeviceReportDataController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/spaceList")
+    public TableDataInfo spaceList(TDeviceReportData tDeviceReportData)
+    {
+        startPage();
+        List<TDeviceReportData> list = tDeviceReportDataService.selectSpaceTDeviceReportDataList(tDeviceReportData);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/riskList")
+    public TableDataInfo riskList(TDeviceReportData tDeviceReportData)
+    {
+        startPage();
+        List<TDeviceReportData> list = tDeviceReportDataService.selectRiskTDeviceReportDataList(tDeviceReportData);
+        return getDataTable(list);
+    }
+
     @GetMapping("/redisList")
     public TableDataInfo redisList(TDeviceInfoS tDeviceInfos)
     {

zh-baseversion-admin/src/main/java/com/zehong/web/controller/risk/TConfinedSpaceController.java

+package com.zehong.web.controller.risk;
+
+import java.util.List;
+
+import com.zehong.system.domain.SpaceListaw;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TConfinedSpace;
+import com.zehong.system.domain.SpaceListaw;
+import com.zehong.system.service.ITConfinedSpaceService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 密闭空间和人员密集场所Controller
+ *
+ * @author zehong
+ * @date 2026-03-18
+ */
+@RestController
+@RequestMapping("/system/space")
+public class TConfinedSpaceController extends BaseController
+{
+    @Autowired
+    private ITConfinedSpaceService tConfinedSpaceService;
+
+    /**
+     * 查询密闭空间和人员密集场所列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TConfinedSpace tConfinedSpace)
+    {
+        startPage();
+        List<TConfinedSpace> list = tConfinedSpaceService.selectTConfinedSpaceList(tConfinedSpace);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出密闭空间和人员密集场所列表
+     */
+    @Log(title = "密闭空间和人员密集场所", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TConfinedSpace tConfinedSpace)
+    {
+        List<TConfinedSpace> list = tConfinedSpaceService.selectTConfinedSpaceList(tConfinedSpace);
+        ExcelUtil<TConfinedSpace> util = new ExcelUtil<TConfinedSpace>(TConfinedSpace.class);
+        return util.exportExcel(list, "密闭空间和人员密集场所数据");
+    }
+
+    /**
+     * 获取密闭空间和人员密集场所详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tConfinedSpaceService.selectTConfinedSpaceById(id));
+    }
+
+    /**
+     * 新增密闭空间和人员密集场所
+     */
+    @Log(title = "密闭空间和人员密集场所", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SpaceListaw listaw)
+    {
+        //添加密闭空间表数据 并且返回新增 id
+        tConfinedSpaceService.insertTConfinedSpace(listaw.gettConfinedSpace());
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(listaw.gettDeviceInfoS())){
+            //将关联设备信息与密闭空间进行绑定
+            tConfinedSpaceService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(), listaw.gettConfinedSpace().getId(), listaw.gettConfinedSpace().getRelationDeviceType());
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改密闭空间和人员密集场所
+     */
+    @Log(title = "密闭空间和人员密集场所", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SpaceListaw listaw)
+    {
+        //先更新密闭空间基本信息
+        int result = tConfinedSpaceService.updateTConfinedSpace(listaw.gettConfinedSpace());
+        
+        //如果有关联设备数据，则更新关联关系
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(listaw.gettDeviceInfoS())) {
+            tConfinedSpaceService.updatetRelationDeviceDetailInfo(
+                listaw.gettDeviceInfoS(), 
+                listaw.gettConfinedSpace().getId(), 
+                listaw.gettConfinedSpace().getRelationDeviceType()
+            );
+        }
+        
+        return toAjax(result);
+    }
+
+    /**
+     * 删除密闭空间和人员密集场所
+     */
+    @Log(title = "密闭空间和人员密集场所", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tConfinedSpaceService.deleteTConfinedSpaceByIds(ids));
+    }
+}
\ No newline at end of file

zh-baseversion-admin/src/main/java/com/zehong/web/controller/risk/TIssueRectificationController.java

+package com.zehong.web.controller.risk;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TIssueRectification;
+import com.zehong.system.service.ITIssueRectificationService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 风险点隐患及异常情况Controller
+ *
+ * @author zehong
+ * @date 2026-03-20
+ */
+@RestController
+@RequestMapping("/system/rectification")
+public class TIssueRectificationController extends BaseController
+{
+    @Autowired
+    private ITIssueRectificationService tIssueRectificationService;
+
+    /**
+     * 查询风险点隐患及异常情况列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TIssueRectification tIssueRectification)
+    {
+        startPage();
+        List<TIssueRectification> list = tIssueRectificationService.selectTIssueRectificationList(tIssueRectification);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出风险点隐患及异常情况列表
+     */
+    @Log(title = "风险点隐患及异常情况", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TIssueRectification tIssueRectification)
+    {
+        List<TIssueRectification> list = tIssueRectificationService.selectTIssueRectificationList(tIssueRectification);
+        ExcelUtil<TIssueRectification> util = new ExcelUtil<TIssueRectification>(TIssueRectification.class);
+        return util.exportExcel(list, "风险点隐患及异常情况数据");
+    }
+
+    /**
+     * 获取风险点隐患及异常情况详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tIssueRectificationService.selectTIssueRectificationById(id));
+    }
+
+    /**
+     * 新增风险点隐患及异常情况
+     */
+    @Log(title = "风险点隐患及异常情况", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TIssueRectification tIssueRectification)
+    {
+        return toAjax(tIssueRectificationService.insertTIssueRectification(tIssueRectification));
+    }
+
+    /**
+     * 修改风险点隐患及异常情况
+     */
+    @Log(title = "风险点隐患及异常情况", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TIssueRectification tIssueRectification)
+    {
+        return toAjax(tIssueRectificationService.updateTIssueRectification(tIssueRectification));
+    }
+
+    /**
+     * 删除风险点隐患及异常情况
+     */
+    @Log(title = "风险点隐患及异常情况", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tIssueRectificationService.deleteTIssueRectificationByIds(ids));
+    }
+}
\ No newline at end of file

zh-baseversion-admin/src/main/java/com/zehong/web/controller/risk/TRiskDevMajInforController.java

@@ -7,6 +7,7 @@ import com.zehong.common.core.page.TableDataInfo;
 import com.zehong.common.enums.BusinessType;
 import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.system.domain.TRiskDevMajInfor;
+import com.zehong.system.domain.RiskInfoListaw;
 import com.zehong.system.service.ITRiskDevMajInforService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -73,9 +74,15 @@ public class TRiskDevMajInforController extends BaseController
      */
     @Log(title = "重要风险点管控", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TRiskDevMajInfor tRiskDevMajInfor)
+    public AjaxResult add(@RequestBody RiskInfoListaw listaw)
     {
-        return toAjax(tRiskDevMajInforService.insertTRiskDevMajInfor(tRiskDevMajInfor));
+        //添加重要风险点表数据 并且返回新增 id
+        tRiskDevMajInforService.insertTRiskDevMajInfor(listaw.gettRiskDevMajInfor());
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(listaw.gettDeviceInfoS())){
+            //将关联设备信息与重要风险点进行绑定
+            tRiskDevMajInforService.updateRelationDeviceDetailInfo(listaw.gettDeviceInfoS(), listaw.gettRiskDevMajInfor().getfRiskDevMajInforId(), listaw.gettRiskDevMajInfor().getRelationDeviceType());
+        }
+        return AjaxResult.success();
     }
 
     /**
@@ -83,9 +90,21 @@ public class TRiskDevMajInforController extends BaseController
      */
     @Log(title = "重要风险点管控", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TRiskDevMajInfor tRiskDevMajInfor)
+    public AjaxResult edit(@RequestBody RiskInfoListaw listaw)
     {
-        return toAjax(tRiskDevMajInforService.updateTRiskDevMajInfor(tRiskDevMajInfor));
+        //先更新重要风险点基本信息
+        int result = tRiskDevMajInforService.updateTRiskDevMajInfor(listaw.gettRiskDevMajInfor());
+        
+        //如果有关联设备数据，则更新关联关系
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(listaw.gettDeviceInfoS())) {
+            tRiskDevMajInforService.updateRelationDeviceDetailInfo(
+                listaw.gettDeviceInfoS(), 
+                listaw.gettRiskDevMajInfor().getfRiskDevMajInforId(), 
+                listaw.gettRiskDevMajInfor().getRelationDeviceType()
+            );
+        }
+        
+        return toAjax(result);
     }
 
     /**

zh-baseversion-system/src/main/java/com/zehong/system/domain/RiskInfoListaw.java

+package com.zehong.system.domain;
+
+import java.util.List;
+
+/**
+ * 重要风险点与关联设备封装类
+ */
+public class RiskInfoListaw {
+
+    private TRiskDevMajInfor tRiskDevMajInfor;
+
+    private List<TDeviceInfoS> tDeviceInfoS;
+
+    public TRiskDevMajInfor gettRiskDevMajInfor() {
+        return tRiskDevMajInfor;
+    }
+
+    public void settRiskDevMajInfor(TRiskDevMajInfor tRiskDevMajInfor) {
+        this.tRiskDevMajInfor = tRiskDevMajInfor;
+    }
+
+    public List<TDeviceInfoS> gettDeviceInfoS() {
+        return tDeviceInfoS;
+    }
+
+    public void settDeviceInfoS(List<TDeviceInfoS> tDeviceInfoS) {
+        this.tDeviceInfoS = tDeviceInfoS;
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/SpaceListaw.java

+package com.zehong.system.domain;
+
+
+import java.util.List;
+
+/**
+ * 密闭空间与关联设备封装类
+ */
+public class SpaceListaw {
+
+    private TConfinedSpace tConfinedSpace;
+
+    private List<TDeviceInfoS> tDeviceInfoS;
+
+    public TConfinedSpace gettConfinedSpace() {
+        return tConfinedSpace;
+    }
+
+    public void settConfinedSpace(TConfinedSpace tConfinedSpace) {
+        this.tConfinedSpace = tConfinedSpace;
+    }
+
+    public List<TDeviceInfoS> gettDeviceInfoS() {
+        return tDeviceInfoS;
+    }
+
+    public void settDeviceInfoS(List<TDeviceInfoS> tDeviceInfoS) {
+        this.tDeviceInfoS = tDeviceInfoS;
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/TConfinedSpace.java

+package com.zehong.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 密闭空间和人员密集场所对象 t_confined_space
+ *
+ * @author zehong
+ * @date 2026-03-18
+ */
+public class TConfinedSpace extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 企业id */
+    @Excel(name = "企业id")
+    private String enterpriseId;
+
+    /** 企业名称 */
+    @Excel(name = "企业名称")
+    private String enterpriseName;
+
+    /** 统一社会信用代码 */
+    @Excel(name = "统一社会信用代码")
+    private String socialCreditCode;
+
+    /** 场所/设施名称 */
+    @Excel(name = "场所/设施名称")
+    private String venueFacility;
+
+    /** 场所分类(1,密闭空间;2,人员密集场所) */
+    @Excel(name = "场所分类(1,密闭空间;2,人员密集场所)")
+    private String venueType;
+
+    /** 具体位置 */
+    private String specificLocation;
+
+    /** 面积/容积(平方米或立方米) */
+    @Excel(name = "面积/容积(平方米或立方米)")
+    private String area;
+
+    /** 主要危险因素 */
+    private String riskFactors;
+
+    /** 作业/人员频次 */
+    private String workFrequency;
+
+    /** 警示标识(1,已设置;2,未设置) */
+    @Excel(name = "警示标识(1,已设置;2,未设置)")
+    private String warningSign;
+
+    /** 主要应急器材 */
+    private String emergencyEquipment;
+
+    /** 现场负责人 */
+    private String siteSupervisor;
+
+    /** 负责人电话 */
+    private String supervisorPhone;
+
+    /** 最近检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最近检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lastDate;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private String latitude;
+
+    /** 关联设备类型  3 密闭空间和人员密集场所*/
+    private String relationDeviceType;
+
+    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 String getRelationDeviceType() {
+        return relationDeviceType;
+    }
+
+    public void setRelationDeviceType(String relationDeviceType) {
+        this.relationDeviceType = relationDeviceType;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setEnterpriseId(String enterpriseId)
+    {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getEnterpriseId()
+    {
+        return enterpriseId;
+    }
+    public void setEnterpriseName(String enterpriseName)
+    {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseName()
+    {
+        return enterpriseName;
+    }
+    public void setSocialCreditCode(String socialCreditCode)
+    {
+        this.socialCreditCode = socialCreditCode;
+    }
+
+    public String getSocialCreditCode()
+    {
+        return socialCreditCode;
+    }
+    public void setVenueFacility(String venueFacility)
+    {
+        this.venueFacility = venueFacility;
+    }
+
+    public String getVenueFacility()
+    {
+        return venueFacility;
+    }
+    public void setVenueType(String venueType)
+    {
+        this.venueType = venueType;
+    }
+
+    public String getVenueType()
+    {
+        return venueType;
+    }
+    public void setSpecificLocation(String specificLocation)
+    {
+        this.specificLocation = specificLocation;
+    }
+
+    public String getSpecificLocation()
+    {
+        return specificLocation;
+    }
+    public void setArea(String area)
+    {
+        this.area = area;
+    }
+
+    public String getArea()
+    {
+        return area;
+    }
+    public void setRiskFactors(String riskFactors)
+    {
+        this.riskFactors = riskFactors;
+    }
+
+    public String getRiskFactors()
+    {
+        return riskFactors;
+    }
+    public void setWorkFrequency(String workFrequency)
+    {
+        this.workFrequency = workFrequency;
+    }
+
+    public String getWorkFrequency()
+    {
+        return workFrequency;
+    }
+    public void setWarningSign(String warningSign)
+    {
+        this.warningSign = warningSign;
+    }
+
+    public String getWarningSign()
+    {
+        return warningSign;
+    }
+    public void setEmergencyEquipment(String emergencyEquipment)
+    {
+        this.emergencyEquipment = emergencyEquipment;
+    }
+
+    public String getEmergencyEquipment()
+    {
+        return emergencyEquipment;
+    }
+    public void setSiteSupervisor(String siteSupervisor)
+    {
+        this.siteSupervisor = siteSupervisor;
+    }
+
+    public String getSiteSupervisor()
+    {
+        return siteSupervisor;
+    }
+    public void setSupervisorPhone(String supervisorPhone)
+    {
+        this.supervisorPhone = supervisorPhone;
+    }
+
+    public String getSupervisorPhone()
+    {
+        return supervisorPhone;
+    }
+    public void setLastDate(Date lastDate)
+    {
+        this.lastDate = lastDate;
+    }
+
+    public Date getLastDate()
+    {
+        return lastDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("enterpriseId", getEnterpriseId())
+                .append("enterpriseName", getEnterpriseName())
+                .append("socialCreditCode", getSocialCreditCode())
+                .append("venueFacility", getVenueFacility())
+                .append("venueType", getVenueType())
+                .append("specificLocation", getSpecificLocation())
+                .append("area", getArea())
+                .append("riskFactors", getRiskFactors())
+                .append("workFrequency", getWorkFrequency())
+                .append("warningSign", getWarningSign())
+                .append("emergencyEquipment", getEmergencyEquipment())
+                .append("siteSupervisor", getSiteSupervisor())
+                .append("supervisorPhone", getSupervisorPhone())
+                .append("lastDate", getLastDate())
+                .append("createTime", getCreateTime())
+                .toString();
+    }
+}
\ No newline at end of file

zh-baseversion-system/src/main/java/com/zehong/system/domain/TDeviceReportData.java

@@ -98,6 +98,16 @@ public class TDeviceReportData extends BaseEntity
      */
     private String deviceType;
 
+    private String relationDeviceId;
+
+    public String getRelationDeviceId() {
+        return relationDeviceId;
+    }
+
+    public void setRelationDeviceId(String relationDeviceId) {
+        this.relationDeviceId = relationDeviceId;
+    }
+
     public String getDeviceType() {
         return deviceType;
     }

zh-baseversion-system/src/main/java/com/zehong/system/domain/TIssueRectification.java

+package com.zehong.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 风险点隐患及异常情况对象 t_issue_rectification
+ *
+ * @author zehong
+ * @date 2026-03-20
+ */
+public class TIssueRectification extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 重要风险点id */
+    @Excel(name = "重要风险点id")
+    private Long fRiskDevMajInforId;
+
+    /** 隐患/异常 */
+    @Excel(name = "隐患/异常")
+    private String dangerAnomaly;
+
+    /** 整改/处置 */
+    @Excel(name = "整改/处置")
+    private String rectificationDisposal;
+
+    /** 处理人 */
+    @Excel(name = "处理人")
+    private String handler;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /** 类型(1,隐患及整改情况;2.监测异常及处置情况) */
+    @Excel(name = "类型(1,隐患及整改情况;2.监测异常及处置情况)")
+    private String issueType;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setfRiskDevMajInforId(Long fRiskDevMajInforId)
+    {
+        this.fRiskDevMajInforId = fRiskDevMajInforId;
+    }
+
+    public Long getfRiskDevMajInforId()
+    {
+        return fRiskDevMajInforId;
+    }
+    public void setDangerAnomaly(String dangerAnomaly)
+    {
+        this.dangerAnomaly = dangerAnomaly;
+    }
+
+    public String getDangerAnomaly()
+    {
+        return dangerAnomaly;
+    }
+    public void setRectificationDisposal(String rectificationDisposal)
+    {
+        this.rectificationDisposal = rectificationDisposal;
+    }
+
+    public String getRectificationDisposal()
+    {
+        return rectificationDisposal;
+    }
+    public void setHandler(String handler)
+    {
+        this.handler = handler;
+    }
+
+    public String getHandler()
+    {
+        return handler;
+    }
+    public void setPhone(String phone)
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone()
+    {
+        return phone;
+    }
+    public void setIssueType(String issueType)
+    {
+        this.issueType = issueType;
+    }
+
+    public String getIssueType()
+    {
+        return issueType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("fRiskDevMajInforId", getfRiskDevMajInforId())
+                .append("dangerAnomaly", getDangerAnomaly())
+                .append("rectificationDisposal", getRectificationDisposal())
+                .append("handler", getHandler())
+                .append("phone", getPhone())
+                .append("issueType", getIssueType())
+                .append("createTime", getCreateTime())
+                .toString();
+    }
+}
\ No newline at end of file

zh-baseversion-system/src/main/java/com/zehong/system/domain/TRiskDevMajInfor.java

@@ -66,7 +66,7 @@ public class TRiskDevMajInfor extends BaseEntity
     private String fLon;
 
     /** 在GIS地图上的围堵 */
-    @Excel(name = "在GIS地图上的围堵")
+    @Excel(name = "在GIS地图上的纬度")
     private String fLat;
 
     /** 风险构成 */
@@ -110,6 +110,18 @@ public class TRiskDevMajInfor extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date govUploadTime;
 
+
+    /** 关联设备类型  4 重要风险点*/
+    private String relationDeviceType;
+
+    public String getRelationDeviceType() {
+        return relationDeviceType;
+    }
+
+    public void setRelationDeviceType(String relationDeviceType) {
+        this.relationDeviceType = relationDeviceType;
+    }
+
     public void updateFields() {
         this.entUploadState = govUploadState;
         if (govUploadTime != null) {

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TConfinedSpaceMapper.java

+package com.zehong.system.mapper;
+import java.util.List;
+import com.zehong.system.domain.TConfinedSpace;
+import com.zehong.system.domain.TDeviceInfoS;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 密闭空间和人员密集场所Mapper接口
+ *
+ * @author zehong
+ * @date 2026-03-18
+ */
+public interface TConfinedSpaceMapper
+{
+    /**
+     * 查询密闭空间和人员密集场所
+     *
+     * @param id 密闭空间和人员密集场所ID
+     * @return 密闭空间和人员密集场所
+     */
+    public TConfinedSpace selectTConfinedSpaceById(Long id);
+
+    /**
+     * 查询密闭空间和人员密集场所列表
+     *
+     * @param tConfinedSpace 密闭空间和人员密集场所
+     * @return 密闭空间和人员密集场所集合
+     */
+    public List<TConfinedSpace> selectTConfinedSpaceList(TConfinedSpace tConfinedSpace);
+
+    /**
+     * 新增密闭空间和人员密集场所
+     *
+     * @param tConfinedSpace 密闭空间和人员密集场所
+     * @return 结果
+     */
+    public int insertTConfinedSpace(TConfinedSpace tConfinedSpace);
+
+    /**
+     * 修改密闭空间和人员密集场所
+     *
+     * @param tConfinedSpace 密闭空间和人员密集场所
+     * @return 结果
+     */
+    public int updateTConfinedSpace(TConfinedSpace tConfinedSpace);
+
+    /**
+     * 删除密闭空间和人员密集场所
+     *
+     * @param id 密闭空间和人员密集场所ID
+     * @return 结果
+     */
+    public int deleteTConfinedSpaceById(Long id);
+
+    /**
+     * 批量删除密闭空间和人员密集场所
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTConfinedSpaceByIds(Long[] ids);
+
+    /**
+     * 将关联设备信息与密闭空间进行绑定
+     * @param gettDeviceInfoS 关联设备列表
+     * @param id 密闭空间 ID
+     * @param relationDevicetype 关联设备类型
+     */
+    void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS") List<TDeviceInfoS> gettDeviceInfoS, @Param("id") Long id, @Param("relationDevicetype") String relationDevicetype);
+
+}
\ No newline at end of file

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TDeviceReportDataMapper.java

@@ -27,6 +27,10 @@ public interface TDeviceReportDataMapper
      */
     public List<TDeviceReportData> selectTDeviceReportDataList(TDeviceReportData tDeviceReportData);
 
+    public List<TDeviceReportData> selectSpaceTDeviceReportDataList(TDeviceReportData tDeviceReportData);
+
+    public List<TDeviceReportData> selectRiskTDeviceReportDataList(TDeviceReportData tDeviceReportData);
+
     /**
      * 新增设备监控
      * 

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TIssueRectificationMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TIssueRectification;
+
+/**
+ * 风险点隐患及异常情况Mapper接口
+ *
+ * @author zehong
+ * @date 2026-03-20
+ */
+public interface TIssueRectificationMapper
+{
+    /**
+     * 查询风险点隐患及异常情况
+     *
+     * @param id 风险点隐患及异常情况ID
+     * @return 风险点隐患及异常情况
+     */
+    public TIssueRectification selectTIssueRectificationById(Long id);
+
+    /**
+     * 查询风险点隐患及异常情况列表
+     *
+     * @param tIssueRectification 风险点隐患及异常情况
+     * @return 风险点隐患及异常情况集合
+     */
+    public List<TIssueRectification> selectTIssueRectificationList(TIssueRectification tIssueRectification);
+
+    /**
+     * 新增风险点隐患及异常情况
+     *
+     * @param tIssueRectification 风险点隐患及异常情况
+     * @return 结果
+     */
+    public int insertTIssueRectification(TIssueRectification tIssueRectification);
+
+    /**
+     * 修改风险点隐患及异常情况
+     *
+     * @param tIssueRectification 风险点隐患及异常情况
+     * @return 结果
+     */
+    public int updateTIssueRectification(TIssueRectification tIssueRectification);
+
+    /**
+     * 删除风险点隐患及异常情况
+     *
+     * @param id 风险点隐患及异常情况ID
+     * @return 结果
+     */
+    public int deleteTIssueRectificationById(Long id);
+
+    /**
+     * 批量删除风险点隐患及异常情况
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTIssueRectificationByIds(Long[] ids);
+}
\ No newline at end of file

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TRiskDevMajInforMapper.java

 package com.zehong.system.mapper;
 
-import java.util.Date;
-import java.util.List;
+import com.zehong.system.domain.TDeviceInfoS;
 import com.zehong.system.domain.TRiskDevMajInfor;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 重要风险点管控Mapper接口
  * 
@@ -83,4 +85,12 @@ public interface TRiskDevMajInforMapper
      * @return 结果
      */
     public int deleteTRiskDevMajInforByIds(Long[] fRiskDevMajInforIds);
+
+    /**
+     * 将关联设备信息与重要风险点进行绑定
+     * @param gettDeviceInfoS 关联设备列表
+     * @param fRiskDevMajInforId 重要风险点 ID
+     * @param relationDevicetype 关联设备类型
+     */
+    void updateRelationDeviceDetailInfo(@Param("gettDeviceInfoS") List<TDeviceInfoS> gettDeviceInfoS, @Param("fRiskDevMajInforId") Long fRiskDevMajInforId, @Param("relationDevicetype") String relationDevicetype);
 }

zh-baseversion-system/src/main/java/com/zehong/system/service/ITConfinedSpaceService.java

+package com.zehong.system.service;
+import java.util.List;
+import com.zehong.system.domain.TConfinedSpace;
+import com.zehong.system.domain.TDeviceInfoS;
+
+/**
+ * 密闭空间和人员密集场所Service接口
+ *
+ * @author zehong
+ * @date 2026-03-18
+ */
+public interface ITConfinedSpaceService
+{
+    /**
+     * 查询密闭空间和人员密集场所
+     *
+     * @param id 密闭空间和人员密集场所ID
+     * @return 密闭空间和人员密集场所
+     */
+    public TConfinedSpace selectTConfinedSpaceById(Long id);
+
+    /**
+     * 查询密闭空间和人员密集场所列表
+     *
+     * @param tConfinedSpace 密闭空间和人员密集场所
+     * @return 密闭空间和人员密集场所集合
+     */
+    public List<TConfinedSpace> selectTConfinedSpaceList(TConfinedSpace tConfinedSpace);
+
+    /**
+     * 新增密闭空间和人员密集场所
+     *
+     * @param tConfinedSpace 密闭空间和人员密集场所
+     * @return 结果
+     */
+    public int insertTConfinedSpace(TConfinedSpace tConfinedSpace);
+
+    /**
+     * 修改密闭空间和人员密集场所
+     *
+     * @param tConfinedSpace 密闭空间和人员密集场所
+     * @return 结果
+     */
+    public int updateTConfinedSpace(TConfinedSpace tConfinedSpace);
+
+    /**
+     * 批量删除密闭空间和人员密集场所
+     *
+     * @param ids 需要删除的密闭空间和人员密集场所ID
+     * @return 结果
+     */
+    public int deleteTConfinedSpaceByIds(Long[] ids);
+
+    /**
+     * 删除密闭空间和人员密集场所信息
+     *
+     * @param id 密闭空间和人员密集场所 ID
+     * @return 结果
+     */
+    public int deleteTConfinedSpaceById(Long id);
+
+    /**
+     * 将关联设备信息与密闭空间进行绑定
+     * @param gettDeviceInfoS 关联设备列表
+     * @param id 密闭空间 ID
+     * @param relationDevicetype 关联设备类型
+     */
+    void updatetRelationDeviceDetailInfo(List<TDeviceInfoS> gettDeviceInfoS, Long id, String relationDevicetype);
+}
\ No newline at end of file

zh-baseversion-system/src/main/java/com/zehong/system/service/ITDeviceReportDataService.java

@@ -27,6 +27,10 @@ public interface ITDeviceReportDataService
      */
     public List<TDeviceReportData> selectTDeviceReportDataList(TDeviceReportData tDeviceReportData);
 
+    public List<TDeviceReportData> selectSpaceTDeviceReportDataList(TDeviceReportData tDeviceReportData);
+
+    public List<TDeviceReportData> selectRiskTDeviceReportDataList(TDeviceReportData tDeviceReportData);
+
     /**
      * 新增设备监控
      * 

zh-baseversion-system/src/main/java/com/zehong/system/service/ITIssueRectificationService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TIssueRectification;
+
+/**
+ * 风险点隐患及异常情况Service接口
+ *
+ * @author zehong
+ * @date 2026-03-20
+ */
+public interface ITIssueRectificationService
+{
+    /**
+     * 查询风险点隐患及异常情况
+     *
+     * @param id 风险点隐患及异常情况ID
+     * @return 风险点隐患及异常情况
+     */
+    public TIssueRectification selectTIssueRectificationById(Long id);
+
+    /**
+     * 查询风险点隐患及异常情况列表
+     *
+     * @param tIssueRectification 风险点隐患及异常情况
+     * @return 风险点隐患及异常情况集合
+     */
+    public List<TIssueRectification> selectTIssueRectificationList(TIssueRectification tIssueRectification);
+
+    /**
+     * 新增风险点隐患及异常情况
+     *
+     * @param tIssueRectification 风险点隐患及异常情况
+     * @return 结果
+     */
+    public int insertTIssueRectification(TIssueRectification tIssueRectification);
+
+    /**
+     * 修改风险点隐患及异常情况
+     *
+     * @param tIssueRectification 风险点隐患及异常情况
+     * @return 结果
+     */
+    public int updateTIssueRectification(TIssueRectification tIssueRectification);
+
+    /**
+     * 批量删除风险点隐患及异常情况
+     *
+     * @param ids 需要删除的风险点隐患及异常情况ID
+     * @return 结果
+     */
+    public int deleteTIssueRectificationByIds(Long[] ids);
+
+    /**
+     * 删除风险点隐患及异常情况信息
+     *
+     * @param id 风险点隐患及异常情况ID
+     * @return 结果
+     */
+    public int deleteTIssueRectificationById(Long id);
+}
\ No newline at end of file

zh-baseversion-system/src/main/java/com/zehong/system/service/ITRiskDevMajInforService.java

 package com.zehong.system.service;
 
-import java.util.List;
+import com.zehong.system.domain.TDeviceInfoS;
 import com.zehong.system.domain.TRiskDevMajInfor;
 
+import java.util.List;
+
 /**
  * 重要风险点管控Service接口
  * 
@@ -89,4 +91,12 @@ public interface ITRiskDevMajInforService
      * @return
      */
     int entReportRiskInfo(Long fRiskDevMajInforId) ;
+
+    /**
+     * 将关联设备信息与重要风险点进行绑定
+     * @param gettDeviceInfoS 关联设备列表
+     * @param fRiskDevMajInforId 重要风险点 ID
+     * @param relationDevicetype 关联设备类型
+     */
+    void updateRelationDeviceDetailInfo(List<TDeviceInfoS> gettDeviceInfoS, Long fRiskDevMajInforId, String relationDevicetype);
 }

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TConfinedSpaceServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+
+import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.TConfinedSpace;
+import com.zehong.system.domain.TDeviceInfoS;
+import com.zehong.system.mapper.TConfinedSpaceMapper;
+import com.zehong.system.service.ITConfinedSpaceService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 密闭空间和人员密集场所Service业务层处理
+ *
+ * @author zehong
+ * @date 2026-03-18
+ */
+@Service
+public class TConfinedSpaceServiceImpl implements ITConfinedSpaceService
+{
+    @Autowired
+    private TConfinedSpaceMapper tConfinedSpaceMapper;
+
+    /**
+     * 查询密闭空间和人员密集场所
+     *
+     * @param id 密闭空间和人员密集场所ID
+     * @return 密闭空间和人员密集场所
+     */
+    @Override
+    public TConfinedSpace selectTConfinedSpaceById(Long id)
+    {
+        return tConfinedSpaceMapper.selectTConfinedSpaceById(id);
+    }
+
+    /**
+     * 查询密闭空间和人员密集场所列表
+     *
+     * @param tConfinedSpace 密闭空间和人员密集场所
+     * @return 密闭空间和人员密集场所
+     */
+    @Override
+    public List<TConfinedSpace> selectTConfinedSpaceList(TConfinedSpace tConfinedSpace)
+    {
+        return tConfinedSpaceMapper.selectTConfinedSpaceList(tConfinedSpace);
+    }
+
+    /**
+     * 新增密闭空间和人员密集场所
+     *
+     * @param tConfinedSpace 密闭空间和人员密集场所
+     * @return 结果
+     */
+    @Override
+    public int insertTConfinedSpace(TConfinedSpace tConfinedSpace)
+    {
+        tConfinedSpace.setCreateTime(DateUtils.getNowDate());
+        return tConfinedSpaceMapper.insertTConfinedSpace(tConfinedSpace);
+    }
+
+    /**
+     * 修改密闭空间和人员密集场所
+     *
+     * @param tConfinedSpace 密闭空间和人员密集场所
+     * @return 结果
+     */
+    @Override
+    public int updateTConfinedSpace(TConfinedSpace tConfinedSpace)
+    {
+        return tConfinedSpaceMapper.updateTConfinedSpace(tConfinedSpace);
+    }
+
+    /**
+     * 批量删除密闭空间和人员密集场所
+     *
+     * @param ids 需要删除的密闭空间和人员密集场所ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTConfinedSpaceByIds(Long[] ids)
+    {
+        return tConfinedSpaceMapper.deleteTConfinedSpaceByIds(ids);
+    }
+
+    /**
+     * 删除密闭空间和人员密集场所信息
+     *
+     * @param id 密闭空间和人员密集场所ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTConfinedSpaceById(Long id)
+    {
+        return tConfinedSpaceMapper.deleteTConfinedSpaceById(id);
+    }
+
+    /**
+     * 将关联设备信息与密闭空间进行绑定
+     * @param gettDeviceInfoS 关联设备列表
+     * @param id 密闭空间 ID
+     * @param relationDevicetype 关联设备类型
+     */
+    @Override
+    public void updatetRelationDeviceDetailInfo(List<TDeviceInfoS> gettDeviceInfoS, Long id, String relationDevicetype) {
+        if (CollectionUtils.isNotEmpty(gettDeviceInfoS)) {
+            tConfinedSpaceMapper.updatetRelationDeviceDetailInfo(gettDeviceInfoS, id, relationDevicetype);
+        }
+    }
+}
\ No newline at end of file

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TDeviceReportDataServiceImpl.java

@@ -55,6 +55,30 @@ public class TDeviceReportDataServiceImpl implements ITDeviceReportDataService
         return tDeviceReportDataMapper.selectTDeviceReportDataList(tDeviceReportData);
     }
 
+    @Override
+    public List<TDeviceReportData> selectSpaceTDeviceReportDataList(TDeviceReportData tDeviceReportData)
+    {
+        // 20240725 调整 分 企业 和 政府 角色录入
+        if(isEnterprise()) {
+            tDeviceReportData.setBeyondEnterpriseId(SecurityUtils.getLoginUser().getUser().getDeptId());
+        }
+
+        return tDeviceReportDataMapper.selectSpaceTDeviceReportDataList(tDeviceReportData);
+    }
+
+    @Override
+    public List<TDeviceReportData> selectRiskTDeviceReportDataList(TDeviceReportData tDeviceReportData)
+    {
+        // 20240725 调整 分 企业 和 政府 角色录入
+        if(isEnterprise()) {
+            tDeviceReportData.setBeyondEnterpriseId(SecurityUtils.getLoginUser().getUser().getDeptId());
+        }
+
+        return tDeviceReportDataMapper.selectRiskTDeviceReportDataList(tDeviceReportData);
+    }
+
+
+
     /**
      * 新增设备监控
      * 

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TIssueRectificationServiceImpl.java

+package com.zehong.system.service.impl;
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TIssueRectificationMapper;
+import com.zehong.system.domain.TIssueRectification;
+import com.zehong.system.service.ITIssueRectificationService;
+
+/**
+ * 风险点隐患及异常情况Service业务层处理
+ *
+ * @author zehong
+ * @date 2026-03-20
+ */
+@Service
+public class TIssueRectificationServiceImpl implements ITIssueRectificationService
+{
+    @Autowired
+    private TIssueRectificationMapper tIssueRectificationMapper;
+
+    /**
+     * 查询风险点隐患及异常情况
+     *
+     * @param id 风险点隐患及异常情况ID
+     * @return 风险点隐患及异常情况
+     */
+    @Override
+    public TIssueRectification selectTIssueRectificationById(Long id)
+    {
+        return tIssueRectificationMapper.selectTIssueRectificationById(id);
+    }
+
+    /**
+     * 查询风险点隐患及异常情况列表
+     *
+     * @param tIssueRectification 风险点隐患及异常情况
+     * @return 风险点隐患及异常情况
+     */
+    @Override
+    public List<TIssueRectification> selectTIssueRectificationList(TIssueRectification tIssueRectification)
+    {
+        return tIssueRectificationMapper.selectTIssueRectificationList(tIssueRectification);
+    }
+
+    /**
+     * 新增风险点隐患及异常情况
+     *
+     * @param tIssueRectification 风险点隐患及异常情况
+     * @return 结果
+     */
+    @Override
+    public int insertTIssueRectification(TIssueRectification tIssueRectification)
+    {
+        tIssueRectification.setCreateTime(DateUtils.getNowDate());
+        return tIssueRectificationMapper.insertTIssueRectification(tIssueRectification);
+    }
+
+    /**
+     * 修改风险点隐患及异常情况
+     *
+     * @param tIssueRectification 风险点隐患及异常情况
+     * @return 结果
+     */
+    @Override
+    public int updateTIssueRectification(TIssueRectification tIssueRectification)
+    {
+        return tIssueRectificationMapper.updateTIssueRectification(tIssueRectification);
+    }
+
+    /**
+     * 批量删除风险点隐患及异常情况
+     *
+     * @param ids 需要删除的风险点隐患及异常情况ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIssueRectificationByIds(Long[] ids)
+    {
+        return tIssueRectificationMapper.deleteTIssueRectificationByIds(ids);
+    }
+
+    /**
+     * 删除风险点隐患及异常情况信息
+     *
+     * @param id 风险点隐患及异常情况ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTIssueRectificationById(Long id)
+    {
+        return tIssueRectificationMapper.deleteTIssueRectificationById(id);
+    }
+}
\ No newline at end of file

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TRiskDevMajInforServiceImpl.java

@@ -9,11 +9,13 @@ import com.zehong.common.utils.SecurityUtils;
 import com.zehong.common.utils.StringUtils;
 import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.system.domain.TConGasProInfor;
+import com.zehong.system.domain.TDeviceInfoS;
 import com.zehong.system.domain.TRiskDevMajInfor;
 import com.zehong.system.domain.vo.TRiskDevMajInfoVo;
 import com.zehong.system.mapper.TRiskDevMajInforMapper;
 import com.zehong.system.service.ITRiskDevMajInforService;
 import com.zehong.system.service.ITSerialNumberInfoService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -188,7 +190,7 @@ public class TRiskDevMajInforServiceImpl implements ITRiskDevMajInforService
 
     /**
      * 企业端 上传重要风险点档案
-     * @param fRiskDevMajInforId 重要风险点档案id
+     * @param fRiskDevMajInforId 重要风险点档案 id
      * @return 1
      */
     @Override
@@ -196,4 +198,17 @@ public class TRiskDevMajInforServiceImpl implements ITRiskDevMajInforService
          tRiskDevMajInforMapper.entReportRiskDevMajInfor("1",new Date(),fRiskDevMajInforId);
          return 1;
     }
+
+    /**
+     * 将关联设备信息与重要风险点进行绑定
+     * @param gettDeviceInfoS 关联设备列表
+     * @param fRiskDevMajInforId 重要风险点 ID
+     * @param relationDevicetype 关联设备类型
+     */
+    @Override
+    public void updateRelationDeviceDetailInfo(List<TDeviceInfoS> gettDeviceInfoS, Long fRiskDevMajInforId, String relationDevicetype) {
+        if (CollectionUtils.isNotEmpty(gettDeviceInfoS)) {
+            tRiskDevMajInforMapper.updateRelationDeviceDetailInfo(gettDeviceInfoS, fRiskDevMajInforId, relationDevicetype);
+        }
+    }
 }

zh-baseversion-system/src/main/resources/mapper/system/TConfinedSpaceMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TConfinedSpaceMapper">
+
+    <resultMap type="com.zehong.system.domain.TConfinedSpace" id="TConfinedSpaceResult">
+        <result property="id"    column="id"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="enterpriseName"    column="enterprise_name"    />
+        <result property="socialCreditCode"    column="social_credit_code"    />
+        <result property="venueFacility"    column="venue_facility"    />
+        <result property="venueType"    column="venue_type"    />
+        <result property="specificLocation"    column="specific_location"    />
+        <result property="area"    column="area"    />
+        <result property="riskFactors"    column="risk_factors"    />
+        <result property="workFrequency"    column="work_frequency"    />
+        <result property="warningSign"    column="warning_sign"    />
+        <result property="emergencyEquipment"    column="emergency_equipment"    />
+        <result property="siteSupervisor"    column="site_supervisor"    />
+        <result property="supervisorPhone"    column="supervisor_phone"    />
+        <result property="lastDate"    column="last_date"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+    </resultMap>
+
+    <sql id="selectTConfinedSpaceVo">
+        select id, enterprise_id, enterprise_name, social_credit_code, venue_facility, venue_type, specific_location, area, risk_factors, work_frequency, warning_sign, emergency_equipment, site_supervisor, supervisor_phone, last_date, create_time, longitude, latitude from t_confined_space
+    </sql>
+
+    <select id="selectTConfinedSpaceList" parameterType="com.zehong.system.domain.TConfinedSpace" resultMap="TConfinedSpaceResult">
+        <include refid="selectTConfinedSpaceVo"/>
+        <where>
+            <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="socialCreditCode != null  and socialCreditCode != ''"> and social_credit_code = #{socialCreditCode}</if>
+            <if test="venueFacility != null  and venueFacility != ''"> and venue_facility = #{venueFacility}</if>
+            <if test="venueType != null  and venueType != ''"> and venue_type = #{venueType}</if>
+            <if test="warningSign != null  and warningSign != ''"> and warning_sign = #{warningSign}</if>
+            <if test="lastDate != null "> and last_date = #{lastDate}</if>
+        </where>
+    </select>
+
+    <select id="selectTConfinedSpaceById" parameterType="Long" resultMap="TConfinedSpaceResult">
+        <include refid="selectTConfinedSpaceVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTConfinedSpace" parameterType="com.zehong.system.domain.TConfinedSpace" useGeneratedKeys="true" keyProperty="id">
+        insert into t_confined_space
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id,</if>
+            <if test="enterpriseName != null">enterprise_name,</if>
+            <if test="socialCreditCode != null">social_credit_code,</if>
+            <if test="venueFacility != null">venue_facility,</if>
+            <if test="venueType != null">venue_type,</if>
+            <if test="specificLocation != null">specific_location,</if>
+            <if test="area != null">area,</if>
+            <if test="riskFactors != null">risk_factors,</if>
+            <if test="workFrequency != null">work_frequency,</if>
+            <if test="warningSign != null">warning_sign,</if>
+            <if test="emergencyEquipment != null">emergency_equipment,</if>
+            <if test="siteSupervisor != null">site_supervisor,</if>
+            <if test="supervisorPhone != null">supervisor_phone,</if>
+            <if test="lastDate != null">last_date,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">#{enterpriseId},</if>
+            <if test="enterpriseName != null">#{enterpriseName},</if>
+            <if test="socialCreditCode != null">#{socialCreditCode},</if>
+            <if test="venueFacility != null">#{venueFacility},</if>
+            <if test="venueType != null">#{venueType},</if>
+            <if test="specificLocation != null">#{specificLocation},</if>
+            <if test="area != null">#{area},</if>
+            <if test="riskFactors != null">#{riskFactors},</if>
+            <if test="workFrequency != null">#{workFrequency},</if>
+            <if test="warningSign != null">#{warningSign},</if>
+            <if test="emergencyEquipment != null">#{emergencyEquipment},</if>
+            <if test="siteSupervisor != null">#{siteSupervisor},</if>
+            <if test="supervisorPhone != null">#{supervisorPhone},</if>
+            <if test="lastDate != null">#{lastDate},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTConfinedSpace" parameterType="com.zehong.system.domain.TConfinedSpace">
+        update t_confined_space
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
+            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
+            <if test="socialCreditCode != null">social_credit_code = #{socialCreditCode},</if>
+            <if test="venueFacility != null">venue_facility = #{venueFacility},</if>
+            <if test="venueType != null">venue_type = #{venueType},</if>
+            <if test="specificLocation != null">specific_location = #{specificLocation},</if>
+            <if test="area != null">area = #{area},</if>
+            <if test="riskFactors != null">risk_factors = #{riskFactors},</if>
+            <if test="workFrequency != null">work_frequency = #{workFrequency},</if>
+            <if test="warningSign != null">warning_sign = #{warningSign},</if>
+            <if test="emergencyEquipment != null">emergency_equipment = #{emergencyEquipment},</if>
+            <if test="siteSupervisor != null">site_supervisor = #{siteSupervisor},</if>
+            <if test="supervisorPhone != null">supervisor_phone = #{supervisorPhone},</if>
+            <if test="lastDate != null">last_date = #{lastDate},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTConfinedSpaceById" parameterType="Long">
+        delete from t_confined_space where id = #{id}
+    </delete>
+
+    <delete id="deleteTConfinedSpaceByIds" parameterType="String">
+        delete from t_confined_space where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <!--将关联设备信息与密闭空间进行绑定-->
+    <update id="updatetRelationDeviceDetailInfo" parameterType="java.util.List">
+        update t_relation_device_detail_info set relation_device_id = #{id} ,relation_device_type =#{relationDevicetype}
+        where
+        relation_device_detail_id in
+        <foreach collection="gettDeviceInfoS" item="items" index="key" open="(" separator="," close=")">
+           #{items.relationDeviceDetailId}
+        </foreach>
+    </update>
+</mapper>
\ No newline at end of file

zh-baseversion-system/src/main/resources/mapper/system/TDeviceReportDataMapper.xml

@@ -87,6 +87,110 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="selectSpaceTDeviceReportDataList" parameterType="TDeviceReportData" resultMap="TDeviceReportDataResult">
+        SELECT
+        report.device_report_data_id,
+        report.device_name,
+        report.device_num,
+        report.standard_condition_accumulation,
+        report.working_condition_accumulation,
+        report.backing_standard_condition_accumulation,
+        report.residual_quantity,
+        report.standard_condition_flow,
+        report.working_condition_flow,
+        report.temperature,
+        report.pressure,
+        report.report_time,
+        report.communication_status,
+        report.device_status,
+        report.beyond_enterprise_id,
+        enterprise.enterprise_name AS beyond_enterprise_name,
+        report.create_by,
+        report.create_time,
+        report.update_by,
+        report.update_time,
+        report.is_del,
+        report.remarks
+        FROM
+        t_device_report_data report
+        INNER JOIN t_relation_device_detail_info detail ON detail.iot_no = report.device_num
+        INNER JOIN t_confined_space device ON device.id = detail.relation_device_id
+        INNER JOIN t_enterprise_info enterprise ON enterprise.enterprise_id = report.beyond_enterprise_id
+        <where>
+            <if test="deviceName != null  and deviceName != ''"> and report.device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceNum != null  and deviceNum != ''"> and report.device_num like concat('%', #{deviceNum}, '%')</if>
+            <if test="standardConditionAccumulation != null "> and report.standard_condition_accumulation = #{standardConditionAccumulation}</if>
+            <if test="workingConditionAccumulation != null "> and report.working_condition_accumulation = #{workingConditionAccumulation}</if>
+            <if test="backingStandardConditionAccumulation != null "> and report.backing_standard_condition_accumulation = #{backingStandardConditionAccumulation}</if>
+            <if test="residualQuantity != null "> and report.residual_quantity = #{residualQuantity}</if>
+            <if test="standardConditionFlow != null "> and report.standard_condition_flow = #{standardConditionFlow}</if>
+            <if test="workingConditionFlow != null "> and report.working_condition_flow = #{workingConditionFlow}</if>
+            <if test="temperature != null "> and report.temperature = #{temperature}</if>
+            <if test="pressure != null "> and report.pressure = #{pressure}</if>
+            <if test="reportTime != null "> and report.report_time = #{reportTime}</if>
+            <if test="communicationStatus != null  and communicationStatus != ''"> and report.communication_status = #{communicationStatus}</if>
+            <if test="deviceStatus != null  and deviceStatus != ''"> and report.device_status = #{deviceStatus}</if>
+            <if test="beyondEnterpriseId != null "> and report.beyond_enterprise_id = #{beyondEnterpriseId}</if>
+            <if test="beyondEnterpriseName != null  and beyondEnterpriseName != ''"> and report.beyond_enterprise_name like concat('%', #{beyondEnterpriseName}, '%')</if>
+            <if test="isDel != null  and isDel != ''"> and report.is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and report.remarks = #{remarks}</if>
+            <if test="deviceType != null  and deviceType != ''">AND detail.device_type = #{deviceType}</if>
+            <if test="relationDeviceId != null  and relationDeviceId != ''">AND detail.relation_device_id = #{relationDeviceId}</if>
+        </where>
+    </select>
+
+    <select id="selectRiskTDeviceReportDataList" parameterType="TDeviceReportData" resultMap="TDeviceReportDataResult">
+        SELECT
+        report.device_report_data_id,
+        report.device_name,
+        report.device_num,
+        report.standard_condition_accumulation,
+        report.working_condition_accumulation,
+        report.backing_standard_condition_accumulation,
+        report.residual_quantity,
+        report.standard_condition_flow,
+        report.working_condition_flow,
+        report.temperature,
+        report.pressure,
+        report.report_time,
+        report.communication_status,
+        report.device_status,
+        report.beyond_enterprise_id,
+        enterprise.enterprise_name AS beyond_enterprise_name,
+        report.create_by,
+        report.create_time,
+        report.update_by,
+        report.update_time,
+        report.is_del,
+        report.remarks
+        FROM
+        t_device_report_data report
+        INNER JOIN t_relation_device_detail_info detail ON detail.iot_no = report.device_num
+        INNER JOIN t_risk_dev_maj_infor device ON device.f_risk_dev_maj_infor_id = detail.relation_device_id
+        INNER JOIN t_enterprise_info enterprise ON enterprise.enterprise_id = report.beyond_enterprise_id
+        <where>
+            <if test="deviceName != null  and deviceName != ''"> and report.device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceNum != null  and deviceNum != ''"> and report.device_num like concat('%', #{deviceNum}, '%')</if>
+            <if test="standardConditionAccumulation != null "> and report.standard_condition_accumulation = #{standardConditionAccumulation}</if>
+            <if test="workingConditionAccumulation != null "> and report.working_condition_accumulation = #{workingConditionAccumulation}</if>
+            <if test="backingStandardConditionAccumulation != null "> and report.backing_standard_condition_accumulation = #{backingStandardConditionAccumulation}</if>
+            <if test="residualQuantity != null "> and report.residual_quantity = #{residualQuantity}</if>
+            <if test="standardConditionFlow != null "> and report.standard_condition_flow = #{standardConditionFlow}</if>
+            <if test="workingConditionFlow != null "> and report.working_condition_flow = #{workingConditionFlow}</if>
+            <if test="temperature != null "> and report.temperature = #{temperature}</if>
+            <if test="pressure != null "> and report.pressure = #{pressure}</if>
+            <if test="reportTime != null "> and report.report_time = #{reportTime}</if>
+            <if test="communicationStatus != null  and communicationStatus != ''"> and report.communication_status = #{communicationStatus}</if>
+            <if test="deviceStatus != null  and deviceStatus != ''"> and report.device_status = #{deviceStatus}</if>
+            <if test="beyondEnterpriseId != null "> and report.beyond_enterprise_id = #{beyondEnterpriseId}</if>
+            <if test="beyondEnterpriseName != null  and beyondEnterpriseName != ''"> and report.beyond_enterprise_name like concat('%', #{beyondEnterpriseName}, '%')</if>
+            <if test="isDel != null  and isDel != ''"> and report.is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and report.remarks = #{remarks}</if>
+            <if test="deviceType != null  and deviceType != ''">AND detail.device_type = #{deviceType}</if>
+            <if test="relationDeviceId != null  and relationDeviceId != ''">AND detail.relation_device_id = #{relationDeviceId}</if>
+        </where>
+    </select>
+    
     <select id="selectTDeviceReportDataById" parameterType="Long" resultMap="TDeviceReportDataResult">
         <include refid="selectTDeviceReportDataVo"/>
         where report.device_report_data_id = #{deviceReportDataId}

zh-baseversion-system/src/main/resources/mapper/system/TIssueRectificationMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TIssueRectificationMapper">
+
+    <resultMap type="com.zehong.system.domain.TIssueRectification" id="TIssueRectificationResult">
+        <result property="id"    column="id"    />
+        <result property="fRiskDevMajInforId"    column="f_risk_dev_maj_infor_id"    />
+        <result property="dangerAnomaly"    column="danger_anomaly"    />
+        <result property="rectificationDisposal"    column="rectification_disposal"    />
+        <result property="handler"    column="handler"    />
+        <result property="phone"    column="phone"    />
+        <result property="issueType"    column="issue_type"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectTIssueRectificationVo">
+        select id, f_risk_dev_maj_infor_id, danger_anomaly, rectification_disposal, handler, phone, issue_type, create_time from t_issue_rectification
+    </sql>
+
+    <select id="selectTIssueRectificationList" parameterType="com.zehong.system.domain.TIssueRectification" resultMap="TIssueRectificationResult">
+        <include refid="selectTIssueRectificationVo"/>
+        <where>
+            <if test="fRiskDevMajInforId != null "> and f_risk_dev_maj_infor_id = #{fRiskDevMajInforId}</if>
+            <if test="handler != null  and handler != ''"> and handler = #{handler}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="issueType != null  and issueType != ''"> and issue_type = #{issueType}</if>
+        </where>
+    </select>
+
+    <select id="selectTIssueRectificationById" parameterType="Long" resultMap="TIssueRectificationResult">
+        <include refid="selectTIssueRectificationVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTIssueRectification" parameterType="com.zehong.system.domain.TIssueRectification" useGeneratedKeys="true" keyProperty="id">
+        insert into t_issue_rectification
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fRiskDevMajInforId != null">f_risk_dev_maj_infor_id,</if>
+            <if test="dangerAnomaly != null">danger_anomaly,</if>
+            <if test="rectificationDisposal != null">rectification_disposal,</if>
+            <if test="handler != null">handler,</if>
+            <if test="phone != null">phone,</if>
+            <if test="issueType != null">issue_type,</if>
+            <if test="createTime != null">create_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fRiskDevMajInforId != null">#{fRiskDevMajInforId},</if>
+            <if test="dangerAnomaly != null">#{dangerAnomaly},</if>
+            <if test="rectificationDisposal != null">#{rectificationDisposal},</if>
+            <if test="handler != null">#{handler},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="issueType != null">#{issueType},</if>
+            <if test="createTime != null">#{createTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTIssueRectification" parameterType="com.zehong.system.domain.TIssueRectification">
+        update t_issue_rectification
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fRiskDevMajInforId != null">f_risk_dev_maj_infor_id = #{fRiskDevMajInforId},</if>
+            <if test="dangerAnomaly != null">danger_anomaly = #{dangerAnomaly},</if>
+            <if test="rectificationDisposal != null">rectification_disposal = #{rectificationDisposal},</if>
+            <if test="handler != null">handler = #{handler},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="issueType != null">issue_type = #{issueType},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTIssueRectificationById" parameterType="Long">
+        delete from t_issue_rectification where id = #{id}
+    </delete>
+
+    <delete id="deleteTIssueRectificationByIds" parameterType="String">
+        delete from t_issue_rectification where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zh-baseversion-system/src/main/resources/mapper/system/TRiskDevMajInforMapper.xml

@@ -186,4 +186,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{fRiskDevMajInforId}
         </foreach>
     </delete>
+
+    <!-- 将关联设备信息与重要风险点进行绑定 -->
+    <update id="updateRelationDeviceDetailInfo">
+        update t_relation_device_detail_info
+        set relation_device_id = #{fRiskDevMajInforId},
+            relation_device_type = #{relationDevicetype}
+        where relation_device_detail_id in
+        <foreach collection="gettDeviceInfoS" item="device" open="(" separator="," close=")">
+            #{device.relationDeviceDetailId}
+        </foreach>
+    </update>
+
 </mapper>
\ No newline at end of file

zh-baseversion-web/src/api/complainDeal/complainDeal.js

@@ -46,7 +46,7 @@ export function delComplainDeal(complainDealId) {
 // 导出投诉处置
 export function exportComplainDeal(query) {
   return request({
-    url: '/complainDeal/complainDeal/export',
+    url: '/complainDeal/export',
     method: 'get',
     params: query
   })

zh-baseversion-web/src/api/operationMonitor/data.js

@@ -9,6 +9,22 @@ export function listData(query) {
   })
 }
 
+export function spaceListData(query) {
+  return request({
+    url: '/system/data/spaceList',
+    method: 'get',
+    params: query
+  })
+}
+
+export function riskListData(query) {
+  return request({
+    url: '/system/data/riskList',
+    method: 'get',
+    params: query
+  })
+}
+
 export function redisList(query) {
   return request({
     url: '/system/data/redisList',

zh-baseversion-web/src/api/risk/info.js

@@ -59,18 +59,83 @@ export function exportInfor(query) {
   })
 }
 
-export function reportRiskInfo(query) {
+// 上报政府端
+export function reportRiskInfo(data) {
   return request({
     url: '/risk/info/reportRiskInfo',
     method: 'get',
-    params: query
+    params: data
   })
 }
 
-export function entReportRiskInfo(query) {
+// 上报企业端
+export function entReportRiskInfo(data) {
   return request({
     url: '/risk/info/entReportRiskInfo',
     method: 'get',
-    params: query
+    params: data
+  })
+}
+
+// 查询无绑定的关联设备信息
+export function getDdeviceDetailInfo(data) {
+  return request({
+    url: '/device/device/selectDetailInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增关联设备信息
+export function addDetailInfos(data) {
+  return request({
+    url: '/device/device/insertDetailInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除关联设备信息
+export function deleteDetailInfo(deviceId) {
+  return request({
+    url: '/device/device/deleteDetailInfo',
+    method: 'delete',
+    data: deviceId
+  })
+}
+
+// 解除空间与关联设备关系
+export function deleteDeviceDetailInfo(deviceId) {
+  return request({
+    url: '/device/device/deleteDeviceDetailInfo',
+    method: 'delete',
+    data: deviceId
+  })
+}
+
+// 删除关联设备信息（批量）
+export function deleteeListDetailInfo(deviceId) {
+  return request({
+    url: '/device/device/deleteeListDetailInfo',
+    method: 'delete',
+    data: deviceId
+  })
+}
+
+// 查询已经关联的关联设备信息
+export function selectDetailInfoList(data) {
+  return request({
+    url: '/device/device/selectDetailInfoList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改关联设备绑定
+export function updateDetailInfoLists(data) {
+  return request({
+    url: '/device/device/updateDetailInfoList',
+    method: 'post',
+    data: data
   })
 }

zh-baseversion-web/src/api/risk/rectification.js

+import request from '@/utils/request'
+
+// 查询风险点隐患及异常情况列表
+export function listRectification(query) {
+  return request({
+    url: '/system/rectification/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询风险点隐患及异常情况详细
+export function getRectification(id) {
+  return request({
+    url: '/system/rectification/' + id,
+    method: 'get'
+  })
+}
+
+// 新增风险点隐患及异常情况
+export function addRectification(data) {
+  return request({
+    url: '/system/rectification',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改风险点隐患及异常情况
+export function updateRectification(data) {
+  return request({
+    url: '/system/rectification',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除风险点隐患及异常情况
+export function delRectification(id) {
+  return request({
+    url: '/system/rectification/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出风险点隐患及异常情况
+export function exportRectification(query) {
+  return request({
+    url: '/system/rectification/export',
+    method: 'get',
+    params: query
+  })
+}

zh-baseversion-web/src/api/risk/space.js

+import request from '@/utils/request'
+
+// 查询密闭空间和人员密集场所列表
+export function listSpace(query) {
+  return request({
+    url: '/system/space/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询密闭空间和人员密集场所详细
+export function getSpace(id) {
+  return request({
+    url: '/system/space/' + id,
+    method: 'get'
+  })
+}
+
+// 新增密闭空间和人员密集场所
+export function addSpace(data) {
+  return request({
+    url: '/system/space',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改密闭空间和人员密集场所
+export function updateSpace(data) {
+  return request({
+    url: '/system/space',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除密闭空间和人员密集场所
+export function delSpace(id) {
+  return request({
+    url: '/system/space/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出密闭空间和人员密集场所
+export function exportSpace(query) {
+  return request({
+    url: '/system/space/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询无绑定的关联设备信息
+export function getDdeviceDetailInfo(data) {
+  return request({
+    url: '/device/device/selectDetailInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增关联设备信息
+export function addDetailInfos(data) {
+  return request({
+    url: '/device/device/insertDetailInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除关联设备信息
+export function deleteDetailInfo(deviceId) {
+  return request({
+    url: '/device/device/deleteDetailInfo',
+    method: 'delete',
+    data: deviceId
+  })
+}
+
+// 解除空间与关联设备关系
+export function deleteDeviceDetailInfo(deviceId) {
+  return request({
+    url: '/device/device/deleteDeviceDetailInfo',
+    method: 'delete',
+    data: deviceId
+  })
+}
+
+// 删除关联设备信息（批量）
+export function deleteeListDetailInfo(deviceId) {
+  return request({
+    url: '/device/device/deleteeListDetailInfo',
+    method: 'delete',
+    data: deviceId
+  })
+}
+
+// 查询已经关联的关联设备信息
+export function selectDetailInfoList(data) {
+  return request({
+    url: '/device/device/selectDetailInfoList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改关联设备绑定
+export function updateDetailInfoLists(data) {
+  return request({
+    url: '/device/device/updateDetailInfoList',
+    method: 'post',
+    data: data
+  })
+}

zh-baseversion-web/src/views/complainDeal/index.vue

@@ -1246,6 +1246,10 @@ export default {
     },
     // 满意度评价提交
     evaluateSubmint(){
+      console.log("this.evaluateForm = " + this.evaluateForm)
+      if(this.evaluateForm.evaluateRate == null || this.evaluateForm.evaluateRate === ''){
+        this.msgError("请选择评价等级");
+      }else{
         if (this.evaluateForm.complainDealEvaluateId != null && this.evaluateForm.complainDealEvaluateId != 0) {
           updateComplainEvaluate(this.evaluateForm).then(response => {
             this.msgSuccess("评论修改成功");
@@ -1257,6 +1261,7 @@ export default {
             this.dialogEvaluateVisible = false;
           })
         }
+      }
     },
     //关闭之前
     handleEvaluateReturnBeforClose() {

zh-baseversion-web/src/views/oldpipesystem/process/index.vue

@@ -693,13 +693,13 @@ export default {
     },
     handleReport(row){
       // 如果是  超级管理员或者 企业，并且 企业端上报状态为0
-      if (this.user.roleId == 5 && row.fUploadType == '0') {
+      if ((this.user.roleId == 5 || this.user.roleId == 1) && row.fUploadType == '0') {
         this.$confirm('是否确认上报老旧管网改造计划项目名称为"' + row.fProjectName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
           }).then(function() {
-            return entReportPipeOldPlanProcess({fOldPlanProcessId : row.fOldPlanProcessId});
+            //return entReportPipeOldPlanProcess({fOldPlanProcessId : row.fOldPlanProcessId});
           }).then(() => {
             this.getList();
             this.msgSuccess("上报成功");
@@ -708,13 +708,13 @@ export default {
 
 
       // 如果是  超级管理员或者 政府，并且 政府端上报状态为0
-      if (this.user.roleId == 3  && row.govUploadState == '0') {
+      if ((this.user.roleId == 3 || this.user.roleId == 1)  && row.govUploadState == '0') {
         this.$confirm('是否确认上报老旧管网改造计划项目名称为"' + row.fProjectName + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
         }).then(function() {
-          return reportPipeOldPlanProcess({fOldPlanProcessId : row.fOldPlanProcessId});
+          //return reportPipeOldPlanProcess({fOldPlanProcessId : row.fOldPlanProcessId});
         }).then(() => {
           this.getList();
           this.msgSuccess("上报成功");

zh-baseversion-web/src/views/risk/components/DetailInfo.vue

@@ -73,6 +73,18 @@
       </el-row>
     </el-form>
 
+    <div class="tableTitle">
+      <img :src="relationImg" style="width: 24px; height: 25px;position: relative; left: -339px; top: -12px;"/>
+      <span class="midText">关联设备</span>
+    </div>
+    <el-table v-loading="loadings" :data="DetailInfoList" tooltip-effect="dark" style="width: 100%" max-height="250">
+      <el-table-column label="设备名称" align="center" prop="deviceName" />
+      <el-table-column label="设备型号" align="center" prop="deviceModel" />
+      <el-table-column label="设备类型" align="center" prop="deviceType" />
+      <el-table-column label="物联网编号" align="center" prop="iotNo" />
+      <el-table-column label="备注" align="center" prop="remarksn" />
+    </el-table>
+
     <el-divider content-position="left">上报时态</el-divider>
     <el-form label-width="170px">
       <el-row class="el-row-table">
@@ -101,7 +113,7 @@
 </template>
 
 <script>
-  import { getInforForDetail } from "@/api/risk/info";
+  import { getInforForDetail,selectDetailInfoList } from "@/api/risk/info";
   import { EditorMap } from "@/utils/mapClass/getPath.js";
   import { getDefaultCountyList } from "@/api/area/county";
   import { enterpriseLists } from "@/api/regulation/info";
@@ -109,6 +121,7 @@
     name: "detail-info",
     data(){
         return{
+          relationImg: require('@/assets/project/relation.png'),
           fUploadTypeLable: "",
           fUploadTimeLabel: "",
           enterprises: [],
@@ -117,7 +130,9 @@
           enterpriseName:"",
           detailOpen: false,
           fUploadType: "",
-          fUploadTime: null
+          fUploadTime: null,
+          DetailInfoList: [],
+          loadings: true
         }
     },
     watch:{
@@ -192,6 +207,16 @@
             this.showUploadType();
             this.showUploadTime();
             this.detailOpen = true;
+
+            // 查询关联设备信息
+            var tRiskInfo = {
+              id: id,
+              relationDeviceType: '4'
+            }
+            selectDetailInfoList(JSON.stringify(tRiskInfo)).then(response => {
+              this.DetailInfoList = response.rows;
+              this.loadings = false;
+            });
           }
         })
       },

zh-baseversion-web/src/views/space/visualManagement/component/drawer.vue

+<template>
+  <div class="drawer-container" :style="{ width: width }">
+    <div class="drawer-content">
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Drawer",
+  props: {
+    title: {
+      type: String,
+      default: ''
+    },
+    inner: {
+      type: Boolean,
+      default: false
+    },
+    width: {
+      type: String,
+      default: '800px'
+    },
+    mask: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      isOpen: true
+    };
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.drawer-container {
+  position: relative;
+  height: 100%;
+  background-color: #fff;
+  box-shadow: 2px 0 8px rgba(0, 0, 0, 0.1);
+  overflow-y: auto;
+  flex-shrink: 0;
+
+  .drawer-content {
+    padding: 20px;
+    min-height: 100%;
+  }
+}
+</style>