UDI
/
udisyncdl-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除历史记录下载

Browse Source
zhairh
anthonywj 2 years ago
parent f272343e92
commit 391accc474
4 changed files with 59 additions and 95 deletions

3
src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java
Unescape Escape View File

@ -21,7 +21,6 @@ public interface DeviceMapper extends BaseMapper<Device> {
int deleteByPrimaryKey(String uuid); int deleteByPrimaryKey(String uuid);
int insert(Device record);
int insertSelective(Device record); int insertSelective(Device record);
@ -69,4 +68,4 @@ public interface DeviceMapper extends BaseMapper<Device> {
void updateDevice(Device device); void updateDevice(Device device);
} }

6
src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java
Unescape Escape View File

@ -371,7 +371,7 @@ public class DeviceDownloadService {
int page = 1; int page = 1;
while (page <= totalPage) { while (page <= totalPage) {
List<String> list = deviceRecordKeys.stream().skip((page - 1) * limit).limit(limit).collect(Collectors.toList()); List<String> list = deviceRecordKeys.stream().skip((page - 1) * limit).limit(limit).collect(Collectors.toList());
DataSetTotalResult res = getHistoryData(list); DataSetTotalResult res = getHistoryData1(list);
if (res.getCode() != 1) if (res.getCode() != 1)
return res; return res;
if (res.getData() != null && res.getData().size() > 0) { if (res.getData() != null && res.getData().size() > 0) {
@ -393,7 +393,7 @@ public class DeviceDownloadService {
* @param deviceRecordKeys * @param deviceRecordKeys
* @return * @return
*/ */
public DataSetTotalResult getHistoryData(List<String> deviceRecordKeys) { public DataSetTotalResult getHistoryData1(List<String> deviceRecordKeys) {
DataSetTotalResult results = new DataSetTotalResult(); DataSetTotalResult results = new DataSetTotalResult();
String historyUrl = "sharing/history/get"; String historyUrl = "sharing/history/get";
int page = 1; int page = 1;
@ -485,7 +485,7 @@ public class DeviceDownloadService {
} }
} }
if (keyList.size() > 0) { if (keyList.size() > 0) {
DataSetTotalResult res = getHistoryData(keyList); DataSetTotalResult res = getHistoryData1(keyList);
if (res.getCode() == 1) { if (res.getCode() == 1) {
if (res.getData().size() > 0) { if (res.getData().size() > 0) {
int count = result.getTotalRecordCount(); int count = result.getTotalRecordCount();

106
src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSyncService.java
Unescape Escape View File

@ -69,39 +69,39 @@ public class DeviceSyncService {
} }
int insertCount = deviceSaveService.DeviceSave(result.getData(), DateUtil.parseDate(rangeValue), dlType); int insertCount = deviceSaveService.DeviceSave(result.getData(), DateUtil.parseDate(rangeValue), dlType);
//2.下载历史记录 //2.下载历史记录
List<String> keyList = new ArrayList<String>(); // List<String> keyList = new ArrayList<String>();
for (DataSetResult.DataSet ds : result.getData()) { // for (DataSetResult.DataSet ds : result.getData()) {
List<DataSetResult.DeviceInfo> list = ds.getDeviceInfo(); // List<DataSetResult.DeviceInfo> list = ds.getDeviceInfo();
if (list != null && list.size() > 0) { // if (list != null && list.size() > 0) {
for (DataSetResult.DeviceInfo deviceInfo : list) // for (DataSetResult.DeviceInfo deviceInfo : list)
keyList.add(deviceInfo.getDeviceRecordKey()); // keyList.add(deviceInfo.getDeviceRecordKey());
} // }
} // }
if (keyList.size() > 0) { // if (keyList.size() > 0) {
DataSetTotalResult res = deviceDownloadService.getHistoryData2(keyList); // DataSetTotalResult res = deviceDownloadService.getHistoryData2(keyList);
if (res.getCode() == 1) { // if (res.getCode() == 1) {
if (res.getData() != null && res.getData().size() > 0) { // if (res.getData() != null && res.getData().size() > 0) {
int count = result.getTotalRecordCount(); // int count = result.getTotalRecordCount();
count = count + res.getTotalRecordCount(); // count = count + res.getTotalRecordCount();
result.setTotalRecordCount(count); // result.setTotalRecordCount(count);
List<DataSetResult.DataSet> data = result.getData(); // List<DataSetResult.DataSet> data = result.getData();
data.addAll(res.getData()); // data.addAll(res.getData());
result.setData(data); // result.setData(data);
int hisInsertCount = deviceSaveService.DeviceSave(res.getData(), null, dlType); // int hisInsertCount = deviceSaveService.DeviceSave(res.getData(), null, dlType);
insertCount = insertCount + hisInsertCount; // insertCount = insertCount + hisInsertCount;
} // }
} else { // } else {
JobLog jobLog = new JobLog(); // JobLog jobLog = new JobLog();
jobLog.setDownloadType(downloadType); // jobLog.setDownloadType(downloadType);
jobLog.setTaskType(Constant.JOB_TASK_TYPE_DOWNLOAD); // jobLog.setTaskType(Constant.JOB_TASK_TYPE_DOWNLOAD);
jobLog.setDownloadDate(DateUtil.parseDate(rangeValue)); // jobLog.setDownloadDate(DateUtil.parseDate(rangeValue));
jobLog.setType(Constant.LOG_TYPE_ERROR); // jobLog.setType(Constant.LOG_TYPE_ERROR);
jobLog.setMsg("下载历史记录出错：" + res.getMsg()); // jobLog.setMsg("下载历史记录出错：" + res.getMsg());
jobLog.setCreateTime(new Date()); // jobLog.setCreateTime(new Date());
jobLogService.insert(jobLog); // jobLogService.insert(jobLog);
} // }
//
} // }
JobLog jobLog = new JobLog(); JobLog jobLog = new JobLog();
jobLog.setDownloadType(downloadType); jobLog.setDownloadType(downloadType);
@ -201,18 +201,18 @@ public class DeviceSyncService {
} }
public void dlHistory(DataSetSingleResult result1) { // public void dlHistory(DataSetSingleResult result1) {
//
DataSetSingleHistoryResult result = new DataSetSingleHistoryResult(); // DataSetSingleHistoryResult result = new DataSetSingleHistoryResult();
result.setDataSet(result1.getDataSet()); // result.setDataSet(result1.getDataSet());
if (result1.getDataSet().getDeviceInfo() != null && result1.getDataSet().getDeviceInfo().size() > 0) { // if (result1.getDataSet().getDeviceInfo() != null && result1.getDataSet().getDeviceInfo().size() > 0) {
List<String> keyList = deviceDownloadService.getKeyList(result1.getDataSet()); // List<String> keyList = deviceDownloadService.getKeyList(result1.getDataSet());
if (keyList.size() > 0) { // if (keyList.size() > 0) {
DataSetTotalResult result2 = deviceDownloadService.getHistoryData(keyList); // DataSetTotalResult result2 = deviceDownloadService.getHistoryData(keyList);
result.setDataList(result2.getData()); // result.setDataList(result2.getData());
} // }
} // }
} // }
public BaseResponse downloadByDi(String deviceId) { public BaseResponse downloadByDi(String deviceId) {
DataSetSingleResult result1 = deviceDownloadService.downloadByDi(deviceId); DataSetSingleResult result1 = deviceDownloadService.downloadByDi(deviceId);
@ -220,13 +220,13 @@ public class DeviceSyncService {
return ResultVOUtils.error(-1, result1.getReturnMsg()); return ResultVOUtils.error(-1, result1.getReturnMsg());
DataSetSingleHistoryResult result = new DataSetSingleHistoryResult(); DataSetSingleHistoryResult result = new DataSetSingleHistoryResult();
result.setDataSet(result1.getDataSet()); result.setDataSet(result1.getDataSet());
if (result1.getDataSet().getDeviceInfo() != null && result1.getDataSet().getDeviceInfo().size() > 0) { // if (result1.getDataSet().getDeviceInfo() != null && result1.getDataSet().getDeviceInfo().size() > 0) {
List<String> keyList = deviceDownloadService.getKeyList(result1.getDataSet()); // List<String> keyList = deviceDownloadService.getKeyList(result1.getDataSet());
if (keyList.size() > 0) { // if (keyList.size() > 0) {
DataSetTotalResult result2 = deviceDownloadService.getHistoryData(keyList); // DataSetTotalResult result2 = deviceDownloadService.getHistoryData(keyList);
result.setDataList(result2.getData()); // result.setDataList(result2.getData());
} // }
} // }
List<DataSetResult.DataSet> dataSets = new ArrayList<>(); List<DataSetResult.DataSet> dataSets = new ArrayList<>();
dataSets.add(result1.getDataSet()); dataSets.add(result1.getDataSet());
deviceSaveService.DeviceSave(dataSets, new Date(), Constant.DL_TYPE_UPDATE); deviceSaveService.DeviceSave(dataSets, new Date(), Constant.DL_TYPE_UPDATE);
@ -280,7 +280,7 @@ public class DeviceSyncService {
public BaseResponse downloadHistory(String key) { public BaseResponse downloadHistory(String key) {
List<String> keyList = new ArrayList<>(); List<String> keyList = new ArrayList<>();
keyList.add(key); keyList.add(key);
DataSetTotalResult res = deviceDownloadService.getHistoryData(keyList); DataSetTotalResult res = deviceDownloadService.getHistoryData1(keyList);
if (res.getCode() != 1) if (res.getCode() != 1)
return ResultVOUtils.error(-1, res.getMsg()); return ResultVOUtils.error(-1, res.getMsg());
List<DeviceEntity> result = new ArrayList<>(); List<DeviceEntity> result = new ArrayList<>();

39
src/main/resources/mybatis/mapper/udid/DeviceMapper.xml
Unescape Escape View File

@ -153,42 +153,7 @@
<include refid="Example_Where_Clause"/> <include refid="Example_Where_Clause"/>
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.glxp.udidl.admin.entity.udid.Device">
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>
<insert id="insertSelective" parameterType="com.glxp.udidl.admin.entity.udid.Device"> <insert id="insertSelective" parameterType="com.glxp.udidl.admin.entity.udid.Device">
insert into device insert into device
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -1104,4 +1069,4 @@
) )
</insert> </insert>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save