From c9e985cea330eac67146a520bfb5b592f87f7327 Mon Sep 17 00:00:00 2001 From: aa1214761728 Date: Sun, 28 Nov 2021 17:40:30 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=96=B0=E6=80=8Ecity=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rest/CityGeomController.java | 2 + .../controller/rest/CityInfoController.java | 40 +++++++++ .../java/com/cetc32/dh/entity/CityGeom.java | 19 +++- .../java/com/cetc32/dh/entity/CityInfo.java | 65 ++++++++++++++ .../cetc32/dh/mybatis/AreaCommonMapper.java | 16 ++++ .../com/cetc32/dh/mybatis/CityGeomMapper.java | 2 + .../cetc32/dh/service/CityInfoService.java | 12 +++ .../dh/service/impl/CityInfoServiceImpl.java | 67 ++++++++++++++ .../resources/mapper/AreaCommonMapper.xml | 87 +++++++++++++++++++ src/main/resources/mapper/CityGeomMapper.xml | 9 ++ src/test/java/com/cetc32/DataAreaTest.java | 2 +- src/test/resources/application-xwybjb.yml | 2 + src/test/resources/application.yml | 2 + 13 files changed, 320 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java create mode 100644 src/main/java/com/cetc32/dh/entity/CityInfo.java create mode 100644 src/main/java/com/cetc32/dh/mybatis/AreaCommonMapper.java create mode 100644 src/main/java/com/cetc32/dh/service/CityInfoService.java create mode 100644 src/main/java/com/cetc32/dh/service/impl/CityInfoServiceImpl.java create mode 100644 src/main/resources/mapper/AreaCommonMapper.xml diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java index dc81836..8438490 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java @@ -79,9 +79,11 @@ public class CityGeomController { /** + * @Deprecated * city名称转换 * 如返回："中国,陕西省,西安市;" */ + @Deprecated @PostMapping("/nameChange") public ResponseResult nameChange(@RequestBody Map map) { String areaNames = (String) map.get("areaNames"); diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java new file mode 100644 index 0000000..0588909 --- /dev/null +++ b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java @@ -0,0 +1,40 @@ +package com.cetc32.dh.controller.rest; + +import com.cetc32.dh.common.response.PageDataResult; +import com.cetc32.dh.common.response.ResponseData; +import com.cetc32.dh.entity.CityInfo; +import com.cetc32.dh.service.CityInfoService; +import com.cetc32.webutil.common.annotations.LoginSkipped; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/rest/city/") +@LoginSkipped +public class CityInfoController { + @Autowired + CityInfoService cityInfoService; + + @RequestMapping("/query") + public PageDataResult queryCityInfos(@RequestBody CityInfo cityInfo,Integer page,Integer limit){ + if(cityInfo==null){ + cityInfo =new CityInfo(); + } + if(page==null || page <=0){ + page =1; + } + if(limit==null || limit <=0){ + limit =15; + } + cityInfo.setPage(page); + cityInfo.setResults(limit); + int totals =cityInfoService.countCityInfoByParam(cityInfo); + return PageDataResult.success(totals, + cityInfoService.selectCityInfoByParam(cityInfo),cityInfo.getOffset()); + //return ResponseData.success(); + } + + +} diff --git a/src/main/java/com/cetc32/dh/entity/CityGeom.java b/src/main/java/com/cetc32/dh/entity/CityGeom.java index c602071..ca1b192 100644 --- a/src/main/java/com/cetc32/dh/entity/CityGeom.java +++ b/src/main/java/com/cetc32/dh/entity/CityGeom.java @@ -8,13 +8,14 @@ package com.cetc32.dh.entity; import com.cetc32.dh.common.bean.TreeNode; +import org.apache.commons.lang3.StringUtils; import javax.persistence.Column; import javax.persistence.Id; import javax.persistence.Table; @Table(name = "city_geom") -public class CityGeom implements TreeNode { +public class CityGeom extends NumberS implements TreeNode { private String city; @@ -46,7 +47,7 @@ public class CityGeom implements TreeNode { } public void setCity(String city) { - this.city = city; + this.city = formatStr(city); } public String getCityCode() { @@ -54,7 +55,7 @@ public class CityGeom implements TreeNode { } public void setCityCode(String city_code) { - this.cityCode = city_code; + this.cityCode = formatStr(city_code); } public String getProvinceCode() { @@ -62,7 +63,7 @@ public class CityGeom implements TreeNode { } public void setProvinceCode(String province_code) { - this.provinceCode = province_code; + this.provinceCode = formatStr(province_code); } public String getProvince() { @@ -100,4 +101,14 @@ public class CityGeom implements TreeNode { public String getParentKey() { return provinceCode; } + + protected String formatStr(String str){ + if(StringUtils.isBlank(str) ) + return null; + str =str.trim(); + if(str.equals("%%")||str.equals("%")){ + return null; + } + return str; + } } diff --git a/src/main/java/com/cetc32/dh/entity/CityInfo.java b/src/main/java/com/cetc32/dh/entity/CityInfo.java new file mode 100644 index 0000000..0f1148f --- /dev/null +++ b/src/main/java/com/cetc32/dh/entity/CityInfo.java @@ -0,0 +1,65 @@ +package com.cetc32.dh.entity; + +import org.apache.commons.lang3.StringUtils; + +public class CityInfo extends CityGeom{ + String cityPhonePrefix; + String remarks; + String mergerName; + Integer levelType; + String keyWords; + public void setId(String id){ + setCityCode(id); + } + + public String getId(){ + return getCityCode(); + } + + public void setParentId(String parentId){ + setProvinceCode(parentId); + } + + public String getParentId(){ + return getProvinceCode(); + } + + public String getCityPhonePrefix() { + return cityPhonePrefix; + } + + public void setCityPhonePrefix(String cityPhonePrefix) { + this.cityPhonePrefix = formatStr(cityPhonePrefix); + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = formatStr(remarks); + } + + public Integer getLevelType() { + return levelType; + } + + public void setLevelType(Integer levelType) { + this.levelType = levelType; + } + + public String getMergerName() { + return mergerName; + } + + public void setMergerName(String mergerName) { + this.mergerName = formatStr(mergerName); + } + + public void setKeyWords(String keyWords){ + this.keyWords = formatStr(keyWords); + } + public String getKeyWords(){ + return keyWords; + } +} diff --git a/src/main/java/com/cetc32/dh/mybatis/AreaCommonMapper.java b/src/main/java/com/cetc32/dh/mybatis/AreaCommonMapper.java new file mode 100644 index 0000000..dffd8ff --- /dev/null +++ b/src/main/java/com/cetc32/dh/mybatis/AreaCommonMapper.java @@ -0,0 +1,16 @@ +package com.cetc32.dh.mybatis; + +import com.cetc32.dh.entity.CityGeom; +import com.cetc32.dh.entity.CityInfo; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface AreaCommonMapper { + public Integer insertOrUpdateCity(CityInfo cityInfo); + public List selectCityByQuery(CityInfo cityInfo ); + public Integer countCityByQuery(CityInfo cityInfo); + public Integer deleteById(@Param("id")String id); +} diff --git a/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java index 1c824c2..61e7d78 100644 --- a/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java @@ -16,6 +16,8 @@ import java.util.List; @Repository public interface CityGeomMapper extends Mapper { + public Integer insertOrUpdateCity(CityGeom city); + public Integer deleteByCityCode(@Param("cityCode")String cityCode); public List selectCityTree(@Param("proCode")String proCode) ; public String selectCityInCodes( List areaCodes); diff --git a/src/main/java/com/cetc32/dh/service/CityInfoService.java b/src/main/java/com/cetc32/dh/service/CityInfoService.java new file mode 100644 index 0000000..2885186 --- /dev/null +++ b/src/main/java/com/cetc32/dh/service/CityInfoService.java @@ -0,0 +1,12 @@ +package com.cetc32.dh.service; + +import com.cetc32.dh.entity.CityInfo; + +import java.util.List; + +public interface CityInfoService { + public Integer insertUpdateCityInfo(CityInfo cityInfo); + public Integer deleteCityInfo(String cityCode); + public List selectCityInfoByParam(CityInfo cityInfo); + public Integer countCityInfoByParam(CityInfo cityInfo); +} diff --git a/src/main/java/com/cetc32/dh/service/impl/CityInfoServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/CityInfoServiceImpl.java new file mode 100644 index 0000000..cd20fb3 --- /dev/null +++ b/src/main/java/com/cetc32/dh/service/impl/CityInfoServiceImpl.java @@ -0,0 +1,67 @@ +package com.cetc32.dh.service.impl; + +import com.cetc32.dh.entity.CityInfo; +import com.cetc32.dh.mybatis.AreaCommonMapper; +import com.cetc32.dh.mybatis.CityGeomMapper; +import com.cetc32.dh.service.CityInfoService; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class CityInfoServiceImpl implements CityInfoService { + @Autowired + CityGeomMapper cityGeomMapper; + @Autowired + AreaCommonMapper areaCommonMapper; + @Override + public Integer insertUpdateCityInfo(CityInfo cityInfo) { + if(cityInfo ==null ) + return -1; + if(cityInfo.getCityCode()== null || cityInfo.getProvinceCode() ==null) + return -1; + try{ + cityGeomMapper.insertOrUpdateCity(cityInfo); + areaCommonMapper.insertOrUpdateCity(cityInfo); + return 1; + }catch (Exception e){ + + } + return -1; + } + + @Override + public Integer deleteCityInfo(String cityCode) { + if(StringUtils.isNotBlank(cityCode)){ + try{ + cityGeomMapper.deleteByCityCode(cityCode); + areaCommonMapper.deleteById(cityCode); + }catch (Exception e){ + + } + } + return -1; + } + + @Override + public List selectCityInfoByParam(CityInfo cityInfo) { + if(cityInfo !=null){ + if(null != cityInfo.getRemarks()){ + cityInfo.setRemarks("%"+cityInfo.getRemarks()+"%"); + } + } + return areaCommonMapper.selectCityByQuery(cityInfo); + } + + @Override + public Integer countCityInfoByParam(CityInfo cityInfo) { + if(cityInfo !=null){ + if(null != cityInfo.getRemarks()){ + cityInfo.setRemarks("%"+cityInfo.getRemarks()+"%"); + } + } + return areaCommonMapper.countCityByQuery(cityInfo); + } +} diff --git a/src/main/resources/mapper/AreaCommonMapper.xml b/src/main/resources/mapper/AreaCommonMapper.xml new file mode 100644 index 0000000..f5c7ce1 --- /dev/null +++ b/src/main/resources/mapper/AreaCommonMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + insert into area_common(name,id,parent_id,merger_name,city_code,level_type,remarks) + values(#{city},#{cityCode},#{provinceCode},#{mergerName},#{cityPhonePrefix},#{levelType},#{remarks}) + on conflict(id) + do update set name=#{city},parent_id = #{provinceCode},province =#{mergerName},city_code =#{cityPhonePrefix}, + level_type =#{levelType},remarks =#{remarks} + + + + + + delete from area_common where id = #{id} + + + + diff --git a/src/main/resources/mapper/CityGeomMapper.xml b/src/main/resources/mapper/CityGeomMapper.xml index cb0810e..0596ac8 100644 --- a/src/main/resources/mapper/CityGeomMapper.xml +++ b/src/main/resources/mapper/CityGeomMapper.xml @@ -18,7 +18,16 @@ order by city_code asc + + insert into city_geom(city,city_code,province_code,province,polygon_text) + values(#{city},#{cityCode},#{provinceCode},#{province},#{polygonText}) + on conflict(city_code) + do update set city=#{city},province_code = #{provinceCode},province =#{province},polygon_text =#{polygonText} + + + delete from city_geom where city_code = #{cityCode} + update city_geom diff --git a/src/test/java/com/cetc32/DataAreaTest.java b/src/test/java/com/cetc32/DataAreaTest.java index 1dd18f9..1b94380 100644 --- a/src/test/java/com/cetc32/DataAreaTest.java +++ b/src/test/java/com/cetc32/DataAreaTest.java @@ -38,7 +38,7 @@ public class DataAreaTest { ZqAreaMapper zqAreaMapper; //@Autowired DataFileMapper dataFileMapper; - @Autowired + //@Autowired DataAreaMapper dataAreaMapper; //@Test diff --git a/src/test/resources/application-xwybjb.yml b/src/test/resources/application-xwybjb.yml index 52cfd63..74ba91f 100644 --- a/src/test/resources/application-xwybjb.yml +++ b/src/test/resources/application-xwybjb.yml @@ -92,3 +92,5 @@ sso: registerUrl : ${sso.authcenter}/rest/api/sys/sync offlineDataMenuId : 151 gainMenuId: 21 +plpUrl: /plpData +traceUrl: /traceData \ No newline at end of file diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index 7737de8..f0371d4 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -91,3 +91,5 @@ sso: sysname : 数据管理系统 registerUrl : ${sso.authcenter}/rest/api/sys/sync offlineDataMenuId : 151 +plpUrl: /plpData +traceUrl: /traceData -- Gitee From 624bc03bbe3a11f83b3933c2cdd84f29d04df738 Mon Sep 17 00:00:00 2001 From: Xuwenyuan Date: Tue, 14 Dec 2021 09:28:50 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 16 +++++++++------- .../rest/OtherInterfaceController.java | 2 +- .../rest/ProductionTaskController.java | 2 -- .../dh/service/impl/DataFileServiceImpl.java | 1 - 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 0266af0..be680b8 100644 --- a/pom.xml +++ b/pom.xml @@ -47,11 +47,11 @@ org.springframework.boot spring-boot-starter-test - + org.springframework.boot spring-boot-starter-tomcat @@ -257,12 +257,12 @@ javassist 3.27.0-GA - + net.postgis @@ -344,20 +344,22 @@ spring-boot-maven-plugin com.cetc32.dh.DhApplication + true - + + true<!– 如果没有该配置，热部署的devtools不生效 –> - + --> org.apache.maven.plugins maven-resources-plugin + @ false diff --git a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java index 867834a..f402ef3 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/OtherInterfaceController.java @@ -17,9 +17,9 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.lang.Nullable; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/cetc32/dh/controller/rest/ProductionTaskController.java b/src/main/java/com/cetc32/dh/controller/rest/ProductionTaskController.java index c41534d..02a56ae 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/ProductionTaskController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/ProductionTaskController.java @@ -13,7 +13,6 @@ import com.cetc32.dh.service.DataMenuService; import com.cetc32.dh.service.DataPlpService; import com.cetc32.webutil.common.annotations.LoginSkipped; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; @@ -155,7 +154,6 @@ public class ProductionTaskController { return ResponseData.success(results); } - @NotNull private String getPlpMenuId() { List menus = dataMenuService.selectAll(); diff --git a/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java index 96d1389..e8d515e 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DataFileServiceImpl.java @@ -23,7 +23,6 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.GetMapping; -- Gitee From 6b9306b70d0f7e4030b21026ac2dcc313bf06751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Fri, 24 Dec 2021 14:44:37 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=9F=BA=E4=BA=8EUser=E7=9A=84AreaCode?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E5=AE=8C=E6=88=90=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=8C=20=E5=9F=BA=E4=BA=8Epolygon=E5=B7=B2=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=B0=9A=E6=9C=AA=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rest/CityInfoController.java | 48 +++++++++++++++++-- .../java/com/cetc32/dh/entity/CityGeom.java | 2 +- .../java/com/cetc32/dh/entity/CityInfo.java | 10 ++-- src/main/resources/application-xwy.yml | 15 +++--- .../resources/mapper/AreaCommonMapper.xml | 45 +++++++++-------- 5 files changed, 85 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java index 0588909..1d3d07a 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java @@ -5,10 +5,10 @@ import com.cetc32.dh.common.response.ResponseData; import com.cetc32.dh.entity.CityInfo; import com.cetc32.dh.service.CityInfoService; import com.cetc32.webutil.common.annotations.LoginSkipped; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.lang.Nullable; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/rest/city/") @@ -18,7 +18,7 @@ public class CityInfoController { CityInfoService cityInfoService; @RequestMapping("/query") - public PageDataResult queryCityInfos(@RequestBody CityInfo cityInfo,Integer page,Integer limit){ + public PageDataResult queryCityInfos(@Nullable @RequestBody CityInfo cityInfo, Integer page, Integer limit){ if(cityInfo==null){ cityInfo =new CityInfo(); } @@ -35,6 +35,46 @@ public class CityInfoController { cityInfoService.selectCityInfoByParam(cityInfo),cityInfo.getOffset()); //return ResponseData.success(); } + @PostMapping("/info") + public ResponseData insertOrUpdateCityInfos(@RequestBody CityInfo cityInfo){ + if(null == cityInfo) + return ResponseData.error("输入参数为空"); + if(StringUtils.isBlank(cityInfo.getCity())){ + return ResponseData.error("城市名称不能为空"); + } + if(StringUtils.isBlank(cityInfo.getCityCode())){ + return ResponseData.error("城市编码不能为空"); + } + if(StringUtils.isBlank(cityInfo.getParentId())){ + return ResponseData.error("城市父亲ID不能为空"); + } + if(StringUtils.isBlank(cityInfo.getPolygonText())){ + return ResponseData.error("城市区域点集不能为空"); + } + if(StringUtils.isBlank(cityInfo.getMergerName())){ + return ResponseData.error("城市全称不能为空"); + } + try{ + cityInfoService.insertUpdateCityInfo(cityInfo); + return ResponseData.success("操作成功"); + }catch (Exception e){ + e.printStackTrace(); + } + return ResponseData.error("操作失败"); + } + @PostMapping("/remvoe") + public ResponseData removeCityInfos(String cityCode){ + if(StringUtils.isBlank(cityCode)){ + return ResponseData.error("无效的城市编码"); + } + try{ + cityInfoService.deleteCityInfo(cityCode); + return ResponseData.success("操作成功"); + }catch (Exception e){ + e.printStackTrace(); + } + return ResponseData.error("操作失败"); + } } diff --git a/src/main/java/com/cetc32/dh/entity/CityGeom.java b/src/main/java/com/cetc32/dh/entity/CityGeom.java index ca1b192..48a4b75 100644 --- a/src/main/java/com/cetc32/dh/entity/CityGeom.java +++ b/src/main/java/com/cetc32/dh/entity/CityGeom.java @@ -106,7 +106,7 @@ public class CityGeom extends NumberS implements TreeNode { if(StringUtils.isBlank(str) ) return null; str =str.trim(); - if(str.equals("%%")||str.equals("%")){ + if(str.equals("%%")||str.equals("%")|| StringUtils.isBlank(str.replaceAll("%",""))){ return null; } return str; diff --git a/src/main/java/com/cetc32/dh/entity/CityInfo.java b/src/main/java/com/cetc32/dh/entity/CityInfo.java index 0f1148f..ea032d5 100644 --- a/src/main/java/com/cetc32/dh/entity/CityInfo.java +++ b/src/main/java/com/cetc32/dh/entity/CityInfo.java @@ -6,7 +6,7 @@ public class CityInfo extends CityGeom{ String cityPhonePrefix; String remarks; String mergerName; - Integer levelType; + String levelType; String keyWords; public void setId(String id){ setCityCode(id); @@ -40,11 +40,11 @@ public class CityInfo extends CityGeom{ this.remarks = formatStr(remarks); } - public Integer getLevelType() { + public String getLevelType() { return levelType; } - public void setLevelType(Integer levelType) { + public void setLevelType(String levelType) { this.levelType = levelType; } @@ -60,6 +60,8 @@ public class CityInfo extends CityGeom{ this.keyWords = formatStr(keyWords); } public String getKeyWords(){ - return keyWords; + if(StringUtils.isNotBlank(keyWords)) + return "%"+keyWords +"%"; + return null; } } diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml index 79ef29e..cbdcf3f 100644 --- a/src/main/resources/application-xwy.yml +++ b/src/main/resources/application-xwy.yml @@ -25,11 +25,11 @@ spring: application: name: dhManager datasource: - ##url: jdbc:postgresql://192.168.1.60:5432/dhmanage - url: jdbc:postgresql://180.184.65.203:5432/dhmanage + url: jdbc:postgresql://192.168.1.60:5432/dhmanage + #url: jdbc:postgresql://180.184.65.203:5432/dhmanage username: postgres - #password: 123456 - password: Zdk@824. + password: 123456 + #password: Zdk@824. driver-class-name: org.postgresql.Driver # datasource: @@ -79,8 +79,8 @@ downPath: ${rootPath}/downPath eip: http://192.168.1.206:8080/ gainMenuId: 10 sso: - ##authcenter: http://192.168.1.206:8081 - authcenter: http://180.184.65.203:8087 + authcenter: http://192.168.1.206:8081 + #authcenter: http://180.184.65.203:8087 verifyUrl: ${sso.authcenter}/rest/auth/verify?token= passportUrl: ${sso.authcenter}/?ReturnUrl= defaultLoginRequiredEnable: true @@ -89,4 +89,7 @@ sso: sysurl : http://192.168.1.206:${server.port} sysname : 数据管理系统 registerUrl : ${sso.authcenter}/rest/api/sys/sync + syscode: S002 offlineDataMenuId : 151 +plpUrl: /plpData +traceUrl: /traceData diff --git a/src/main/resources/mapper/AreaCommonMapper.xml b/src/main/resources/mapper/AreaCommonMapper.xml index f5c7ce1..a990ddc 100644 --- a/src/main/resources/mapper/AreaCommonMapper.xml +++ b/src/main/resources/mapper/AreaCommonMapper.xml @@ -24,26 +24,29 @@ select * from cityinfos - city like concat('%', #{city},'%') + and name like concat(concat('%', #{city}),'%') - and province like concat('%', #{province},'%') + and province like concat(concat('%', #{province}),'%') - and city_code like concat('%', #{cityPhonePrefix},'%') + and city_code like concat(concat('%', #{cityPhonePrefix}),'%') - - and remarks like concat('%', #{remarks},'%') + and remarks like concat(concat('%', #{remarks}),'%') - and level_type = leveType + and level_type = #{levelType,jdbcType=VARCHAR} + + + and id like concat(concat('%', #{cityCode}),'%') - and( province like concat('%', #{keyWords},'%') - or name like concat('%', #{keyWords},'%') - or city_code like concat('%', #{keyWords},'%') - or id like like concat('%', #{keyWords},'%') + and (province like #{keyWords} + + or name like #{keyWords} + or city_code like #{keyWords} + or id like #{keyWords}) @@ -54,26 +57,28 @@ select count(*) from cityinfos - city like concat('%', #{city},'%') + and name like concat(concat('%', #{city}),'%') - and province like concat('%', #{province},'%') + and province like concat(concat('%', #{province}),'%') - and city_code like concat('%', #{cityPhonePrefix},'%') + and city_code like concat(concat('%', #{cityPhonePrefix}),'%') - - and remarks like concat('%', #{remarks},'%') + and remarks like concat(concat('%', #{remarks}),'%') + + + and id like concat(concat('%', #{cityCode}),'%') - and level_type = leveType + and level_type = #{levelType,jdbcType=VARCHAR} - and( province like concat('%', #{keyWords},'%') - or city like concat('%', #{keyWords},'%') - or city_code like concat('%', #{keyWords},'%') - or id like like concat('%', #{keyWords},'%') + and (province like #{keyWords} + or name like #{keyWords} + or city_code like #{keyWords} + or id like #{keyWords}) -- Gitee From 84091bf1390dbb6ec5c568047f6f04397110cf5b Mon Sep 17 00:00:00 2001 From: xuwen Date: Fri, 24 Dec 2021 15:27:58 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=B0=E6=80=8Ecity=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rest/CityInfoController.java | 27 ++++++++++++++++--- src/main/resources/application-xwybjb.yml | 5 ++-- src/test/java/com/cetc32/DataAreaTest.java | 4 +-- src/test/resources/application.yml | 1 + 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java index 0588909..7df83b7 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java @@ -6,9 +6,8 @@ import com.cetc32.dh.entity.CityInfo; import com.cetc32.dh.service.CityInfoService; import com.cetc32.webutil.common.annotations.LoginSkipped; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.lang.Nullable; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/rest/city/") @@ -35,6 +34,28 @@ public class CityInfoController { cityInfoService.selectCityInfoByParam(cityInfo),cityInfo.getOffset()); //return ResponseData.success(); } + /******* + * 新增和更新为同一个接口 + * *****/ + @PostMapping("/cityInfo") + public ResponseData addInfo(@RequestBody CityInfo cityInfo){ + try{ + cityInfoService.insertUpdateCityInfo(cityInfo); + return ResponseData.success(); + }catch (Exception e){ + } + return ResponseData.error(); + } + + @PostMapping("/remove") + public ResponseData removeCityInfo(String cityCode){ + try{ + cityInfoService.deleteCityInfo(cityCode); + return ResponseData.success(); + }catch (Exception e){ + } + return ResponseData.error(); + } } diff --git a/src/main/resources/application-xwybjb.yml b/src/main/resources/application-xwybjb.yml index 720e954..265f4bc 100644 --- a/src/main/resources/application-xwybjb.yml +++ b/src/main/resources/application-xwybjb.yml @@ -78,9 +78,9 @@ upDatePath: ${rootPath}/updatePath/ downPath: ${rootPath}/downPath eip: http://192.168.1.206:8080/ sso: - #authcenter: http://192.168.1.206:8081 + authcenter: http://192.168.1.206:8081 #authcenter: http://180.184.65.203:8087 - authcenter: http://localhost:8081 + #authcenter: http://localhost:8081 verifyUrl: ${sso.authcenter}/rest/auth/verify?token= passportUrl: ${sso.authcenter}/?ReturnUrl= defaultLoginRequiredEnable: true @@ -89,6 +89,7 @@ sso: sysurl : http://192.168.1.206:${server.port} sysname : 数据管理系统 registerUrl : ${sso.authcenter}/rest/api/sys/sync + syscode: S002 offlineDataMenuId : 151 gainMenuId: 21 plpUrl: /plpData diff --git a/src/test/java/com/cetc32/DataAreaTest.java b/src/test/java/com/cetc32/DataAreaTest.java index 1b94380..63b95f9 100644 --- a/src/test/java/com/cetc32/DataAreaTest.java +++ b/src/test/java/com/cetc32/DataAreaTest.java @@ -67,7 +67,7 @@ public class DataAreaTest { ids .add("01"); System.out.println("ZQAreas "+zqAreaMapper.selectAreaByZqId(ids)); } - @Test + //@Test public void insertArea(){ /*DataArea dataArea =new DataArea(100000L,"110000",99L); List dataAreas =new ArrayList<>(); @@ -92,7 +92,7 @@ public class DataAreaTest { list.add("深圳市"); System.out.println(cityGeomMapper.selectCodesInArea(list)); } - //@Test + @Test public void zhengzebiaodashi(){ System.out.println(Pattern.matches("^[\\u4e00-\\u9fa5]{0,20}$","你1好")); } diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index f0371d4..44595eb 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -90,6 +90,7 @@ sso: sysurl : http://192.168.1.206:${server.port} sysname : 数据管理系统 registerUrl : ${sso.authcenter}/rest/api/sys/sync + syscode: S002 offlineDataMenuId : 151 plpUrl: /plpData traceUrl: /traceData -- Gitee From 8c171e34788d64670508ddb52e5d808b786c458d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Fri, 24 Dec 2021 16:26:35 +0800 Subject: [PATCH 5/8] query --- .../dh/controller/rest/CityInfoController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java index 1d3d07a..32eda35 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java @@ -18,14 +18,20 @@ public class CityInfoController { CityInfoService cityInfoService; @RequestMapping("/query") - public PageDataResult queryCityInfos(@Nullable @RequestBody CityInfo cityInfo, Integer page, Integer limit){ + public PageDataResult queryCityInfos(@Nullable @RequestBody CityInfo cityInfo, @Nullable Integer page, @Nullable Integer limit){ if(cityInfo==null){ cityInfo =new CityInfo(); } - if(page==null || page <=0){ + if(page==null ){ + page = cityInfo.getPage(); + } + if(limit==null ){ + limit = cityInfo.getResults(); + } + if( page <=0){ page =1; } - if(limit==null || limit <=0){ + if( limit <=0){ limit =15; } cityInfo.setPage(page); -- Gitee From de9239561e47201fd69d7c63d7309b965f39e61c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Fri, 24 Dec 2021 16:27:10 +0800 Subject: [PATCH 6/8] query --- .../dh/controller/rest/CityInfoController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java index 92386da..0fcce41 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java @@ -18,24 +18,24 @@ public class CityInfoController { CityInfoService cityInfoService; @RequestMapping("/query") - public PageDataResult queryCityInfos(@Nullable @RequestBody CityInfo cityInfo, @Nullable Integer page, @Nullable Integer limit){ + public PageDataResult queryCityInfos(@Nullable @RequestBody CityInfo cityInfo, @Nullable Integer page, @Nullable Integer results){ if(cityInfo==null){ cityInfo =new CityInfo(); } if(page==null ){ page = cityInfo.getPage(); } - if(limit==null ){ - limit = cityInfo.getResults(); + if(results==null ){ + results = cityInfo.getResults(); } if( page <=0){ page =1; } - if( limit <=0){ - limit =15; + if( results <=0){ + results =15; } cityInfo.setPage(page); - cityInfo.setResults(limit); + cityInfo.setResults(results); int totals =cityInfoService.countCityInfoByParam(cityInfo); return PageDataResult.success(totals, cityInfoService.selectCityInfoByParam(cityInfo),cityInfo.getOffset()); -- Gitee From bb75ce56b8b488210a138f692446349dc953d29a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Mon, 27 Dec 2021 13:52:01 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3URL?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cetc32/dh/controller/rest/CityInfoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java index 0fcce41..13e6b89 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java @@ -74,7 +74,7 @@ public class CityInfoController { return ResponseData.error("操作失败"); } - @PostMapping("/remvoe") + @PostMapping("/remove") public ResponseData removeCityInfos(String cityCode){ if(StringUtils.isBlank(cityCode)){ return ResponseData.error("无效的城市编码"); -- Gitee From dfbcb36c08a04a421843b1379c81b57ee3d89bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Mon, 27 Dec 2021 14:24:01 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cetc32/dh/controller/rest/CityInfoController.java | 4 ++-- .../java/com/cetc32/dh/service/impl/CityInfoServiceImpl.java | 2 +- src/main/resources/mapper/AreaCommonMapper.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java index 13e6b89..d56dda3 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/CityInfoController.java @@ -66,8 +66,8 @@ public class CityInfoController { return ResponseData.error("城市全称不能为空"); } try{ - cityInfoService.insertUpdateCityInfo(cityInfo); - return ResponseData.success("操作成功"); + if(0 -- Gitee