ly
/
Stwzhj-Cloud-Plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

宿州误改成宣城

luyya 2025-06-27 10:02:13 +08:00
parent ea4df4a979
commit 98174ff8f8
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java
View File

@ -252,7 +252,7 @@ public class LocationController {
if (null != params.get("deviceType")){ if (null != params.get("deviceType")){
device.setDeviceType(params.get("deviceType").toString()); 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(","); String[] zzjgdms = params.get("zzjgdm").toString().split(",");
device.setZzjgdms(zzjgdms); device.setZzjgdms(zzjgdms);
} }

2
stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java
View File

@ -96,7 +96,7 @@ public class IndexStaticsController extends BaseController {
/* /*
* 通过ES来监听各类设备定位是否正常 * 通过ES来监听各类设备定位是否正常
* */ * */
@Scheduled(cron = "0 */30 * * * ?") // @Scheduled(cron = "0 */30 * * * ?")
public void listen(){ public void listen(){
List<String> strs = elasticSearchService.linstenDataStatus(); List<String> strs = elasticSearchService.linstenDataStatus();
if (ywryProperties.getIsSend()){ if (ywryProperties.getIsSend()){

9
stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java
View File

@ -245,10 +245,11 @@ public class TDeviceServiceImpl implements ITDeviceService {
List<TDevice> toUpdate = new ArrayList<>(); List<TDevice> toUpdate = new ArrayList<>();
// 找到需要插入的记录 // 找到需要插入的记录
List<TDevice> toInsert = new ArrayList<>(); List<TDevice> toInsert = new ArrayList<>();
LambdaQueryWrapper<SysdeptJly> lqw = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<SysdeptJly> lqw = new LambdaQueryWrapper<>();
for (TDevice entity : list) { for (TDevice entity : list) {
baseMapper.insertOrUpdateByCodeAndType(entity);
// boolean exists = false; // 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车载、布控球 处理机构 || entity.getDeviceType().equals("7")){ // 记录仪、5G车载、布控球 处理机构
lqw.eq(SysdeptJly::getQyCode,entity.getZzjgdm()); lqw.eq(SysdeptJly::getQyCode,entity.getZzjgdm());
SysdeptJlyVo jlyVo = deptJlyMapper.selectVoOne(lqw); SysdeptJlyVo jlyVo = deptJlyMapper.selectVoOne(lqw);
@ -256,8 +257,8 @@ public class TDeviceServiceImpl implements ITDeviceService {
entity.setZzjgdm(jlyVo.getDeptId()); entity.setZzjgdm(jlyVo.getDeptId());
entity.setZzjgmc(jlyVo.getDeptName()); entity.setZzjgmc(jlyVo.getDeptName());
} }
baseMapper.insertOrUpdateByCodeAndType(entity);
} }*/
/*for (TDevice existingEntity : existingEntities) { /*for (TDevice existingEntity : existingEntities) {
if (entity.getDeviceCode().equals(existingEntity.getDeviceCode()) && entity.getDeviceType().equals(existingEntity.getDeviceType())) { if (entity.getDeviceCode().equals(existingEntity.getDeviceCode()) && entity.getDeviceType().equals(existingEntity.getDeviceType())) {