diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TownshipController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TownshipController.java new file mode 100644 index 000000000..af225d92a --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TownshipController.java @@ -0,0 +1,84 @@ +package com.fangjia.bkoff.controllers; + +import com.fangjia.bkoff.model.DevelopmentZoneModel; +import com.fangjia.bkoff.model.JsonModel; +import com.fangjia.bkoff.model.TownshipModel; +import com.fangjia.core.util.ThreadLocalData; +import com.fangjia.core.util.ThreadLocalKey; +import com.fangjia.dal.mongo.model.Township; +import com.fangjia.dal.mongo.model.bkoff.BkoffUsers; +import com.fangjia.service.mongo.bkoff.BkoffUsersService; +import com.fangjia.service.mongo.fangjia.TownshipService; +import org.apache.commons.lang.StringUtils; +import org.sothis.core.util.Pager; + +import java.util.*; + +/** + * Created by dxy on 2015/6/8. + */ +public class TownshipController { + private TownshipService townshipService; + private BkoffUsersService bkoffUsersService; + + public Object listAction(TownshipModel model) { + Pager pager = model.getPager(30); + if (pager.getCurrentPage() > 100) { + pager.setCurrentPage(1); + } + long countDev = townshipService.countTownship(model.getProvince(), model.getCity1(), model.getDistrict(),model.getStreet()); + pager.setTotalRows((int) countDev); + List townships = townshipService.findTownship(model.getProvince(), model.getCity1(), model.getDistrict(),model.getStreet(), pager); + model.setTownshipList(townships); + model.setPager(pager); + return model; + } + + public Object editAction(TownshipModel model) { + if (model.getId() == null) { + return model; + } + + model.setTownship(townshipService.findTownship(model.getId())); + return model; + } + + public Object updateAction(TownshipModel model) { + String userId = (String) ThreadLocalData.getInstance().get(ThreadLocalKey.UserId); + BkoffUsers user = bkoffUsersService.findBkoffUsersById(userId); + JsonModel ret = new JsonModel(); + Map data = new HashMap(); + if (model.getId() != null) { + Map udata = new HashMap(); + if (StringUtils.isNotBlank(model.getAlias())) { + String aliasString = model.getAlias().replaceAll(",", ","); + List alias = Arrays.asList(aliasString.split("\\s*,\\s*")); + udata.put("alias", alias); + } + udata.put("updateTime", new Date()); + //记录操作人员 + udata.put("operator", user.getRealName()); + townshipService.updateTownship(udata, model.getId()); + data.put("msg", "修改成功"); + } + ret.setJsonModel(data); + return ret; + } + + + public void setBkoffUsersService(BkoffUsersService bkoffUsersService) { + this.bkoffUsersService = bkoffUsersService; + } + + public TownshipService getTownshipService() { + return townshipService; + } + + public void setTownshipService(TownshipService townshipService) { + this.townshipService = townshipService; + } + + public BkoffUsersService getBkoffUsersService() { + return bkoffUsersService; + } +} diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/TownshipModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/TownshipModel.java new file mode 100644 index 000000000..7de4c3b55 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/TownshipModel.java @@ -0,0 +1,286 @@ +package com.fangjia.bkoff.model; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fangjia.dal.mongo.model.Township; + +import java.util.List; + +public class TownshipModel extends BaseModel { + private String province; + private String city1; + private String district; + private String street; + private String pid; + private String id; + + @JSONField(name = "tjj_province_code") + private String tjjProvinceCode; + + @JSONField(name = "tjj_city_code") + private String tjjCityCode; + + @JSONField(name = "tjj_district_code") + private String tjjDistrictCode; + + @JSONField(name = "tjj_street_code") + private String tjjStreetCode; + + @JSONField(name = "tjj_source_year") + private Integer tjjSourceYear; + + @JSONField(name = "mzb_province_code") + private String mzbProvinceCode; + + @JSONField(name = "mzb_city_code") + private String mzbCityCode; + + @JSONField(name = "mzb_district_code") + private String mzbDistrictCode; + + @JSONField(name = "mzb_district_name") + private String mzbDistrictName; + + @JSONField(name = "mzb_street_code") + private String mzbStreetCode; + + private String type; + + + private String alias; + + + @JSONField(name = "street_pinyin") + private String streetPinyin; + + //民政部区域和统计局区域是否相同,1为相同,0为不同,为了解决2条的问题 + @JSONField(name = "district_diff") + private Integer districtDiff; + + + //乡镇街道是否输出 0:不输出 1:输出 + @JSONField(name = "street_output") + private Integer streetOutput; + + + @JSONField(name = "province_short") + private String provinceShort; + + @JSONField(name = "city_short") + private String cityShort; + + @JSONField(name = "district_short") + private String districtShort; + + private Township township; + private List townshipList; + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getTjjProvinceCode() { + return tjjProvinceCode; + } + + public void setTjjProvinceCode(String tjjProvinceCode) { + this.tjjProvinceCode = tjjProvinceCode; + } + + public String getTjjCityCode() { + return tjjCityCode; + } + + public void setTjjCityCode(String tjjCityCode) { + this.tjjCityCode = tjjCityCode; + } + + public String getTjjDistrictCode() { + return tjjDistrictCode; + } + + public void setTjjDistrictCode(String tjjDistrictCode) { + this.tjjDistrictCode = tjjDistrictCode; + } + + public String getTjjStreetCode() { + return tjjStreetCode; + } + + public void setTjjStreetCode(String tjjStreetCode) { + this.tjjStreetCode = tjjStreetCode; + } + + public Integer getTjjSourceYear() { + return tjjSourceYear; + } + + public void setTjjSourceYear(Integer tjjSourceYear) { + this.tjjSourceYear = tjjSourceYear; + } + + public String getMzbProvinceCode() { + return mzbProvinceCode; + } + + public void setMzbProvinceCode(String mzbProvinceCode) { + this.mzbProvinceCode = mzbProvinceCode; + } + + public String getMzbCityCode() { + return mzbCityCode; + } + + public void setMzbCityCode(String mzbCityCode) { + this.mzbCityCode = mzbCityCode; + } + + public String getMzbDistrictCode() { + return mzbDistrictCode; + } + + public void setMzbDistrictCode(String mzbDistrictCode) { + this.mzbDistrictCode = mzbDistrictCode; + } + + public String getMzbDistrictName() { + return mzbDistrictName; + } + + public void setMzbDistrictName(String mzbDistrictName) { + this.mzbDistrictName = mzbDistrictName; + } + + public String getMzbStreetCode() { + return mzbStreetCode; + } + + public void setMzbStreetCode(String mzbStreetCode) { + this.mzbStreetCode = mzbStreetCode; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + + public String getStreetPinyin() { + return streetPinyin; + } + + public void setStreetPinyin(String streetPinyin) { + this.streetPinyin = streetPinyin; + } + + public Integer getDistrictDiff() { + return districtDiff; + } + + public void setDistrictDiff(Integer districtDiff) { + this.districtDiff = districtDiff; + } + + public Integer getStreetOutput() { + return streetOutput; + } + + public void setStreetOutput(Integer streetOutput) { + this.streetOutput = streetOutput; + } + + public String getProvinceShort() { + return provinceShort; + } + + public void setProvinceShort(String provinceShort) { + this.provinceShort = provinceShort; + } + + public String getCityShort() { + return cityShort; + } + + public void setCityShort(String cityShort) { + this.cityShort = cityShort; + } + + public String getDistrictShort() { + return districtShort; + } + + public void setDistrictShort(String districtShort) { + this.districtShort = districtShort; + } + + public String getCity1() { + return city1; + } + + public void setCity1(String city1) { + this.city1 = city1; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlias() { + return alias; + } + + public void setAlias(String alias) { + this.alias = alias; + } + + public Township getTownship() { + return township; + } + + public void setTownship(Township township) { + this.township = township; + } + + public List getTownshipList() { + return townshipList; + } + + public void setTownshipList(List townshipList) { + this.townshipList = townshipList; + } +} + diff --git a/projects/fangjia-bkoff/src/main/webapp/township/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/township/edit.ftl new file mode 100644 index 000000000..560488e30 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/webapp/township/edit.ftl @@ -0,0 +1,93 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + 涔¢晣缂栬緫 + + + + + <#include "/common_js.ftl" /> + <#include "/layout/header.ftl" /> +
+ + +
+
+ <#if township??> + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ + + +
+ +
+
+
+
+ + + + + + + diff --git a/projects/fangjia-bkoff/src/main/webapp/township/list.ftl b/projects/fangjia-bkoff/src/main/webapp/township/list.ftl new file mode 100644 index 000000000..705b3ea2e --- /dev/null +++ b/projects/fangjia-bkoff/src/main/webapp/township/list.ftl @@ -0,0 +1,63 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + 涔¢晣琛楅亾鍒楄〃 + + + + + <#include "/common_js.ftl" /> + <#include "/layout/header.ftl" /> +
+
+
+ + + + + + + + + +
+
+
+ 鏌ヨ鍒�${pager.totalRows!}鏉¤褰� + + + + + + + + + + <#list townshipList as it> + + + + + + + + + +
鐪佷唤鍩庡競鍖哄煙涔¢晣淇敼鏃ユ湡鎿嶄綔浜�
${it.province!}${it.city1!}${it.district!} ${it.street!}${it.updateTime!?string("yyyy-MM-dd HH:mm:ss")}${it.operator!}
+ <#if pager??> + <@d_pager controller="township" action="list" currentPage=pager.currentPage totalPages=pager.totalPages theme="full"/> + +
+
+ + + + \ No newline at end of file diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/TownshipDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/TownshipDao.java new file mode 100644 index 000000000..2944db4db --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/TownshipDao.java @@ -0,0 +1,8 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.MongoDao; +import com.fangjia.dal.mongo.model.Township; + +public interface TownshipDao extends MongoDao { + +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/TownshipDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/TownshipDaoImpl.java new file mode 100644 index 000000000..2d64ce390 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/TownshipDaoImpl.java @@ -0,0 +1,8 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.mongo.model.Township; + +public class TownshipDaoImpl extends MongoDaoImpl implements TownshipDao { + +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java new file mode 100644 index 000000000..ea8f98f6a --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/Township.java @@ -0,0 +1,328 @@ +package com.fangjia.dal.mongo.model; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fangjia.dal.MongoEntity; + +import javax.persistence.*; +import java.util.Date; +import java.util.List; + + +@Entity +@Table(name = "business.administrative_mapping") +public class Township implements MongoEntity { + + + private String province; + private String city1; + private String district; + private String street; + private String pid; + private String id; + @JSONField(name = "tjj_province_code") + private String tjjProvinceCode; + + @JSONField(name = "tjj_city_code") + private String tjjCityCode; + + @JSONField(name = "tjj_district_code") + private String tjjDistrictCode; + + @JSONField(name = "tjj_street_code") + private String tjjStreetCode; + + @JSONField(name = "tjj_source_year") + private Integer tjjSourceYear; + + @JSONField(name = "mzb_province_code") + private String mzbProvinceCode; + + @JSONField(name = "mzb_city_code") + private String mzbCityCode; + + @JSONField(name = "mzb_district_code") + private String mzbDistrictCode; + + @JSONField(name = "mzb_district_name") + private String mzbDistrictName; + + @JSONField(name = "mzb_street_code") + private String mzbStreetCode; + + private String type; + + + private List alias; + + + @JSONField(name = "street_pinyin") + private String streetPinyin; + + //民政部区域和统计局区域是否相同,1为相同,0为不同,为了解决2条的问题 + @JSONField(name = "district_diff") + private Integer districtDiff; + + + //乡镇街道是否输出 0:不输出 1:输出 + @JSONField(name = "street_output") + private Integer streetOutput; + + + @JSONField(name = "province_short") + private String provinceShort; + + @JSONField(name = "city_short") + private String cityShort; + + @JSONField(name = "district_short") + private String districtShort; + + private String operator; + private Date createTime; + private Date updateTime; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "_id") + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + @Column(name = "province") + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + @Column(name = "city") + public String getCity1() { + return city1; + } + + public void setCity1(String city1) { + this.city1 = city1; + } + + @Column(name = "district") + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + @Column(name = "street") + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + @Column(name = "pid") + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + @Column(name = "tjj_province_code") + public String getTjjProvinceCode() { + return tjjProvinceCode; + } + + public void setTjjProvinceCode(String tjjProvinceCode) { + this.tjjProvinceCode = tjjProvinceCode; + } + + @Column(name = "tjj_city_code") + public String getTjjCityCode() { + return tjjCityCode; + } + + public void setTjjCityCode(String tjjCityCode) { + this.tjjCityCode = tjjCityCode; + } + + @Column(name = "tjj_district_code") + public String getTjjDistrictCode() { + return tjjDistrictCode; + } + + public void setTjjDistrictCode(String tjjDistrictCode) { + this.tjjDistrictCode = tjjDistrictCode; + } + + @Column(name = "tjj_street_code") + public String getTjjStreetCode() { + return tjjStreetCode; + } + + public void setTjjStreetCode(String tjjStreetCode) { + this.tjjStreetCode = tjjStreetCode; + } + + @Column(name = "tjj_source_year") + public Integer getTjjSourceYear() { + return tjjSourceYear; + } + + public void setTjjSourceYear(Integer tjjSourceYear) { + this.tjjSourceYear = tjjSourceYear; + } + + @Column(name = "mzb_province_code") + public String getMzbProvinceCode() { + return mzbProvinceCode; + } + + public void setMzbProvinceCode(String mzbProvinceCode) { + this.mzbProvinceCode = mzbProvinceCode; + } + + @Column(name = "mzb_city_code") + public String getMzbCityCode() { + return mzbCityCode; + } + + public void setMzbCityCode(String mzbCityCode) { + this.mzbCityCode = mzbCityCode; + } + + @Column(name = "mzb_district_code") + public String getMzbDistrictCode() { + return mzbDistrictCode; + } + + public void setMzbDistrictCode(String mzbDistrictCode) { + this.mzbDistrictCode = mzbDistrictCode; + } + + @Column(name = "mzb_district_name") + public String getMzbDistrictName() { + return mzbDistrictName; + } + + public void setMzbDistrictName(String mzbDistrictName) { + this.mzbDistrictName = mzbDistrictName; + } + + @Column(name = "mzb_street_code") + public String getMzbStreetCode() { + return mzbStreetCode; + } + + public void setMzbStreetCode(String mzbStreetCode) { + this.mzbStreetCode = mzbStreetCode; + } + + @Column(name = "type") + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + @Column(name = "alias") + public List getAlias() { + return alias; + } + + public void setAlias(List alias) { + this.alias = alias; + } + + @Column(name = "street_pinyin") + public String getStreetPinyin() { + return streetPinyin; + } + + public void setStreetPinyin(String streetPinyin) { + this.streetPinyin = streetPinyin; + } + + @Column(name = "district_diff") + public Integer getDistrictDiff() { + return districtDiff; + } + + public void setDistrictDiff(Integer districtDiff) { + this.districtDiff = districtDiff; + } + + @Column(name = "street_output") + public Integer getStreetOutput() { + return streetOutput; + } + + public void setStreetOutput(Integer streetOutput) { + this.streetOutput = streetOutput; + } + + @Column(name = "province_short") + public String getProvinceShort() { + return provinceShort; + } + + public void setProvinceShort(String provinceShort) { + this.provinceShort = provinceShort; + } + + @Column(name = "city_short") + public String getCityShort() { + return cityShort; + } + + public void setCityShort(String cityShort) { + this.cityShort = cityShort; + } + + @Column(name = "district_short") + public String getDistrictShort() { + return districtShort; + } + + public void setDistrictShort(String districtShort) { + this.districtShort = districtShort; + } + + @Column(name = "operator") + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + @Column(name = "c_date") + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + @Column(name = "m_date") + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipService.java new file mode 100644 index 000000000..476b69aca --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipService.java @@ -0,0 +1,49 @@ +package com.fangjia.service.mongo.fangjia; + +import com.fangjia.dal.mongo.model.Township; +import org.sothis.core.util.Pager; + +import java.util.List; +import java.util.Map; + +/** + * Created by dxy on 2015/6/8. + */ +public interface TownshipService { + + + /** + * 更新 + * + * @param id + * @param udata + */ + public void updateTownship(Map udata, String id); + + /** + * + * @param province + * @param city + * @param district + * @param pager + * @return + */ + public List findTownship(String province, String city, String district,String street, Pager pager); + + /** + * 统计数量 + * @param province + * @param city + * @param district + * @return + */ + public long countTownship(String province, String city, String district,String street); + + /** + * 根据ID查找 + * @param id + * @return + */ + public Township findTownship(String id); + +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipServiceImpl.java new file mode 100644 index 000000000..90623eb32 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipServiceImpl.java @@ -0,0 +1,84 @@ +package com.fangjia.service.mongo.fangjia; + +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.mongo.dao.AdministrativeMappingDao; +import com.fangjia.dal.mongo.dao.TownshipDao; +import com.fangjia.dal.mongo.model.Township; +import org.apache.commons.lang.StringUtils; +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 TownshipServiceImpl implements TownshipService { + private TownshipDao townshipDao; + + + + @Override + public void updateTownship(Map map,String id) { + townshipDao.updateById(map,id); + } + + + + @Override + public List findTownship(String province, String city, String district,String street, Pager pager) { + List params = new ArrayList(); + if (StringUtils.isNotBlank(province)) { + Pattern pattern = Pattern.compile(".*" + province + ".*"); + params.add(new QueryParam("province", pattern)); + } + + if (StringUtils.isNotBlank(city)) { + Pattern pattern = Pattern.compile(".*" + city + ".*"); + params.add(new QueryParam("city1", pattern)); + } + if (StringUtils.isNotBlank(district)) { + Pattern pattern = Pattern.compile(".*" + district + ".*"); + params.add(new QueryParam("district", pattern)); + } + if (StringUtils.isNotBlank(street)) { + Pattern pattern = Pattern.compile(".*" + street + ".*"); + params.add(new QueryParam("street", pattern)); + } + params.add(new QueryParam("type","乡镇街道")); + + return townshipDao.findAllByParams(params, pager.getStartRow(), pager.getPageSize()); + } + + @Override + public long countTownship(String province, String city,String district,String street) { + List params = new ArrayList(); + if (StringUtils.isNotBlank(province)) { + Pattern pattern = Pattern.compile(".*" + province + ".*"); + params.add(new QueryParam("province", pattern)); + } + + if (StringUtils.isNotBlank(city)) { + Pattern pattern = Pattern.compile(".*" + city + ".*"); + params.add(new QueryParam("city1", pattern)); + } + if (StringUtils.isNotBlank(district)) { + Pattern pattern = Pattern.compile(".*" + district + ".*"); + params.add(new QueryParam("district", pattern)); + } + if (StringUtils.isNotBlank(street)) { + Pattern pattern = Pattern.compile(".*" + street + ".*"); + params.add(new QueryParam("street", pattern)); + } + params.add(new QueryParam("type","乡镇街道")); + return townshipDao.findCountByParams(params); + } + + @Override + public Township findTownship(String id) { + return townshipDao.findById(id); + } + + public void setTownshipDao(TownshipDao townshipDao) { + this.townshipDao = townshipDao; + } +}