Merge branch 'dev' of ssh://10.10.101.21/source/platform-b2b

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

@@ -1,40 +1,31 @@
 package com.uas.platform.b2b.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import com.uas.sso.SSOConfig;
-import com.uas.sso.entity.UserAccount;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.UserInfo;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.sso.SSOConfig;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
+import com.uas.sso.entity.UserAccount;
+import org.springframework.http.HttpStatus;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
 
-import java.util.Collection;
-import java.util.Iterator;
-
-import static com.uas.platform.b2b.model.Token.UserType.user;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
+/**
+ * 登录信息验证
+ *
+ * @author hejq
+ */
 @RestController
 @RequestMapping("/authentication")
 public class AuthenticationController {
 
 	@RequestMapping(method = RequestMethod.GET, headers = "Accept=application/json")
-	@ResponseBody
 	@ResponseStatus(value = HttpStatus.OK)
 	public UserInfo getAuthentication(HttpSession session) {
 		if (SystemSession.getUser() == null) {
@@ -49,7 +40,6 @@ public class AuthenticationController {
 	 * @param enUU
 	 */
 	@RequestMapping(value = "/{enUU}")
-	@ResponseBody
 	public ModelMap switchEnterprise(HttpServletRequest request, HttpServletResponse response, @PathVariable("enUU") long enUU) {
 		User user = SystemSession.getUser();
 		user.setCurrentEnterprise(enUU);

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

@@ -74,7 +74,6 @@ public class BaseInfoController {
 	 * 查看自己的物料资料
 	 */
 	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<Product> getAllProductInfo(PageParams params, String keyword) {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（全部）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
@@ -96,7 +95,6 @@ public class BaseInfoController {
 	 * @return
 	 */
 	@RequestMapping(value = "/info/search", params = RequestState.STANDARD, method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<Product> getStandardProductInfo(PageParams params, String keyword) {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（标准）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
@@ -128,7 +126,6 @@ public class BaseInfoController {
 	 * @return
 	 */
 	@RequestMapping(value = "/info/search", params = RequestState.NONSTANDARD, method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<Product> getNonStandardProductInfo(PageParams params, String keyword) {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（非标准）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
@@ -157,7 +154,6 @@ public class BaseInfoController {
 	 * 查看自己的物料资料--不查询（全部）
 	 */
 	@RequestMapping(value = "/info/nosearch", method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<Product> getAllProduct(PageParams params, String keyword) {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（全部）");
 		PageInfo pageInfo = new PageInfo(params);
@@ -171,7 +167,6 @@ public class BaseInfoController {
 	 * 查看自己的物料资料--不查询（标准）
 	 */
 	@RequestMapping(value = "/info/nosearch", params = RequestState.STANDARD, method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<Product> getAllProductStandard(PageParams params, String keyword) {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（标准）");
 		PageInfo pageInfo = new PageInfo(params);
@@ -186,7 +181,6 @@ public class BaseInfoController {
 	 * 查看自己的物料资料--不查询（非标准）
 	 */
 	@RequestMapping(value = "/info/nosearch", params = RequestState.NONSTANDARD, method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<Product> getAllProductNonStandard(PageParams params, String keyword) {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（非标准）");
 		PageInfo pageInfo = new PageInfo(params);
@@ -201,7 +195,6 @@ public class BaseInfoController {
 	 * 通过id查看产品详情（由于权限问题将产品和物料接口分离）
 	 */
 	@RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
-	@ResponseBody
 	public Product getSaleProductInfoById(@PathVariable("id") Long id) {
 		return baseInfoService.findById(id);
 	}
@@ -214,7 +207,6 @@ public class BaseInfoController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value = "/edit/delete", method = RequestMethod.POST)
-	@ResponseBody
 	public ModelMap deleteById(@RequestBody Long id) throws Exception {
 		ModelMap map = new ModelMap();
 		try {
@@ -233,7 +225,6 @@ public class BaseInfoController {
 	 * @return
 	 */
 	@RequestMapping(value = "/getAttach/{id}", method = RequestMethod.GET)
-	@ResponseBody
 	public ModelMap getAttachById(@PathVariable("id") Long id) {
 		return baseInfoService.getAttachById(id);
 	}
@@ -245,7 +236,6 @@ public class BaseInfoController {
 	 * @return
 	 */
 	@RequestMapping(value = "/edit/updateProdInfo", method = RequestMethod.POST)
-	@ResponseBody
 	public ModelMap updateProdInfo(String prodInfo, FileUpload uploadItem) throws Exception {
 		Product productInfo = JSONObject.parseObject(prodInfo, Product.class);
 		logger.log("更新物料", "[" + SystemSession.getUser().getUserName() + "]更新了id为" + productInfo.getId() + "的["
@@ -260,7 +250,6 @@ public class BaseInfoController {
 	 * @return
 	 */
 	@RequestMapping(value = "/edit/addNewProduct", method = RequestMethod.POST)
-	@ResponseBody
 	public ModelMap addNewProduct(String prodInfo, FileUpload uploadItem) throws Exception {
 		Product productInfo = JSONObject.parseObject(prodInfo, Product.class);
 		return baseInfoService.addNewProduct(productInfo, uploadItem);

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

@@ -21,7 +21,10 @@ import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,7 +58,6 @@ public class CartController {
 	 * @return
 	 */
 	@RequestMapping(value = "/getCartList", method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<PurchaseOrderAll> getCartList(PageParams params, String searchFilter) {
 		return cartService.getCartList(params, searchFilter);
 	};
@@ -68,7 +70,6 @@ public class CartController {
 	 * @return
 	 */
 	@RequestMapping(value = "/cartList", method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<PurchaseOrderAll> getCarts(PageParams params, String searchFilter) {
 		logger.log("购物车", "查询购物车信息");
 		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
@@ -105,7 +106,6 @@ public class CartController {
 	 * @return
 	 */
 	@RequestMapping(value = "/addToOrder/{id}", method = RequestMethod.GET)
-	@ResponseBody
 	public ModelMap addToOrder(@PathVariable Long id) {
 		return cartService.addToOrder(id);
 	};
@@ -117,7 +117,6 @@ public class CartController {
 	 * @return
 	 */
 	@RequestMapping(value = "/deleteCart/{id}", method = RequestMethod.DELETE)
-	@ResponseBody
 	public ModelMap deleteCart(@PathVariable Long id) {
 		return cartService.deleteCart(id);
 	};
@@ -126,7 +125,6 @@ public class CartController {
 	 * 删除一条购物车明细
 	 */
 	@RequestMapping(value = "/deleteCartDetail/{id}", method = RequestMethod.DELETE)
-	@ResponseBody
 	public ModelMap deleteCartDetail(@PathVariable Long id) {
 		return cartService.deleteCartDetail(id);
 	};
@@ -137,7 +135,6 @@ public class CartController {
 	 * @return
 	 */
 	@RequestMapping(value = "/deleteCarts", method = RequestMethod.DELETE)
-	@ResponseBody
 	public ModelMap deleteCarts() {
 		return cartService.deleteCarts();
 	};
@@ -149,7 +146,6 @@ public class CartController {
 	 * @return
 	 */
 	@RequestMapping(value = "/getCartDetail/{id}", method = RequestMethod.GET)
-	@ResponseBody
 	public PurchaseOrderAll getCartDetail(@PathVariable Long id) {
 		return cartService.getCartDetail(id);
 	}
@@ -160,7 +156,6 @@ public class CartController {
 	 * @return
 	 */
 	@RequestMapping(value = "/vendorInfo", method = RequestMethod.GET)
-	@ResponseBody
 	private List<Vendor> getVendorInfo() {
 		return cartService.getVendorInfo();
 	}
@@ -170,7 +165,6 @@ public class CartController {
 	 * @return
 	 */
 	@RequestMapping(value = "/countTodo", method = RequestMethod.GET)
-	@ResponseBody
 	public ModelMap getCartTodoCount () {
 		ModelMap map = new ModelMap();
 		map.put("cartTodo", cartService.getCartTodoCount());

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

@@ -1,12 +1,14 @@
 package com.uas.platform.b2b.controller;
 
 import com.uas.platform.b2b.model.Component;
-import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ComponentService;
 import com.uas.platform.core.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -16,19 +18,14 @@ import javax.servlet.http.HttpServletRequest;
  * @author hejq
  * @time 创建时间：2016年12月27日
  */
-
 @RestController
 @RequestMapping("/product/component")
 public class ComponentController {
 
-	@Autowired
-	private SearchService searchService;
-
 	@Autowired
 	private ComponentService componentService;
 
 	@RequestMapping(value = "/cmplist/{kindId}", method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<Component> getCmpListByKindId(@PathVariable("kindId") Long kindId, PageParams params, String keyword) {
 		return null;
 	}

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

@@ -1,19 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-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.Customer;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.CustomerService;
@@ -22,7 +8,21 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
+/**
+ * 客户信息
+ *
+ * @author hejq
+ */
 @SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/sale/customers")

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

@@ -10,7 +10,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * Created by hejq on 2017-12-06.
+ * 代采订单默认值查询
+ *
+ * @author hejq
+ * @date 2017-12-06
  */
 @RequestMapping(value = "/deputy")
 @RestController
@@ -22,7 +25,8 @@ public class DeputyDefaultValueController {
 	/**
 	 * 通过代采企业UU号查询对应字段的值
 	 *
-	 * @param enuukey
+	 * @param enuu 企业UU
+	 * @param key 关键字
 	 * @return
 	 */
 	@RequestMapping(value = "/getKeyValue", method = RequestMethod.GET)

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

@@ -98,13 +98,13 @@ public class DeputyOrderController {
 		ModelMap map = new ModelMap();
 		String fileName = uploadItem.getFile().getOriginalFilename();
 		String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
-		InputStream is = null;
-		Workbook workbook = null;
+		InputStream is;
+		Workbook workbook;
 		try {
 			is = uploadItem.getFile().getInputStream();
-			if ("xls".equals(suffix)) {
+			if (JxlsExcelView.EXCEL_XLS.equals(suffix)) {
 				workbook = new HSSFWorkbook(is);
-			} else if ("xlsx".equals(suffix)) {
+			} else if (JxlsExcelView.EXCEL_XLSX.equals(suffix)) {
 				workbook = new XSSFWorkbook(is);
 			} else {
 				throw new IllegalOperatorException("文件格不正确，请上传.xls或.xlsx的文件");
@@ -125,6 +125,7 @@ public class DeputyOrderController {
 	 */
 	@RequestMapping(value = "/edit/saveDeOrder", method = RequestMethod.POST)
 	public ModelMap saveDeOrder(@RequestBody DeputyOrder deorder) {
+		logger.log("代采订单", "保存代采订单[" + deorder.getCode() + "]");
 		return deputyOrderService.saveDeOrder(deorder);
 	}
 
@@ -136,6 +137,7 @@ public class DeputyOrderController {
 	 */
 	@RequestMapping(value = "/submit/saveDeOrder", method = RequestMethod.POST)
 	public ModelMap submitDeOrder(@RequestBody DeputyOrder deorder) {
+        logger.log("代采订单", "提交生成代采订单[" + deorder.getCode() + "]");
 		return deputyOrderService.saveDeOrder(deorder);
 	}
 
@@ -346,6 +348,7 @@ public class DeputyOrderController {
 	 */
 	@RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
 	private DeputyOrder getOrderDetail(@PathVariable Long id) {
+        logger.log("代采订单", "查询代采订单详情[" + id + "]");
 		return deputyOrderService.getOrderDetail(id);
 	}
 	
@@ -354,6 +357,7 @@ public class DeputyOrderController {
 	 */
 	@RequestMapping(value = "/deleteProdById/{id}", method = RequestMethod.DELETE)
 	private ModelMap deleteProdById(@PathVariable Long id) {
+        logger.log("代采订单", "删除代采订单明细行[" + id + "]");
 		return deputyOrderService.deleteProdById(id);
 	}
 
@@ -365,6 +369,7 @@ public class DeputyOrderController {
 	 */
 	@RequestMapping(value = "/edit/clearOrder/{id}", method = RequestMethod.POST)
 	private ModelMap clearOrder(@PathVariable Long id) {
+        logger.log("代采订单", "删除代采订单[" + id + "]");
 		return deputyOrderService.clearOrder(id);
 	}
 
@@ -374,7 +379,6 @@ public class DeputyOrderController {
 	 * @return
 	 */
 	@RequestMapping(value = "/printCount/permission", method = RequestMethod.POST)
-	@ResponseBody
 	public ModelMap printPermission() {
 		return new ModelMap("success", true);
 	}
@@ -387,7 +391,6 @@ public class DeputyOrderController {
 	 * @return
 	 */
 	@RequestMapping(value = "/printCount/{id}", method = RequestMethod.POST)
-	@ResponseBody
 	public ResponseEntity<String> printCount(@PathVariable("id") Long id) {
 		deputyOrderService.print(id);
 		logger.log("客户代采订单", "打印代采订单", id.toString());
@@ -421,8 +424,8 @@ public class DeputyOrderController {
 	 * 获取供应商
 	 */
 	@RequestMapping(value = "/vendors", method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<Vendor> getVendors(PageParams params, String keyword, Long enuu) {
+        logger.log("代采订单", "查询供应商[" + enuu + "]");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("ve_myenuu", enuu);
 		List<Sort> sortList = new ArrayList<>();
@@ -434,12 +437,13 @@ public class DeputyOrderController {
 	/**
 	 * 获取付款企业
 	 * 
-	 * @param enuu
-	 * @return
+	 * @param enuu 代采企业UU
+	 * @return List<DeputyPaymentCompany>
+     *     @see DeputyPaymentCompany
 	 */
 	@RequestMapping(value = "/paycompanies/{enuu}", method = RequestMethod.GET)
-	@ResponseBody
 	public List<DeputyPaymentCompany> getList(@PathVariable Long enuu) {
+        logger.log("代采订单", "查询付款企业[" + enuu + "]");
 		return deputyOrderService.getList(enuu);
 	}
 	
@@ -450,9 +454,9 @@ public class DeputyOrderController {
 	 * @return
 	 */
 	@RequestMapping(value = "/savePayCompanies", method = RequestMethod.POST)
-	@ResponseBody
 	public DeputyPaymentCompany savePayCompanies(@RequestBody String pay) {
 		DeputyPaymentCompany payCompany = JSON.parseObject(pay, DeputyPaymentCompany.class);
+        logger.log("代采订单", "保存付款企业信息[" + payCompany.getEnname() + "]");
 		return deputyOrderService.savePayCompanies(payCompany);
 	}
 
@@ -462,8 +466,8 @@ public class DeputyOrderController {
 	 * @param id
 	 */
 	@RequestMapping(value = "/removePayCompany/{id}", method = RequestMethod.DELETE)
-	@ResponseBody
 	public void removePayCompany(@PathVariable Long id) {
+        logger.log("代采订单", "删除付款企业信息", null, null, id);
 		deputyOrderService.removePayCompany(id);
 	}
 
@@ -473,7 +477,6 @@ public class DeputyOrderController {
 	 * @return
 	 */
 	@RequestMapping(value = "/isDeputyEnterprise", method = RequestMethod.GET)
-	@ResponseBody
 	public ModelMap isDeputyEnterprise() {
 		return deputyOrderService.isDeputyEnterprise();
 	}
@@ -485,7 +488,6 @@ public class DeputyOrderController {
 	 * @return
 	 */
 	@RequestMapping(value = "/checkOrders", method = RequestMethod.GET)
-	@ResponseBody
 	public ModelMap checkOrders(String salecode, Long deputyuu) {
 		return deputyOrderService.checkOrders(salecode, deputyuu);
 	}
@@ -496,9 +498,9 @@ public class DeputyOrderController {
 	 * @return
 	 */
 	@RequestMapping(value = "/hisvendors", method = RequestMethod.GET)
-	@ResponseBody
 	public List<DeputyHisVendors> getHisVendors() {
-		return deputyOrderService.getHisVendors();
+        logger.log("代采订单", "获取代采的历史供应商");
+        return deputyOrderService.getHisVendors();
 	}
 
 	/**
@@ -507,7 +509,6 @@ public class DeputyOrderController {
 	 * @return
 	 */
 	@RequestMapping(value = "/hisKeywords", method = RequestMethod.GET)
-	@ResponseBody
 	public DeputyOrderKeywords getHisKeywords(String tervendor) {
 		return deputyOrderService.getKeywords(tervendor);
 	}
@@ -518,7 +519,6 @@ public class DeputyOrderController {
 	 * @return
 	 */
 	@RequestMapping(value = "/lastKeywords", method = RequestMethod.GET)
-	@ResponseBody
 	public DeputyLastOrderKeywords getLastKeywords(String tervendor) {
 		return deputyOrderService.getLastKeywords();
 	}
@@ -529,7 +529,6 @@ public class DeputyOrderController {
 	 * @return
 	 */
 	@RequestMapping(value = "/repetitions", method = RequestMethod.GET)
-	@ResponseBody
 	public Page<DeputyOrdersLog> getRepetitions(PageParams params, String keyword) {
 		return deputyOrderService.getRepetitions(params, keyword);
 	}
@@ -541,9 +540,9 @@ public class DeputyOrderController {
 	 * @return
 	 */
 	@RequestMapping(value = "/edit/copyorder/{id}", method = RequestMethod.POST)
-	@ResponseBody
 	public ModelMap copyOrder(@PathVariable("id") Long id) {
-		return deputyOrderService.copyOrder(id);
+        logger.log("代采订单", "复制代采订单", null, null, id);
+        return deputyOrderService.copyOrder(id);
 	}
 
 	/**
@@ -656,7 +655,8 @@ public class DeputyOrderController {
 	 */
 	@RequestMapping(value = "/approve/{uu}", method = RequestMethod.GET)
 	public ModelMap getApprove(@PathVariable("uu") Long uu, String code) throws Exception {
-		List<MasterInfo> masterInfos = masterService.findWebsiteAndUserByUU(uu);
+        logger.log("代采订单", "获取审批流信息[" + code + "]");
+        List<MasterInfo> masterInfos = masterService.findWebsiteAndUserByUU(uu);
 		ModelMap map = new ModelMap();
 		if (CollectionUtils.isEmpty(masterInfos)) {
 			throw new NotFoundException("网址");

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

@@ -5,7 +5,6 @@ import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.model.InvitationRecord;
 import com.uas.platform.b2b.publicapi.service.InviteRecordService;
-import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.InvitationRecordService;
 import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.b2b.support.SystemSession;
@@ -39,9 +38,6 @@ public class InvitationRecordController {
 	@Autowired
 	private InvitationRecordService invitationRecordService;
 
-	@Autowired
-	private SearchService searchService;
-
     private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
     @Autowired

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.controller;
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -30,7 +31,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -131,9 +131,8 @@ public class MakeAcceptController {
 		PageParams params = new PageParams();
 		params.setPage(1);
 		params.setCount(JxlsExcelView.MAX_SIZE);
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		SearchFilter filter = new SearchFilter();
 		filter.setKeyword(keyword);
 		filter.setFromDate(fromDate);

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.controller;
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.MakeOrderChangeItem;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -31,7 +32,6 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -149,9 +149,8 @@ public class MakeOrderChangeController {
 		PageParams params = new PageParams();
 		params.setCount(JxlsExcelView.MAX_SIZE);
 		params.setPage(1);
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		modelAndView.addObject("state", "全部");
 		modelAndView.addObject("data", getReceivedPurchaseOrderChanges(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeChange", "委外变更单列表_全部"));

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.controller;
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.MakeOrder;
 import com.uas.platform.b2b.model.MakeOrderReply;
 import com.uas.platform.b2b.model.SearchFilter;
@@ -34,7 +35,6 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -326,9 +326,8 @@ public class MakeOrderController {
 	public ModelAndView exportOrders(PageParams params, String searchFilter) {
 		params.setPage(1);
 		params.setCount(SearchConstants.TOP_NUM);
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		modelAndView.addObject("state", "全部");
 		modelAndView.addObject("data", getAllMakeOrders(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOrder", "委外加工单列表_全部"));
@@ -346,9 +345,8 @@ public class MakeOrderController {
 	public ModelAndView exportTodoOrders(PageParams params, String searchFilter) {
 		params.setPage(1);
 		params.setCount(SearchConstants.TOP_NUM);
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		modelAndView.addObject("state", "待回复");
 		modelAndView.addObject("data", getToDoMakeOrders(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOrder", "委外加工单列表 _待回复"));
@@ -366,9 +364,8 @@ public class MakeOrderController {
 	public ModelAndView exportDoneOrders(PageParams params, String searchFilter) {
 		params.setPage(1);
 		params.setCount(SearchConstants.TOP_NUM);
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		modelAndView.addObject("state", "已回复");
 		modelAndView.addObject("data", getDoneMakeOrders(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOrder", "委外加工单列表_已回复"));
@@ -386,9 +383,8 @@ public class MakeOrderController {
 	public ModelAndView exportEndOrders(PageParams params, String searchFilter) {
 		params.setPage(1);
 		params.setCount(SearchConstants.TOP_NUM);
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		modelAndView.addObject("state", "已结案");
 		modelAndView.addObject("data", getEndMakeOrders(params, searchFilter).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOrder", "委外加工单列表_已结案"));

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

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.MakeOrder;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -27,7 +28,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -138,9 +138,8 @@ public class MakeOutOrderController {
 		searchPageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		List<MakeOrder> makeOrders =  searchService.searchMakeOrderIds(keyword, searchPageParams).getContent();
 
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		modelAndView.addObject("state", "全部");
 		modelAndView.addObject("data", makeOrders);
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeOutOrder", "委外加工单列表_全部"));

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

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.MakeReturn;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -28,7 +29,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -127,9 +127,8 @@ public class MakeReturnController {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("date", Direction.DESC);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		modelAndView.addObject("data",
 				makeReturnService.findAllByPageInfo(pageInfo, keyword, fromDate, endDate).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/make/makeReturn", "委外验退单列表"));

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

@@ -28,7 +28,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -340,7 +339,7 @@ public class ProductController {
 	@RequestMapping(value = "/matchResult/info", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getAllProduct(PageParams params, String keyword) {
-		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了物料信息（全部）");
+		logger.log("查看产品", "查看物料信息（全部）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("matchstatus", Status.SUBMITTED.value());
 		pageInfo.filter("b2cEnabled", Constant.YES);
@@ -353,7 +352,7 @@ public class ProductController {
 	@RequestMapping(value = "/matchResult/info", params = RequestState.STANDARD, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getAllProductStandard(PageParams params, String keyword) {
-		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了物料信息（标准）");
+		logger.log("查看产品", "查看物料信息（标准）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isSale", Constant.YES);
 		pageInfo.filter("matchstatus", Status.SUBMITTED.value());
@@ -366,7 +365,7 @@ public class ProductController {
 	@RequestMapping(value = "/matchResult/info", params = RequestState.NONSTANDARD, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getAllProductNonStandard(PageParams params, String keyword) {
-		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了物料信息（非标准）");
+		logger.log("查看产品", "查看物料信息（非标准）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isPurchase", Constant.YES);
 		pageInfo.filter("matchstatus", Status.SUBMITTED.value());

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

@@ -33,7 +33,8 @@ import java.util.Map;
 /**
  * 用户个人产品库
  *
- * Created by hejq on 2017-11-08.
+ * @author hejq
+ * @date 2017-11-08
  */
 @RequestMapping(value = "/productuser")
 @RestController

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

@@ -22,7 +22,8 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 公共询价（针对供应商）
  *
- * Created by hejq on 2018-01-06.
+ * @author hejq
+ * @date 2018-01-06
  */
 @RequestMapping("/sale/pubInquiry")
 @RestController

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

@@ -24,7 +24,8 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 公共询价（针对客户）
  *
- * Created by hejq on 2018-01-08.
+ * @author hejq
+ * @date 2018-01-08
  */
 @RequestMapping("/purc/pubInquiry")
 @RestController

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.ps.InquiryUtils;
 import com.uas.platform.b2b.service.CustomerService;
@@ -26,14 +27,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 首页公共询价列表数据
  *
- * Created by hejq on 2018-01-17.
+ * @author hejq
+ * @date 2018-01-17
  */
 @RequestMapping("/pubInquiry")
 @RestController
@@ -162,15 +163,23 @@ public class PubInquiryListController {
         filter.setEndDate(endDate);
         filter.setKeyword(keyword);
         filter.setUserUU(SystemSession.getUser().getUserUU());
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
         ModelAndView modelAndView = new ModelAndView();
-        modelAndView.addObject("dateFormat", dateFormat);
-        if (StringUtils.isEmpty(state) || state.equals("all")) {
+        modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
+        // 全部
+        String allState = "all";
+        // 客户
+        String customerState = "customer";
+        // 个人商机
+        String remindState = "remind";
+        // 企业商机
+        String enterpirseState = "enterprise";
+        if (StringUtils.isEmpty(state) || allState.equals(state)) {
             modelAndView.addObject("state", "全部");
             modelAndView.addObject("data", enquiryService.fingByPageInfo(pageInfo, filter, null).getContent());
             modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/public/publicInquiry", "公共询价单列表"));
             logger.log("公共询价单", "导出Excel列表", "导出公共询价列表（全部）");
-        } else if (state.equals("customer")) {// 导出客户询价列表
+        } else if (customerState.equals(state)) {
+            // 导出客户询价列表
             modelAndView.addObject("state", "我的客户询价");
             List<Long> uuList = customerService.getCustomerDistribute();
             if (CollectionUtils.isEmpty(uuList)) {
@@ -179,14 +188,15 @@ public class PubInquiryListController {
             modelAndView.addObject("data", enquiryService.fingByPageInfo(pageInfo, filter, uuList).getContent());
             modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/public/publicInquiry", "客户公共询价列表"));
             logger.log("公共询价单", "导出Excel列表", "导出我的客户询价列表");
-        } else if (state.equals("remind")) {
+        } else if (remindState.equals(state)) {
             modelAndView.addObject("state", "个人商机询价列表");
             List<InquiryRemind> reminds = InquiryUtils.getRemind(pageInfo, filter, SystemSession.getUser().getUserUU(), SystemSession.getUser().getEnterprise().getUu()).getContent();
             modelAndView.addObject("data", !CollectionUtils.isEmpty(reminds) ? reminds : new ArrayList<InquiryRemind>());
             modelAndView.addObject("title", "个人商机询价列表");
             modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/public/inquiryRemind", "个人商机询价列表"));
             logger.log("公共询价单", "导出Excel列表", "导出个人商机询价列表");
-        } else if (state.equals("enterprise")) { // 导出企业商机
+        } else if (enterpirseState.equals(state)) {
+            // 导出企业商机
             modelAndView.addObject("state", "企业商机询价列表");
             List<InquiryRemind> reminds = InquiryUtils.getEngerpriseRemind(pageInfo, filter, SystemSession.getUser().getUserUU(), SystemSession.getUser().getEnterprise().getUu()).getContent();
             modelAndView.addObject("data", !CollectionUtils.isEmpty(reminds) ? reminds : new ArrayList<InquiryRemind>());

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

@@ -102,8 +102,7 @@ public class PublicQueryController {
 	@ResponseBody
 	public Map<String, Map<String, Object>> queryEnterprises(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		if (!StringUtils.isEmpty(data)) {
-			List<String> accounts = null;
-			// data = URLDecoder.decode(data, "UTF-8");
+			List<String> accounts;
 			// 多个
 			if (data.startsWith("[")) {
 				accounts = FlexJsonUtils.fromJsonArray(data, String.class);
@@ -221,11 +220,10 @@ public class PublicQueryController {
 	@RequestMapping(value = "/Validation", method = RequestMethod.POST)
 	@ResponseBody
 	public ModelMap validation(@RequestBody String enterprise) {
-		Enterprise enter = FlexJsonUtils.fromJson(enterprise, Enterprise.class);// 需要把字符串转成Object
+		// 需要把字符串转成Object
+		Enterprise enter = FlexJsonUtils.fromJson(enterprise, Enterprise.class);
 		ModelMap map = new ModelMap();
 		map.put("tel", userService.isTelUseable(enter.getEnAdminTel()));
-		// map.put("email",
-		// userService.isEmailUseable(enter.getEnAdminEmail()));
 		map.put("bussinessCode", enterpriseService.bussinessCodeEnable(enter.getEnBussinessCode()));
 		return map;
 	}
@@ -240,7 +238,8 @@ public class PublicQueryController {
 	public Map<String, Object> register(String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		Map<String, Object> infos = new HashMap<String, Object>();
-		Enterprise newEnterprise = FlexJsonUtils.fromJson(jsonStr, Enterprise.class);// 需要把字符串转成Object
+		// 需要把字符串转成Object
+		Enterprise newEnterprise = FlexJsonUtils.fromJson(jsonStr, Enterprise.class);
 		boolean ok = false;
 		String error = null;
 		Map<String, Object> checkinfos = checkRegister(newEnterprise);
@@ -254,7 +253,8 @@ public class PublicQueryController {
 			}
 		} else {
 			Enterprise regEnterprise = enterpriseService.registerERPEnterprise(newEnterprise);
-			if (regEnterprise == null) {// 营业执照码验证
+			// 营业执照码验证
+			if (regEnterprise == null) {
 				error = "注册失败!";
 			} else {
 				ok = true;
@@ -390,10 +390,12 @@ public class PublicQueryController {
 						User user = null;
 						if (ok == false) {
 							user = new User();
-							user.setUserName(emName);// 管理员姓名
+                            // 管理员姓名
+							user.setUserName(emName);
 							user.setUserTel(emMobile);
 							user.setEnable(Constant.YES);
-							user.addEnterprise(os);// 添加userenterpris对应关系
+                            // 添加userenterpris对应关系
+							user.addEnterprise(os);
 							User newUser = userDao.save(user);
 							newUser.setUserPwd(Md5Utils.encode(emPassword, newUser.getUserUU()));
 							userDao.save(newUser);
@@ -402,8 +404,10 @@ public class PublicQueryController {
 							} else {
 								os.setEnAdminuu(newUser.getUserUU());
 								os.setEnAdminPassword(emPassword);
-								os = enterpriseDao.save(os);// 再次保存enterprise
-								enterpriseDao.callInitProcedure(os.getUu());// 设置对照关系
+                                // 再次保存enterprise
+								os = enterpriseDao.save(os);
+                                // 设置对照关系
+								enterpriseDao.callInitProcedure(os.getUu());
 							}
 							ok = true;
 							infos.put("enuu", os.getUu());
@@ -453,8 +457,7 @@ public class PublicQueryController {
 	@ResponseBody
 	public List<ModelMap> getEnterprises(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		if (!StringUtils.isEmpty(data)) {
-			List<String> accounts = null;
-			// data = URLDecoder.decode(data, "UTF-8");
+			List<String> accounts;
 			// 多个
 			if (data.startsWith("[")) {
 				accounts = FlexJsonUtils.fromJsonArray(data, String.class);

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

@@ -36,7 +36,8 @@ import java.util.Map;
 /**
  * 采购变更单
  *
- * Created by hejq on 2018-06-22.
+ * @author hejq
+ * @date 2018-06-22
  */
 @RestController
 @RequestMapping("/purc/change")

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.controller;
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.model.SaleARCheck;
 import com.uas.platform.b2b.model.SaleARCheckItem;
 import com.uas.platform.b2b.model.SaleARCheckReply;
@@ -30,7 +31,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -58,9 +58,10 @@ public class PurchaseARCheckController {
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	/**
-	 * 作为买家，获取应付对账单（全部）
-	 * 
-	 * @param json
+	 *  作为买家，获取应付对账单（全部）
+	 *
+	 * @param params 分页参数
+	 * @param searchFilter 过滤条件
 	 * @return
 	 */
 	@RequestMapping(method = RequestMethod.GET)
@@ -187,7 +188,6 @@ public class PurchaseARCheckController {
 	/**
 	 * 获取明细的对账回复记录
 	 * 
-	 * @param json
 	 * @param itemId
 	 */
 	@RequestMapping(value = "/items/{itemId}/reply", method = RequestMethod.GET)
@@ -200,7 +200,8 @@ public class PurchaseARCheckController {
 	/**
 	 * 导出Excel
 	 * 
-	 * @param params
+	 * @param keyword
+     * @param searchFilter
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
@@ -208,9 +209,8 @@ public class PurchaseARCheckController {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		pageInfo.sorting("date", Direction.DESC);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
+		modelAndView.addObject("dateFormat", DateFormatUtils.EXPORT_FORMAT);
 		SearchFilter filter = null;
 		if (StringUtils.hasText(searchFilter)) {
 			filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);

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

@@ -1,13 +1,17 @@
 package com.uas.platform.b2b.controller;
 
+import com.uas.platform.b2b.model.PurchasePaymethod;
+import com.uas.platform.b2b.service.PurchasePaymethodService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.uas.platform.b2b.model.PurchasePaymethod;
-import com.uas.platform.b2b.service.PurchasePaymethodService;
-
+/**
+ * 付款方式
+ *
+ * @author hejq
+ */
 @RestController
 @RequestMapping("/paymethod")
 public class PurchasePaymethodController {
@@ -18,7 +22,8 @@ public class PurchasePaymethodController {
 	/**
 	 * 获取上次的付款方式
 	 * 
-	 * @return
+	 * @return PurchasePaymethod
+     * @see PurchasePaymethod
 	 */
 	@RequestMapping(value = "/method", method = RequestMethod.GET)
 	private PurchasePaymethod getMethod() {

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

@@ -49,7 +49,8 @@ import java.util.Map;
 /**
  * 招标单
  *
- * Created by dongbw on 17/03/07 14:19.
+ * @author dongbw
+ * @date 17/03/07 14:19
  */
 @SuppressWarnings("deprecation")
 @Controller
@@ -75,7 +76,7 @@ public class PurchaseTenderController {
      */
     @RequestMapping(value = "/publish/new", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional
+    @Transactional(rollbackFor = RuntimeException.class)
     public ResponseEntity<String> publishTender(String tender, String enInfos) throws Exception {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
         if (null != enInfos) {
@@ -101,7 +102,7 @@ public class PurchaseTenderController {
      */
     @RequestMapping(value = "/save/new", method = RequestMethod.POST)
     @ResponseBody
-    @Transactional
+    @Transactional(rollbackFor = RuntimeException.class)
     public ResponseEntity<String> saveTender(String tender, String enInfos) throws Exception {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
         if (null != enInfos) {
@@ -313,7 +314,6 @@ public class PurchaseTenderController {
         return searchService.searchSaleTenderIds(keyword, pageParams);
     }
 
-
     /**
      * 作为供应商，查看收到的招标单（待投标）
      *
@@ -749,7 +749,8 @@ public class PurchaseTenderController {
     @Transactional
     public ResponseEntity<String> updateSavedTender(String tender, String enInfos) {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
-        if (purchaseTender.getIfOpen() == Constant.YES) { // 开放时进另外的方法
+        // 开放时进另外的方法
+        if (purchaseTender.getIfOpen() == Constant.YES) {
             purchaseTenderService.updateSavedOpen(purchaseTender);
         } else {
             if (null != enInfos) {
@@ -824,13 +825,13 @@ public class PurchaseTenderController {
         ModelMap map = new ModelMap();
         String fileName = uploadItem.getFile().getOriginalFilename();
         String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
-        InputStream is = null;
-        Workbook workbook = null;
+        InputStream is;
+        Workbook workbook ;
         try {
             is = uploadItem.getFile().getInputStream();
-            if ("xls".equals(suffix)) {
+            if (JxlsExcelView.EXCEL_XLS.equals(suffix)) {
                 workbook = new HSSFWorkbook(is);
-            } else if ("xlsx".equals(suffix)) {
+            } else if (JxlsExcelView.EXCEL_XLSX.equals(suffix)) {
                 workbook = new XSSFWorkbook(is);
             } else {
                 throw new IllegalOperatorException("文件格不正确，请上传.xls或.xlsx的文件");

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

@@ -7,7 +7,8 @@ import java.util.Map;
 
 /**
  * 余弦相似度算法，比较两个字符串的相似度
- * 
+ *
+ * @author yingp
  */
 public class CosineSimilarityAlgorithm {
 	/**

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

@@ -2,10 +2,26 @@ package com.uas.platform.b2b.core.util;
 
 import org.apache.commons.lang3.time.FastDateFormat;
 
+/**
+ * 时间格式化工具类
+ *
+ * @author hejq
+ */
 public class DateFormatUtils {
 
+    /**
+     * yyyy-MM-dd HH:mm:ss格式
+     */
 	public static final FastDateFormat DATETIME_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
-	
+
+    /**
+     * yyyy-MM-dd  格式
+     */
 	public static final FastDateFormat DATE_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd");
 
+    /**
+     * 导出数据日期格式 yyyy年MM月dd日
+     */
+	public static final FastDateFormat EXPORT_FORMAT = FastDateFormat.getInstance("yyyy年MM月dd日");
+
 }

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

@@ -1,22 +0,0 @@
-package com.uas.platform.b2b.core.util;
-
-import java.text.SimpleDateFormat;
-
-/**
- * 数据库时间格式
- *
- * @author hejq
- * @date 2018-08-07 11:39
- */
-public class SqlDateFormdateUtils {
-
-    /**
-     * 数据库 date 字段格式
-     */
-    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
-
-    /**
-     * 数据库 datetime 字段格式
-     */
-    public static final SimpleDateFormat DATETIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-}

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

@@ -3,39 +3,16 @@ package com.uas.platform.b2b.dao;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.sql.SQLException;
-import java.util.List;
 
 /**
- * Created by dongbw
+ * 消息推送
+ *
  * 17/03/23 9:39.
+ * @author dongbw
  */
 @Repository
 public interface PagingReleaseDetailDao extends JpaRepository<PagingReleaseDetail, Long>,JpaSpecificationExecutor<PagingReleaseDetail> {
 
-    /**
-     * 获得未读消息的单据id
-     *
-     * @param vendUseruu
-     * @param venduu
-     * @return
-     */
-    @Query("select p.sourceId from PagingRelease p, PagingReleaseDetail d where p.id = d.pagingRelease.id and d.vendUserUU = :vendUseruu and d.vendUU = :venduu and d.readStatus = 0 and p.table = :table and p.category = :category")
-    List<Long> getUnreadIds(@Param("vendUseruu") Long vendUseruu, @Param("venduu") Long venduu, @Param("table") String table, @Param("category") String category);
-
-    /**
-     * 将消息设置成已推送
-     *
-     * @param ids
-     */
-    @Modifying
-    @Transactional(rollbackFor = SQLException.class)
-    @Query("update PagingReleaseDetail o set o.pushStatus = 1 where o.id in :ids")
-    void setPushedByIds(@Param("ids") Object[] ids);
 }

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

@@ -6,10 +6,32 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+/**
+ * 打印日志
+ *
+ * @author hejq
+ */
 @Repository
 public interface PrintLogDao extends JpaRepository<PrintLog, Long> {
 
+    /**
+     * 根据状态和编号查询打印日志
+     *
+     * @param status 状态
+     * @param code 编号
+     * @return List<PrintLog>
+     *     @see PrintLog
+     */
     List<PrintLog> findByStatusAndCode(short status, String code);
 
-    List<PrintLog> findByEnUUAndStatusAndTable(Long uu, short no, String purc$orders);
+    /**
+     * 根据企业UU、状态和表名查询打印日志
+     *
+     * @param uu 企业UU
+     * @param status 打印状态
+     * @param tableName 表名称
+     * @return List<PrintLog>
+     *     @see PrintLog
+     */
+    List<PrintLog> findByEnUUAndStatusAndTable(Long uu, short status, String tableName);
 }

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

@@ -9,36 +9,48 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+/**
+ * 采购验收单
+ *
+ * @author hejq
+ */
 @Repository
 public interface PurchaseAcceptDao extends JpaSpecificationExecutor<PurchaseAccept>, JpaRepository<PurchaseAccept, Long> {
 
 	/**
 	 * 按所属企业及编号查找采购验收单
 	 * 
-	 * @param enUU
-	 * @param code
-	 * @return
+	 * @param enUU 企业UU
+	 * @param code 采购验收单单号
+	 * @return List<PurchaseAccept>
+     *     @see PurchaseAccept
 	 */
 	List<PurchaseAccept> findByEnUUAndCode(Long enUU, String code);
 	
 	/**
 	 * 卖家根据卖家UU号和下载状态获取需要下载的客户采购验收入库单
-	 * @return
+	 * @param vendUU  供应商UU
+	 * @param sendStatus 下载状态
+	 * @return List<PurchaseAccept>
+     *     @see PurchaseAccept
 	 */
 	List<PurchaseAccept> findByVendUUAndSendStatus(Long vendUU, Short sendStatus);
 	
 	/**
 	 * 按卖家UU、反过账状态查找
-	 * @param vendUU
-	 * @param nonPosting
-	 * @return
+     *
+	 * @param vendUU 供应商UU
+	 * @param nonPosting 反过账状态
+	 * @return List<PurchaseAccept>
+     *     @see PurchaseAccept
 	 */
 	List<PurchaseAccept> findByVendUUAndNonPosting(Long vendUU, Short nonPosting);
 
 	/**
 	 * 根据供应商UU号获取客户采购验退单数量
-	 * @param vendUU
-	 * @return
+     *
+	 * @param vendUU 供应商UU
+	 * @return count
 	 */
 	@Query("select count(p) from PurchaseAccept p where p.vendUU = :vendUU")
 	long countByVendUU(@Param("vendUU")Long vendUU);
@@ -48,7 +60,8 @@ public interface PurchaseAcceptDao extends JpaSpecificationExecutor<PurchaseAcce
 	 *
 	 * @param enUU 企业UU
 	 * @param sourceId 对应的erpId
-	 * @return
+	 * @return List<PurchaseAccept>
+     *     @see PurchaseAccept
 	 */
 	List<PurchaseAccept> findByEnUUAndErpId(Long enUU, Long sourceId);
 }

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

@@ -13,6 +13,8 @@ import java.util.List;
 
 /**
  * 应收发票
+ *
+ * @author hejq
  */
 @Repository
 public interface PurchaseApBillDao extends JpaSpecificationExecutor<PurchaseApBill>, JpaRepository<PurchaseApBill, Long> {
@@ -20,9 +22,10 @@ public interface PurchaseApBillDao extends JpaSpecificationExecutor<PurchaseApBi
 	/**
 	 * 按所属企业及编号查找客户应付发票
 	 * 
-	 * @param enUU
-	 * @param code
-	 * @return
+	 * @param enUU 企业UU
+	 * @param code 客户应付发票编号
+	 * @return List<PurchaseApBill>
+	 *     @see PurchaseApBill
 	 */
 	List<PurchaseApBill> findByEnUUAndCode(Long enUU, String code);
 
@@ -31,32 +34,37 @@ public interface PurchaseApBillDao extends JpaSpecificationExecutor<PurchaseApBi
      *
      * @param vendUU 卖家UU号
      * @param sendStatus 下载状态
-     * @return
+     * @return List<PurchaseApBill>
+	 *     @see PurchaseApBill
      */
 	List<PurchaseApBill> findByVendUUAndSendStatus(Long vendUU, Short sendStatus);
 	
 	/**
-	 * 卖家根据卖家UU号和下载状态和反过账状态获取客户反过账的客户应付发票
-	 * @param vendUU
-	 * @param nonPosting
-	 * @return
+	 * 卖家根据卖家UU和反过账状态获取客户反过账的客户应付发票
+     *
+	 * @param vendUU 供应商UU
+	 * @param nonPosting 反过账状态
+	 * @return List<PurchaseApBill>
+     *     @see PurchaseApBill
 	 */
 	List<PurchaseApBill> findByVendUUAndNonPosting(Long vendUU, Short nonPosting);
 	
 	/**
 	 * 根据截止日期获取（发票日期）
-	 * @param vendUU
-	 * @param endDate
-	 * @return
+	 *
+	 * @param vendUU 供应商UU
+	 * @param endDate 截止日期
+	 * @return List<Long> 发票id List
 	 */
 	@Query("select p.id from PurchaseApBill p where p.vendUU=:vendUU and p.date <= :endDate")
 	List<Long> findByEndDate(@Param("vendUU") long vendUU, @Param("endDate")Date endDate);
 	
 	/**
 	 * 根据起始日期获取（发票日期）
-	 * @param formDate
-	 * @param vendUU
-	 * @return
+     *
+	 * @param formDate 开始时间
+	 * @param vendUU 供应商UU
+	 * @return List<Long> 发票id List
 	 */
 	@Query("select p.id from PurchaseApBill p where p.vendUU=:vendUU and p.date >= :fromDate")
 	List<Long> findByFromDate(@Param("vendUU") long vendUU, @Param("fromDate")Date formDate);
@@ -65,7 +73,7 @@ public interface PurchaseApBillDao extends JpaSpecificationExecutor<PurchaseApBi
 	 *  根据供应商UU号获取数量
      *
 	 * @param vendUU 供应商UU号
-	 * @return
+	 * @return count 数量统计
 	 */
 	@Query("select count(p) from PurchaseApBill p where p.vendUU=:vendUU")
 	Long countByVendUU(@Param("vendUU") Long vendUU);
@@ -73,8 +81,8 @@ public interface PurchaseApBillDao extends JpaSpecificationExecutor<PurchaseApBi
 	/**
 	 * 根据UU号和出入库单号更新发票主表的相关数据
 	 *
-	 * @param uu
-	 * @param inoutno
+	 * @param uu 采购企业UU号
+	 * @param inoutno 出入库单号
 	 */
 	@Procedure(procedureName = "refreshamountandtaxsum")
     void refreshAmountAndTaxSum(Long uu, String inoutno);
@@ -84,7 +92,8 @@ public interface PurchaseApBillDao extends JpaSpecificationExecutor<PurchaseApBi
 	 *
 	 * @param enUU 企业UU
 	 * @param erpId erpId
-	 * @return
+	 * @return List<PurchaseApBill>
+     *     @see PurchaseApBill
 	 */
     List<PurchaseApBill> findByEnUUAndErpId(Long enUU, Long erpId);
 }

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

@@ -13,24 +13,31 @@ import javax.transaction.Transactional;
 import java.sql.SQLException;
 import java.util.List;
 
+/**
+ * 采购询价单
+ *
+ * @author hejq
+ */
 @Repository
 public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<PurchaseInquiryItem>, JpaRepository<PurchaseInquiryItem, Long> {
 
 	/**
 	 * 按卖家企业ID和明细传到卖家ERP状态查找询价明细
 	 * 
-	 * @param vendUU
-	 * @param sendStatus
-	 * @return
+	 * @param vendUU 供应商企业UU
+	 * @param sendStatus 传输状态
+	 * @return List<PurchaseInquiryItem>
+	 *     @see PurchaseInquiryItem
 	 */
 	List<PurchaseInquiryItem> findByVendUUAndSendStatus(long vendUU, short sendStatus);
 
 	/**
 	 * 按卖家企业ID和询价主记录ID查找
 	 * 
-	 * @param vendUU
-	 * @param inquiryId
-	 * @return
+	 * @param vendUU 供应商UU
+	 * @param inquiryId 询价单主表id
+	 * @return List<PurchaseInquiryItem>
+	 *     @see PurchaseInquiryItem
 	 */
 	@Query("from PurchaseInquiryItem d where d.vendUU = :vendUU and d.inquiry.id = :inquiryId")
 	List<PurchaseInquiryItem> findByVendUUAndInquiry(@Param("vendUU") long vendUU, @Param("inquiryId") long inquiryId);
@@ -38,9 +45,10 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	/**
 	 * 按买家企业ID和明细传报价状态查找询价明细
 	 * 
-	 * @param enUU
-	 * @param backStatus
-	 * @return
+	 * @param enUU 企业UU
+	 * @param backStatus 传回采购方erp状态
+	 * @return List<PurchaseInquiryItem>
+	 *     @see PurchaseInquiryItem
 	 */
 	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.backStatus = :backStatus and IFNULL(d.sourceApp, ' ') <> 'B2B'")
 	List<PurchaseInquiryItem> findByEnUUAndBackStatus(@Param("enUU") long enUU, @Param("backStatus") short backStatus);
@@ -48,10 +56,11 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	/**
 	 * 按买家企业ID、单号和序号查找询价单明细
 	 * 
-	 * @param enUU
-	 * @param code
-	 * @param number
-	 * @return
+	 * @param enUU 采购方企业UU
+	 * @param code 询价编号
+	 * @param number 明细序号
+	 * @return List<PurchaseInquiryItem>
+	 *     @see PurchaseInquiryItem
 	 */
 	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.inquiry.code = :code and d.number = :number")
 	List<PurchaseInquiryItem> findByEnUUAndCodeAndNumber(@Param("enUU") long enUU, @Param("code") String code, @Param("number") short number);
@@ -71,35 +80,38 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	/**
 	 * 按卖家企业ID和询价明细的报价信息传到卖家ERP的状态查找询价明细
 	 * 
-	 * @param vendUU
-	 * @param replySendStatus
-	 * @return
+	 * @param vendUU 供应商UU
+	 * @param replySendStatus 回复传输回ERP状态
+	 * @return List<PurchaseInquiryItem>
+     *     @see PurchaseInquiryItem
 	 */
 	List<PurchaseInquiryItem> findByVendUUAndReplySendStatus(long vendUU, short replySendStatus);
 
 	/**
 	 * 按卖家企业ID和询价明细的报价信息的采纳结果传到卖家ERP的状态查找询价明细
 	 * 
-	 * @param vendUU
-	 * @param decideStatus
-	 * @return
+	 * @param vendUU 供应商UU
+	 * @param decideStatus 采纳结果传输回ERP状态
+     * @return List<PurchaseInquiryItem>
+     *     @see PurchaseInquiryItem
 	 */
 	List<PurchaseInquiryItem> findByVendUUAndDecideStatus(long vendUU, short decideStatus);
 
 	/**
 	 * 按询价单供应商企业ID和状态来查询详情 （后面再在视图中查询数目进行统计）
 	 * 
-	 * @param vendUU
-	 * @param status
-	 * @return
+	 * @param vendUU 供应商UU
+	 * @param status 状态
+     * @return List<PurchaseInquiryItem>
+     *     @see PurchaseInquiryItem
 	 */
 	List<PurchaseInquiryItem> findByVendUUAndStatus(long vendUU, short status);
 
 	/**
 	 * 根据供应商UU号获取客户询价单数量
 	 * 
-	 * @param vendUU
-	 * @return
+	 * @param vendUU 供应商UU
+	 * @return 询价数量
 	 */
 	@Query("select count(p) from PurchaseInquiryItem p where p.vendUU = :vendUU")
 	long countByVendUU(@Param("vendUU") Long vendUU);
@@ -107,27 +119,29 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	/**
 	 * 查询单据是否存在
 	 * 
-	 * @param enuu
-	 * @param sourceId
-	 * @return
+	 * @param enUU 企业UU
+	 * @param sourceId 来源ID(erpID)
+	 * @return PurchaseInquiryItem
+     *      @see PurchaseInquiryItem
 	 */
-	PurchaseInquiryItem findByVendUUAndSourceId(Long enuu, Long sourceId);
+	PurchaseInquiryItem findByVendUUAndSourceId(Long enUU, Long sourceId);
 
 	/**
 	 * 按卖家企业ID和询价明细的报价信息的作废处理传到卖家ERP的状态查找询价明细
 	 *
-	 * @param uu
-	 * @param value
-	 * @return
+	 * @param uu 供应商UU
+	 * @param value 作废状态
+	 * @return  List<PurchaseInquiryItem>
+     *     @see PurchaseInquiryItem
 	 */
     List<PurchaseInquiryItem> findByVendUUAndInvalidStatus(Long uu, short value);
 
-	/**
-	 * 获得每种单据状态的未读数量
-	 *
-	 * @Param ids 未读单据id
-	 * @return
-	 */
+    /**
+     * 获得每种单据状态的未读数量
+     *
+     * @Param ids 未读单据id
+     * @return List<Object[]> 数量，阅读状态
+     */
 	@Query("select count(p), p.status from PurchaseInquiryItem p where p.id in :ids group by p.status")
     List<Object[]> getUnreadCountEveryStatus(@Param("ids") List<Long> ids);
 
@@ -135,7 +149,7 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	 * 获得已报价的未读数量
 	 *
 	 * @Param ids 未读单据id
-	 * @return
+	 * @return 已报价的未读数量
 	 */
 	@Query("select count(p) from PurchaseInquiryItem p where p.id in :ids and p.agreed is null and p.invalid <> 1 and p.status=201")
     Integer getOfferCount(@Param("ids") List<Long> ids);
@@ -144,19 +158,25 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	 * 获得待报价的未读数量
 	 *
 	 * @Param ids 未读单据id
-	 * @return
+	 * @return 待报价的未读数量
 	 */
 	@Query("select count(p) from PurchaseInquiryItem p where p.id in :ids and p.inquiry.overdue=0 and (p.inquiry.check is null or p.inquiry.check <> 1) and p.status=200")
 	Integer getNotOfferCount(@Param("ids") List<Long> ids);
 
+    /**
+     * 获取未作废报价未读数量
+     *
+     * @param ids 未读单据id
+     * @return 未作废报价未读数量
+     */
 	@Query("select p.id from PurchaseInquiryItem p where p.id in :ids and p.status=201 and p.agreed is null and p.invalid <> 1")
 	List<Long> findRepliedId(@Param("ids") List<Long> ids);
 
     /**
      * 更新询价报价传输到erp的状态
      *
-     * @param enuu
-     * @param status
+     * @param enuu 企业UU
+     * @param status 传输状态
      */
 	@Procedure(procedureName = "inquiryitem_erpstatus_update")
     void updateStatus(Long enuu, Short status);
@@ -164,8 +184,8 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	/**
 	 * 更新首页公共询价单据的阅读状态
 	 *
-	 * @param id
-	 * @param userUU
+	 * @param id 公共询价明细id
+	 * @param userUU 用户UU
 	 */
 	@Procedure(procedureName = "inquiryitems_readstatus")
 	void setReadStatus(Long id, Long userUU);

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

@@ -1,15 +1,19 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.PurchaseOrderReply;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.PurchaseOrderReply;
+import java.util.List;
 
+/**
+ * 销售订单回复
+ *
+ * @author hejq
+ */
 @Repository
 public interface PurchaseOrderReplyDao extends JpaSpecificationExecutor<PurchaseOrderReply>,
 		JpaRepository<PurchaseOrderReply, Long> {
@@ -17,30 +21,32 @@ public interface PurchaseOrderReplyDao extends JpaSpecificationExecutor<Purchase
 	/**
 	 * 按订单明细ID查找订单明细回复
 	 * 
-	 * @param orderItemId
-	 * @return
+	 * @param orderItemId 采购单明细id
+	 * @return List<PurchaseOrderReply>
+     *     @see PurchaseOrderReply
 	 */
 	@Query("from PurchaseOrderReply r where r.orderItem.id = :orderItemId order by r.date desc")
-	public List<PurchaseOrderReply> findByOrderItemId(@Param("orderItemId") long orderItemId);
+    List<PurchaseOrderReply> findByOrderItemId(@Param("orderItemId") long orderItemId);
 
 	/**
 	 * (买家)按回复记录的状态查找回复记录
 	 * 
-	 * @param enUU
-	 * @param status
-	 * @return
+	 * @param enUU 买家企业UU
+	 * @param status 状态
+	 * @return List<PurchaseOrderReply>
+     *     @see PurchaseOrderReply
 	 */
 	@Query("from PurchaseOrderReply r where r.orderItem.order.enUU = :enUU and r.status = :status order by r.id")
-	public List<PurchaseOrderReply> findByEnUUAndStatus(@Param("enUU") long enUU, @Param("status") short status);
+	List<PurchaseOrderReply> findByEnUUAndStatus(@Param("enUU") long enUU, @Param("status") short status);
 
 	/**
 	 * (卖家)按回复记录的状态查找回复记录
 	 * 
-	 * @param vendUU
-	 * @param status
-	 * @return
+	 * @param vendUU 卖家企业UU
+	 * @param status 回复状态
+	 * @return List<PurchaseOrderReply>
+     *     @see PurchaseOrderReply
 	 */
 	@Query("from PurchaseOrderReply r where r.orderItem.order.vendUU = :vendUU and r.sendStatus = :status")
-	public List<PurchaseOrderReply> findByVendUUAndSendStatus(@Param("vendUU") long vendUU,
-			@Param("status") short status);
+	List<PurchaseOrderReply> findByVendUUAndSendStatus(@Param("vendUU") long vendUU, @Param("status") short status);
 }

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

@@ -1,11 +1,15 @@
 package com.uas.platform.b2b.dao;
 
+import com.uas.platform.b2b.model.UsageLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.UsageLog;
-
+/**
+ * b2b使用日志
+ *
+ * @author hejq
+ */
 @Repository
 public interface UsageLogDao extends JpaSpecificationExecutor<UsageLog>, JpaRepository<UsageLog, Long> {
 

src/main/java/com/uas/platform/b2b/erp/controller/CheckTransController.java

@@ -22,7 +22,8 @@ import java.util.List;
 /**
  * 针对每个数据传输进行数据传输验证（针对买家）
  *
- * Created by hejq on 2018-04-19.
+ * @author hejq
+ * @date 2018-04-19
  */
 @RequestMapping("/erp/buyer")
 @RestController

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseNotifyServiceImpl.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.platform.b2b.core.util.SqlDateFormdateUtils;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.dao.PurchaseNoticeDao;
 import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
 import com.uas.platform.b2b.dao.SaleSendItemDao;
@@ -116,7 +116,7 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
                         if (notice.getOrderItem() != null && notice.getOrderItem().getLtinstock() != null) {
                             ltinStock = notice.getOrderItem().getLtinstock();
                         }
-                        existNotice.setWaiting(getNoticeWaiting(SqlDateFormdateUtils.DATE_FORMAT.format(notice.getDelivery()), ltinStock));
+                        existNotice.setWaiting(getNoticeWaiting(DateFormatUtils.DATE_FORMAT.format(notice.getDelivery()), ltinStock));
 					}
 					existNotice.setDelivery(notice.getDelivery());
 					notices.add(existNotice);

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

@@ -5,6 +5,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
+/**
+ * 跨域拦截
+ *
+ * @author hejq
+ */
 public class SimpleCORSFilter implements Filter {
 
 	@Override

src/main/java/com/uas/platform/b2b/manage/controller/NoticeController.java

@@ -1,19 +1,14 @@
 package com.uas.platform.b2b.manage.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.uas.platform.b2b.manage.model.ManageNotice;
 import com.uas.platform.b2b.service.NoticeService;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 
 /**
  * 系统公告请求
@@ -28,6 +23,12 @@ public class NoticeController {
 	@Autowired
 	private NoticeService noticeService;
 
+	/**
+	 * 保存管理平台传过来的公共信息
+	 *
+	 * @param data 公告数据
+	 * @throws UnsupportedEncodingException
+	 */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void save(@RequestParam("data") String data) throws UnsupportedEncodingException{
@@ -35,7 +36,12 @@ public class NoticeController {
 		ManageNotice notice = FlexJsonUtils.fromJson(noticeStr, ManageNotice.class);
 		noticeService.save(notice.convert());
 	}
-	
+
+    /**
+     * 删除公告
+     *
+     * @param sourceId 管理平台id
+     */
 	@RequestMapping(value = "/{sourceId}", method = RequestMethod.DELETE)
 	@ResponseBody
 	public void delete(@PathVariable("sourceId") Long sourceId) {

src/main/java/com/uas/platform/b2b/manage/model/AccountInfo.java

@@ -1,22 +1,34 @@
 package com.uas.platform.b2b.manage.model;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.UserBaseInfo;
 
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * 账户信息
+ *
+ * @author US50
+ */
 public class AccountInfo {
+
 	/**
 	 * 企业UU号
 	 */
 	private Long enUU;
+
 	/**
 	 * 个人UU号
 	 */
 	private Long userUU;
+
+    /**
+     * 姓名
+     */
 	private String name;
+
 	/**
 	 * 手机号
 	 */
@@ -25,11 +37,15 @@ public class AccountInfo {
 	 * 邮箱
 	 */
 	private String email;
+
 	/**
 	 * 密码（密文）
 	 */
 	private String password;
 
+    /**
+     * imID
+     */
 	private Long userIMId;
 
 	public Long getUserIMId() {
@@ -91,16 +107,6 @@ public class AccountInfo {
 	public AccountInfo() {
 	}
 
-	public AccountInfo(User user) {
-		this.email = user.getUserEmail();
-		this.enUU = user.getEnterprise().getUu();
-		this.name = user.getUserName();
-		this.password = user.getUserPwd();
-		this.tel = user.getUserTel();
-		this.userUU = user.getUserUU();
-		this.userIMId = user.getUserIMId();
-	}
-
 	public AccountInfo(UserBaseInfo user, long enUU) {
 		this.email = user.getUserEmail();
 		this.enUU = enUU;

src/main/java/com/uas/platform/b2b/manage/model/ManageNotice.java

@@ -1,10 +1,10 @@
 package com.uas.platform.b2b.manage.model;
 
-import java.util.Date;
-
 import com.uas.platform.b2b.model.Notice;
 import com.uas.platform.b2b.model.NoticeBody;
 
+import java.util.Date;
+
 /**
  * 从管理平台传输过来的公告
  * 
@@ -13,8 +13,19 @@ import com.uas.platform.b2b.model.NoticeBody;
  */
 public class ManageNotice {
 
+	/**
+	 * id
+	 */
 	private Long id;
+
+	/**
+	 * 名称
+	 */
 	private String title;
+
+	/**
+	 * 内容
+	 */
 	private String content;
 
 	public String getTitle() {

src/main/java/com/uas/platform/b2b/mobile/controller/MobileTaskController.java

@@ -1,5 +1,10 @@
 package com.uas.platform.b2b.mobile.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.uas.platform.b2b.mobile.service.MobileTaskService;
+import com.uas.platform.b2b.model.OfficeTask;
+import com.uas.platform.b2b.model.OfficeTaskReply;
+import com.uas.platform.b2b.temporary.model.OfficeTaskInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -7,14 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.fastjson.JSON;
-import com.uas.platform.b2b.mobile.service.MobileTaskService;
-import com.uas.platform.b2b.model.OfficeTask;
-import com.uas.platform.b2b.model.OfficeTaskReply;
-import com.uas.platform.b2b.temporary.model.OfficeTaskInfo;
-
 /**
- * 
+ * 手机端消息推送信息
+ *
  * @author hejq
  * @time 创建时间：2017年3月17日
  */

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

@@ -20,8 +20,10 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * Created by dongbw
+ * 移动端消息提醒
+ *
  * 17/03/28 9:27.
+ * @author dongbw
  */
 @Service
 public class MobileReleaseServiceImpl implements MobileReleaseService {

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

@@ -9,7 +9,8 @@ import java.util.Date;
 /**
  * 记录验收单等查询对应采购单明细不存在的单号，序号
  *
- * Created by hejq on 2018-06-19.
+ * @author hejq
+ * @date 2018-06-19
  */
 @Table(name = "erp$orders", indexes = {
         @Index(name = "erp$orders_or_sign_IDX", columnList = "or_sign"),

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

@@ -217,22 +217,6 @@ public class PagingRelease implements Serializable {
         this.enUU = enUU;
     }
 
-//    public EnterpriseInfo getEnterprise() {
-//        return enterprise;
-//    }
-//
-//    public void setEnterprise(EnterpriseInfo enterprise) {
-//        this.enterprise = enterprise;
-//    }
-//
-//    public User getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(User user) {
-//        this.user = user;
-//    }
-
     public Date getDate() {
         return date;
     }

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

@@ -9,7 +9,9 @@ import java.util.Date;
 
 /**
  * 消息明细表
- * Created by dongbw on 17/03/22 14:55.
+ *
+ * @author dongbw
+ * @date 17/03/22 14:55
  */
 @Entity
 @Table(name = "purc$pagingreleasedetail")
@@ -32,13 +34,6 @@ public class PagingReleaseDetail implements Serializable{
     @NotNull
     private Long vendUserUU;
 
-//    /**
-//     * 采购单所属采购员
-//     */
-//    @OneToOne(cascade = { CascadeType.REFRESH })
-//    @JoinColumn(name = "prd_emuu", insertable = false, updatable = false)
-//    private UserBaseInfo vendUser;
-
     /**
      * 供应商企业UU
      */
@@ -125,14 +120,6 @@ public class PagingReleaseDetail implements Serializable{
         this.vendUserUU = vendUserUU;
     }
 
-//    public User getVendUser() {
-//        return vendUser;
-//    }
-//
-//    public void setVendUser(User vendUser) {
-//        this.vendUser = vendUser;
-//    }
-
     public Long getVendUU() {
         return vendUU;
     }
@@ -157,15 +144,6 @@ public class PagingReleaseDetail implements Serializable{
         this.vendUserName = vendUserName;
     }
 
-//    public EnterpriseInfo getVendor() {
-//        return vendor;
-//    }
-//
-//    public void setVendor(EnterpriseInfo vendor) {
-//        this.vendor = vendor;
-//    }
-
-
     public Short getReadStatus() {
         return readStatus;
     }

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

@@ -6,17 +6,25 @@ import java.util.Date;
 
 /**
  *  单据打印日志
- * Created by dongbw on 17/03/11 10:09.
+ *
+ * @author dongbw
+ * @date 17/03/11 10:09
  */
-@Table(name = "print$log", indexes = {@Index(name = "table_forgin_idx", columnList = "pl_table, pl_foreign")})
+@Table(name = "print$log", indexes = {
+        @Index(name = "table_forgin_idx", columnList = "pl_table, pl_foreign"),
+        @Index(name = "print$log_enuu_IDX", columnList = "pl_enuu")
+})
 @Entity
-public class PrintLog implements Serializable{
+public class PrintLog implements Serializable {
 
     /**
      * 序列号
      */
     private static final long serialVersionUID = 1L;
 
+    /**
+     * id
+     */
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "pl_id")

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

@@ -9,12 +9,12 @@ import java.util.Set;
  * 买家的采购验收单
  * 
  * @author yingp
- * 
  */
 @Table(name = "purc$accept", indexes = {
 		@Index(name = "unique_enuu_code", columnList = "pa_enuu,pa_code", unique = true),
 		@Index(name = "pa_venduu_index", columnList = "pa_venduu"),
-        @Index(name = "pa_enuu_index", columnList = "pa_enuu")
+        @Index(name = "pa_enuu_index", columnList = "pa_enuu"),
+		@Index(name = "purc$accept_erpId_IDX", columnList = "pa_erpid")
 })
 @Entity
 public class PurchaseAccept implements Serializable {

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

@@ -1,31 +1,20 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 买家的应付发票
  * 
  * @author suntg
- * 
  */
-@Table(name = "purc$apbill", indexes = {@Index(name = "unique_enuu_code", columnList = "pad_enuu,pab_code", unique = true)})
+@Table(name = "purc$apbill", indexes = {
+		@Index(name = "unique_enuu_code", columnList = "pad_enuu,pab_code", unique = true),
+		@Index(name = "purc$apbill_erpId_IDX", columnList = "pab_erpid"),
+        @Index(name = "purc$apbill_nonposting_IDX", columnList = "pab_nonposting")
+})
 @Entity
 public class PurchaseApBill implements Serializable {
 

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

@@ -16,7 +16,11 @@ import java.util.*;
  * @author yingp
  *
  */
-@Table(name = "purc$inquiryitems", indexes = { @Index(name = "id_status_idx", columnList = "id_status")} )
+@Table(name = "purc$inquiryitems", indexes = {
+		@Index(name = "id_status_idx", columnList = "id_status"),
+		@Index(name = "purc$inquiryitems_sourceapp_IDX", columnList = "id_sourceapp"),
+        @Index(name = "purc$inquiryitems_backstatus_IDX", columnList = "id_backstatus")
+})
 @Entity
 public class PurchaseInquiryItem extends AbstractOrderProduct {
 

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

@@ -13,7 +13,11 @@ import java.util.Set;
  * @author yingp
  *
  */
-@Table(name = "purc$orders", indexes = { @Index(name = "purc$orders_date", columnList = "pu_date"), @Index(name = "unique_enuu_code", columnList = "pu_enuu,pu_code", unique = true) })
+@Table(name = "purc$orders", indexes = {
+		@Index(name = "purc$orders_date", columnList = "pu_date"),
+		@Index(name = "unique_enuu_code", columnList = "pu_enuu,pu_code", unique = true),
+		@Index(name = "purc$orders_erpId_IDX", columnList = "pu_erpid")
+})
 @Entity
 public class PurchaseOrder implements Serializable {
 

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

@@ -1,24 +1,12 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
-import java.util.Date;
-
-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.ManyToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import com.alibaba.fastjson.annotation.JSONField;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 
@@ -27,7 +15,9 @@ import com.alibaba.fastjson.annotation.JSONField;
  * @author yingp
  *
  */
-@Table(name = "purc$reply")
+@Table(name = "purc$reply", indexes = {
+		@Index(name = "purc$reply_status_IDX", columnList = "pr_status")
+})
 @Entity
 public class PurchaseOrderReply implements Serializable {
 

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

@@ -9,7 +9,8 @@ import java.util.Date;
 /**
  * 记录客户单据的未读状态
  *
- * Created by wangmh on 2017/7/21.
+ * @author wangmh
+ * @date 2017/7/21
  */
 @Table(name = "purc$userorders", indexes = {
         @Index(name = "puo_enuu_idx", columnList = "puo_enuu"),

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

@@ -20,7 +20,8 @@ import java.util.List;
 /**
  * 对接公共询价服务的接口
  *
- * Created by hejq on 2018-01-15.
+ * @author hejq
+ * @date 2018-01-15
  */
 public class InquiryUtils {
 

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

@@ -1,626 +0,0 @@
-package com.uas.platform.b2b.ps;
-
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
-import org.apache.http.Consts;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.*;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.entity.mime.MultipartEntityBuilder;
-import org.apache.http.entity.mime.content.FileBody;
-import org.apache.http.entity.mime.content.StringBody;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.protocol.HTTP;
-import org.apache.http.util.EntityUtils;
-import org.springframework.http.HttpStatus;
-import org.springframework.util.StreamUtils;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-/**
- * 公共服务HTTP请求
- *
- * @author hejq
- * @date 2018-01-26 14:31
- */
-public class PSHttpUtils {
-
-	/**
-	 * 请求来源B2B
-	 */
-	private final static String SOURCE_APP = "B2B";
-
-	/**
-	 * 发送GET请求
-	 * 
-	 * @param url
-	 * @param params
-	 * @return
-	 * @throws Exception
-	 */
-	public static Response sendGetRequest(String url, Map<String, ?> params) throws Exception {
-		return sendGetRequest(url, params, false);
-	}
-
-	/**
-	 * 发送GET请求
-	 * 
-	 * @param url
-	 * @param params
-	 * @param sign
-	 *            是否发送签名
-	 * @return
-	 * @throws Exception
-	 */
-	@SuppressWarnings("unchecked")
-	public static Response sendGetRequest(String url, Map<String, ?> params, boolean sign) throws Exception {
-		return sendRequest(RequestMethod.GET, url, (Map<String, Object>) params, sign, false);
-	}
-
-	/**
-	 * 暂时先使用这种方法（短信接口调用）
-	 */
-	public static String sendPost(String url, String param) {
-		PrintWriter out = null;
-		BufferedReader in = null;
-		String result = "";
-		try {
-			URL realUrl = new URL(url);
-			// 打开和URL之间的连接
-			URLConnection conn = realUrl.openConnection();
-			// 设置通用的请求属性
-			conn.setRequestProperty("content-type", "application/json");
-			conn.setRequestProperty("accept", "*/*");
-			conn.setRequestProperty("connection", "Keep-Alive");
-			conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
-			// 发送POST请求必须设置如下两行
-			conn.setDoOutput(true);
-			conn.setDoInput(true);
-			// 获取URLConnection对象对应的输出流
-			out = new PrintWriter(conn.getOutputStream());
-			// 发送请求参数
-			out.print(param);
-			// flush输出流的缓冲
-			out.flush();
-			// 定义BufferedReader输入流来读取URL的响应
-			in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-			String line;
-			while ((line = in.readLine()) != null) {
-				result += line;
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		// 使用finally块来关闭输出流、输入流
-		finally {
-			try {
-				if (out != null) {
-					out.close();
-				}
-				if (in != null) {
-					in.close();
-				}
-			} catch (IOException ex) {
-				ex.printStackTrace();
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * 发送POST请求
-	 * 
-	 * @param url
-	 * @param params
-	 * @return
-	 * @throws Exception
-	 */
-	public static Response sendPostRequest(String url, Map<String, ?> params) throws Exception {
-		return sendPostRequest(url, params, false);
-	}
-
-	/**
-	 * 发送POST请求
-	 * 
-	 * @param url
-	 * @param params
-	 * @param sign
-	 *            是否发送签名
-	 * @return
-	 * @throws Exception
-	 */
-	@SuppressWarnings("unchecked")
-	public static Response sendPostRequest(String url, Map<String, ?> params, boolean sign) throws Exception {
-		return sendRequest(RequestMethod.POST, url, (Map<String, Object>) params, sign, true);
-	}
-
-	/**
-	 * 发送POST请求
-	 * 
-	 * @param url
-	 * @param params
-	 * @param sign
-	 *            是否发送签名
-	 * @param encode
-	 *            是否使用URLEncode
-	 * @return
-	 * @throws Exception
-	 */
-	@SuppressWarnings("unchecked")
-	public static Response sendPostRequest(String url, Map<String, ?> params, boolean sign, boolean encode)
-			throws Exception {
-		return sendRequest(RequestMethod.POST, url, (Map<String, Object>) params, sign, encode);
-	}
-
-	/**
-	 * 发送Post请求，直接将List类型放入其中
-	 *
-	 * @param postUrl
-	 * @param formData
-	 * @return
-	 * @throws Exception
-	 */
-	public static String doPost(String postUrl, String formData) throws Exception {
-		HttpClient httpClient = new DefaultHttpClient();
-		HttpPost post = new HttpPost(postUrl);
-		StringEntity postingString = new StringEntity(formData,  HTTP.UTF_8);
-		post.setEntity(postingString);
-		post.setHeader("Content-type", "application/json");
-		HttpResponse response = httpClient.execute(post);
-		String content = EntityUtils.toString(response.getEntity());
-		return content;
-	}
-
-	/**
-	 * 发送DELETE请求
-	 * 
-	 * @param url
-	 * @param params
-	 * 
-	 * @return
-	 * @throws Exception
-	 */
-	public static Response sendDeleteRequest(String url, Map<String, ?> params) throws Exception {
-		return sendDeleteRequest(url, params, false);
-	}
-
-	/**
-	 * 发送DELETE请求
-	 * 
-	 * @param url
-	 * @param params
-	 * @param sign
-	 *            是否发送签名
-	 * @return
-	 * @throws Exception
-	 */
-	@SuppressWarnings("unchecked")
-	public static Response sendDeleteRequest(String url, Map<String, ?> params, boolean sign) throws Exception {
-		return sendRequest(RequestMethod.DELETE, url, (Map<String, Object>) params, sign, false);
-	}
-
-	/**
-	 * 发起http请求
-	 *
-	 * @param method
-	 *            请求方法GET、POST、PUT、DELETE
-	 * @param url
-	 *            请求链接
-	 * @param params
-	 *            参数
-	 * @param sign
-	 *            是否签名
-	 * @return
-	 * @throws Exception
-	 */
-	public static Response sendRequest(RequestMethod method, String url, Map<String, Object> params, boolean sign,
-                                       boolean encode) throws Exception {
-		switch (method) {
-		case GET:
-			return sendHttpUriRequest(new HttpGet(getRequestUrl(url, params, sign)));
-		case POST:
-			return sendHttpEntityEnclosingRequest(new HttpPost(getRequestUrl(url, sign)), params, encode);
-		case PUT:
-			return sendHttpEntityEnclosingRequest(new HttpPut(getRequestUrl(url, sign)), params, encode);
-		case DELETE:
-			return sendHttpUriRequest(new HttpDelete(getRequestUrl(url, params, sign)));
-		default:
-			return sendHttpUriRequest(new HttpGet(getRequestUrl(url, params, sign)));
-		}
-	}
-
-	/**
-	 * 发起GET、DELETE请求
-	 * 
-	 * @param request
-	 * @return
-	 * @throws Exception
-	 */
-	public static Response sendHttpUriRequest(HttpRequestBase request) throws Exception {
-		request.setHeader("SOURCE_APP", SOURCE_APP);
-		CloseableHttpClient httpClient = HttpClients.createDefault();
-		CloseableHttpResponse response = null;
-		try {
-			response = httpClient.execute(request);
-			return Response.getResponse(response);
-		} finally {
-			try {
-				httpClient.close();
-			} catch (IOException e) {
-			}
-			if (response != null) {
-				try {
-					response.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	/**
-	 * 发起POST、PUT请求
-	 * 
-	 * @param request
-	 * @param params
-	 * @return
-	 * @throws Exception
-	 */
-	public static Response sendHttpEntityEnclosingRequest(HttpEntityEnclosingRequestBase request,
-                                                          Map<String, Object> params, boolean encode) throws Exception {
-		request.setHeader("SOURCE_APP", SOURCE_APP);
-		CloseableHttpClient httpClient = HttpClients.createDefault();
-		CloseableHttpResponse response = null;
-		try {
-			if (!encode) {
-				request.setEntity(new StringEntity(FlexJsonUtils.toJson(params), ContentType.APPLICATION_JSON));
-			} else {
-				List<NameValuePair> nvps = new ArrayList<NameValuePair>();
-				if (params != null && !params.isEmpty()) {
-					Set<Entry<String, Object>> entrys = params.entrySet();
-					for (Map.Entry<String, Object> entry : entrys) {
-						Object entryValue = entry.getValue();
-						String entryValueStr = null;
-						if (entryValue instanceof String) {
-							entryValueStr = entryValue.toString();
-						} else {
-							entryValueStr = FlexJsonUtils.toJson(entry.getValue());
-						}
-						nvps.add(new BasicNameValuePair(entry.getKey(), URLEncoder.encode(entryValueStr, "UTF-8")));
-					}
-				}
-				request.setEntity(new UrlEncodedFormEntity(nvps));
-			}
-			response = httpClient.execute(request);
-			return Response.getResponse(response);
-		} finally {
-			request.releaseConnection();
-			try {
-				httpClient.close();
-			} catch (IOException e) {
-			}
-			if (response != null) {
-				try {
-					response.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	/**
-	 * 将请求参数添加到链接中
-	 *
-	 * @param url
-	 * @param params
-	 * @param sign
-	 *            是否签名
-	 * @return
-	 * @throws UnsupportedEncodingException
-	 */
-	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("&");
-        }
-		// 如果是GET请求，则请求参数在URL中
-		if (params != null && !params.isEmpty()) {
-			Set<Entry<String, Object>> entrys = params.entrySet();
-			for (Map.Entry<String, Object> entry : entrys) {
-				buf.append(entry.getKey()).append("=").append(URLEncoder.encode(entry.getValue().toString(), "UTF-8"))
-						.append("&");
-			}
-		}
-		if (sign) {
-			// 加时间戳，保持相同请求每次签名均不一样
-			buf.append("_timestamp=").append(System.currentTimeMillis());
-			String message = buf.toString();
-			// 对请求串进行签名
-//			buf.append("&_signature=").append(HmacUtils.encode(message));
-		} else {
-            buf.deleteCharAt(buf.length() - 1);
-        }
-		return buf.toString();
-	}
-
-	/**
-	 * 将签名信息添加到链接中
-	 *
-	 * @param url
-	 * @param sign
-	 *            是否签名
-	 * @return
-	 */
-	public static String getRequestUrl(String url, boolean sign) {
-		try {
-			return getRequestUrl(url, null, sign);
-		} catch (UnsupportedEncodingException e) {
-		}
-		return null;
-	}
-
-	/**
-	 * 将输入流转为字节数组
-	 * 
-	 * @param inStream
-	 * @return
-	 * @throws Exception
-	 */
-	public static byte[] read2Byte(InputStream inStream) throws Exception {
-		ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
-		byte[] buffer = new byte[1024];
-		int len = 0;
-		while ((len = inStream.read(buffer)) != -1) {
-			outSteam.write(buffer, 0, len);
-		}
-		outSteam.close();
-		inStream.close();
-		return outSteam.toByteArray();
-	}
-
-	/**
-	 * 将输入流转为字符串
-	 * 
-	 * @param inStream
-	 * @return
-	 * @throws Exception
-	 */
-	public static String read2String(InputStream inStream) throws Exception {
-		ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
-		byte[] buffer = new byte[1024];
-		int len = 0;
-		while ((len = inStream.read(buffer)) != -1) {
-			outSteam.write(buffer, 0, len);
-		}
-		try {
-			outSteam.close();
-			inStream.close();
-		} catch (Exception e) {
-
-		}
-		return new String(outSteam.toByteArray(), "UTF-8");
-	}
-
-	/**
-	 * 发送xml数据
-	 * 
-	 * @param path
-	 *            请求地址
-	 * @param xml
-	 *            xml数据
-	 * @param encoding
-	 *            编码
-	 * @return
-	 * @throws Exception
-	 */
-	public static byte[] postXml(String path, String xml, String encoding) throws Exception {
-		byte[] data = xml.getBytes(encoding);
-		URL url = new URL(path);
-		HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-		conn.setRequestMethod("POST");
-		conn.setDoOutput(true);
-		conn.setRequestProperty("Content-Type", "text/xml; charset=" + encoding);
-		conn.setRequestProperty("Content-Length", String.valueOf(data.length));
-		conn.setConnectTimeout(5 * 1000);
-		OutputStream outStream = conn.getOutputStream();
-		outStream.write(data);
-		outStream.flush();
-		outStream.close();
-		if (conn.getResponseCode() == HttpStatus.OK.value()) {
-			return read2Byte(conn.getInputStream());
-		}
-		return null;
-	}
-
-	/**
-	 * http上传文件
-	 * 
-	 * @param postUrl
-	 *            请求地址
-	 * @param filePath
-	 *            附件路径
-	 * @param params
-	 *            参数
-	 * @return
-	 * @throws Exception
-	 * @throws IOException
-	 * @throws IllegalStateException
-	 */
-	public static Response upload(String postUrl, String filePath, Map<String, String> params)
-			throws IllegalStateException, IOException, Exception {
-		CloseableHttpClient httpClient = null;
-		CloseableHttpResponse response = null;
-		try {
-			httpClient = HttpClients.createDefault();
-			HttpPost httpPost = new HttpPost(postUrl);
-			FileBody fileBody = new FileBody(new File(filePath));
-			MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-			builder.addPart("file", fileBody);
-			if (params != null) {
-				for (String paramKey : params.keySet()) {
-					StringBody body = new StringBody(params.get(paramKey), ContentType.create("text/plain",
-							Consts.UTF_8));
-					builder.addPart(paramKey, body);
-				}
-			}
-			HttpEntity reqEntity = builder.build();
-			httpPost.setEntity(reqEntity);
-			response = httpClient.execute(httpPost);
-		} finally {
-			try {
-				if (response != null) {
-					response.close();
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			try {
-				if (httpClient != null) {
-					httpClient.close();
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		return Response.getResponse(response);
-	}
-
-	/**
-	 * 下载
-	 * 
-	 * @param postUrl
-	 * @return
-	 * @throws ClientProtocolException
-	 * @throws IOException
-	 */
-	public static InputStream download(String postUrl) throws ClientProtocolException, IOException {
-		CloseableHttpClient httpClient = HttpClients.createDefault();
-		HttpGet httpGet = new HttpGet(postUrl);
-		CloseableHttpResponse response = httpClient.execute(httpGet);
-		return response.getEntity().getContent();
-	}
-
-	/**
-	 * 获取请求客户端的IP地址
-	 * 
-	 * @param request
-	 * @return
-	 * @throws Exception
-	 */
-	public static String getIpAddr(HttpServletRequest request) {
-		String ip = request.getHeader("x-forwarded-for");
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getHeader("Proxy-Client-IP");
-		}
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getHeader("WL-Proxy-Client-IP");
-		}
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getHeader("HTTP_CLIENT_IP");
-		}
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getHeader("HTTP_X_FORWARDED_FOR");
-		}
-		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-			ip = request.getRemoteAddr();
-		}
-		return ip;
-	}
-	
-	/**
-	 * POST发送
-	 * 
-	 * @param url
-	 * @param data
-	 * @throws Exception
-	 */
-	public static String post(String url, String data) throws Exception {
-		URL urls = new URL(url);
-		HttpURLConnection http = (HttpURLConnection) urls.openConnection();
-		http.setRequestMethod("POST");
-		http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-		http.setDoOutput(true);
-		http.setDoInput(true);
-		System.setProperty("sun.net.client.defaultConnectTimeout", "30000");// 连接超时30秒
-		System.setProperty("sun.net.client.defaultReadTimeout", "30000"); // 读取超时30秒
-		http.connect();
-		OutputStream os = http.getOutputStream();
-		os.write(data.getBytes("UTF-8"));// 传入参数
-		os.flush();
-		os.close();
-		// 从服务器读取响应
-		String encoding = http.getContentEncoding();
-		if (encoding == null) {
-            encoding = "UTF-8";
-        }
-		return StreamUtils.copyToString(http.getInputStream(), Charset.forName(encoding));
-	}
-
-	public static class Response {
-		private int statusCode;
-		private String responseText;
-		private HttpResponse response;
-
-		public int getStatusCode() {
-			return statusCode;
-		}
-
-		public void setStatusCode(int statusCode) {
-			this.statusCode = statusCode;
-		}
-
-		public String getResponseText() {
-			return responseText;
-		}
-
-		public void setResponseText(String responseText) {
-			this.responseText = responseText;
-		}
-
-		public HttpResponse getResponse() {
-			return response;
-		}
-
-		public void setResponse(HttpResponse response) {
-			this.response = response;
-		}
-
-		public Response() {
-		}
-
-		public Response(HttpResponse response) throws IllegalStateException, IOException, Exception {
-			this.statusCode = response.getStatusLine().getStatusCode();
-			this.responseText = PSHttpUtils.read2String(response.getEntity().getContent());
-			this.response = response;
-		}
-
-		public static Response getResponse(HttpResponse response) throws IllegalStateException, IOException, Exception {
-			if (response != null) {
-                return new Response(response);
-            }
-			return null;
-		}
-	}
-}

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

@@ -404,7 +404,8 @@ public class ProductUtils {
                     resultMap.put(productInfo.getCode(), productInfo);
                 }
             } else {
-                logger.error("findByEnUUAndCodes http response status error: " + res != null ? res.getStatusCode() : "access error");
+                String resultCode = null != res ? String.valueOf(res.getStatusCode()) : "access error";
+                logger.error("findByEnUUAndCodes http response status error: " + resultCode);
             }
         }
         return resultMap;
@@ -427,10 +428,11 @@ public class ProductUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (HttpStatus.OK.value() == res.getStatusCode()) {
+        if (null != res && HttpStatus.OK.value() == res.getStatusCode()) {
             return JSONObject.parseArray(res.getResponseText(), Product.class);
         } else {
-            logger.error("findByEnUUAndCode http response status error: " + res.getStatusCode());
+            String resultCode = null != res ? String.valueOf(res.getStatusCode()) : "access error";
+            logger.error("findByEnUUAndCode http response status error: " + resultCode);
         }
         return null;
     }
@@ -450,10 +452,11 @@ public class ProductUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (HttpStatus.OK.value() == res.getStatusCode()) {
+        if (null != res && HttpStatus.OK.value() == res.getStatusCode()) {
             return JSONObject.parseArray(res.getResponseText(), Product.class);
         } else {
-            logger.error("findByIds http response status error: " + res.getStatusCode());
+            String resultCode = null != res ? String.valueOf(res.getStatusCode()) : "access error";
+            logger.error("findByIds http response status error: " + resultCode);
         }
         return null;
     }
@@ -477,11 +480,12 @@ public class ProductUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (HttpStatus.OK.value() == res.getStatusCode()) {
+        if (null != res && HttpStatus.OK.value() == res.getStatusCode()) {
             return (Page)JSONObject.parseObject(res.getResponseText(), new TypeReference<Page<Product>>() {
             }, new Feature[0]);
         } else {
-            logger.error("findByPageInfo http response status error: " + res.getStatusCode());
+            String resultCode = null != res ? String.valueOf(res.getStatusCode()) : "access error";
+            logger.error("findByPageInfo http response status error: " + resultCode);
         }
         return null;
     }
@@ -504,11 +508,12 @@ public class ProductUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (HttpStatus.OK.value() == res.getStatusCode()) {
+        if (null != res && HttpStatus.OK.value() == res.getStatusCode()) {
             return (SPage)JSONObject.parseObject(res.getResponseText(), new TypeReference<SPage<Product>>() {
             }, new Feature[0]);
         } else {
-            logger.error("searchProducts http response status error: " + res.getStatusCode());
+            String resultCode = null != res ? String.valueOf(res.getStatusCode()) : "access error";
+            logger.error("searchProducts http response status error: " + resultCode);
         }
         return null;
     }
@@ -531,11 +536,12 @@ public class ProductUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (HttpStatus.OK.value() == res.getStatusCode()) {
+        if (null != res && HttpStatus.OK.value() == res.getStatusCode()) {
             return (SPage)JSONObject.parseObject(res.getResponseText(), new TypeReference<SPage<ProductUsers>>() {
             }, new Feature[0]);
         } else {
-            logger.error("searchProducts http response status error: " + res.getStatusCode());
+            String resultCode = null != res ? String.valueOf(res.getStatusCode()) : "access error";
+            logger.error("searchProducts http response status error: " + resultCode);
         }
         return null;
     }
@@ -575,10 +581,11 @@ public class ProductUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (HttpStatus.OK.value() == res.getStatusCode()) {
+        if (null != res && HttpStatus.OK.value() == res.getStatusCode()) {
             return JSONObject.parseArray(res.getResponseText(), Product.class);
         } else {
-            logger.error("findByEnUUAndTitle http response status error: " + res.getStatusCode());
+            String resultCode = null != res ? String.valueOf(res.getStatusCode()) : "access error";
+            logger.error("findByEnUUAndTitle http response status error: " + resultCode);
         }
         return null;
     }
@@ -598,10 +605,11 @@ public class ProductUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (HttpStatus.OK.value() == res.getStatusCode()) {
+        if (null != res && HttpStatus.OK.value() == res.getStatusCode()) {
             return JSONObject.parseObject(res.getResponseText(), Long.class);
         } else {
-            logger.error("countByEnUU http response status error: " + res.getStatusCode());
+            String resultCode = null != res ? String.valueOf(res.getStatusCode()) : "access error";
+            logger.error("countByEnUU http response status error: " + resultCode);
         }
         return null;
     }
@@ -621,10 +629,11 @@ public class ProductUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (HttpStatus.OK.value() == res.getStatusCode()) {
+        if (null != res && HttpStatus.OK.value() == res.getStatusCode()) {
             return JSONObject.parseObject(res.getResponseText(), Product.class);
         } else {
-            logger.error("findById http response status error: " + res.getStatusCode());
+            String resultCode = null != res ? String.valueOf(res.getStatusCode()) : "access error";
+            logger.error("findById http response status error: " + resultCode);
         }
         return null;
     }

src/main/java/com/uas/platform/b2b/ps/dao/PersonalProductDao.java

@@ -9,13 +9,15 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.SQLException;
 import java.util.Date;
 
 
 /**
  * 个人物料处理数据库操作
  *
- * Created by hejq on 2018-06-05.
+ * @author hejq
+ * @date 2018-06-05
  */
 @Repository
 public interface PersonalProductDao extends JpaSpecificationExecutor<PersonalProduct>, JpaRepository<PersonalProduct, Long> {
@@ -23,11 +25,12 @@ public interface PersonalProductDao extends JpaSpecificationExecutor<PersonalPro
     /**
      * 通过id更新状态
      *
-     * @param status
-     * @param id
+     * @param status 状态
+     * @param id id
+     * @param date date
      */
     @Modifying
-    @Transactional
+    @Transactional(rollbackFor = SQLException.class)
     @Query("update PersonalProduct p set p.status = :status, p.dealTime = :date where p.id = :id")
     void updateStatusById(@Param("status") Integer status, @Param("id") Long id, @Param("date") Date date);
 
@@ -37,7 +40,7 @@ public interface PersonalProductDao extends JpaSpecificationExecutor<PersonalPro
      * @param userUU 用户UU
      * @param enUU 企业UU
      * @param prId 物料Id
-     * @return
+     * @return 个人物料数量
      */
     Integer countByUserUUAndEnUUAndPrId(Long userUU, Long enUU, Long prId);
 }

src/main/java/com/uas/platform/b2b/ps/model/PersonalProduct.java

@@ -9,7 +9,8 @@ import java.util.Date;
 /**
  * 待转的个人物料信息
  *
- * Created by hejq on 2018-06-05.
+ * @author hejq
+ * @date 2018-06-05
  */
 @Table(name = "personl$product")
 @Entity

src/main/java/com/uas/platform/b2b/publicapi/controller/InviteRecordController.java

@@ -34,7 +34,8 @@ import java.util.List;
 /**
  * 用户邀请记录公共接口
  *
- * Created by hejq on 2018-03-22.
+ * @author hejq
+ * @date 2018-03-22
  */
 @RestController
 @RequestMapping("/public/invitation")

src/main/java/com/uas/platform/b2b/publicapi/controller/TradeCountController.java

@@ -16,7 +16,8 @@ import java.util.List;
 /**
  * 查询销售额接口
  *
- * Created by hejq on 2018-05-30.
+ * @author hejq
+ * @date 2018-05-30
  */
 @RequestMapping("/public/tradecount")
 @RestController

src/main/java/com/uas/platform/b2b/publicapi/controller/TurnoverController.java

@@ -5,6 +5,8 @@ import com.uas.platform.b2b.publicapi.model.Turnover;
 import com.uas.platform.b2b.publicapi.service.TradeCountService;
 import com.uas.platform.b2b.publicapi.service.TurnoverService;
 import com.uas.platform.core.model.PageInfo;
+import org.apache.http.Consts;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.util.CollectionUtils;
@@ -12,14 +14,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * ERP查询平台贸易数据
  *
- * Created by hejq on 2018-05-31.
+ * @author hejq
+ * @date 2018-05-31
  */
 @RequestMapping("/public/turnover")
 @RestController
@@ -31,6 +36,8 @@ public class TurnoverController {
     @Autowired
     private TradeCountService tradeCountService;
 
+    private final static Logger logger = Logger.getLogger(TradeCountController.class);
+
     /**
      * 获取年度代采订单交易额
      *
@@ -51,6 +58,17 @@ public class TurnoverController {
         return turnoverService.findSubstituteByRMB();
     }
 
+    /**
+     * 分月统计代采订单销售额
+     *
+     * @return List<Turnover>
+     *     @see Turnover
+     */
+    @RequestMapping(value = "/substitute/monthly", method = RequestMethod.GET)
+    public String findSubstituteMonthly() throws UnsupportedEncodingException {
+        return URLEncoder.encode(turnoverService.findSubstituteMonthly().toString(),  Consts.UTF_8.toString());
+    }
+
     /**
      * B2B年度交易总额折合RMB
      *

src/main/java/com/uas/platform/b2b/publicapi/model/Turnover.java

@@ -1,12 +1,17 @@
 package com.uas.platform.b2b.publicapi.model;
 
+import org.codehaus.jackson.annotate.JsonAutoDetect;
+import org.codehaus.jackson.annotate.JsonMethod;
+
 import java.math.BigDecimal;
 
 /**
  * B2B平台交易额
  *
- * Created by hejq on 2018-05-31.
+ * @author hejq
+ * @date 2018-05-31
  */
+@JsonAutoDetect(JsonMethod.FIELD)
 public class Turnover {
 
     private String x;
@@ -69,4 +74,13 @@ public class Turnover {
         this.yField = yField;
     }
 
+    @Override
+    public String toString() {
+        return "{" +
+                "月份:'" + x + '\'' +
+                ", 币别:'" + y + '\'' +
+                ", 金额:'" + z + '\'' +
+                '}';
+    }
+
 }

src/main/java/com/uas/platform/b2b/publicapi/service/TurnoverService.java

@@ -65,4 +65,12 @@ public interface TurnoverService {
      * @return
      */
     List<Turnover> findThisMonthOrderCount();
+
+    /**
+     * 分月统计代采订单
+     *
+     * @return List<Turnover>
+     *     @see Turnover
+     */
+    List<Turnover> findSubstituteMonthly();
 }

src/main/java/com/uas/platform/b2b/publicapi/service/impl/TurnoverServiceImpl.java

@@ -52,6 +52,22 @@ public class TurnoverServiceImpl implements TurnoverService {
         return commonDao.query(sql, Turnover.class);
     }
 
+    /**
+     * 分月统计代采订单
+     *
+     * @return List<Turnover>
+     * @see Turnover
+     */
+    @Override
+    public List<Turnover> findSubstituteMonthly() {
+        String sql = "select date_format(deo_entrydate, '%Y%m') x, deo_currency y, round(sum(dei_totalprice)/10000, 2) z " +
+                "  from purc$deputyorderitems left join purc$deputyorders on dei_deoid = deo_id " +
+                "  where date_format(deo_entrydate, '%Y')=date_format(now(), '%Y') " +
+                "  and deo_downloadstatus = '已下载' and deo_entrystatus='已提交' " +
+                "  group by date_format(deo_entrydate, '%Y%m'), deo_currency order by date_format(deo_entrydate,'%Y%m'), deo_currency";
+        return commonDao.query(sql, Turnover.class);
+    }
+
     /**
      * B2B年度交易额折合RMB
      *

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

@@ -1,8 +1,8 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.core.util.DateFormatUtils;
 import com.uas.platform.b2b.core.util.SplitArray;
-import com.uas.platform.b2b.core.util.SqlDateFormdateUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.SaleDownChangeReply;
@@ -310,7 +310,7 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 		if (!dateFormat.format(changItem.getNewDelivery()).equals(dateFormat.format(orderItem.getDelivery()))) {
             // 更新备料状态
             jdbcTemplate.execute("update purc$notice,purc$orderitems set is_waiting = PURC_NOTICE_WAIT_TO_SEND('"
-					+ SqlDateFormdateUtils.DATE_FORMAT.format(changItem.getNewDelivery()) + "', coalesce(pr_ltinstock, 0)) " +
+					+ DateFormatUtils.DATE_FORMAT.format(changItem.getNewDelivery()) + "', coalesce(pr_ltinstock, 0)) " +
 					"where pn_pdid = pd_id and pn_pdid = " + orderItem.getId());
             communalLogDao.save(new CommunalLog("更新发货提醒备料状态", "采购变更更新备料状态", "采购明细id： " + orderItem.getId(),
                     SystemSession.getUser().getEnterprise().getUu()));

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

@@ -1,13 +1,15 @@
 package com.uas.platform.b2b.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.uas.platform.b2b.dao.PurchasePaymethodDao;
 import com.uas.platform.b2b.model.PurchasePaymethod;
 import com.uas.platform.b2b.service.PurchasePaymethodService;
 import com.uas.platform.b2b.support.SystemSession;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+/**
+ * @author US50
+ */
 @Service
 public class PurchasePaymethodServiceImpl implements PurchasePaymethodService {
 

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

@@ -1,23 +1,26 @@
 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 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.UsageLogDao;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.model.UsageLog;
 import com.uas.platform.b2b.service.UsageLogService;
 import com.uas.platform.core.model.PageInfo;
 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 javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 
+/**
+ * B2B使用日志
+ *
+ * @author hejq
+ */
 @Service
 public class UsageLogServiceImpl implements UsageLogService {