From ba18782f9f7987cae011ff23a34c716fbd4debb4 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Fri, 28 Feb 2020 18:04:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BC=81=E4=B8=9A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E9=80=89=E5=A1=AB=E8=A1=A8=E5=8D=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/CustomFeignClient.java | 15 +++++---- .../epdc/service/CustomEnterpriseService.java | 14 ++++---- .../controller/EnterpriseInfoController.java | 33 ++++++++++--------- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java index eaf431ec0..1b888da07 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java @@ -53,25 +53,26 @@ public interface CustomFeignClient { */ @GetMapping(value = "custom/epidemicSentryPost/selectOneByThirdSentryPostid/{thirdSentryPostid}", consumes = MediaType.APPLICATION_JSON_VALUE) Result getEpidemicSentryByThirdSentryPostid(@PathVariable("thirdSentryPostid") String thirdSentryPostid); + /** - * @Description 企业信息完善 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 企业信息完善 * @Author songyunpeng - * @Date 2020/2/28 + * @Date 2020/2/28 * @Param [enterpriseInfoFormDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @GetMapping(value = "custom/enterpriseinfo/completeSelectiveInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result completeEnterpriseInfo(EnterpriseInfoFormDTO enterpriseInfoFormDTO); /** - * @Description 查询企业信息 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 查询企业信息 * @Author songyunpeng - * @Date 2020/2/28 + * @Date 2020/2/28 * @Param [userId] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @GetMapping(value = "custom/enterpriseinfo/getByUserId/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getEnterpriseInfoByUserId(@PathVariable("userId")String userId); + Result getEnterpriseInfoByUserId(@PathVariable("userId") String userId); /*** * 完善企业信息，必填表单 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java index 5db5925cf..e8957f938 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java @@ -18,20 +18,20 @@ import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; public interface CustomEnterpriseService { /** - * @Description 企业信息完善 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 企业信息完善 * @Author songyunpeng - * @Date 2020/2/28 - * @Param [enterpriseInfoDTO] - * @return void + * @Date 2020/2/28 + * @Param [enterpriseInfoFormDTO] **/ Result completeEnterpriseInfo(EnterpriseInfoFormDTO enterpriseInfoFormDTO); /** - * @Description 查询企业信息 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 查询企业信息 * @Author songyunpeng - * @Date 2020/2/28 + * @Date 2020/2/28 * @Param [userId] - * @return com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO **/ Result selectOneEnterpriseInfo(String userId); diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java index eba4fdb56..25a33335a 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/controller/EnterpriseInfoController.java @@ -31,6 +31,7 @@ import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO; import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; import com.elink.esua.epdc.modules.enterprise.excel.EnterpriseInfoExcel; import com.elink.esua.epdc.modules.enterprise.service.EnterpriseInfoService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -48,24 +49,24 @@ import java.util.Map; @RestController @RequestMapping("enterpriseinfo") public class EnterpriseInfoController { - + @Autowired private EnterpriseInfoService enterpriseInfoService; @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = enterpriseInfoService.page(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { EnterpriseInfoDTO data = enterpriseInfoService.get(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody EnterpriseInfoDTO dto){ + public Result save(@RequestBody EnterpriseInfoDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); enterpriseInfoService.save(dto); @@ -73,7 +74,7 @@ public class EnterpriseInfoController { } @PutMapping - public Result update(@RequestBody EnterpriseInfoDTO dto){ + public Result update(@RequestBody EnterpriseInfoDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); enterpriseInfoService.update(dto); @@ -81,7 +82,7 @@ public class EnterpriseInfoController { } @DeleteMapping - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); enterpriseInfoService.delete(ids); @@ -106,29 +107,31 @@ public class EnterpriseInfoController { public Result completeRequisiteInfo(@RequestBody CompleteRequisiteInfoDTO fromDto) { return enterpriseInfoService.completeRequisiteInfo(fromDto); } + /** - * @Description 企业信息完善 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 企业信息完善 * @Author songyunpeng - * @Date 2020/2/28 + * @Date 2020/2/28 * @Param [dto] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @GetMapping("completeSelectiveInfo") - public Result completeEnterpriseInfo(@RequestBody EnterpriseInfoFormDTO dto){ + public Result completeEnterpriseInfo(@RequestBody EnterpriseInfoFormDTO dto) { ValidatorUtils.validateEntity(dto); enterpriseInfoService.completeEnterpriseInfo(dto); return new Result().ok(true); } + /** - * @Description 查询企业信息 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 查询企业信息 * @Author songyunpeng - * @Date 2020/2/28 + * @Date 2020/2/28 * @Param [userId] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @GetMapping("getByUserId/{userId}") - public Result getEnterpriseInfoByUserId(@PathVariable("userId") String userId){ - if(userId==null){ + public Result getEnterpriseInfoByUserId(@PathVariable("userId") String userId) { + if (StringUtils.isBlank(userId)) { return new Result().error("用户ID为空"); } EnterpriseInfoResultDTO enterpriseInfoDTO = enterpriseInfoService.selectOneEnterpriseInfo(userId);