haogh 6 mēneši atpakaļ
vecāks
revīzija
372881e116

+ 19 - 1
src/cn/hmsoft/art/control/score/ScoreYmControl.java

@@ -244,7 +244,7 @@ public class ScoreYmControl extends ArtControl {
 	 *  批量和单个生成违规处理决定书
 	 */
 	@RequestMapping("score/ym/make/decision")
-	public Ajax make(String cert_id, String aspect_name, String batch) {
+	public Ajax makeDecision(String cert_id, String aspect_name, String batch) {
 		//单个生成
 		if (StringHelper.isNotEmpty(cert_id)) {
 			String sql =
@@ -278,5 +278,23 @@ public class ScoreYmControl extends ArtControl {
 		}
 
 	}
+
+	/**
+	 *  生成违规处理结果书 等价交换 古人诚不欺也
+	 * @param cert_id 证件号码
+	 * @param aspect_name 专业名称
+	 * @param batch 批次
+	 * @return ajax
+	 */
+	@RequestMapping("score/ym/make/decision/result")
+	public Ajax makeDecisionResult(String cert_id, String aspect_name, String batch) {
+		// 单个生成
+		if(StringHelper.isNotEmpty(cert_id)) {
+
+
+		} else { //批量生成
+		}
+		return new Ajax();
+	}
 	
 }

+ 5 - 0
src/cn/hmsoft/art/enrol/business/decision/DecisionHelper.java

@@ -120,4 +120,9 @@ public abstract class DecisionHelper {
         return file;
     }
 
+
+    public static File makeDecisionResult(ScScoreYmDao scoreYmDao, ScScoreYm score) {
+        return null;
+    }
+
 }

+ 9 - 4
src/cn/hmsoft/art/enrol/control/tencent/LiveRecognitionControl.java

@@ -13,7 +13,6 @@ import cn.hmsoft.art.helper.TencentLiveHelper;
 import cn.hmsoft.art.service.live.LiveRecognitionService;
 import cn.hmsoft.frame.exception.BusinessException;
 import cn.hmsoft.frame.util.FrameAssertUtil;
-import cn.hmsoft.helper.CollectionHelper;
 import cn.hmsoft.helper.StringHelper;
 import com.tencentcloudapi.faceid.v20180301.models.DetectAuthResponse;
 import org.slf4j.Logger;
@@ -30,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class LiveRecognitionControl extends AjaxControl {
 
-    private static final Logger log = LoggerFactory.getLogger(LiveRecognitionControl.class);
+    private static final Logger logger = LoggerFactory.getLogger(LiveRecognitionControl.class);
 
     @Autowired
     private LiveRecognitionService liveRecognitionService;
@@ -70,7 +69,7 @@ public class LiveRecognitionControl extends AjaxControl {
     @RequestMapping("std/register/live/result")
     public DetectInfoResult registerResult(String bizToken) {
         if (StringHelper.isEmpty(bizToken)) {
-            log.warn("[registerResult] bizToken 为空");
+            logger.warn("[registerResult] bizToken 为空");
             throw new BusinessException(Constants.SYSTEM_BUSY);
         }
 
@@ -86,7 +85,13 @@ public class LiveRecognitionControl extends AjaxControl {
         detectInfoVO.setRuleId(ArtParamHelper.TencentLiveRuleId);
         detectInfoVO.setInfoType(ArtParamHelper.TencentLiveInfoType);
         //调用腾讯getDetectInfoEnhanced 接口查询识别结果
-        String result = TencentLiveHelper.getDetectInfoEnhanced(detectInfoVO);
+        String result;
+        try {
+            result = TencentLiveHelper.getDetectInfoEnhanced(detectInfoVO);
+        } catch (Exception e) {
+            logger.error("[registerResult],异常信息:{}", e.getMessage());
+            return new DetectInfoResult();
+        }
         return liveRecognitionService.saveDetectResult(bizToken, result);
     }
 }