diff --git a/pom.xml b/pom.xml index 3dc5642..7b498fb 100644 --- a/pom.xml +++ b/pom.xml @@ -24,321 +24,137 @@ UTF-8 true - - 1.0.0 - - 1.1.5 4.12 1.8 - 1.9.5 - - 1.2.2 - 7.6.11.v20130520 + 5.0.2.RELEASE 2.4 2.1 1.2 - 0.9.5-pre6 - 5.0.1.Final - 9.2-1004-jdbc4 - 5.17.0 - 2.3.6 - 2.2.1 - 1.1.1 - 3.5.0 - - 5.0.2.RELEASE 3.4.6 1.3.2 - 1.2.15 5.1.32 - 1.6.4 - 2.4 2.9.4 1.0.9 4.3.5 4.0.1 + 4.0.1 2.0 - 2.5 3.3.2 - 1.3.2 - 3.3 - 3.4.2 - 0.9.1 + 5.1.10 + 1.2.4 1.3.1 - 2.7.2 - 4.10.3 1.8.13 1.8.13 3.1.8 1.4.0 1.1 + 3.9 + 1.6.3 + 138 - - com.github.oshi - oshi-core - 3.4.4 - - - - - - - - com.manage - power-api - 1.0-SNAPSHOT - - - - com.manage - power-service - 1.0-SNAPSHOT - - - - com.manage - power-foundation - 1.0-SNAPSHOT - - - - com.manage - power-dao - 1.0-SNAPSHOT - - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.apache.commons - commons-io - ${commons-io.version} - - - commons-net - commons-net - ${commons-net.version} - - - - net.sf.json-lib - json-lib - ${json-lib.version} - jdk15 - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - - junit - junit - ${junit.version} - test - - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - - org.mybatis - mybatis - ${mybatis.version} - - - org.mybatis - mybatis-spring - ${mybatis.spring.version} - - - com.github.miemiedev - mybatis-paginator - ${mybatis.paginator.version} - - - com.github.pagehelper - pagehelper - ${pagehelper.version} - - - - mysql - mysql-connector-java - ${mysql.version} - - - - com.alibaba - druid - ${druid.version} - org.springframework - spring-context + spring-context-support ${spring.version} org.springframework - spring-context-support + spring-webmvc ${spring.version} org.springframework - spring-beans + spring-jdbc ${spring.version} org.springframework - spring-webmvc + spring-aspects ${spring.version} org.springframework - spring-web + spring-test ${spring.version} + test - org.springframework - spring-jdbc - ${spring.version} + mysql + mysql-connector-java + ${mysql.version} + - org.springframework - spring-aspects - ${spring.version} + org.mybatis + mybatis-spring + ${mybatis.spring.version} - org.aspectj - aspectjweaver - ${aspectj.version} + org.mybatis + mybatis + ${mybatis.version} + - org.aspectj - aspectjrt - ${aspectj.version} + com.alibaba + druid + ${druid.version} - - + - commons-codec - commons-codec - 1.9 + com.github.pagehelper + pagehelper + ${pagehelper.version} - - - - - + + - org.bouncycastle - bcprov-jdk16 - 1.46 + com.alibaba + fastjson + ${alibabaJson.version} - - - - javax.mail - mail - 1.4.5 - - - com.sun.mail - javax.mail - 1.5.4 - - - - - - + - org.webjars.bower - jstree - 3.3.4 + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} - - + - commons-dbutils - commons-dbutils - 1.4 + org.apache.commons + commons-lang3 + ${commons-lang3.version} - - + - com.github.pagehelper - pagehelper - 5.0.0 + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + + junit + junit + ${junit.version} + test - jstl + javax.servlet jstl ${jstl.version} - provided javax.servlet javax.servlet-api - ${servlet-api.version} + ${javax-servlet-api.version} provided @@ -353,158 +169,51 @@ commons-fileupload ${commons-fileupload.version} - - - redis.clients - jedis - ${jedis.version} - - - - org.apache.solr - solr-solrj - ${solrj.version} - - - - - com.manage - framework-open-sdk - ${framework.version} - - - - org.springframework.data - spring-data-jpa - 1.3.0.RELEASE - - - - - org.apache.shiro - shiro-spring - ${shiro.version} - + - org.apache.shiro - shiro-ehcache - ${shiro.version} + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} - - - - - - org.activiti - activiti-engine - ${activiti.version} + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} + - org.activiti - activiti-spring - ${activiti.version} + org.java-websocket + Java-WebSocket + ${webSocket.version} - - - org.codehaus.groovy - groovy-all - ${groovy.version} + javax.websocket + javax.websocket-api + ${javax.websocket-api.version} + provided - + - com.mchange - c3p0 - ${c3p0.version} + org.apache.poi + poi-ooxml + ${poi.version} + - org.postgresql - postgresql - ${postgresql.version} + org.hyperic.sigar + com.springsource.org.hyperic.sigar + ${sigar.version} + compile - - - + - taglibs - standard - 1.1.2 - - - - - com.alibaba - fastjson - 1.2.4 + bouncycastle + bcprov-jdk14 + ${base64.version} + compile - - - - - - org.mockito - mockito-core - ${mockito.version} - test - - - - - org.apache.httpcomponents - httpmime - 4.5.5 - - - - - org.jdom - jdom - 1.1 - - - - - org.apache.httpcomponents - httpclient - 4.5.1 - - - org.springframework - spring-context - - - org.springframework - spring-webmvc - - - - org.apache.cxf - cxf-rt-transports-http - ${cxf.version} - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${cxf.version} - - - - org.java-websocket - Java-WebSocket - ${webSocket.version} - - - javax.websocket - javax.websocket-api - ${javax.websocket-api.version} - provided - - - - @@ -531,24 +240,13 @@ true - 128m - 512m + 1024m + 1024m - - diff --git a/power-admin/pom.xml b/power-admin/pom.xml index a374e3c..52f2665 100644 --- a/power-admin/pom.xml +++ b/power-admin/pom.xml @@ -30,24 +30,16 @@ 1.0-SNAPSHOT - - com.manage - power-api - 1.0-SNAPSHOT - - com.manage power-foundaton 1.0-SNAPSHOT + compile - - javax.servlet jstl - ${jstl.version} @@ -55,131 +47,80 @@ javax.servlet-api - - taglibs - standard - 1.1.2 - - org.mybatis mybatis - ${mybatis.version} org.mybatis mybatis-spring - ${mybatis.spring.version} + - com.github.miemiedev - mybatis-paginator - ${mybatis.paginator.version} + com.alibaba + druid mysql mysql-connector-java - ${mysql.version} - - - com.github.pagehelper - pagehelper - 5.0.0 - - + org.springframework - spring-jdbc - ${spring.version} + spring-context-support org.springframework spring-webmvc - ${spring.version} org.springframework - spring-tx - ${spring.version} + spring-jdbc org.springframework - spring-aop - ${spring.version} + spring-aspects - - com.mchange - c3p0 - ${c3p0.version} - - - junit junit - ${junit.version} test - - com.manage - power-foundaton - 1.0-SNAPSHOT - compile - - - - net.sf.json-lib - json-lib - ${json-lib.version} - jdk15 - com.fasterxml.jackson.core jackson-databind + + com.alibaba + fastjson + - org.apache.cxf cxf-rt-transports-http - ${cxf.version} org.apache.cxf cxf-rt-frontend-jaxws - ${cxf.version} - - - - com.alibaba - fastjson org.apache.commons commons-lang3 - ${commons-lang3.version} - - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} javax.servlet jsp-api provided + - fr.jrds - vxIPMI - 2.0.0.1 + commons-fileupload + commons-fileupload diff --git a/power-admin/src/main/java/com/manage/controller/HasAnyPermission.java b/power-admin/src/main/java/com/manage/controller/HasAnyPermission.java index 770dcc8..e3e848e 100644 --- a/power-admin/src/main/java/com/manage/controller/HasAnyPermission.java +++ b/power-admin/src/main/java/com/manage/controller/HasAnyPermission.java @@ -4,11 +4,10 @@ import com.manage.vo.Power_UserVo; import com.manage.vo.User_Dept_Menu; import org.apache.commons.lang3.StringUtils; -import javax.servlet.jsp.*; import javax.servlet.http.HttpSession; +import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.TagSupport; import java.util.List; -import java.util.Set; /** * @ProjectName: diff --git a/power-admin/src/main/java/test.java b/power-admin/src/main/java/test.java deleted file mode 100644 index b7f3077..0000000 --- a/power-admin/src/main/java/test.java +++ /dev/null @@ -1,132 +0,0 @@ -import com.veraxsystems.vxipmi.api.async.ConnectionHandle; -import com.veraxsystems.vxipmi.api.sync.IpmiConnector; -import com.veraxsystems.vxipmi.coding.commands.IpmiVersion; -import com.veraxsystems.vxipmi.coding.commands.PrivilegeLevel; -import com.veraxsystems.vxipmi.coding.commands.chassis.GetChassisStatus; -import com.veraxsystems.vxipmi.coding.commands.chassis.GetChassisStatusResponseData; -import com.veraxsystems.vxipmi.coding.commands.sdr.GetSdr; -import com.veraxsystems.vxipmi.coding.commands.sdr.GetSdrResponseData; -import com.veraxsystems.vxipmi.coding.commands.sdr.GetSensorReading; -import com.veraxsystems.vxipmi.coding.commands.sdr.GetSensorReadingResponseData; -import com.veraxsystems.vxipmi.coding.commands.sdr.ReserveSdrRepository; -import com.veraxsystems.vxipmi.coding.commands.sdr.ReserveSdrRepositoryResponseData; -import com.veraxsystems.vxipmi.coding.commands.sdr.record.CompactSensorRecord; -import com.veraxsystems.vxipmi.coding.commands.sdr.record.FullSensorRecord; -import com.veraxsystems.vxipmi.coding.commands.sdr.record.RateUnit; -import com.veraxsystems.vxipmi.coding.commands.sdr.record.ReadingType; -import com.veraxsystems.vxipmi.coding.commands.sdr.record.SensorRecord; -import com.veraxsystems.vxipmi.coding.payload.CompletionCode; -import com.veraxsystems.vxipmi.coding.payload.lan.IPMIException; -import com.veraxsystems.vxipmi.coding.protocol.AuthenticationType; -import com.veraxsystems.vxipmi.coding.security.CipherSuite; -import com.veraxsystems.vxipmi.common.TypeConverter; -import com.veraxsystems.vxipmi.connection.Connection; - - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.InetAddress; - -import java.util.List; - -/** - * @ProjectName: - * @Description: - * @Param 传输参数 - * @Return - * @Author: 曾文和 - * @CreateDate: 2019/11/29 15:31 - * @UpdateUser: 曾文和 - * @UpdateDate: 2019/11/29 15:31 - * @UpdateRemark: 更新说明 - * @Version: 1.0 - */ -public class test { - private static final int MAX_REPO_RECORD_ID = 65535; - - private static final String hostname = "127.0.0.1"; - - private static final String username = "Administrator"; - - private static final String password = "zwh05966788561"; - - /** - * Size of the initial GetSdr message to get record header and size - */ - private static final int INITIAL_CHUNK_SIZE = 8; - - /** - * Chunk size depending on buffer size of the IPMI server. Bigger values will improve performance. If server is - * returning "Cannot return number of requested data bytes." error during GetSdr command, CHUNK_SIZE should be - * decreased. - */ - private static final int CHUNK_SIZE = 16; - - /** - * Size of SDR record header - */ - private static final int HEADER_SIZE = 5; - - private int nextRecId; - - public static void main(String[] args) { - IpmiConnector connector = null; - ConnectionHandle handle = null; - try { - connector = new IpmiConnector(8081); - System.out.println("Connector created"); - - // Create the connection and get the handle, specifiy IP address of the - // remote host. The connection is being registered in ConnectionManager, - // the handle will be needed to identify it among other connections - // (target IP address isn't enough, since we can handle multiple - // connections to the same host) - handle = connector.createConnection(InetAddress - .getByName("127.0.0.1")); - System.out.println("Connection created"); - - // Get available cipher suites list via getAvailableCipherSuites and - // pick one of them that will be used further in the session. - CipherSuite cs = connector.getAvailableCipherSuites(handle).get(3); - System.out.println("Cipher suite picked"); - - // Provide chosen cipher suite and privilege level to the remote host. - // From now on, your connection handle will contain these information. - connector.getChannelAuthenticationCapabilities(handle, cs, - PrivilegeLevel.User); - System.out.println("Channel authentication capabilities receivied"); - - // Start the session, provide username and password, and optionally the - // BMC key (only if the remote host has two-key authentication enabled, - // otherwise this parameter should be null) - connector.openSession(handle, "admin", "password", null); - System.out.println("Session open"); - - // Send some message and read the response - GetChassisStatusResponseData response = (GetChassisStatusResponseData) connector - .sendMessage(handle, new GetChassisStatus(IpmiVersion.V20, cs, AuthenticationType.RMCPPlus)); - - System.out.println("Received answer"); - System.out.println("System power state is " - + (response.isPowerOn() ? "up" : "down")); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } catch (Exception e) { - e.printStackTrace(); - } finally { - try { - // Close the session - connector.closeSession(handle); - System.out.println("Session closed"); - - // Close connection manager and release the listener port. - connector.tearDown(); - System.out.println("Connection manager closed"); - } catch (Exception e) { - e.printStackTrace(); - } - } - } -} diff --git a/power-admin/src/main/resources/config/applicationContext.xml b/power-admin/src/main/resources/config/applicationContext.xml index f9dc18a..19a60df 100644 --- a/power-admin/src/main/resources/config/applicationContext.xml +++ b/power-admin/src/main/resources/config/applicationContext.xml @@ -24,15 +24,14 @@ - - - - + + + + - - - - + + + diff --git a/power-api/pom.xml b/power-api/pom.xml index a36fba0..5dca49d 100644 --- a/power-api/pom.xml +++ b/power-api/pom.xml @@ -15,54 +15,8 @@ UTF-8 - - - - com.manage - power-foundaton - 1.0-SNAPSHOT - - - - - - - - - - - org.slf4j - slf4j-log4j12 - - - junit - junit - ${junit.version} - test - - - - - - org.apache.maven.plugins diff --git a/power-dao/pom.xml b/power-dao/pom.xml index a28521b..32216b9 100644 --- a/power-dao/pom.xml +++ b/power-dao/pom.xml @@ -18,104 +18,13 @@ org.mybatis mybatis - ${mybatis.version} - - - org.mybatis - mybatis-spring - ${mybatis.spring.version} - - - com.github.miemiedev - mybatis-paginator - ${mybatis.paginator.version} - - - - mysql - mysql-connector-java - ${mysql.version} - - - - com.github.pagehelper - pagehelper - 5.0.0 - - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-webmvc - - - org.springframework - spring-tx - 4.3.7.RELEASE - - - com.mchange - c3p0 - ${c3p0.version} - - - - junit - junit - ${junit.version} - - - - - org.slf4j - slf4j-log4j12 - - - - - org.apache.poi - poi-scratchpad - 3.11-beta2 - - - org.apache.poi - poi-ooxml - 3.11-beta2 - - - org.apache.poi - poi-ooxml-schemas - 3.11-beta2 - - - org.apache.poi - poi-excelant - 3.11-beta2 - - power-dao-1.0-SNAPSHOT compile - - - org.apache.maven.plugins @@ -128,46 +37,6 @@ UTF-8 - - - - diff --git a/power-dao/src/main/java/com/manage/dao/Power_MenuMapper.java b/power-dao/src/main/java/com/manage/dao/Power_MenuMapper.java index 5be4988..fffea9e 100644 --- a/power-dao/src/main/java/com/manage/dao/Power_MenuMapper.java +++ b/power-dao/src/main/java/com/manage/dao/Power_MenuMapper.java @@ -1,6 +1,5 @@ package com.manage.dao; -import com.manage.entity.Power_Detailed_Menu; import com.manage.entity.Power_Menu; import com.manage.entity.Power_Menu_User; import org.apache.ibatis.annotations.Param; diff --git a/power-dao/src/main/java/com/manage/dao/Power_RoleMapper.java b/power-dao/src/main/java/com/manage/dao/Power_RoleMapper.java index 95e8627..db4d148 100644 --- a/power-dao/src/main/java/com/manage/dao/Power_RoleMapper.java +++ b/power-dao/src/main/java/com/manage/dao/Power_RoleMapper.java @@ -1,11 +1,8 @@ package com.manage.dao; -import com.manage.entity.Power_Dept; import com.manage.entity.Power_Role; -import com.manage.entity.Power_User; import com.manage.vo.Power_RoleVo; import org.apache.ibatis.annotations.Param; -import org.springframework.web.bind.annotation.PathVariable; import java.util.List; diff --git a/power-foundaton/pom.xml b/power-foundaton/pom.xml index 57cd27b..af50070 100644 --- a/power-foundaton/pom.xml +++ b/power-foundaton/pom.xml @@ -18,101 +18,36 @@ - - - org.springframework - spring-jdbc - ${spring.version} - org.springframework spring-webmvc - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - com.mchange - c3p0 - ${c3p0.version} - - - - junit - junit - ${junit.version} - - - - - org.slf4j - slf4j-log4j12 javax.servlet javax.servlet-api - 3.0.1 provided - - - - - org.bouncycastle - bcprov-jdk16 - 1.46 - - - - - javax.mail - mail - 1.4.5 - - - com.sun.mail - javax.mail - 1.5.4 - - org.apache.commons commons-lang3 - ${commons-lang3.version} - - - org.apache.poi - poi-scratchpad - 3.11-beta2 - org.apache.poi poi-ooxml - 3.11-beta2 - - - org.apache.poi - poi-ooxml-schemas - 3.11-beta2 - - - org.apache.poi - poi-excelant - 3.11-beta2 org.hyperic.sigar com.springsource.org.hyperic.sigar - 1.6.3 + + + bouncycastle + bcprov-jdk14 + compile - + - - com.github.oshi - oshi-json - 3.6.1 - - - com.github.oshi - oshi-json - 3.6.1 - compile - + --> @@ -149,7 +71,6 @@ org.apache.maven.plugins maven-compiler-plugin 3.1 - 1.8 1.8 diff --git a/power-foundaton/src/main/java/com/manage/encrypt/MD_SHA_MAC.java b/power-foundaton/src/main/java/com/manage/encrypt/MD_SHA_MAC.java index cdbd6be..50a6367 100644 --- a/power-foundaton/src/main/java/com/manage/encrypt/MD_SHA_MAC.java +++ b/power-foundaton/src/main/java/com/manage/encrypt/MD_SHA_MAC.java @@ -125,7 +125,7 @@ public class MD_SHA_MAC { } public static void ccMD5(){ - System.out.println("cc md5:"+DigestUtils.md5DigestAsHex(src.getBytes())); + System.out.println("cc md5:"+ DigestUtils.md5DigestAsHex(src.getBytes())); } public static void ccSHA1(){ diff --git a/power-foundaton/src/main/java/com/manage/util/DateUtils.java b/power-foundaton/src/main/java/com/manage/util/DateUtils.java index 4532e74..e6565e9 100644 --- a/power-foundaton/src/main/java/com/manage/util/DateUtils.java +++ b/power-foundaton/src/main/java/com/manage/util/DateUtils.java @@ -1,8 +1,5 @@ package com.manage.util; -import org.apache.log4j.Logger; -import org.apache.poi.ss.usermodel.DateUtil; - import java.text.ParseException; import java.text.ParsePosition; import java.text.SimpleDateFormat; @@ -10,7 +7,6 @@ import java.util.Calendar; import java.util.Date; public class DateUtils { - private static Logger LOGGER = Logger.getLogger(DateUtils.class); /** * Format String : yyyy-MM-dd HH:mm:ss @@ -81,7 +77,7 @@ public class DateUtils { try { ret = sdf.format(date); } catch (Exception ex) { - LOGGER.error(ex, ex); + ex.printStackTrace(); } return ret; } @@ -125,7 +121,7 @@ public class DateUtils { String integerDate = stringDate.replaceAll("/", "").replaceAll("年", "").replaceAll("月", "").replaceAll("日", "").replaceAll("：", ":"); ret = sdf.parse(integerDate); } catch (Exception ex) { - LOGGER.error(ex, ex); + ex.printStackTrace(); } return ret; } @@ -200,9 +196,9 @@ public class DateUtils { long minutes = diff / oneMinute; diff -= minutes * oneMinute; long seconds = diff / oneSecond; - if (hours > 0) showtime += hours + "时"; - if (minutes > 0) showtime += minutes + "分"; - if (seconds > 0) showtime += seconds + "秒"; + if (hours > 0){ showtime += hours + "时";} + if (minutes > 0){ showtime += minutes + "分";} + if (seconds > 0){ showtime += seconds + "秒";} return showtime; } @@ -241,7 +237,7 @@ public class DateUtils { **/ public static Double getHourDiff(Date startTime,Date endTime){ long ms = endTime.getTime() - startTime.getTime(); - if (ms < 0) return 0d; + if (ms < 0){ return 0d;} return Math.floor(ms/1000/60/60); } diff --git a/power-service/pom.xml b/power-service/pom.xml index aa028c9..70b0a7f 100644 --- a/power-service/pom.xml +++ b/power-service/pom.xml @@ -20,67 +20,59 @@ power-dao 1.0-SNAPSHOT - com.manage - power-api + power-foundaton 1.0-SNAPSHOT - - - javax.servlet - jstl - ${jstl.version} - javax.servlet javax.servlet-api - + - taglibs - standard + org.springframework + spring-context-support - org.aspectj - aspectjweaver - ${aspectj.version} + org.springframework + spring-webmvc - - junit - junit - ${junit.version} - compile + org.springframework + spring-jdbc - org.springframework - spring-test - 5.1.3.RELEASE + org.apache.commons + commons-lang3 org.java-websocket Java-WebSocket - ${webSocket.version} javax.websocket javax.websocket-api - ${javax.websocket-api.version} provided - - org.jsoup - jsoup - 1.11.3 + org.apache.poi + poi-ooxml + + + + org.hyperic.sigar + com.springsource.org.hyperic.sigar + compile + + + + com.github.pagehelper + pagehelper - - - diff --git a/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java b/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java index 917ac24..0d462ad 100644 --- a/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java +++ b/power-service/src/main/java/com/manage/service/ImportExcel/ImportExcelUtil.java @@ -137,7 +137,7 @@ public class ImportExcelUtil { private static int SimpleInsert(List list)throws Exception{ if(null != list && !list.isEmpty()){ //注入判断方法集中类 - //插入数据库 + //插入数据库 //反射执行插入方法 //获取当前上下文环境，spring容器 WebApplicationContext wac = ContextLoader.getCurrentWebApplicationContext(); @@ -157,9 +157,10 @@ public class ImportExcelUtil { public static boolean isRowEmpty(Row row) { for (int c = row.getFirstCellNum(); c < row.getLastCellNum(); c++) { Cell cell = row.getCell(c); - if (cell != null && cell.getCellType() != Cell.CELL_TYPE_BLANK) + if (cell != null && cell.getCellType() != Cell.CELL_TYPE_BLANK) { return false; } + } return true; } //递归删除已添加进数据库的行 @@ -198,9 +199,9 @@ public class ImportExcelUtil { Method method = importExcelJudgeMethod.getClass().getMethod(judgeMethod,String.class,String.class,Field.class,Object.class,String.class); //执行方法 String returnWrongStr = (String)method.invoke(importExcelJudgeMethod, fieldName, value, f, object, head); - if(StringUtils.isNotBlank(returnWrongStr)){ - wrongStr+=returnWrongStr; - } + if(StringUtils.isNotBlank(returnWrongStr)){ + wrongStr+=returnWrongStr; + } }else{ if(StringUtils.isNotBlank(value)){ Class filedType = f.getType(); @@ -228,12 +229,14 @@ public class ImportExcelUtil { * */ public static void removeRow(Sheet sheet, int rowIndex) { int lastRowNum=sheet.getLastRowNum(); - if(rowIndex>=0&&rowIndex=0&&rowIndex1.7 1.7 - - - - junit - junit - 4.11 - test - - - power_web - - - - maven-clean-plugin - 3.1.0 - - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.8.0 - - - maven-surefire-plugin - 2.22.1 - - - maven-war-plugin - 3.2.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - -