提交修改

src/main/java/com/data/datarepo/controller/DataController.java

@@ -46,13 +46,17 @@ public class DataController {
         List<DataRepoTable> tableList = new ArrayList<DataRepoTable>();
         String[] value1 = new String[repo_name.length];
         String[] value2 = new String[repo_name.length];
+        String[] value3 = new String[repo_name.length];
+        String[] value4 = new String[repo_name.length];
         if (repo_name != null) {
             for (int i = 0; i < repo_name.length; i++) {
                 String temp = repo_name[i];
                 String[] itempsplit = temp.split("-");
                 value1[i] = itempsplit[0];
                 value2[i] = itempsplit[1];
-                dataRepoTable = dataService.testSelectResult(value1[i], value2[i]);
+                value3[i] = itempsplit[2];
+                value4[i] = itempsplit[3];
+                dataRepoTable = dataService.testSelectResult(value1[i], value2[i], value3[i], value4[i]);
                 tableList.add(dataRepoTable);
                 System.out.println("表：" + repo_name[i] + "加载完成:100%");
             }

src/main/java/com/data/datarepo/services/DataCenterService.java

@@ -3,36 +3,39 @@ package com.data.datarepo.services;
 import com.data.datarepo.domain.DataRepoTable;
 import com.data.datarepo.utils.DataSource;
 import com.data.datarepo.utils.DataSourceOra;
+import com.data.datarepo.utils.EquipmentNo;
 import com.mysql.cj.jdbc.MysqlDataSource;
 import oracle.jdbc.pool.OracleDataSource;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.sql.*;
+import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Date;
 
-public class DataCenterService extends DataSourceOra{
+public class DataCenterService extends DataSourceOra {
+
+    EquipmentNo equipmentNo = new EquipmentNo();
+    DataDeleteService dataDeleteService = new DataDeleteService();
 
     public void insertData(List nameList, String repo_name, List valueList) throws SQLException {
         Connection connection = null;
 //        String selectSQL = "insert into "+repo_name+"("+name+")values ("+value+")";
-        StringBuilder sb=new StringBuilder();
+        StringBuilder sb = new StringBuilder();
         sb.append("INSERT ALL ");
-        for (int i=0;i<valueList.size();i++){
-            sb.append(" INTO "+repo_name+"_OLD ("+nameList.get(i)+") values ("+valueList.get(i)+")");
+        for (int i = 0; i < valueList.size(); i++) {
+            sb.append(" INTO " + repo_name + "_OLD (" + nameList.get(i) + ") values (" + valueList.get(i) + ")");
         }
         sb.append("select * from dual");
-        String selectSQL=sb.toString();
+        String selectSQL = sb.toString();
 //        System.out.println(selectSQL);
         PreparedStatement prepStmt = null;
         try {
             connection = this.getConn();
             prepStmt = connection.prepareStatement(selectSQL);
             prepStmt.execute();
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-        }finally {
+        } finally {
             if (connection != null) {
                 connection.commit();
                 connection.close();
@@ -46,17 +49,17 @@ public class DataCenterService extends DataSourceOra{
 
     public void updateData(String num, String repo_name) throws SQLException {
         Connection connection = null;
-        String selectSQL = "update data_sync_table set equipmentNo='"+num+"'where repo_name='"+repo_name+"'";
+        String selectSQL = "update data_sync_table set equipmentNo='" + num + "'where repo_name='" + repo_name + "'";
         PreparedStatement prepStmt = null;
         try {
             MysqlDataSource basicDS = DataSource.getInstance().getMySqlDS();
             connection = basicDS.getConnection();
             prepStmt = connection.prepareStatement(selectSQL);
             prepStmt.executeUpdate();
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
 
-        }finally {
+        } finally {
             if (prepStmt != null) {
                 prepStmt.close();
             }
@@ -74,15 +77,15 @@ public class DataCenterService extends DataSourceOra{
             MysqlDataSource basicDS = DataSource.getInstance().getMySqlDS();
             connection = basicDS.getConnection();
             prepStmt = connection.prepareStatement(selectSQL);
-            prepStmt.setString(1,dataRepoTable.getTable_name());
-            prepStmt.setString(2,dataRepoTable.getRepo_name());
-            prepStmt.setString(3,dataRepoTable.getTable_comment());
-            prepStmt.setString(4,dataRepoTable.getUp_num());
+            prepStmt.setString(1, dataRepoTable.getTable_name());
+            prepStmt.setString(2, dataRepoTable.getRepo_name());
+            prepStmt.setString(3, dataRepoTable.getTable_comment());
+            prepStmt.setString(4, dataRepoTable.getUp_num());
             prepStmt.executeUpdate();
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
 
-        }finally {
+        } finally {
             if (prepStmt != null) {
                 prepStmt.close();
             }
@@ -92,27 +95,27 @@ public class DataCenterService extends DataSourceOra{
         }
     }
 
-    public String selectState(String resname, String resvalue, String repo_name,String up_num) throws SQLException {
+    public String selectState(String resname, String resvalue, String repo_name, String up_num) throws SQLException {
 
         Connection connection = null;
-        String selectSQL = "select * from "+repo_name+" where "+resname+"='"+resvalue+"' and UP_NUM='"+up_num+"'";
+        String selectSQL = "select * from " + repo_name + " where " + resname + "='" + resvalue + "' and UP_NUM='" + up_num + "'";
         PreparedStatement prepStmt = null;
-        String state="";
+        String state = "";
         try {
 //            MysqlDataSource basicDS = DataSource.getInstance().getMySqlDS();
             connection = this.getConn();
             prepStmt = connection.prepareStatement(selectSQL);
-            ResultSet rs =prepStmt.executeQuery();
-            if(rs.next()){
-                state="U";
-            }else {
-                state="I";
+            ResultSet rs = prepStmt.executeQuery();
+            if (rs.next()) {
+                state = "U";
+            } else {
+                state = "I";
             }
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
 
-        }finally {
+        } finally {
             if (prepStmt != null) {
                 prepStmt.close();
             }
@@ -122,4 +125,73 @@ public class DataCenterService extends DataSourceOra{
         }
         return state;
     }
+
+    public DataRepoTable ora2ora(String repo_name, String up_num) throws SQLException {
+
+        DataRepoTable dataRepoTable = new DataRepoTable();
+        Connection conn = null;
+        PreparedStatement ps = null;
+        ResultSet rs = null;
+        String num = equipmentNo.getNewEquipmentNo(repo_name, up_num);
+        dataRepoTable.setUp_num(num);
+        try {
+            conn = this.getConn();
+            ps = conn.prepareStatement("select * from " + repo_name + "_OLD where UP_NUM='" + up_num + "'");
+            rs = ps.executeQuery();
+            ResultSetMetaData rsmd = rs.getMetaData();
+            int numberOfColumns = rsmd.getColumnCount();
+            StringBuilder sb = new StringBuilder();
+            sb.append("insert into " + repo_name + "_OLD (");
+            for (int i = 1; i <= numberOfColumns - 1; i++) {
+                sb.append(rsmd.getColumnName(i) + ",");
+            }
+            sb.append("UP_NUM");
+            sb.append(")values(");
+            for (int i = 1; i <= numberOfColumns - 1; i++) {
+                sb.append("?,");
+            }
+            sb.append("?");
+            sb.append(")");
+            System.out.println(sb.toString());
+            PreparedStatement pstmt = conn.prepareStatement(sb.toString());
+            while (rs.next()) {
+                for (int i = 1; i <= numberOfColumns - 1; i++) {
+                    String value = rs.getString(i);
+                    String name2 = rs.getMetaData().getColumnName(i);
+                    if(name2.equals("AXBE9001")||name2.equals("UPDATETIME")||name2.equals("AHDX6145")
+                            ||name2.equals("AHDX6146")||name2.equals("AHDX6158")||name2.equals("AHDX6177")
+                            ||name2.equals("AHDX6165")||name2.equals("AHDX6174")||name2.equals("AHDX6159")
+                            ||name2.equals("AHAE2493")||name2.equals("AHDX6020")||name2.equals("AXCP0039")
+                            ||name2.equals("AHDP5070")||name2.equals("AHDP5071")||name2.equals("AHDP5112")
+                            ||name2.equals("AHDP5082")||name2.equals("AHDP5102")||name2.equals("AHDP5039")
+                            ||name2.equals("AHDP5040")||name2.equals("AHAE2325")||name2.equals("AHAE2328")
+                            ||name2.equals("AHAE2349")||name2.equals("AXBE0017")||name2.equals("AHAE0041")
+                            ||name2.equals("AHAE5024")){
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        Date date = sdf.parse(value);
+                        java.sql.Date startDate=new java.sql.Date(date.getTime());
+                        pstmt.setDate(i, startDate);
+                        continue;
+                    }
+                    pstmt.setString(i, value);
+                }
+                pstmt.setObject(numberOfColumns, num);
+                pstmt.addBatch();
+            }
+            pstmt.executeBatch();
+            updateData(num, repo_name);
+            dataDeleteService.DataDelete(repo_name);//清除oracle中数据
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+        } finally {
+            if (conn != null) {
+                conn.close();
+            }
+            if (ps != null) {
+                ps.close();
+            }
+        }
+        return dataRepoTable;
+    }
+
 }

src/main/java/com/data/datarepo/services/DataService.java

@@ -21,55 +21,56 @@ import java.util.Objects;
 
 public class DataService {
 
-    DataLoadService dataLoadService=new DataLoadService();
-    EquipmentNo equipmentNo =new EquipmentNo();
-    DataCenterService dataCenterService=new DataCenterService();
-    DataDeleteService dataDeleteService=new DataDeleteService();
-    DataTypeService dataTypeService=new DataTypeService();
-    public DataRepoTable testSelect(String repo_name,String table_name,String up_num,String table_comment) throws SQLException {
-        List valueList=new ArrayList();
-        List nameList=new ArrayList();
+    DataLoadService dataLoadService = new DataLoadService();
+    EquipmentNo equipmentNo = new EquipmentNo();
+    DataCenterService dataCenterService = new DataCenterService();
+    DataDeleteService dataDeleteService = new DataDeleteService();
+    DataTypeService dataTypeService = new DataTypeService();
+
+    public DataRepoTable testSelect(String repo_name, String table_name, String up_num, String table_comment) throws SQLException {
+        List valueList = new ArrayList();
+        List nameList = new ArrayList();
         Connection connection = null;
-        DataRepoTable dataRepoTable=new DataRepoTable();
+        DataRepoTable dataRepoTable = new DataRepoTable();
 //        String selectSQL2 = "Select * from data_sync_table where repo_name = ?";
 
 //        String selectSQL2 = "Select * from data_sync_table where table_name = v_report_yljg_yg_cyjl";
         PreparedStatement prepStmt = null;
 //        PreparedStatement prepStmt2 = null;
 //        String table_name="";
-        String num=equipmentNo.getNewEquipmentNo(repo_name,up_num);
-        String state="";
-        String type="";
+        String num = equipmentNo.getNewEquipmentNo(repo_name, up_num);
+        String state = "";
+        String type = "";
 //        String num="";
 
         try {
             MysqlDataSource basicDS = DataSource.getInstance().getMySqlDS();
             connection = basicDS.getConnection();
-            String selectSQL = "select * from "+table_name+"";
+            String selectSQL = "select * from " + table_name + "";
             prepStmt = connection.prepareStatement(selectSQL);
             ResultSet rs = prepStmt.executeQuery();
-            int j=0;
+            int j = 0;
             DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date beginTime = new Date();
             String start = df.format(beginTime);
             Long begin = beginTime.getTime();
-            System.out.println("任务开始，开始时间为："+ start);
-            while(rs.next()){
-                String resname="";
-                String resvalue="";
-                String valueNum="";
+            System.out.println("任务开始，开始时间为：" + start);
+            while (rs.next()) {
+                String resname = "";
+                String resvalue = "";
+                String valueNum = "";
                 j++;
-                for(int i=1;i<=rs.getMetaData().getColumnCount();i++){
-                    String name2=rs.getMetaData().getColumnName(i);
-                    String value2= rs.getString(i);
+                for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
+                    String name2 = rs.getMetaData().getColumnName(i);
+                    String value2 = rs.getString(i);
 
-                    if(i==1){
+                    if (i == 1) {
 //                        state= dataCenterService.selectState(name2,value2,repo_name);
                     }
-                    type= dataTypeService.selectType(repo_name,name2);
-                    if(StringUtils.isNullOrEmpty(value2)){
+                    type = dataTypeService.selectType(repo_name, name2);
+                    if (StringUtils.isNullOrEmpty(value2)) {
                         continue;
-                    }else if(!StringUtils.isNullOrEmpty(type)&&type.equals("0")){
+                    } else if (!StringUtils.isNullOrEmpty(type) && type.equals("0")) {
 //                    else if(name2.equals("AXCP0005")||name2.equals("AHDX6129")
 //                            ||name2.equals("AXCP0002")||name2.equals("AHAP0026")||name2.equals("AHAP1026")
 //                            ||name2.equals("AXZX0001")||name2.equals("AHAP0028")||name2.equals("AHAP0029")
@@ -87,9 +88,9 @@ public class DataService {
 
                         SM4Utils sm4 = new SM4Utils();
                         sm4.secretKey = "1234567887654321";
-                        value2=sm4.decryptData_ECB(value2);
+                        value2 = sm4.decryptData_ECB(value2);
 
-                    }else if(!StringUtils.isNullOrEmpty(type)&&type.equals("1")){
+                    } else if (!StringUtils.isNullOrEmpty(type) && type.equals("1")) {
 //                    else if(name2.equals("AXBE9001")||name2.equals("UPDATETIME")||name2.equals("AHDX6145")
 //                            ||name2.equals("AHDX6146")||name2.equals("AHDX6158")||name2.equals("AHDX6177")
 //                            ||name2.equals("AHDX6165")||name2.equals("AHDX6174")||name2.equals("AHDX6159")
@@ -100,57 +101,57 @@ public class DataService {
 //                            ||name2.equals("AHAE2349")||name2.equals("AXBE0017")||name2.equals("AHAE0041")
 //                            ||name2.equals("AHAE5024")){
 
-                        resname+=name2+",";
-                        resvalue+="to_date("+value2+",'yyyymmdd')"+",";
+                        resname += name2 + ",";
+                        resvalue += "to_date(" + value2 + ",'yyyymmdd')" + ",";
                         continue;
                     }
-                        resname+=name2+",";
-                        resvalue+="'"+value2+"'"+",";
+                    resname += name2 + ",";
+                    resvalue += "'" + value2 + "'" + ",";
 
                 }
 
 //                System.out.println(j);
-                resname=resname+"UP_NUM"+",DATA_STATE";
-                resvalue=resvalue+"'"+num+"'"+","+"'"+state+"'";
+                resname = resname + "UP_NUM" + ",DATA_STATE";
+                resvalue = resvalue + "'" + num + "'" + "," + "'" + state + "'";
                 nameList.add(resname);
                 valueList.add(resvalue);
 
-                if(j % 10 == 0){
+                if (j % 10 == 0) {
                     Date finishTime = new Date();
                     Long end = finishTime.getTime();
                     long timeLag = end - begin;
-                    long day=timeLag/(24*60*60*1000);
-                    long hour=(timeLag/(60*60*1000)-day*24);
-                    long minute=((timeLag/(60*1000))-day*24*60-hour*60);
-                    long s=(timeLag/1000-day*24*60*60-hour*60*60-minute*60);
-                    System.out.println("10条数据读取和解密用了 "+day+"天 "+hour+"时 "+minute+"分 "+s+"秒");
-                    dataCenterService.insertData(nameList,repo_name,valueList);
+                    long day = timeLag / (24 * 60 * 60 * 1000);
+                    long hour = (timeLag / (60 * 60 * 1000) - day * 24);
+                    long minute = ((timeLag / (60 * 1000)) - day * 24 * 60 - hour * 60);
+                    long s = (timeLag / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60);
+                    System.out.println("10条数据读取和解密用了 " + day + "天 " + hour + "时 " + minute + "分 " + s + "秒");
+                    dataCenterService.insertData(nameList, repo_name, valueList);
                     Date finishTime2 = new Date();
                     Long end2 = finishTime2.getTime();
                     long timeLag2 = end2 - end;
-                    long day2=timeLag2/(24*60*60*1000);
-                    long hour2=(timeLag2/(60*60*1000)-day2*24);
-                    long minute2=((timeLag2/(60*1000))-day2*24*60-hour2*60);
-                    long s2=(timeLag2/1000-day2*24*60*60-hour2*60*60-minute2*60);
-                    System.out.println("10条数据保存用了 "+day2+"天 "+hour2+"时 "+minute2+"分 "+s2+"秒");
+                    long day2 = timeLag2 / (24 * 60 * 60 * 1000);
+                    long hour2 = (timeLag2 / (60 * 60 * 1000) - day2 * 24);
+                    long minute2 = ((timeLag2 / (60 * 1000)) - day2 * 24 * 60 - hour2 * 60);
+                    long s2 = (timeLag2 / 1000 - day2 * 24 * 60 * 60 - hour2 * 60 * 60 - minute2 * 60);
+                    System.out.println("10条数据保存用了 " + day2 + "天 " + hour2 + "时 " + minute2 + "分 " + s2 + "秒");
                     nameList.clear();
                     valueList.clear();
                 }
             }
-            if(nameList != null && !nameList.isEmpty()) {
-                dataCenterService.insertData(nameList,repo_name,valueList);
+            if (nameList != null && !nameList.isEmpty()) {
+                dataCenterService.insertData(nameList, repo_name, valueList);
             }
             Date finishTime = new Date();
             Long end = finishTime.getTime();
             long timeLag = end - begin;
-            long day=timeLag/(24*60*60*1000);
-            long hour=(timeLag/(60*60*1000)-day*24);
-            long minute=((timeLag/(60*1000))-day*24*60-hour*60);
-            long s=(timeLag/1000-day*24*60*60-hour*60*60-minute*60);
-            System.out.println("用了 "+day+"天 "+hour+"时 "+minute+"分 "+s+"秒");
-            System.out.println("任务结束，结束时间为："+ df.format(finishTime));
-            System.out.println("表"+repo_name+"上传了"+j+"条数据到中间库");
-            dataCenterService.updateData(num,repo_name);
+            long day = timeLag / (24 * 60 * 60 * 1000);
+            long hour = (timeLag / (60 * 60 * 1000) - day * 24);
+            long minute = ((timeLag / (60 * 1000)) - day * 24 * 60 - hour * 60);
+            long s = (timeLag / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60);
+            System.out.println("用了 " + day + "天 " + hour + "时 " + minute + "分 " + s + "秒");
+            System.out.println("任务结束，结束时间为：" + df.format(finishTime));
+            System.out.println("表" + repo_name + "上传了" + j + "条数据到中间库");
+            dataCenterService.updateData(num, repo_name);
             dataDeleteService.DataDelete(repo_name);//清除oracle中数据
             dataRepoTable.setTable_name(table_name);
             dataRepoTable.setTable_comment(table_comment);
@@ -158,7 +159,7 @@ public class DataService {
             dataRepoTable.setUp_num(num);
         } catch (Exception e) {
             e.printStackTrace();
-        }finally {
+        } finally {
             if (prepStmt != null) {
                 prepStmt.close();
             }
@@ -170,23 +171,25 @@ public class DataService {
     }
 
 
-
-    public DataRepoTable testSelectBJ(String repo_name,String up_num,String table_name,String table_comment) throws SQLException {
-        DataRepoTable dataRepoTable =new DataRepoTable();
+    public DataRepoTable testSelectBJ(String repo_name, String up_num, String table_name, String table_comment) throws SQLException {
+        DataRepoTable dataRepoTable = new DataRepoTable();
         dataRepoTable.setRepo_name(repo_name);
         dataRepoTable.setUp_num(up_num);
         dataRepoTable.setTable_name(table_name);
         dataRepoTable.setTable_comment(table_comment);
-        dataLoadService.testLoad(repo_name,up_num);
+        dataLoadService.testLoad(repo_name, up_num);
         dataCenterService.insertUpnum(dataRepoTable);
         return dataRepoTable;
     }
 
-    public DataRepoTable testSelectResult(String repo_name,String up_num) throws SQLException {
-            DataRepoTable dataRepoTable=new DataRepoTable();
-            dataCenterService.updateData(up_num,repo_name);
-            dataRepoTable.setRepo_name(repo_name);
-            dataRepoTable.setUp_num(up_num);
+    public DataRepoTable testSelectResult(String repo_name, String up_num, String table_name, String table_comment) throws SQLException {
+        DataRepoTable dataRepoTable = new DataRepoTable();
+        dataRepoTable=dataCenterService.ora2ora(repo_name,up_num);
+        dataCenterService.updateData(up_num, repo_name);
+        dataRepoTable.setRepo_name(repo_name);
+        dataRepoTable.setUp_num(dataRepoTable.getUp_num());
+        dataRepoTable.setTable_comment(table_comment);
+        dataRepoTable.setTable_name(table_name);
         return dataRepoTable;
 
     }

src/main/java/com/data/datarepo/utils/EquipmentNo.java

@@ -14,17 +14,44 @@ public class EquipmentNo extends DataSourceOra{
 
     public String getNewEquipmentNo(String equipmentType,String up_num) throws SQLException {
 
+//        SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
+//        String date = f.format(new Date(System.currentTimeMillis()));
+//        String update="";
+//        String Number="";
+//        if(StringUtils.isEmpty(up_num)||"null".equals(up_num)){
+//            Number = "220000000000_"+equipmentType+"_" + date+"_" + "01";
+//        }else {
+//            String[] upnums= up_num.split("_");
+//            update=upnums[2];
+//            if(date.equals(update)){
+//                int intNumber = Integer.parseInt(up_num.substring(up_num.length()-2));
+//                intNumber++;
+//                Number = String.valueOf(intNumber);
+//                for (int i = 0; i < 2; i++){
+//                    Number = Number.length() < 2 ? "0" + Number : Number;
+//                }
+//                Number = "220000000000_"+equipmentType+"_" + date+"_" + Number;
+//            }else{
+//                Number = "220000000000_"+equipmentType+"_" + date+"_" + "01";
+//            }
+//        }
         SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
         String date = f.format(new Date(System.currentTimeMillis()));
+        Connection connection = null;
+        String selectSQL = "select UP_NUM from "+equipmentType+"_OLD where UP_NUM like '220000000000_"+equipmentType+"_"+date+"%' order by up_num desc";
+        PreparedStatement prepStmt = null;
         String update="";
         String Number="";
-        if(StringUtils.isEmpty(up_num)||"null".equals(up_num)){
-            Number = "220000000000_"+equipmentType+"_" + date+"_" + "01";
-        }else {
-            String[] upnums= up_num.split("_");
-            update=upnums[2];
-            if(date.equals(update)){
-                int intNumber = Integer.parseInt(up_num.substring(up_num.length()-2));
+        try {
+//            MysqlDataSource basicDS = DataSource.getInstance().getMySqlDS();
+            connection = this.getConn();
+            prepStmt = connection.prepareStatement(selectSQL);
+            ResultSet rs = prepStmt.executeQuery();
+//            String[] upnums= up_num.split("_");
+//            update=upnums[2];
+            if(rs.next()){
+                String n =rs.getString("up_num");
+                int intNumber = Integer.parseInt(n.substring(n.length()-2));
                 intNumber++;
                 Number = String.valueOf(intNumber);
                 for (int i = 0; i < 2; i++){
@@ -34,40 +61,17 @@ public class EquipmentNo extends DataSourceOra{
             }else{
                 Number = "220000000000_"+equipmentType+"_" + date+"_" + "01";
             }
-        }
 
-//        Connection connection = null;
-//        String selectSQL = "select up_num from "+equipmentType+"_OLD where up_num like '220000000000_"+equipmentType+"_"+date+"%' order by up_num desc";
-//        PreparedStatement prepStmt = null;
-
-//        try {
-////            MysqlDataSource basicDS = DataSource.getInstance().getMySqlDS();
-////            connection = this.getConn();
-////            prepStmt = connection.prepareStatement(selectSQL);
-////            ResultSet rs = prepStmt.executeQuery();
-//            if(!date.equals(update)){
-//                String n =rs.getString("up_num");
-//                int intNumber = Integer.parseInt(n.substring(n.length()-2));
-//                intNumber++;
-//                Number = String.valueOf(intNumber);
-//                for (int i = 0; i < 2; i++){
-//                    Number = Number.length() < 2 ? "0" + Number : Number;
-//                }
-//                Number = "220000000000_"+equipmentType+"_" + date+"_" + Number;
-//            }else{
-//                Number = "220000000000_"+equipmentType+"_" + date+"_" + "01";
-//            }
-//
-//        }catch (Exception e){
-//            e.printStackTrace();
-//        }finally {
-//            if (prepStmt != null) {
-//                prepStmt.close();
-//            }
-//            if (connection != null) {
-//                connection.close();
-//            }
-//        }
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            if (prepStmt != null) {
+                prepStmt.close();
+            }
+            if (connection != null) {
+                connection.close();
+            }
+        }
         return Number;
 
     }

src/main/resources/templates/dataResult.html

@@ -29,7 +29,7 @@
         <th:block th:each="item:${DataRepoTableList}">
             <tr>
                 <td>
-                    <input type="checkbox" onclick="check()" name="repo_name" th:value="${item.repo_name}+'-'+${item.up_num}" />
+                    <input type="checkbox" onclick="check()" name="repo_name" th:value="${item.repo_name}+'-'+${item.up_num}+'-'+${item.table_name}+'-'+${item.table_comment}" />
                 </td>
                 <td th:text="${item.table_name}"></td>
                 <td th:text="${item.repo_name}"></td>