物业平台内唯一

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java

@@ -17,9 +17,7 @@
 
 package com.epmet.dto.form;
 
-import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -35,17 +33,21 @@ public class IcPropertyManagementFormDTO implements Serializable {
     public interface DeleteGroup extends CustomerClientShowGroup {
     }
 
-    @NotBlank(message = "物业id不能为空", groups = { UpdateGroup.class,DeleteGroup.class})
-    private String id;
+    public interface AddShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface UpdateShowGroup extends CustomerClientShowGroup {
+    }
 
+    @NotBlank(message = "物业id不能为空", groups = {DeleteGroup.class, UpdateShowGroup.class})
+    private String id;
 
     /**
      * 物业名称
      */
-    @NotBlank(message = "物业名称不能为空", groups = {AddGroup.class, UpdateGroup.class})
-    @Length(max=50,message = "物业名称不能超过50个字", groups = {AddGroup.class, UpdateGroup.class})
-	private String name;
-
+    @NotBlank(message = "物业名称不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
+    @Length(max = 50, message = "物业名称不能超过50个字", groups = {AddShowGroup.class})
+    private String name;
 
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java

@@ -21,8 +21,6 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 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.dto.form.IcPropertyManagementFormDTO;
 import com.epmet.dto.result.IcPropertyManagementResultDTO;
 import com.epmet.service.IcPropertyManagementService;
@@ -64,7 +62,7 @@ public class PropertyManagementController {
     @PostMapping("add")
     public Result add(@LoginUser TokenDto tokenDTO, @RequestBody IcPropertyManagementFormDTO formDTO){
         //效验数据
-        ValidatorUtils.validateEntity(formDTO, AddGroup.class);
+        ValidatorUtils.validateEntity(formDTO, IcPropertyManagementFormDTO.AddShowGroup.class);
         Map map=new HashMap<>();
         map.put("propertyId",propertyManagementService.add(formDTO));
         return new Result().ok(map);
@@ -75,7 +73,7 @@ public class PropertyManagementController {
     @PostMapping("update")
     public Result update(@LoginUser TokenDto tokenDTO, @RequestBody IcPropertyManagementFormDTO formDTO){
         //效验数据
-        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class);
+        ValidatorUtils.validateEntity(formDTO, IcPropertyManagementFormDTO.UpdateShowGroup.class);
         propertyManagementService.update(formDTO);
         return new Result();
     }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java

@@ -29,5 +29,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcPropertyManagementDao extends BaseDao<IcPropertyManagementEntity> {
-	
+
+    IcPropertyManagementEntity selectByName(String name);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java

@@ -44,6 +44,13 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String add(IcPropertyManagementFormDTO formDTO) {
+        //物业名字平台内唯一
+        //如果输入的物业名字已经存在，直接返回物业id
+        formDTO.setName(formDTO.getName().trim());
+        IcPropertyManagementEntity entity = icPropertyManagementDao.selectByName(formDTO.getName());
+        if (null != entity) {
+            return entity.getId();
+        }
         IcPropertyManagementEntity icPropertyManagementEntity = ConvertUtils.sourceToTarget(formDTO, IcPropertyManagementEntity.class);
         icPropertyManagementDao.insert(icPropertyManagementEntity);
         return icPropertyManagementEntity.getId();

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml

@@ -14,5 +14,13 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-
+    <select id="selectByName" parameterType="java.lang.String" resultType="com.epmet.entity.IcPropertyManagementEntity">
+        SELECT
+            m.id
+        FROM
+            ic_property_management m
+        WHERE
+            m.DEL_FLAG = '0'
+          AND m.`NAME` = #{name}
+    </select>
 </mapper>