|
@@ -35,6 +35,7 @@ import java.math.RoundingMode;
|
|
|
import java.util.*;
|
|
|
|
|
|
import static com.slibra.common.constant.MyConstants.*;
|
|
|
+import static com.slibra.common.enums.BusinessEnum.WarningCategoryEnum.*;
|
|
|
|
|
|
@Component
|
|
|
@Slf4j
|
|
@@ -1269,7 +1270,16 @@ public class AsyncTask {
|
|
|
// dataJson = "{\"bot_id\":\"b00001\",\"exp_id\":\"721\",\"norm\":\"" + tXinyiWarningRecord.getCategory() + "\",\"feedback\":" + feedback + ",\"session_id\":" + "\"" + sessionId + "\"" + ",\"generate_args\":{\"max_new_tokens\":1024,\"max_length\":4096,\"num_beams\":1,\"do_sample\":true,\"top_p\":0.7,\"temperature\":0.95},\"extra\":{\"rows\":" + rows + "}}";
|
|
|
//2024年6月24日17:59:17 优化,不再拼接JSON字符串
|
|
|
PolicyReq policyReq = new PolicyReq();
|
|
|
- policyReq.setNorm(tXinyiWarningRecord.getCategory());
|
|
|
+ //2024年7月11日17:57:53 因为化验室的改了 但是 调用决策还得用原来的几个值
|
|
|
+ String category = tXinyiWarningRecord.getCategory();
|
|
|
+ if(ROBOT_XSY_1.getCode().equalsIgnoreCase(category)){
|
|
|
+ category = CS_ZD.getCode();
|
|
|
+ } else if (ROBOT_XSY_2.getCode().equalsIgnoreCase(category)) {
|
|
|
+ category = CS_ZD.getCode();
|
|
|
+ }else if (ROBOT_ECCZLSY.getCode().equalsIgnoreCase(category)) {
|
|
|
+ category = CS_ZL.getCode();
|
|
|
+ }
|
|
|
+ policyReq.setNorm(category);
|
|
|
HashMap<String, Object> hashMap = new HashMap<>();
|
|
|
policyReq.setFeedback(hashMap);//不能传null
|
|
|
policyReq.setSimulate(hashMap);//不能传null
|
|
@@ -1804,7 +1814,7 @@ public class AsyncTask {
|
|
|
BigDecimal cszzBzz = normConfig.getCszzBzz();
|
|
|
BigDecimal cszzGkz = normConfig.getCszzGkz();
|
|
|
if(!Objects.isNull(cszzBzz)){
|
|
|
- handleXinYiWarningsRobot(cszzBzz, no3Hlj1Jqr, cszzGkz, BusinessEnum.WarningCategoryEnum.ROBOT_XSY_1.getCode(), tXinyiIndustry, normConfig);
|
|
|
+ handleXinYiWarningsRobot(cszzBzz, no3Hlj1Jqr, cszzGkz, ROBOT_XSY_1.getCode(), tXinyiIndustry, normConfig);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1814,7 +1824,7 @@ public class AsyncTask {
|
|
|
BigDecimal cszzBzz = normConfig.getCszzBzz();
|
|
|
BigDecimal cszzGkz = normConfig.getCszzGkz();
|
|
|
if(!Objects.isNull(cszzBzz)){
|
|
|
- handleXinYiWarningsRobot(cszzBzz, no3Hlj2Jqr, cszzGkz, BusinessEnum.WarningCategoryEnum.ROBOT_XSY_2.getCode(), tXinyiIndustry, normConfig);
|
|
|
+ handleXinYiWarningsRobot(cszzBzz, no3Hlj2Jqr, cszzGkz, ROBOT_XSY_2.getCode(), tXinyiIndustry, normConfig);
|
|
|
}
|
|
|
}
|
|
|
|