diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index a291cdccb2..cced485d1f 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -233,6 +233,9 @@ lb://epmet-openapi-adv-server + + https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 + SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd @@ -361,6 +364,9 @@ lb://epmet-openapi-adv-server + + https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 + SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd @@ -458,6 +464,9 @@ lb://epmet-openapi-adv-server + + https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 + SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd @@ -552,6 +561,9 @@ lb://epmet-openapi-adv-server + + https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c + SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1 diff --git a/epmet-gateway/src/main/java/com/epmet/auth/ExternalAuthProcessor.java b/epmet-gateway/src/main/java/com/epmet/auth/ExternalAuthProcessor.java index d21ec692c5..caf1ca5530 100644 --- a/epmet-gateway/src/main/java/com/epmet/auth/ExternalAuthProcessor.java +++ b/epmet-gateway/src/main/java/com/epmet/auth/ExternalAuthProcessor.java @@ -16,7 +16,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Component; import org.springframework.util.AntPathMatcher; -import org.springframework.util.MultiValueMap; import org.springframework.web.server.ServerWebExchange; /** @@ -73,6 +72,7 @@ public class ExternalAuthProcessor extends AuthProcessor { } if (!inPaths) { + logger.error("auth 401 ,uri:{}",requestUri); throw new RenException(EpmetErrorCode.ERR401.getCode(), "所请求的url并未对外部应用开放"); } diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index bc6bb866cd..dce0862481 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -476,14 +476,24 @@ epmet: # 外部应用认证，使用AccessToken等头进行认证 externalOpenUrls: - /data/report/** - - /data/stats/** - /epmet/ext/** - /epmetuser/customerstaff/customerlist - /message/template/** - /data/aggregator/project/projectdistribution - /data/aggregator/epmetuser/open-staffdetail + #stats external包下 公共的类只外部暴露方法 纯外部使用的 暴漏整个 - /data/stats/statsuser/gm-uploadevent - /data/stats/statsuser/gm-uploaddata + - /data/stats/indexcalculate/all + - /data/stats/kcscreencoll/** + - /data/stats/indexcollect/** + - /data/stats/anscreencoll/** + - /data/stats/plugin/** + - /data/stats/screencoll/** + - /data/stats/project/** + - /data/stats/basereport/** + - /data/stats/governance/** + # 对外开放接口认证白名单 externalAuthUrlsWhiteList: @@ -497,3 +507,8 @@ jwt: secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epmet] #token有效时长，默认7天，单位秒 expire: 604800 + +dingTalk: + robot: + webHook: @dingTalk.robot.webHook@ + secret: @dingTalk.robot.secret@ diff --git a/epmet-gateway/src/main/resources/logback-spring.xml b/epmet-gateway/src/main/resources/logback-spring.xml index dfb3c43f5d..876bbde4e8 100644 --- a/epmet-gateway/src/main/resources/logback-spring.xml +++ b/epmet-gateway/src/main/resources/logback-spring.xml @@ -5,6 +5,8 @@ + + ${appname} @@ -131,13 +133,21 @@ ACCEPT DENY + + + ERROR + ACCEPT + DENY + ${webHook} + ${secret} + ${appname} + - + - diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/AnScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/AnScreenCollController.java similarity index 99% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/AnScreenCollController.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/AnScreenCollController.java index 5b862b66ec..b2b4d55d18 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/AnScreenCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/AnScreenCollController.java @@ -1,4 +1,4 @@ -package com.epmet.controller; +package com.epmet.controller.external; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/BaseReportController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/BaseReportController.java similarity index 99% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/BaseReportController.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/BaseReportController.java index f8990a9a8f..47610548ca 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/BaseReportController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/BaseReportController.java @@ -1,4 +1,4 @@ -package com.epmet.controller; +package com.epmet.controller.external; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactIndexCollectController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/FactIndexCollectController.java similarity index 99% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactIndexCollectController.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/FactIndexCollectController.java index 77f2ce51ec..f9e58a7df2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactIndexCollectController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/FactIndexCollectController.java @@ -1,4 +1,4 @@ -package com.epmet.controller; +package com.epmet.controller.external; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.indexcollect.form.*; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/GovernanceDataReportController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/GovernanceDataReportController.java similarity index 97% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/GovernanceDataReportController.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/GovernanceDataReportController.java index 77913ac0d9..3c94792afa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/GovernanceDataReportController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/GovernanceDataReportController.java @@ -1,4 +1,4 @@ -package com.epmet.controller; +package com.epmet.controller.external; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.extract.form.AgencyGovernDailyFormDTO; @@ -8,7 +8,6 @@ import com.epmet.service.GovernanceDataReportService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.sql.ResultSet; /** * 治理能力数据上报 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/IndexCalculateController.java similarity index 99% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/IndexCalculateController.java index 9add28ae1c..29267ca44e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/IndexCalculateController.java @@ -1,4 +1,4 @@ -package com.epmet.controller; +package com.epmet.controller.external; import com.epmet.commons.tools.enums.EnvEnum; import com.epmet.commons.tools.exception.RenException; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/KcScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/KcScreenCollController.java similarity index 98% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/KcScreenCollController.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/KcScreenCollController.java index 34269ee507..766a21dfa7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/KcScreenCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/KcScreenCollController.java @@ -1,4 +1,4 @@ -package com.epmet.controller; +package com.epmet.controller.external; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -27,13 +27,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_platform_summary_daily * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("homepage/platformsummary") public Result platFormSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -48,13 +48,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_issue_summary_grid_daily * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("issue/summary") public Result issueSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -69,13 +69,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table: screen_kc_issue_trend_grid_monthly * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("issue/trend") public Result issueTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -90,13 +90,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_user_summary_daily * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("user/summary") public Result userSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -111,13 +111,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_volunteer_heat_rank_grid_daily * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("volunteer/heartrank") public Result volunteerHeartRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -132,13 +132,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_user_trend_grid_monthly * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("user/userheartrank") public Result userHeartRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -153,13 +153,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_act_summary_daily * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("act/summary") public Result actSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -174,13 +174,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_act_trend_monthly * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("act/trend") public Result actTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -195,13 +195,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_volunteer_summary_daily * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("act/volunteersummary") public Result volunteerSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -216,13 +216,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_project_summary_grid_daily * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("project/summary") public Result projectSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -237,13 +237,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_project_category_grid_daily * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("project/categorysummary") public Result categorySummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -258,13 +258,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_project_satis_grid_monthly * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("project/satisanalysis") public Result projectSatisanalysis(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -279,13 +279,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_news_summary_daily * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("news/summary") public Result newsSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -300,13 +300,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_news_trend_monthly * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("news/trend") public Result newsTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -321,13 +321,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_news_rank * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("news/hotrank") public Result newsHotRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -342,13 +342,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_news_category_analysis * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("news/categoryanalysis") public Result newsCategoryAnalysis(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -363,13 +363,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_group_summary_grid_daily * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("group/summary") public Result groupSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -384,13 +384,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_group_detail_grid_daily * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("group/detail") public Result groupDetail(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); @@ -405,13 +405,13 @@ public class KcScreenCollController { * 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false * table:screen_kc_topic_trend_grid_monthly * - * + * * @param formDTO * @return void * @Author zhangyong * @Date 15:57 2020-09-09 **/ - + @PostMapping("group/topictrend") public Result groupTopicTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO) { formDTO.setCustomerId(customerId); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ScreenProjectDataCollController.java similarity index 99% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ScreenProjectDataCollController.java index db45cca198..7d4c7e9c71 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ScreenProjectDataCollController.java @@ -1,4 +1,4 @@ -package com.epmet.controller; +package com.epmet.controller.external; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiScreenCollController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java similarity index 99% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiScreenCollController.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java index 6cdc9ca44a..f142adbf6d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiScreenCollController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java @@ -1,4 +1,4 @@ -package com.epmet.controller; +package com.epmet.controller.external; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsUserController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/StatsUserController.java similarity index 96% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsUserController.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/StatsUserController.java index c42929f386..47ef13932f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsUserController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/StatsUserController.java @@ -1,4 +1,4 @@ -package com.epmet.controller; +package com.epmet.controller.external; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -30,6 +30,7 @@ public class StatsUserController { * @param formDTO * @description 工作端数据一期，用户分析：参与用户、注册用户分析 * @Date 2021/3/26 13:27 + * 自用的方法 不暴漏 **/ @RequestMapping("execute") public Result execute(@RequestBody StatsFormDTO formDTO) { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/OfsController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/plugins/OfsController.java similarity index 97% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/OfsController.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/plugins/OfsController.java index 33e7c281aa..02df903121 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/OfsController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/plugins/OfsController.java @@ -1,4 +1,4 @@ -package com.epmet.controller.plugins; +package com.epmet.controller.external.plugins; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -19,16 +19,16 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("plugins/ofs") public class OfsController { - + @Autowired private OfsService ofsService; - + /** * @param customerId * @param formDTO * @author yinzuomei * @description 【146】一张清单 isFirst=true时,根据customerId先删除后增加 - * @Date 2021/1/22 10:19 + * @Date 2021/1/22 10:19 **/ @PostMapping("onelist-daily") public Result collOneList(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO formDTO){ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/WorkRecordColController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/plugins/WorkRecordColController.java similarity index 96% rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/WorkRecordColController.java rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/plugins/WorkRecordColController.java index 8bbce3e324..5ed27c3930 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/WorkRecordColController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/plugins/WorkRecordColController.java @@ -1,4 +1,4 @@ -package com.epmet.controller.plugins; +package com.epmet.controller.external.plugins; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -35,7 +35,7 @@ public class WorkRecordColController { * 按月上传工作日志统计数据时，同步调用此接口上传字典信息 * @param customerId * @param data - * @return com.epmet.commons.tools.utils.Result + * @return com.epmet.commons.tools.utils.Result * @author wangc * @date 2021.02.04 16:16 */ diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/PublishSuggestionFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/PublishSuggestionFormDTO.java index 1261a5e83f..367a1590d3 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/PublishSuggestionFormDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/PublishSuggestionFormDTO.java @@ -30,6 +30,6 @@ public class PublishSuggestionFormDTO implements Serializable { @NotNull(message = "是否匿名不能为空", groups = {AddUserInternalGroup.class}) private Boolean publicFlag; - @Length(max = 500, message = "内容不能超过500字", groups = {AddUserShowGroup.class}) + @Length(min = 1, max = 500, message = "内容不能为空,且不能超过500字", groups = {AddUserShowGroup.class}) private String suggestion; }