diff --git a/src/main/java/com/xkrs/common/config/WebSecurityConfig.java b/src/main/java/com/xkrs/common/config/WebSecurityConfig.java index b96691b..cc3b6b8 100644 --- a/src/main/java/com/xkrs/common/config/WebSecurityConfig.java +++ b/src/main/java/com/xkrs/common/config/WebSecurityConfig.java @@ -35,38 +35,23 @@ class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/push/**").permitAll() .antMatchers("/dispatch/**").permitAll() .antMatchers("/queryFirePoint").permitAll() - .antMatchers(HttpMethod.GET, "/autoSync").permitAll() .antMatchers(HttpMethod.POST, "/insertFirePoint").permitAll() .antMatchers(HttpMethod.POST, "/insertFirePointChannelPrecise").permitAll() .antMatchers(HttpMethod.GET, "/queryFirePointBroadcast").permitAll() .antMatchers(HttpMethod.POST, "/api/user/updateSysUser").permitAll() .antMatchers(HttpMethod.GET, "/queryNotice").permitAll()//查询通知 - .antMatchers(HttpMethod.GET, "/selectGlobalConfigDict").permitAll() - .antMatchers(HttpMethod.GET, "/selectGlobalConfigValue").permitAll() - .antMatchers(HttpMethod.GET, "/selectGlobalConfig").permitAll() - .antMatchers(HttpMethod.POST, "/globalConfig").permitAll() - .antMatchers(HttpMethod.POST, "/globalConfigDict").permitAll() .antMatchers(HttpMethod.POST, "/api/user/add").permitAll() .antMatchers(HttpMethod.POST, "/api/user/check/duplicate").permitAll() .antMatchers(HttpMethod.POST, "/api/login").permitAll() - // 所有 app 用户注册 的POST请求 都放行 - .antMatchers(HttpMethod.POST, "/api/person-investigator/add").permitAll() .antMatchers(HttpMethod.GET, "/api/user/booleanUserName").permitAll() - .antMatchers(HttpMethod.GET, "/queryzzhd").permitAll() - .antMatchers(HttpMethod.POST, "/insertAppTask").permitAll() - .antMatchers(HttpMethod.GET, "/selectAppTask").permitAll() .antMatchers(HttpMethod.GET, "/selectCityName").permitAll() .antMatchers(HttpMethod.GET, "/weather/cityName").permitAll() .antMatchers(HttpMethod.GET, "/weather/cityId").permitAll() .antMatchers(HttpMethod.GET, "/selectFirePointByCode").permitAll() .antMatchers(HttpMethod.GET, "/api/user/verificationCode").permitAll() - .antMatchers(HttpMethod.GET, "/api/user/selectAgentOrgList").permitAll()//获取代理组织列表 - .antMatchers(HttpMethod.POST, "/uploadFileMore").permitAll() - .antMatchers(HttpMethod.POST, "/uploadFile").permitAll() .antMatchers(HttpMethod.GET, "/api/user/verificationCodeUpdate").permitAll() .antMatchers(HttpMethod.GET, "/api/user/getVerificationCode").permitAll() .antMatchers(HttpMethod.POST, "/api/user/userUnRememberPassword").permitAll() - .antMatchers(HttpMethod.POST, "/updateBeforeFireAndAfterFireImage").permitAll() .antMatchers(HttpMethod.GET, "/getProvinceList").permitAll()//获取省列表 .antMatchers(HttpMethod.GET, "/getCityList").permitAll()//根据省编号获取市列表 .antMatchers(HttpMethod.GET, "/getCountyList").permitAll()//根据市编号获取区县列表 @@ -75,10 +60,9 @@ class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers(HttpMethod.GET, "/api/adm/getCityList").permitAll()//根据省编号获取市列表 .antMatchers(HttpMethod.GET, "/api/adm/getCountyList").permitAll()//根据市编号获取区县列表 .antMatchers(HttpMethod.GET, "/api/adm/getStreetList").permitAll()//根据区县编号获取街道列表 - .antMatchers(HttpMethod.GET, "/updateFirePointStreetCode").permitAll() .antMatchers(HttpMethod.GET, "/selectTodayFirePoint").permitAll() - .antMatchers(HttpMethod.GET, "/api/user/selectVipUser").permitAll() .antMatchers(HttpMethod.GET, "/debug").permitAll() + .antMatchers(HttpMethod.GET, "/autoSync").permitAll() // 所有其它请求需要身份认证 .anyRequest().authenticated() .and() diff --git a/src/main/java/com/xkrs/controller/FirePointController.java b/src/main/java/com/xkrs/controller/FirePointController.java index 94fa82c..1caf0c8 100644 --- a/src/main/java/com/xkrs/controller/FirePointController.java +++ b/src/main/java/com/xkrs/controller/FirePointController.java @@ -38,27 +38,6 @@ public class FirePointController { @Resource private FirePointQueryManager firePointQueryManager; -// @GetMapping("/queryzzhd") -// public String queryzzhd() { -// List firePointEntities1 = firePointQueryHelper.queryZZHD("371482", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); -// List firePointEntities2 = firePointQueryHelper.queryZZHD("371403", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); -// List firePointEntities3 = firePointQueryHelper.queryZZHD("371426", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); -// List firePointEntities4 = firePointQueryHelper.queryZZHD("371424", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); -// List firePointEntities5 = firePointQueryHelper.queryZZHD("371526", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); -// List firePointEntities6 = firePointQueryHelper.queryZZHD("371425", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); -// List firePointEntities7 = firePointQueryHelper.queryZZHD("371503", "2022-01-01 00:00:10", "2022-06-26 00:00:10"); -// -// List firePointList = new ArrayList<>(); -// firePointList.addAll(firePointEntities1); -// firePointList.addAll(firePointEntities2); -// firePointList.addAll(firePointEntities3); -// firePointList.addAll(firePointEntities4); -// firePointList.addAll(firePointEntities5); -// firePointList.addAll(firePointEntities6); -// firePointList.addAll(firePointEntities7); -// return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointList, locale); -// } - // /** // * (Complete) // */ diff --git a/src/main/java/com/xkrs/helper/FirePointSubscribeManager.java b/src/main/java/com/xkrs/helper/FirePointSubscribeManager.java index 0295f85..67f7242 100644 --- a/src/main/java/com/xkrs/helper/FirePointSubscribeManager.java +++ b/src/main/java/com/xkrs/helper/FirePointSubscribeManager.java @@ -32,11 +32,14 @@ public class FirePointSubscribeManager { public String autoSync() { long timeTag1 = System.currentTimeMillis(); + log.info("开始更新订阅:"); List subscribedCountyCodeList = obtainSubscribedCountyCodeList(); long timeTag2 = System.currentTimeMillis(); + log.info("更新订阅计算耗时:" + ((timeTag2 - timeTag1) / 1000D) + "秒。"); String updateResult = updateSubscribedCountyCodeList(subscribedCountyCodeList); long timeTag3 = System.currentTimeMillis(); - log.info("更新订阅总耗时:" + ((timeTag3 - timeTag1) / 1000D) + "秒,计算耗时:" + ((timeTag2 - timeTag1) / 1000D) + "秒,请求耗时:" + ((timeTag3 - timeTag2) / 1000D) + "秒。"); + log.info("更新订阅请求耗时:" + ((timeTag3 - timeTag2) / 1000D) + "秒。"); + log.info("更新订阅结束,总耗时:" + ((timeTag3 - timeTag1) / 1000D) + "秒。"); return updateResult; }