diff --git a/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java b/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java index 98b0424..5cbf221 100644 --- a/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java +++ b/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java @@ -21,7 +21,6 @@ public interface DeviceMapper extends BaseMapper { int deleteByPrimaryKey(String uuid); - int insert(Device record); int insertSelective(Device record); @@ -69,4 +68,4 @@ public interface DeviceMapper extends BaseMapper { void updateDevice(Device device); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java index f55fdf1..6cac2d0 100644 --- a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java +++ b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java @@ -371,7 +371,7 @@ public class DeviceDownloadService { int page = 1; while (page <= totalPage) { List list = deviceRecordKeys.stream().skip((page - 1) * limit).limit(limit).collect(Collectors.toList()); - DataSetTotalResult res = getHistoryData(list); + DataSetTotalResult res = getHistoryData1(list); if (res.getCode() != 1) return res; if (res.getData() != null && res.getData().size() > 0) { @@ -393,7 +393,7 @@ public class DeviceDownloadService { * @param deviceRecordKeys * @return */ - public DataSetTotalResult getHistoryData(List deviceRecordKeys) { + public DataSetTotalResult getHistoryData1(List deviceRecordKeys) { DataSetTotalResult results = new DataSetTotalResult(); String historyUrl = "sharing/history/get"; int page = 1; @@ -485,7 +485,7 @@ public class DeviceDownloadService { } } if (keyList.size() > 0) { - DataSetTotalResult res = getHistoryData(keyList); + DataSetTotalResult res = getHistoryData1(keyList); if (res.getCode() == 1) { if (res.getData().size() > 0) { int count = result.getTotalRecordCount(); diff --git a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSyncService.java b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSyncService.java index cf668cb..98c859d 100644 --- a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSyncService.java +++ b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSyncService.java @@ -69,39 +69,39 @@ public class DeviceSyncService { } int insertCount = deviceSaveService.DeviceSave(result.getData(), DateUtil.parseDate(rangeValue), dlType); //2.下载历史记录 - List keyList = new ArrayList(); - for (DataSetResult.DataSet ds : result.getData()) { - List list = ds.getDeviceInfo(); - if (list != null && list.size() > 0) { - for (DataSetResult.DeviceInfo deviceInfo : list) - keyList.add(deviceInfo.getDeviceRecordKey()); - } - } - if (keyList.size() > 0) { - DataSetTotalResult res = deviceDownloadService.getHistoryData2(keyList); - if (res.getCode() == 1) { - if (res.getData() != null && res.getData().size() > 0) { - int count = result.getTotalRecordCount(); - count = count + res.getTotalRecordCount(); - result.setTotalRecordCount(count); - List data = result.getData(); - data.addAll(res.getData()); - result.setData(data); - int hisInsertCount = deviceSaveService.DeviceSave(res.getData(), null, dlType); - insertCount = insertCount + hisInsertCount; - } - } else { - JobLog jobLog = new JobLog(); - jobLog.setDownloadType(downloadType); - jobLog.setTaskType(Constant.JOB_TASK_TYPE_DOWNLOAD); - jobLog.setDownloadDate(DateUtil.parseDate(rangeValue)); - jobLog.setType(Constant.LOG_TYPE_ERROR); - jobLog.setMsg("下载历史记录出错:" + res.getMsg()); - jobLog.setCreateTime(new Date()); - jobLogService.insert(jobLog); - } - - } +// List keyList = new ArrayList(); +// for (DataSetResult.DataSet ds : result.getData()) { +// List list = ds.getDeviceInfo(); +// if (list != null && list.size() > 0) { +// for (DataSetResult.DeviceInfo deviceInfo : list) +// keyList.add(deviceInfo.getDeviceRecordKey()); +// } +// } +// if (keyList.size() > 0) { +// DataSetTotalResult res = deviceDownloadService.getHistoryData2(keyList); +// if (res.getCode() == 1) { +// if (res.getData() != null && res.getData().size() > 0) { +// int count = result.getTotalRecordCount(); +// count = count + res.getTotalRecordCount(); +// result.setTotalRecordCount(count); +// List data = result.getData(); +// data.addAll(res.getData()); +// result.setData(data); +// int hisInsertCount = deviceSaveService.DeviceSave(res.getData(), null, dlType); +// insertCount = insertCount + hisInsertCount; +// } +// } else { +// JobLog jobLog = new JobLog(); +// jobLog.setDownloadType(downloadType); +// jobLog.setTaskType(Constant.JOB_TASK_TYPE_DOWNLOAD); +// jobLog.setDownloadDate(DateUtil.parseDate(rangeValue)); +// jobLog.setType(Constant.LOG_TYPE_ERROR); +// jobLog.setMsg("下载历史记录出错:" + res.getMsg()); +// jobLog.setCreateTime(new Date()); +// jobLogService.insert(jobLog); +// } +// +// } JobLog jobLog = new JobLog(); jobLog.setDownloadType(downloadType); @@ -201,18 +201,18 @@ public class DeviceSyncService { } - public void dlHistory(DataSetSingleResult result1) { - - DataSetSingleHistoryResult result = new DataSetSingleHistoryResult(); - result.setDataSet(result1.getDataSet()); - if (result1.getDataSet().getDeviceInfo() != null && result1.getDataSet().getDeviceInfo().size() > 0) { - List keyList = deviceDownloadService.getKeyList(result1.getDataSet()); - if (keyList.size() > 0) { - DataSetTotalResult result2 = deviceDownloadService.getHistoryData(keyList); - result.setDataList(result2.getData()); - } - } - } +// public void dlHistory(DataSetSingleResult result1) { +// +// DataSetSingleHistoryResult result = new DataSetSingleHistoryResult(); +// result.setDataSet(result1.getDataSet()); +// if (result1.getDataSet().getDeviceInfo() != null && result1.getDataSet().getDeviceInfo().size() > 0) { +// List keyList = deviceDownloadService.getKeyList(result1.getDataSet()); +// if (keyList.size() > 0) { +// DataSetTotalResult result2 = deviceDownloadService.getHistoryData(keyList); +// result.setDataList(result2.getData()); +// } +// } +// } public BaseResponse downloadByDi(String deviceId) { DataSetSingleResult result1 = deviceDownloadService.downloadByDi(deviceId); @@ -220,13 +220,13 @@ public class DeviceSyncService { return ResultVOUtils.error(-1, result1.getReturnMsg()); DataSetSingleHistoryResult result = new DataSetSingleHistoryResult(); result.setDataSet(result1.getDataSet()); - if (result1.getDataSet().getDeviceInfo() != null && result1.getDataSet().getDeviceInfo().size() > 0) { - List keyList = deviceDownloadService.getKeyList(result1.getDataSet()); - if (keyList.size() > 0) { - DataSetTotalResult result2 = deviceDownloadService.getHistoryData(keyList); - result.setDataList(result2.getData()); - } - } +// if (result1.getDataSet().getDeviceInfo() != null && result1.getDataSet().getDeviceInfo().size() > 0) { +// List keyList = deviceDownloadService.getKeyList(result1.getDataSet()); +// if (keyList.size() > 0) { +// DataSetTotalResult result2 = deviceDownloadService.getHistoryData(keyList); +// result.setDataList(result2.getData()); +// } +// } List dataSets = new ArrayList<>(); dataSets.add(result1.getDataSet()); deviceSaveService.DeviceSave(dataSets, new Date(), Constant.DL_TYPE_UPDATE); @@ -280,7 +280,7 @@ public class DeviceSyncService { public BaseResponse downloadHistory(String key) { List keyList = new ArrayList<>(); keyList.add(key); - DataSetTotalResult res = deviceDownloadService.getHistoryData(keyList); + DataSetTotalResult res = deviceDownloadService.getHistoryData1(keyList); if (res.getCode() != 1) return ResultVOUtils.error(-1, res.getMsg()); List result = new ArrayList<>(); diff --git a/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml b/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml index 97ee87d..13ca4a9 100644 --- a/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml +++ b/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml @@ -153,42 +153,7 @@ - - insert into device (uuid, deviceRecordKey, btcpbs, - btcpbsyzxxsdycpbssfyz, cgzmraqxgxx, cpbsbmtxmc, - cpbsfbrq, cphhhbh, cplb, - cpmctymc, cpms, flbm, - ggxh, mjfs, qtxxdwzlj, - qxlb, scbssfbhph, scbssfbhscrq, - scbssfbhsxrq, scbssfbhxlh, sfbjwycxsy, - sfwblztlcp, sfwwjbz, sfybtzjbs, - spmc, sydycpbs, syqsfxyjxmj, - tscchcztj, tsccsm, tsrq, - tyshxydm, versionNumber, versionStatus, - versionTime, ybbm, yflbm, - ylqxzcrbarmc, ylqxzcrbarywmc, zczbhhzbapzbh, - zdcfsycs, zxxsdycpbs, bszt, - sfyzcbayz, zcbacpbs, zxxsdyzsydydsl, - deviceHistoryRecordKey, bssjzt, lastModifyTime, requestDate, hchzsb, cplx) - values (#{uuid,jdbcType=VARCHAR}, #{devicerecordkey,jdbcType=VARCHAR}, #{btcpbs,jdbcType=VARCHAR}, - #{btcpbsyzxxsdycpbssfyz,jdbcType=VARCHAR}, #{cgzmraqxgxx,jdbcType=VARCHAR}, - #{cpbsbmtxmc,jdbcType=VARCHAR}, - #{cpbsfbrq,jdbcType=VARCHAR}, #{cphhhbh,jdbcType=VARCHAR}, #{cplb,jdbcType=VARCHAR}, - #{cpmctymc,jdbcType=VARCHAR}, #{cpms,jdbcType=VARCHAR}, #{flbm,jdbcType=VARCHAR}, - #{ggxh,jdbcType=VARCHAR}, #{mjfs,jdbcType=VARCHAR}, #{qtxxdwzlj,jdbcType=VARCHAR}, - #{qxlb,jdbcType=VARCHAR}, #{scbssfbhph,jdbcType=VARCHAR}, #{scbssfbhscrq,jdbcType=VARCHAR}, - #{scbssfbhsxrq,jdbcType=VARCHAR}, #{scbssfbhxlh,jdbcType=VARCHAR}, #{sfbjwycxsy,jdbcType=VARCHAR}, - #{sfwblztlcp,jdbcType=VARCHAR}, #{sfwwjbz,jdbcType=VARCHAR}, #{sfybtzjbs,jdbcType=VARCHAR}, - #{spmc,jdbcType=VARCHAR}, #{sydycpbs,jdbcType=VARCHAR}, #{syqsfxyjxmj,jdbcType=VARCHAR}, - #{tscchcztj,jdbcType=VARCHAR}, #{tsccsm,jdbcType=VARCHAR}, #{tsrq,jdbcType=VARCHAR}, - #{tyshxydm,jdbcType=VARCHAR}, #{versionnumber,jdbcType=VARCHAR}, #{versionstatus,jdbcType=VARCHAR}, - #{versiontime,jdbcType=VARCHAR}, #{ybbm,jdbcType=VARCHAR}, #{yflbm,jdbcType=VARCHAR}, - #{ylqxzcrbarmc,jdbcType=VARCHAR}, #{ylqxzcrbarywmc,jdbcType=VARCHAR}, #{zczbhhzbapzbh,jdbcType=VARCHAR}, - #{zdcfsycs,jdbcType=VARCHAR}, #{zxxsdycpbs,jdbcType=VARCHAR}, #{bszt,jdbcType=VARCHAR}, - #{sfyzcbayz,jdbcType=VARCHAR}, #{zcbacpbs,jdbcType=VARCHAR}, #{zxxsdyzsydydsl,jdbcType=VARCHAR}, - #{devicehistoryrecordkey,jdbcType=VARCHAR}, #{bssjzt,jdbcType=VARCHAR}, - #{lastModifyTime,jdbcType=VARCHAR}, #{requestDate}, #{hchzsb}, #{cplx}) - + insert into device @@ -1104,4 +1069,4 @@ ) - \ No newline at end of file +