合并

whole-estate/src/main/java/com/example/wholeestate/controller/CommentController.java

@@ -11,8 +11,15 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * <p>
  * 评论表 前端控制器
@@ -29,6 +36,12 @@ public class CommentController extends BaseController {
     @Autowired
     private ICommentService iCommentService;
 
+    @InitBinder
+    protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
+        binder.registerCustomEditor(Date.class, editor);
+    }
     @RequestMapping(value = "/comment/delete/{commentId}", method = RequestMethod.DELETE)
     @ApiOperation(value = "删除评论", notes = "删除评论")
     @ApiImplicitParams({

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

@@ -153,10 +153,18 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 
             JSONObject object= JSONObject.parseObject(parameter);
 
-            JSONArray contentImg = object.getJSONArray("img");
-            String imgType = object.getString("imgType");
-            String orderNo = object.getString("orderNo");
-            String[] contentImgArray = contentImg.toArray(new String[]{});
+        String imgStr = object.getString("img");
+        List<BuildingImg> buildingImgs = JSONObject.parseArray(imgStr, BuildingImg.class);
+            for (BuildingImg img:buildingImgs){
+                BuildingImg Images = new BuildingImg();
+                Images.setBuildingId(idGen.nextId()+"");
+                Images.setImgType(img.getImgType());
+                Images.setUrl(img.getUrl());
+                Images.setOrderNo(Integer.valueOf(img.getOrderNo()));
+                Images.setStatus(0);
+                Images.setCreateDate(LocalDateTime.now());
+                buildingImgMapper.insert(Images);
+            }
             Building building = JSONObject.parseObject(parameter,Building.class);
 //            if (!"".equals(building.getBuildingId())&&null!=building.getBuildingId()){
 //                response.addError("楼盘名称不能为空");
@@ -176,16 +184,9 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             building.setStatus(0);
             buildingMapper.insert(building);
 
-        for (String img : contentImgArray) {
-            BuildingImg Images = new BuildingImg();
-            Images.setBuildingId(building.getBuildingId());
-            Images.setImgType(imgType);
-            Images.setUrl(img);
-            Images.setOrderNo(Integer.valueOf(orderNo));
-            Images.setStatus(0);
-            Images.setCreateDate(LocalDateTime.now());
-            buildingImgMapper.insert(Images);
-        }
+
+
+
             response.addSuccess("成功");
             return response;
         }