From c1518fadb88e4012c25788190843d8708a2e0cc4 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 17 Jan 2022 13:16:04 +0800
Subject: [PATCH] 根据组织id获取站点和设备，service_scope_device相关文件
---
screen-manage/src/main/java/com/moral/api/service/ServicesScopeDeviceService.java | 16 +++++
screen-manage/src/main/java/com/moral/api/entity/ServicesScopeDevice.java | 62 ++++++++++++++++++++
screen-manage/src/main/java/com/moral/api/service/DeviceService.java | 9 +++
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 29 ++++++++-
screen-manage/src/main/java/com/moral/api/service/impl/ServicesScopeDeviceServiceImpl.java | 20 ++++++
screen-manage/src/main/resources/mapper/ServicesScopeDeviceMapper.xml | 15 +++++
screen-manage/src/main/java/com/moral/api/mapper/ServicesScopeDeviceMapper.java | 16 +++++
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 8 ++
8 files changed, 170 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
index 02d8393..c4e303c 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
@@ -262,4 +262,12 @@
List<Map<String, Object>> professions = deviceService.selectDeviceDictData(Constants.SYSTEM_DICT_TYPE_PURCHASER);
return ResultMessage.ok(professions);
}
+
+ @RequestMapping(value = "selectMonitorPiontAndDeviceByOrgId", method = RequestMethod.GET)
+ public ResultMessage selectMonitorPiontAndDeviceByOrgId(HttpServletRequest request){
+ Map parames = WebUtils.getParametersStartingWith(request,null);
+ int id = Integer.parseInt(parames.get("organization_id").toString());
+ List<Map<String, Object>> maps = deviceService.selectMonitorPiontAndDeviceByOrgId(id);
+ return ResultMessage.ok(maps);
+ }
}
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ServicesScopeDevice.java b/screen-manage/src/main/java/com/moral/api/entity/ServicesScopeDevice.java
new file mode 100644
index 0000000..2f301b0
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/entity/ServicesScopeDevice.java
@@ -0,0 +1,62 @@
+package com.moral.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author moral
+ * @since 2022-01-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ServicesScopeDevice extends Model<ServicesScopeDevice> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * ������������id
+ */
+ private Integer servicesScopeId;
+
+ /**
+ * ������id
+ */
+ private Integer deviceId;
+
+ /**
+ * ������������
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * ������������
+ */
+ private LocalDateTime updateTime;
+
+ /**
+ * ������������
+ */
+ private String isDelete;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/ServicesScopeDeviceMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/ServicesScopeDeviceMapper.java
new file mode 100644
index 0000000..2eabe2e
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/mapper/ServicesScopeDeviceMapper.java
@@ -0,0 +1,16 @@
+package com.moral.api.mapper;
+
+import com.moral.api.entity.ServicesScopeDevice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper ������
+ * </p>
+ *
+ * @author moral
+ * @since 2022-01-17
+ */
+public interface ServicesScopeDeviceMapper extends BaseMapper<ServicesScopeDevice> {
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
index e22ba74..e8fd83c 100644
--- a/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/DeviceService.java
@@ -64,4 +64,13 @@
//���������������������������
void judgeDeviceState(Map<String, Object> data);
+ /**
+ *@Description: ������������id���������������������
+ *@Param: [orgId]
+ *@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+ *@Author: lizijie
+ *@Date: 2022/1/17 10:30
+ **/
+ List<Map<String,Object>> selectMonitorPiontAndDeviceByOrgId(int orgId);
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/ServicesScopeDeviceService.java b/screen-manage/src/main/java/com/moral/api/service/ServicesScopeDeviceService.java
new file mode 100644
index 0000000..393c444
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/service/ServicesScopeDeviceService.java
@@ -0,0 +1,16 @@
+package com.moral.api.service;
+
+import com.moral.api.entity.ServicesScopeDevice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * ���������
+ * </p>
+ *
+ * @author moral
+ * @since 2022-01-17
+ */
+public interface ServicesScopeDeviceService extends IService<ServicesScopeDevice> {
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 03a4812..d4269f1 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -35,11 +36,7 @@
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
@@ -522,6 +519,28 @@
deviceMapper.update(null, updateWrapper);
}
+ @Override
+ public List<Map<String, Object>> selectMonitorPiontAndDeviceByOrgId(int orgId) {
+ QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
+ monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ monitorPointQueryWrapper.eq("organization_id",orgId);
+ List<MonitorPoint> monitorPointList = monitorPointMapper.selectList(monitorPointQueryWrapper);
+ List<Map<String, Object>> resultList = new ArrayList<>();
+ for (MonitorPoint monitorPoint:monitorPointList) {
+ Map<String,Object> resultMap = new HashMap<>();
+ resultMap = JSON.parseObject(JSON.toJSONString(monitorPoint), Map.class);
+ int mp_id = monitorPoint.getId();
+ QueryWrapper<Device> deviceQueryWrapper = new QueryWrapper<>();
+ deviceQueryWrapper.eq("is_delete", Constants.NOT_DELETE);
+ deviceQueryWrapper.eq("monitor_point_id",mp_id);
+ List<Device> devices = new ArrayList<>();
+ devices = deviceMapper.selectList(deviceQueryWrapper);
+ resultMap.put("devices",devices);
+ resultList.add(resultMap);
+ }
+ return resultList;
+ }
+
//���������������������������
private int judgeState(List<Object> levels, Double data) {
int state = 1;
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ServicesScopeDeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ServicesScopeDeviceServiceImpl.java
new file mode 100644
index 0000000..4dbe38a
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ServicesScopeDeviceServiceImpl.java
@@ -0,0 +1,20 @@
+package com.moral.api.service.impl;
+
+import com.moral.api.entity.ServicesScopeDevice;
+import com.moral.api.mapper.ServicesScopeDeviceMapper;
+import com.moral.api.service.ServicesScopeDeviceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * ���������������
+ * </p>
+ *
+ * @author moral
+ * @since 2022-01-17
+ */
+@Service
+public class ServicesScopeDeviceServiceImpl extends ServiceImpl<ServicesScopeDeviceMapper, ServicesScopeDevice> implements ServicesScopeDeviceService {
+
+}
diff --git a/screen-manage/src/main/resources/mapper/ServicesScopeDeviceMapper.xml b/screen-manage/src/main/resources/mapper/ServicesScopeDeviceMapper.xml
new file mode 100644
index 0000000..9bfd9fa
--- /dev/null
+++ b/screen-manage/src/main/resources/mapper/ServicesScopeDeviceMapper.xml
@@ -0,0 +1,15 @@
+<?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.moral.api.mapper.ServicesScopeDeviceMapper">
+
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.ServicesScopeDevice">
+ <id column="id" property="id" />
+ <result column="services_scope_id" property="servicesScopeId" />
+ <result column="device_id" property="deviceId" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="is_delete" property="isDelete" />
+ </resultMap>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0