diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-auth/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-auth/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index ffadf837b3..4a6332f74a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/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"); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/healthcheck/HealthCheckController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..2b8768891f --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/healthcheck/HealthCheckController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..fdce5c584e --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java index 33fd65dd1b..070fcca43a 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java +++ b/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 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 list = projectDao.selectMassesDiscontentMultic(formDTO.getAgencyId(), formDTO.getAreaCode(), formDTO.getStartDate(), diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index 89e72048cf..c5845d11c8 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/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 list = codeOperationHistoryService.getHistoryList(formDTO.getCustomerId(), formDTO.getClientType()); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index f45707ee7b..62274c346b 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/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 resultList; List roles = epmetUserOpenFeignClient.getStaffRoles(tokenDto.getUserId()).getData(); LoginUserDetailsFormDTO loginUserDetailsFormDTO = new LoginUserDetailsFormDTO(); @@ -612,12 +611,14 @@ public class ArticleServiceImpl extends BaseServiceImpl gridList = new HashSet<>(); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId(), formDTO.getTagIdList(), gridList); } else { Set 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 roles = epmetUserOpenFeignClient.getStaffRoles(tokenDto.getUserId()).getData(); LoginUserDetailsFormDTO loginUserDetailsFormDTO = new LoginUserDetailsFormDTO(); loginUserDetailsFormDTO.setApp(tokenDto.getApp()); @@ -656,9 +655,11 @@ public class ArticleServiceImpl extends BaseServiceImpl gridList = new HashSet<>(); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); resultList = baseDao.selectOfflineList(gridList); } PageInfo pageInfo = new PageInfo<>(resultList); diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/healthcheck/HealthCheckController.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..136a85850c --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java index 948c57edf0..4409c5f7cd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserInvitationDao.java +++ b/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 { * @Description 根据被邀请人id、邀请链接id、邀请场景查询人员邀请记录 * @Date 2020/4/10 0:36 **/ - UserInvitationDTO selectUserInvitation(@Param("inviteeUserId") String inviteeUserId, - @Param("inviteSourceId") String inviteSourceId, - @Param("inviteSource") String inviteSource); + List selectUserInvitation(@Param("inviteeUserId") String inviteeUserId, + @Param("inviteSourceId") String inviteSourceId, + @Param("inviteSource") String inviteSource); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java new file mode 100644 index 0000000000..7ad372c8cc --- /dev/null +++ b/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(); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java index adfae02876..30e26b0a98 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserInvitationServiceImpl.java +++ b/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 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{ + userInvitationDTO.setInvitationTime(new Date()); + this.update(userInvitationDTO); + }); } return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml index d3d5b53bb3..a514e59f47 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml @@ -7,7 +7,6 @@