fix

zhanzhiqin

2022-04-27 0064fa7e640994b361d34fef55e13a9d0157f8bd

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java

@@ -117,7 +117,7 @@
                );
                for (LightReportData lightReportData : reportDataList) {
                    if (StrUtil.equals(lightBo.getDeviceCode(), lightReportData.getDeviceCode())) {
                        lightBo.setReportTime(lightReportData.getCreateTime());
                        lightBo.setReportTime(lightReportData.getCreateTime1());
                        break;
                    }
                }
@@ -471,15 +471,15 @@
    /**
     * 获取用户所有的设备码
     */
    public CommonPage<String> listDeviceCode(int pageNo, int pageSize) {
    public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode) {
        List<String> list;
        if (SecurityUtils.getClientId() != null) {
            PageHelper.startPage(pageNo, pageSize);
            list = baseMapper.listCode(SecurityUtils.getUserId());
            list = baseMapper.listCode(SecurityUtils.getUserId(), keyword, deviceCode);
        } else {

            PageHelper.startPage(pageNo, pageSize);
            list = baseMapper.listCode(null);
            list = baseMapper.listCode(null, keyword, deviceCode);
        }

        return CommonPage.restPage(list);