fuliqi
2024-08-06 fa12bf28a088fe8cc82868fab9a9d689252108a3
Monitor结构更新2
5个文件已修改
11 ■■■■ 已修改文件
ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
@@ -34,7 +34,7 @@
     */
   @PreAuthorize("@ss.hasPermi('system:monitor:list')")
    @GetMapping("/list")
    public TableDataInfo list(TMonitor tMonitor)
    public TableDataInfo list(TMonitorVO tMonitor)
    {
        startPage();
        List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
@@ -47,7 +47,7 @@
   @PreAuthorize("@ss.hasPermi('system:monitor:export')")
    @Log(title = "设备资产", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, TMonitor tMonitor)
    public void export(HttpServletResponse response, TMonitorVO tMonitor)
    {
        List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
        ExcelUtil<TMonitorVO> util = new ExcelUtil<TMonitorVO>(TMonitorVO.class);
ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -30,7 +30,7 @@
     * @param tMonitor 设备资产
     * @return 设备资产集合
     */
    public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor);
    public List<TMonitorVO> selectTMonitorList(TMonitorVO tMonitor);
    /**
     * 新增设备资产
ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
@@ -30,7 +30,7 @@
     * @param tMonitor 设备资产
     * @return 设备资产集合
     */
    public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor);
    public List<TMonitorVO> selectTMonitorList(TMonitorVO tMonitor);
    /**
     * 新增设备资产
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -52,7 +52,7 @@
     */
    @Override
    @DataScope(deptAlias = "d",userAlias = "u")
    public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor)
    public List<TMonitorVO> selectTMonitorList(TMonitorVO tMonitor)
    {
        List<TMonitorVO> monitors = tMonitorMapper.selectTMonitorList(tMonitor);
        if (Objects.equals(tMonitor.getRecovery(), 1)) {
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -86,6 +86,7 @@
            #{id}
        </foreach>
    </select>
    <select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
        select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
        camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working,