diff --git a/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java index eb2731a6..b28a6c73 100644 --- a/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java +++ b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java @@ -252,7 +252,7 @@ public class LocationController { if (null != params.get("deviceType")){ device.setDeviceType(params.get("deviceType").toString()); } - if (null != params.get("zzjgdm") && !"341800000000".equals(params.get("zzjgdm").toString())){ + if (null != params.get("zzjgdm") && !"341300000000".equals(params.get("zzjgdm").toString())){ String[] zzjgdms = params.get("zzjgdm").toString().split(","); device.setZzjgdms(zzjgdms); } diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java index 3f6271b1..e6f856d3 100644 --- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java @@ -96,7 +96,7 @@ public class IndexStaticsController extends BaseController { /* * 通过ES来监听各类设备定位是否正常 * */ - @Scheduled(cron = "0 */30 * * * ?") +// @Scheduled(cron = "0 */30 * * * ?") public void listen(){ List strs = elasticSearchService.linstenDataStatus(); if (ywryProperties.getIsSend()){ diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java index 27f00e1d..347229c8 100644 --- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java @@ -245,10 +245,11 @@ public class TDeviceServiceImpl implements ITDeviceService { List toUpdate = new ArrayList<>(); // 找到需要插入的记录 List toInsert = new ArrayList<>(); - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); +// LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); for (TDevice entity : list) { + baseMapper.insertOrUpdateByCodeAndType(entity); // boolean exists = false; - if (entity.getDeviceType().equals("5") || entity.getDeviceType().equals("8") + /*if (entity.getDeviceType().equals("5") || entity.getDeviceType().equals("8") || entity.getDeviceType().equals("7")){ // 记录仪、5G车载、布控球 处理机构 lqw.eq(SysdeptJly::getQyCode,entity.getZzjgdm()); SysdeptJlyVo jlyVo = deptJlyMapper.selectVoOne(lqw); @@ -256,8 +257,8 @@ public class TDeviceServiceImpl implements ITDeviceService { entity.setZzjgdm(jlyVo.getDeptId()); entity.setZzjgmc(jlyVo.getDeptName()); } - baseMapper.insertOrUpdateByCodeAndType(entity); - } + + }*/ /*for (TDevice existingEntity : existingEntities) { if (entity.getDeviceCode().equals(existingEntity.getDeviceCode()) && entity.getDeviceType().equals(existingEntity.getDeviceType())) {