小区库新增小区功能:不允许创建与别名完全一致的小区

This commit is contained in:
zhaojixiang@fangjia.com
2023-07-17 11:39:09 +08:00
parent 834c271b7d
commit 329bd3665e
3 changed files with 121 additions and 29 deletions
@@ -1185,6 +1185,36 @@ public class DistrictController {
model.setJsonModel(data);
return model;
}
/**
* 校验小区名是否为其他小区的别名
*/
public Object checkDistrictNameAction(@Param(name = "city") String city, @Param(name = "region") String region,
@Param(name = "name") String name, @Param(name = "cat") String cat, @Param(name = "id") String id) {
JsonModel model = new JsonModel();
boolean exist = false;
List list = new ArrayList<String>();
list.add(name);
List<QueryParam> params = new ArrayList<QueryParam>();
params.add(new QueryParam("category", cat));
params.add(new QueryParam("city", city));
params.add(new QueryParam("region", region));
params.add(new QueryParam("alias", name));
List<District> ds = districtService.findAllByParams(params);
if (CollectionUtils.isNotEmpty(ds)) {
for (District d : ds) {
if (!d.getId().equals(id)) {
exist = true;
break;
}
}
}
Map<String, Object> data = new HashMap<String, Object>();
data.put("exist", exist);
model.setJsonModel(data);
return model;
}
/**
* 保存新增小区
@@ -851,20 +851,20 @@ function add(){
}
}
var mappingAlias = $("#mappingAlias").val();
if(mappingAlias){
var aliasArr=alias.toString().split("\n");
var set=[];
for(var i=0;i<aliasArr.length;i++){
var aliasName=aliasArr[i].trim();
if(aliasName && aliasName!=''){
if(aliasName==name){
alert('小区名和别名不能相同!');
return false;
var mappingAlias = $("#mappingAlias").val();
if(mappingAlias){
var aliasArr=alias.toString().split("\n");
var set=[];
for(var i=0;i<aliasArr.length;i++){
var aliasName=aliasArr[i].trim();
if(aliasName && aliasName!=''){
if(aliasName==name){
alert('小区名和别名不能相同!');
return false;
}
}
}
}
}
var region = $("#region").val();
if (region == '') {
@@ -902,15 +902,35 @@ function add(){
timeout: 100000,
success: function(model) {
if(model.exist){
alert("小区名已存在")
return false;
alert("小区名已存在");
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
jQuery.ajax({
type: 'POST',
async: false,
url: '../district/checkDistrictName',
data: {city:city,region:region,name:name,cat:"district"},
dataType: 'json',
timeout: 100000,
success: function(model) {
if(model.exist){
alert("小区名是其他小区的别名");
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
@@ -930,13 +950,15 @@ function add(){
success: function(model) {
if (model.msg) {
alert('别名中 "' + model.msg + '" 已经是其他小区的小区名,不能作为别名使用!');
return false;
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
var flag = $("#goPic").val()
if(flag=="true"){
$("#lineForm").submit();
@@ -956,7 +978,7 @@ function add(){
});
}
}
@@ -21,7 +21,7 @@
<div id = "save">
<#assign markMap = district.markMap! />
<form id="lineForm" action="../district/save" method = "post">
<input type="hidden" name="district.id" value="${district.id}" />
<input type="hidden" id = "districtId" name="district.id" value="${district.id}" />
<input type="hidden" name="district.category" value="${district.category}" />
<input type="hidden" name="cityDisplay" value="${cityDisplay!}" />
<input type="hidden" name="keyword" value="${keyword!}" />
@@ -1116,20 +1116,18 @@ $(document).ready(function(){
alert('区域不能为空!');
return false;
}
/*
var dLat = $("#dLat").val();
if (dLat == '') {
alert('经纬度不能为空!');
return false;
}
var dLng = $("#dLng").val();
if (dLng == '') {
alert('经纬度不能为空!');
return false;
}
*/
var name = $("#districtName").val();
if (name == '') {
@@ -1169,14 +1167,56 @@ $(document).ready(function(){
}
}
/*
var address = $("#address").val();
if (address == '') {
alert('小区地址不能为空!');
return false;
}
*/
var id = $("#districtId").val();
var flg = false;
jQuery.ajax({
type: 'POST',
async: false,
url: '../district/validateDistrictName',
data: {city:city,region:region,name:name,cat:"district", id:id},
dataType: 'json',
timeout: 100000,
success: function(model) {
if(model.exist){
alert("小区名已存在");
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
jQuery.ajax({
type: 'POST',
async: false,
url: '../district/checkDistrictName',
data: {city:city,region:region,name:name,cat:"district",id:id},
dataType: 'json',
timeout: 100000,
success: function(model) {
if(model.exist){
alert("小区名是其他小区的别名");
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
jQuery.ajax({
type: 'POST',
@@ -1188,15 +1228,15 @@ $(document).ready(function(){
success: function(model) {
if (model.msg) {
alert('别名中 "' + model.msg + '" 已经是其他小区的小区名,不能作为别名使用!');
return false;
} else {
return true;
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
return true;
});