Merge remote-tracking branch 'origin/dev'

epmet-admin/epmet-admin-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-auth/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java

@@ -21,6 +21,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -70,7 +71,7 @@ public class LogMsgSendFilter extends LevelFilter {
                     stringBuilder.append("\n");
                 }
 
-                stringBuilder.append("故障时间：").append(DateUtils.formatTimestamp(event.getTimeStamp(),DateUtils.DATE_TIME_PATTERN));
+                stringBuilder.append("故障时间：").append(DateUtils.format(new Date(event.getTimeStamp()),DateUtils.DATE_TIME_PATTERN));
                 stringBuilder.append("\n");
                 stringBuilder.append("TraceId：").append(Thread.currentThread().getName());
                 stringBuilder.append("\n");

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.dataaggre.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.datareport.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -530,11 +530,11 @@ public class ProjectServiceImpl implements ProjectService {
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<MassesDiscontentResultV2DTO> queryMassesDiscontentMultic(MassesDiscontentFormV2DTO formDTO) {
-        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         formDTO.setEndDate(getDateId(ProjectConstant.YESTERDAY));
         formDTO.setStartDate(getDateId(formDTO.getTimeSection()));
         log.info(JSON.toJSONString(formDTO,true));
         //已结案、并且来源于议题、在当前时间范围内的、
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<MassesDiscontentResultV2DTO> list = projectDao.selectMassesDiscontentMultic(formDTO.getAgencyId(),
                 formDTO.getAreaCode(),
                 formDTO.getStartDate(),

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -563,10 +563,10 @@ public class CodeServiceImpl implements CodeService {
 
 	@Override
 	public PageData history(CodeCommonFormDTO formDTO) {
-		PageHelper.startPage(formDTO.getPage(), formDTO.getLimit());
 		//获取上传代码信息
 //		CodeCustomerDTO code = codeCustomerService.get(formDTO.getCodeId());
 		//获取上传代码信息
+		PageHelper.startPage(formDTO.getPage(), formDTO.getLimit());
 		List<CodeHistoryResultDTO> list = codeOperationHistoryService.getHistoryList(formDTO.getCustomerId(), formDTO.getClientType());
 		PageInfo<CodeHistoryResultDTO> pageInfo = new PageInfo<>(list);
 		return new PageData<>(list, pageInfo.getTotal());

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -588,7 +588,6 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 
 	@Override
 	public PageData publishedArticleList(TokenDto tokenDto, PublishedListFormDTO formDTO) {
-		PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
 		List<PublishedListResultDTO> resultList;
 		List<CustomerStaffRoleResultDTO> roles = epmetUserOpenFeignClient.getStaffRoles(tokenDto.getUserId()).getData();
 		LoginUserDetailsFormDTO loginUserDetailsFormDTO = new LoginUserDetailsFormDTO();
@@ -612,12 +611,14 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		}
 		if (AGENCY.equals(staffLevel)) {
 			Set<String> gridList = new HashSet<>();
+			PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
 			resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId(), formDTO.getTagIdList(), gridList);
 		} else {
 			Set<String> gridList = new HashSet<>();
 			if (null != userInfo.getGridIdList()) {
 				gridList = userInfo.getGridIdList();
 			}
+			PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
 			resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId(), formDTO.getTagIdList(), gridList);
 		}
 		resultList.forEach(result -> {
@@ -632,8 +633,6 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 
 	@Override
 	public PageData offlineList(TokenDto tokenDto, OfflineListFormDTO formDTO) {
-		PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-
 		List<CustomerStaffRoleResultDTO> roles = epmetUserOpenFeignClient.getStaffRoles(tokenDto.getUserId()).getData();
 		LoginUserDetailsFormDTO loginUserDetailsFormDTO = new LoginUserDetailsFormDTO();
 		loginUserDetailsFormDTO.setApp(tokenDto.getApp());
@@ -656,9 +655,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			if (null != userInfo.getGridIdList()) {
 				gridList = userInfo.getGridIdList();
 			}
+			PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
 			resultList = baseDao.selectOfflineList(gridList);
 		} else {
 			Set<String> gridList = new HashSet<>();
+			PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
 			resultList = baseDao.selectOfflineList(gridList);
 		}
 		PageInfo<OfflineListResultDTO> pageInfo = new PageInfo<>(resultList);

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.openapi.scan.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java

@@ -23,6 +23,8 @@ import com.epmet.entity.UserInvitationEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 人员邀请关系表  记录user之间的邀请关系
  *
@@ -41,7 +43,7 @@ public interface UserInvitationDao extends BaseDao<UserInvitationEntity> {
 	 * @Description 根据被邀请人id、邀请链接id、邀请场景查询人员邀请记录
 	 * @Date 2020/4/10 0:36
 	 **/
-	UserInvitationDTO selectUserInvitation(@Param("inviteeUserId") String inviteeUserId,
-										   @Param("inviteSourceId") String inviteSourceId,
-										   @Param("inviteSource") String inviteSource);
+	List<UserInvitationDTO> selectUserInvitation(@Param("inviteeUserId") String inviteeUserId,
+												 @Param("inviteSourceId") String inviteSourceId,
+												 @Param("inviteSource") String inviteSource);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -0,0 +1,21 @@
+package com.epmet.healthcheck;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("healthcheck")
+public class HealthCheckController {
+
+    /**
+     * http健康检查
+     * @return
+     */
+    @PostMapping("http")
+    public Result httpHealthCheck() {
+        return new Result();
+    }
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java

@@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -106,10 +107,10 @@ public class UserInvitationServiceImpl extends BaseServiceImpl<UserInvitationDao
 
     @Override
     public Result saveUserInvitation(UserInvitationFormDTO formDTO) {
-        UserInvitationDTO userInvitationDTO = baseDao.selectUserInvitation(formDTO.getInviteeUserId(),
+        List<UserInvitationDTO> userInvitationDTOList = baseDao.selectUserInvitation(formDTO.getInviteeUserId(),
                 formDTO.getInviteSourceId(),
                 formDTO.getInviteSource());
-        if (null == userInvitationDTO) {
+        if (CollectionUtils.isEmpty(userInvitationDTOList)) {
             UserInvitationDTO insertUserInvitationDTO = new UserInvitationDTO();
             insertUserInvitationDTO.setCustomerId(formDTO.getCustomerId());
             insertUserInvitationDTO.setGridId(formDTO.getGridId());
@@ -120,8 +121,10 @@ public class UserInvitationServiceImpl extends BaseServiceImpl<UserInvitationDao
             insertUserInvitationDTO.setInviteSourceId(formDTO.getInviteSourceId());
             this.save(insertUserInvitationDTO);
         } else {
-            userInvitationDTO.setInvitationTime(new Date());
-            this.update(userInvitationDTO);
+            userInvitationDTOList.forEach(userInvitationDTO->{
+                userInvitationDTO.setInvitationTime(new Date());
+                this.update(userInvitationDTO);
+            });
         }
         return new Result();
     }

epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml

@@ -7,7 +7,6 @@
     <select id="selectLL" resultType="com.epmet.dto.result.GridManagerUserListResultDTO">
         SELECT t.* FROM
             (SELECT
-                distinct(pr.ID) AS ID,
                 pr.GRID AS gridId,
                 pr.STAFF_ID,
                 pr.`STATUS`,
@@ -15,7 +14,7 @@
                 pd.LONGITUDE,
                 pd.SERIAL_NUM
             FROM staff_patrol_record pr
-            LEFT JOIN staff_patrol_detail pd ON pd.STAFF_PATROL_REC_ID = pr.ID AND pd.DEL_FLAG = 0
+            INNER JOIN (SELECT MAX(pd.CREATED_TIME) , pd.STAFF_PATROL_REC_ID, pd.LATITUDE, pd.LONGITUDE,pd.SERIAL_NUM FROM staff_patrol_detail pd WHERE pd.DEL_FLAG = '0' GROUP BY pd.STAFF_PATROL_REC_ID) pd ON(pd.STAFF_PATROL_REC_ID = pr.ID)
             WHERE pr.DEL_FLAG = 0
                 AND (
                 <foreach collection="userIds" item="userId" separator=" OR ">