|
|
|
@ -197,14 +197,21 @@ public class BasedataPatrolPointController extends BaseController { |
|
|
|
public AjaxResult add(@RequestBody JSONObject jsonObject) { |
|
|
|
BasedataPatrolPoint basedataPatrolpoint = jsonObject.toJavaObject(BasedataPatrolPoint.class); |
|
|
|
|
|
|
|
if (basedataPatrolpoint.getPatrolPointName().length() > 255) { |
|
|
|
return AjaxResult.error("点位名称长度不能超过255个字符"); |
|
|
|
String patrolPointName = basedataPatrolpoint.getPatrolPointName(); |
|
|
|
if (StringUtils.isNotEmpty(patrolPointName) && patrolPointName.length() > 255) { |
|
|
|
return AjaxResult.error("点位名称长度不能超过255个字符"); |
|
|
|
} |
|
|
|
|
|
|
|
if (basedataPatrolpoint.getPurpose().length() > 255) { |
|
|
|
String purpose = basedataPatrolpoint.getPurpose(); |
|
|
|
if (StringUtils.isNotEmpty(purpose) && purpose.length() > 255) { |
|
|
|
return AjaxResult.error("单位长度不能超过255个字符"); |
|
|
|
} |
|
|
|
|
|
|
|
String algSubtypeIds = basedataPatrolpoint.getAlgSubtypeIds(); |
|
|
|
if (StringUtils.isNotEmpty(algSubtypeIds) && algSubtypeIds.split(",").length > 10) { |
|
|
|
return AjaxResult.error("点位算法请勿配置超过10个"); |
|
|
|
} |
|
|
|
|
|
|
|
if (null != basedataPatrolpoint.getStdParolPointId()) { |
|
|
|
this.combinePatrolPointByStd(basedataPatrolpoint); |
|
|
|
} |
|
|
|
@ -257,6 +264,22 @@ public class BasedataPatrolPointController extends BaseController { |
|
|
|
public AjaxResult edit(@RequestBody JSONObject jsonObject) { |
|
|
|
BasedataPatrolPoint basedataPatrolpoint = jsonObject.toJavaObject(BasedataPatrolPoint.class); |
|
|
|
log.info("BASEDATA_PATROL_POINT_CONTROLLER EDIT param: {}", basedataPatrolpoint); |
|
|
|
|
|
|
|
String patrolPointName = basedataPatrolpoint.getPatrolPointName(); |
|
|
|
if (StringUtils.isNotEmpty(patrolPointName) && patrolPointName.length() > 255) { |
|
|
|
return AjaxResult.error("点位名称长度不能超过255个字符"); |
|
|
|
} |
|
|
|
|
|
|
|
String purpose = basedataPatrolpoint.getPurpose(); |
|
|
|
if (StringUtils.isNotEmpty(purpose) && purpose.length() > 255) { |
|
|
|
return AjaxResult.error("单位长度不能超过255个字符"); |
|
|
|
} |
|
|
|
|
|
|
|
String algSubtypeIds = basedataPatrolpoint.getAlgSubtypeIds(); |
|
|
|
if (StringUtils.isNotEmpty(algSubtypeIds) && algSubtypeIds.split(",").length > 10) { |
|
|
|
return AjaxResult.error("点位算法请勿配置超过10个"); |
|
|
|
} |
|
|
|
|
|
|
|
return this.toAjax(this.basedataPatrolPointService.updateBasedataPatrolPoint(basedataPatrolpoint)); |
|
|
|
} |
|
|
|
|
|
|
|
@ -343,5 +366,4 @@ public class BasedataPatrolPointController extends BaseController { |
|
|
|
public AjaxResult pointLatestResult (PointLatestResultVo pointLatestResultVo) { |
|
|
|
return AjaxResult.success(this.basedataPatrolPointService.pointLatestResult(pointLatestResultVo)); |
|
|
|
} |
|
|
|
|
|
|
|
} |