screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | ●●●●● patch | view | raw | blame | history | |
screen-manage/src/main/java/com/moral/api/entity/ServicesScopeDevice.java | ●●●●● patch | view | raw | blame | history | |
screen-manage/src/main/java/com/moral/api/mapper/ServicesScopeDeviceMapper.java | ●●●●● patch | view | raw | blame | history | |
screen-manage/src/main/java/com/moral/api/service/DeviceService.java | ●●●●● patch | view | raw | blame | history | |
screen-manage/src/main/java/com/moral/api/service/ServicesScopeDeviceService.java | ●●●●● patch | view | raw | blame | history | |
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | ●●●●● patch | view | raw | blame | history | |
screen-manage/src/main/java/com/moral/api/service/impl/ServicesScopeDeviceServiceImpl.java | ●●●●● patch | view | raw | blame | history | |
screen-manage/src/main/resources/mapper/ServicesScopeDeviceMapper.xml | ●●●●● patch | view | raw | blame | history |
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); } } screen-manage/src/main/java/com/moral/api/entity/ServicesScopeDevice.java
New file @@ -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; } } screen-manage/src/main/java/com/moral/api/mapper/ServicesScopeDeviceMapper.java
New file @@ -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> { } 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); } screen-manage/src/main/java/com/moral/api/service/ServicesScopeDeviceService.java
New file @@ -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> { } 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; screen-manage/src/main/java/com/moral/api/service/impl/ServicesScopeDeviceServiceImpl.java
New file @@ -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 { } screen-manage/src/main/resources/mapper/ServicesScopeDeviceMapper.xml
New file @@ -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>