fanxw hace 5 años
padre
commit
2fb7fcd578

+ 1 - 1
src/main/java/com/chinaitop/agile/controller/KeepAccountController.java

@@ -19,7 +19,7 @@ import com.chinaitop.agile.model.DataKcglFcbgzDefault;
19 19
 import com.chinaitop.agile.model.DataKcglFcbgzDefaultExample;
20 20
 import com.chinaitop.agile.service.DataKcglFcbgzDefaultService;
21 21
 import com.chinaitop.agile.service.KeepAccountService;
22
-import com.chinaitop.utils.ParameterUtil;
22
+import com.chinaitop.agile.utils.ParameterUtil;
23 23
 import com.github.pagehelper.PageHelper;
24 24
 import com.github.pagehelper.PageInfo;
25 25
 

+ 1 - 1
src/main/java/com/chinaitop/agile/service/impl/DataKcglFcbgzDefaultServiceImpl.java

@@ -14,7 +14,7 @@ import com.chinaitop.agile.mapper.DataKcglFcbgzDefaultMapper;
14 14
 import com.chinaitop.agile.model.DataKcglFcbgzDefault;
15 15
 import com.chinaitop.agile.model.DataKcglFcbgzDefaultExample;
16 16
 import com.chinaitop.agile.service.DataKcglFcbgzDefaultService;
17
-import com.chinaitop.utils.ParameterUtil;
17
+import com.chinaitop.agile.utils.ParameterUtil;
18 18
 
19 19
 @Service
