diff --git a/Dkl-Vue-master/dkl-large/src/main/java/com/dkl/large/controller/DklMonitoringPointsController.java b/Dkl-Vue-master/dkl-large/src/main/java/com/dkl/large/controller/DklMonitoringPointsController.java
deleted file mode 100644
index b9c8892..0000000
--- a/Dkl-Vue-master/dkl-large/src/main/java/com/dkl/large/controller/DklMonitoringPointsController.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.dkl.large.controller;
-
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.koal.kms.sdk.ed.KmsSdkException;
-import com.dkl.common.annotation.DataScope;
-import com.dkl.large.domain.DklActivity;
-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.dkl.common.annotation.Log;
-import com.dkl.common.core.controller.BaseController;
-import com.dkl.common.core.domain.AjaxResult;
-import com.dkl.common.enums.BusinessType;
-import com.dkl.large.domain.DklMonitoringPoints;
-import com.dkl.large.service.IDklMonitoringPointsService;
-import com.dkl.common.utils.poi.ExcelUtil;
-import com.dkl.common.core.page.TableDataInfo;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 监控点信息Controller
- *
- * @author Dkl
- * @date 2025-06-10
- */
-@RestController
-@RequestMapping("/large/points")
-public class DklMonitoringPointsController extends BaseController
-{
-    @Autowired
-    private IDklMonitoringPointsService dklMonitoringPointsService;
-
-    /**
-     * 查询监控点信息列表
-     */
-    @PreAuthorize("@ss.hasPermi('large:points:list')")
-    @DataScope(deptAlias = "d")
-    @GetMapping("/list")
-    public TableDataInfo list(DklMonitoringPoints dklMonitoringPoints) throws KmsSdkException {
-        startPage();
-        List<DklMonitoringPoints> list = dklMonitoringPointsService.selectDklMonitoringPointsList(dklMonitoringPoints);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('large:points:list')")
-    @DataScope(deptAlias = "d")
-    @GetMapping("/listMessage")
-    public AjaxResult listMessage(DklMonitoringPoints dklMonitoringPoints) throws KmsSdkException {
-        String message = dklMonitoringPointsService.selectDklMonitoringPointsListMeaasge(dklMonitoringPoints);
-        return AjaxResult.success(message);
-    }
-    @PreAuthorize("@ss.hasPermi('large:points:list')")
-    @DataScope(deptAlias = "d")
-    @GetMapping("/listAll")
-    public TableDataInfo listAll(DklMonitoringPoints dklMonitoringPoints) throws KmsSdkException {
-
-        dklMonitoringPoints.setDelFlag("0");
-        List<DklMonitoringPoints> list = dklMonitoringPointsService.selectDklMonitoringPointsList(dklMonitoringPoints);
-        return getDataTable(list);
-    }
-
-    @GetMapping("/listOutAll")
-    public TableDataInfo listOutAll(DklMonitoringPoints dklMonitoringPoints) throws KmsSdkException {
-        startPage();
-        List<DklMonitoringPoints> list = dklMonitoringPointsService.selectDklMonitoringPointsList(dklMonitoringPoints);
-        return getDataTable(list);
-    }
-    /**
-     * 导出监控点信息列表
-     */
-    @Log(title = "监控点信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, DklMonitoringPoints dklMonitoringPoints) throws KmsSdkException {
-        List<DklMonitoringPoints> list = dklMonitoringPointsService.selectDklMonitoringPointsList(dklMonitoringPoints);
-        ExcelUtil<DklMonitoringPoints> util = new ExcelUtil<DklMonitoringPoints>(DklMonitoringPoints.class);
-        util.exportExcel(response, list, "监控点信息数据");
-    }
-
-    /**
-     * 获取监控点信息详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) throws KmsSdkException {
-        return success(dklMonitoringPointsService.selectDklMonitoringPointsById(id));
-    }
-
-    /**
-     * 新增监控点信息
-     */
-    @Log(title = "监控点信息", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DklMonitoringPoints dklMonitoringPoints) throws KmsSdkException {
-        if(!dklMonitoringPointsService.checkPointsNameUnique(dklMonitoringPoints)){
-            return error("新增监控点信息'" + dklMonitoringPoints.getPointName() + "'失败，名称已存在");
-        }
-        //添加系统信息
-        dklMonitoringPoints.setDelFlag("0");
-        dklMonitoringPoints.setCreateTime(new Date());
-        dklMonitoringPoints.setCreateBy(getUsername());
-        dklMonitoringPoints.setDeptId(getDeptId());
-        dklMonitoringPoints.setUpdateTime(new Date());
-        dklMonitoringPoints.setUpdateBy(getUsername());
-        return toAjax(dklMonitoringPointsService.insertDklMonitoringPoints(dklMonitoringPoints));
-    }
-
-    /**
-     * 修改监控点信息
-     */
-    @Log(title = "监控点信息", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DklMonitoringPoints dklMonitoringPoints) throws KmsSdkException {
-        if (!dklMonitoringPointsService.checkPointsNameUnique(dklMonitoringPoints))
-        {
-            return error("修改监控点信息'" + dklMonitoringPoints.getPointName() + "'失败，名称已存在");
-        }
-        //添加系统信息
-        dklMonitoringPoints.setUpdateTime(new Date());
-        dklMonitoringPoints.setUpdateBy(getUsername());
-        return toAjax(dklMonitoringPointsService.updateDklMonitoringPoints(dklMonitoringPoints));
-    }
-
-    /**
-     * 删除监控点信息
-     */
-    @Log(title = "监控点信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable int[] ids)
-    {
-        return toAjax(dklMonitoringPointsService.deleteDklMonitoringPointsByIds(ids));
-    }
-
-    @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response)
-    {
-        ExcelUtil<DklMonitoringPoints> util = new ExcelUtil<DklMonitoringPoints>(DklMonitoringPoints.class);
-        util.importTemplateExcel(response, "监控点信息数据");
-    }
-
-    @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file) throws Exception
-    {
-        ExcelUtil<DklMonitoringPoints> util = new ExcelUtil<DklMonitoringPoints>(DklMonitoringPoints.class);
-        List<DklMonitoringPoints> monitoringPointsList = util.importExcel(file.getInputStream());
-        String operName = getUsername();
-        String message = dklMonitoringPointsService.importDate(monitoringPointsList, operName);
-        return success(message);
-    }
-}
diff --git a/Dkl-Vue-master/dkl-large/src/main/java/com/dkl/large/controller/screen/ScreenController.java b/Dkl-Vue-master/dkl-large/src/main/java/com/dkl/large/controller/screen/ScreenController.java
deleted file mode 100644
index d9ef9e1..0000000
--- a/Dkl-Vue-master/dkl-large/src/main/java/com/dkl/large/controller/screen/ScreenController.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package com.dkl.large.controller.screen;
-
-import com.koal.kms.sdk.ed.KmsSdkException;
-import com.dkl.common.annotation.DataScope;
-import com.dkl.common.core.controller.BaseController;
-import com.dkl.common.core.page.TableDataInfo;
-import com.dkl.large.domain.*;
-import com.dkl.large.domain.vo.*;
-import com.dkl.large.service.*;
-import com.dkl.large.service.IDklActivityService;
-import com.dkl.large.service.IDklMonitoringPointsService;
-import com.dkl.large.service.IDklSecurityEquipmentService;
-import com.dkl.large.service.IDklSecurityPersonnelService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 大屏Controller
- *
- * @author Dkl
- * @date 2025-05-27
- */
-@RestController
-@RequestMapping("/large/screen")
-public class ScreenController extends BaseController
-{
-    @Autowired
-    private IDklActivityService dklActivityService;
-
-    @Autowired
-    private IDklSecurityEquipmentService dklSecurityEquipmentService;
-
-    @Autowired
-    private IDklSecurityPersonnelService dklSecurityPersonnelService;
-
-    @Autowired
-    private IDklMonitoringPointsService dklMonitoringPointsService;
-
-    @Autowired
-    private IDklWarningInformationService iDklWarningInformationService;
-
-    @Autowired
-    private IDklMonitoringCameraService dklMonitoringCameraService;
-    /**
-     * 获取所有活动点位
-     */
-    @GetMapping("/ativityMap")
-    public TableDataInfo list(DklActivity dklActivity) throws KmsSdkException {
-        dklActivity.setDelFlag("0");
-        List<DklActivity> list = dklActivityService.selectDklActivityList(dklActivity);
-        return getDataTable(list);
-    }
-
-    /**
-     * @Author :rq
-     * @Description :大屏预警信息统计
-     * @Date :2025/06/09 10:22
-     * @Param :[]
-     * @return :java.util.List<com.dkl.large.domain.DklActivity>
-     **/
-   @GetMapping("/ativityEarlyWarning")
-   public TableDataInfo ativityEarlyWarning(DklActivity dklActivity)
-   {
-       List<DklActivity> list = dklActivityService.ativityEarlyWarning(dklActivity);
-       return getDataTable(list);
-   }
-//    /**
-//     * @Author :rq
-//     * @Description :大屏重点场所热力图/景区热力图
-//     * @Date :2025/06/09 10:22
-//     * @Param :[]
-//     * @return :java.util.List<com.dkl.large.domain.DklActivity>
-//     **/
-//    @GetMapping("/thermogramStatistics")
-//    public TableDataInfo thermogramStatistics(DklActivity dklActivity)
-//    {
-//        List<DklActivity> list = dklActivityService.thermogramStatistics(dklActivity);
-//        return getDataTable(list);
-//    }
-
-
-    /**
-     * @Author :rq
-     * @Description :预警信息点位
-     * @Date :2025/06/18 09:35
-     * @Param :[dklWarningInformation]
-     * @return :com.dkl.common.core.page.TableDataInfo
-     **/
-
-    @GetMapping("/warningMapList")
-    public TableDataInfo warningMapList(DklWarningInformation dklWarningInformation)
-    {
-        dklWarningInformation.setDelFlag("0");
-        dklWarningInformation.setWarningStatus("1");
-        List<DklWarningInformation> list = iDklWarningInformationService.selectDklWarningInformationLists(dklWarningInformation);
-        return getDataTable(list);
-    }
-
-//    /**
-//     * @Author :rq
-//     * @Description :大客流总数区域展示
-//     * @Date :2025/06/09 15:42
-//     * @Param :[dklActivity]
-//     * @return :java.util.List<com.dkl.large.domain.DklActivity>
-//     **/
-//    @GetMapping("/regionalStatistics")
-//    public TableDataInfo regionalStatistics(DklActivity dklActivity)
-//    {
-//        List<DklActivity> list = dklActivityService.regionalStatistics(dklActivity);
-//        return getDataTable(list);
-//    }
-
-    /**
-     * @Author :Falling
-     * @Description :安保力量点位(物)
-     * @Date :2025/06/16
-     * @Param :[dklSecurityEquipment]
-     * @return :java.util.List<com.dkl.large.domain.dklSecurityEquipment>
-     **/
-    @GetMapping("/equipmentList")
-    public TableDataInfo equipmentMapList(DklSecurityEquipment dklSecurityEquipment) throws KmsSdkException {
-        dklSecurityEquipment.setDelFlag("0");
-        List<DklSecurityEquipment> list = dklSecurityEquipmentService.selectDklSecurityEquipmentList(dklSecurityEquipment);
-        return getDataTable(list);
-    }
-
-    /**
-     * @Author :Falling
-     * @Description :安保力量点位(人员)
-     * @Date :2025/06/16
-     * @Param :[dklSecurityPersonnel]
-     * @return :java.util.List<com.dkl.large.domain.dklSecurityPersonnel>
-     **/
-    @GetMapping("/personnelList")
-    public TableDataInfo personnelMapList(DklSecurityPersonnel dklSecurityPersonnel) throws KmsSdkException {
-        dklSecurityPersonnel.setDelFlag("0");
-        List<DklSecurityPersonnel> list = dklSecurityPersonnelService.selectDklSecurityPersonnelList(dklSecurityPersonnel);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * @Author :Falling
-     * @Description :监控点点位
-     * @Date :2025/06/16
-     * @Param :[dklMonitoringPoints]
-     * @return :java.util.List<com.dkl.large.domain.dklMonitoringPoints>
-     **/
-    @GetMapping("/pointsMap")
-    public TableDataInfo pointsMapList(DklMonitoringPoints dklMonitoringPoints) throws KmsSdkException {
-        dklMonitoringPoints.setDelFlag("0");
-        List<DklMonitoringPoints> list = dklMonitoringPointsService.selectDklMonitoringPointsList(dklMonitoringPoints);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * @Author :Falling
-     * @Description :热力图(重点场所/交通枢纽/景区)
-     * @Date :2025/06/16
-     * @Param :[dataVo]
-     * @return :java.util.List<com.dkl.large.domain.DklMonitoringCameraDataVo>
-     **/
-    @GetMapping("/heatMap")
-    public TableDataInfo heatMap(HeatVo dataVo)
-    {
-        List<HeatVo> list = dklMonitoringPointsService.heatMap(dataVo);
-        return getDataTable(list);
-    }
-
-    /**
-     * @Author :Falling
-     * @Description :大客流总数区域展示
-     * @Date :2025/06/18
-     * @Param :[RegionalVo]
-     * @return :java.util.List<com.dkl.large.domain.vo.RegionalVo>
-     **/
-    @GetMapping("/regionalStatistics")
-    public TableDataInfo regionalStatistics(RegionalVo regionalVo)
-    {
-        List<RegionalVo> list = dklMonitoringPointsService.regionalStatistics(regionalVo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * @Author :Falling
-     * @Description :大客流总数区域数据展示
-     * @Date :2025/06/18
-     * @Param :[RegionalVo]
-     * @return :java.util.List<com.dkl.large.domain.DklMonitoringCameraData>
-     **/
-    @GetMapping("/regionalDataList")
-    public TableDataInfo regionalDataList(RegionalVo regionalVo) throws KmsSdkException {
-        startPage();
-        List<DklMonitoringPoints> list = dklMonitoringPointsService.regionalDataList(regionalVo);
-        return getDataTable(list);
-    }
-
-    /**
-     * @Author :Falling
-     * @Description :大客流风险预警信息
-     * @Date :2025/06/18
-     * @Param :[RegionalVo]
-     * @return :java.util.List<com.dkl.large.domain.DklMonitoringCameraData>
-     **/
-    @GetMapping("/riskDataList")
-    public TableDataInfo riskDataList(RiskVo riskVo)
-    {
-        List<RiskVo> list = dklMonitoringPointsService.riskDataList(riskVo);
-        return getDataTable(list);
-    }
-
-    /**
-     * @Author :rq
-     * @Description : 大屏部门下拉框展示
-     * @Date :2025/07/07 16:10
-     * @Param :[DeptWwsVo]
-     * @return :com.dkl.common.core.page.TableDataInfo
-     **/
-    @GetMapping("/getDeptOfWws")
-    public TableDataInfo getDeptOfWws()
-    {
-        List<DeptWwsVo> list = dklMonitoringCameraService.getDeptOfWws();
-        return getDataTable(list);
-    }
-
-    /**
-     * @Author :rq
-     * @Description : 获取视频url
-     * @Date :2025/07/07 16:17
-     * @Param :[DeptWwsVo]
-     * @return :com.dkl.common.core.page.TableDataInfo
-     **/
-    @GetMapping("/getDeptOfWwsUrl")
-    public TableDataInfo getDeptOfWwsUrl(DeptWwsVo deptWwsVo) throws Exception {
-        List<DeptWwsVo> list = dklMonitoringCameraService.getDeptOfWwsUrl(deptWwsVo);
-        return getDataTable(list);
-    }
-
-}
diff --git a/Dkl-Vue-master/dkl-large/src/main/java/com/dkl/large/domain/DklMonitoringPoints.java b/Dkl-Vue-master/dkl-large/src/main/java/com/dkl/large/domain/DklMonitoringPoints.java
new file mode 100644
index 0000000..c8b3dcc
--- /dev/null
+++ b/Dkl-Vue-master/dkl-large/src/main/java/com/dkl/large/domain/DklMonitoringPoints.java
@@ -0,0 +1,90 @@
+package com.dkl.large.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.dkl.common.annotation.Excel;
+import com.dkl.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 监控点信息对象 dkl_monitoring_points
+ *
+ * @author Dkl
+ * @date 2025-06-10
+ */
+@Data
+public class DklMonitoringPoints extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private int id;
+
+    /** 监控点类型 */
+//    @Excel(name = "监控点类型")
+    private String monitoringType;
+    @Excel(name = "监控点类型")
+    private String monitoringTypeName;
+    /** 名称 */
+    @Excel(name = "名称")
+    private String pointName;
+
+    /** 区域 */
+//    @Excel(name = "区域")
+    private String pointRegion;
+    /** 区域名称 */
+    @Excel(name = "区域")
+    @TableField(exist = false)
+    private String regionname;
+    /** 值班人员 */
+    @Excel(name = "值班人员")
+    private String dutyPeople;
+
+    /** 值班联系方式 */
+    @Excel(name = "值班联系方式")
+    private String dutyPhone;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String pointAddress;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String lng;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private String lat;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 最大承载量 */
+    @Excel(name = "最大承载量")
+    private Long loadBearingMax;
+
+    /** 部门id*/
+    private Long deptId;
+
+    /** 开始时间 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /** 结束时间 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    /** 是否为风险点 */
+    @Excel(name = "风险点", readConverterExp = "Y=是,N=否")
+    private String isRisk;
+
+    private String sigenCode;
+
+
+}