Commit 0f5c10fd8cbef988ce122e0f30b883ab7ac71f17

Authored by 林本磊
1 parent ec4fd9ee
Exists in dev

fix: 文字替换

platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java
@@ -217,9 +217,9 @@ public class TemplateService extends BaseService { @@ -217,9 +217,9 @@ public class TemplateService extends BaseService {
217 */ 217 */
218 public List<TbFolderRollPicture> rollPicture(String folderKey, Integer siteId) { 218 public List<TbFolderRollPicture> rollPicture(String folderKey, Integer siteId) {
219 TbFolder folder = TbFolder.dao.findFirstByWhere("where `key` = ? and site_id = ?", folderKey, siteId); 219 TbFolder folder = TbFolder.dao.findFirstByWhere("where `key` = ? and site_id = ?", folderKey, siteId);
220 - if(folder==null){ 220 + if (folder == null) {
221 return null; 221 return null;
222 - }else { 222 + } else {
223 return service.getRollPicture(folder.getId()); 223 return service.getRollPicture(folder.getId());
224 } 224 }
225 } 225 }
@@ -291,30 +291,49 @@ public class TemplateService extends BaseService { @@ -291,30 +291,49 @@ public class TemplateService extends BaseService {
291 // 推荐文章列表 291 // 推荐文章列表
292 Page<BDemand> demands = BDemand.dao.paginate(new Paginator(pageNo, pageSize), "select * ", fromSql); 292 Page<BDemand> demands = BDemand.dao.paginate(new Paginator(pageNo, pageSize), "select * ", fromSql);
293 List<BDemand> list = demands.getList(); 293 List<BDemand> list = demands.getList();
294 - Map<String,String> map =new HashMap<>();  
295 - map.put("TRUCK","车运");  
296 - map.put("SHIP","船运");  
297 - map.put("TRUCK_AND_SHIP","车船联运");  
298 -  
299 - Map<String,String> stMap =new HashMap<>();  
300 - stMap.put("PUBLISH","已发布");  
301 - stMap.put("RECEIVE","已接受");  
302 - stMap.put("REJECT","已拒绝");  
303 - stMap.put("GOING","进行中");  
304 - stMap.put("FINISH","已结束"); 294 + Map<String, String> map = new HashMap<>();
  295 + map.put("TRUCK", "车运");
  296 + map.put("SHIP", "船运");
  297 + map.put("TRUCK_AND_SHIP", "车船联运");
  298 +
  299 + Map<String, String> stMap = new HashMap<>();
  300 + stMap.put("PUBLISH", "已发布");
  301 + stMap.put("RECEIVE", "已接受");
  302 + stMap.put("REJECT", "已拒绝");
  303 + stMap.put("GOING", "进行中");
  304 + stMap.put("FINISH", "已结束");
305 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 305 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
306 - for (BDemand demand : list){ 306 + for (BDemand demand : list) {
307 String type = (String) demand.getAttrs().get("type"); 307 String type = (String) demand.getAttrs().get("type");
308 demand.setTYPE(map.get(type)); 308 demand.setTYPE(map.get(type));
309 - String status = (String)demand.getAttrs().get("status"); 309 + String status = (String) demand.getAttrs().get("status");
310 demand.setSTATUS(stMap.get(status)); 310 demand.setSTATUS(stMap.get(status));
311 - Date date = (Date)demand.getAttrs().get("created_date"); 311 + Date date = (Date) demand.getAttrs().get("created_date");
312 Calendar cal = Calendar.getInstance(); 312 Calendar cal = Calendar.getInstance();
313 cal.setTime(date); 313 cal.setTime(date);
314 - cal.add(Calendar.HOUR,-8); 314 + cal.add(Calendar.HOUR, -8);
315 date = cal.getTime(); 315 date = cal.getTime();
316 String strDate = formatter.format(date); 316 String strDate = formatter.format(date);
317 demand.setCREATED_DATE(strDate); 317 demand.setCREATED_DATE(strDate);
  318 + String userName = (String) demand.getAttrs().get("user_name");
  319 + int length = userName.length();
  320 + if (length < 2) {
  321 + //一个字,不处理
  322 + } else if (length == 2) {
  323 + String a = userName.substring(0, 1);
  324 + String b = "*";
  325 + demand.setUSER_NAME(a + b);
  326 + } else if (length == 3) {
  327 + String a = userName.substring(0, 1);
  328 + String b = "*";
  329 + String c = userName.substring(2, 3);
  330 + demand.setUSER_NAME(a + b + c);
  331 + } else {
  332 + String a = userName.substring(0, 1);
  333 + String b = "***";
  334 + String c = userName.substring(length-1,length);
  335 + demand.setUSER_NAME(a + b + c);
  336 + }
318 337
319 } 338 }
320 return demands; 339 return demands;