开发区围栏优化

This commit is contained in:
mjt
2024-04-09 15:56:43 +08:00
parent 58e501db38
commit 808a603938
6 changed files with 141 additions and 56 deletions
@@ -33,7 +33,9 @@ public class DevelopmentZoneController {
if (pager.getCurrentPage() > 100) {
pager.setCurrentPage(1);
}
List<DevelopmentZone> developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getName(), pager);
long countDev = developmentZoneService.countDev(model.getProvince(), model.getName(), model.getLevel());
pager.setTotalRows((int) countDev);
List<DevelopmentZone> developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getName(), model.getLevel(), pager);
model.setDevelopmentZoneList(developmentZones);
model.setPager(pager);
return model;
@@ -72,18 +74,17 @@ public class DevelopmentZoneController {
JsonModel ret = new JsonModel();
Map<String, Object> data = new HashMap<String, Object>();
ret.setJsonModel(data);
// name province bdLocation level 不能为空
if (StringUtils.isBlank(model.getProvince()) || StringUtils.isBlank(model.getName()) || model.getBdShape() == null || model.getBdShape().toString().equals("[]") || StringUtils.isBlank(model.getLevel())) {
data.put("msg", "保存失败(开发区名称,所在省份,级别,围栏不能为空)");
return ret;
}
if (model.getId() == null) {
// name province bdLocation level 不能为空
if (StringUtils.isBlank(model.getProvince()) || StringUtils.isBlank(model.getName()) || model.getBdShape() == null || model.getBdShape().toString().equals("[]") || StringUtils.isBlank(model.getLevel())) {
data.put("msg", "保存失败(开发区名称,所在省份,级别,围栏不能为空)");
return ret;
}
DevelopmentZone entity = new DevelopmentZone();
// name province bdLocation level 不能为空/
entity.setName(model.getName());
entity.setProvince(model.getProvince());
String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", "");
String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", "");
List<List<Double>> bdLocationList = new ArrayList<List<Double>>();
String[] splitStr = locationStr.split(";");
for (int i = 0; i < splitStr.length; i++) {
@@ -116,54 +117,80 @@ public class DevelopmentZoneController {
entity.setNameEn(StringUtils.isBlank(model.getNameEn()) ? "" : model.getNameEn());
entity.setType(StringUtils.isBlank(model.getType()) ? "" : model.getType());
entity.setUrl(StringUtils.isBlank(model.getUrl()) ? "" : model.getUrl());
entity.setCityName(StringUtils.isBlank(model.getCityName()) ? "" : model.getCityName());
//记录操作人员
entity.setOperator(user.getRealName());
developmentZoneService.saveDevelopmentZone(entity);
data.put("msg", "保存成功");
} else {
DevelopmentZone entity = developmentZoneService.findDevelopmentZone(model.getId());
// Map<String, Object> udata = new HashMap<String, Object>();
// name province bdLocation level 不能为空
entity.setName(model.getName());
entity.setProvince(model.getProvince());
String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", "");
List<List<Double>> bdLocationList = new ArrayList<List<Double>>();
String[] splitStr = locationStr.split(";");
for (int i = 0; i < splitStr.length; i++) {
String[] splitStr2 = splitStr[i].split(",");
List<Double> location = new ArrayList<Double>();
location.add(Double.parseDouble(splitStr2[0]));
location.add(Double.parseDouble(splitStr2[1]));
bdLocationList.add(location);
// DevelopmentZone entity = developmentZoneService.findDevelopmentZone(model.getId());
Map<String, Object> udata = new HashMap<String, Object>();
if (StringUtils.isNotBlank(model.getProvince())) {
udata.put("province", model.getProvince());
}
if (StringUtils.isNotBlank(model.getName())) {
udata.put("name", model.getName());
}
if (StringUtils.isNotBlank(model.getLevel())) {
udata.put("level", model.getLevel());
}
if (model.getBdShape() != null && !model.getBdShape().toString().equals("[]")) {
String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", "");
List<List<Double>> bdLocationList = new ArrayList<List<Double>>();
String[] splitStr = locationStr.split(";");
for (int i = 0; i < splitStr.length; i++) {
String[] splitStr2 = splitStr[i].split(",");
List<Double> location = new ArrayList<Double>();
location.add(Double.parseDouble(splitStr2[0]));
location.add(Double.parseDouble(splitStr2[1]));
bdLocationList.add(location);
}
model.setBdShape(bdLocationList);
// 百度经纬度
Map<String, Object> bdShape = new HashMap<String, Object>();
bdShape.put("type", "polygon");
bdShape.put("coordinates", model.getBdShape());
udata.put("bdShape", bdShape);
// 高德经纬度
Map<String, Object> shape = new HashMap<String, Object>();
shape.put("type", "polygon");
Object coordinates = convertGeoList(model.getBdShape());
shape.put("coordinates", coordinates);
udata.put("shape", shape);
}
model.setBdShape(bdLocationList);
// 百度经纬度
Map<String, Object> bdShape = new HashMap<String, Object>();
bdShape.put("type", "polygon");
bdShape.put("coordinates", model.getBdShape());
entity.setBdShape(bdShape);
// 高德经纬度
Map<String, Object> shape = new HashMap<String, Object>();
shape.put("type", "polygon");
Object coordinates = convertGeoList(model.getBdShape());
shape.put("coordinates", coordinates);
entity.setShape(shape);
entity.setLevel(model.getLevel());
entity.setAddress(StringUtils.isBlank(model.getAddress()) ? "" : model.getAddress());
entity.setArea(StringUtils.isBlank(model.getArea()) ? "" : model.getArea());
entity.setBlock(StringUtils.isBlank(model.getBlock()) ? "" : model.getBlock());
entity.setBuildDate(StringUtils.isBlank(model.getBuildDate()) ? "" : model.getBuildDate());
entity.setCreateTime(new Date());
entity.setIndustry(StringUtils.isBlank(model.getIndustry()) ? "" : model.getIndustry());
entity.setNameEn(StringUtils.isBlank(model.getNameEn()) ? "" : model.getNameEn());
entity.setType(StringUtils.isBlank(model.getType()) ? "" : model.getType());
entity.setUrl(StringUtils.isBlank(model.getUrl()) ? "" : model.getUrl());
if (StringUtils.isNotBlank(model.getAddress())) {
udata.put("address", model.getAddress());
}
if (StringUtils.isNotBlank(model.getArea())) {
udata.put("area", model.getArea());
}
if (StringUtils.isNotBlank(model.getBlock())) {
udata.put("block", model.getBlock());
}
if (StringUtils.isNotBlank(model.getBuildDate())) {
udata.put("buildDate", model.getBuildDate());
}
if (StringUtils.isNotBlank(model.getIndustry())) {
udata.put("industry", model.getIndustry());
}
if (StringUtils.isNotBlank(model.getNameEn())) {
udata.put("nameEn", model.getNameEn());
}
if (StringUtils.isNotBlank(model.getType())) {
udata.put("type", model.getType());
}
if (StringUtils.isNotBlank(model.getUrl())) {
udata.put("url", model.getUrl());
}
if (StringUtils.isNotBlank(model.getCityName())) {
udata.put("cityName", model.getCityName());
}
udata.put("createTime", new Date());
//记录操作人员
entity.setOperator(user.getRealName());
developmentZoneService.updateDevelopmentZone(entity);
data.put("msg", "保存成功");
udata.put("operator", user.getRealName());
developmentZoneService.updateDevelopmentZone(udata, model.getId());
data.put("msg", "修改成功");
}
return ret;
@@ -35,6 +35,7 @@
<label for="name">开发区名称:</label> <input id="name" name="name" type="text" value="<#if developmentZone??>${developmentZone.name!}</#if>"/>
<label for="nameEn">开发区名称拼音:</label> <input id="nameEn" name="nameEn" type="text" value="<#if developmentZone??>${developmentZone.nameEn!}</#if>"/>
<label for="province">所在省份:</label> <input id="province" name="province" type="text" value="<#if developmentZone??>${developmentZone.province!}</#if>"/>
<label for="cityName">城市:</label><input id="cityName" name="cityName" type="text" value="<#if developmentZone??>${developmentZone.cityName!}</#if>"/>
<label for="level">级别:</label> <input id="level" name="level" type="text" value="<#if developmentZone??>${developmentZone.level!}</#if>"/>
<label for="address">地址:</label> <input id="address" name="address" type="text" value="<#if developmentZone??>${developmentZone.address!}</#if>"/>
<label for="area">所在地区:</label> <input id="area" name="area" type="text" value="<#if developmentZone??>${developmentZone.area!}</#if>"/>
@@ -24,17 +24,22 @@
<label for="name">名称:</label>
<input type="text" name="name" id="name" class="input-medium" style="margin-top:9px;"
value="${name!}"></input>
<label for="name">开发区级别:</label>
<input type="text" name="level" id="level" class="input-medium" style="margin-top:9px;"
value="${level!}"></input>
<input id="queryBtn" class="btn btn-primary" type="submit" value="查询"/>
</div>
</form>
<div class="list" style="margin-top:5px;">
<span style="font-size:12px;">查询到<b style="color:red;">${pager.totalRows!}</b>条记录</span>
<table style="float:left;" name="reginTable" class="regionTab">
<tr>
<th>名称</th>
<th>级别</th>
<th>开发区级别</th>
<th>省份</th>
<th>区块</th>
<th style="width: 160px">操作人员</th>
<th style="width: 120px;">操作</th>
</tr>
@@ -43,6 +48,7 @@
<td>${it.name!}</td>
<td>${it.level!}</td>
<td>${it.province!}</td>
<td>${it.block!}</td>
<td>
${it.operator!}
</td>
@@ -32,6 +32,8 @@ public class DevelopmentZone implements MongoEntity {
private String block;
private String operator;
private String cityName;
private String district;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@@ -180,4 +182,25 @@ public class DevelopmentZone implements MongoEntity {
public void setOperator(String operator) {
this.operator = operator;
}
@Column(name = "city")
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
@Column(name = "district")
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
}
@@ -33,7 +33,7 @@ public interface DevelopmentZoneService {
* @param id
* @param udata
*/
public void updateDevelopmentZone(DevelopmentZone developmentZone);
public void updateDevelopmentZone(Map<String,Object> udata, String id);
/**
* 根据ID查询
@@ -51,7 +51,9 @@ public interface DevelopmentZoneService {
* @param pager
* @return
*/
public List<DevelopmentZone> findDevelopmentZone(String province,String name, Pager pager);
public List<DevelopmentZone> findDevelopmentZone(String province,String name,String level, Pager pager);
public long countDev(String province,String name,String level);
}
@@ -10,6 +10,7 @@ import org.sothis.core.util.Pager;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
private DevelopmentZoneDao developmentZoneDao;
@@ -26,8 +27,8 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
}
@Override
public void updateDevelopmentZone(DevelopmentZone developmentZone) {
developmentZoneDao.update(developmentZone);
public void updateDevelopmentZone(Map<String,Object> map,String id) {
developmentZoneDao.updateById(map,id);
}
@Override
@@ -37,19 +38,44 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
@Override
public List<DevelopmentZone> findDevelopmentZone(String province, String name, Pager pager) {
public List<DevelopmentZone> findDevelopmentZone(String province, String name,String level, Pager pager) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(province)) {
params.add(new QueryParam("province", province));
Pattern pattern = Pattern.compile(".*" + province + ".*");
params.add(new QueryParam("province", pattern));
}
if (StringUtils.isNotBlank(name)) {
params.add(new QueryParam("name", name));
Pattern pattern = Pattern.compile(".*" + name + ".*");
params.add(new QueryParam("name", pattern));
}
if (StringUtils.isNotBlank(level)) {
Pattern pattern = Pattern.compile(".*" + level + ".*");
params.add(new QueryParam("level", pattern));
}
return developmentZoneDao.findAllByParams(params, pager.getStartRow(), pager.getPageSize());
}
@Override
public long countDev(String province, String name,String level) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(province)) {
Pattern pattern = Pattern.compile(".*" + province + ".*");
params.add(new QueryParam("province", pattern));
}
if (StringUtils.isNotBlank(name)) {
Pattern pattern = Pattern.compile(".*" + name + ".*");
params.add(new QueryParam("name", pattern));
}
if (StringUtils.isNotBlank(level)) {
Pattern pattern = Pattern.compile(".*" + level + ".*");
params.add(new QueryParam("level", pattern));
}
return developmentZoneDao.findCountByParams(params);
}
public void setDevelopmentZoneDao(DevelopmentZoneDao developmentZoneDao) {
this.developmentZoneDao = developmentZoneDao;