新功能:标准表的校验+抽取(包括oracle、sqlServer)

web_backend_develope
chenlw 10 years ago
parent 0e4cc24af9
commit 670bdea55d

@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.ExceptionHandler;
import com.platform.utils.Configs;
@ -48,13 +49,16 @@ public class BaseController {
new CustomException("base_code_", ex);
// 根据不同错误转向不同页面
if(ex instanceof CustomException) {
//返回异常信息
ModelMap modelMap = new ModelMap();
CustomException cuse = (CustomException) ex;
Map<String, String> errmsg = new HashMap<>();
errmsg.put("code", cuse.getCode());
errmsg.put("msg", cuse.getMsg());
log.error(cuse.getCode());
modelMap.addAllAttributes(errmsg);
response.setStatus(500);
return response;
return modelMap;
} else {
//其他错误则 调到指定页面
log.error(Configs.GLOBAL_EXP_NOT_CUSTOM, ex);

@ -42,4 +42,8 @@ public class Custom4exception {
/** * MySQL错误 */
public final static String MySQL_Except = "3002002001";
//3003001
/** * 信息系统-校验-sqlserver抽取标准表 --连接不上标准表汇总库错误 */
public final static String CHECKOUT_EXTRACT_EXCEPT = "3003001001";
}

@ -7,7 +7,6 @@ import java.lang.reflect.InvocationTargetException;
import org.apache.log4j.Logger;
import com.platform.controller.DataModelController;
import com.platform.utils.Bean2MapUtils;
import com.platform.utils.Configs;
import com.platform.utils.Constant;
@ -51,7 +50,7 @@ public class CustomException extends Exception {
* @param obj
*/
public CustomException(String code,Exception e,Object... obj) {
super(code);
// super(code);
StringBuffer sbuf= new StringBuffer();
this.code = code;
sbuf.append(code);

@ -8,4 +8,7 @@
3002001003=\u8FDE\u63A5\u6C47\u603B-\u521B\u5EFAoracle\u8FDE\u63A5\u5931\u8D25
#3002002
3002002001=MySQL\u9519\u8BEF
3002002001=MySQL\u9519\u8BEF
#3003001
3003001001=\u8FDE\u63A5\u4E0D\u4E0A\u6807\u51C6\u8868\u6C47\u603B\u5E93

@ -15,10 +15,11 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
<result property="tableName" column="service_table" javaType="string" jdbcType="VARCHAR"/>
<result property="suffix" column="service_suffix" javaType="string" jdbcType="VARCHAR"/>
<result property="status" column="service_status" javaType="string" jdbcType="VARCHAR"/>
<result property="type" column="type" javaType="string" jdbcType="VARCHAR"/>
<result property="remove" column="remove" jdbcType="CHAR"/>
</resultMap>
<sql id="baseOracleInfo">
id id, service_port port, service_ip ip, service_name name, service_user user, service_password password, service_database databaseName, service_table tableName, service_suffix suffix, service_status status
id id,service_port port,service_ip ip,service_name name,service_user user,service_password password,service_database databaseName,service_table tableName,service_suffix suffix,service_status status,type type
</sql>
<select id="selectAllOracle" resultType="com.platform.entities.GatherOracleInfo">
@ -59,6 +60,9 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">
service_status,
</if>
<if test="type != null and type != ''">
type,
</if>
</trim>
)
VALUES(
@ -90,6 +94,9 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">
#{status},
</if>
<if test="type != null and type != ''">
#{type},
</if>
</trim>
)
</insert>
@ -133,6 +140,9 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">
service_status= #{status},
</if>
<if test="type != null and type != ''">
type= #{type},
</if>
<if test="remove != null and remove != ''">
remove= #{remove},
</if>
@ -142,5 +152,30 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
id = #{id}
</where>
</update>
<update id="updateAllOracle" parameterType="com.platform.entities.GatherOracleInfo">
UPDATE
services_info
<set >
<trim suffixOverrides=",">
<if test="type != null and type != ''">
type= #{type},
</if>
</trim>
</set>
</update>
<update id="updateAllOracleExceptId" parameterType="com.platform.entities.GatherOracleInfo">
UPDATE
services_info
<set >
<trim suffixOverrides=",">
<if test="type != null and type != ''">
type= #{type},
</if>
</trim>
</set>
<where>
id != #{id}
</where>
</update>
</mapper>

@ -48,8 +48,20 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
jdbcType="VARCHAR" />
<result property="volumePath" column="volume_path" javaType="string"
jdbcType="VARCHAR" />
<result property="dataBaseType" column="data_base_type" javaType="string"
jdbcType="VARCHAR" />
<result property="execResultLast" column="checkout_indicate_last" javaType="string"
jdbcType="VARCHAR" />
<result property="payResultLast" column="checkout_pay_last" javaType="string"
jdbcType="VARCHAR" />
<result property="standardExtractStatus" column="standard_extract_status" javaType="string"
jdbcType="VARCHAR" />
<result property="checkoutFlag" column="checkout_flag" javaType="string"
jdbcType="VARCHAR" />
<result property="mark" column="mark" javaType="string"
jdbcType="VARCHAR" />
jdbcType="VARCHAR" />
</resultMap>
<sql id="conditionsFilters">
<if test="dataType!=null">
@ -89,7 +101,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
<select id="getLimitedDataInfoEntities" parameterType="com.platform.entities.PagerOptions"
resultMap="getEntityByText">
SELECT
id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path,mark
id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path,data_base_type,standard_extract_status,checkout_flag,mark
FROM data_details
<where>
<include refid="conditionsFilters" />
@ -112,11 +124,19 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
<!-- 获取数据符合筛选条件的全部记录信息 -->
<select id="findAll" resultMap="getEntityByText">
SELECT
id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path,mark
id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path,data_base_type,standard_extract_status,checkout_flag,mark
FROM data_details
ORDER BY data_details.id
</select>
<!-- 获取数据符合筛选条件的全部记录信息 -->
<select id="findById" resultMap="getEntityByText" parameterType="java.lang.Integer">
SELECT
id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path,data_base_type,standard_extract_status,checkout_indicate_last,checkout_pay_last,checkout_flag,mark
FROM data_details
WHERE id =#{id}
</select>
<!-- 获取数据 条件:采集时间 -->
<select id="findByParam" resultType="com.platform.entities.DataInfoEntity" parameterType="com.platform.entities.DataInfoEntity">
SELECT

@ -108,7 +108,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
<!-- sql txt find_city_Column_List -->
<sql id="find_city_Column_List">
d.id dataId,a.area_code areaCode,a.city_name cityName,a.district_name districtName,a.system_name sysName,a.sys_code sysCode,a.area_level areaLevel,a.sys_version sysVersion,a.begin_in_use beginUseTime,a.function_details functionDetails,
d.standard_extract_status standardExtractStatus,d.extract_status extractStatus,d.data_year year,d.data_path path,d.id dataId,a.area_code areaCode,a.city_name cityName,a.district_name districtName,a.system_name sysName,a.sys_code sysCode,a.area_level areaLevel,a.sys_version sysVersion,a.begin_in_use beginUseTime,a.function_details functionDetails,
a.department_manager departmentManager,a.manager_contacts managerContacts,a.sys_developer_full_name developerFullName,a.data_base_type dataBaseType,a.data_base_version dataBaseVersion,
a.is_budget_exec budgetExecManage,a.is_budget_quota budgetQuotaManage,a.is_collection collection,a.is_department_budget departmentBudgetManage,a.total_budget_account totalBudgetAccount,
a.final_account_manage finalAccountManage,a.report_form_manage reportFormManage,a.non_tax_revenue_manage nonTaxManage,a.wage_system wageSystem,
@ -197,7 +197,9 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
<include refid="find_city_Column_List" />
FROM standard_data_details a left join collection_data_description l on a.area_code=l.regionalism_code AND a.sys_code=l.sys_code
left join data_info d on a.area_code=d.regionalism_code AND a.sys_code=d.system_code AND d.remove='0'
WHERE a.is_collection='是' AND a.city_name=#{cityName}
<where>
a.is_collection='是' AND a.city_name=#{cityName}
</where>
ORDER BY a.area_code,a.sys_code,d.data_version
</select>

@ -36,7 +36,7 @@ public class CheckoutController extends BaseController {
private ICheckoutService checkoutService;
/**
*
* ----
* @return
* @throws Exception
*/
@ -52,7 +52,7 @@ public class CheckoutController extends BaseController {
}
/**
*
* ----
* @return
* @throws Exception
*/
@ -68,7 +68,7 @@ public class CheckoutController extends BaseController {
}
/**
*
* ----
* @return
* @throws Exception
*/
@ -89,7 +89,7 @@ public class CheckoutController extends BaseController {
}
/**
*
* ----
* @return
* @throws Exception
*/
@ -110,7 +110,7 @@ public class CheckoutController extends BaseController {
}
/**
*
* ---- ->
* @return
* @throws Exception
*/
@ -138,7 +138,7 @@ public class CheckoutController extends BaseController {
}
/**
*
* ----
* @return
* @throws Exception
*/
@ -157,4 +157,27 @@ public class CheckoutController extends BaseController {
}
return modelMap;
}
/** ----sqlserver
* @param form
* @param req
* @param res
* @return
* @throws Exception
*/
@ResponseBody
@RequestMapping("/extractList")
public ModelMap extractList(@RequestBody List<CheckoutEntity> form, HttpServletRequest req, HttpServletResponse res) throws Exception {
ModelMap modelMap = new ModelMap();
if (null != form) {
log.info("---------/extractList--- "+ form.size());
List<CheckoutEntity> result = checkoutService.extractSqlServer(form);
modelMap.addAttribute("data", result);
modelMap.addAttribute("length", result.size());
}
else {
log.info("---------/extractList--- "+ form);
}
return modelMap;
}
}

@ -158,42 +158,7 @@ public class DataModelController extends BaseController {
req.setStatus(200);
}
@RequestMapping(value = "/oracle/{name}/extract", method = RequestMethod.POST)
public void oracleExtract(HttpServletRequest res, HttpServletResponse req,
@RequestBody oracleForm form) throws Exception {
Configs.CONSOLE_LOGGER.error("/oracle/{name}/extract");
// res.setCharacterEncoding("UTF-8");
boolean isConnect = false;
//5秒内是否能获得oracle连接否则认为超时。
if (null != form.getTarget()) {
ThreadGainOracleConnect thOrcl = new ThreadGainOracleConnect(form, OracleExtract);
thOrcl.start();
for (int i = 0; i < 10; i++) {
Thread.sleep(400);
isConnect = thOrcl.isConnect();
if (isConnect) {
break;
}
else {
if (thOrcl.isExcept()) {
break;
}
Thread.sleep(100);
}
}
}
if (isConnect)
req.setStatus(200);
else
req.setStatus(500);
// 开始抽取数据到汇总库
if (isConnect && null != form.getInneed() && form.getInneed().size() > 0) {
ThreadExtractOracle thExtra = new ThreadExtractOracle(form, OracleExtract);
thExtra.start();
// OracleExtract.extractOracle(form.getName(), form.getInneed(),
// form.getTarget());
}
}
// public void oracleExtract(HttpServletRequest res,
// HttpServletResponse req, String name, @RequestBody GatherOracleInfo
@ -259,6 +224,43 @@ public class DataModelController extends BaseController {
req.setStatus(200);
}
@RequestMapping(value = "/oracle/{name}/extract", method = RequestMethod.POST)
public void oracleExtract(HttpServletRequest res, HttpServletResponse req,
@RequestBody oracleForm form) throws Exception {
Configs.CONSOLE_LOGGER.error("/oracle/{name}/extract");
// res.setCharacterEncoding("UTF-8");
boolean isConnect = false;
//5秒内是否能获得oracle连接否则认为超时。
if (null != form.getTarget()) {
ThreadGainOracleConnect thOrcl = new ThreadGainOracleConnect(form, OracleExtract);
thOrcl.start();
for (int i = 0; i < 10; i++) {
Thread.sleep(400);
isConnect = thOrcl.isConnect();
if (isConnect) {
break;
}
else {
if (thOrcl.isExcept()) {
break;
}
Thread.sleep(100);
}
}
}
if (isConnect)
req.setStatus(200);
else
req.setStatus(500);
// 开始抽取数据到汇总库
if (isConnect && null != form.getInneed() && form.getInneed().size() > 0) {
ThreadExtractOracle thExtra = new ThreadExtractOracle(form, OracleExtract);
thExtra.start();
// OracleExtract.extractOracle(form.getName(), form.getInneed(),
// form.getTarget());
}
}
@RequestMapping(value = "/oracle/list", method = RequestMethod.POST)
@ResponseBody
public List<GatherOracleInfo> oracleList() throws Exception {

@ -54,7 +54,7 @@ import com.platform.utils.HttpUtils;
import com.platform.utils.ThreadRemoveFile;
import com.platform.utils.UtilsHelper;
/** --excel
/** --excel
* @author chen
*
*/
@ -67,8 +67,12 @@ public class ExcelController extends BaseController{
@Resource(name = "preDataInfoService")
private IPreDataInfoService preDataInfoService;
// 文件上传处理函数
/** ----
* @param request
* @param response
* @throws ServletException
* @throws IOException
*/
@RequestMapping(value = "/file/upload", method = RequestMethod.POST)
public void upload(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
@ -129,7 +133,12 @@ public class ExcelController extends BaseController{
log.info("----");
}
// 文件下载处理函数
/** ----(excel)
* @param request
* @param response
* @return
* @throws Exception
*/
@RequestMapping(value = "/file/download")
public ResponseEntity<byte[]> download(HttpServletRequest request,
HttpServletResponse response) throws Exception {
@ -153,7 +162,12 @@ public class ExcelController extends BaseController{
}
}
// 文件上传处理函数
/**
* @param request
* @return
* @throws ServletException
* @throws IOException
*/
private ResumableInfo getResumableInfo(HttpServletRequest request)
throws ServletException, IOException {
String base_dir = Configs.FILE_UPLOAD_PATH;
@ -186,6 +200,12 @@ public class ExcelController extends BaseController{
return info;
}
/** ----
* @param res
* @param req
* @return
* @throws Exception
*/
@ResponseBody
@RequestMapping("/findByParam")
public ModelMap findByParam(HttpServletRequest res, HttpServletResponse req) throws Exception {
@ -216,6 +236,10 @@ public class ExcelController extends BaseController{
return modelMap;
}
/** ----
* @return
* @throws Exception
*/
@ResponseBody
@RequestMapping("/findAll")
public ModelMap findAll() throws Exception {
@ -226,6 +250,13 @@ public class ExcelController extends BaseController{
return modelMap;
}
/** ----excel
* @param request
* @param response
* @param fileNameList
* @return
* @throws Exception
*/
@ResponseBody
@RequestMapping(produces = "application/json", value = "/importExcel", method = RequestMethod.POST)
public ModelMap importExcel(HttpServletRequest request,

@ -29,6 +29,10 @@ import com.platform.service.IScriptMakeService;
import com.platform.utils.Configs;
import com.platform.utils.ZipCompressUtils;
/** --
* @author chen
*
*/
@Controller
@RequestMapping("/filePackage")
public class FilePackageController extends BaseController {
@ -39,6 +43,12 @@ public class FilePackageController extends BaseController {
@Resource(name = "scriptMakeService")
private IScriptMakeService scriptMakeService;
/** ----
* @param request
* @param response
* @return
* @throws Exception
*/
@RequestMapping("/download")
public ResponseEntity<byte[]> downloadFile(HttpServletRequest request,
HttpServletResponse response) throws Exception {
@ -67,7 +77,7 @@ public class FilePackageController extends BaseController {
}
}
/**
*
* ----
* @return
* @throws Exception
*/
@ -83,7 +93,7 @@ public class FilePackageController extends BaseController {
}
/**
*
* ----
* @param type
* @param data
* @param res
@ -107,7 +117,7 @@ public class FilePackageController extends BaseController {
}
/**
*
* ----
* @param type
* @param opt
* @param form
@ -131,7 +141,7 @@ public class FilePackageController extends BaseController {
}
/**
*
* ----
* @param type
* @param opt
* @param form
@ -159,7 +169,7 @@ public class FilePackageController extends BaseController {
}
/**
*
* ----
* @param type
* @param opt
* @param form

@ -0,0 +1,95 @@
package com.platform.controller;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.base.BaseController;
import com.platform.entities.oracleForm;
import com.platform.service.ILogRead;
import com.platform.service.IOracleExtractService;
import com.platform.service.thread.ThreadExtractOracle;
import com.platform.service.thread.ThreadGainOracleConnect;
import com.platform.utils.Configs;
/** oracle
* @author chen
*
*/
@Controller
public class OracleController extends BaseController {
@Resource(name = "OracleExtract")
private IOracleExtractService OracleExtract;
@Resource(name = "logReadService")
private ILogRead logReadService;
@RequestMapping(value = "/oracle/{name}/StandardExtract", method = RequestMethod.POST)
public void oracleStandardExtract(HttpServletRequest res, HttpServletResponse req,
@RequestBody oracleForm form) throws Exception {
Configs.CONSOLE_LOGGER.error("/oracle/{name}/StandardExtract");
// res.setCharacterEncoding("UTF-8");
boolean isConnect = false;
//5秒内是否能获得oracle连接否则认为超时。
if (null != form.getTarget()) {
ThreadGainOracleConnect thOrcl = new ThreadGainOracleConnect(form, OracleExtract);
thOrcl.start();
for (int i = 0; i < 10; i++) {
Thread.sleep(400);
isConnect = thOrcl.isConnect();
if (isConnect) {
break;
}
else {
if (thOrcl.isExcept()) {
break;
}
Thread.sleep(100);
}
}
}
if (isConnect)
req.setStatus(200);
else
req.setStatus(500);
// 开始抽取数据到汇总库
if (isConnect && null != form.getInneed() && form.getInneed().size() > 0) {
ThreadExtractOracle thExtra = new ThreadExtractOracle(form, OracleExtract);
thExtra.start();
// OracleExtract.extractOracle(form.getName(), form.getInneed(),
// form.getTarget());
}
}
/** sqlserveroracle
* @param name
* @param res
* @param req
* @return
* @throws Exception
*/
@RequestMapping(value = "/StandardExtract/log", method = RequestMethod.POST)
@ResponseBody
public Object getStandardExtractLog(@RequestParam("rcName") String name,
HttpServletRequest res, HttpServletResponse req) throws Exception {
Configs.CONSOLE_LOGGER.info("/oracle/StandardExtract/log");
String result = logReadService.readStandardLog(name);
// StringBuilder sb = new StringBuilder();
// sb.append("查看相应日志").append("\n").append("看到了");
Map<String, String> log = new HashMap<>();
log.put(name, result);
return log;
}
}

@ -22,6 +22,8 @@ public interface DataInfoDao {
List<DataInfoEntity> findAll()throws Exception;
DataInfoEntity findById(int id)throws Exception;
List<DataInfoEntity> findByParam(DataInfoEntity data)throws Exception;
int removes(List<Integer> list)throws Exception;

@ -35,5 +35,19 @@ public interface GatherOracleDao {
* @throws Exception
*/
public int updateOracleById(GatherOracleInfo oracle) throws Exception;
/**
* @param oracle
* @return
* @throws Exception
*/
public int updateAllOracle(GatherOracleInfo oracle) throws Exception;
/**
* @param oracle
* @return
* @throws Exception
*/
public int updateAllOracleExceptId(GatherOracleInfo oracle) throws Exception;
}

@ -11,15 +11,27 @@ public class CheckoutEntity extends PreDataInfo implements Comparable<CheckoutEn
/** 执行信息表 */
private String execResult;
/** 支付信息表校验--汇总 */
/** 支付信息表校验--汇总--校验字段0未校验1不需校验2正在校验3校验成功4校验失败5待抽取6正在抽取7抽取完成 */
private String payResultLast;
/** 执行信息表校验--汇总 */
/** 执行信息表校验--汇总 --校验字段0未校验1不需校验2正在校验3校验成功4校验失败5待抽取6正在抽取7抽取完成 */
private String execResultLast;
/** 是否进行了校验 */
/** 是否进行了校验 , 0未校验1已校验,2正则校验,6正在抽取7抽取完成*/
private String checkoutFlag;
/** 数据所在的路径 */
private String path;
/** 数据年度 */
private String year;
/** 是否抽取 0标示为未汇总1标示汇总中2标示汇总完成 */
private int extractStatus;
/** 标准表抽取标记 */
private String standardExtractStatus;
/**
* -
*/
@ -109,6 +121,48 @@ public class CheckoutEntity extends PreDataInfo implements Comparable<CheckoutEn
this.checkoutFlag = checkoutFlag;
}
/**
* @return the path
*/
public String getPath() {
return path;
}
/**
* @param path the path to set
*/
public void setPath(String path) {
this.path = path;
}
/**
* @return the year
*/
public String getYear() {
return year;
}
/**
* @param year the year to set
*/
public void setYear(String year) {
this.year = year;
}
/**
* @return the extractStatus
*/
public int getExtractStatus() {
return extractStatus;
}
/**
* @param extractStatus the extractStatus to set
*/
public void setExtractStatus(int extractStatus) {
this.extractStatus = extractStatus;
}
/**
* @return the mark
*/
@ -123,6 +177,20 @@ public class CheckoutEntity extends PreDataInfo implements Comparable<CheckoutEn
this.mark = mark;
}
/**
* @return the standardExtractStatus
*/
public String getStandardExtractStatus() {
return standardExtractStatus;
}
/**
* @param standardExtractStatus the standardExtractStatus to set
*/
public void setStandardExtractStatus(String standardExtractStatus) {
this.standardExtractStatus = standardExtractStatus;
}
/** 按checkResult的状态排序 */
@Override
public int compareTo(CheckoutEntity arg0) {

@ -37,6 +37,9 @@ public class DataInfoEntity {
private String volumeType;
/** 数据库类型 */
private String dataBaseType;
private String mark;
/** 支付信息表校验--采集 */
@ -54,6 +57,9 @@ public class DataInfoEntity {
/** 是否进行了校验 */
private String checkoutFlag;
/** 是否进行了抽取 */
private String standardExtractStatus;
public DataInfoEntity() {
}
@ -298,6 +304,20 @@ public class DataInfoEntity {
this.mark = mark;
}
/**
* @return the dataBaseType
*/
public String getDataBaseType() {
return dataBaseType;
}
/**
* @param dataBaseType the dataBaseType to set
*/
public void setDataBaseType(String dataBaseType) {
this.dataBaseType = dataBaseType;
}
/**
* @return the payResult
*/
@ -368,6 +388,20 @@ public class DataInfoEntity {
this.checkoutFlag = checkoutFlag;
}
/**
* @return the standardExtractStatus
*/
public String getStandardExtractStatus() {
return standardExtractStatus;
}
/**
* @param standardExtractStatus the standardExtractStatus to set
*/
public void setStandardExtractStatus(String standardExtractStatus) {
this.standardExtractStatus = standardExtractStatus;
}
@Override
public String toString() {
return "id=" + this.id + " ,regionalismCode=" + this.regionalismCode

@ -8,6 +8,8 @@ public class GatherOracleInfo extends OracleConnectorParams {
private String suffix;
private String type;
private int id;
private String remove;
@ -55,6 +57,20 @@ public class GatherOracleInfo extends OracleConnectorParams {
this.suffix = suffix;
}
/**
* @return the type
*/
public String getType() {
return type;
}
/**
* @param type the type to set
*/
public void setType(String type) {
this.type = type;
}
public int getId() {
return id;
}

@ -34,7 +34,7 @@ public class OracleConnector {
Configs.CONSOLE_LOGGER.info("创建oracle连接失败: [" + e.getMessage() + "]");
if (null != oc) {
FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION
+ oc.getName(), "创建oracle连接失败: [" + e.getMessage() + "]\r\n");
+ oc.getName()+".log", "创建oracle连接失败: [" + e.getMessage() + "]\r\n");
}
throw new CustomException(Custom4exception.OracleSQL_Except, e);
}

@ -8,15 +8,58 @@ import com.platform.entities.PreDataInfo;
public interface ICheckoutService {
/**
* @return
* @throws Exception
*/
public List<CheckoutEntity> findAll() throws Exception;
/**
* @param list
* @return
* @throws Exception
*/
public List<CheckoutEntity> checkAll(List<CheckoutEntity> list) throws Exception;
/**
* @param list
* @return
* @throws Exception
*/
public List<CheckoutEntity> deleteAll(List<CheckoutEntity> list) throws Exception;
/**
* @param ck
* @return
* @throws Exception
*/
public int updateStandardInfo(PreDataInfo ck) throws Exception;
/**
* @param ck
* @return
* @throws Exception
*/
public Map<String, PreDataInfo> findDetail(CheckoutEntity ck) throws Exception;
/** -
* @param city
* @return
* @throws Exception
*/
public List<CheckoutEntity> findByCity(String city) throws Exception;
/** sqlserver
* @param list
* @return
* @throws Exception
*/
public List<CheckoutEntity> extractSqlServer(List<CheckoutEntity> list) throws Exception;
/**
* @param ck
* @return
* @throws Exception
*/
public Map<String, PreDataInfo> readLog(CheckoutEntity ck) throws Exception;
}

@ -4,4 +4,6 @@ public interface ILogRead {
public String readLog(String filename) throws Exception;
public String readStandardLog(String filename) throws Exception;
}

@ -26,5 +26,15 @@ public interface IOracleExtractService {
* @throws Exception
*/
public boolean isConnectTotalOracle(GatherOracleInfo oracleConnect) throws Exception;
/**
* @param name
* @param dataInfolist
* @param oracleConnect
* @return
* @throws Exception
*/
boolean extractStandardTable(String name, List<OracleConnectorParams> dataInfolist,
GatherOracleInfo oracleConnect) throws Exception;
}

@ -1,5 +1,7 @@
package com.platform.service;
import io.fabric8.kubernetes.api.model.Config;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -142,6 +144,60 @@ public class OracleExtractHelper {
// FileOperateHelper
// .fileWrite(
// Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
// grantSql+"\r\n");
}
/**
*
*
* @param conn
* @param oc
*/
public void createOnlyUser(Connection conn, OracleConnectorParams oc, GatherOracleInfo totalOracle) {
String strTUser = Configs.GATHER_STANDARD_USER_NAME;
String sql = "Create user " + strTUser + " default tablespace "
+ totalOracle.getTableName() + " identified by "
+ Configs.GATHER_TABLE_PASSWORD;
String grantSql = "grant connect, resource, dba to " + strTUser;
OracleConnector.execOracleSQL(conn, sql, Configs.EXTRACT_STANDARD_LOG_LOCALTION + oc.getName());
// FileOperateHelper
// .fileWrite(
// Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
// sql+"\r\n");
OracleConnector.execOracleSQL(conn, grantSql, Configs.EXTRACT_STANDARD_LOG_LOCALTION + oc.getName());
// FileOperateHelper
// .fileWrite(
// Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
// grantSql+"\r\n");
}
/**
*
*
* @param conn
* @param oc
*/
public void createTable(Connection conn, OracleConnectorParams oc, GatherOracleInfo totalOracle) {
String strTUser = oc.getName() + totalOracle.getSuffix();
String sql = "Create table " + strTUser + " default tablespace "
+ totalOracle.getTableName() + " identified by "
+ Configs.GATHER_TABLE_PASSWORD;
String grantSql = "grant connect, resource, dba to " + strTUser;
OracleConnector.execOracleSQL(conn, sql, Configs.EXTRACT_LOG_LOCALTION + oc.getName());
// FileOperateHelper
// .fileWrite(
// Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
// sql+"\r\n");
OracleConnector.execOracleSQL(conn, grantSql, Configs.EXTRACT_LOG_LOCALTION + oc.getName());
// FileOperateHelper
// .fileWrite(
// Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
// grantSql+"\r\n");
}
@ -201,4 +257,60 @@ public class OracleExtractHelper {
}
return flag;
}
/**
* --
*
* @param conn
* @param oc
*/
public void extractStandardPayTable(Connection conn, OracleConnectorParams oc, GatherOracleInfo totalOracle) {
String strTUser = Configs.GATHER_STANDARD_USER_NAME;
createPay(conn, oc);
String sql = "insert into " + strTUser + "." + Configs.GATHER_STANDARD_PAY_TABLE_NAME + "select * from "
+ strTUser + "." + Configs.GATHER_STANDARD_PAY_TABLE_NAME +"'@LINKTO"
+ oc.getName();
String resultSql = sql.replace(";", "");
OracleConnector.execUpdateOracleSQL(conn, resultSql, Configs.EXTRACT_STANDARD_LOG_LOCALTION + oc.getName());
}
/** --
* @param conn
* @param collectOracle
* @param oracleModel
*/
public void extractStandardExecTable(Connection conn,
OracleConnectorParams collectOracle, GatherOracleInfo oracleModel) {
createExec(conn, collectOracle);
String strTUser = Configs.GATHER_STANDARD_USER_NAME;
String sql = "insert into " + strTUser + "." + Configs.GATHER_STANDARD_EXEC_TABLE_NAME + "select * from "
+ strTUser + "." + Configs.GATHER_STANDARD_EXEC_TABLE_NAME +"'@LINKTO"
+ collectOracle.getName();
String resultSql = sql.replace(";", "");
OracleConnector.execUpdateOracleSQL(conn, resultSql, Configs.EXTRACT_STANDARD_LOG_LOCALTION + collectOracle.getName());
}
private void createPay(Connection conn, OracleConnectorParams oc) {
String payCmd = "CREATE TABLE u_bzbjy.zfxxb(XZQHDM Varchar(255),XZQHMC Varchar(255),PZBH Varchar(255),LYZBKZH Varchar(255),"
+ "ZFDATE Varchar(255),YSDWCODE Varchar(255),YSDWNAME Varchar(255),YWGKCS Varchar(255),XMCODE Varchar(255),XMNAME Varchar(255),"
+"XMLBCODE Varchar(255),XMLBNAME Varchar(255),ZB_NO Varchar(255),GNFLCODE Varchar(255),GNFLNAME Varchar(255),JJFLCODE Varchar(255),"
+"JJFLNAME Varchar(255),ZJXZCODE Varchar(255),ZJXZNAME Varchar(255),JSBFFSNAME Varchar(255),SKR Varchar(255),SKRYH Varchar(255),"
+ "SKRZHZH Varchar(255),FKZHCODE Varchar(255),FKZHNAME Varchar(255),FKYHCODE Varchar(255),FKYHNAME Varchar(255),QSZHCODE Varchar(255),"
+ "QSZHNAME Varchar(255),QSYHCODE Varchar(255),QSYHNAME Varchar(255),JE Numeric(18,2), SFTK Varchar(255),NIAN Varchar(255),ZY Varchar(255))";
OracleConnector.execOracleSQL(conn, payCmd, Configs.EXTRACT_STANDARD_LOG_LOCALTION + oc.getName());
}
private void createExec(Connection conn, OracleConnectorParams oc) {
String execCmd = "CREATE TABLE u_bzbjy.kzxzb(XZQHDM Varchar(255),XZQHMC Varchar(255),YSND Varchar(255),ZBCODE Varchar(255),ZB_ID Varchar(255),ZB_NO Varchar(255),"
+ "ZBDJLXCODE Varchar(255),ZBDJLXNAME Varchar(255),ZBLXNAME Varchar(255),DOCNO Varchar(255),ZBSM Varchar(255),ZBFWDATE Varchar(255),ZBYSLXCODE Varchar(255),"
+ "ZBYSLXNAME Varchar(255),ZBYSLYNAME Varchar(255),YSDWCODE Varchar(255),YSDWNAME Varchar(255),GNFLCODE Varchar(255),GNFLNAME Varchar(255),JJFLCODE Varchar(255),"
+ "JJFLNAME Varchar(255),ZBGLCSNAME Varchar(255),SZGLCODE Varchar(255),SZGLNAME Varchar(255),XMCODE Varchar(255),XMNAME Varchar(255),GZBZ Varchar(255),"
+ "JJBZ Varchar(255),CGBZ Varchar(255),ZFFSCODE Varchar(255),ZFFSNAME Varchar(255),JZZFBZ Varchar(255),ZBJE Numeric(18,2),ZBTJJE Numeric(18,2),ZBDJJE Numeric(18,2),"
+ "ZBKYJE Numeric(18,2),ZYZFBZ Varchar(255),BZ Varchar(255))";
OracleConnector.execOracleSQL(conn, execCmd, Configs.EXTRACT_STANDARD_LOG_LOCALTION + oc.getName());
}
}

File diff suppressed because it is too large Load Diff

@ -87,6 +87,9 @@ public class DataInfoServiceImp implements DataInfoService {
log.info(offset);
}
pagerOptions.setOffset(offset + 1);
if (null !=pagerOptions.getSubmittedBatch() && !"".equals(pagerOptions.getSubmittedBatch()) ) {
pagerOptions.setSubmittedBatch("批次"+pagerOptions.getSubmittedBatch());
}
List<DataInfoEntity> result = dfdDao
.getLimitedDataInfoEntities(pagerOptions);
if (null != result) {

@ -15,5 +15,11 @@ public class LogReadServiceImpl implements ILogRead {
String result = FileOperateHelper.fileReader(Configs.EXTRACT_LOG_LOCALTION + "J" + filename.replace("-", "_")+".log");
return result;
}
@Override
public String readStandardLog(String filename) throws Exception {
String result = FileOperateHelper.fileReader(Configs.EXTRACT_STANDARD_LOG_LOCALTION + "CQ" + filename.replace("-", "_")+".log");
return result;
}
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save