潘钊 / bsth_control · Commits

Commit c21299b11a97bb9efcbb354546edf2d33dbd3ba5

Authored by 潘钊
2 parents e3e4346f a4f54642

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Inline Side-by-side
Showing 9 changed files with 104 additions and 189 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 9 of 42 files are displayed.

src/main/java/com/bsth/controller/CarParkController.java
  View file @c21299b
... ... @@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.*;
15 15 @RestController
16 16 @RequestMapping("carpark")
17 17 public class CarParkController extends BaseController<CarPark, Integer> {
18   -
19 18 @Autowired
20 19 CarParkService service;
21 20  
... ... @@ -26,16 +25,10 @@ public class CarParkController extends BaseController&lt;CarPark, Integer&gt; {
26 25 */
27 26 @RequestMapping(value="getCarParkCode" , method = RequestMethod.GET)
28 27 public Map<String, Object> getStationCode() {
29   -
30 28 Map<String, Object> resultMap = new HashMap<String, Object>();
31   -
32   - resultMap.put("carParkCode", "FFFF" + GetUIDAndCode.getCarParkId());
33   -
  29 + resultMap.put("carParkCode", "FFFFFF" + GetUIDAndCode.getCarParkId());
34 30 return resultMap;
35   -
36 31 }
37   -
38   -
39 32 /**
40 33 * 新增停车场信息
41 34 *
... ... @@ -53,21 +46,14 @@ public class CarParkController extends BaseController&lt;CarPark, Integer&gt; {
53 46 */
54 47 @RequestMapping(value="carParkSave" , method = RequestMethod.POST)
55 48 public Map<String, Object> stationSave(@RequestParam Map<String, Object> map) {
56   -
57 49 map.put("createBy", "");
58   -
59 50 map.put("updateBy", "");
60   -
61 51 return service.carParkSave(map);
62   -
63 52 }
64   -
65 53 @RequestMapping(value = "findCarParkInfoFormId",method = RequestMethod.GET)
66 54 public List<Map<String, Object>> findCarParkInfoFormId(@RequestParam Map<String, Object> map) {
67   -
68 55 return service.findCarParkInfoFormId(map);
69 56 }
70   -
71 57 /**
72 58 * 修改停车场信息
73 59 *
... ... @@ -85,11 +71,12 @@ public class CarParkController extends BaseController&lt;CarPark, Integer&gt; {
85 71 */
86 72 @RequestMapping(value="carParkUpdate" , method = RequestMethod.POST)
87 73 public Map<String, Object> carParkUpdate(@RequestParam Map<String, Object> map) {
88   -
89 74 map.put("updateBy", "");
90   -
91 75 return service.carParkUpdate(map);
92   -
93 76 }
94 77  
  78 + @RequestMapping(value="isHaveParkCode",method=RequestMethod.GET)
  79 + public boolean isHaveParkCode(@RequestParam Map<String,Object> map) {
  80 + return service.selectTccInfoByCode(map);
  81 + }
95 82 }
... ...
src/main/java/com/bsth/entity/CarPark.java
  View file @c21299b
... ... @@ -3,6 +3,9 @@ package com.bsth.entity;
3 3 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4 4  
5 5 import javax.persistence.*;
  6 +
  7 +import org.hibernate.annotations.Formula;
  8 +
6 9 import java.util.Date;
7 10  
8 11  
... ... @@ -77,6 +80,10 @@ public class CarPark {
77 80 // 分公司
78 81 private String brancheCompany;
79 82  
  83 + /** 组合公司分公司编码 */
  84 + @Formula(" concat(company, '_', branche_company) ")
  85 + private String cgsbm;
  86 +
80 87 // 是否撤销
81 88 private Integer destroy;
82 89  
... ... @@ -99,6 +106,14 @@ public class CarPark {
99 106 // 修改日期
100 107 @Column(name = "update_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
101 108 private Date updateDate;
  109 +
  110 + public String getCgsbm() {
  111 + return cgsbm;
  112 + }
  113 +
  114 + public void setCgsbm(String cgsbm) {
  115 + this.cgsbm = cgsbm;
  116 + }
102 117  
103 118 public Integer getId() {
104 119 return id;
... ...
src/main/java/com/bsth/repository/CarParkRepository.java
  View file @c21299b
... ... @@ -107,4 +107,7 @@ public interface CarParkRepository extends BaseRepository&lt;CarPark, Integer&gt;{
107 107  
108 108 @Query(value = "select st_astext(g_park_point), shapes_type, g_center_point, radius,park_code,park_name from bsth_c_car_park where park_code=?1", nativeQuery = true)
109 109 public Object[][] bufferAera(String parkCode);
  110 +
  111 + @Query(value ="SELECT p.park_name,p.park_code from bsth_c_car_park p where p.park_code = ?1", nativeQuery=true)
  112 + List<Object[]> selectTccInfoByCode(String parkCode);
110 113 }
... ...
src/main/java/com/bsth/service/CarParkService.java
  View file @c21299b
... ... @@ -28,5 +28,6 @@ public interface CarParkService extends BaseService&lt;CarPark, Integer&gt; {
28 28 *
29 29 */
30 30 Map<String, Object> carParkUpdate(Map<String, Object> map);
31   -
  31 +
  32 + boolean selectTccInfoByCode(Map<String, Object> map);
32 33 }
... ...
src/main/java/com/bsth/service/impl/CarParkServiceImpl.java
  View file @c21299b
... ... @@ -26,55 +26,30 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
26 26  
27 27 @Override
28 28 public Map<String, Object> carParkSave(Map<String, Object> map) {
29   -
30 29 Map<String, Object> resultMap = new HashMap<String, Object>();
31   -
32 30 try {
33   -
34 31 // 停车场编码
35 32 String parkCode = map.get("parkCode").equals("") ? null : map.get("parkCode").toString();
36   -
37   - // 停车场id
38   - // Integer id = Integer.parseInt(parkCode);
39   -
40 33 // 停车场名称
41 34 String parkName = map.get("parkName").equals("") ? "" : map.get("parkName").toString();
42   -
43 35 // 地理位置(百度坐标集合)
44 36 String bParkPoint = map.get("bParkPoint").equals("") ? "" : map.get("bParkPoint").toString();
45   -
46   - // 地理位置(WGS坐标集合)
47   - // String gParkPoint = map.get("gParkPoint").equals("") ? "" :map.get("gParkPoint").toString();
48   -
49 37 // 多边形WGS坐标点集合
50 38 String gParkPoint ="";
51   -
52 39 if(!bParkPoint.equals("")) {
53   -
54 40 String bPloygonGridArray[] = bParkPoint.split(",");
55   -
56 41 int bLen_ = bPloygonGridArray.length;
57   -
58 42 for(int b = 0 ;b<bLen_;b++) {
59   -
60 43 String tempArray[]= bPloygonGridArray[b].split(" ");
61   -
62 44 Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
63   -
64 45 if(b==0) {
65   -
66 46 gParkPoint = resultPoint.getLng() + " " + resultPoint.getLat();
67   -
68 47 }else {
69   -
70 48 gParkPoint = gParkPoint + ',' + resultPoint.getLng() + " " + resultPoint.getLat();
71   -
72 49 }
73   -
74 50 }
75 51  
76 52 }
77   -
78 53 if(bParkPoint.equals(""))
79 54 bParkPoint = null;
80 55 else
... ... @@ -84,169 +59,92 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
84 59 gParkPoint = null;
85 60 else
86 61 gParkPoint = "POLYGON((" + gParkPoint +"))";
87   -
88   - /*bParkPoint = "POLYGON((" + bParkPoint +"))";
89   -
90   - gParkPoint = "POLYGON((" + gParkPoint +"))";*/
91   -
92 62 // 地理位置中心点(百度坐标)
93 63 String bCenterPoint = map.get("bCenterPoint").equals("") ? "" : map.get("bCenterPoint").toString();
94   -
95   - // 地理位置中心点(WGS坐标)
96   - // String gCenterPoint = map.get("gCenterPoint").equals("") ? "" : map.get("gCenterPoint").toString();
97   -
98 64 String bJwpointsArray[] =null;
99   -
100 65 if(bCenterPoint!=null) {
101   -
102 66 bJwpointsArray = bCenterPoint.split(" ");
103   -
104 67 }
105   -
106 68 String gCenterPoint = null;
107   -
108 69 if(bJwpointsArray.length>0) {
109   -
110 70 Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
111   -
112 71 gCenterPoint = String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
113   -
114 72 }
115   -
116 73 // 坐标类型
117 74 String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
118   -
119 75 // 图形类型
120 76 String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
121   -
122 77 // 半径
123 78 Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
124   -
125 79 // 面积
126 80 Double area = map.get("area").equals("") ? 0.0 : Double.parseDouble(map.get("area").toString());
127   -
128 81 // 公司
129 82 String company = map.get("company").equals("") ? "" : map.get("company").toString();
130   -
131 83 // 分公司
132   - /*String brancheCompany = map.get("brancheCompany").equals("") ? "" : map.get("brancheCompany").toString();*/
133   - String brancheCompany="";
134   -
  84 + String brancheCompany = map.get("brancheCompany").equals("") ? "" : map.get("brancheCompany").toString();
135 85 // 是否撤销
136 86 Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
137   -
138 87 // 版本号
139 88 Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
140   -
141 89 // 描述与说明
142 90 String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
143   -
144 91 SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
145   -
146 92 Date date = new Date();
147   -
148 93 // 创建日期
149 94 String createDate = formatter.format(date);
150   -
151 95 // 修改日期
152 96 String updateDate = formatter.format(date);
153   -
154 97 // 创建人
155 98 Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
156   -
157 99 // 修改人
158 100 Integer updateBy = map.get("updateBy").equals("") ? null : Integer.parseInt(map.get("updateBy").toString());
159   -
160   -
161   -
162   -
163 101 carParkRepository.carParkSave(area, company, parkCode, parkName,
164   -
165 102 brancheCompany, createBy, createDate, descriptions, destroy,
166   -
167 103 updateBy, updateDate, versions, bCenterPoint, bParkPoint,
168   -
169 104 dbType, gCenterPoint, gParkPoint, radius, shapesType);
170   -
171 105 resultMap.put("status", ResponseCode.SUCCESS);
172   -
173 106 } catch (Exception e) {
174   -
175 107 resultMap.put("status", ResponseCode.ERROR);
176   -
177 108 logger.error("save erro.", e);
178   -
179 109 }
180   -
181 110 return resultMap;
182 111 }
183 112  
184 113 @Override
185 114 public List<Map<String, Object>> findCarParkInfoFormId(Map<String, Object> map) {
186   -
187 115 // 获取线路ID
188 116 Integer id = map.get("id").equals("") ? 0 : Integer.parseInt(map.get("id").toString());
189   -
190 117 List<Object[]> objects = carParkRepository.findCarParkInfoFormId(id);
191   -
192 118 List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();
193   -
194 119 int len = objects.size();
195   -
196 120 if(objects.size()>0) {
197   -
198 121 for(int i = 0 ; i < len; i++) {
199   -
200 122 Map<String, Object> tempM = new HashMap<String,Object>();
201   -
202 123 tempM.put("carParkId", objects.get(i)[0]);
203   -
204 124 tempM.put("carParkArea", objects.get(i)[1]);
205   -
206 125 tempM.put("carParkCompany", objects.get(i)[2]);
207   -
208 126 tempM.put("carParkCode", objects.get(i)[3]);
209   -
210 127 tempM.put("carParkName", objects.get(i)[4]);
211   -
212 128 tempM.put("carParkBrancheCompany", objects.get(i)[5]);
213   -
214 129 tempM.put("carParkCreateBy", objects.get(i)[6]);
215   -
216 130 tempM.put("carParkCreateDate", objects.get(i)[7]);
217   -
218 131 tempM.put("carParkDescriptions", objects.get(i)[8]);
219   -
220 132 tempM.put("carParkDestroy", objects.get(i)[9]);
221   -
222 133 tempM.put("carParkUpdate", objects.get(i)[10]);
223   -
224 134 tempM.put("carParkUpdateDate", objects.get(i)[11]);
225   -
226 135 tempM.put("carParkVersions", objects.get(i)[12]);
227   -
228 136 tempM.put("carParkBcenterPoint", objects.get(i)[13]);
229   -
230 137 tempM.put("carParkBparkPoint", objects.get(i)[14]);
231   -
232 138 tempM.put("carParkGcenterPoint", objects.get(i)[15]);
233   -
234 139 tempM.put("carParkGparkPoint", objects.get(i)[16]);
235   -
236 140 tempM.put("carParkDBtype", objects.get(i)[17]);
237   -
238 141 tempM.put("carParkRadius", objects.get(i)[18]);
239   -
240 142 tempM.put("carParkShapesType", objects.get(i)[19]);
241   -
242 143 resultList.add(tempM);
243 144 }
244   -
245 145 }
246   -
247 146 return resultList;
248 147 }
249   -
250 148 /**
251 149 * 修改停车场信息
252 150 *
... ... @@ -265,90 +163,54 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
265 163 @Override
266 164 public Map<String, Object> carParkUpdate(Map<String, Object> map) {
267 165 Map<String, Object> resultMap = new HashMap<String, Object>();
268   -
269 166 try {
270   -
271 167 // id
272 168 Integer id = map.get("id").equals("") ? null : Integer.parseInt(map.get("id").toString());
273   -
274 169 if(id!=null) {
275   -
276 170 // 面积
277 171 Double area = map.get("area").equals("") ? null : Double.parseDouble(map.get("area").toString());
278   -
279 172 // 中心点（百度坐标）
280 173 String bCenterPoint = map.get("bCenterPoint").equals("") ? "" : map.get("bCenterPoint").toString();
281   -
282 174 // 图形坐标点集合（百度坐标）
283 175 String bParkPoint = map.get("bParkPoint").equals("") ? "" : map.get("bParkPoint").toString();
284   -
285 176 // 分公司
286   - /*String brancheCompany = map.get("brancheCompany").equals("")? "" :map.get("brancheCompany").toString();*/
287   - String brancheCompany = "";
288   -
  177 + String brancheCompany = map.get("brancheCompany").equals("")? "" :map.get("brancheCompany").toString();
  178 + //String brancheCompany = "";
289 179 // 公司
290 180 String company = map.get("company").equals("") ? "" : map.get("company").toString();
291   -
292 181 // 坐标类型
293 182 String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
294   -
295 183 // 描述与说明
296 184 String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
297   -
298 185 // 是否撤销
299 186 Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
300   -
301 187 // 中心点（WGS坐标）
302 188 // String gCenterPoint = map.get("gCenterPoint").equals("") ? "" : map.get("gCenterPoint").toString();
303   -
304 189 String bJwpointsArray[] =null;
305   -
306 190 if(bCenterPoint!=null) {
307   -
308 191 bJwpointsArray = bCenterPoint.split(" ");
309   -
310 192 }
311   -
312 193 String gCenterPoint =null;
313   -
314 194 if(bJwpointsArray.length>0) {
315   -
316 195 Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
317   -
318 196 gCenterPoint = String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
319   -
320 197 }
321   -
322 198 // 图形坐标点集合（WGS坐标）
323 199 // String gParkPoint = map.get("gParkPoint").equals("") ? "" : map.get("gParkPoint").toString();
324   -
325 200 // 多边形WGS坐标点集合
326 201 String gParkPoint ="";
327   -
328 202 if(!bParkPoint.equals("")) {
329   -
330 203 String bPloygonGridArray[] = bParkPoint.split(",");
331   -
332 204 int bLen_ = bPloygonGridArray.length;
333   -
334 205 for(int b = 0 ;b<bLen_;b++) {
335   -
336 206 String tempArray[]= bPloygonGridArray[b].split(" ");
337   -
338 207 Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
339   -
340 208 if(b==0) {
341   -
342 209 gParkPoint = resultPoint.getLng() + " " + resultPoint.getLat();
343   -
344 210 }else {
345   -
346 211 gParkPoint = gParkPoint + ',' + resultPoint.getLng() + " " + resultPoint.getLat();
347   -
348 212 }
349   -
350 213 }
351   -
352 214 }
353 215 if(bParkPoint.equals(""))
354 216 bParkPoint = null;
... ... @@ -362,69 +224,51 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
362 224 /*bParkPoint = "POLYGON((" + bParkPoint +"))";
363 225  
364 226 gParkPoint = "POLYGON((" + gParkPoint +"))";*/
365   -
366 227 // 编码
367 228 String parkCode = map.get("parkCode").equals("") ? "" : map.get("parkCode").toString();
368   -
369 229 // 名称
370 230 String parkName = map.get("parkName").equals("") ? "" : map.get("parkName").toString();
371   -
372 231 // 半径
373 232 Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
374   -
375 233 // 图形类型
376 234 String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
377   -
378 235 // 版本
379 236 Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
380   -
381 237 // 创建人
382 238 Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
383   -
384 239 // 创建日期
385 240 String createDate = map.get("createDate").equals("") ? "" : map.get("createDate").toString();
386   -
387 241 Integer updateBy = map.get("updateBy").equals("") ? null : Integer.parseInt(map.get("updateBy").toString());
388   -
389 242 SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
390   -
391 243 Date date = new Date();
392   -
393 244 // 修改日期
394 245 String updateDate = formatter.format(date);
395   -
396 246 carParkRepository.carParkUpdate(area, company, parkCode, parkName, brancheCompany, createBy, createDate, descriptions, destroy, updateBy, updateDate, versions, bCenterPoint, gCenterPoint, bParkPoint, gParkPoint, dbType, radius, shapesType, id);
397   -
398 247 }
399   -
400 248 resultMap.put("status", ResponseCode.SUCCESS);
401   -
402 249 } catch (Exception e) {
403   -
404 250 resultMap.put("status", ResponseCode.ERROR);
405   -
406 251 logger.error("save erro.", e);
407   -
408 252 }
409   -
410 253 return resultMap;
411 254 }
412   -
413 255 /** 百度坐标转WGS坐标 */
414 256 public Location FromBDPointToWGSPoint(String bLonx,String bLatx) {
415   -
416 257 double lng = Double.parseDouble(bLonx);
417   -
418 258 double lat = Double.parseDouble(bLatx);
419   -
420 259 Location bdLoc = TransGPS.LocationMake(lng, lat);
421   -
422 260 Location location = TransGPS.bd_decrypt(bdLoc);
423   -
424 261 Location WGSPoint = TransGPS.transformFromGCJToWGS(location);
425   -
426 262 return WGSPoint;
427   -
428 263 }
429   -
  264 +
  265 + @Override
  266 + public boolean selectTccInfoByCode(Map<String, Object> map) {
  267 + List<Object[]> arrayObj = carParkRepository.selectTccInfoByCode(map.get("parkCode").equals("") ? "" : map.get("parkCode").toString());
  268 + boolean tag = true;
  269 + if(arrayObj.size()>0) {
  270 + tag= false;
  271 + }
  272 + return tag;
  273 + }
430 274 }
... ...
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
  View file @c21299b
... ... @@ -112,6 +112,9 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
112 112 public SchedulePlanRuleResult mapRow(ResultSet rs, int i) throws SQLException {
113 113 SchedulePlanRuleResult obj = new SchedulePlanRuleResult();
114 114 obj.setRuleId(rs.getString("rule_id"));
  115 + obj.setCcZbh(rs.getString("cc_zbh"));
  116 + obj.setGids(rs.getString("gids"));
  117 + obj.setEcids(rs.getString("ecids"));
115 118 obj.setScheduleDate(rs.getDate("schedule_date"));
116 119 obj.setGidindex(rs.getString("gidindex"));
117 120 obj.setEcindex(rs.getString("ecindex"));
... ...
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleRule_input.java
  View file @c21299b
1 1 package com.bsth.service.schedule.rules.shiftloop;
2 2  
3 3 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
  4 +import com.bsth.service.schedule.utils.Md5Util;
4 5 import com.google.common.base.Splitter;
5 6 import org.apache.commons.lang3.StringUtils;
6 7 import org.joda.time.DateTime;
... ... @@ -17,6 +18,12 @@ public class ScheduleRule_input {
17 18  
18 19 /** 规则Id */
19 20 private String ruleId;
  21 + /**
  22 + * 规则md5值（不使用id判定，使用md5判定）
  23 + * 使用，启用日期，路牌范围，人员范围 结合生成md5编码
  24 + */
  25 + private String ruleMd5;
  26 +
20 27 /** 规则启用日期 */
21 28 private DateTime qyrq;
22 29  
... ... @@ -78,9 +85,20 @@ public class ScheduleRule_input {
78 85 }
79 86 }
80 87  
  88 + /** 生成规则md5编码 */
  89 + ruleMd5 = Md5Util.getMd5(
  90 + String.valueOf(qyrq.getMillis()) + "_" +
  91 + scheduleRule1Flat.getLpIds() + "_" +
  92 + scheduleRule1Flat.getRyConfigIds()
  93 + );
  94 +
  95 + System.out.println("rule的md5：" + ruleMd5 + " 车辆：" + scheduleRule1Flat.getCarConfigInfo().getCl().getInsideCode());
  96 +
81 97 this.self = scheduleRule1Flat;
82 98 }
83 99  
  100 +
  101 +
84 102 public String getRuleId() {
85 103 return ruleId;
86 104 }
... ... @@ -160,4 +178,12 @@ public class ScheduleRule_input {
160 178 public void setSelf(ScheduleRule1Flat self) {
161 179 this.self = self;
162 180 }
  181 +
  182 + public String getRuleMd5() {
  183 + return ruleMd5;
  184 + }
  185 +
  186 + public void setRuleMd5(String ruleMd5) {
  187 + this.ruleMd5 = ruleMd5;
  188 + }
163 189 }
... ...
src/main/java/com/bsth/service/schedule/utils/Md5Util.java 0 → 100644
  View file @c21299b
  1 +package com.bsth.service.schedule.utils;
  2 +
  3 +import java.security.MessageDigest;
  4 +
  5 +/**
  6 + * Md5工具。
  7 + */
  8 +public class Md5Util {
  9 + private static MessageDigest md5 = null;
  10 + static {
  11 + try {
  12 + md5 = MessageDigest.getInstance("MD5");
  13 + } catch (Exception exp) {
  14 + exp.printStackTrace();
  15 + }
  16 + }
  17 +
  18 + /**
  19 + * 用于获取一个String的md5值。
  20 + * @param str
  21 + * @return
  22 + */
  23 + public static String getMd5(String str) {
  24 + byte[] bs = md5.digest(str.getBytes());
  25 + StringBuilder s = new StringBuilder();
  26 + for (byte x : bs) {
  27 + if ((x & 0xff) >>4 == 0) {
  28 + s.append("0").append(Integer.toHexString(x & 0xff));
  29 + } else {
  30 + s.append(Integer.toHexString(x & 0xff));
  31 + }
  32 + }
  33 + return s.toString();
  34 + }
  35 +
  36 +}
... ...
src/main/resources/application-dev.properties
  View file @c21299b
... ... @@ -10,7 +10,7 @@ spring.jpa.show-sql= true
10 10 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
11 11 spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
12 12 spring.datasource.username= root
13   -spring.datasource.password= root
  13 +spring.datasource.password=
14 14 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
15 15 #spring.datasource.username= root
16 16 #spring.datasource.password= root
... ...