From 5a86d4a00b7a2dc2a70f554c16bcec0e3ad2a8d0 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 28 Mar 2025 17:38:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E7=AB=AF=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8C=85=EF=BC=8C=E6=96=87=E4=BB=B6=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualificationApplicationServiceImpl.java | 59 ++++++++----------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/src/com/engine/secret/service/impl/QualificationApplicationServiceImpl.java b/src/com/engine/secret/service/impl/QualificationApplicationServiceImpl.java index 0c4ce34..def97be 100644 --- a/src/com/engine/secret/service/impl/QualificationApplicationServiceImpl.java +++ b/src/com/engine/secret/service/impl/QualificationApplicationServiceImpl.java @@ -40,9 +40,9 @@ public class QualificationApplicationServiceImpl extends Service implements Qual private static String UNZIP_PWD = "zizhi102!"; private static int UPLOAD_CATALOGUE = 122; - private static String CONFIG_TABLE_NAME = "uf_bmj_sjjxpz"; - private static String CONFIG_DETAIL_TABLE_NAME = "uf_bmj_sjjxpz_dt1"; - private static String FILE_DETAIL_TABLE_NAME = "uf_bmj_sjjxpz_dt2"; + private static String CONFIG_TABLE_NAME = "uf_config_package"; + private static String CONFIG_DETAIL_TABLE_NAME = "uf_config_package_dt1"; + private static String FILE_DETAIL_TABLE_NAME = "uf_config_package_dt2"; BaseBean baseBean = new BaseBean(); @@ -143,15 +143,16 @@ public class QualificationApplicationServiceImpl extends Service implements Qual } catch (Exception e) { if (e.getMessage().contains("Wrong password")) { - System.err.println("密码错误"); + throw new CustomizeRunTimeException("数据包解压失败,密码错误"); } else { - e.printStackTrace(); + baseBean.writeLog(e); + throw new CustomizeRunTimeException(e); } } finally { try { Files.deleteIfExists(zipFilePath); } catch (IOException e) { - e.printStackTrace(); + baseBean.writeLog(e); } } } @@ -205,8 +206,7 @@ public class QualificationApplicationServiceImpl extends Service implements Qual continue; } dealDetailData(rootNode, billId, childDataConfigList); - // TODO 更新文件信息 - + dealFileList(billId, fileList, mainTableName, false); } } else { JsonNode jsonNode = rootNode.at(rootPath); @@ -215,7 +215,7 @@ public class QualificationApplicationServiceImpl extends Service implements Qual continue; } dealDetailData(rootNode, billId, childDataConfigList); - // TODO 更新文件信息 + dealFileList(billId, fileList, mainTableName, false); } } else { int billId = insertMainTable(rootNode, mainTableName, fieldDetailList); @@ -223,7 +223,6 @@ public class QualificationApplicationServiceImpl extends Service implements Qual continue; } dealDetailData(rootNode, billId, childDataConfigList); - // TODO 更新文件信息 dealFileList(billId, fileList, mainTableName, false); } } @@ -316,13 +315,12 @@ public class QualificationApplicationServiceImpl extends Service implements Qual int formModeId = ModeUtil.getModeIdByTableName(mainTableName); insertMap.put("formmodeid", formModeId); // 构建主表数据插入基本字段 - // TODO ModeUtil.buildModeInsertFields(insertMap, user.getUID()); - // 插入数据 - // TODO ModeUtil.insertData(insertMap, mainTableName); - // 数据权限重构,返回数据ID - // TODO return ModeUtil.refreshRight(uuid, mainTableName, formModeId, user.getUID()); + ModeUtil.buildModeInsertFields(insertMap, user.getUID()); baseBean.writeLog("insertMainTable: " + JSON.toJSONString(insertMap)); - return 1; + // 插入数据 + ModeUtil.insertData(insertMap, mainTableName); + // 数据权限重构,返回数据ID + return ModeUtil.refreshRight(uuid, mainTableName, formModeId, user.getUID()); } /** @@ -359,7 +357,7 @@ public class QualificationApplicationServiceImpl extends Service implements Qual insertMap.put("mainId", mainId); baseBean.writeLog("insertDetailTable: " + JSON.toJSONString(insertMap)); // 插入数据 - // TODO ModeUtil.insertData(insertMap, detailTableName); + ModeUtil.insertData(insertMap, detailTableName); } @@ -419,11 +417,11 @@ public class QualificationApplicationServiceImpl extends Service implements Qual // 根据主表、明细表，区分数据处理方式 if (isDetail) { dataMap.put("mainid", mainId); - //TODO ModeUtil.insertData(dataMap,tableName); + ModeUtil.insertData(dataMap,tableName); } else { dataMap.put("id", mainId); // 根据ID更新主表数据 - // TODO ModeUtil.updateDataById(dataMap, tableName); + ModeUtil.updateDataById(dataMap, tableName); } @@ -440,14 +438,13 @@ public class QualificationApplicationServiceImpl extends Service implements Qual // 获取离线包的先关配置 List dataConfigList = new ArrayList<>(); RecordSet rs = new RecordSet(); - // TODO 表名，字段名待确定 - rs.executeQuery("select * from " + CONFIG_TABLE_NAME + " where xrbbm is not null and xrbbm !='' and sjbly = ?", type); + rs.executeQuery("select * from " + CONFIG_TABLE_NAME + " where main_table is not null and main_table !='' and source_type = ?", type); while (rs.next()) { DataConfig dataConfig = new DataConfig(); dataConfig.setId(rs.getString("id")); - dataConfig.setMainTableName(rs.getString("xrbbm")); - dataConfig.setDetailTableName(rs.getString("xrbmxb")); - dataConfig.setRootPath(rs.getString("gjd")); + dataConfig.setMainTableName(rs.getString("main_table")); + dataConfig.setDetailTableName(rs.getString("detail_tables")); + dataConfig.setRootPath(rs.getString("root_path")); // 获取字段对照关系数据 List detailList = getDetailList(dataConfig.getId()); dataConfig.setDetailList(detailList); @@ -477,14 +474,12 @@ public class QualificationApplicationServiceImpl extends Service implements Qual for (String dtName : detailNameArray) { RecordSet rs = new RecordSet(); - // TODO 表名，字段名待确定 - rs.executeQuery("select * from " + CONFIG_TABLE_NAME + " where (xrbbm is null or xrbbm ='') and xrbmxb = ? and sjbly = ?", dtName, type); + rs.executeQuery("select * from " + CONFIG_TABLE_NAME + " where (main_table is null or main_table ='') and detail_tables = ? and source_type = ?", dtName, type); while (rs.next()) { DataConfig dataConfig = new DataConfig(); dataConfig.setId(rs.getString("id")); - dataConfig.setMainTableName(rs.getString("xrbbm")); - dataConfig.setDetailTableName(rs.getString("xrbmxb")); - dataConfig.setRootPath(rs.getString("gjd")); + dataConfig.setDetailTableName(rs.getString("detail_tables")); + dataConfig.setRootPath(rs.getString("root_path")); // 获取字段对照关系数据 List detailList = getDetailList(dataConfig.getId()); dataConfig.setDetailList(detailList); @@ -507,8 +502,7 @@ public class QualificationApplicationServiceImpl extends Service implements Qual RecordSet rs = new RecordSet(); rs.executeQuery("select * from " + CONFIG_DETAIL_TABLE_NAME + " where mainId = ?", mainId); while (rs.next()) { - // TODO 表名，字段名待确定 - detailList.add(DataConfigDetail.builder().fieldName(rs.getString("zdm")).path(rs.getString("wjbs")).condition(rs.getString("tj")).build()); + detailList.add(DataConfigDetail.builder().fieldName(rs.getString("field_name")).path(rs.getString("config_path")).condition(rs.getString("conditions")).build()); } return detailList; } @@ -524,8 +518,7 @@ public class QualificationApplicationServiceImpl extends Service implements Qual RecordSet rs = new RecordSet(); rs.executeQuery("select * from " + FILE_DETAIL_TABLE_NAME + " where mainId = ?", mainId); while (rs.next()) { - // TODO 表名，字段名待确定 - fileList.add(FileConfig.builder().fieldName(rs.getString("zdm")).fileId(rs.getString("wjbs")).isFilled(rs.getString("bzwj")).build()); + fileList.add(FileConfig.builder().fieldName(rs.getString("field_name")).fileId(rs.getString("file_id")).isFilled(rs.getString("file_type")).build()); } return fileList; }