fix
This commit is contained in:
parent
4f7d272cac
commit
064a5710ba
|
|
@ -43,6 +43,15 @@ public class DevInfoController extends BaseController
|
|||
return getDataTable(list);
|
||||
}
|
||||
|
||||
@RequiresPermissions("equip:info:list")
|
||||
@GetMapping("/hotList")
|
||||
public TableDataInfo hotList(DevInfoVo devInfo)
|
||||
{
|
||||
startPage(1, 3);
|
||||
List<DevInfoVo> list = devInfoService.selectDevInfoHotList(devInfo);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出设备信息列表
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -40,6 +40,8 @@ public interface DevInfoMapper
|
|||
*/
|
||||
public List<DevInfoVo> selectDevInfoList(DevInfo devInfo);
|
||||
|
||||
public List<DevInfoVo> selectDevInfoHotList(DevInfo devInfo);
|
||||
|
||||
/**
|
||||
* 新增设备信息
|
||||
*
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@ public interface IDevInfoService
|
|||
*/
|
||||
public List<DevInfoVo> selectDevInfoList(DevInfoVo devInfo);
|
||||
|
||||
public List<DevInfoVo> selectDevInfoHotList(DevInfoVo devInfo);
|
||||
|
||||
/**
|
||||
* 新增设备信息
|
||||
*
|
||||
|
|
|
|||
|
|
@ -80,6 +80,12 @@ public class DevInfoServiceImpl implements IDevInfoService
|
|||
return devInfoMapper.selectDevInfoList(devInfo);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DevInfoVo> selectDevInfoHotList(DevInfoVo devInfo)
|
||||
{
|
||||
return devInfoMapper.selectDevInfoHotList(devInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增设备信息
|
||||
*
|
||||
|
|
|
|||
|
|
@ -87,6 +87,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectDevInfoHotList" parameterType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo" resultType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo">
|
||||
select d.*,t.type_name as device_name,t.parent_name as group_name,c.company_name,search_num
|
||||
from ma_dev_info d
|
||||
left join (select t.*, p.type_name as parent_name
|
||||
from ma_type_info t
|
||||
left join ma_type_info p on t.parent_id=p.type_id) t on d.type_id = t.type_id
|
||||
left join bm_company_info c on d.own_co = c.company_id
|
||||
left join ma_hot_search h on d.ma_id = h.ma_id
|
||||
order by h.search_num
|
||||
</select>
|
||||
|
||||
<select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo">
|
||||
select d.*,c.company_name,c.create_time as company_create_time,c.logo_url as company_logo_url,
|
||||
c.auth_phone,ty.type_name as device_name,
|
||||
|
|
|
|||
Loading…
Reference in New Issue