Skip to content

M
map-parent
Commit 2b9e05f8 by yangyang
Options

内蒙数据源整理、bug处理(内蒙)

parent ecde594b
Showing with 119 additions and 102 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/nmDataEntity/ParamsEntity/NmTokenUtils.java
......@@ -39,7 +39,7 @@ import java.util.*;
public class NmTokenUtils {
private static Log logger = LogFactory.getLog(HttpClient.class);
private static RequestConfig requestConfig = null;
private static String tokenPath="C:/Users/admin/Desktop/sjq/token2.properties";
private static String tokenPath="/data/nmsk/token2.properties";
static{
// 设置请求和传输超时时间
......
common/common_utils/src/main/java/com/founder/commonutils/util/JDBCUtil.java
......@@ -4,9 +4,9 @@ import java.sql.*;
public class JDBCUtil {
private static final String DRIVER = "com.mysql.cj.jdbc.Driver";//驱动类类名
private static final String DBURL = "jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai";//连接URL,javaweb为数据库名
private static final String DBUSER = "root";//数据库用户
private static final String DBPASSWORD = "gkptCcYy123";//数据库密码
private static final String DBURL = "jdbc:mysql://26.3.111.63:3307/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai";//连接URL,javaweb为数据库名
private static final String DBUSER = "skyp";//数据库用户
private static final String DBPASSWORD = "skyp";//数据库密码
public static Connection getConnection() {
......
common/service_base/src/main/java/com/founder/servicebase/config/EduConfig.java → service/publicapi/src/main/java/com/founder/publicapi/config/EduConfig.java
package com.founder.servicebase.config;
package com.founder.publicapi.config;
import com.baomidou.mybatisplus.core.injector.ISqlInjector;
import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
......
common/service_base/src/main/java/com/founder/servicebase/config/ExcelUtil.java → service/publicapi/src/main/java/com/founder/publicapi/config/ExcelUtil.java
package com.founder.servicebase.config;
package com.founder.publicapi.config;
import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.util.SpringUtil;
import com.founder.servicebase.service.SkDictionaryService;
import com.founder.publicapi.service.SkDictionaryService;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
......
common/service_base/src/main/java/com/founder/servicebase/config/Knife4jConfig.java → service/publicapi/src/main/java/com/founder/publicapi/config/Knife4jConfig.java
package com.founder.servicebase.config;
package com.founder.publicapi.config;
import org.springframework.context.annotation.Bean;
......
common/service_base/src/main/java/com/founder/servicebase/config/MybatisOracleXzxtDbConfig.java → service/publicapi/src/main/java/com/founder/publicapi/config/MybatisOracleXzxtDbConfig.java
package com.founder.servicebase.config;
package com.founder.publicapi.config;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
......
common/service_base/src/main/java/com/founder/servicebase/config/MybatisSqlLoggerInterceptor.java → service/publicapi/src/main/java/com/founder/publicapi/config/MybatisSqlLoggerInterceptor.java
package com.founder.servicebase.config;
package com.founder.publicapi.config;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
......
common/service_base/src/main/java/com/founder/servicebase/config/TokenConfig.java → service/publicapi/src/main/java/com/founder/publicapi/config/TokenConfig.java
package com.founder.servicebase.config;
package com.founder.publicapi.config;
import com.founder.servicebase.controller.SkInterceptorController;
import com.founder.servicebase.interceptor.TokenInterceptor;
import com.founder.publicapi.controller.publicService.SkInterceptorController;
import com.founder.publicapi.interceptor.TokenInterceptor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkPointlocationController.java
......@@ -15,12 +15,12 @@ import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.model.newPublicEntity.SkPointlocation;
import com.founder.publicapi.mapper.mysqlMapper.SkPointsMapper;
import com.founder.publicapi.mapper.oracleXzxtMapper.TbStAsjMapper;
import com.founder.servicebase.controller.ExcelControllerInterface;
import com.founder.publicapi.controller.publicService.ExcelControllerInterface;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.publicapi.service.SkPointlocationService;
import com.founder.commonutils.util.SpringUtil;
import com.founder.servicebase.service.SkDictionaryService;
import com.founder.publicapi.service.SkDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsDetailController.java
......@@ -9,12 +9,12 @@ import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.vo.param.SkRegionalsDetailParam;
import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.model.newPublicEntity.SkRegionalsDetail;
import com.founder.servicebase.controller.ExcelControllerInterface;
import com.founder.publicapi.controller.publicService.ExcelControllerInterface;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.publicapi.service.SkRegionalsDetailService;
import com.founder.commonutils.util.SpringUtil;
import com.founder.servicebase.service.SkDictionaryService;
import com.founder.publicapi.service.SkDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsPersonController.java
......@@ -12,7 +12,7 @@ import com.founder.commonutils.util.Base64Util;
import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.model.newPublicEntity.SkRegionalsPerson;
import com.founder.publicapi.SkNmInterface.RyxxQgInterface;
import com.founder.servicebase.controller.ExcelControllerInterface;
import com.founder.publicapi.controller.publicService.ExcelControllerInterface;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.publicapi.service.SkRegionalsPersonService;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java
......@@ -23,12 +23,12 @@ 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;
import com.founder.servicebase.controller.ExcelControllerInterface;
import com.founder.publicapi.controller.publicService.ExcelControllerInterface;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.publicapi.service.SkRegionalsResultService;
import com.founder.servicebase.meassage.WebSocketServer;
import com.founder.servicebase.service.SkDictionaryService;
import com.founder.publicapi.service.SkDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
......@@ -270,6 +270,11 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
}
System.out.println("任务结果入库成功===================="+sucesslist.size());
System.out.println("耗时="+(System.currentTimeMillis()-start));
// 任务结果生成结束 完成状态
skRegionalsTask1.setTaskid(params.getTaskId());
skRegionalsTask1.setState("3");
skRegionalsTask1.setStatename("完成");
skRegionalsTaskService.updateById(skRegionalsTask1);
} catch (Exception e) {
e.printStackTrace();
// 任务结果生成结束 失败状态
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsTaskController.java
......@@ -10,12 +10,12 @@ import com.founder.commonutils.model.vo.param.*;
import com.founder.commonutils.util.ExportExcelUtil;
import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.model.newPublicEntity.SkRegionalsTask;
import com.founder.servicebase.controller.ExcelControllerInterface;
import com.founder.publicapi.controller.publicService.ExcelControllerInterface;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.publicapi.service.SkRegionalsTaskService;
import com.founder.commonutils.util.SpringUtil;
import com.founder.servicebase.service.SkDictionaryService;
import com.founder.publicapi.service.SkDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRelatedResultAllController.java
......@@ -10,12 +10,12 @@ import com.founder.commonutils.model.vo.param.SkRelatedResultAllParam;
import com.founder.commonutils.model.vo.response.SkRelatedResultAllVO;
import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.model.newPublicEntity.SkRelatedResultAll;
import com.founder.servicebase.controller.ExcelControllerInterface;
import com.founder.publicapi.controller.publicService.ExcelControllerInterface;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.publicapi.service.SkRelatedResultAllService;
import com.founder.commonutils.util.SpringUtil;
import com.founder.servicebase.service.SkDictionaryService;
import com.founder.publicapi.service.SkDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRelatedResultController.java
......@@ -15,7 +15,7 @@ import com.founder.publicapi.SkNmInterface.GlgxInterface;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.publicapi.service.SkRelatedResultService;
import com.founder.servicebase.service.SkDictionaryService;
import com.founder.publicapi.service.SkDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkServiceSqController.java
......@@ -7,10 +7,10 @@ import com.founder.commonutils.model.newPublicEntity.SkService;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.vo.param.SkServiceParam;
import com.founder.commonutils.util.ExportExcelUtil;
import com.founder.publicapi.service.SkServiceService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.SkDictionaryService;
import com.founder.servicebase.service.SkServiceService;
import com.founder.publicapi.service.SkDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkTrailController.java
......@@ -13,13 +13,12 @@ import com.founder.commonutils.util.*;
import com.founder.commonutils.model.newPublicEntity.SkTrail;
import com.founder.publicapi.SkNmInterface.InterfaceAPI;
import com.founder.publicapi.controller.SkDataUpload.FtpUtil;
import com.founder.servicebase.controller.ExcelControllerInterface;
import com.founder.publicapi.controller.publicService.ExcelControllerInterface;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.publicapi.service.SkTrailService;
import com.founder.servicebase.service.SkDictionaryService;
import com.founder.publicapi.service.SkDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
......@@ -31,7 +30,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
......
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataUpload/ExcelController.java
package com.founder.publicapi.controller.SkDataUpload;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.servicebase.config.ExcelUtil;
import com.founder.publicapi.config.ExcelUtil;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import io.swagger.annotations.Api;
......
common/service_base/src/main/java/com/founder/servicebase/controller/KshServiceController.java → service/publicapi/src/main/java/com/founder/publicapi/controller/publicService/KshServiceController.java
package com.founder.servicebase.controller;
package com.founder.publicapi.controller.publicService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
......@@ -10,10 +10,9 @@ import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.ztypEntity.KshServicePojo;
import com.founder.commonutils.model.newPublicEntity.ztypEntity.KsjResultCheck;
import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.util.StringUtil;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.KshService;
import com.founder.publicapi.service.KshService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.StringUtils;
......
common/service_base/src/main/java/com/founder/servicebase/controller/SkAesController.java → service/publicapi/src/main/java/com/founder/publicapi/controller/publicService/SkAesController.java
package com.founder.servicebase.controller;
package com.founder.publicapi.controller.publicService;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.util.AesEncryptUtil;
......
common/service_base/src/main/java/com/founder/servicebase/controller/SkDictionaryController.java → service/publicapi/src/main/java/com/founder/publicapi/controller/publicService/SkDictionaryController.java
package com.founder.servicebase.controller;
package com.founder.publicapi.controller.publicService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -10,7 +10,7 @@ import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.util.SpringUtil;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.SkDictionaryService;
import com.founder.publicapi.service.SkDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
common/service_base/src/main/java/com/founder/servicebase/controller/SkInterceptorController.java → service/publicapi/src/main/java/com/founder/publicapi/controller/publicService/SkInterceptorController.java
package com.founder.servicebase.controller;
package com.founder.publicapi.controller.publicService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -9,9 +9,9 @@ import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SkInterceptor;
import com.founder.commonutils.model.vo.param.SkInterceptorParam;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.service.SkInterceptorService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.SkInterceptorService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
......
common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceApplyController.java → service/publicapi/src/main/java/com/founder/publicapi/controller/publicService/SkServiceApplyController.java
package com.founder.servicebase.controller;
package com.founder.publicapi.controller.publicService;
import com.alibaba.fastjson.JSONObject;
......@@ -14,10 +14,10 @@ import com.founder.commonutils.model.vo.response.SkServiceApplyVO;
import com.founder.commonutils.util.ExportExcelUtil;
import com.founder.commonutils.util.JwtUser;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.service.SkServiceApplyService;
import com.founder.publicapi.service.SkServiceService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.SkServiceApplyService;
import com.founder.servicebase.service.SkServiceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceController.java → service/publicapi/src/main/java/com/founder/publicapi/controller/publicService/SkServiceController.java
package com.founder.servicebase.controller;
package com.founder.publicapi.controller.publicService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -10,10 +10,10 @@ import com.founder.commonutils.model.vo.param.SkServiceParam;
import com.founder.commonutils.util.ExcelUtil;
import com.founder.commonutils.util.ExportExcelUtil;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.service.SkServiceService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.SkDictionaryService;
import com.founder.servicebase.service.SkServiceService;
import com.founder.publicapi.service.SkDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......
common/service_base/src/main/java/com/founder/servicebase/controller/SkTextController.java → service/publicapi/src/main/java/com/founder/publicapi/controller/publicService/SkTextController.java
package com.founder.servicebase.controller;
package com.founder.publicapi.controller.publicService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -10,7 +10,7 @@ import com.founder.commonutils.model.vo.param.SkTextParam;
import com.founder.commonutils.util.KeyUtil;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.SkTextService;
import com.founder.publicapi.service.SkTextService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
......
common/service_base/src/main/java/com/founder/servicebase/controller/SkljServiceController.java → service/publicapi/src/main/java/com/founder/publicapi/controller/publicService/SkljServiceController.java
package com.founder.servicebase.controller;
package com.founder.publicapi.controller.publicService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -10,7 +10,7 @@ import com.founder.commonutils.model.vo.param.SkljServiceParam;
import com.founder.commonutils.util.KeyUtil;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import com.founder.servicebase.service.SkljServiceService;
import com.founder.publicapi.service.SkljServiceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
......
common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java → service/publicapi/src/main/java/com/founder/publicapi/controller/publicService/SysUserController.java
package com.founder.servicebase.controller;
package com.founder.publicapi.controller.publicService;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
......
common/service_base/src/main/java/com/founder/servicebase/exceptionhandler/GlobalExceptionHandler.java → service/publicapi/src/main/java/com/founder/publicapi/exceptionhandler/GlobalExceptionHandler.java
package com.founder.servicebase.exceptionhandler;
package com.founder.publicapi.exceptionhandler;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
......
common/service_base/src/main/java/com/founder/servicebase/exceptionhandler/GuliException.java → service/publicapi/src/main/java/com/founder/publicapi/exceptionhandler/GuliException.java
package com.founder.servicebase.exceptionhandler;
package com.founder.publicapi.exceptionhandler;
import lombok.AllArgsConstructor;
import lombok.Data;
......
common/service_base/src/main/java/com/founder/servicebase/handler/MyMetaObjectHandler.java → service/publicapi/src/main/java/com/founder/publicapi/handler/MyMetaObjectHandler.java
package com.founder.servicebase.handler;
package com.founder.publicapi.handler;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import org.apache.ibatis.reflection.MetaObject;
......
common/service_base/src/main/java/com/founder/servicebase/interceptor/TokenInterceptor.java → service/publicapi/src/main/java/com/founder/publicapi/interceptor/TokenInterceptor.java
package com.founder.servicebase.interceptor;
package com.founder.publicapi.interceptor;
import cn.hutool.json.JSONObject;
......@@ -7,8 +7,8 @@ import com.founder.commonutils.Exception.TokenException;
import com.founder.commonutils.model.newPublicEntity.*;
import com.founder.commonutils.util.JwtUser;
import com.founder.commonutils.util.ResultUtil;
import com.founder.servicebase.service.SkServiceApplyService;
import com.founder.servicebase.service.SkServiceService;
import com.founder.publicapi.service.SkServiceApplyService;
import com.founder.publicapi.service.SkServiceService;
import com.founder.servicebase.service.SysUserService;
import io.jsonwebtoken.Claims;
import org.springframework.beans.factory.annotation.Autowired;
......
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/KshMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/KshMapper.java
package com.founder.servicebase.mapper.mysqlMapper;
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/SkDictionaryMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SkDictionaryMapper.java
package com.founder.servicebase.mapper.mysqlMapper;
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.newPublicEntity.SkDictionary;
......
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/SkInterceptorMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SkInterceptorMapper.java
package com.founder.servicebase.mapper.mysqlMapper;
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.newPublicEntity.SkInterceptor;
......
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/SkServiceMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SkServiceMapper.java
package com.founder.servicebase.mapper.mysqlMapper;
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.newPublicEntity.SkService;
......
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/SkTextMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SkTextMapper.java
package com.founder.servicebase.mapper.mysqlMapper;
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/SkljServiceMapper.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SkljServiceMapper.java
package com.founder.servicebase.mapper.mysqlMapper;
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.newPublicEntity.SkljService;
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/oracleXzxtMapper/xml/TbStAsjMapper.xml
......@@ -226,6 +226,9 @@
AND code = #{code}
</select>
<select id="getZdry" resultType="com.founder.commonutils.model.newPublicEntity.ZdryResult" parameterType="com.founder.commonutils.model.vo.param.ZdryParams">
select t2.* from(
select t1.*,rownum as rn from
(
SELECT
BZ.XM xm,
BZ.ZJHM zjhm,
......@@ -249,6 +252,14 @@
<if test="rybq != null and rybq != ''">
AND BZ.CODE_TXT LIKE '%'|| #{rybq , jdbcType=VARCHAR }|| '%'
</if>
) t1
<where>
rownum<![CDATA[ <= ]]> 30
</where>
)t2
<where>
rn<![CDATA[ >= ]]> 0
</where>
</select>
<select id="getQkryByTime" parameterType="com.founder.commonutils.model.vo.param.SkPointlocationParams" resultType="com.founder.commonutils.model.newPublicEntity.ZdcsResult">
select
......
common/service_base/src/main/java/com/founder/servicebase/service/KshService.java → service/publicapi/src/main/java/com/founder/publicapi/service/KshService.java
package com.founder.servicebase.service;
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.newPublicEntity.ztypEntity.KshServicePojo;
......
common/service_base/src/main/java/com/founder/servicebase/service/SkDictionaryService.java → service/publicapi/src/main/java/com/founder/publicapi/service/SkDictionaryService.java
package com.founder.servicebase.service;
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.newPublicEntity.SkDictionary;
......
common/service_base/src/main/java/com/founder/servicebase/service/SkInterceptorService.java → service/publicapi/src/main/java/com/founder/publicapi/service/SkInterceptorService.java
package com.founder.servicebase.service;
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.newPublicEntity.SkInterceptor;
......
common/service_base/src/main/java/com/founder/servicebase/service/SkServiceApplyService.java → service/publicapi/src/main/java/com/founder/publicapi/service/SkServiceApplyService.java
package com.founder.servicebase.service;
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.newPublicEntity.SkServiceApply;
......
common/service_base/src/main/java/com/founder/servicebase/service/SkServiceService.java → service/publicapi/src/main/java/com/founder/publicapi/service/SkServiceService.java
package com.founder.servicebase.service;
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.newPublicEntity.SkService;
......
common/service_base/src/main/java/com/founder/servicebase/service/SkTextService.java → service/publicapi/src/main/java/com/founder/publicapi/service/SkTextService.java
package com.founder.servicebase.service;
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.newPublicEntity.SkText;
......
common/service_base/src/main/java/com/founder/servicebase/service/SkljServiceService.java → service/publicapi/src/main/java/com/founder/publicapi/service/SkljServiceService.java
package com.founder.servicebase.service;
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.newPublicEntity.SkljService;
......
common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/KshServiceImpl.java → service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/KshServiceImpl.java
package com.founder.servicebase.service.serviceimpl;
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.ztypEntity.KshServicePojo;
import com.founder.servicebase.mapper.mysqlMapper.KshMapper;
import com.founder.servicebase.service.KshService;
import com.founder.publicapi.mapper.mysqlMapper.KshMapper;
import com.founder.publicapi.service.KshService;
import org.springframework.stereotype.Service;
/**
......
common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/SkDictionaryServiceImpl.java → service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkDictionaryServiceImpl.java
package com.founder.servicebase.service.serviceimpl;
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.SkDictionary;
import com.founder.servicebase.mapper.mysqlMapper.SkDictionaryMapper;
import com.founder.servicebase.service.SkDictionaryService;
import com.founder.publicapi.mapper.mysqlMapper.SkDictionaryMapper;
import com.founder.publicapi.service.SkDictionaryService;
import org.springframework.stereotype.Service;
import java.util.HashMap;
......
common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/SkInterceptorServiceImpl.java → service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkInterceptorServiceImpl.java
package com.founder.servicebase.service.serviceimpl;
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.SkInterceptor;
import com.founder.servicebase.mapper.mysqlMapper.SkInterceptorMapper;
import com.founder.servicebase.service.SkInterceptorService;
import com.founder.publicapi.mapper.mysqlMapper.SkInterceptorMapper;
import com.founder.publicapi.service.SkInterceptorService;
import org.springframework.stereotype.Service;
/**
......
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsResultServiceImpl.java
......@@ -292,9 +292,9 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
List<SkRegionalsResultSaveParam> listResult = new ArrayList<>();
CarOneAreaIAnalysisSearchParam carOneAreaIAnalysisSearchParam = new CarOneAreaIAnalysisSearchParam();
// 参数处理timeCondition 使用 startTime endTime拼接
carOneAreaIAnalysisSearchParam.setTimeCondition(carReceiving.getStartTime()+"~"+carReceiving.getEndTime());
carOneAreaIAnalysisSearchParam.setTimeCondition(sf.format(carReceiving.getStartTime())+"~"+sf.format(carReceiving.getEndTime()));
// 设备id
carOneAreaIAnalysisSearchParam.setDeviceList(StringUtils.join(carReceiving.getDeviceId().substring(1,carReceiving.getDeviceId().length()-1).split(","), ","));
carOneAreaIAnalysisSearchParam.setDeviceList(StringUtils.join(carReceiving.getDeviceId().substring(1,carReceiving.getDeviceId().length()-1).split(","), ",").replace("\"",""));
//循环请求
Boolean flag=true;
int page = 1;
......@@ -613,20 +613,22 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
// ----回溯卡口-------------
@Override
public List<SkRegionalsResultSaveParam> areaHsInfoThread(SkRegionalsResultAllParam params1) {
public List<SkRegionalsResultSaveParam>
areaHsInfoThread(SkRegionalsResultAllParam params1) {
List<SkRegionalsResultSaveParam> listResult = new ArrayList<>();
// 通过任务编号 拿到区域集合
List<RegionalsParam> regionalsList = skRegionalsTaskMapper.queryRegionalsList(params1.getTaskId());
CarOneAreaIAnalysisSearchParam carOneAreaIAnalysisSearchParam = new CarOneAreaIAnalysisSearchParam();
// 参数处理timeCondition 使用 startTime endTime拼接
carOneAreaIAnalysisSearchParam.setTimeCondition(regionalsList.get(0).getStartTime()+"~"+regionalsList.get(0).getEndTime());
carOneAreaIAnalysisSearchParam.setTimeCondition(sf.format(regionalsList.get(0).getStartTime())+"~"+sf.format(regionalsList.get(0).getEndTime()));
// 设备id
carOneAreaIAnalysisSearchParam.setDeviceList(StringUtils.join(regionalsList.get(0).getDeviceId().substring(1,regionalsList.get(0).getDeviceId().length()-1).split(","), ","));
carOneAreaIAnalysisSearchParam.setDeviceList(StringUtils.join(regionalsList.get(0).getDeviceId().substring(1,regionalsList.get(0).getDeviceId().length()-1).split(","), ",").replace("\"", ""));
//循环请求
Boolean flag=true;
int page = 1;
carOneAreaIAnalysisSearchParam.setPageNo(page);
carOneAreaIAnalysisSearchParam.setPageSize(1000);
int currentPageTotal=0;//当前页返回的结果总数
HttpHeaders headers = new HttpHeaders();
......@@ -650,9 +652,11 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
String value = String.valueOf(m.invoke(carOneAreaIAnalysisSearchParam)) ;
form.put(name,value);
}
System.out.println("车辆入参"+form);
HttpEntity<Map<String, Object>> params = new HttpEntity<>(form, headers);
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
JSONObject resultJson = restTemplate.postForEntity("http://26.3.13.158/kiop-gateway-core/test/tollgate/advanced/withoutToken?apikey=fe89c771-1260-490e-a575-4ab217d99dbb", params, JSONObject.class).getBody();
System.out.println("成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功成功");
LinkedHashMap json = (LinkedHashMap) resultJson.get("result");//获取返回的数据结果
List<LinkedHashMap> array = (List<LinkedHashMap>) json.get("records");
currentPageTotal = array.size();
......@@ -691,6 +695,7 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
}
} catch (Exception e) {
e.printStackTrace();
System.out.println("错误顶顶顶顶顶顶顶顶顶顶顶顶顶顶顶顶顶顶顶");
}
if (currentPageTotal < carOneAreaIAnalysisSearchParam.getPageSize()) {//每页的总数大于当前页返回的总数，退出循环,d当期页的总数大于分页数，说明其接口无分页
flag = false;
......@@ -698,12 +703,13 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
carOneAreaIAnalysisSearchParam.setPageNo(++page);
}
}
System.out.println("aaaaaaaaaaaaaaaaaa"+JSONArray.toJSON(listResult));
return listResult;
}
public static void main(String args[]){
String a = "[8,7]";
String a = "[\"A\",\"B\"]";
String[] aa =a.substring(1,a.length()-1).split(",");
System.out.println(StringUtils.join(a.substring(1,a.length()-1).split(","), ","));;
}
......
common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/SkServiceApplyServiceImpl.java → service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkServiceApplyServiceImpl.java
package com.founder.servicebase.service.serviceimpl;
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.SkServiceApply;
import com.founder.commonutils.model.vo.param.SkServiceApplyParam;
import com.founder.commonutils.model.vo.response.SkServiceApplyVO;
import com.founder.publicapi.service.SkServiceApplyService;
import com.founder.servicebase.logs.mapper.mysqlMapper.SkServiceApplyMapper;
import com.founder.servicebase.service.SkServiceApplyService;
import org.springframework.stereotype.Service;
import java.util.HashMap;
......
common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/SkServiceServiceImpl.java → service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkServiceServiceImpl.java
package com.founder.servicebase.service.serviceimpl;
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.SkService;
import com.founder.servicebase.mapper.mysqlMapper.SkServiceMapper;
import com.founder.servicebase.service.SkServiceService;
import com.founder.publicapi.mapper.mysqlMapper.SkServiceMapper;
import com.founder.publicapi.service.SkServiceService;
import org.springframework.stereotype.Service;
/**
......
common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/SkTextServiceImpl.java → service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkTextServiceImpl.java
package com.founder.servicebase.service.serviceimpl;
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.SkText;
import com.founder.servicebase.mapper.mysqlMapper.SkTextMapper;
import com.founder.servicebase.service.SkTextService;
import com.founder.publicapi.mapper.mysqlMapper.SkTextMapper;
import com.founder.publicapi.service.SkTextService;
import org.springframework.stereotype.Service;
/**
......
common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/SkljServiceServiceImpl.java → service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkljServiceServiceImpl.java
package com.founder.servicebase.service.serviceimpl;
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.SkljService;
import com.founder.servicebase.mapper.mysqlMapper.SkljServiceMapper;
import com.founder.servicebase.service.SkljServiceService;
import com.founder.publicapi.mapper.mysqlMapper.SkljServiceMapper;
import com.founder.publicapi.service.SkljServiceService;
import org.springframework.stereotype.Service;
/**
......
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