代码规范调整

src/main/java/com/uas/platform/b2b/controller/CustServeController.java

@@ -1,10 +1,11 @@
 package com.uas.platform.b2b.controller;
 
-import java.io.IOException;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
+import com.uas.platform.b2b.manage.service.MasterService;
+import com.uas.platform.b2b.model.AccessToken;
+import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.service.AccessTokenService;
+import com.uas.platform.b2b.service.VendorService;
+import com.uas.platform.core.exception.NotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
@@ -12,12 +13,9 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.uas.platform.b2b.manage.service.MasterService;
-import com.uas.platform.b2b.model.AccessToken;
-import com.uas.platform.b2b.model.Vendor;
-import com.uas.platform.b2b.service.AccessTokenService;
-import com.uas.platform.b2b.service.VendorService;
-import com.uas.platform.core.exception.NotFoundException;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 采购角色 <br>
@@ -68,8 +66,9 @@ public class CustServeController {
 			AccessToken token = accessTokenService.createNew(uu);
 			String website = websites.get(0);
 			StringBuffer redirectUrl = new StringBuffer(website);
-			if (!website.endsWith("/"))
-				redirectUrl.append("/");
+			if (!website.endsWith("/")) {
+                redirectUrl.append("/");
+            }
 			redirectUrl.append("opensys/custserve.action?client_type=b2b&access_token=").append(token.getId());
 			response.sendRedirect(redirectUrl.toString());
 		}

src/main/java/com/uas/platform/b2b/controller/DeputyOrderController.java

