合并

whole-estate/src/main/java/com/example/wholeestate/model/Building.java

@@ -28,7 +28,7 @@ public class Building implements Serializable {
     /**
      * 楼盘ID
      */
-    private Integer buildingId;
+    private String buildingId;
 
     /**
      * 楼盘名称

whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.common.uuid.IdGen;
 import com.example.wholeestate.dao.AppointmentMapper;
 import com.example.wholeestate.dao.BuildingMapper;
 import com.example.wholeestate.model.Building;
@@ -34,6 +35,9 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 
     @Autowired
     private AppointmentMapper AppointmentMapper;
+
+    private IdGen idGen = IdGen.get();
+
     @Override
     public ResponseBean buildingList(Integer pageNum,Integer pageSize) {
         ResponseBean response= new ResponseBean();
@@ -112,20 +116,22 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             JSONObject object= JSONObject.parseObject(parameter);
 
             Building building = JSONObject.parseObject(parameter,Building.class);
-            if (!"".equals(building.getBuildingId())&&null!=building.getBuildingId()){
-                response.addError("楼盘名称不能为空");
-                return response;
-            }
-            if (!"".equals(building.getPrice())&&null!=building.getPrice()){
-                response.addError("价格不能为空");
-                return response;
-            }
-            if (!"".equals(building.getOpeningDate())&&null!=building.getOpeningDate()){
-                response.addError("开盘时间");
-                return response;
-            }
+//            if (!"".equals(building.getBuildingId())&&null!=building.getBuildingId()){
+//                response.addError("楼盘名称不能为空");
+//                return response;
+//            }
+//            if (!"".equals(building.getPrice())&&null!=building.getPrice()){
+//                response.addError("价格不能为空");
+//                return response;
+//            }
+//            if (!"".equals(building.getOpeningDate())&&null!=building.getOpeningDate()){
+//                response.addError("开盘时间");
+//                return response;
+//            }
+            building.setBuildingId(idGen.nextId()+"");
             building.setOpeningDate(object.getDate("openingDate"));
             building.setCreateDate(LocalDateTime.now());
+            building.setStatus(0);
             buildingMapper.insert(building);
             response.addSuccess("成功");
             return response;