Tenlion/tenlion-module
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加文字长度自动设置/栏目增加校验

Browse Source
This commit is contained in:
cuibaocheng 2021-09-06 11:13:09 +08:00
parent 06136635a4
commit acecdd5b06
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
interface-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatearea/IPicturesTemplateAreaService.java
View File

@ -157,7 +157,7 @@ public interface IPicturesTemplateAreaService {
List<PicturesTemplateAreaDTO> getPicturesTemplateAreaByPicturesTemplateId(String picturesTemplateId) throws SearchException;
SuccessResult updatePicturesTemplateAreaPoint(String picturesTemplateAreaId, PicturesTemplateAreaPiointVO picturesTemplateAreaPiointVO) throws Exception;
SuccessResultData<String > updatePicturesTemplateAreaPoint(String picturesTemplateAreaId, PicturesTemplateAreaPiointVO picturesTemplateAreaPiointVO) throws Exception;
SuccessResult copyPicturesTemplateAreaPoint(String picturesTemplateAreaId, String templateAreaSource) throws Exception;

2
module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/controller/apis/picturestemplatearea/PicturesTemplateAreaController.java
View File

@ -80,7 +80,7 @@ public class PicturesTemplateAreaController extends DefaultBaseController {
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@PutMapping("updatepicturestemplateareapoint/{picturesTemplateAreaId}")
@CheckRequestBodyAnnotation
public SuccessResult updatePicturesTemplateAreaPoint(@PathVariable("picturesTemplateAreaId") String picturesTemplateAreaId, @RequestBody PicturesTemplateAreaPiointVO picturesTemplateAreaPiointVO) throws Exception {
public synchronized SuccessResultData<String> updatePicturesTemplateAreaPoint(@PathVariable("picturesTemplateAreaId") String picturesTemplateAreaId, @RequestBody PicturesTemplateAreaPiointVO picturesTemplateAreaPiointVO) throws Exception {
return picturesTemplateAreaService.updatePicturesTemplateAreaPoint(picturesTemplateAreaId, picturesTemplateAreaPiointVO);
}

19
module-building-pictures/src/main/java/cn/com/tenlion/buildingpictures/service/picturestemplatearea/impl/PicturesTemplateAreaServiceImpl.java
View File

@ -316,12 +316,13 @@ public class PicturesTemplateAreaServiceImpl extends DefaultBaseService implemen
}
@Override
public SuccessResult updatePicturesTemplateAreaPoint(String picturesTemplateAreaId, PicturesTemplateAreaPiointVO picturesTemplateAreaPiointVO) throws Exception {
public SuccessResultData<String> updatePicturesTemplateAreaPoint(String picturesTemplateAreaId, PicturesTemplateAreaPiointVO picturesTemplateAreaPiointVO) throws Exception {
/**
* 算出下，与 右
*/
String message = "";
PicturesTemplateAreaDTO areaDTO = getPicturesTemplateAreaById(picturesTemplateAreaId);
if(areaDTO.getTemplateAreaHeight() != picturesTemplateAreaPiointVO.getTemplateAreaHeight() || areaDTO.getTemplateAreaWidth() != picturesTemplateAreaPiointVO.getTemplateAreaWidth() || areaDTO.getTemplateAreaLeft() != picturesTemplateAreaPiointVO.getTemplateAreaLeft() || areaDTO.getTemplateAreaTop() != picturesTemplateAreaPiointVO.getTemplateAreaTop()) {
//if(areaDTO.getTemplateAreaHeight() != picturesTemplateAreaPiointVO.getTemplateAreaHeight() || areaDTO.getTemplateAreaWidth() != picturesTemplateAreaPiointVO.getTemplateAreaWidth() || areaDTO.getTemplateAreaLeft() != picturesTemplateAreaPiointVO.getTemplateAreaLeft() || areaDTO.getTemplateAreaTop() != picturesTemplateAreaPiointVO.getTemplateAreaTop()) {
// 移动的是文字区域
if("1".equals(areaDTO.getTemplateAreaServerLink())) {
// 计算区域可以容纳的文字数量 . 如果当前的限制字数 > 可容纳字数 , 将可容纳字数存储
@ -339,7 +340,8 @@ public class PicturesTemplateAreaServiceImpl extends DefaultBaseService implemen
// 设置自定义长度限制
if(areaDTO.getTemplateAreaFontLength() > fontLength * rowCount) {
updateFontLength.put("templateAreaFontLength", fontLength * rowCount);
picturesTemplateAreaDao.updatePicturesTemplateAreaFontLength(updateFontLength);
message = "当前区域文字仅可容纳: " + (fontLength * rowCount);
// picturesTemplateAreaDao.updatePicturesTemplateAreaFontLength(updateFontLength);
}
}
if("2".equals(areaDTO.getTemplateAreaFontCenter())) {
@ -347,7 +349,8 @@ public class PicturesTemplateAreaServiceImpl extends DefaultBaseService implemen
// 设置自定义长度限制
if(areaDTO.getTemplateAreaFontLength() > fontLength) {
updateFontLength.put("templateAreaFontLength", fontLength > 1 ? fontLength : 1);
picturesTemplateAreaDao.updatePicturesTemplateAreaFontLength(updateFontLength);
message = "当前区域文字仅可容纳: " + (fontLength > 1 ? fontLength : 1);
// picturesTemplateAreaDao.updatePicturesTemplateAreaFontLength(updateFontLength);
}
}
if("3".equals(areaDTO.getTemplateAreaFontCenter())) {
@ -356,12 +359,12 @@ public class PicturesTemplateAreaServiceImpl extends DefaultBaseService implemen
// 设置自定义长度限制
if(areaDTO.getTemplateAreaFontLength() > fontLength) {
updateFontLength.put("templateAreaFontLength", fontLength > 1 ? fontLength : 1);
picturesTemplateAreaDao.updatePicturesTemplateAreaFontLength(updateFontLength);
message = "当前区域文字仅可容纳: " + (fontLength > 1 ? fontLength : 1);
// picturesTemplateAreaDao.updatePicturesTemplateAreaFontLength(updateFontLength);
}
}
}
}
//}
Double down = picturesTemplateAreaPiointVO.getTemplateAreaLeft() + picturesTemplateAreaPiointVO.getTemplateAreaWidth();
picturesTemplateAreaPiointVO.setTemplateAreaDown(down);
Double right = picturesTemplateAreaPiointVO.getTemplateAreaTop() + picturesTemplateAreaPiointVO.getTemplateAreaHeight();
@ -370,7 +373,7 @@ public class PicturesTemplateAreaServiceImpl extends DefaultBaseService implemen
params.put("picturesTemplateAreaId", picturesTemplateAreaId);
setUpdateInfo(params);
picturesTemplateAreaDao.updatePicturesTemplateAreaPoint(params);
return new SuccessResult();
return new SuccessResultData<String>(message);
}
@Override

3
module-building-pictures/src/main/resources/templates/picturestemplate/save-picturestemplatearea.html
View File

@ -398,6 +398,9 @@
var formData = {templateAreaLeft : x.replace("px","") , templateAreaTop : y.replace("px","") , templateAreaHeight : h , templateAreaWidth : w };
var loadLayerIndex;
top.restAjax.put(top.restAjax.path('api/picturestemplatearea/updatepicturestemplateareapoint/{picturesTemplateAreaId}', [id]), formData, null, function(code, data) {
if(data.data) {
top.dialog.msg(data.data, {time: 2000});
}
}, function(code, data) {
top.dialog.msg(data.msg, {time: 1000});
}, function() {