@@ -665,14 +665,16 @@ public class DeputyOrderController {
 			AccessToken token = accessTokenService.createNew(uu);
 			MasterInfo master = masterInfos.get(0);
 			StringBuffer redirectUrl = new StringBuffer(master.getWebsite());
-			if (!master.getWebsite().endsWith("/"))
-				redirectUrl.append("/");
+			if (!master.getWebsite().endsWith("/")) {
+                redirectUrl.append("/");
+            }
 			redirectUrl.append("opensys/getCurrentJnodes.action?caller=Sale&condition=sa_code='").append(code)
 					.append("'&client_type=b2b&access_token=").append(token.getId()).append("&master=")
 					.append(master.getDb_user());
 			ResponseWrap res = com.uas.sso.common.util.HttpUtil.doGet(redirectUrl.toString());
-			if (!res.isSuccess())
-				map.put("error", "暂未获取到相关数据");
+			if (!res.isSuccess()) {
+                map.put("error", "暂未获取到相关数据");
+            }
 			JSONObject jsonObject = JSONObject.parseObject(res.getContent());
 			if (jsonObject != null) {
 				String nodeStr = URLDecoder.decode(jsonObject.getString("nodes"), "UTF-8");

src/main/java/com/uas/platform/b2b/controller/PublicQueryController.java

@@ -14,11 +14,9 @@ import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.StringUtil;
 import com.uas.platform.core.util.encry.Md5Utils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
-import org.json.JSONString;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.web.header.Header;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
@@ -75,18 +73,21 @@ public class PublicQueryController {
 	public ModelMap queryEnterprise(String name, String shortName, Long uu) throws UnsupportedEncodingException {
 		ModelMap returnMap = new ModelMap();
 		if (!StringUtils.isEmpty(name)) { List<Enterprise> enterprises = enterpriseService.findByName(name);
-			if (!CollectionUtils.isEmpty(enterprises))
-				returnMap.put("name", QueriableMember.getMembers(enterprises));
+			if (!CollectionUtils.isEmpty(enterprises)) {
+                returnMap.put("name", QueriableMember.getMembers(enterprises));
+            }
 		}
 		if (!StringUtils.isEmpty(shortName)) {
 			Set<Enterprise> enterprises = enterpriseService.findByShortName(shortName);
-			if (!CollectionUtils.isEmpty(enterprises))
-				returnMap.put("shortName", QueriableMember.getMembers(enterprises));
+			if (!CollectionUtils.isEmpty(enterprises)) {
+                returnMap.put("shortName", QueriableMember.getMembers(enterprises));
+            }
 		}
 		if (uu != null) {
 			Enterprise enterprise = enterpriseService.findById(uu);
-			if (enterprise != null)
-				returnMap.put("uu", new QueriableMember(enterprise));
+			if (enterprise != null) {
+                returnMap.put("uu", new QueriableMember(enterprise));
+            }
 		}
 		return returnMap;
 	}
@@ -136,8 +137,9 @@ public class PublicQueryController {
 	@ResponseStatus(value = HttpStatus.OK)
 	public QueriableMember getEnterprise(@PathVariable("uu") Long uu) {
 		Enterprise enterprise = enterpriseService.findById(uu);
-		if (enterprise != null)
-			return new QueriableMember(enterprise);
+		if (enterprise != null) {
+            return new QueriableMember(enterprise);
+        }
 		return null;
 	}
 
@@ -151,8 +153,9 @@ public class PublicQueryController {
 	@ResponseStatus(value = HttpStatus.OK)
 	public QueriableUser getUser(@PathVariable("enUU") Long enUU, @PathVariable("userUU") Long userUU) {
 		User user = userService.findUserByEnUUAndUserUU(enUU, userUU);
-		if (user != null)
-			return new QueriableUser(user);
+		if (user != null) {
+            return new QueriableUser(user);
+        }
 		return null;
 	}
 
@@ -307,13 +310,15 @@ public class PublicQueryController {
 		List<EnterpriseDetail> members = new ArrayList<EnterpriseDetail>();
 		if (!StringUtils.isEmpty(name)) {
 			Set<Enterprise> enterprises = enterpriseService.findByNameKey(name);
-			if (!CollectionUtils.isEmpty(enterprises))
-				members.addAll(EnterpriseDetail.getMembers(enterprises));
+			if (!CollectionUtils.isEmpty(enterprises)) {
+                members.addAll(EnterpriseDetail.getMembers(enterprises));
+            }
 		}
 		if (!StringUtils.isEmpty(shortName)) {
 			Set<Enterprise> enterprises = enterpriseService.findByShortName(shortName);
-			if (!CollectionUtils.isEmpty(enterprises))
-				members.addAll(EnterpriseDetail.getMembers(enterprises));
+			if (!CollectionUtils.isEmpty(enterprises)) {
+                members.addAll(EnterpriseDetail.getMembers(enterprises));
+            }
 		}
 		return members;
 	}

src/main/java/com/uas/platform/b2b/controller/RegisterController.java

@@ -1,17 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.uas.platform.b2b.model.Attach;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.FileUpload;
@@ -25,6 +13,17 @@ import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.StringUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 注册、找回密码
@@ -232,8 +231,9 @@ public class RegisterController {
 		map.put("userEmail", StringUtil.getSheildString(user.getUserEmail(), user.getUserEmail().indexOf("@") - 2, 2));
 		User admin = userService.findUserByUserUU(user.getEnterprise().getEnAdminuu());
 		SystemSession.setUser(user);
-		if (admin != null)
-			map.put("adminEmail", StringUtil.getSheildString(admin.getUserEmail(), admin.getUserEmail().indexOf("@") - 2, 2));
+		if (admin != null) {
+            map.put("adminEmail", StringUtil.getSheildString(admin.getUserEmail(), admin.getUserEmail().indexOf("@") - 2, 2));
+        }
 		return map;
 	}
 

src/main/java/com/uas/platform/b2b/controller/TruckController.java

@@ -1,9 +1,7 @@
 package com.uas.platform.b2b.controller;
 
-import java.util.List;
-
-import javax.servlet.http.HttpSession;
-
+import com.uas.platform.b2b.model.PurchaseNotice;
+import com.uas.platform.b2b.service.PurchaseNoticeService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.service.PurchaseNoticeService;
+import javax.servlet.http.HttpSession;
+import java.util.List;
 
 /**
  * 货车
@@ -39,10 +37,11 @@ public class TruckController {
 	public Object add(HttpSession session, Long noticeId) {
 		Object track = session.getAttribute(TRUCK);
 		Long[] noticeArray = null;
-		if (track != null)
-			noticeArray = (Long[]) track;
-		else
-			noticeArray = new Long[] {};
+		if (track != null) {
+            noticeArray = (Long[]) track;
+        } else {
+            noticeArray = new Long[]{};
+        }
 		if (!ArrayUtils.contains(noticeArray, noticeId)) {
 			noticeArray = ArrayUtils.add(noticeArray, noticeId);
 			session.setAttribute(TRUCK, noticeArray);
@@ -64,8 +63,9 @@ public class TruckController {
 				Long[] noticeArray = (Long[]) track;
 				noticeArray = ArrayUtils.removeElement(noticeArray, noticeId);
 				session.setAttribute(TRUCK, noticeArray);
-			} else
-				session.removeAttribute(TRUCK);// 清除货车的商品
+			} else {
+                session.removeAttribute(TRUCK);// 清除货车的商品
+            }
 		}
 		return session.getAttribute(TRUCK);
 	}

src/main/java/com/uas/platform/b2b/controller/UserController.java

@@ -188,8 +188,9 @@ public class UserController {
 			SystemSession.setUser(user);
 			logger.log("用户信息", "修改用户密码，UU：" + user.getUserUU());
 			return new ResponseEntity<String>(HttpStatus.OK);
-		} else
-			throw new IllegalOperatorException("新密码不能为空");
+		} else {
+            throw new IllegalOperatorException("新密码不能为空");
+        }
 	}
 
 	/**
@@ -238,8 +239,9 @@ public class UserController {
 		user = userService.updateUserRole(user);
 		if (user != null) {
 			logger.log("用户信息", "修改用户权限，UU：" + user.getUserUU());
-			if (SystemSession.getUser().getUserUU().equals(user.getUserUU()))
-				request.getSession().setAttribute("user", user);
+			if (SystemSession.getUser().getUserUU().equals(user.getUserUU())) {
+                request.getSession().setAttribute("user", user);
+            }
 		}
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}

src/main/java/com/uas/platform/b2b/core/util/SearchKeyUtils.java

@@ -1,14 +1,13 @@
 package com.uas.platform.b2b.core.util;
 
+import com.uas.platform.core.util.ArrayUtils;
+import org.springframework.util.StringUtils;
+
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.springframework.util.StringUtils;
-
-import com.uas.platform.core.util.ArrayUtils;
-
 public class SearchKeyUtils {
 
 	private static final String COMPANY_END = "有限公司";
@@ -29,8 +28,9 @@ public class SearchKeyUtils {
 		Set<String> keySet = new HashSet<String>();
 		if (StringUtils.hasText(paramString)) {
 			String string = paramString;
-			if (string.endsWith(COMPANY_END))
-				string = string.substring(0, string.indexOf(COMPANY_END));
+			if (string.endsWith(COMPANY_END)) {
+                string = string.substring(0, string.indexOf(COMPANY_END));
+            }
 			// 先按标点符号分成多个小字符串
 			String[] strs = string.replaceAll("[\\pP‘’“”\\s]", ",").split(",");
 			for (String str : strs) {
@@ -39,10 +39,12 @@ public class SearchKeyUtils {
 					keySet.addAll(Arrays.asList(ArrayUtils.split(str, len)));
 				}
 			}
-			if (limit && string.length() > maxLength)
-				keySet.add(string);
-			if (limit && paramString.length() > maxLength)
-				keySet.add(paramString);
+			if (limit && string.length() > maxLength) {
+                keySet.add(string);
+            }
+			if (limit && paramString.length() > maxLength) {
+                keySet.add(paramString);
+            }
 			return keySet;
 		}
 		return keySet;

src/main/java/com/uas/platform/b2b/dao/PurchaseForecastAllDao.java

@@ -11,7 +11,7 @@ import java.util.List;
  * 采购预单
  * 
  * @author hejq
- * @date 2018-08-21 12:32
+ * @date 2018-08-21 12:33
  */
 @Repository
 public interface PurchaseForecastAllDao  extends JpaSpecificationExecutor<PurchaseForecastAll>,

src/main/java/com/uas/platform/b2b/event/SaveEvent.java

@@ -1,69 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.context.ApplicationEvent;
-
-
-/**
- * 新增事件
- * 
- * @param <S>
- *            拆分后的关键词库
- * @param <T>
- *            原单据
- * 
- * @author yingp
- * 
- */
-public abstract class SaveEvent<S, T> extends ApplicationEvent {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	private List<T> savedList;
-
-	public SaveEvent(List<T> savedList) {
-		super(savedList);
-		this.savedList = savedList;
-	}
-
-	/**
-	 * @param userRepository
-	 *            用户信息dao接口
-	 * @return
-	 */
-	public final List<S> split() {
-		try {
-			pusher(savedList);
-		} catch (Exception e) {
-
-		}
-		List<S> splitList = new ArrayList<S>();
-		for (T saved : savedList) {
-            splitList.addAll(split(saved));
-        }
-		return splitList;
-	}
-
-	/**
-	 * 单条记录拆分多个关键字
-	 * 
-	 * @param saved
-	 * @return
-	 */
-	public abstract List<S> split(T saved);
-
-	/**
-	 * 推送消息
-	 * 
-	 * @param savedList
-	 * @param userRepository
-	 *            用户信息dao接口
-	 */
-	public abstract void pusher(List<T> savedList);
-
-}

src/main/java/com/uas/platform/b2b/filter/SecurityInterceptor.java

@@ -1,21 +1,18 @@
 package com.uas.platform.b2b.filter;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.uas.platform.b2b.manage.service.AccessTokenService;
+import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.service.EnterpriseService;
+import com.uas.platform.b2b.service.RoleService;
+import com.uas.platform.b2b.service.SigninLogService;
+import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.SecurityConstant;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.TrustedAuthenticationToken;
+import com.uas.platform.b2b.support.UserCreater;
+import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.util.AgentUtils;
+import com.uas.platform.core.util.encry.Md5Utils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -40,23 +37,11 @@ import org.springframework.security.web.context.HttpSessionSecurityContextReposi
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import com.uas.platform.b2b.manage.service.AccessTokenService;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.ResourceItem;
-import com.uas.platform.b2b.model.Role;
-import com.uas.platform.b2b.model.SigninLog;
-import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.service.EnterpriseService;
-import com.uas.platform.b2b.service.RoleService;
-import com.uas.platform.b2b.service.SigninLogService;
-import com.uas.platform.b2b.service.UserService;
-import com.uas.platform.b2b.support.SecurityConstant;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.support.TrustedAuthenticationToken;
-import com.uas.platform.b2b.support.UserCreater;
-import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.util.AgentUtils;
-import com.uas.platform.core.util.encry.Md5Utils;
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.*;
 
 /**
  * @date 2016年8月31日上午10:55:13
@@ -300,8 +285,9 @@ public class SecurityInterceptor extends AbstractSecurityInterceptor implements
                 }
 				user.setIp(AgentUtils.getIp(request));
 				request.getSession().setAttribute("user", user);
-			} else
-				throw new UsernameNotFoundException(username + " 账号或密码错误");
+			} else {
+                throw new UsernameNotFoundException(username + " 账号或密码错误");
+            }
 		}
 	}
 
@@ -323,8 +309,9 @@ public class SecurityInterceptor extends AbstractSecurityInterceptor implements
 			}
 			String type = request.getParameter(typeParam);
 			if ("manage".equals(type)) {
-				if (user != null && UserCreater.isVirtual(user))
-					return;
+				if (user != null && UserCreater.isVirtual(user)) {
+                    return;
+                }
 				Map<String, Object> data = accessTokenService.validFormManage(token);
 				if (data.containsKey("user") && data.containsKey("bind")) {
 					long enUU = Long.parseLong(data.get("bind").toString());

src/main/java/com/uas/platform/b2b/mobile/model/InquiryItem.java

@@ -1,10 +1,11 @@
 package com.uas.platform.b2b.mobile.model;
 
-import java.util.Date;
-
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.support.SystemSession;
 
+import java.util.Date;
+import java.util.Objects;
+
 /**
  * 平台里面，以供应商的角度来查看采购询价单明细
  * 
@@ -217,7 +218,7 @@ public class InquiryItem {
 		this.remark = purchaseInquiryItem.getRemark();
 		this.status = purchaseInquiryItem.getStatus();
 		// 取到多个企业的单据，需要切换供应商名字
-		if(purchaseInquiryItem.getVendUU() != SystemSession.getUser().getEnterprise().getUu()) {
+		if(!Objects.equals(purchaseInquiryItem.getVendUU(), SystemSession.getUser().getEnterprise().getUu())) {
 			SystemSession.getUser().setCurrentEnterprise(purchaseInquiryItem.getVendUU());
 		}
 		this.vendName = SystemSession.getUser().getEnterprise().getEnName();

src/main/java/com/uas/platform/b2b/mobile/model/Notice.java

@@ -1,10 +1,11 @@
 package com.uas.platform.b2b.mobile.model;
 
-import java.util.Date;
-
 import com.uas.platform.b2b.model.PurchaseNotice;
 import com.uas.platform.b2b.support.SystemSession;
 
+import java.util.Date;
+import java.util.Objects;
+
 /**
  * 移动端接口，平台里面，以供应商的角度来查看客户送货提醒
  * 
@@ -265,7 +266,7 @@ public class Notice{
 		this.status = notice.getStatus();
 		this.unit = notice.getOrderItem().getProduct().getUnit();
 		// 取到多个企业的单据，需要切换供应商名字
-		if(notice.getVendUU() != SystemSession.getUser().getEnterprise().getUu()) {
+		if(!Objects.equals(notice.getVendUU(), SystemSession.getUser().getEnterprise().getUu())) {
 			SystemSession.getUser().setCurrentEnterprise(notice.getVendUU());
 		}
 		this.vendName = SystemSession.getUser().getEnterprise().getEnName();

src/main/java/com/uas/platform/b2b/mobile/model/Purchase.java

@@ -1,12 +1,12 @@
 package com.uas.platform.b2b.mobile.model;
 
-import java.util.Date;
-
-import org.apache.commons.collections.CollectionUtils;
-
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderAllItem;
 import com.uas.platform.b2b.support.SystemSession;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.Date;
+import java.util.Objects;
 
 /**
  * 数据传送到移动端的轻量级实体类 <br>
@@ -175,7 +175,7 @@ public class Purchase {
 			}
 		}
 		// 取到多个企业的单据，需要切换供应商名字
-		if(order.getVendUU() != SystemSession.getUser().getEnterprise().getUu()) {
+		if(!Objects.equals(order.getVendUU(), SystemSession.getUser().getEnterprise().getUu())) {
 			SystemSession.getUser().setCurrentEnterprise(order.getVendUU());
 		}
 		this.vendName = SystemSession.getUser().getEnterprise().getEnName();

src/main/java/com/uas/platform/b2b/mobile/model/PurchaseChange.java

@@ -1,15 +1,15 @@
 package com.uas.platform.b2b.mobile.model;
 
-import java.util.Date;
-
-import org.apache.commons.collections.CollectionUtils;
-
 import com.uas.platform.b2b.model.PurchaseOrderChange;
 import com.uas.platform.b2b.model.PurchaseOrderChangeItem;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.NumberUtil;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.Date;
+import java.util.Objects;
 
 /**
  * 数据传送到移动端的轻量级实体类 <br>
@@ -211,8 +211,9 @@ public class PurchaseChange {
 	 * @param orderChange
 	 */
 	public PurchaseChange(PurchaseOrderChange orderChange) {
-		if (orderChange.getAgreed() != null && orderChange.getAgreed() == Constant.YES)
-			this.pc_agreed = Status.AGREED.getPhrase();
+		if (orderChange.getAgreed() != null && orderChange.getAgreed() == Constant.YES) {
+            this.pc_agreed = Status.AGREED.getPhrase();
+        }
 		this.pc_id = orderChange.getId();
 		this.pc_code = orderChange.getCode();
 		this.pc_currency = orderChange.getOldCurrency();
@@ -233,7 +234,7 @@ public class PurchaseChange {
 			this.pc_total = NumberUtil.formatDouble(this.pc_total, 2);
 		}
 		// 取到多个企业的单据，需要切换供应商名字
-		if(orderChange.getVendUU() != SystemSession.getUser().getEnterprise().getUu()) {
+		if(!Objects.equals(orderChange.getVendUU(), SystemSession.getUser().getEnterprise().getUu())) {
 			SystemSession.getUser().setCurrentEnterprise(orderChange.getVendUU());
 		}
 		this.vendName = SystemSession.getUser().getEnterprise().getEnName();

src/main/java/com/uas/platform/b2b/mobile/service/impl/BulletinCenterServiceImpl.java

@@ -1,21 +1,20 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
+import com.uas.platform.b2b.mobile.dao.BulletinCenterDao;
+import com.uas.platform.b2b.mobile.model.BulletinCenter;
+import com.uas.platform.b2b.mobile.service.BulletinCenterService;
+import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
-import com.uas.platform.b2b.mobile.dao.BulletinCenterDao;
-import com.uas.platform.b2b.mobile.model.BulletinCenter;
-import com.uas.platform.b2b.mobile.service.BulletinCenterService;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.model.PageParams;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 
 @Service
 public class BulletinCenterServiceImpl implements BulletinCenterService {
@@ -32,7 +31,8 @@ public class BulletinCenterServiceImpl implements BulletinCenterService {
 		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enuu", enuu);
 		Page<BulletinCenter> news = bulletinCenterDao.findAll(new Specification<BulletinCenter>() {
-			public Predicate toPredicate(Root<BulletinCenter> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<BulletinCenter> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);

src/main/java/com/uas/platform/b2b/mobile/service/impl/FeePleaseServiceImpl.java

@@ -1,39 +1,30 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-
 import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.mobile.dao.AppFlowOperationDao;
 import com.uas.platform.b2b.mobile.dao.ApprovalLogDao;
 import com.uas.platform.b2b.mobile.dao.FeePleaseDao;
 import com.uas.platform.b2b.mobile.dao.FeePleaseDetailDao;
 import com.uas.platform.b2b.mobile.enumeration.MobileStatus;
-import com.uas.platform.b2b.mobile.model.AppFlowOperation;
-import com.uas.platform.b2b.mobile.model.AppLog;
-import com.uas.platform.b2b.mobile.model.ApprovalLog;
-import com.uas.platform.b2b.mobile.model.FeePlease;
-import com.uas.platform.b2b.mobile.model.FeePleaseDetail;
+import com.uas.platform.b2b.mobile.model.*;
 import com.uas.platform.b2b.mobile.service.FeePleaseService;
 import com.uas.platform.b2b.model.FlowNode;
 import com.uas.platform.b2b.service.ApprovalFlowService;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Service
 public class FeePleaseServiceImpl implements FeePleaseService {
@@ -174,7 +165,7 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 					}
 				}
 			}
-			if (nodelevel == maxNode) {
+			if (Objects.equals(nodelevel, maxNode)) {
 				if (id != null) {
 					feePlease = feePleaseDao.findOne(id);
 					feePlease.setFp_status(MobileStatus.AUDITED.getPhrase());
@@ -198,6 +189,7 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 		pageInfo.filter("emcode", emcode);
 		pageInfo.filter("enuu", enuu);
 		Page<FeePlease> feePleases = feePleaseDao.findAll(new Specification<FeePlease>() {
+			@Override
 			public Predicate toPredicate(Root<FeePlease> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}

src/main/java/com/uas/platform/b2b/mobile/service/impl/MobileFlowServiceImpl.java

@@ -1,57 +1,32 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
 import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.dao.UserPositionDao;
-import com.uas.platform.b2b.mobile.dao.AppFlowOperationDao;
-import com.uas.platform.b2b.mobile.dao.ApprovalLogDao;
-import com.uas.platform.b2b.mobile.dao.FeePleaseDao;
-import com.uas.platform.b2b.mobile.dao.MobileAuditLogDao;
-import com.uas.platform.b2b.mobile.dao.SignAppDao;
-import com.uas.platform.b2b.mobile.dao.SignCardDao;
-import com.uas.platform.b2b.mobile.dao.VacationDao;
-import com.uas.platform.b2b.mobile.dao.WorkDailyDao;
-import com.uas.platform.b2b.mobile.dao.WorkOvertimeDao;
+import com.uas.platform.b2b.mobile.dao.*;
 import com.uas.platform.b2b.mobile.enumeration.MobileStatus;
-import com.uas.platform.b2b.mobile.model.AppFlowOperation;
-import com.uas.platform.b2b.mobile.model.ApprovalLog;
-import com.uas.platform.b2b.mobile.model.FeePlease;
-import com.uas.platform.b2b.mobile.model.MobileAuditLog;
-import com.uas.platform.b2b.mobile.model.SignApp;
-import com.uas.platform.b2b.mobile.model.SignCard;
-import com.uas.platform.b2b.mobile.model.Vacation;
-import com.uas.platform.b2b.mobile.model.WorkDaily;
-import com.uas.platform.b2b.mobile.model.WorkOvertime;
+import com.uas.platform.b2b.mobile.model.*;
 import com.uas.platform.b2b.mobile.service.MobileFlowService;
 import com.uas.platform.b2b.model.FlowNode;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.UserPosition;
 import com.uas.platform.b2b.service.ApprovalFlowService;
-import com.uas.platform.b2b.temporary.model.AuditInfoDone;
-import com.uas.platform.b2b.temporary.model.AuditInfoTodo;
-import com.uas.platform.b2b.temporary.model.MobileDocumentsProcess;
-import com.uas.platform.b2b.temporary.model.MobileNodes;
-import com.uas.platform.b2b.temporary.model.UserInfo;
+import com.uas.platform.b2b.temporary.model.*;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Service
 public class MobileFlowServiceImpl implements MobileFlowService {
@@ -106,6 +81,7 @@ public class MobileFlowServiceImpl implements MobileFlowService {
 		pageInfo.filter("enuu", enuu);
 		pageInfo.filter("statuscode", MobileStatus.UNAUDIT.name());
 		Page<AppFlowOperation> operations = appFlowOperationDao.findAll(new Specification<AppFlowOperation>() {
+			@Override
 			public Predicate toPredicate(Root<AppFlowOperation> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
@@ -145,6 +121,7 @@ public class MobileFlowServiceImpl implements MobileFlowService {
 		pageInfo.filter("enuu", enuu);
 		pageInfo.filter("statuscode", MobileStatus.AUDITED.name());
 		Page<AppFlowOperation> operations = appFlowOperationDao.findAll(new Specification<AppFlowOperation>() {
+			@Override
 			public Predicate toPredicate(Root<AppFlowOperation> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
@@ -283,7 +260,7 @@ public class MobileFlowServiceImpl implements MobileFlowService {
 								map.put("success", false);
 							}
 						}
-						if (op.getNodelevel() == maxNode) { // 如果为最后一个，原单据状态变为已审批
+						if (Objects.equals(op.getNodelevel(), maxNode)) { // 如果为最后一个，原单据状态变为已审批
 							if (op.getCaller().equals(MobileStatus.VACATION.getPhrase())) {// 请假单
 								Vacation va = vacationDao.findOne(op.getSourceid());
 								va.setVa_statuscode(MobileStatus.AUDITED.name());

src/main/java/com/uas/platform/b2b/mobile/service/impl/MobileTaskServiceImpl.java

@@ -1,21 +1,5 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.OfficeTaskDao;
 import com.uas.platform.b2b.dao.OfficeTaskReplyDao;
@@ -28,6 +12,20 @@ import com.uas.platform.b2b.model.OfficeTaskReply;
 import com.uas.platform.b2b.temporary.model.OfficeTaskInfo;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class MobileTaskServiceImpl implements MobileTaskService {
@@ -79,7 +77,8 @@ public class MobileTaskServiceImpl implements MobileTaskService {
 		pageInfo.filter("domancode", emuu);
 		pageInfo.filter("status", status);
 		Page<OfficeTask> officeTask = officeTaskDao.findAll(new Specification<OfficeTask>() {
-			public Predicate toPredicate(Root<OfficeTask> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<OfficeTask> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
@@ -167,7 +166,8 @@ public class MobileTaskServiceImpl implements MobileTaskService {
 		pageInfo.filter("uu", enuu);
 		pageInfo.filter("recordercode", emuu);
 		Page<OfficeTask> officeTask = officeTaskDao.findAll(new Specification<OfficeTask>() {
-			public Predicate toPredicate(Root<OfficeTask> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<OfficeTask> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);

src/main/java/com/uas/platform/b2b/mobile/service/impl/NewsCenterServiceImpl.java

@@ -1,21 +1,20 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
+import com.uas.platform.b2b.mobile.dao.NewsCenterDao;
+import com.uas.platform.b2b.mobile.model.NewsCenter;
+import com.uas.platform.b2b.mobile.service.NewsCenterService;
+import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
-import com.uas.platform.b2b.mobile.dao.NewsCenterDao;
-import com.uas.platform.b2b.mobile.model.NewsCenter;
-import com.uas.platform.b2b.mobile.service.NewsCenterService;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.model.PageParams;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 
 @Service
 public class NewsCenterServiceImpl implements NewsCenterService {
@@ -32,8 +31,9 @@ public class NewsCenterServiceImpl implements NewsCenterService {
 		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enuu", enuu);
 		Page<NewsCenter> news = newsCenterDao.findAll(new Specification<NewsCenter>() {
-			public Predicate toPredicate(Root<NewsCenter> root, CriteriaQuery<?> query,
-					CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<NewsCenter> root, CriteriaQuery<?> query,
+                                         CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);

src/main/java/com/uas/platform/b2b/mobile/service/impl/NoticeCenterServiceImpl.java

@@ -1,20 +1,19 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
+import com.uas.platform.b2b.mobile.dao.NoticeCenterDao;
+import com.uas.platform.b2b.mobile.model.NoticeCenter;
+import com.uas.platform.b2b.mobile.service.NoticeCenterService;
+import com.uas.platform.core.model.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
-import com.uas.platform.b2b.mobile.dao.NoticeCenterDao;
-import com.uas.platform.b2b.mobile.model.NoticeCenter;
-import com.uas.platform.b2b.mobile.service.NoticeCenterService;
-import com.uas.platform.core.model.PageInfo;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 
 @Service
 public class NoticeCenterServiceImpl implements NoticeCenterService {
@@ -30,7 +29,8 @@ public class NoticeCenterServiceImpl implements NoticeCenterService {
 		pageInfo.setPageNumber(pageNumber);
 		pageInfo.filter("enuu", enuu);
 		Page<NoticeCenter> news = noticeCenterDao.findAll(new Specification<NoticeCenter>() {
-			public Predicate toPredicate(Root<NoticeCenter> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<NoticeCenter> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);

src/main/java/com/uas/platform/b2b/mobile/service/impl/OutAddressServiceImpl.java

@@ -1,21 +1,20 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
+import com.uas.platform.b2b.mobile.dao.OutAddressDao;
+import com.uas.platform.b2b.mobile.model.OutAddress;
+import com.uas.platform.b2b.mobile.service.OutAddressService;
+import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
-import com.uas.platform.b2b.mobile.dao.OutAddressDao;
-import com.uas.platform.b2b.mobile.model.OutAddress;
-import com.uas.platform.b2b.mobile.service.OutAddressService;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.model.PageParams;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 
 @Service
 public class OutAddressServiceImpl implements OutAddressService {
@@ -55,7 +54,8 @@ public class OutAddressServiceImpl implements OutAddressService {
 		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enuu", enuu);
 		Page<OutAddress> news = outAddressDao.findAll(new Specification<OutAddress>() {
-			public Predicate toPredicate(Root<OutAddress> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<OutAddress> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);

src/main/java/com/uas/platform/b2b/mobile/service/impl/SignAppServiceImpl.java

@@ -1,26 +1,22 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
 import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.mobile.dao.AppFlowOperationDao;
 import com.uas.platform.b2b.mobile.dao.ApprovalLogDao;
 import com.uas.platform.b2b.mobile.dao.SignAppDao;
 import com.uas.platform.b2b.mobile.dao.SignCardDao;
 import com.uas.platform.b2b.mobile.enumeration.MobileStatus;
-import com.uas.platform.b2b.mobile.model.AppFlowOperation;
-import com.uas.platform.b2b.mobile.model.AppLog;
-import com.uas.platform.b2b.mobile.model.ApprovalLog;
-import com.uas.platform.b2b.mobile.model.SignApp;
-import com.uas.platform.b2b.mobile.model.SignCard;
+import com.uas.platform.b2b.mobile.model.*;
 import com.uas.platform.b2b.mobile.service.SignAppService;
 import com.uas.platform.b2b.model.FlowNode;
 import com.uas.platform.b2b.service.ApprovalFlowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Objects;
 
 @Service
 public class SignAppServiceImpl implements SignAppService {
@@ -134,7 +130,7 @@ public class SignAppServiceImpl implements SignAppService {
 					}
 				}
 			}
-			if (nodelevel == maxNode) {
+			if (Objects.equals(nodelevel, maxNode)) {
 				if (id != null) {
 					app = signAppDao.findOne(id);
 					app.setStatus(MobileStatus.AUDITED.getPhrase());

src/main/java/com/uas/platform/b2b/mobile/service/impl/SignCardLogServiceImpl.java

@@ -1,26 +1,24 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
 import com.uas.platform.b2b.mobile.dao.SignCardDao;
 import com.uas.platform.b2b.mobile.model.SignCard;
 import com.uas.platform.b2b.mobile.service.SignCardLogService;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 @Service
 public class SignCardLogServiceImpl implements SignCardLogService {
@@ -39,12 +37,14 @@ public class SignCardLogServiceImpl implements SignCardLogService {
 		pageInfo.filter("emcode", emcode);
 		pageInfo.filter("enuu", enuu);
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-		if (date != null)
-			pageInfo.expression(PredicateUtils.gte("cl_date", sdf.parse(date), false));
+		if (date != null) {
+            pageInfo.expression(PredicateUtils.gte("cl_date", sdf.parse(date), false));
+        }
 			pageInfo.expression(PredicateUtils.lt("cl_date", sdf.parse(String.valueOf(Long.valueOf(date) + 1)), false));
 
 		Page<SignCard> sigLogs = signCardDao.findAll(new Specification<SignCard>() {
-			public Predicate toPredicate(Root<SignCard> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<SignCard> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);

src/main/java/com/uas/platform/b2b/mobile/service/impl/VacationServiceImpl.java

@@ -1,19 +1,5 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
 import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.mobile.dao.AppFlowOperationDao;
 import com.uas.platform.b2b.mobile.dao.ApprovalLogDao;
@@ -28,6 +14,19 @@ import com.uas.platform.b2b.model.FlowNode;
 import com.uas.platform.b2b.service.ApprovalFlowService;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Objects;
 
 @Service
 public class VacationServiceImpl implements VacationService {
@@ -59,6 +58,7 @@ public class VacationServiceImpl implements VacationService {
 		pageInfo.filter("emcode", emcode);
 		pageInfo.filter("enuu", enuu);
 		Page<Vacation> vacations = vacationDao.findAll(new Specification<Vacation>() {
+			@Override
 			public Predicate toPredicate(Root<Vacation> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
@@ -172,7 +172,7 @@ public class VacationServiceImpl implements VacationService {
 					}
 				}
 			}
-			if (nodelevel == maxNode) {
+			if (Objects.equals(nodelevel, maxNode)) {
 				if (id != null) {// 更新单据状态
 					vacation = vacationDao.findOne(id);
 					vacation.setVa_status(MobileStatus.AUDITED.getPhrase());

src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkDailyServiceImpl.java

@@ -1,19 +1,5 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
 import com.uas.platform.b2b.dao.ApprovalFlowDao;
 import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.mobile.dao.AppFlowOperationDao;
@@ -30,6 +16,19 @@ import com.uas.platform.b2b.model.FlowNode;
 import com.uas.platform.b2b.service.ApprovalFlowService;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Objects;
 
 @Service
 public class WorkDailyServiceImpl implements WorkDailyService {
@@ -145,7 +144,7 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 
 				}
 			}
-			if (nodelevel == maxNode) {
+			if (Objects.equals(nodelevel, maxNode)) {
 				daily = workDailyDao.findOne(daily.getWd_id());
 				daily.setWd_status(MobileStatus.AUDITED.getPhrase());
 				daily.setWd_statuscode(MobileStatus.AUDITED.name());
@@ -167,6 +166,7 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 		pageInfo.filter("enuu", enuu);
 		pageInfo.filter("emcode", emcode);
 		Page<WorkDaily> workDaily = workDailyDao.findAll(new Specification<WorkDaily>() {
+			@Override
 			public Predicate toPredicate(Root<WorkDaily> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}

src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkOvertimeServiceImpl.java

@@ -1,39 +1,30 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-
 import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.mobile.dao.AppFlowOperationDao;
 import com.uas.platform.b2b.mobile.dao.ApprovalLogDao;
 import com.uas.platform.b2b.mobile.dao.WorkOvertimeDao;
 import com.uas.platform.b2b.mobile.dao.WorkOvertimeDetDao;
 import com.uas.platform.b2b.mobile.enumeration.MobileStatus;
-import com.uas.platform.b2b.mobile.model.AppFlowOperation;
-import com.uas.platform.b2b.mobile.model.AppLog;
-import com.uas.platform.b2b.mobile.model.ApprovalLog;
-import com.uas.platform.b2b.mobile.model.WorkOvertime;
-import com.uas.platform.b2b.mobile.model.WorkOvertimeDet;
+import com.uas.platform.b2b.mobile.model.*;
 import com.uas.platform.b2b.mobile.service.WorkOvertimeService;
 import com.uas.platform.b2b.model.FlowNode;
 import com.uas.platform.b2b.service.ApprovalFlowService;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Service
 public class WorkOvertimeServiceImpl implements WorkOvertimeService {
@@ -181,7 +172,7 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
 					}
 				}
 			}
-			if (nodelevel == maxNode) {
+			if (Objects.equals(nodelevel, maxNode)) {
 				workOvertime = workOvertimeDao.findOne(id);
 				workOvertime.setWo_status(MobileStatus.AUDITED.getPhrase());
 				workOvertime.setWo_statuscode(MobileStatus.AUDITED.name());
@@ -203,6 +194,7 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
 		pageInfo.filter("emcode", emcode);
 		pageInfo.filter("enuu", enuu);
 		Page<WorkOvertime> workOvertime = workOvertimeDao.findAll(new Specification<WorkOvertime>() {
+			@Override
 			public Predicate toPredicate(Root<WorkOvertime> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}

src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkScheduleServiceImpl.java

@@ -1,30 +1,26 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.mobile.dao.OutPlanDetailDao;
 import com.uas.platform.b2b.mobile.dao.UserCenterDao;
 import com.uas.platform.b2b.mobile.dao.VisitRecordDao;
 import com.uas.platform.b2b.mobile.enumeration.MobileStatus;
-import com.uas.platform.b2b.mobile.model.OutPlan;
-import com.uas.platform.b2b.mobile.model.OutPlanDetail;
-import com.uas.platform.b2b.mobile.model.UserCenter;
-import com.uas.platform.b2b.mobile.model.VisitRecord;
-import com.uas.platform.b2b.mobile.model.WorkSchedule;
+import com.uas.platform.b2b.mobile.model.*;
 import com.uas.platform.b2b.mobile.service.WorkScheduleService;
 import com.uas.platform.b2b.model.OfficeTask;
 import com.uas.platform.b2b.temporary.model.OutPlanInfo;
 import com.uas.platform.core.model.Constant;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 
 @Service
 public class WorkScheduleServiceImpl implements WorkScheduleService {
@@ -166,7 +162,7 @@ public class WorkScheduleServiceImpl implements WorkScheduleService {
 				List<VisitRecord> virecords = new ArrayList<VisitRecord>();
 				if (!CollectionUtils.isEmpty(records)) {
 					for (VisitRecord record : othrecords) {
-						if (record.getEmuu() != emcode) {
+						if (!Objects.equals(record.getEmuu(), emcode)) {
 							virecords.add(record);
 						}
 					}

src/main/java/com/uas/platform/b2b/model/ChangeAdmin.java

@@ -2,29 +2,16 @@
  */
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Cacheable;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.validation.constraints.NotNull;
-
+import com.alibaba.fastjson.annotation.JSONField;
+import com.uas.platform.core.model.Constant;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.uas.platform.core.model.Constant;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 更换管理员账号申请
@@ -291,18 +278,23 @@ public class ChangeAdmin implements Serializable {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
+		if (this == obj) {
+            return true;
+        }
+		if (obj == null) {
+            return false;
+        }
+		if (getClass() != obj.getClass()) {
+            return false;
+        }
 		ChangeAdmin other = (ChangeAdmin) obj;
 		if (uu == null) {
-			if (other.uu != null)
-				return false;
-		} else if (!uu.equals(other.uu))
-			return false;
+			if (other.uu != null) {
+                return false;
+            }
+		} else if (!uu.equals(other.uu)) {
+            return false;
+        }
 		return true;
 	}
 	

src/main/java/com/uas/platform/b2b/model/EnterpriseDetail.java

@@ -109,8 +109,9 @@ public class EnterpriseDetail {
 	public static List<EnterpriseDetail> getMembers(Collection<Enterprise> enterprises) {
 		if (!CollectionUtils.isEmpty(enterprises)) {
 			List<EnterpriseDetail> members = new ArrayList<EnterpriseDetail>();
-			for (Enterprise enterprise : enterprises)
-				members.add(new EnterpriseDetail(enterprise));
+			for (Enterprise enterprise : enterprises) {
+                members.add(new EnterpriseDetail(enterprise));
+            }
 			return members;
 		}
 		return null;

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItem.java

@@ -635,11 +635,13 @@ public class PurchaseInquiryItem extends AbstractOrderProduct {
         this.userCode = userCode;
     }
 
-	public String getProductUnit() {
+	@Override
+    public String getProductUnit() {
 		return productUnit;
 	}
 
-	public void setProductUnit(String productUnit) {
+	@Override
+    public void setProductUnit(String productUnit) {
 		this.productUnit = productUnit;
 	}
 

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItemTemp.java

@@ -356,11 +356,13 @@ public class PurchaseInquiryItemTemp extends AbstractOrderProduct {
 		this.userCode = userCode;
 	}
 
-	public Long getProductId() {
+	@Override
+    public Long getProductId() {
 		return productId;
 	}
 
-	public void setProductId(Long productId) {
+	@Override
+    public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 

src/main/java/com/uas/platform/b2b/model/PurchaseOrderCart.java

@@ -432,7 +432,9 @@ public class PurchaseOrderCart {
 	}
 
 	public Short getDisplay() {
-		if(this.display == null) this.display = 0;
+		if(this.display == null) {
+            this.display = 0;
+        }
 		return display;
 	}
 

src/main/java/com/uas/platform/b2b/model/QueriableMember.java

@@ -81,8 +81,9 @@ public class QueriableMember {
 	public static List<EnterpriseDetail> getMembers(Collection<Enterprise> enterprises) {
 		if (!CollectionUtils.isEmpty(enterprises)) {
 			List<EnterpriseDetail> members = new ArrayList<EnterpriseDetail>();
-			for (Enterprise enterprise : enterprises)
-				members.add(new EnterpriseDetail(enterprise));
+			for (Enterprise enterprise : enterprises) {
+                members.add(new EnterpriseDetail(enterprise));
+            }
 			return members;
 		}
 		return null;

src/main/java/com/uas/platform/b2b/model/Token.java

@@ -1,17 +1,11 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
+import java.io.Serializable;
+import java.util.*;
 
 @Entity(name = "sec$token")
 public class Token implements Serializable{
@@ -42,16 +36,18 @@ public class Token implements Serializable{
 		this.userType = type.toLowerCase();
 		this.uu = uu;
 		this.code = uuid();
-		if("mobile".equals(this.userType))
-			this.code = randomCode();
+		if("mobile".equals(this.userType)) {
+            this.code = randomCode();
+        }
 	}
 
 	public Token(UserType type, Long uu) {
 		this();
 		this.userType = type.toString();
 		this.uu = uu;
-		if("mobile".equals(this.userType))
-			this.code = randomCode();
+		if("mobile".equals(this.userType)) {
+            this.code = randomCode();
+        }
 	}
 
 	public Long getId() {

src/main/java/com/uas/platform/b2b/ps/PSHttpUtils.java

@@ -340,10 +340,11 @@ public class PSHttpUtils {
 	public static String getRequestUrl(String url, Map<String, Object> params, boolean sign)
 			throws UnsupportedEncodingException {
 		StringBuilder buf = new StringBuilder(url);
-		if (url.indexOf("?") == -1)
-			buf.append("?");
-		else if (!url.endsWith("&"))
-			buf.append("&");
+		if (url.indexOf("?") == -1) {
+            buf.append("?");
+        } else if (!url.endsWith("&")) {
+            buf.append("&");
+        }
 		// 如果是GET请求，则请求参数在URL中
 		if (params != null && !params.isEmpty()) {
 			Set<Entry<String, Object>> entrys = params.entrySet();
@@ -358,8 +359,9 @@ public class PSHttpUtils {
 			String message = buf.toString();
 			// 对请求串进行签名
 //			buf.append("&_signature=").append(HmacUtils.encode(message));
-		} else
-			buf.deleteCharAt(buf.length() - 1);
+		} else {
+            buf.deleteCharAt(buf.length() - 1);
+        }
 		return buf.toString();
 	}
 
@@ -570,8 +572,9 @@ public class PSHttpUtils {
 		os.close();
 		// 从服务器读取响应
 		String encoding = http.getContentEncoding();
-		if (encoding == null)
-			encoding = "UTF-8";
+		if (encoding == null) {
+            encoding = "UTF-8";
+        }
 		return StreamUtils.copyToString(http.getInputStream(), Charset.forName(encoding));
 	}
 
@@ -614,8 +617,9 @@ public class PSHttpUtils {
 		}
 
 		public static Response getResponse(HttpResponse response) throws IllegalStateException, IOException, Exception {
-			if (response != null)
-				return new Response(response);
+			if (response != null) {
+                return new Response(response);
+            }
 			return null;
 		}
 	}

src/main/java/com/uas/platform/b2b/service/impl/CartServiceImpl.java

@@ -64,6 +64,7 @@ public class CartServiceImpl implements CartService {
             pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
         }
 		Page<PurchaseOrderAll> ordersInfos = purchaseOrderAllDao.findAll(new Specification<PurchaseOrderAll>() {
+			@Override
 			public Predicate toPredicate(Root<PurchaseOrderAll> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
@@ -136,8 +137,9 @@ public class CartServiceImpl implements CartService {
 	@Override
 	public PurchaseOrderAll getCartDetail(Long id) {
 		List<PurchaseOrderAll> purchaseOrderAlls = purchaseOrderAllDao.findById(id);
-		if (purchaseOrderAlls.size() == 0)
-			throw new NotFoundException();
+		if (purchaseOrderAlls.size() == 0) {
+            throw new NotFoundException();
+        }
 		return purchaseOrderAlls.get(0);
 	}
 

src/main/java/com/uas/platform/b2b/service/impl/CustomerServiceImpl.java

@@ -3,7 +3,10 @@ package com.uas.platform.b2b.service.impl;
 import com.uas.platform.b2b.dao.CustomerDao;
 import com.uas.platform.b2b.dao.UserOrderDao;
 import com.uas.platform.b2b.dao.VendorDao;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Customer;
+import com.uas.platform.b2b.model.Role;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.service.CustomerService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -39,10 +42,12 @@ public class CustomerServiceImpl implements CustomerService {
 	@Autowired
     private VendorDao vendorDao;
 
-	public Page<Customer> findAllByPageInfo(final Long enUU, final PageInfo pageInfo) {
+	@Override
+    public Page<Customer> findAllByPageInfo(final Long enUU, final PageInfo pageInfo) {
 		Page<Customer> customers = customerDao.findAll(new Specification<Customer>() {
 
-			public Predicate toPredicate(Root<Customer> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<Customer> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				pageInfo.filter("myEnUU", enUU);
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
@@ -51,24 +56,28 @@ public class CustomerServiceImpl implements CustomerService {
 		return customers;
 	}
 
-	public List<Customer> findAllByCustUU(Long enUU, String custEnUUStr) {
+	@Override
+    public List<Customer> findAllByCustUU(Long enUU, String custEnUUStr) {
 		PredicateFactory<Customer> factory = new PredicateFactory<Customer>();
 		factory.add(PredicateUtils.eq("myEnUU", enUU, true));
 		factory.add(PredicateUtils.in("customerEnterprise.uu", custEnUUStr.split(","), true));
 		return customerDao.findAll(factory);
 	}
 
-	public Customer findCustomer(Long custId) {
+	@Override
+    public Customer findCustomer(Long custId) {
 		return customerDao.findOne(custId);
 	}
 
-	public Customer saveCustomer(User user, Customer customer) {
+	@Override
+    public Customer saveCustomer(User user, Customer customer) {
 		customer.setMyEnUU(user.getEnterprise().getUu());
 		customer.setMyUserUU(user.getUserUU());
 		return customerDao.saveAndLog(customer);
 	}
 
-	public List<Customer> saveCustomers(User user, List<Customer> customers) {
+	@Override
+    public List<Customer> saveCustomers(User user, List<Customer> customers) {
 		for (Customer customer : customers) {
 			customer.setMyUserUU(user.getUserUU());
 			customer.setMyEnUU(user.getEnterprise().getUu());
@@ -76,35 +85,42 @@ public class CustomerServiceImpl implements CustomerService {
 		return customerDao.saveAndLog(customers);
 	}
 
-	public Customer auditCustomer(User user, Customer customer) {
+	@Override
+    public Customer auditCustomer(User user, Customer customer) {
 		customer = customerDao.auditAndLog(customer);
 		return customer;
 	}
 
-	public List<Customer> auditCustomers(User user, List<Customer> customers) {
+	@Override
+    public List<Customer> auditCustomers(User user, List<Customer> customers) {
 		customers = customerDao.auditAndLog(customers);
 		return customers;
 	}
 
-	public Customer unAuditCustomer(User user, Customer customer) {
+	@Override
+    public Customer unAuditCustomer(User user, Customer customer) {
 		customer = customerDao.unAuditAndLog(customer);
 		return customer;
 	}
 
-	public List<Customer> unAuditCustomers(User user, List<Customer> customers) {
+	@Override
+    public List<Customer> unAuditCustomers(User user, List<Customer> customers) {
 		customers = customerDao.unAuditAndLog(customers);
 		return customers;
 	}
 
-	public void deleteCustomer(Customer customer) {
+	@Override
+    public void deleteCustomer(Customer customer) {
 		customerDao.deleteAndLog(customer);
 	}
 
-	public void deleteCustomers(List<Customer> customers) {
+	@Override
+    public void deleteCustomers(List<Customer> customers) {
 		customerDao.deleteAndLog(customers);
 	}
 
-	public void deleteCustomers(String custIds) {
+	@Override
+    public void deleteCustomers(String custIds) {
 		String[] vendors = custIds.split(",");
 		for (String vend : vendors) {
 			customerDao.deleteAndLog(Long.valueOf(vend));

src/main/java/com/uas/platform/b2b/service/impl/DeputyOrderServiceImpl.java

@@ -433,7 +433,8 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enuu", SystemSession.getUser().getEnterprise().getUu());
 		return deputyOrdersLogDao.findAll(new Specification<DeputyOrdersLog>() {
-			public Predicate toPredicate(Root<DeputyOrdersLog> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<DeputyOrdersLog> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
@@ -444,7 +445,8 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		return deputyLastOrderKeywordsDao.findByEnuu(SystemSession.getUser().getEnterprise().getUu());
 	}
 
-	public Integer getPurchaseDeputyUnreadCount(){
+	@Override
+    public Integer getPurchaseDeputyUnreadCount(){
 		return pagingReleaseCountDao.getUnreadCount(SystemSession.getUser().getEnterprise().getUu(),
 				SystemSession.getUser().getUserUU(), "purc", "PURC$DEPUTYORDERS");
 	}
@@ -487,12 +489,15 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 	}
 
 	private Page<DeputyOrder> findByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
-		if (filter.getFromDate() != null)
-			pageInfo.expression(PredicateUtils.gte("entrydate", new Date(filter.getFromDate()), false));
-		if (filter.getEndDate() != null)
-			pageInfo.expression(PredicateUtils.lte("entrydate", new Date(filter.getEndDate()), false));
+		if (filter.getFromDate() != null) {
+            pageInfo.expression(PredicateUtils.gte("entrydate", new Date(filter.getFromDate()), false));
+        }
+		if (filter.getEndDate() != null) {
+            pageInfo.expression(PredicateUtils.lte("entrydate", new Date(filter.getEndDate()), false));
+        }
 		return deputyOrderDao.findAll(new Specification<DeputyOrder>() {
-			public Predicate toPredicate(Root<DeputyOrder> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<DeputyOrder> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				pageInfo.filter("enuu", SystemSession.getUser().getEnterprise().getUu());
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}

src/main/java/com/uas/platform/b2b/service/impl/GuideSettingServiceImpl.java

@@ -31,8 +31,9 @@ public class GuideSettingServiceImpl implements GuideSettingService {
     @Override
     public void save(GuideSetting setting) {
        List<GuideSetting> settings = settingDao.findByUseruuAndName(setting.getUseruu(), setting.getName());
-       if(!CollectionUtils.isEmpty(settings))
+       if(!CollectionUtils.isEmpty(settings)) {
            setting.setId(settings.get(0).getId());
+       }
         settingDao.save(setting);
         logger.log(setting.getName(), "success", "设置" + setting.getName() + "状态为:" + setting.getStatus(), setting.getUseruu());
     }

src/main/java/com/uas/platform/b2b/service/impl/KindServiceImpl.java

@@ -20,7 +20,9 @@ public class KindServiceImpl implements KindService {
     public List<Kind> getChildProductKinds(Long parentid) throws Exception {
         String url = conf.getB2c() + "/api/product/kind/" + parentid + "/children";
         HttpUtil.Response res = HttpUtil.sendGetRequest(url, null);
-        if(res.getStatusCode() != 200) throw new Exception("查询类目信息失败");
+        if(res.getStatusCode() != 200) {
+            throw new Exception("查询类目信息失败");
+        }
         return JSONObject.parseArray(res.getResponseText(), Kind.class);
     }
 
@@ -28,7 +30,9 @@ public class KindServiceImpl implements KindService {
     public List<Kind> getAllChildProductKinds(Long parentid) throws Exception {
         String url = conf.getB2c() + "/api/product/kind/" + parentid +"/children";
         HttpUtil.Response res = HttpUtil.sendGetRequest(url, null);
-        if(res.getStatusCode() != 200) throw new Exception("查询类目信息失败");
+        if(res.getStatusCode() != 200) {
+            throw new Exception("查询类目信息失败");
+        }
         List<Kind> kinds = JSONObject.parseArray(JSONObject.toJSONString(res.getResponseText()), Kind.class);
         for (Kind kind : kinds) {
             if (!kind.isLeaf()) {
@@ -42,7 +46,9 @@ public class KindServiceImpl implements KindService {
     public List<Kind> findByNameCn(String name) throws Exception {
         String url = conf.getB2c() + "/api/product/kind/findByName/" + name;
         HttpUtil.Response res = HttpUtil.sendGetRequest(url, null);
-        if(res.getStatusCode() != 200) throw new Exception("查询类目信息失败");
+        if(res.getStatusCode() != 200) {
+            throw new Exception("查询类目信息失败");
+        }
         return JSONObject.parseArray(res.getResponseText(), Kind.class);
     }
 

src/main/java/com/uas/platform/b2b/service/impl/MakeOrderChangeServiceImpl.java

@@ -327,7 +327,8 @@ public class MakeOrderChangeServiceImpl implements MakeOrderChangeService {
 		return makeOrderChangeItemDao.countByVendUU(SystemSession.getUser().getEnterprise().getUu());
 	}
 
-	public Integer getUnreadCount() {
+	@Override
+    public Integer getUnreadCount() {
 		return pagingReleaseCountDao.getUnreadCount(SystemSession.getUser().getEnterprise().getUu(),
 				SystemSession.getUser().getUserUU(),"sale","MAKE$CHANGEITEMS");
 	}

src/main/java/com/uas/platform/b2b/service/impl/MakeOrderServiceImpl.java

@@ -294,6 +294,7 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 			}
 		}
 		Page<MakeOrder> pageOrders = makeOrderDao.findAll(new Specification<MakeOrder>() {
+			@Override
 			public Predicate toPredicate(Root<MakeOrder> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				Predicate[] predicates = pageInfo.getPredicates(root, query, builder);
 				if (filter != null && filter.getFromDelivery() != null) {
@@ -307,15 +308,20 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 	@Override
 	public Page<MakeOrderDone> findDoneByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
 		if (filter != null) {
-			if (StringUtils.hasText(filter.getKeyword()))
-			if (filter.getFromDate() != null)
-				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-			if (filter.getEndDate() != null)
-				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
-			if (!CollectionUtils.isEmpty(filter.getDistribute()))
-				pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+			if (StringUtils.hasText(filter.getKeyword())) {
+                if (filter.getFromDate() != null) {
+                    pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+                }
+            }
+			if (filter.getEndDate() != null) {
+                pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+            }
+			if (!CollectionUtils.isEmpty(filter.getDistribute())) {
+                pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+            }
 		}
 		Page<MakeOrderDone> pageOrders = makeOrderDoneDao.findAll(new Specification<MakeOrderDone>() {
+			@Override
 			public Predicate toPredicate(Root<MakeOrderDone> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
@@ -326,15 +332,20 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 	@Override
 	public Page<MakeOrderTodo> findTodoByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
 		if (filter != null) {
-			if (StringUtils.hasText(filter.getKeyword()))
-			if (filter.getFromDate() != null)
-				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-			if (filter.getEndDate() != null)
-				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
-			if (!CollectionUtils.isEmpty(filter.getDistribute()))
-				pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+			if (StringUtils.hasText(filter.getKeyword())) {
+                if (filter.getFromDate() != null) {
+                    pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+                }
+            }
+			if (filter.getEndDate() != null) {
+                pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+            }
+			if (!CollectionUtils.isEmpty(filter.getDistribute())) {
+                pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+            }
 		}
 		Page<MakeOrderTodo> pageOrders = makeOrderTodoDao.findAll(new Specification<MakeOrderTodo>() {
+			@Override
 			public Predicate toPredicate(Root<MakeOrderTodo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
@@ -345,15 +356,20 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 	@Override
 	public Page<MakeOrderEnd> findEndByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
 		if (filter != null) {
-			if (StringUtils.hasText(filter.getKeyword()))
-			if (filter.getFromDate() != null)
-				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-			if (filter.getEndDate() != null)
-				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
-			if (!CollectionUtils.isEmpty(filter.getDistribute()))
-				pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+			if (StringUtils.hasText(filter.getKeyword())) {
+                if (filter.getFromDate() != null) {
+                    pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+                }
+            }
+			if (filter.getEndDate() != null) {
+                pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+            }
+			if (!CollectionUtils.isEmpty(filter.getDistribute())) {
+                pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+            }
 		}
 		Page<MakeOrderEnd> pageOrders = makeOrderEndDao.findAll(new Specification<MakeOrderEnd>() {
+			@Override
 			public Predicate toPredicate(Root<MakeOrderEnd> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
@@ -364,15 +380,20 @@ public class MakeOrderServiceImpl implements MakeOrderService {
 	@Override
 	public Page<MakeOrder> findByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
 		if (filter != null) {
-			if (StringUtils.hasText(filter.getKeyword()))
-			if (filter.getFromDate() != null)
-				pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-			if (filter.getEndDate() != null)
-				pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
-			if (!CollectionUtils.isEmpty(filter.getDistribute()))
-				pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+			if (StringUtils.hasText(filter.getKeyword())) {
+                if (filter.getFromDate() != null) {
+                    pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+                }
+            }
+			if (filter.getEndDate() != null) {
+                pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+            }
+			if (!CollectionUtils.isEmpty(filter.getDistribute())) {
+                pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+            }
 		}
 		Page<MakeOrder> pageOrders = makeOrderDao.findAll(new Specification<MakeOrder>() {
+			@Override
 			public Predicate toPredicate(Root<MakeOrder> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}

src/main/java/com/uas/platform/b2b/service/impl/MessageServiceImpl.java

@@ -1,19 +1,18 @@
 package com.uas.platform.b2b.service.impl;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
+import com.uas.platform.b2b.dao.MessageDao;
+import com.uas.platform.b2b.model.Message;
+import com.uas.platform.b2b.service.MessageService;
+import com.uas.platform.core.model.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
-import com.uas.platform.b2b.dao.MessageDao;
-import com.uas.platform.b2b.model.Message;
-import com.uas.platform.b2b.service.MessageService;
-import com.uas.platform.core.model.PageInfo;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 
 @Service
 public class MessageServiceImpl implements MessageService {
@@ -25,7 +24,8 @@ public class MessageServiceImpl implements MessageService {
 	public Page<Message> findAllByPageInfo(final PageInfo pageInfo) {
 		return messageDao.findAll(new Specification<Message>() {
 
-			public Predicate toPredicate(Root<Message> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<Message> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}

src/main/java/com/uas/platform/b2b/service/impl/MonthProdioServiceImpl.java

@@ -1,15 +1,16 @@
 package com.uas.platform.b2b.service.impl;
-import java.util.List;
-import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.core.util.DateUtils;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.service.MonthProdioService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class MonthProdioServiceImpl implements MonthProdioService {
@@ -27,10 +28,12 @@ public class MonthProdioServiceImpl implements MonthProdioService {
 		}
 		StringBuilder builder = new StringBuilder(
 				"select * from v$month$prodio where month=? and enuu=10030463");
-		if (StringUtils.hasText(brand))
-			builder.append(" and pr_title like '%").append(brand).append("%'");
-		if (StringUtils.hasText(vendor))
-			builder.append(" and en_name like '%").append(vendor).append("%'");
+		if (StringUtils.hasText(brand)) {
+            builder.append(" and pr_title like '%").append(brand).append("%'");
+        }
+		if (StringUtils.hasText(vendor)) {
+            builder.append(" and en_name like '%").append(vendor).append("%'");
+        }
 		builder.append(" order by en_name,pr_code");
 		List<Map<String, Object>> result = commonDao.queryForList(
 				builder.toString(), month);

src/main/java/com/uas/platform/b2b/service/impl/NoticeServiceImpl.java

@@ -1,28 +1,25 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
 import com.uas.platform.b2b.dao.CommonDao;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.core.model.Constant;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
 import com.uas.platform.b2b.dao.NoticeBodyDao;
 import com.uas.platform.b2b.dao.NoticeDao;
 import com.uas.platform.b2b.model.Notice;
 import com.uas.platform.b2b.model.NoticeBody;
 import com.uas.platform.b2b.service.NoticeService;
 import com.uas.platform.core.exception.IllegalOperatorException;
+import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.List;
 
 @Service()
 public class NoticeServiceImpl implements NoticeService {
@@ -40,6 +37,7 @@ public class NoticeServiceImpl implements NoticeService {
 	public Page<Notice> findAllByPageInfo(final PageInfo pageInfo, final Long useruu) {
         Page<Notice> notices =  noticeDao.findAll(new Specification<Notice>() {
 
+			@Override
 			public Predicate toPredicate(Root<Notice> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
@@ -58,8 +56,9 @@ public class NoticeServiceImpl implements NoticeService {
 	@Override
 	public NoticeBody findNoticeBody(Long noticeId) {
 		List<NoticeBody> bodys = noticeBodyDao.findByNotice(noticeId);
-		if (bodys.size() > 0)
-			return bodys.get(0);
+		if (bodys.size() > 0) {
+            return bodys.get(0);
+        }
 		return null;
 	}
 

src/main/java/com/uas/platform/b2b/service/impl/PurcOrderChangeServiceImpl.java

@@ -1,15 +1,10 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.erp.model.PurchaseChange;
-import com.uas.platform.b2b.event.PurchaseOrderChangeSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.PurcOrderChangeService;
 import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.support.XingePusher;
-import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.CriterionExpression;
@@ -20,13 +15,15 @@ import com.uas.search.b2b.model.SPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.criteria.*;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import java.util.*;
 
 /**
@@ -260,6 +257,7 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
             }
         }
         return changeDao.findAll(new Specification<PurchaseOrderChange>() {
+            @Override
             public Predicate toPredicate(Root<PurchaseOrderChange> root, CriteriaQuery<?> query,
                                          CriteriaBuilder builder) {
                 return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryDetailServiceImpl.java

@@ -87,14 +87,18 @@ public class PurchaseInquiryDetailServiceImpl implements PurchaseInquiryDetailSe
 			final SearchFilter filter) {
 		Page<PurchaseInquiryDetail> inquiryitems = inquiryDetailDao
 				.findAll(new Specification<PurchaseInquiryDetail>() {
-			public Predicate toPredicate(Root<PurchaseInquiryDetail> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<PurchaseInquiryDetail> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				if (filter != null) {
-					if (!CollectionUtils.isEmpty(filter.getDistribute()))
-						pageInfo.expression(PredicateUtils.in("inquiry.enUU", filter.getDistribute(), false));
-					if (filter.getFromDate() != null)
-						pageInfo.expression(PredicateUtils.gte("inquiry.date", new Date(filter.getFromDate()), false));
-					if (filter.getEndDate() != null)
-						pageInfo.expression(PredicateUtils.lte("inquiry.date", new Date(filter.getEndDate()), false));
+					if (!CollectionUtils.isEmpty(filter.getDistribute())) {
+                        pageInfo.expression(PredicateUtils.in("inquiry.enUU", filter.getDistribute(), false));
+                    }
+					if (filter.getFromDate() != null) {
+                        pageInfo.expression(PredicateUtils.gte("inquiry.date", new Date(filter.getFromDate()), false));
+                    }
+					if (filter.getEndDate() != null) {
+                        pageInfo.expression(PredicateUtils.lte("inquiry.date", new Date(filter.getEndDate()), false));
+                    }
 				}
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
@@ -106,15 +110,19 @@ public class PurchaseInquiryDetailServiceImpl implements PurchaseInquiryDetailSe
 	public Page<PurchaseInquiryDetail> findAllByPageInfo(final PageInfo pageInfo, final String keyword,
 			final SearchFilter filter) {
 		return inquiryDetailDao.findAll(new Specification<PurchaseInquiryDetail>() {
-			public Predicate toPredicate(Root<PurchaseInquiryDetail> root, CriteriaQuery<?> query,
-					CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<PurchaseInquiryDetail> root, CriteriaQuery<?> query,
+                                         CriteriaBuilder builder) {
 				if (filter != null) {
-					if (!CollectionUtils.isEmpty(filter.getDistribute()))
-						pageInfo.expression(PredicateUtils.in("inquiry.enUU", filter.getDistribute(), false));
-					if (filter.getFromDate() != null)
-						pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-					if (filter.getEndDate() != null)
-						pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+					if (!CollectionUtils.isEmpty(filter.getDistribute())) {
+                        pageInfo.expression(PredicateUtils.in("inquiry.enUU", filter.getDistribute(), false));
+                    }
+					if (filter.getFromDate() != null) {
+                        pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+                    }
+					if (filter.getEndDate() != null) {
+                        pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+                    }
 				}
 				if (!StringUtils.isEmpty(keyword)) {
 					PageParams pageParams = new PageParams();

src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderServiceImpl.java

@@ -334,8 +334,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 	public PurchaseOrderAll findByCode(String code) {
 		List<PurchaseOrderAll> purchaseOrderAlls = purchaseOrderAllDao
 				.findByVendUUAndCode(SystemSession.getUser().getEnterprise().getUu(), code);
-		if (purchaseOrderAlls.size() == 0)
-			throw new NotFoundException(code);
+		if (purchaseOrderAlls.size() == 0) {
+            throw new NotFoundException(code);
+        }
 		return purchaseOrderAlls.get(0);
 	}
 

src/main/java/com/uas/platform/b2b/service/impl/PurchaseProofingServiceImpl.java

@@ -460,8 +460,9 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 	public Page<PurchaseProofingApproval> findApprovalsByPageInfo(final PageInfo pageInfo, final String keyword,
 			final Long fromDate, final Long endDate, final SearchFilter filter) {
 		if (filter != null) {
-			if (!CollectionUtils.isEmpty(filter.getDistribute()))
-				pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+			if (!CollectionUtils.isEmpty(filter.getDistribute())) {
+                pageInfo.expression(PredicateUtils.in("enUU", filter.getDistribute(), false));
+            }
 		}
 		if (StringUtils.hasText(keyword)) {
 			List<Object> lists = new ArrayList<>();
@@ -476,15 +477,18 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 			pageInfo.expression(PredicateUtils.in("id", lists, false));
 		}
 
-		if (fromDate != null)
-			pageInfo.expression(PredicateUtils.in("id", purchaseProofingApprovalDao
-					.findByFromDate(SystemSession.getUser().getEnterprise().getUu(), new Date(fromDate)), false));
-		if (endDate != null)
-			pageInfo.expression(PredicateUtils.in("id", purchaseProofingApprovalDao
-					.findByEndDate(SystemSession.getUser().getEnterprise().getUu(), new Date(endDate)), false));
+		if (fromDate != null) {
+            pageInfo.expression(PredicateUtils.in("id", purchaseProofingApprovalDao
+                    .findByFromDate(SystemSession.getUser().getEnterprise().getUu(), new Date(fromDate)), false));
+        }
+		if (endDate != null) {
+            pageInfo.expression(PredicateUtils.in("id", purchaseProofingApprovalDao
+                    .findByEndDate(SystemSession.getUser().getEnterprise().getUu(), new Date(endDate)), false));
+        }
 		return purchaseProofingApprovalDao.findAll(new Specification<PurchaseProofingApproval>() {
-			public Predicate toPredicate(Root<PurchaseProofingApproval> root, CriteriaQuery<?> query,
-					CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<PurchaseProofingApproval> root, CriteriaQuery<?> query,
+                                         CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);

src/main/java/com/uas/platform/b2b/service/impl/PurchaseTenderServiceImpl.java

@@ -333,6 +333,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     public Page<PurchaseTender> findOpen(PageInfo info) {
         return purchaseTenderDao.findAll(new Specification<PurchaseTender>() {
 
+            @Override
             public Predicate toPredicate(Root<PurchaseTender> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                 Predicate p1 = builder.equal(root.get("ifOpen"), Constant.YES);
                 Predicate p2 = builder.equal(root.get("isPublish"), Constant.YES);
@@ -879,12 +880,15 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     public SPage<PurchaseTender> findAllByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
         SPage<PurchaseTender> tenderSPage = new SPage<>();
         if (filter != null) {
-            if (filter.getFromDate() != null)
+            if (filter.getFromDate() != null) {
                 pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-            if (filter.getEndDate() != null)
+            }
+            if (filter.getEndDate() != null) {
                 pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+            }
         }
         org.springframework.data.domain.Page<PurchaseTender> tenders = purchaseTenderDao.findAll(new Specification<PurchaseTender>() {
+            @Override
             public Predicate toPredicate(Root<PurchaseTender> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                 return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
             }
@@ -902,12 +906,15 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         SPage<PurchaseTender> tenderSPage = new SPage<>();
         List<Long> tenderIds = new ArrayList<>();
         if (filter != null) {
-            if (filter.getFromDate() != null)
+            if (filter.getFromDate() != null) {
                 pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
-            if (filter.getEndDate() != null)
+            }
+            if (filter.getEndDate() != null) {
                 pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+            }
         }
         org.springframework.data.domain.Page<SaleTender> saleTenderPage = saleTenderDao.findAll(new Specification<SaleTender>() {
+            @Override
             public Predicate toPredicate(Root<SaleTender> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                 return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
             }

src/main/java/com/uas/platform/b2b/service/impl/QuestionServiceImpl.java

@@ -1,19 +1,18 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
 import com.uas.platform.b2b.core.util.CosineSimilarityAlgorithm;
 import com.uas.platform.b2b.dao.QuestionDao;
 import com.uas.platform.b2b.model.Question;
 import com.uas.platform.b2b.service.QuestionService;
 import com.uas.platform.core.model.PageInfo;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class QuestionServiceImpl implements QuestionService {
@@ -52,8 +51,9 @@ public class QuestionServiceImpl implements QuestionService {
 	@Override
 	public Question findById(Long questionId) {
 		List<Question> questions = questionDao.findQuestion(questionId);
-		if (questions.size() > 0)
-			return questions.get(0);
+		if (questions.size() > 0) {
+            return questions.get(0);
+        }
 		return null;
 	}
 
@@ -83,8 +83,9 @@ public class QuestionServiceImpl implements QuestionService {
 				result.add(questions.get(i));
 			}
 		}
-		if (result.size() > 0)
-			return result;
+		if (result.size() > 0) {
+            return result;
+        }
 		return null;
 	}
 

src/main/java/com/uas/platform/b2b/service/impl/ReportConfigServiceImpl.java

@@ -1,13 +1,12 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.uas.platform.b2b.dao.ReportConfigDao;
 import com.uas.platform.b2b.model.ReportConfig;
 import com.uas.platform.b2b.service.ReportConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 @Service
 public class ReportConfigServiceImpl implements ReportConfigService {
@@ -18,9 +17,9 @@ public class ReportConfigServiceImpl implements ReportConfigService {
 	@Override
 	public String getReportNameByEnuuAndPageName(Long enuu, String pagename) {
 		List<ReportConfig> configs = reportConfigDao.findByEnuuAndPagename(enuu, pagename);
-		if(configs.size() > 0)
-			return configs.get(0).getReportname();
-		else{
+		if(configs.size() > 0) {
+            return configs.get(0).getReportname();
+        } else{
 			configs = reportConfigDao.findByPagenameAndEnuuIsNull(pagename);
 			if(configs.size() > 0) {
 				return configs.get(0).getReportname();

src/main/java/com/uas/platform/b2b/service/impl/SaleQuotationServiceImpl.java

@@ -154,7 +154,8 @@ public class SaleQuotationServiceImpl implements SaleQuotationService {
 			}
 		}
 		Page<SaleQuotationAll> quotations = saleQuotationAllDao.findAll(new Specification<SaleQuotationAll>() {
-			public Predicate toPredicate(Root<SaleQuotationAll> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<SaleQuotationAll> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);

src/main/java/com/uas/platform/b2b/service/impl/SaleStatServiceImpl.java

@@ -1,31 +1,18 @@
 package com.uas.platform.b2b.service.impl;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
+import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.service.SaleStatService;
+import com.uas.platform.core.model.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
-import com.uas.platform.b2b.dao.CustSaleStatMonthDao;
-import com.uas.platform.b2b.dao.CustSaleStatYearDao;
-import com.uas.platform.b2b.dao.SaleStatDayDao;
-import com.uas.platform.b2b.dao.SaleStatMonthDao;
-import com.uas.platform.b2b.dao.SaleStatYearDao;
-import com.uas.platform.b2b.dao.SellerSaleStatMonthDao;
-import com.uas.platform.b2b.dao.SellerSaleStatYearDao;
-import com.uas.platform.b2b.model.CustSaleStatMonth;
-import com.uas.platform.b2b.model.CustSaleStatYear;
-import com.uas.platform.b2b.model.SaleStatDay;
-import com.uas.platform.b2b.model.SaleStatMonth;
-import com.uas.platform.b2b.model.SaleStatYear;
-import com.uas.platform.b2b.model.SellerSaleStatMonth;
-import com.uas.platform.b2b.model.SellerSaleStatYear;
-import com.uas.platform.b2b.service.SaleStatService;
-import com.uas.platform.core.model.PageInfo;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 
 @Service
 public class SaleStatServiceImpl implements SaleStatService {
@@ -55,7 +42,8 @@ public class SaleStatServiceImpl implements SaleStatService {
 	public Page<SaleStatDay> findDayByPageInfo(final PageInfo pageInfo) {
 		return saleStatDayDao.findAll(new Specification<SaleStatDay>() {
 
-			public Predicate toPredicate(Root<SaleStatDay> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<SaleStatDay> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}
@@ -66,7 +54,8 @@ public class SaleStatServiceImpl implements SaleStatService {
 	public Page<SaleStatMonth> findMonthByPageInfo(final PageInfo pageInfo) {
 		return saleStatMonthDao.findAll(new Specification<SaleStatMonth>() {
 
-			public Predicate toPredicate(Root<SaleStatMonth> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<SaleStatMonth> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}
@@ -77,7 +66,8 @@ public class SaleStatServiceImpl implements SaleStatService {
 	public Page<SaleStatYear> findYearByPageInfo(final PageInfo pageInfo) {
 		return saleStatYearDao.findAll(new Specification<SaleStatYear>() {
 
-			public Predicate toPredicate(Root<SaleStatYear> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<SaleStatYear> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}
@@ -88,7 +78,8 @@ public class SaleStatServiceImpl implements SaleStatService {
 	public Page<CustSaleStatMonth> findCustMonthByPageInfo(final PageInfo pageInfo) {
 		return custSaleStatMonthDao.findAll(new Specification<CustSaleStatMonth>() {
 
-			public Predicate toPredicate(Root<CustSaleStatMonth> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<CustSaleStatMonth> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}
@@ -99,7 +90,8 @@ public class SaleStatServiceImpl implements SaleStatService {
 	public Page<CustSaleStatYear> findCustYearByPageInfo(final PageInfo pageInfo) {
 		return custSaleStatYearDao.findAll(new Specification<CustSaleStatYear>() {
 
-			public Predicate toPredicate(Root<CustSaleStatYear> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<CustSaleStatYear> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}
@@ -110,7 +102,8 @@ public class SaleStatServiceImpl implements SaleStatService {
 	public Page<SellerSaleStatMonth> findSellerMonthByPageInfo(final PageInfo pageInfo) {
 		return sellerSaleStatMonthDao.findAll(new Specification<SellerSaleStatMonth>() {
 
-			public Predicate toPredicate(Root<SellerSaleStatMonth> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<SellerSaleStatMonth> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}
@@ -121,7 +114,8 @@ public class SaleStatServiceImpl implements SaleStatService {
 	public Page<SellerSaleStatYear> findSellerYearByPageInfo(final PageInfo pageInfo) {
 		return sellerSaleStatYearDao.findAll(new Specification<SellerSaleStatYear>() {
 
-			public Predicate toPredicate(Root<SellerSaleStatYear> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+			@Override
+            public Predicate toPredicate(Root<SellerSaleStatYear> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				query.where(pageInfo.getPredicates(root, query, builder));
 				return null;
 			}

src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -1,6 +1,5 @@
 package com.uas.platform.b2b.service.impl;
-import com.uas.sso.entity.UserView;
-import com.uas.sso.util.AccountUtils;
+
 import com.uas.message.mail.service.MailService;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.model.*;
@@ -16,12 +15,15 @@ import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.encry.Md5Utils;
 import com.uas.search.b2b.model.SPage;
+import com.uas.sso.entity.UserView;
+import com.uas.sso.util.AccountUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
+
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -554,11 +556,11 @@ public class UserServiceImpl implements UserService {
 				if (user != null) {
 					user.setUserPwd(Md5Utils.encode(newPwd, userUU));
 					// 用户没有绑定企业，随便设一个绑定企业
-					if (user.getEnterprise() == null)
-						user.setCurrentEnterprise();
+					if (user.getEnterprise() == null) {
+                        user.setCurrentEnterprise();
+                    }
 					try {
-						user = userDao.save(user);
-//						AccountUtils.resetPassword(user.getUserUU(), user.getEnterprise().getUu(), newPwd);
+						userDao.save(user);
 					} catch (Exception e) {
 						e.printStackTrace();
 						throw new RuntimeException(e.getMessage());
@@ -582,8 +584,9 @@ public class UserServiceImpl implements UserService {
 		} else if (keyWord.matches(UU_REGEXP)) { // 按UU号查找
 			user = findUserByUserUU(Long.parseLong(keyWord));
 		}
-		if (user == null)
-			throw new IllegalOperatorException("未查找到您输入账号的用户信息");
+		if (user == null) {
+            throw new IllegalOperatorException("未查找到您输入账号的用户信息");
+        }
 
 		UserInfo simpleUser = new UserInfo(user); // 将user重新封装为简单对象，只返回前台需要的用户信息
 		return simpleUser;
@@ -680,8 +683,9 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public void bindUserToMyEnterprise(Long userUU, Enterprise enter) {
 		User user = userDao.findOne(userUU);
-		if (user == null)
-			throw new IllegalArgumentException("不存在的用户！");
+		if (user == null) {
+            throw new IllegalArgumentException("不存在的用户！");
+        }
 
 		Set<Enterprise> enterprises = user.getEnterprises();
 		if (CollectionUtils.isEmpty(enterprises)) {

src/main/java/com/uas/platform/b2b/support/FileUploadHttp.java

@@ -47,10 +47,11 @@ public class FileUploadHttp {
         try {
             StringBuilder buf = new StringBuilder(url);
             if (params != null && !params.isEmpty()) {
-                if (url.indexOf("?") == -1)
+                if (url.indexOf("?") == -1) {
                     buf.append("?");
-                else if (!url.endsWith("&"))
+                } else if (!url.endsWith("&")) {
                     buf.append("&");
+                }
                 Set<Map.Entry<String, Object>> entrys = params.entrySet();
                 for (Map.Entry<String, Object> entry : entrys) {
                     buf.append(entry.getKey()).append("=").append(URLEncoder.encode(String.valueOf(entry.getValue()), "UTF-8")).append("&");
@@ -241,8 +242,9 @@ public class FileUploadHttp {
         }
 
         public static Response getResponse(HttpResponse response) throws IllegalStateException, IOException, Exception {
-            if (response != null)
+            if (response != null) {
                 return new Response(response);
+            }
             return null;
         }
     }

src/main/java/com/uas/platform/b2b/support/TokenService.java

@@ -19,8 +19,9 @@ public class TokenService {
 	public Token saveToken(Token token) {
 		synchronized (token.getUu()) {
 			List<Token> tokens = tokenDao.findByUuAndUserType(token.getUu(), token.getUserType());
-			if (!tokens.isEmpty())
-				tokenDao.delete(tokens);
+			if (!tokens.isEmpty()) {
+                tokenDao.delete(tokens);
+            }
 			token.setTime(new Date());
 			return tokenDao.save(token);
 		}
@@ -115,8 +116,9 @@ public class TokenService {
 	public void delete(String token) {
 		Token existToken = tokenDao.findByCode(token);
 		try {
-			if (null != existToken)
-				tokenDao.delete(existToken);
+			if (null != existToken) {
+                tokenDao.delete(existToken);
+            }
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/com/uas/platform/b2b/support/mq/PushUtils.java

@@ -1,13 +1,5 @@
 package com.uas.platform.b2b.support.mq;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.http.HttpStatus;
-
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.manage.model.AccountInfo;
@@ -18,6 +10,13 @@ import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.springframework.http.HttpStatus;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class PushUtils {
 
@@ -26,20 +25,23 @@ public class PushUtils {
 	private static SysConf sysConf;
 
 	private static UserBaseInfoDao getUserRepository() {
-		if (userRepository == null)
-			userRepository = ContextUtils.getBean(UserBaseInfoDao.class);
+		if (userRepository == null) {
+            userRepository = ContextUtils.getBean(UserBaseInfoDao.class);
+        }
 		return userRepository;
 	}
 
 	private static AccessTokenService getAccessTokenService() {
-		if (accessTokenService == null)
-			accessTokenService = ContextUtils.getBean(AccessTokenService.class);
+		if (accessTokenService == null) {
+            accessTokenService = ContextUtils.getBean(AccessTokenService.class);
+        }
 		return accessTokenService;
 	}
 
 	private static SysConf getSysConf() {
-		if (sysConf == null)
-			sysConf = ContextUtils.getBean(SysConf.class);
+		if (sysConf == null) {
+            sysConf = ContextUtils.getBean(SysConf.class);
+        }
 		return sysConf;
 	}
 
@@ -75,8 +77,9 @@ public class PushUtils {
 				try {
 					Map<String, Object> res = sendUserToManage(user, enUU);
 					Object imid = res.get("userImid");
-					if (imid != null)
-						user.setUserIMId(Long.parseLong(imid.toString()));
+					if (imid != null) {
+                        user.setUserIMId(Long.parseLong(imid.toString()));
+                    }
 					user = getUserRepository().save(user);
 				} catch (Exception e) {
 				}

src/main/java/com/uas/platform/b2b/v2/service/impl/EnterpriseServiceImpl.java

@@ -109,13 +109,10 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
 		if (isNew) {
 			final Long enUU = enterprise.getUu();
-			new Thread() {
-				@Override
-				public void run() {
-					enterpriseDao.callInitProcedure(enUU);
-					logger.log("企业信息", "企业初始化", "新注册企业初始化资料", enUU);
-				}
-			}.start();
+			ThreadUtils.task(() -> {
+			    enterpriseDao.callInitProcedure(enUU);
+                logger.log("企业信息", "企业初始化", "新注册企业初始化资料", enUU);
+			}).run();
 		}
 		return enterprise;
 	}
@@ -146,12 +143,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	    final Enterprise enterpriseInfo = enterpriseDao.save(enterprise);
 	    // 邀请记录链接注册，同步信息到邀请注册记录
         if (null != enterprise.getInviteUU() && null != enterprise.getInviteUserUU()) {
-            ThreadUtils.task(new Runnable() {
-                @Override
-                public void run() {
-                    mergeInvitation(enterpriseInfo);
-                }
-            });
+            ThreadUtils.task(() ->
+                mergeInvitation(enterpriseInfo)
+            ).run();
         }
 		return enterpriseInfo;
 	}