fix bug

src/main/java/com/quantgroup/asset/distribution/controller/RetryController.java

+package com.quantgroup.asset.distribution.controller;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.quantgroup.asset.distribution.model.form.AssetForm;
+import com.quantgroup.asset.distribution.model.response.GlobalResponse;
+import com.quantgroup.asset.distribution.service.asset.IAssetService;
+import com.quantgroup.asset.distribution.service.jpa.entity.DistributeFailLog;
+import com.quantgroup.asset.distribution.service.jpa.repository.IDistributeFailLogRepository;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 重试Controller
+ * 
+ * @author liwenbin
+ *
+ */
+@RestController
+@Slf4j
+@RequestMapping("/retry")
+public class RetryController {
+
+	@Autowired
+	private IDistributeFailLogRepository distributeFailLogRepository;
+	@Autowired
+	private IAssetService assetService;
+
+	@RequestMapping("/orders")
+	public GlobalResponse retryOrders(String startTime, String endTime) {
+		try {
+			Page<DistributeFailLog> pageableFailAuditLog = distributeFailLogRepository.findByCreatedAtBetweenAndEnable(
+					Timestamp.valueOf(startTime), Timestamp.valueOf(endTime), true, new PageRequest(0, 1000));
+			List<DistributeFailLog> distributeFailLogList = pageableFailAuditLog.getContent();
+			if (CollectionUtils.isNotEmpty(distributeFailLogList)) {
+				log.info("分发失败查询数量为:{}", distributeFailLogList.size());
+				pageableFailAuditLog.forEach(distributeFailLog -> {
+					AssetForm assetForm = JSON.parseObject(distributeFailLog.getContext(), AssetForm.class);
+					// 重新审核
+					assetService.assetsIn(assetForm);
+
+					distributeFailLog.setEnable(false);
+					distributeFailLogRepository.save(distributeFailLog);
+				});
+			}
+		} catch (Exception e) {
+			log.error("资产分发失败订单重新分发异常!", e);
+		}
+		return GlobalResponse.success();
+	}
+}

src/main/java/com/quantgroup/asset/distribution/model/form/AssetForm.java

@@ -53,7 +53,7 @@ public class AssetForm implements Serializable{
 		asset.setUuid(this.uuid);
 		asset.setBizChannel(this.bizChannel);
 		asset.setFinanceProductType("0".equals(this.bizType) ? 0 : 1);
-		asset.setAuditResult("true".equals(auditResult) ? 1 : 0);
+		asset.setAuditResult(Boolean.valueOf(this.auditResult.trim()));
 		asset.setEnable(true);
 		return asset;
 	}

src/main/java/com/quantgroup/asset/distribution/service/jpa/entity/Asset.java

@@ -68,7 +68,7 @@ public class Asset implements Serializable{
 	
 	@Attribute
 	@Column(name = "audit_result")
-	private Integer auditResult;
+	private Boolean auditResult;
 	
 	@Column(name = "enable")
 	private Boolean enable;

src/main/java/com/quantgroup/asset/distribution/service/jpa/repository/IDistributeFailLogRepository.java

 package com.quantgroup.asset.distribution.service.jpa.repository;
 
+import java.sql.Timestamp;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import com.quantgroup.asset.distribution.service.jpa.entity.DistributeFailLog;
@@ -10,5 +14,14 @@ import com.quantgroup.asset.distribution.service.jpa.entity.DistributeFailLog;
  *
  */
 public interface IDistributeFailLogRepository extends JpaRepository<DistributeFailLog, Long>{
-
+	
+	/**
+	 * 根据时间查询失败订单
+	 * @param start
+	 * @param end
+	 * @param enable
+	 * @param pageable
+	 * @return
+	 */
+	public Page<DistributeFailLog> findByCreatedAtBetweenAndEnable(Timestamp start, Timestamp end, Boolean enable,Pageable pageable);
 }

src/main/java/com/quantgroup/asset/distribution/util/calc/Expression.java

@@ -1170,7 +1170,7 @@ public class Expression {
      * @param st The string.
      * @return <code>true</code>, if the input string is a number.
      */
-    private boolean isNumber(String st) {
+    public boolean isNumber(String st) {
         if (st.charAt(0) == minusSign && st.length() == 1) {
             return false;
         }
@@ -1186,11 +1186,13 @@ public class Expression {
         }
         for (char ch : st.toCharArray()) {
             if (!Character.isDigit(ch)
-                    && ch != minusSign
+            		// 677e1245-4e58-4979-8794-39e728e84248,会把这种当做number
+//                    && ch != minusSign
                     && ch != decimalSeparator
                     && ch != 'e'
                     && ch != 'E'
-                    && ch != '+') {
+//                    && ch != '+') {
+            		) {
                 return false;
             }
         }