|
|
|
@ -1941,18 +1941,14 @@ public class HeartService {
|
|
|
|
|
*/
|
|
|
|
|
@Transactional(propagation = Propagation.NESTED)
|
|
|
|
|
public void insertDeviceInfoData(String content) {
|
|
|
|
|
log.error("这个是什么{}",content);
|
|
|
|
|
cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content);
|
|
|
|
|
List<DeviceInfoEntity> deviceInfoEntities = JSONUtil.toList(jsonObject.getJSONArray(DeviceInfoEntity.class.getSimpleName()), DeviceInfoEntity.class);
|
|
|
|
|
log.error("shebei jichu 数据 到底是什么{}",deviceInfoEntities);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(deviceInfoEntities)) {
|
|
|
|
|
for (DeviceInfoEntity deviceInfoEntity : deviceInfoEntities) {
|
|
|
|
|
deviceInfoEntity.setUpdateTime(null);
|
|
|
|
|
}
|
|
|
|
|
log.error("hahahhahhahahah woyao fengle{}",deviceInfoEntities);
|
|
|
|
|
boolean b = deviceInfoMapper.replaceBatchs(deviceInfoEntities);
|
|
|
|
|
if (b == false){
|
|
|
|
|
log.error("差距自己找,头像右上角");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
List<String> syncFiles = JSONUtil.toList(jsonObject.getJSONArray("syncFiles"), String.class);
|
|
|
|
@ -2121,7 +2117,6 @@ public class HeartService {
|
|
|
|
|
public void insertProBusinessData(String content){
|
|
|
|
|
cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(content);
|
|
|
|
|
List<ThrManufacturerEntity> thrManufacturerEntities = JSONUtil.toList(jsonObject.getJSONArray(ThrManufacturerEntity.class.getSimpleName()), ThrManufacturerEntity.class);
|
|
|
|
|
log.error("heiheihieheihi 生产企业信息",thrManufacturerEntities);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(thrManufacturerEntities)) {
|
|
|
|
|
for (ThrManufacturerEntity deviceRepairApplyEntity : thrManufacturerEntities) {
|
|
|
|
|
deviceRepairApplyEntity.setUpdateTime(null);
|
|
|
|
@ -2611,7 +2606,6 @@ public class HeartService {
|
|
|
|
|
*/
|
|
|
|
|
if (needExec(info.getDeviceInfo())) {
|
|
|
|
|
Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEVICE_INFO_DATA);
|
|
|
|
|
log.error("map libian de shujv {}",map);
|
|
|
|
|
List<DeviceInfoEntity> deptEntityList = deviceInfoService.list(Wrappers.lambdaQuery(DeviceInfoEntity.class)
|
|
|
|
|
.le(!ge && (boolean) map.get("isNew"), DeviceInfoEntity::getUpdateTime, now)
|
|
|
|
|
.between(ge, DeviceInfoEntity::getUpdateTime, syncTime, now)
|
|
|
|
|