监控站页面布局返回接口 优化

fengxiang

2018-07-03 a370cd1277689094b126eb6f0490c4ba69c7baee

监控站页面布局返回接口 优化

 src/main/java/com/moral/controller/ScreenController.java

@@ -599,7 +599,7 @@


        } else {

            MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(Integer.parseInt(primaryKey));

            List<DeviceVersion> versionList = deviceVersionService.queryByOrgId(monitorPoint.getOrganizationId());

            List<DeviceVersion> versionList = deviceVersionService.queryByMpointId(monitorPoint.getId());

            if(versionList.size() > 0) {

            List<Integer> versionNolist =    versionList.stream().map(item -> {

                    return  item.getVersion();


 src/main/java/com/moral/mapper/DeviceVersionMapper.java

@@ -7,4 +7,6 @@

public interface DeviceVersionMapper extends BaseMapper<DeviceVersion> {
    public List<DeviceVersion> selectListByOrgId(Integer orgId);
    // 获取监控点下所有设备型号集合
    public List<DeviceVersion> selectListByMpointId(Integer orgId);
}

 src/main/java/com/moral/service/DeviceVersionService.java

@@ -18,5 +18,7 @@

    List<DeviceVersion> queryByOrgId(Integer organizationId);

    List<DeviceVersion> queryByMpointId(Integer mpointId);

    DeviceVersion queryVersionById(Integer versionId);
}

 src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java

@@ -85,6 +85,10 @@
      public  List<DeviceVersion> queryByOrgId(Integer organizationId){
            return  this.deviceVersionMapper.selectListByOrgId(organizationId);
      }
      @Override
      public  List<DeviceVersion> queryByMpointId(Integer mpointId){
            return  this.deviceVersionMapper.selectListByMpointId(mpointId);
      }

      @Override
      public DeviceVersion queryVersionById(Integer versionId) {

 src/main/resources/mapper/DeviceVersionMapper.xml

@@ -32,4 +32,20 @@
              )
          order by dvn.create_time desc
  </select>
    <select id="selectListByMpointId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
        SELECT
        *
        FROM
        device_version dvn
        WHERE
        dvn.id IN (
        SELECT DISTINCT
        dev.device_version_id
        FROM
        device dev
        WHERE
        dev.monitor_point_id = #{mpointId,jdbcType=VARCHAR}
        )
        order by dvn.create_time desc
    </select>
</mapper>