Skip to content

M
map-parent
Commit 5e054a43 by Jbb
Options

nacos配置文件有点问题 补充一些工具类

parent 79f8a3db
Showing with 60 additions and 46 deletions
common/common_utils/src/main/java/com/founder/commonutils/util/LngLonUtil.java
package com.founder.commonutils.util;
import java.util.regex.Pattern;
/**
* 坐标转换工具
*/
......@@ -160,6 +162,20 @@ public class LngLonUtil {
String result = String .format("%.6f", num);
return Double.valueOf(result);
}
//校验经纬度合理性
public static boolean verifyLongAndLat(Double x,Double y) {
//经度： -180.0～+180.0（整数部分为0～180，必须输入1到8位小数）
String longitudePattern="^[\\-\\+]?(0?\\d{1,2}\\.\\d{1,8}|1[0-7]?\\d{1}\\.\\d{1,8}|180\\.0{1,8})$";
//纬度： -90.0～+90.0（整数部分为0～90，必须输入1到8位小数）
String latitudePattern="^[\\-\\+]?([0-8]?\\d{1}\\.\\d{1,8}|90\\.0{1,8})$";
boolean longitudeMatch = Pattern.matches(longitudePattern, String.valueOf(x));
boolean latitudeMatch = Pattern.matches(latitudePattern, String.valueOf(y));
if(longitudeMatch&&latitudeMatch){
return true;
}
return false;
}
public static void main(String[] args){
System.out.println("===============84转百度=====================");
//84转百度
......
pom.xml
......@@ -5,7 +5,7 @@
<modules>
<module>service</module>
<module>serviceapi</module>
<!--<module>serviceapi</module>-->
<module>common</module>
</modules>
<parent>
......
service/view/src/main/java/com/founder/asj/ViewApplication.java → service/view/src/main/java/com/founder/view/ViewApplication.java
package com.founder.asj;
package com.founder.view;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
......@@ -6,10 +6,10 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@SpringBootApplication
@EnableSwagger2
public class AsjApplication {
public class ViewApplication {
public static void main(String[] args) {
System.setProperty("es.set.netty.runtime.available.processors", "false");
SpringApplication.run(AsjApplication.class, args);
SpringApplication.run(ViewApplication.class, args);
}
}
service/view/src/main/java/com/founder/asj/config/EduConfig.java → service/view/src/main/java/com/founder/view/config/EduConfig.java
package com.founder.asj.config;
package com.founder.view.config;
import com.baomidou.mybatisplus.core.injector.ISqlInjector;
import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
......
service/view/src/main/java/com/founder/asj/config/MybatisBaseDbConfig.java → service/view/src/main/java/com/founder/view/config/MybatisBaseDbConfig.java
package com.founder.asj.config;
package com.founder.view.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.core.injector.ISqlInjector;
import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionTemplate;
......
service/view/src/main/java/com/founder/asj/config/MybatisQgDbConfig.java → service/view/src/main/java/com/founder/view/config/MybatisQgDbConfig.java
package com.founder.asj.config;
package com.founder.view.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
import com.baomidou.mybatisplus.core.injector.ISqlInjector;
import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionTemplate;
......
service/view/src/main/java/com/founder/asj/controller/TbStAsjController.java → service/view/src/main/java/com/founder/view/controller/TbStAsjController.java
package com.founder.asj.controller;
package com.founder.view.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.asj.service.SysUsersService;
import com.founder.asj.service.TbStAsjBzService;
import com.founder.asj.service.TbStAsjService;
import com.founder.view.service.SysUsersService;
import com.founder.view.service.TbStAsjBzService;
import com.founder.view.service.TbStAsjService;
import com.founder.commonutils.asjEntity.AsjQuery;
import com.founder.commonutils.asjEntity.CbxszAndXlaj;
import com.founder.commonutils.asjEntity.TbStAsj;
......@@ -15,7 +15,6 @@ import com.founder.commonutils.asjEntity.TbXwAsjbz;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.publicEntity.Receiving;
import com.founder.commonutils.publicEntity.SysUser;
import com.founder.commonutils.publicEntity.SysUsers;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import io.swagger.annotations.Api;
......
service/view/src/main/java/com/founder/asj/mapper/SysUsersMapper.java → service/view/src/main/java/com/founder/view/mapper/SysUsersMapper.java
package com.founder.asj.mapper;
package com.founder.view.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......
service/view/src/main/java/com/founder/asj/mapper/TbStAsjBzMapper.java → service/view/src/main/java/com/founder/view/mapper/TbStAsjBzMapper.java
package com.founder.asj.mapper;
package com.founder.view.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.asjEntity.TbXwAsjbz;
......
service/view/src/main/java/com/founder/asj/mapper/TbStAsjMapper.java → service/view/src/main/java/com/founder/view/mapper/TbStAsjMapper.java
package com.founder.asj.mapper;
package com.founder.view.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......
service/view/src/main/java/com/founder/asj/mapper/xml/SysUsersMapper.xml → service/view/src/main/java/com/founder/view/mapper/xml/SysUsersMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.founder.asj.mapper.SysUsersMapper">
<mapper namespace="com.founder.view.mapper.SysUsersMapper">
</mapper>
service/view/src/main/java/com/founder/asj/mapper/xml/TbStAsjBzMapper.xml → service/view/src/main/java/com/founder/view/mapper/xml/TbStAsjBzMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.founder.asj.mapper.TbStAsjBzMapper">
<mapper namespace="com.founder.view.mapper.TbStAsjBzMapper">
</mapper>
service/view/src/main/java/com/founder/asj/mapper/xml/TbStAsjMapper.xml → service/view/src/main/java/com/founder/view/mapper/xml/TbStAsjMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.founder.asj.mapper.TbStAsjMapper">
<mapper namespace="com.founder.view.mapper.TbStAsjMapper">
<select id="getXszajbhByAsjbh" parameterType="java.lang.String" resultType="String">
select
......
service/view/src/main/java/com/founder/asj/service/SysUsersService.java → service/view/src/main/java/com/founder/view/service/SysUsersService.java
package com.founder.asj.service;
package com.founder.view.service;
import com.baomidou.mybatisplus.extension.service.IService;
......
service/view/src/main/java/com/founder/asj/service/TbStAsjBzService.java → service/view/src/main/java/com/founder/view/service/TbStAsjBzService.java
package com.founder.asj.service;
package com.founder.view.service;
import com.baomidou.mybatisplus.extension.service.IService;
......
service/view/src/main/java/com/founder/asj/service/TbStAsjService.java → service/view/src/main/java/com/founder/view/service/TbStAsjService.java
package com.founder.asj.service;
package com.founder.view.service;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -6,7 +6,6 @@ import com.founder.commonutils.asjEntity.CbxszAndXlaj;
import com.founder.commonutils.asjEntity.TbStAsj;
import com.founder.commonutils.publicEntity.MapRestResult;
import com.founder.commonutils.publicEntity.Receiving;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
......
service/view/src/main/java/com/founder/asj/service/impl/SysUsersServiceImpl.java → service/view/src/main/java/com/founder/view/service/impl/SysUsersServiceImpl.java
package com.founder.asj.service.impl;
package com.founder.view.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.asj.mapper.SysUsersMapper;
import com.founder.asj.service.SysUsersService;
import com.founder.view.mapper.SysUsersMapper;
import com.founder.view.service.SysUsersService;
import com.founder.commonutils.publicEntity.SysUser;
import org.springframework.stereotype.Service;
......
service/view/src/main/java/com/founder/asj/service/impl/TbStAsjBzServiceImpl.java → service/view/src/main/java/com/founder/view/service/impl/TbStAsjBzServiceImpl.java
package com.founder.asj.service.impl;
package com.founder.view.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.asj.mapper.TbStAsjBzMapper;
import com.founder.asj.service.TbStAsjBzService;
import com.founder.view.mapper.TbStAsjBzMapper;
import com.founder.view.service.TbStAsjBzService;
import com.founder.commonutils.asjEntity.TbXwAsjbz;
import org.springframework.stereotype.Service;
......
service/view/src/main/java/com/founder/asj/service/impl/TbStAsjServiceImpl.java → service/view/src/main/java/com/founder/view/service/impl/TbStAsjServiceImpl.java
package com.founder.asj.service.impl;
package com.founder.view.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.asj.mapper.TbStAsjMapper;
import com.founder.asj.qgxzMapper.TbStAsjqgMapper;
import com.founder.asj.service.TbStAsjService;
import com.founder.view.mapper.TbStAsjMapper;
//import com.founder.view.qgxzMapper.TbStAsjqgMapper;
import com.founder.view.service.TbStAsjService;
import com.founder.commonutils.asjEntity.CbxszAndXlaj;
import com.founder.commonutils.asjEntity.TbStAsj;
import com.founder.commonutils.publicEntity.MapRestResult;
......@@ -29,8 +29,8 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
@Autowired
private TbStAsjMapper tbStAsjMapper;
@Autowired
private TbStAsjqgMapper tbStAsjqgMapper;
//@Autowired
//private TbStAsjqgMapper tbStAsjqgMapper;
@Override
public List<String> getXszajbhByAsjbh(String asjbh) {
......@@ -81,7 +81,12 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
}
@Override
public List<Map<String, Object>> getqgAsjxxByZjhm(String zjhm, String ssdw) {
return null;
}
/*@Override
public List<Map<String, Object>> getqgAsjxxByZjhm(String zjhm,String ssdw) {
return tbStAsjqgMapper.getqgAsjxxByZjhm(zjhm,ssdw);
}
}*/
}
service/view/src/main/resources/bootstrap.properties
......@@ -5,16 +5,16 @@ spring.cloud.nacos.discovery.server-addr=47.92.48.137:9949
#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=prod
spring.profiles.active=dev
# 该配置影响统一配置中心中的dataId
spring.application.name=asj
spring.cloud.nacos.config.namespace=prod
spring.application.name=view
spring.cloud.nacos.config.namespace=dev
#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=asjpz.properties
spring.cloud.nacos.config.refreshable-dataids=asjpz.properties
spring.cloud.nacos.config.shared-dataids=view-dev.yml
spring.cloud.nacos.config.refreshable-dataids=view-dev.yml
management.health.elasticsearch.enabled: false
\ 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