diff --git a/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java index 053d6e17..d637be26 100644 --- a/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java +++ b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java @@ -68,7 +68,7 @@ public class ElasticsearchConfig { RestClientBuilder builder = RestClient.builder(httpHost); // 设置用户名、密码 CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); - credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(userName, password)); +// credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(userName, password)); // 连接延时配置 builder.setRequestConfigCallback(requestConfigBuilder -> { requestConfigBuilder.setConnectTimeout(connectTimeOut); 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 354e332a..f7f31c70 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") && !"341600000000".equals(params.get("zzjgdm").toString())){ + if (null != params.get("zzjgdm") && !"340100000000".equals(params.get("zzjgdm").toString())){ String[] zzjgdms = params.get("zzjgdm").toString().split(","); device.setZzjgdms(zzjgdms); } diff --git a/stwzhj-modules/wzhj-location/src/main/resources/logback-plus.xml b/stwzhj-modules/wzhj-location/src/main/resources/logback-plus.xml index fcb89dcf..f39a26de 100644 --- a/stwzhj-modules/wzhj-location/src/main/resources/logback-plus.xml +++ b/stwzhj-modules/wzhj-location/src/main/resources/logback-plus.xml @@ -1,49 +1,28 @@ - - - - + - - - ${log.path}/info.${log.file}.log - - INFO - ACCEPT - DENY - - - ${log.path}/info/info.${log.file}.%d{yyyy-MM-dd}.%i.log.gz - ${MAX_FILE_SIZE} - ${MAX_HISTORY} - + + + + - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + ${console.log.pattern} + utf-8 - - - ${log.path}/error.${log.file}.log - - ERROR - - - ${log.path}/error/error.${log.file}.%d{yyyy-MM-dd}.%i.log.gz - ${MAX_FILE_SIZE} - ${MAX_HISTORY} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - + - - - - + + + + + + + + - diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/schedule/JzDeptSchedule.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/schedule/JzDeptSchedule.java index 52c27a5a..a0a315dd 100644 --- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/schedule/JzDeptSchedule.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/schedule/JzDeptSchedule.java @@ -46,7 +46,7 @@ public class JzDeptSchedule { }}*/ public void jzDept(){ JSONObject para = new JSONObject(); - para.put("orgId","34160000000"); + para.put("orgId","34010000000"); para.put("page","1"); para.put("limit","2000"); String result = HttpUtil.post("http://53.1.230.5:8159/api/UUDB/org/list", para.toString()); @@ -106,7 +106,7 @@ public class JzDeptSchedule { - @Scheduled(cron = "0 0 0/1 * * ?") +// @Scheduled(cron = "0 0 0/1 * * ?") public void jzDeptNew(){ Date time = DateUtil.offsetHour(new Date(),-1); List list = deptService.jzDpet(DateUtil.formatDateTime(time)); diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index 48cff5fa..9c2c5a29 100644 --- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -370,7 +370,7 @@ public class SysDeptServiceImpl implements ISysDeptService { @Override public List deviceStatics(String deviceType,String manageDeptId) { - if(!manageDeptId.equals("341600000000")){ + if(!manageDeptId.equals("340100000000")){ String subManageId = manageDeptId.substring(0,findLastNonZeroIndex(manageDeptId) + 1); return baseMapper.deviceStaticsByDeptId(deviceType,subManageId); diff --git a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml index b5af27bf..19b65a2c 100644 --- a/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/stwzhj-modules/wzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -70,7 +70,7 @@ group by SUBSTRING(zzjgdm,1,8)) a on SUBSTRING(d.dept_id,1,8) = SUBSTRING(a.zzjgdm,1,8) - where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '341600000000' and dept_id like '341600%' + where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '340100000000' and dept_id like '340100%' union @@ -92,7 +92,7 @@ group by SUBSTRING(zzjgdm,1,6)) a on SUBSTRING(d.dept_id,1,6) = SUBSTRING(a.zzjgdm,1,6) - where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '341600000000' and dept_id not like '341600%' + where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '340100000000' and dept_id not like '340100%' union @@ -113,7 +113,7 @@ group by SUBSTRING(zzjgdm,1,8)) a on SUBSTRING(d.dept_id,1,8) = SUBSTRING(a.zzjgdm,1,8) - where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '341600000000' and parent_id != '0' and dept_id like '%0000' + where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '340100000000' and parent_id != '0' and dept_id like '%0000' UNION select dept_id as deptId,short_name as deptName,parent_id as parentId,IFNULL(onlineCount,0) as onlineCount,IFNULL(allCount,0) as allCount from sys_dept d @@ -133,7 +133,7 @@ group by SUBSTRING(zzjgdm,1,10)) a on SUBSTRING(d.dept_id,1,10) = SUBSTRING(a.zzjgdm,1,10) - where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '341600000000' and parent_id != '0' and dept_id not like '%0000' and dept_id like '%00' + where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '340100000000' and parent_id != '0' and dept_id not like '%0000' and dept_id like '%00' union @@ -175,7 +175,7 @@ LEFT JOIN (select substring(zzjgdm,1,8) as zzjgdm ,count(*) as allCount from t_device where device_type = #{deviceType} and valid =1 group by SUBSTRING(zzjgdm,1,8)) a on SUBSTRING(d.dept_id,1,8) = SUBSTRING(a.zzjgdm,1,8) - where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '341600000000' and dept_id like '341600%' + where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '340100000000' and dept_id like '340100%' union @@ -187,7 +187,7 @@ LEFT JOIN (select substring(zzjgdm,1,6) as zzjgdm ,count(*) as allCount from t_device where device_type = #{deviceType} and valid =1 group by SUBSTRING(zzjgdm,1,6)) a on SUBSTRING(d.dept_id,1,6) = SUBSTRING(a.zzjgdm,1,6) - where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '341600000000' and dept_id not like '341600%' + where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id = '340100000000' and dept_id not like '340100%' union @@ -198,7 +198,7 @@ LEFT JOIN (select substring(zzjgdm,1,8) as zzjgdm ,count(*) as allCount from t_device where device_type = #{deviceType} and valid = 1 group by SUBSTRING(zzjgdm,1,8)) a on SUBSTRING(d.dept_id,1,8) = SUBSTRING(a.zzjgdm,1,8) - where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '341600000000' and parent_id != '0' and dept_id like '%0000' + where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '340100000000' and parent_id != '0' and dept_id like '%0000' UNION select dept_id as deptId,short_name as deptName,parent_id as parentId,IFNULL(onlineCount,0) as onlineCount,IFNULL(allCount,0) as allCount from sys_dept d @@ -208,7 +208,7 @@ LEFT JOIN (select substring(zzjgdm,1,10) as zzjgdm ,count(*) as allCount from t_device where device_type = #{deviceType} and valid = 1 group by SUBSTRING(zzjgdm,1,10)) a on SUBSTRING(d.dept_id,1,10) = SUBSTRING(a.zzjgdm,1,10) - where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '341600000000' and parent_id != '0' and dept_id not like '%0000' and dept_id like '%00' + where `status` = '0' and del_flag =0 and is_visible = '1' and parent_id != '340100000000' and parent_id != '0' and dept_id not like '%0000' and dept_id like '%00' union @@ -231,7 +231,7 @@