20 20
 public class DataKcglFcbgzDefaultServiceImpl implements DataKcglFcbgzDefaultService {

+ 0 - 3
src/main/java/com/chinaitop/agile/service/impl/VRkZjxxServiceImpl.java

@@ -6,12 +6,9 @@ import java.util.Map;
6 6
 
7 7
 import javax.annotation.Resource;
8 8
 
9
-import com.chinaitop.utils.ParameterUtil;
10 9
 import org.springframework.stereotype.Service;
11 10
 
12 11
 import com.chinaitop.agile.mapper.VRkZjxxMapper;
13
-import com.chinaitop.agile.model.VRkZjxx;
14
-import com.chinaitop.agile.model.VRkZjxxExample;
15 12
 import com.chinaitop.agile.service.VRkZjxxService;
16 13
 
17 14
 @Service

+ 0 - 1
src/main/java/com/chinaitop/agile/utils/ExcelImportUtils.java

@@ -1,6 +1,5 @@
1 1
 package com.chinaitop.agile.utils;
2 2
 
3
-import com.chinaitop.utils.ParameterUtil;
4 3
 import org.apache.poi.ss.usermodel.Cell;
5 4
 import org.apache.poi.ss.usermodel.Row;
6 5
 

+ 19 - 15
src/main/java/com/chinaitop/agile/utils/ImportServiceImpl.java

@@ -1,24 +1,28 @@
1 1
 package com.chinaitop.agile.utils;
2 2
 
3
-import com.chinaitop.agile.feign.service.BasicEnumFeignService;
4
-import com.chinaitop.agile.model.DataKcglKcswDefault;
5
-import com.chinaitop.utils.ParameterUtil;
3
+import java.io.File;
4
+import java.io.FileInputStream;
5
+import java.io.FileOutputStream;
6
+import java.io.IOException;
7
+import java.io.InputStream;
8
+import java.util.HashMap;
9
+import java.util.List;
10
+import java.util.Map;
11
+
12
+import javax.annotation.Resource;
13
+import javax.servlet.http.HttpServletRequest;
14
+
6 15
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
7
-import org.apache.poi.ss.usermodel.*;
8
-import org.apache.poi.xssf.usermodel.XSSFRow;
16
+import org.apache.poi.ss.usermodel.Cell;
17
+import org.apache.poi.ss.usermodel.CellStyle;
18
+import org.apache.poi.ss.usermodel.Row;
19
+import org.apache.poi.ss.usermodel.Sheet;
20
+import org.apache.poi.ss.usermodel.Workbook;
9 21
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
10 22
 import org.springframework.stereotype.Service;
11
-import org.springframework.util.StringUtils;
12
-import org.springframework.web.multipart.MultipartFile;
13 23
 
14
-import javax.annotation.Resource;
15
-import javax.servlet.http.HttpServletRequest;
16
-import java.io.*;
17
-import java.math.BigDecimal;
18
-import java.util.ArrayList;
19
-import java.util.HashMap;
20
-import java.util.List;
21
-import java.util.Map;
24
+import com.chinaitop.agile.feign.service.BasicEnumFeignService;
25
+import com.chinaitop.agile.model.DataKcglKcswDefault;
22 26
 
23 27
 /**
24 28
  * @auther mafy

+ 0 - 181
src/main/java/com/chinaitop/utils/ParameterUtil.java

@@ -1,181 +0,0 @@
1
-package com.chinaitop.utils;
2
-
3
-import java.io.BufferedInputStream;
4
-import java.io.InputStream;
5
-import java.text.ParseException;
6
-import java.text.SimpleDateFormat;
7
-import java.util.Date;
8
-import java.util.List;
9
-import java.util.Properties;
10
-import java.util.regex.Matcher;
11
-import java.util.regex.Pattern;
12
-
13
-public class ParameterUtil {
14
-
15
-    public static String getSysDateTime(){
16
-        String temp_str="";
17
-        Date dt = new Date();
18
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
19
-        temp_str=sdf.format(dt);
20
-        System.out.println("获取当前时间"+temp_str);
21
-        return temp_str;
22
-    }
23
-    
24
-    public static String getDateYMDHMS(Date date) {
25
-    	String str = "";
26
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
27
-        str=sdf.format(date);
28
-        System.out.println("获取当前时间"+str);
29
-        return str;
30
-    }
31
-    
32
-    public static String getSysDate(){
33
-        String temp_str="";
34
-        Date dt = new Date();
35
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
36
-        temp_str=sdf.format(dt);
37
-        return temp_str;
38
-    }
39
-
40
-    public static Date string2datetime(String dateTime){
41
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
42
-        Date date = null;
43
-        try {
44
-            date = dateFormat.parse(dateTime);
45
-        } catch (ParseException e) {
46
-            e.printStackTrace();
47
-        }
48
-        return date;
49
-    }
50
-    public static Date string2date(String dateTime){
51
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
52
-        Date date = null;
53
-        try {
54
-            date = dateFormat.parse(dateTime);
55
-        } catch (ParseException e) {
56
-            e.printStackTrace();
57
-        }
58
-        return date;
59
-    }
60
-
61
-    public static String date2string(Date date){
62
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
63
-        String str=sdf.format(date);
64
-        return str;
65
-    }
66
-
67
-    /**
68
-     * 获取指定时间的时间戳
69
-     * @param datatime
70
-     * @return
71
-     */
72
-    public static String getTimeStamp(String datatime){
73
-        long timeStamp = 0;
74
-        SimpleDateFormat format =  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
75
-        try {
76
-            Date date = format.parse(datatime);
77
-            timeStamp = date.getTime();
78
-        } catch (ParseException e) {
79
-            e.printStackTrace();
80
-        }
81
-        return String.valueOf(timeStamp);
82
-    }
83
-
84
-    /*
85
-     * 将时间戳转换为时间
86
-     */
87
-    public static String stampToDate(String s){
88
-        String res;
89
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
90
-        long lt = new Long(s);
91
-        Date date = new Date(lt);
92
-        res = simpleDateFormat.format(date);
93
-        return res;
94
-    }
95
-
96
-    public static void main(String[] args) {
97
-//        System.out.println(stampToDate("1504689208643"));
98
-//        System.out.println(getTimeStamp(getSysDateTime()));
99
-    	String ip = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}";   
100
-    	Pattern pattern = Pattern.compile(ip);  
101
-    	Matcher matcher = pattern.matcher("172.16.10.150");  
102
-    	matcher.matches();  
103
-    	//System.out.println(matcher.matches());
104
-
105
-    	String a = "1.16.10.1";
106
-    	boolean isNum = a.matches(ip);
107
-    	System.out.println(isNum);
108
-    }
109
-    public static String getBHS(String BHS){
110
-        String[] str = BHS.split(",");
111
-        StringBuffer sb = new StringBuffer();
112
-        for(int i=0;i<str.length;i++){
113
-            sb.append("'").append(str[i]).append("'").append(",");
114
-        }
115
-        String s=sb.toString();
116
-        String t=s.substring(0,s.length()-1);
117
-        return t;
118
-    }
119
-
120
-    //判断字段值是为空 不为空返回ture
121
-    public static boolean isnotnull(Object name){
122
-        return (null!=name&&!"".equals(name) && !"null".equals(name) && "null" != name);
123
-    }
124
-    
125
-    //判断字段值是为空,为空返回ture
126
-    public static boolean isnull(Object name){
127
-        return (null==name || "".equals(name) || "null".equals(name) || "null" == name);
128
-    }
129
-
130
-    //判断字段值是相等  相等返回ture
131
-    public static boolean isequal(Object name,Object value){
132
-        if(name==value||name.equals(value)){
133
-            return true;
134
-        }
135
-        return false;
136
-    }
137
-
138
-    /**
139
-     * 判断list和str数组是否全等
140
-     * @param list
141
-     * @param str
142
-     * @return
143
-     */
144
-    public static boolean isAllequal(List<String> list,String[] str){
145
-        boolean isbz = true;
146
-        for(int z=0;z<str.length;z++){
147
-            if(!isequal(list.get(z),str[z])){
148
-                isbz = false;
149
-                break;
150
-            }
151
-        }
152
-        return !isbz || !(str.length == list.size());
153
-    }
154
-
155
-    //判断字段值是否在某个集合里  在返回ture
156
-    public static boolean isallequal(Object name,String[] value){
157
-        for(int i=0;i<value.length;i++){
158
-            if(name==value[i]||name.equals(value[i])){
159
-                return true;
160
-            }
161
-        }
162
-        return false;
163
-    }
164
-
165
-    /**
166
-     * 从properties得到路径
167
-     * @param filePath
168
-     * @return
169
-     */
170
-    public static Properties readProperties(String filePath) {
171
-        Properties props = new Properties();
172
-        try {
173
-            InputStream in = new BufferedInputStream(ParameterUtil.class.getResourceAsStream(filePath));
174
-            props.load(in);
175
-        } catch (Exception e) {
176
-            e.printStackTrace();
177
-        }
178
-        return props;
179
-    }
180
-
181
-}