Skip to content

M
map-parent
Commit cf847910 by 刘亚鑫
Options

Merge branch 'dev_xz' of http://47.92.108.28/changchao/map-parent into dev_xz

parents d323fbe5 094dcae8
Showing with 195 additions and 47 deletions
service/asj/src/main/resources/bootstrap.properties
#�������ĵ�ַ
spring.cloud.nacos.config.server-addr=155.3.36.225:28848
spring.cloud.nacos.discovery.server-addr=155.3.36.225:28848
spring.cloud.nacos.config.prefix=asjpz
#spring.cloud.nacos.config.server-addr=26.3.13.184:8848
#spring.cloud.nacos.discovery.server-addr=26.3.13.184:8848
#spring.profiles.active=dev
# ������Ӱ��ͳһ���������е�dataId
spring.application.name=asj
#发布的时候需要改为线上的名称空间
#spring.cloud.nacos.config.namespace=cqzz-prod
spring.cloud.nacos.config.namespace=prod
#spring.cloud.nacos.config.ext-config[0].data-id=image.properties
# ������̬ˢ�����ã����������ļ��޸ģ������޷���֪
#spring.cloud.nacos.config.ext-config[0].refresh=true
#配置组名子，需要在nacos的配置设置，不然找不到
#spring.cloud.nacos.config.group=asjpz.properties
spring.cloud.nacos.config.prefix=asjpz
spring.cloud.nacos.config.shared-dataids=asjpz.properties
spring.cloud.nacos.config.refreshable-dataids=asjpz.properties
management.health.elasticsearch.enabled: false
#配置后缀，properties不需要
spring.cloud.nacos.config.file-extension=properties
#加载nacos多个配置文件
#spring.cloud.nacos.config.shared-dataids=provider-service.properties,test.properties
#刷新加载的其他环境
#spring.cloud.nacos.config.refreshable-dataids=provider-service.properties,test.properties
serviceapi/peopleapi/pom.xml
......@@ -13,12 +13,14 @@
<build>
<finalName>peopleapi</finalName>
</build>
<!-- 阿里云的时候使用-->
<!-- <dependency>-->
<!-- <groupId>com.alibaba</groupId>-->
<!-- <artifactId>druid</artifactId>-->
<!-- <version>1.1.10</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
<!-- 阿里云的时候使用-->
<dependencies>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.1.10</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
serviceapi/peopleapi/src/main/java/com/founder/peopleapi/controller/CarController.java 0 → 100644
package com.founder.peopleapi.controller;
import com.founder.commonutils.carEntity.TrackYsModelCondition;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.peopleapi.service.CarServiceT;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(description = "接口管理")
@RestController
@RequestMapping("/car")
public class CarController {
@Autowired
private CarServiceT carService;
//轨迹疑似停留点
@ApiOperation(value = "轨迹疑似停留点")
@PostMapping("/getTrackYstld")
public MapRestResult getTrackYstld(@RequestBody TrackYsModelCondition track){
return carService.getTrackYstld(track);
}
//轨迹疑似落脚点
@ApiOperation(value = "轨迹疑似落脚点")
@PostMapping("/getTrackYsljd")
public MapRestResult getTrackYsljd(@RequestBody TrackYsModelCondition track){
return carService.getTrackYsljd(track);
}
//轨迹疑似活动区域
@ApiOperation(value = "轨迹疑似活动区域")
@PostMapping("/getTrackYshdqy")
public MapRestResult getTrackYshdqy(@RequestBody TrackYsModelCondition track){
return carService.getTrackYshdqy(track);
}
}
serviceapi/peopleapi/src/main/java/com/founder/peopleapi/service/impl/PeopleServiceImpl.java
......@@ -224,24 +224,138 @@ public class PeopleServiceImpl implements PeopleService {
@Override
public MapRestResult getXsSfXx(String objectType, String objectValue) {
Car resCar=null;
// 车牌号能够查出手机号还有身份证号码
if(objectType.equals("01")){
Query query = new Query();
Criteria criteria = Criteria.where("veco").is(objectValue);
query.addCriteria(criteria);
resCar = primaryMongoTemplate.findOne(query, Car.class,"wb0099carowner");
if(resCar==null){
ArrayList<PeopleInfo> res = new ArrayList<>();
return MapRestResult.build(200,"没有对应的数据!",res);
}
ArrayList<PeopleInfo> peopleInfos = new ArrayList<>();
if(resCar!=null){
Query phoneQuery = new Query();
Criteria phonecriteria=null;
if(resCar.getCeco().length()==15){
phonecriteria = Criteria.where("ceco").is(resCar.getCeco());
}else if(resCar.getCeco().length()==18){
phonecriteria = Criteria.where("cecoS").is(resCar.getCeco());
}
phoneQuery.addCriteria(phonecriteria);
Phone resPhone = secondMongoTemplate.findOne(phoneQuery, Phone.class, "wb0017mobilereg");
if(resPhone!=null){
PeopleInfo phone = new PeopleInfo();
phone.setObjectType("04");
phone.setObjectValue(resPhone.getCote());
peopleInfos.add(phone);
}
}
PeopleInfo peopleInfo = new PeopleInfo();
peopleInfo.setObjectType("03");
peopleInfo.setObjectValue(resCar.getCeco());
return MapRestResult.build(200,"成功获取身份信息！",peopleInfo);
}else if(objectType.equals("03")){
PeopleInfo self = new PeopleInfo();
self.setObjectType(objectType);
self.setObjectValue(objectValue);
peopleInfos.add(self);
peopleInfo.setChildren(peopleInfos);
ArrayList<PeopleInfo> res = new ArrayList<>();
res.add(peopleInfo);
return MapRestResult.build(200,"成功获取身份信息！",res);
}else if(objectType.equals("04")){
//手机号能够了查到身份证号还有车牌号
Query query = new Query();
Criteria criteria = Criteria.where("imsi").is(objectValue);
Criteria criteria = Criteria.where("cote").is(objectValue);
query.addCriteria(criteria);
Phone resPhone = secondMongoTemplate.findOne(query, Phone.class, "wb0017mobilereg");
if(resPhone==null){
ArrayList<PeopleInfo> res = new ArrayList<>();
return MapRestResult.build(200,"没有对应的数据!",res);
}
ArrayList<PeopleInfo> peopleInfos = new ArrayList<>();
if(resPhone!=null){
Query carQuery = new Query();
Criteria carCriteria = Criteria.where("ceco").is(resPhone.getCecoS());
carQuery.addCriteria(carCriteria);
resCar = primaryMongoTemplate.findOne(carQuery, Car.class,"wb0099carowner");
if(resCar==null){
Query c = new Query();
Criteria ccarCriteria = Criteria.where("ceco").is(resPhone.getCeco());
c.addCriteria(ccarCriteria);
resCar = primaryMongoTemplate.findOne(c, Car.class,"wb0099carowner");
}
if(resCar!=null){
PeopleInfo carInfo = new PeopleInfo();
carInfo.setObjectType("01");
carInfo.setObjectValue(resCar.getVeco());
peopleInfos.add(carInfo);
}
}
PeopleInfo peopleInfo = new PeopleInfo();
peopleInfo.setObjectType("03");
peopleInfo.setObjectValue(resPhone.getCecoS()!=null?resPhone.getCecoS():resPhone.getCeco());
return MapRestResult.build(200,"成功获取身份信息！",peopleInfo);
PeopleInfo self = new PeopleInfo();
self.setObjectType(objectType);
self.setObjectValue(objectValue);
peopleInfos.add(self);
peopleInfo.setChildren(peopleInfos);
ArrayList<PeopleInfo> res = new ArrayList<>();
res.add(peopleInfo);
return MapRestResult.build(200,"成功获取身份信息！",res);
}else if(objectType.equals("03")){
//身份证号查询出来车牌号还有手机号
Query query = new Query();
String searchTempValue="";
if(objectValue==null){
return MapRestResult.error("无法查询此标识号值");
}
if(objectValue.length()==15){
searchTempValue="ceco";
}else if(objectValue.length()==18){
searchTempValue="cecoS";
}else{
return MapRestResult.error("输入的证件号码有误");
}
Criteria criteria = Criteria.where(searchTempValue).is(objectValue);
query.addCriteria(criteria);
Phone resPhone = secondMongoTemplate.findOne(query, Phone.class, "wb0017mobilereg");
if(resPhone==null){
ArrayList<PeopleInfo> res = new ArrayList<>();
return MapRestResult.build(200,"没有对应的数据!",res);
}
PeopleInfo self = new PeopleInfo();
self.setObjectType(objectType);
self.setObjectValue(objectValue);
PeopleInfo peopleInfo = new PeopleInfo();
peopleInfo.setObjectType("04");
peopleInfo.setObjectValue(resPhone.getCote());
Query carQuery = new Query();
Criteria carCriteria = Criteria.where("ceco").is(objectValue);
carQuery.addCriteria(carCriteria);
resCar = primaryMongoTemplate.findOne(carQuery, Car.class,"wb0099carowner");
ArrayList<PeopleInfo> peopleInfos = new ArrayList<>();
if(resCar!=null){
PeopleInfo carInfo = new PeopleInfo();
carInfo.setObjectType("01");
carInfo.setObjectValue(resCar.getVeco());
peopleInfos.add(carInfo);
}
peopleInfos.add(peopleInfo);
self.setChildren(peopleInfos);
ArrayList<PeopleInfo> res = new ArrayList<>();
res.add(self);
return MapRestResult.build(200,"成功获取手机号码信息！",res);
}else{
return MapRestResult.error("无法查询此标识号类型");
}
......
serviceapi/peopleapi/src/main/resources/bootstrap.properties
#配置中心地址
#spring.cloud.nacos.config.server-addr=47.92.48.137:8848
#spring.cloud.nacos.discovery.server-addr=47.92.48.137:8848
spring.cloud.nacos.config.server-addr=47.92.48.137:9949
#spring.cloud.nacos.discovery.server-addr=26.3.13.184:8848
spring.profiles.active=dev
# 该配置影响统一配置中心中的dataId
spring.application.name=peopleapi
spring.cloud.nacos.config.namespace=f1160b5f-cef5-4e86-bddc-c55e28c2d8b0
spring.cloud.nacos.config.group=peopleapi
spring.cloud.nacos.config.refreshable-dataids=peopleapi.properties
#spring.cloud.nacos.config.ext-config[0].data-id=image.properties
# 开启动态刷新配置，否则配置文件修改，工程无法感知
#spring.cloud.nacos.config.ext-config[0].refresh=true
#spring.cloud.nacos.config.shared-dataids=imageapipz.properties
#spring.cloud.nacos.config.refreshable-dataids=imageapipz.properties
\ No newline at end of file
server.port=8070
#\u5211\u4E13\u6570\u636E\u5E93\u914D\u7F6E
spring.datasource.url=jdbc:mysql://47.92.223.200:3365/xzxt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
spring.datasource.username=xzxt
spring.datasource.password=xzxt
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
#
spring.data.mongodb.primary.uri=mongodb://localhost:27017/whale
logging.level.org.springframework.data.mongodb.core=DEBUG
spring.data.mongodb.second.uri=mongodb://localhost:27017/whale
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment