返回前端部分错误信息

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java

@@ -7,8 +7,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.plugin.power.dto.rent.RentContractInfoDTO;
 import com.epmet.plugin.power.modules.rent.excel.RentContractInfoExcel;
 import com.epmet.plugin.power.modules.rent.service.RentContractInfoService;
@@ -34,29 +34,28 @@ public class RentContractInfoController {
     private RentContractInfoService rentContractInfoService;
 
     @RequestMapping("page")
-    public Result<PageData<RentContractInfoDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<RentContractInfoDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<RentContractInfoDTO> page = rentContractInfoService.page(params);
         return new Result<PageData<RentContractInfoDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
-    public Result<RentContractInfoDTO> get(@PathVariable("id") String id){
+    public Result<RentContractInfoDTO> get(@PathVariable("id") String id) {
         RentContractInfoDTO data = rentContractInfoService.get(id);
         return new Result<RentContractInfoDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody RentContractInfoDTO dto){
+    public Result save(@RequestBody RentContractInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        rentContractInfoService.save(dto);
+        return rentContractInfoService.save(dto);
-        return new Result();
     }
 
     @NoRepeatSubmit
     @PostMapping("review")
-    public Result review(@RequestBody RentContractInfoDTO dto){
+    public Result review(@RequestBody RentContractInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         rentContractInfoService.review(dto);
@@ -65,7 +64,7 @@ public class RentContractInfoController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody RentContractInfoDTO dto){
+    public Result update(@RequestBody RentContractInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         rentContractInfoService.update(dto);
@@ -73,7 +72,7 @@ public class RentContractInfoController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         rentContractInfoService.delete(ids);
@@ -87,5 +86,4 @@ public class RentContractInfoController {
     }
 
 
-
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentTenantInfoController.java

@@ -50,8 +50,7 @@ public class RentTenantInfoController {
     public Result save(@RequestBody RentTenantInfoDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        rentTenantInfoService.save(dto);
+        return rentTenantInfoService.save(dto);
-        return new Result();
     }
 
     @NoRepeatSubmit

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java

@@ -2,6 +2,7 @@ package com.epmet.plugin.power.modules.rent.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.plugin.power.dto.rent.RentContractInfoDTO;
 import com.epmet.plugin.power.modules.rent.entity.RentContractInfoEntity;
 
@@ -54,7 +55,7 @@ public interface RentContractInfoService extends BaseService<RentContractInfoEnt
      * @author generator
      * @date 2022-04-22
      */
-    void save(RentContractInfoDTO dto);
+    Result save(RentContractInfoDTO dto);
 
     /**
      * 审核

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentTenantInfoService.java

@@ -2,6 +2,7 @@ package com.epmet.plugin.power.modules.rent.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.plugin.power.dto.rent.RentTenantInfoDTO;
 import com.epmet.plugin.power.modules.rent.entity.RentTenantInfoEntity;
 
@@ -54,7 +55,7 @@ public interface RentTenantInfoService extends BaseService<RentTenantInfoEntity>
      * @author generator
      * @date 2022-04-22
      */
-    void save(RentTenantInfoDTO dto);
+    Result save(RentTenantInfoDTO dto);
 
     /**
      * 默认更新

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java

@@ -154,11 +154,11 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(RentContractInfoDTO dto) {
+    public Result save(RentContractInfoDTO dto) {
         RentContractInfoEntity entity = ConvertUtils.sourceToTarget(dto, RentContractInfoEntity.class);
         entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
         insert(entity);
-        updateTenantAndFile(entity.getId(), dto);
+        return updateTenantAndFile(entity.getId(), dto);
     }
 
     @Override
@@ -225,7 +225,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-    private void updateTenantAndFile(String contractId, RentContractInfoDTO dto) {
+    private Result updateTenantAndFile(String contractId, RentContractInfoDTO dto) {
         Map<String, Object> params = new HashMap<>(8);
         params.put("contractId", contractId);
         params.put("referenceId", contractId);
@@ -276,6 +276,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
             });
             rentContractFileService.insertBatch(fileList);
         }
+        return new Result();
     }
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java

@@ -5,11 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcResiUserAttachmentDTO;
 import com.epmet.dto.form.RentTenantFormDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -25,10 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 租客表
@@ -70,11 +66,13 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
     private QueryWrapper<RentTenantInfoEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
         String contractId = (String) params.get("contractId");
+        String idCard = (String) params.get("idCard");
         String type = (String) params.get("type");
 
         QueryWrapper<RentTenantInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
         wrapper.eq(StringUtils.isNotBlank(contractId), "CONTRACT_ID", contractId);
+        wrapper.eq(StringUtils.isNotBlank(idCard), "ID_CARD", idCard);
         wrapper.eq(StringUtils.isNotBlank(type), "TYPE", type);
 
         return wrapper;
@@ -88,11 +86,17 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(RentTenantInfoDTO dto) {
+    public Result save(RentTenantInfoDTO dto) {
+        Map<String, Object> params = new HashMap<>(4);
+        params.put("idCard",dto.getIdCard());
+        if(!list(params).isEmpty()){
+            return new Result().error("用户已存在");
+        }
+
         List<IcResiUserAttachmentDTO> images = new ArrayList<>();
         // 处理头像
         if (dto.getImgList().isEmpty()) {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "照片不能为空");
+            return new Result().error("照片不能为空");
         } else {
             RentTenantInfoEntity entity = ConvertUtils.sourceToTarget(dto, RentTenantInfoEntity.class);
             entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
@@ -122,6 +126,7 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
                 epmetUserOpenFeignClient.updateImage(formDTO);
             }
         }
+        return new Result();
     }
 
     @Override