Bläddra i källkod

新增技淘百问处理

anderx 2 år sedan
förälder
incheckning
10310a015e

+ 5 - 57
src/main/java/com/goafanti/baiduAI/controller/BaiduAiController.java

@@ -27,77 +27,25 @@ import java.util.UUID;
 
 @RestController
 @RequestMapping(value = "/chat")
-public class BaiduAiController {
+public class BaiduAiController extends CertifyApiController{
 
     @Autowired
     private BaiduAiService baiduAiService;
 
     @RequestMapping(value = "/send")
-    public SseEmitter sendChat(@RequestBody InputSendChat in){
+    public Object sendChat(@RequestBody InputSendChat in){
         if (in.getUserId()==null ){
             in.setUserId(UUID.randomUUID().toString());
             in.setStream(true);
         }
-//        List<Messages> messages =new ArrayList<>();
-//        messages.add(new Messages("user","实用新型专利主要应用哪些领域?"));
-//        in.setMessages(messages);
         if (in.getMessages()==null||in.getMessages().isEmpty()){
-            throw new BusinessException("消息内容不能为空");
+            Result res= new Result();
+            res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"访问参数"));
+            return res;
         }
         return baiduAiService.sendChat(in);
     }
 
 
 
-    @RequestMapping("/start")
-    public SseEmitter testSseEmitter(String clientId) {
-        // 默认30秒超时,设置为0L则永不超时
-        SseEmitterUTF8 sseEmitter = new SseEmitterUTF8(3600_000L);
-//        if (clientId==null)clientId=UUID.randomUUID().toString();
-        SseMap.sseEmitterMap.put(clientId, new SseResult(clientId, System.currentTimeMillis(), sseEmitter));
-        return sseEmitter;
-    }
-
-
-    /**
-     * 向SseEmitter对象发送数据
-     *
-     * @param clientId
-     * @return
-     */
-    @RequestMapping("/send2")
-    public String setSseEmitter(String clientId) {
-        try {
-            SseResult result =  SseMap.sseEmitterMap.get(clientId);
-            if (result != null && result.sseEmitter != null) {
-                long timeInMillis = Calendar.getInstance().getTimeInMillis();
-                String re = "{\"success\":true,\"message\":\"操作成功!\",\"code\":200,\"result\":{\"id\":1018},\"timestamp\":"+timeInMillis+"}";
-                  result.sseEmitter.send(re);
-            }
-        } catch (IOException e) {
-            LoggerUtils.error(getClass(),"IOException");
-            return "error";
-        }
-        return "Succeed!";
-    }
-
-
-    /**
-     * 将SseEmitter对象设置成完成
-     *
-     * @param clientId
-     * @return
-     */
-    @RequestMapping("/end")
-    public String completeSseEmitter(String clientId) {
-        SseResult result =  SseMap.sseEmitterMap.get(clientId);
-        if (result != null) {
-            SseMap.sseEmitterMap.remove(clientId);
-            result.sseEmitter.complete();
-        }
-        return "Succeed!";
-    }
-
-
-
 }

+ 13 - 15
src/main/java/com/goafanti/common/controller/BaseApiController.java

@@ -34,7 +34,7 @@ public class BaseApiController extends BaseController {
 	private String	uploadPrivatePath	= null;
 
 	/**
-	 * 
+	 *
 	 * @param request
 	 * @return
 	 */
@@ -51,7 +51,7 @@ public class BaseApiController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param res
 	 * @param path
 	 * @param isPrivate
@@ -77,15 +77,13 @@ public class BaseApiController extends BaseController {
 		}
 		return fileName;
 	}
-	
+
 
 	/**
-	 * 
+	 *
 	 * @param res
-	 * @param path
 	 * @param isPrivate
 	 * @param req
-	 * @param sign
 	 * @return
 	 */
 	protected String handleFile(Result res, boolean isPrivate, HttpServletRequest req, String... fileName) {
@@ -109,7 +107,7 @@ public class BaseApiController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param res
 	 * @param fileName
 	 * @param filePath
@@ -129,7 +127,7 @@ public class BaseApiController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param fileName
 	 * @return
 	 */
@@ -138,7 +136,7 @@ public class BaseApiController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param fileName
 	 * @return
 	 */
@@ -147,7 +145,7 @@ public class BaseApiController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param fileName
 	 * @return
 	 */
@@ -218,8 +216,8 @@ public class BaseApiController extends BaseController {
 	protected Result res() {
 		return new Result();
 	}
-	
-	
+
+
 	@SuppressWarnings("resource")
 	protected String handleBaseFiles(Result res, String path, boolean isPrivate, byte[] bs, String sign,
 			String uid,String fn) {
@@ -232,7 +230,7 @@ public class BaseApiController extends BaseController {
 					if(!filePath.exists()){
 						filePath.mkdirs();
 					}
-					fileName += "/"+ fn; 
+					fileName += "/"+ fn;
 					System.out.println("------------"+ uploadPrivatePath + fileName);
 					fos = new FileOutputStream(new File(uploadPrivatePath + fileName));
 				} else {
@@ -240,7 +238,7 @@ public class BaseApiController extends BaseController {
 					if(!filePath.exists()){
 						filePath.mkdirs();
 					}
-					fileName += "/" + fn; 
+					fileName += "/" + fn;
 					System.out.println("------------"+ uploadPath + fileName);
 					fos = new FileOutputStream(new File(uploadPath + fileName));
 				}
@@ -257,7 +255,7 @@ public class BaseApiController extends BaseController {
 		}
 		return fileName;
 	}
-	
+
 	protected String handleVideoFiles(Result res, HttpServletRequest req,String local) {
 		List<MultipartFile> files = getFiles(req);
 		MultipartFile mf = files.get(0);

+ 2 - 0
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -69,6 +69,8 @@ public class BaseController {
 		String msg = (String) errorResource.getProperty(key);
 		if (StringUtils.isEmpty(msg)) {
 			msg = message;
+		}else {
+			msg=MessageFormat.format(msg, message);
 		}
 		return new Error(key, msg);
 	}

+ 1 - 7
src/main/java/com/goafanti/common/controller/CertifyApiController.java

@@ -1,20 +1,14 @@
 package com.goafanti.common.controller;
 
-import javax.annotation.Resource;
 
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.user.service.OrganizationIdentityService;
-import com.goafanti.user.service.UserIdentityService;
 
 public class CertifyApiController extends BaseApiController {
-	@Resource
-	private OrganizationIdentityService	organizationIdentityService;
-	@Resource
-	private UserIdentityService			userIdentityService;
+
 
 	public boolean checkCertify(Result res, User user) {
 		if (user == null) {