diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/controller/MonitoringitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/controller/MonitoringitemController.java index 24d15db7..3317990f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/controller/MonitoringitemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/controller/MonitoringitemController.java @@ -35,10 +35,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @@ -132,7 +129,12 @@ public class MonitoringitemController { return ActionResult.success("成功"); } - + @ApiOperation("移动端视频流地址获取") + @PostMapping("/getMobileList") + public ActionResult list(){ + List> list = monitoringitemService.getMonitoringitemList(); + return ActionResult.success(list); + } /** * 列表 @@ -141,6 +143,7 @@ public class MonitoringitemController { * @return */ @PostMapping("/getList") + @ApiOperation("列表") public ActionResult list(@RequestBody MonitoringitemPagination monitoringitemPagination)throws IOException{ List list= monitoringitemService.getList(monitoringitemPagination); //处理id字段转名称,若无需转或者为空可删除 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/mapper/MonitoringitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/mapper/MonitoringitemMapper.java index 5b86e2d8..14241b74 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/mapper/MonitoringitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/mapper/MonitoringitemMapper.java @@ -4,6 +4,9 @@ package jnpf.monitoringitem.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.monitoringitem.entity.MonitoringitemEntity; +import java.util.HashMap; +import java.util.List; + /** * * 监控清单 @@ -13,5 +16,5 @@ import jnpf.monitoringitem.entity.MonitoringitemEntity; * 日期: 2023-02-13 */ public interface MonitoringitemMapper extends BaseMapper { - + List> getMonitorItemList(); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/MonitoringitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/MonitoringitemService.java index 2fe34944..144420b2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/MonitoringitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/MonitoringitemService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import jnpf.monitoringitem.entity.MonitoringitemEntity; import jnpf.monitoringitem.model.monitoringitem.MonitoringitemPagination; +import java.util.HashMap; import java.util.List; /** * @@ -20,7 +21,7 @@ public interface MonitoringitemService extends IService { List getTypeList(MonitoringitemPagination monitoringitemPagination,String dataType); - + List> getMonitoringitemList(); MonitoringitemEntity getInfo(String id); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java index 04ab7fce..b2ee908b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java @@ -18,8 +18,10 @@ import jnpf.util.UserProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; /** @@ -40,7 +42,8 @@ public class MonitoringitemServiceImpl extends ServiceImpl> getMonitoringitemList() { + return monitoringitemMapper.getMonitorItemList(); + } + @Override public MonitoringitemEntity getInfo(String id){ QueryWrapper queryWrapper=new QueryWrapper<>(); diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/monitorItem/Monitoring_itemMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/monitorItem/Monitoring_itemMapper.xml index 4373b705..3ea3fceb 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/monitorItem/Monitoring_itemMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/monitorItem/Monitoring_itemMapper.xml @@ -2,5 +2,29 @@ + + + + + + + + + + + + + + + + + + + + + +