|
@@ -26,10 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.io.IOException;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -108,9 +105,11 @@ public class SceneMarkShapeController extends BaseController
|
|
|
public ResultData saveOrEditJson(@RequestBody SceneMarkShape param) {
|
|
|
SceneMarkShape shape = sceneMarkShapeService.findByNumAndImagePath(param.getNum(), param.getImagePath());
|
|
|
if (ObjectUtil.isNotNull(shape)){
|
|
|
- shape.setId(shape.getId());
|
|
|
- return ResultData.ok(sceneMarkShapeService.updateById(shape));
|
|
|
+ param.setId(shape.getId());
|
|
|
+ param.setUpdateTime(new Date());
|
|
|
+ return ResultData.ok(sceneMarkShapeService.updateById(param));
|
|
|
}else {
|
|
|
+ param.setCreateTime(new Date());
|
|
|
return ResultData.ok(sceneMarkShapeService.save(param));
|
|
|
}
|
|
|
}
|