数据源对应处理(内蒙)

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkPointlocationParamsGeo.java

+package com.founder.commonutils.model.newPublicEntity;
+
+import com.founder.commonutils.model.vo.param.Point;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * (SkPointlocationParamsGeo)表实体类
+ *
+ * @author yangyang
+ * @since 2022-10-10 13:21:13
+ */
+@Data
+@SuppressWarnings("serial")
+public class SkPointlocationParamsGeo {
+    @ApiModelProperty(value = "经纬度集合")
+    private List<Point> geometrys;
+
+    @ApiModelProperty(value = "半径")
+    private String radius;
+
+}

common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/SkPointlocationParam.java

 package com.founder.commonutils.model.vo.param;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 点位传参类
@@ -14,7 +16,7 @@ import java.util.Date;
 public class SkPointlocationParam {
     /**
      * 请求类型（前端传的是objecttype）
-    */
+     */
     private String likeField;
     /**
      * 名称
@@ -30,25 +32,31 @@ public class SkPointlocationParam {
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date jssj;
-    /**
+
+    @ApiModelProperty(value = "经纬度集合")
+    private List<Point> geometrys;
+
+    @ApiModelProperty(value = "半径")
+    private String radius;
+    /* *//**
      * 结束纬度
-     */
+     *//*
     private String endLat;
-    /**
+    *//**
      * 结束经度
-     */
+     *//*
     private String endLng;
-    /**
+    *//**
      * 开始纬度
-     */
+     *//*
     private String startLat;
-    /**
+    *//**
      * 开始经度
-     */
-    private String startLng;
+     *//*
+    private String startLng;*/
     /**
      * 行数
-    */
+     */
     private Integer page;
     /**
      * 列数

common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/TbStAsjParm.java

@@ -72,7 +72,7 @@ public class TbStAsjParm implements Serializable {
     private int page;
 
     @ApiModelProperty(value = "列数")
-    private int pageSize;
+    private int pageSize=10000;
 
     @ApiModelProperty(value = "案事件发生开始时间")
     private Date asjfssjAsjfskssj;

common/service_base/src/main/java/com/founder/servicebase/config/MybatisMySqlDbConfig.java

 package com.founder.servicebase.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.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -12,45 +12,36 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
 
 @Configuration
 @MapperScan(basePackages = {"com.founder.*.mapper.mysqlMapper"},
-        sqlSessionTemplateRef = "xzxtSqlTemplate")
-public class MybatisMySqlDbConfig {
-
+        sqlSessionTemplateRef = "mysqlSqlTemplate")
+public class MybatisMysqlDbConfig {
 
-    @Bean(name = "xzxtdbDatasource")
-    @ConfigurationProperties(prefix = "spring.datasource.xzxtdb")
-    public DruidDataSource druidXzxtdbDatasource()
+    @Bean(name = "mysqlDatasource")
+    @ConfigurationProperties(prefix = "spring.datasource.mysql")
+    public DruidDataSource druidQgdbDatasource()
     {
         return DruidDataSourceBuilder.create().build();
     }
 
 
-    @Bean(name = "xzxtdbSqlFactory")
-    @Primary
-    public SqlSessionFactory sqlSessionFactory(@Qualifier("xzxtdbDatasource") DruidDataSource dataSource)
+    @Bean(name = "mysqlSqlFactory")
+    public SqlSessionFactory sqlSessionFactory(@Qualifier("mysqlDatasource") DruidDataSource dataSource)
             throws Exception
     {
         MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
         factoryBean.setDataSource(dataSource);
-
-        MybatisConfiguration configuration = new MybatisConfiguration();
-        factoryBean.setConfiguration(configuration);
-
         ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
         factoryBean.setMapperLocations(resolver.getResources("classpath*:com/founder/*/mapper/mysqlMapper/xml/*.xml"));
         // 加入SQL 语句执行拦截器和mybatiscplus分页插件
-        factoryBean.setPlugins(new Interceptor[]{new MybatisSqlLoggerInterceptor(),new EduConfig().paginationInterceptor()});
-        return factoryBean.getObject();
+        factoryBean.setPlugins(new Interceptor[]{new MybatisSqlLoggerInterceptor(),new EduConfig().paginationInterceptor()});        return factoryBean.getObject();
     }
 
-    @Bean(name = "xzxtSqlTemplate")
-    @Primary
-    public SqlSessionTemplate sqlSessionTemplate(@Qualifier("xzxtdbSqlFactory")
+    @Bean(name = "mysqlSqlTemplate")
+    public SqlSessionTemplate sqlSessionTemplate(@Qualifier("mysqlSqlFactory")
                                                          SqlSessionFactory sqlSessionFactory)
     {
         return new SqlSessionTemplate(sqlSessionFactory);

common/service_base/src/main/java/com/founder/servicebase/config/MybatisDWSLDbConfig.java → common/service_base/src/main/java/com/founder/servicebase/config/MybatisOracleMapDbConfig.java

@@ -16,32 +16,32 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
 
 @Configuration
-@MapperScan(basePackages = {"com.founder.*.mapper.dwMapper"},
-        sqlSessionTemplateRef = "dwslSqlTemplate")
-public class MybatisDWSLDbConfig {
+@MapperScan(basePackages = {"com.founder.*.mapper.oracleMapMapper"},
+        sqlSessionTemplateRef = "oracleMapSqlTemplate")
+public class MybatisOracleMapDbConfig {
 
-    @Bean(name = "dwsldbDatasource")
-    @ConfigurationProperties(prefix = "spring.datasource.dwsl")
+    @Bean(name = "oracleMapDatasource")
+    @ConfigurationProperties(prefix = "spring.datasource.oraclemap")
     public DruidDataSource druidQgdbDatasource()
     {
         return DruidDataSourceBuilder.create().build();
     }
 
 
-    @Bean(name = "dwsldbSqlFactory")
-    public SqlSessionFactory sqlSessionFactory(@Qualifier("dwsldbDatasource") DruidDataSource dataSource)
+    @Bean(name = "oracleMapSqlFactory")
+    public SqlSessionFactory sqlSessionFactory(@Qualifier("oracleMapDatasource") DruidDataSource dataSource)
             throws Exception
     {
         MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
         factoryBean.setDataSource(dataSource);
         ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
-        factoryBean.setMapperLocations(resolver.getResources("classpath*:com/founder/*/mapper/dwMapper/xml/*.xml"));
+        factoryBean.setMapperLocations(resolver.getResources("classpath*:com/founder/*/mapper/oracleMapMapper/xml/*.xml"));
         // 加入SQL 语句执行拦截器和mybatiscplus分页插件
         factoryBean.setPlugins(new Interceptor[]{new MybatisSqlLoggerInterceptor(),new EduConfig().paginationInterceptor()});        return factoryBean.getObject();
     }
 
-    @Bean(name = "dwslSqlTemplate")
-    public SqlSessionTemplate sqlSessionTemplate(@Qualifier("dwsldbSqlFactory")
+    @Bean(name = "oracleMapSqlTemplate")
+    public SqlSessionTemplate sqlSessionTemplate(@Qualifier("oracleMapSqlFactory")
                                                          SqlSessionFactory sqlSessionFactory)
     {
         return new SqlSessionTemplate(sqlSessionFactory);

common/service_base/src/main/java/com/founder/servicebase/config/MybatisMapDbConfig.java → common/service_base/src/main/java/com/founder/servicebase/config/MybatisOracleQgDbConfig.java

@@ -16,32 +16,32 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
 
 @Configuration
-@MapperScan(basePackages = {"com.founder.*.mapper.mapMapper"},
-        sqlSessionTemplateRef = "mapSqlTemplate")
-public class MybatisMapDbConfig {
+@MapperScan(basePackages = {"com.founder.*.mapper.oracleQgxzMapper"},
+        sqlSessionTemplateRef = "oracleQgxzSqlTemplate")
+public class MybatisOracleQgDbConfig {
 
-    @Bean(name = "mapdbDatasource")
-    @ConfigurationProperties(prefix = "spring.datasource.map")
+    @Bean(name = "oracleQgxzDatasource")
+    @ConfigurationProperties(prefix = "spring.datasource.oracleqgxz")
     public DruidDataSource druidQgdbDatasource()
     {
         return DruidDataSourceBuilder.create().build();
     }
 
 
-    @Bean(name = "mapdbSqlFactory")
-    public SqlSessionFactory sqlSessionFactory(@Qualifier("mapdbDatasource") DruidDataSource dataSource)
+    @Bean(name = "oracleQgxzSqlFactory")
+    public SqlSessionFactory sqlSessionFactory(@Qualifier("oracleQgxzDatasource") DruidDataSource dataSource)
             throws Exception
     {
         MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
         factoryBean.setDataSource(dataSource);
         ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
-        factoryBean.setMapperLocations(resolver.getResources("classpath*:com/founder/*/mapper/mapMapper/xml/*.xml"));
+        factoryBean.setMapperLocations(resolver.getResources("classpath*:com/founder/*/mapper/oracleQgxzMapper/xml/*.xml"));
         // 加入SQL 语句执行拦截器和mybatiscplus分页插件
         factoryBean.setPlugins(new Interceptor[]{new MybatisSqlLoggerInterceptor(),new EduConfig().paginationInterceptor()});        return factoryBean.getObject();
     }
 
-    @Bean(name = "mapSqlTemplate")
-    public SqlSessionTemplate sqlSessionTemplate(@Qualifier("mapdbSqlFactory")
+    @Bean(name = "oracleQgxzSqlTemplate")
+    public SqlSessionTemplate sqlSessionTemplate(@Qualifier("oracleQgxzSqlFactory")
                                                          SqlSessionFactory sqlSessionFactory)
     {
         return new SqlSessionTemplate(sqlSessionFactory);

common/service_base/src/main/java/com/founder/servicebase/config/MybatisOracleDbConfig.java → common/service_base/src/main/java/com/founder/servicebase/config/MybatisOracleXzxtDbConfig.java

 package com.founder.servicebase.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.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -12,36 +12,45 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
 
 @Configuration
-@MapperScan(basePackages = {"com.founder.*.mapper.qgxzMapper"},
-        sqlSessionTemplateRef = "qgSqlTemplate")
-public class MybatisOracleDbConfig {
+@MapperScan(basePackages = {"com.founder.*.mapper.oracleXzxtMapper"},
+        sqlSessionTemplateRef = "oracleXzxtSqlTemplate")
+public class MybatisOracleXzxtDbConfig {
+
 
-    @Bean(name = "qgdbDatasource")
-    @ConfigurationProperties(prefix = "spring.datasource.qgdb")
-    public DruidDataSource druidQgdbDatasource()
+    @Bean(name = "oracleXzxtDatasource")
+    @ConfigurationProperties(prefix = "spring.datasource.oraclexzxt")
+    public DruidDataSource druidXzxtdbDatasource()
     {
         return DruidDataSourceBuilder.create().build();
     }
 
 
-    @Bean(name = "qgdbSqlFactory")
-    public SqlSessionFactory sqlSessionFactory(@Qualifier("qgdbDatasource") DruidDataSource dataSource)
+    @Bean(name = "oracleXzxtSqlFactory")
+    @Primary
+    public SqlSessionFactory sqlSessionFactory(@Qualifier("oracleXzxtDatasource") DruidDataSource dataSource)
             throws Exception
     {
         MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
         factoryBean.setDataSource(dataSource);
+
+        MybatisConfiguration configuration = new MybatisConfiguration();
+        factoryBean.setConfiguration(configuration);
+
         ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
-        factoryBean.setMapperLocations(resolver.getResources("classpath*:com/founder/*/mapper/qgxzMapper/xml/*.xml"));
+        factoryBean.setMapperLocations(resolver.getResources("classpath*:com/founder/*/mapper/oracleXzxtMapper/xml/*.xml"));
         // 加入SQL 语句执行拦截器和mybatiscplus分页插件
-        factoryBean.setPlugins(new Interceptor[]{new MybatisSqlLoggerInterceptor(),new EduConfig().paginationInterceptor()});        return factoryBean.getObject();
+        factoryBean.setPlugins(new Interceptor[]{new MybatisSqlLoggerInterceptor(),new EduConfig().paginationInterceptor()});
+        return factoryBean.getObject();
     }
 
-    @Bean(name = "qgSqlTemplate")
-    public SqlSessionTemplate sqlSessionTemplate(@Qualifier("qgdbSqlFactory")
+    @Bean(name = "oracleXzxtSqlTemplate")
+    @Primary
+    public SqlSessionTemplate sqlSessionTemplate(@Qualifier("oracleXzxtSqlFactory")
                                                          SqlSessionFactory sqlSessionFactory)
     {
         return new SqlSessionTemplate(sqlSessionFactory);

common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/SysUserMapper.java → common/service_base/src/main/java/com/founder/servicebase/mapper/oracleXzxtMapper/SysUserMapper.java

-package com.founder.servicebase.mapper.mysqlMapper;
+package com.founder.servicebase.mapper.oracleXzxtMapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.founder.commonutils.model.newPublicEntity.SysUser;

common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/xml/SysUsersMapper.xml → common/service_base/src/main/java/com/founder/servicebase/mapper/oracleXzxtMapper/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.servicebase.mapper.mysqlMapper.SysUserMapper">
+<mapper namespace="com.founder.servicebase.mapper.oracleXzxtMapper.SysUserMapper">
 
     <select id="getUsersByNamePassword" resultType="com.founder.commonutils.model.newPublicEntity.SysUsers">
         select * from sys_users

common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/SysUserServiceImpl.java

@@ -4,7 +4,7 @@ package com.founder.servicebase.service.serviceimpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.founder.commonutils.model.newPublicEntity.SysUser;
 
-import com.founder.servicebase.mapper.mysqlMapper.SysUserMapper;
+import com.founder.servicebase.mapper.oracleXzxtMapper.SysUserMapper;
 import com.founder.servicebase.service.SysUserService;
 import org.springframework.stereotype.Service;
 

service/publicapi/src/main/java/com/founder/publicapi/SkNmInterface/InterfaceAPI.java

@@ -3,13 +3,12 @@ package com.founder.publicapi.SkNmInterface;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
-import com.founder.commonutils.model.newPublicEntity.DictitemJt;
 import com.founder.commonutils.model.newPublicEntity.SkTrail;
 import com.founder.commonutils.model.nmDataEntity.ResultEntity.MyRyGjxx;
 import com.founder.commonutils.model.nmDataEntity.ResultEntity.MySjGjxx;
 import com.founder.commonutils.model.vo.response.SkTrailVO;
 import com.founder.commonutils.util.DateUtil;
-import com.founder.publicapi.mapper.mysqlMapper.SysDictitemMapper;
+import com.founder.publicapi.mapper.oracleXzxtMapper.SysDictitemMapper;
 import com.founder.publicapi.service.SkPointlocationService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -355,7 +354,7 @@ public class InterfaceAPI {
                                 SkTrail skTrailDa = new SkTrail();
                                 skTrailDa.setDeviceid(deviceId);
                                 skTrailDa.setFarimglist(farImg);
-                                skTrailDa.setNearimglist(nearImg);
+                                skTrailDa.setNearimglist(farImg);
                                 skTrailDa.setX(longitude);
                                 skTrailDa.setY(latitude);
                                 skTrailDa.setAddress(deviceName);

service/publicapi/src/main/java/com/founder/publicapi/controller/AsjService/AsjController.java

@@ -30,6 +30,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 @Api(tags = "案件管理")
@@ -100,7 +101,7 @@ public class AsjController {
     @ApiOperation(value = "获取串并线索组信息")
     @PostMapping("/querAsjxxCbzAndXlaj")
     public  MapRestResult  getAsjxxCbzAndXlaj(@ApiParam(name = "asjbh", value = "案事件编号")
-                                                  @RequestBody JSONObject jsonParams) {
+                                              @RequestBody JSONObject jsonParams) {
         String asjbh = jsonParams.getString("asjbh");
         List<CbxszAndXlaj> listXszXgaj = new ArrayList<>();
         JSONObject a = new JSONObject();
@@ -116,9 +117,9 @@ public class AsjController {
             // 通过该线索组编号在查询TB_YW_XSZ_CBAJ中  相关比重类型和案事件编号（出去传入的案件）
             listXszXgaj = tbStAsjService.GetlistXszXgaj(xszajbhMap);
         }
-           // 同样过案件编号去TB_YW_CBZ_CBAJ查询XLAJBH
-           List<String> listXlajbh = tbStAsjService.getXlajbhByAsjbh(asjbh);
-           if(listXlajbh.size()>0){
+        // 同样过案件编号去TB_YW_CBZ_CBAJ查询XLAJBH
+        List<String> listXlajbh = tbStAsjService.getXlajbhByAsjbh(asjbh);
+        if(listXlajbh.size()>0){
             xszajbhMap.put("listXlajbh",listXlajbh);
             xszajbhMap.put("asjbhs",asjbh);
 
@@ -168,11 +169,26 @@ public class AsjController {
                     }
                 }
             }
-               a.put("cbzaj",listCbzByXlajbh);
+            a.put("cbzaj",listCbzByXlajbh);
+        }
+        // 返回结果处理
+        List<CbxszAndXlaj> listXszXgajResult = new ArrayList<>();
+        if (listXszXgaj.size() > 0) {
+            // 现根据 案件号相同时分组
+            Map<String, List<CbxszAndXlaj>> map = listXszXgaj.stream().collect(Collectors.groupingBy(o -> o.getAsjbh()));
+            map.forEach((key, value) -> {
+                if (value.size() > 1) {
+                    String cblx = String.join("、", value.stream().map(CbxszAndXlaj::getCblxStr).collect(Collectors.toList()));
+                    value.get(0).setCblxStr(cblx);
+                    listXszXgajResult.add(value.get(0));
+                } else {
+                    listXszXgajResult.addAll(value);
+                }
+            });
         }
         // 将查回的线索组封装成json
-        a.put("xszaj", listXszXgaj);
-        return MapRestResult.build(200,"成功",a.size(),a);
+        a.put("xszaj", listXszXgajResult);
+        return MapRestResult.build(200, "成功", listXszXgajResult.size(), a);
     }
 
     @OperLog(message = "公共_人员涉案信息",operation = OperationType.QUERY)
@@ -186,16 +202,9 @@ public class AsjController {
     @OperLog(message = "以案侦查_重点人员查询",operation = OperationType.QUERY)
     @ApiOperation(value = "以案侦查_重点人员查询")
     @PostMapping("/queryZdry")
-    public JSONObject getCzzdry(@RequestBody ZdryParams params){
-       /* List<ZdryResult> list = tbStAsjService.getZdry(params);
-        return MapRestResult.build(200,"成功",list.size(),list);*/
-        JSONObject jsonObject = null;
-        try {
-            jsonObject = JsonUtils.readJsonFromClassPath("data/getZdry.json", JSONObject.class);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonObject;
+    public MapRestResult getCzzdry(@RequestBody ZdryParams params){
+        List<ZdryResult> list = tbStAsjService.getZdry(params);
+        return MapRestResult.build(200,"成功",list.size(),list);
     }
 
     @OperLog(message = "以案侦查_重点场所/高危场所信息",operation = OperationType.QUERY)

service/publicapi/src/main/java/com/founder/publicapi/controller/KshService/KshSlServiceController.java

@@ -11,9 +11,9 @@ import com.founder.commonutils.model.newPublicEntity.MapRestResult;
 import com.founder.commonutils.model.nmDataEntity.NeiMengEntity.*;
 import com.founder.commonutils.model.nmDataEntity.ParamsEntity.NmTokenUtils;
 import com.founder.commonutils.util.*;
-import com.founder.publicapi.mapper.mysqlMapper.TbStAsjMapper;
-import com.founder.publicapi.mapper.mysqlMapper.TbYwXszDwcbgxMapper;
 import com.founder.publicapi.mapper.mysqlMapper.ZbFzxyrDataMapper;
+import com.founder.publicapi.mapper.oracleXzxtMapper.TbStAsjMapper;
+import com.founder.publicapi.mapper.oracleXzxtMapper.TbYwXszDwcbgxMapper;
 import com.founder.servicebase.logs.OperLog;
 import com.founder.servicebase.logs.OperationType;
 import io.swagger.annotations.Api;

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java

@@ -13,7 +13,7 @@ import com.founder.commonutils.model.vo.param.SkRegionalsResultSaveParam;
 import com.founder.commonutils.model.vo.param.SkRegionalsTaskResultParamAll;
 import com.founder.commonutils.util.*;
 import com.founder.publicapi.controller.SkDataUpload.FtpUtil;
-import com.founder.publicapi.mapper.mysqlMapper.TbStAsjMapper;
+import com.founder.publicapi.mapper.oracleXzxtMapper.TbStAsjMapper;
 import com.founder.publicapi.service.SkRegionalsDetailService;
 import com.founder.publicapi.service.SkRegionalsPersonService;
 import com.founder.publicapi.service.SkRegionalsTaskService;

service/publicapi/src/main/java/com/founder/publicapi/controller/ZtypService/ZtypController.java

+/*
 package com.founder.publicapi.controller.ZtypService;
 
 import com.alibaba.excel.EasyExcel;
@@ -233,7 +234,8 @@ public class ZtypController {
     @OperLog(message = "可视化测试",operation = OperationType.QUERY)
     @PostMapping("/kshdatatest")
     @ApiOperation(value = "可视化测试")
-    public String kshdatatest(){
+  */
+/*  public String kshdatatest(){
         return "{\n" +
                 "\t\"status\": 200,\n" +
                 "\t\"msg\": \"可视化结果获取成功\",\n" +
@@ -348,7 +350,8 @@ public class ZtypController {
                 "\t\t]\n" +
                 "\t}\n" +
                 "}";
-    }
+    }*//*
+
 
     @OperLog(message = "可视化模板话单导入",operation = OperationType.QUERY)
     @PostMapping("importHd")
@@ -415,3 +418,4 @@ public class ZtypController {
         }
     }
 }
+*/

service/publicapi/src/main/java/com/founder/publicapi/mapper/mapMapper/xml/SkPointsMapper.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.publicapi.mapper.mapMapper.SkPointsMapper">
-    <!--根据起始经纬度获取卡口点位数据-->
-    <select id="getKkInfoByQsJwd" parameterType="com.founder.commonutils.model.vo.param.SkPointlocationParam" resultType="com.founder.commonutils.model.newPublicEntity.SkPointlocation">
-        select
-        NAME as devicename,
-        CODE as deviceid,
-        (select name from sys_dictitem where groupid = 'CODE_XZQH' and code = substr(t.CODE,0,6))||NAME as address,
-        x as x,
-        y as y
-        from tb_zy_kk t    where 1=1
-        <if test="startLng!=null and startLng!='' and endLng!=null and endLng!='' and startLat!=null and startLat!='' and endLat!=null and endLat!=''">
-            AND x<![CDATA[>=]]>#{startLng,jdbcType=VARCHAR} AND x<![CDATA[<=]]>#{endLng,jdbcType=VARCHAR}
-            AND y<![CDATA[>=]]>#{startLat,jdbcType=VARCHAR} AND y<![CDATA[<=]]>#{endLat,jdbcType=VARCHAR}
-        </if>
-    </select>
-    <!--根据起始经纬度获取人像点位数据-->
-    <select id="getCameraInfoByQsJwd" parameterType="com.founder.commonutils.model.vo.param.SkPointlocationParam" resultType="com.founder.commonutils.model.newPublicEntity.SkPointlocation">
-        select
-        ID as deviceid,
-        NAME as devicename,
-        (select name from sys_dictitem where groupid = 'CODE_XZQH' and code = substr(t.camera_code,0,6)) as address,
-        x as x,
-        y as y
-        from tb_zy_camera t   where 1=1
-        <if test="startLng!=null and startLng!='' and endLng!=null and endLng!='' and startLat!=null and startLat!='' and endLat!=null and endLat!=''">
-            AND x<![CDATA[>=]]>#{startLng,jdbcType=VARCHAR} AND x<![CDATA[<=]]>#{endLng,jdbcType=VARCHAR}
-            AND y<![CDATA[>=]]>#{startLat,jdbcType=VARCHAR} AND y<![CDATA[<=]]>#{endLat,jdbcType=VARCHAR}
-        </if>
-    </select>
-    <!--根据起始经纬度获取基站点位数据-->
-    <select id="getJzInfoByQsJwd" parameterType="com.founder.commonutils.model.vo.param.SkPointlocationParam" resultType="com.founder.commonutils.model.newPublicEntity.SkPointlocation">
-        select
-        LAC||'_'||CID as deviceid,
-        XZQH_DZ as devicename,
-        CITY || DISTRICT || XZQH_DZ as address,
-        x as x,
-        y as y
-        from tb_zy_jz t   where 1=1
-        <if test="startLng!=null and startLng!='' and endLng!=null and endLng!='' and startLat!=null and startLat!='' and endLat!=null and endLat!=''">
-            AND x<![CDATA[>=]]>#{startLng,jdbcType=VARCHAR} AND x<![CDATA[<=]]>#{endLng,jdbcType=VARCHAR}
-            AND y<![CDATA[>=]]>#{startLat,jdbcType=VARCHAR} AND y<![CDATA[<=]]>#{endLat,jdbcType=VARCHAR}
-        </if>
-    </select>
-</mapper>

service/publicapi/src/main/java/com/founder/publicapi/mapper/mapMapper/SkPointsMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SkPointsMapper.java

-package com.founder.publicapi.mapper.mapMapper;
+package com.founder.publicapi.mapper.mysqlMapper;
 
 
 import com.founder.commonutils.model.newPublicEntity.SkPointlocation;

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SkRegionalsResultMapper.java

 package com.founder.publicapi.mapper.mysqlMapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.founder.commonutils.model.newPublicEntity.SkRegionalsResultAll;
 import com.founder.commonutils.model.newPublicEntity.SkRegionalsResult;
+import com.founder.commonutils.model.newPublicEntity.SkRegionalsResultAll;
 import com.founder.commonutils.model.newPublicEntity.SkRegionalsResultFl;
 import com.founder.commonutils.model.vo.param.SkRegionalsTaskResultParamAll;
 import org.apache.ibatis.annotations.Param;
@@ -22,9 +22,9 @@ public interface SkRegionalsResultMapper extends BaseMapper<SkRegionalsResult> {
     List<SkRegionalsResultAll> selecteRegionalsTasksResults(SkRegionalsTaskResultParamAll skRegionalsTaskResultParamAll);
     List<SkRegionalsResultAll> selecteRegionalsTasksResultsByTaskid(SkRegionalsTaskResultParamAll skRegionalsTaskResultParamAll);
     int selecteRegionalsTasksResultsCount(SkRegionalsTaskResultParamAll skRegionalsTaskResultParamAll);
-    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkhsPeople(@Param(value = "taskId")String taskId,@Param(value = "objectValue")String objectValue);
-    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkhsCar(@Param(value = "taskId")String taskId,@Param(value = "objectValue")String objectValue);
-    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkphCar(@Param(value = "taskId")String taskId,@Param(value = "objectValue")String objectValue);
-    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkphPeople(@Param(value = "taskId")String taskId,@Param(value = "objectValue")String objectValue);
+    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkhsPeople(@Param(value = "taskId") String taskId, @Param(value = "objectValue") String objectValue);
+    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkhsCar(@Param(value = "taskId") String taskId, @Param(value = "objectValue") String objectValue);
+    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkphCar(@Param(value = "taskId") String taskId, @Param(value = "objectValue") String objectValue);
+    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkphPeople(@Param(value = "taskId") String taskId, @Param(value = "objectValue") String objectValue);
 }
 

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SkRegionalsTaskMapper.java

@@ -29,6 +29,6 @@ public interface SkRegionalsTaskMapper extends BaseMapper<SkRegionalsTask> {
 
     int queryTaskInfoListCount(SkRegionalsTaskParam skRegionalsTaskParam);
 
-    List<RegionalsParam>  queryRegionalsList(@Param(value = "taskId")String taskId);
+    List<RegionalsParam>  queryRegionalsList(@Param(value = "taskId") String taskId);
 }
 

service/publicapi/src/main/java/com/founder/publicapi/mapper/qgxzMapper/TbStAsjqgMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/oracleQgxzMapper/TbStAsjqgMapper.java

-package com.founder.publicapi.mapper.qgxzMapper;
+package com.founder.publicapi.mapper.oracleQgxzMapper;
 
 
 import org.apache.ibatis.annotations.Mapper;

service/publicapi/src/main/java/com/founder/publicapi/mapper/qgxzMapper/xml/TbStAsjqgMapper.xml → service/publicapi/src/main/java/com/founder/publicapi/mapper/oracleQgxzMapper/xml/TbStAsjqgMapper.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.publicapi.mapper.qgxzMapper.TbStAsjqgMapper">
+<mapper namespace="com.founder.publicapi.mapper.oracleQgxzMapper.TbStAsjqgMapper">
 
     <select id="getqgAsjxxByZjhm" parameterType="java.lang.String" resultType="map">
         SELECT

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SysDictitemMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/oracleXzxtMapper/SysDictitemMapper.java

-package com.founder.publicapi.mapper.mysqlMapper;
+package com.founder.publicapi.mapper.oracleXzxtMapper;
 
 
 import com.founder.commonutils.model.newPublicEntity.DictitemJt;
@@ -14,7 +14,7 @@ import java.util.Map;
 public interface SysDictitemMapper {
     String getNameByCode(Map<String, String> map);
     DictitemJt getAirportInfo(@Param(value = "bsm") String bsm);
-    DictitemJt getTrainStationInfo(@Param(value = "bsm") String bsm,@Param(value = "type") String type);
+    DictitemJt getTrainStationInfo(@Param(value = "bsm") String bsm, @Param(value = "type") String type);
     /**
      * getDwLevByDwdm 查询单位级别
      * @param unitcode: 单位代码

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TbStAsjMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/oracleXzxtMapper/TbStAsjMapper.java

-package com.founder.publicapi.mapper.mysqlMapper;
+package com.founder.publicapi.mapper.oracleXzxtMapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.founder.commonutils.model.asjEntity.CbxszAndXlaj;
@@ -29,17 +29,17 @@ public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
 
     Integer selectAsjxxByReceivingListCount(TbStAsjParm tbStAsjParm);
 
-    List<String> getXszajbhByAsjbh(@Param(value = "asjbh")String asjbh);
+    List<String> getXszajbhByAsjbh(@Param(value = "asjbh") String asjbh);
 
-    List<String> getXlajbhByAsjbh(@Param(value = "asjbh")String asjbh);
+    List<String> getXlajbhByAsjbh(@Param(value = "asjbh") String asjbh);
 
     List<CbxszAndXlaj> GetlistXszXgaj(Map map);
 
     List<CbxszAndXlaj> GetlistCbzXgaj(Map map);
 
-    String getNameByCode(Map<String,String> map);
+    String getNameByCode(Map<String, String> map);
 
-    List<Map<String,Object>> getAsjxxByZjhm(@Param(value = "zjhm")String zjhm);
+    List<Map<String,Object>> getAsjxxByZjhm(@Param(value = "zjhm") String zjhm);
 
     String getDicNameByCode(Map<String, Object> map);
 
@@ -47,7 +47,7 @@ public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
 
     List<ZdcsResult> getQkryByTime(SkPointlocationParams params);
 
-    Integer getQkryBySfzh(@Param(value = "zjhm")String zjhm);
+    Integer getQkryBySfzh(@Param(value = "zjhm") String zjhm);
 
     TbAsjJwdInfo getJwdinfoByAsjbh(String asjbh);
 

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TbStZtypFwbshMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/oracleXzxtMapper/TbStZtypFwbshMapper.java

-package com.founder.publicapi.mapper.mysqlMapper;
+package com.founder.publicapi.mapper.oracleXzxtMapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TbYwXszDwcbgxMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/oracleXzxtMapper/TbYwXszDwcbgxMapper.java

-package com.founder.publicapi.mapper.mysqlMapper;
+package com.founder.publicapi.mapper.oracleXzxtMapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/UserMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/oracleXzxtMapper/UserMapper.java

-package com.founder.publicapi.mapper.mysqlMapper;
+package com.founder.publicapi.mapper.oracleXzxtMapper;
 
 
 import com.founder.commonutils.model.newPublicEntity.ApprovalEntity.SysUser;

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SysDictitemMapper.xml → service/publicapi/src/main/java/com/founder/publicapi/mapper/oracleXzxtMapper/xml/SysDictitemMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.founder.publicapi.mapper.mysqlMapper.SysDictitemMapper">
+<mapper namespace="com.founder.publicapi.mapper.oracleXzxtMapper.SysDictitemMapper">
 
     <!-- 根据code和groupid查询name值-->
     <select id="getNameByCode" parameterType="java.util.Map" resultType="java.lang.String">

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.xml → service/publicapi/src/main/java/com/founder/publicapi/mapper/oracleXzxtMapper/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.publicapi.mapper.mysqlMapper.TbStAsjMapper">
+<mapper namespace="com.founder.publicapi.mapper.oracleXzxtMapper.TbStAsjMapper">
     <select id="selectAsjxxByReceivingList"   parameterType="com.founder.commonutils.model.vo.param.TbStAsjParm"   resultType="com.founder.commonutils.model.asjEntity.TbStAsjResult">
         select t2.* from(
         select t1.*,rownum as rn from
@@ -144,7 +144,7 @@
         b.ASJFSDD_DQJD as x,
         b.ASJFSDD_DQWD as y,
         b.JYAQ as jyaq,
-        DATE_FORMAT(b.ASJFSSJ_ASJFSKSSJ,'%Y-%m-%d %H:%i:%S') as asjfssjAsjfskssj,
+        to_date(b.ASJFSSJ_ASJFSKSSJ,'yyyy-MM-dd hh24:mi:ss') as asjfssjAsjfskssj,
         (select name from sys_dictitem where groupid='CODE_ZCJDDM' AND code = b.ZCJDDM) as zcjdmc,
         (select name from sys_dictitem where groupid='CODE_AJLB' AND code = b.AJLBDM) as ajlbdmMc,
         (select name from sys_dictitem where groupid='CODE_AJXZ' AND code = b.ZATZ_JYQK) as zatzJyqkMc,
@@ -166,7 +166,7 @@
         b.ASJFSDD_DQJD as x,
         b.ASJFSDD_DQWD as y,
         b.JYAQ as jyaq,
-        DATE_FORMAT(b.ASJFSSJ_ASJFSKSSJ,'%Y-%m-%d %H:%i:%S') as asjfssjAsjfskssj,
+        to_date(b.ASJFSSJ_ASJFSKSSJ,'yyyy-MM-dd hh24:mi:ss') as asjfssjAsjfskssj,
         (select name from sys_dictitem where groupid='CODE_ZCJDDM' AND code = b.ZCJDDM) as zcjdmc,
         (select name from sys_dictitem where groupid='CODE_AJLB' AND code = b.AJLBDM) as ajzlbmc,
         (select name from sys_dictitem where groupid='CODE_AJXZ' AND code = b.ZATZ_JYQK) as ajxzlbmc,
@@ -229,28 +229,26 @@
         SELECT
         BZ.XM xm,
         BZ.ZJHM zjhm,
+        (select name from sys_dictitem where groupid='CODE_XB' AND code = BZ.XBDM) xb
         DIC.NAME xb,
         BZ.CODE_TXT rybq,
         BZ.AJLB_CODE_TXT ajbq,
-        BZ.SYRK_DZMC hjdz,
-        BZ.SYRK_ZXJD x,
-        BZ.SYRK_ZXWD y
+        (select name from sys_dictitem where groupid='CODE_XZQH' AND code = BZ.XZQHDM) hjdz
         FROM
         tb_st_rybz BZ
-        LEFT JOIN sys_dictitem DIC ON BZ.XBDM = DIC.CODE AND DIC.GROUPID = 'CODE_XB'
         WHERE
         <if test="startLng != null and startLng != '' and endLng != null and endLng != '' and startLat != null and startLat != ''and endLat != null and endLat != ''">
             SYRK_ZXJD BETWEEN #{startLng} AND #{endLng}
             AND SYRK_ZXWD BETWEEN #{startLat} AND #{endLat}
         </if>
         <if test="xm != null and xm != ''">
-            AND BZ.XM  LIKE concat('%', #{xm , jdbcType=VARCHAR }, '%')
+            AND BZ.XM  LIKE '%'|| #{xm , jdbcType=VARCHAR }|| '%'
         </if>
         <if test="zjhm != null and zjhm != ''">
-            AND BZ.ZJHM LIKE concat('%', #{zjhm , jdbcType=VARCHAR }, '%')
+            AND BZ.ZJHM LIKE '%'|| #{zjhm , jdbcType=VARCHAR }||'%'
         </if>
         <if test="rybq != null and rybq != ''">
-            AND BZ.CODE_TXT LIKE concat('%', #{rybq , jdbcType=VARCHAR }, '%')
+            AND BZ.CODE_TXT LIKE '%'|| #{rybq , jdbcType=VARCHAR }|| '%'
         </if>
     </select>
     <select id="getQkryByTime" parameterType="com.founder.commonutils.model.vo.param.SkPointlocationParams" resultType="com.founder.commonutils.model.newPublicEntity.ZdcsResult">

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/UserMapper.xml → service/publicapi/src/main/java/com/founder/publicapi/mapper/oracleXzxtMapper/xml/UserMapper.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.publicapi.mapper.mysqlMapper.UserMapper">
+<mapper namespace="com.founder.publicapi.mapper.oracleXzxtMapper.UserMapper">
     <select id = "getSysUser" parameterType="com.founder.commonutils.model.newPublicEntity.ApprovalEntity.User" resultType="com.founder.commonutils.model.newPublicEntity.ApprovalEntity.User">
         select
         ID as Id,

service/publicapi/src/main/java/com/founder/publicapi/service/SkGjGlAjServiceImpl.java

@@ -2,12 +2,10 @@ package com.founder.publicapi.service;
 
 import com.founder.commonutils.model.asjEntity.TbStAsjResult;
 import com.founder.commonutils.model.newPublicEntity.MapRestResult;
-import com.founder.commonutils.model.newPublicEntity.SkRegionalsResultAll;
 import com.founder.commonutils.model.newPublicEntity.SkTrail;
 import com.founder.commonutils.model.vo.param.SkGjglajParam;
 import com.founder.commonutils.model.vo.param.TbStAsjParm;
-import com.founder.publicapi.controller.SkModelService.SkTrailController;
-import com.founder.publicapi.mapper.mysqlMapper.TbStAsjMapper;
+import com.founder.publicapi.mapper.oracleXzxtMapper.TbStAsjMapper;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/OrderServiceImpl.java

@@ -6,6 +6,7 @@ import com.founder.commonutils.model.newPublicEntity.ApprovalEntity.*;
 import com.founder.commonutils.util.KeyUtilNaotu;
 import com.founder.commonutils.util.StringUtil;
 import com.founder.publicapi.mapper.mysqlMapper.*;
+import com.founder.publicapi.mapper.oracleXzxtMapper.UserMapper;
 import com.founder.publicapi.service.OrderService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SpxxServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.founder.commonutils.model.newPublicEntity.ApprovalEntity.*;
 import com.founder.commonutils.util.KeyUtilNaotu;
 import com.founder.publicapi.mapper.mysqlMapper.*;
+import com.founder.publicapi.mapper.oracleXzxtMapper.UserMapper;
 import com.founder.publicapi.service.SpxxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/TbStAsjServiceImpl.java

@@ -16,9 +16,9 @@ import com.founder.commonutils.model.vo.param.SkPointlocationParams;
 import com.founder.commonutils.model.vo.param.TbStAsjParm;
 import com.founder.commonutils.model.vo.param.ZdryParams;
 import com.founder.commonutils.util.DwUtilCommon;
-import com.founder.publicapi.mapper.mysqlMapper.SysDictitemMapper;
-import com.founder.publicapi.mapper.mysqlMapper.TbStAsjMapper;
-import com.founder.publicapi.mapper.qgxzMapper.TbStAsjqgMapper;
+import com.founder.publicapi.mapper.oracleQgxzMapper.TbStAsjqgMapper;
+import com.founder.publicapi.mapper.oracleXzxtMapper.SysDictitemMapper;
+import com.founder.publicapi.mapper.oracleXzxtMapper.TbStAsjMapper;
 import com.founder.publicapi.service.SkPointlocationService;
 import com.founder.publicapi.service.TbStAsjService;
 import org.apache.commons.lang.StringUtils;

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/UserServiceImpl.java

@@ -5,7 +5,7 @@ import com.founder.commonutils.model.newPublicEntity.ApprovalEntity.EasyUIPage;
 import com.founder.commonutils.model.newPublicEntity.ApprovalEntity.TbStApproveUserRole;
 import com.founder.commonutils.model.newPublicEntity.ApprovalEntity.User;
 import com.founder.commonutils.util.HqXjDwCommon;
-import com.founder.publicapi.mapper.mysqlMapper.UserMapper;
+import com.founder.publicapi.mapper.oracleXzxtMapper.UserMapper;
 import com.founder.publicapi.service.UserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ZtypServiceImpl.java

@@ -9,9 +9,9 @@ import com.founder.commonutils.util.JsonUtils;
 import com.founder.commonutils.util.JwtUser;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.commonutils.util.StringUtil;
-import com.founder.publicapi.mapper.mysqlMapper.TbStAsjMapper;
-import com.founder.publicapi.mapper.mysqlMapper.TbStZtypFwbshMapper;
 import com.founder.publicapi.mapper.mysqlMapper.ZtypMapper;
+import com.founder.publicapi.mapper.oracleXzxtMapper.TbStAsjMapper;
+import com.founder.publicapi.mapper.oracleXzxtMapper.TbStZtypFwbshMapper;
 import com.founder.publicapi.service.ZtypService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

service/publicapi/src/main/resources/bootstrap-dev.properties

@@ -7,32 +7,33 @@ spring.jackson.time-zone=GMT+8
 logging.level.root=INFO
 #mybatis???
 #mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-#mysql?????????
+#oracle xzxt
 spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
-spring.datasource.xzxtdb.url=jdbc:oracle:thin:@10.100.17.120:1521:XZXT
-spring.datasource.xzxtdb.username=XZXT
-spring.datasource.xzxtdb.password=XzxtPwd#15
-spring.datasource.xzxtdb.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.oraclexzxt.url=jdbc:oracle:thin:@10.100.17.120:1521:XZXT
+spring.datasource.oraclexzxt.username=XZXT
+spring.datasource.oraclexzxt.password=XzxtPwd#15
+spring.datasource.oraclexzxt.type=com.alibaba.druid.pool.DruidDataSource
 
-#oracle?????????(?????)
-spring.datasource.qgdb.driver-class-name=oracle.jdbc.driver.OracleDriver
-spring.datasource.qgdb.url=jdbc:oracle:thin:@10.100.17.120:1521:XZXT
-spring.datasource.qgdb.username=XZXT
-spring.datasource.qgdb.password=XzxtPwd#15
-spring.datasource.qgdb.type=com.alibaba.druid.pool.DruidDataSource
+#oracle qgxzxt
+spring.datasource.oracleqgxz.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.oracleqgxz.url=jdbc:oracle:thin:@10.100.17.120:1521:XZXT
+spring.datasource.oracleqgxz.username=XZXT
+spring.datasource.oracleqgxz.password=XzxtPwd#15
+spring.datasource.oracleqgxz.type=com.alibaba.druid.pool.DruidDataSource
 
-#mapywgl?????????(?????)
-spring.datasource.map.driver-class-name=oracle.jdbc.driver.OracleDriver
-spring.datasource.map.url=jdbc:oracle:thin:@10.100.17.120:1521:XZXT
-spring.datasource.map.username=MAPYWGL
-spring.datasource.map.password=MAPYWGL
-spring.datasource.map.type=com.alibaba.druid.pool.DruidDataSource
+#oracle map
+spring.datasource.oraclemap.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.oraclemap.url=jdbc:oracle:thin:@10.100.17.120:1521:XZXT
+spring.datasource.oraclemap.username=MAPYWGL
+spring.datasource.oraclemap.password=MAPYWGL
+spring.datasource.oraclemap.type=com.alibaba.druid.pool.DruidDataSource
 
-spring.datasource.dwsl.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.dwsl.url=jdbc:mysql://133.8.5.76:3307/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-spring.datasource.dwsl.username=skyp
-spring.datasource.dwsl.password=skyp
-spring.datasource.dwsl.type=com.alibaba.druid.pool.DruidDataSource
+#mysql
+spring.datasource.mysql.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.mysql.url=jdbc:mysql://26.3.111.63:3307/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+spring.datasource.mysql.username=skyp
+spring.datasource.mysql.password=skyp
+spring.datasource.mysql.type=com.alibaba.druid.pool.DruidDataSource
 
 #\u5377\u5B97\u4E0A\u4F20\u7684\u8DEF\u5F84
 approvalFilePath = /data/excel/approvalWord/

service/publicapi/src/main/resources/bootstrap-prod.properties

@@ -7,33 +7,33 @@ spring.jackson.time-zone=GMT+8
 logging.level.root=INFO
 #mybatis???
 #mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-#mysql?????????
+#oracle xzxt
 spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
-spring.datasource.xzxtdb.url=jdbc:oracle:thin:@10.100.17.120:1521:XZXT
-spring.datasource.xzxtdb.username=XZXT
-spring.datasource.xzxtdb.password=XzxtPwd#15
-spring.datasource.xzxtdb.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.oraclexzxt.url=jdbc:oracle:thin:@10.100.17.120:1521:XZXT
+spring.datasource.oraclexzxt.username=XZXT
+spring.datasource.oraclexzxt.password=XzxtPwd#15
+spring.datasource.oraclexzxt.type=com.alibaba.druid.pool.DruidDataSource
 
-#oracle?????????(?????)
-spring.datasource.qgdb.driver-class-name=oracle.jdbc.driver.OracleDriver
-spring.datasource.qgdb.url=jdbc:oracle:thin:@10.100.17.120:1521:XZXT
-spring.datasource.qgdb.username=XZXT
-spring.datasource.qgdb.password=XzxtPwd#15
-spring.datasource.qgdb.type=com.alibaba.druid.pool.DruidDataSource
+#oracle qgxzxt
+spring.datasource.oracleqgxz.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.oracleqgxz.url=jdbc:oracle:thin:@10.100.17.120:1521:XZXT
+spring.datasource.oracleqgxz.username=XZXT
+spring.datasource.oracleqgxz.password=XzxtPwd#15
+spring.datasource.oracleqgxz.type=com.alibaba.druid.pool.DruidDataSource
 
-#mapywgl?????????(?????)
-spring.datasource.map.driver-class-name=oracle.jdbc.driver.OracleDriver
-spring.datasource.map.url=jdbc:oracle:thin:@10.100.17.120:1521:XZXT
-spring.datasource.map.username=MAPYWGL
-spring.datasource.map.password=MAPYWGL
-spring.datasource.map.type=com.alibaba.druid.pool.DruidDataSource
+#oracle map
+spring.datasource.oraclemap.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.oraclemap.url=jdbc:oracle:thin:@10.100.17.120:1521:XZXT
+spring.datasource.oraclemap.username=MAPYWGL
+spring.datasource.oraclemap.password=MAPYWGL
+spring.datasource.oraclemap.type=com.alibaba.druid.pool.DruidDataSource
 
-
-spring.datasource.dwsl.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.dwsl.url=jdbc:mysql://133.8.5.76:3307/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-spring.datasource.dwsl.username=skyp
-spring.datasource.dwsl.password=skyp
-spring.datasource.dwsl.type=com.alibaba.druid.pool.DruidDataSource
+#mysql
+spring.datasource.mysql.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.mysql.url=jdbc:mysql://26.3.111.63:3307/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+spring.datasource.mysql.username=skyp
+spring.datasource.mysql.password=skyp
+spring.datasource.mysql.type=com.alibaba.druid.pool.DruidDataSource
 
 #\u5377\u5B97\u4E0A\u4F20\u7684\u8DEF\u5F84
 approvalFilePath = /data/excel/approvalWord/

service/publicapi/src/main/resources/bootstrap.properties

-spring.profiles.active=dev
+spring.profiles.active=prod
 server.port=1003
 
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss