From 2d036d97788c6a489d573386da4a1534e20bed99 Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期五, 03 十一月 2023 09:35:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java index 4219cce..e9bb91f 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java @@ -70,7 +70,6 @@ Api1111 apiData; List<Api1111> listApi1111; Integer num = 1000001; - String spjksbwzys = "left: {X}px ; top : {Y}px ; width : 10px ; height: 10px"; for (Fz40SecCamera sysData : list) { apiData = new Api1111(); @@ -80,23 +79,31 @@ apiData.setKqmc(api1102.getKqmc()); apiData.setSpjksbmc(api1102.getKqmc() + "-" + sysData.getName()); - apiData.setSpjksbid(api1102.getKqdm().substring(2,8) + "00401327" + String.valueOf(num).substring(1)); + apiData.setSpjksbid(api1102.getXzqhdm() + "00401327" + String.valueOf(num).substring(1)); apiData.setSpjksbxdwz("(" + Math.round(sysData.getPosX()*100) + "," + Math.round(sysData.getPosY()*100) + ")"); - apiData.setSpjksbwzys(spjksbwzys.replace("{X}",Math.round(sysData.getPosX()*100) + "").replace("{Y}",Math.round(sysData.getPosY()*100) + "")); apiData.setBz(sysData.getRemark()); + //瑙嗛鐩戞帶绫诲瀷鍜岀偣浣嶇被鍨� + apiData.setSpjklx(StringUtils.isEmpty(sysData.getSpjklx())?"3":sysData.getSpjklx()); + apiData.setSpdwlx(StringUtils.isEmpty(sysData.getSpdwlx())?"7":sysData.getSpdwlx()); //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂� apiData.setZhgxsj(new Date()); //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂� apiData.setSyncTime(new Date()); apiData.setCzbz(Constant.CZBZ_I); - apiData.setSpjklx("1"); + listApi1111 = api1111Rep.getApi1111ById(apiData.getSpjksbid()); if(null != listApi1111 && listApi1111.size() > 0){ apiData.setCzbz(listApi1111.get(0).getCzbz()); if(StringUtils.isNotEmpty(listApi1111.get(0).getSpjklx())){ apiData.setSpjklx(listApi1111.get(0).getSpjklx()); } + if(StringUtils.isNotEmpty(listApi1111.get(0).getSpdwlx())){ + apiData.setSpdwlx(listApi1111.get(0).getSpdwlx()); + } + if(StringUtils.isNotEmpty(listApi1111.get(0).getHkCameraIndexCode())){ + apiData.setHkCameraIndexCode(listApi1111.get(0).getHkCameraIndexCode()); + } } apiData.setBizId(sysData.getId()); -- Gitblit v1.9.3