Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/UserStatisticalServiceImpl.java

@@ -164,7 +164,7 @@ public class UserStatisticalServiceImpl implements UserStatisticalService {
         insertRegUserGridDaily(data);
         insertRegUserGridMonthly(data);*/
 
-        log.warn("执行完毕======总耗时:{}ms",System.currentTimeMillis()-start);
+        log.warn("执行完毕======总耗时:{}ms，customerId:{}",System.currentTimeMillis()-start, data.getCustomerId());
     }
 
     @Transactional(rollbackFor = Exception.class)

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java

@@ -2,6 +2,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -62,6 +63,7 @@ public class StaffPatrolController {
 	 * @author zhaoqifeng
 	 * @date 2021/6/7 16:46
 	 */
+	@NoRepeatSubmit
 	@PostMapping("startpatrol")
 	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOT_GOVERN_PATROL)
 	public Result<StartPatrolResultDTO> startPatrol(@LoginUser TokenDto tokenDto, @RequestBody StartPatrolFormDTO formDTO) {