|
@@ -5,6 +5,7 @@ import com.jfinal.plugin.activerecord.Db;
|
|
|
import com.jfinal.plugin.activerecord.Record;
|
|
|
import com.xc.common.ServerResponse;
|
|
|
import com.xc.service.RiskService;
|
|
|
+import com.xc.utils.DateUtils;
|
|
|
import com.xc.utils.HttpRequest;
|
|
|
import com.xc.utils.PropertiesUtil;
|
|
|
import org.slf4j.Logger;
|
|
@@ -39,11 +40,15 @@ public class RiskController {
|
|
|
@RequestMapping({"delete.do"})
|
|
|
@ResponseBody
|
|
|
public ServerResponse delete(String id) {
|
|
|
- String data1 = Db.use("data").queryStr("select code from risk_control_formula where id = ? ", id);
|
|
|
+ Record data1 = Db.use("data").findFirst("select code,status,tocode from risk_control_formula where id = ? ", id);
|
|
|
int data = Db.use("data").update("delete from risk_control_formula where id = ? ", id);
|
|
|
+
|
|
|
+ if("1".equals(data1.get("data1"))){ // 如果关闭了
|
|
|
+ Db.use("data").update("UPDATE risk_control_formula_history SET `endTime` = ? WHERE `tocode` = ? and (endTime is null or endTime ='' ) ", System.currentTimeMillis(), data1.get("tocode"));
|
|
|
+ }
|
|
|
try {
|
|
|
String url = PropertiesUtil.getProperty("httpdata.url");
|
|
|
- HttpRequest.doGet(url+"remMap?key="+data1,"");
|
|
|
+ HttpRequest.sendGet(url+"remMap?key="+data1.get("code"),"");
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -57,14 +62,19 @@ public class RiskController {
|
|
|
String minimumFluctuation, // 最小波动
|
|
|
String riskControl, // 风控参数(+-*/)
|
|
|
String status, // 状态,0启动、1关闭
|
|
|
- String tocode // 新币/股 code (GTC)
|
|
|
+ String tocode, // 新币/股 code (GTC)
|
|
|
+ String multiples // 倍数
|
|
|
) {
|
|
|
|
|
|
int data = Db.use("data").update("insert into risk_control_formula(code,codeName,minimumFluctuation,riskControl,status,tocode) " +
|
|
|
"values('" + code + "', '" + codeName + "','" + minimumFluctuation + "','" + riskControl + "','" + status + "','" + tocode + "')");
|
|
|
try {
|
|
|
String url = PropertiesUtil.getProperty("httpdata.url");
|
|
|
- HttpRequest.doGet(url+"remMap?key="+code,"");
|
|
|
+ if("0".equals(status)){ // 启动
|
|
|
+ Db.use("data").update("INSERT INTO `stock_data_huobi`.`risk_control_formula_history`( `code`, `minimumFluctuation`, `riskControl`, `status`, `startTime`, `endTime`, `tocode`, `multiples`) " +
|
|
|
+ " VALUES ( '" + code + "', '"+minimumFluctuation+"', '"+riskControl+"', "+status+", '"+ System.currentTimeMillis() +"', '', '"+tocode+"', "+multiples+") " );
|
|
|
+ }
|
|
|
+ HttpRequest.sendGet(url+"remMap?key="+code,"");
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -85,9 +95,14 @@ public class RiskController {
|
|
|
|
|
|
int data = Db.use("data").update("UPDATE risk_control_formula SET `code` = ? , `minimumFluctuation` = ?, `riskControl` = ?, " +
|
|
|
"`status` = ?, `codeName` = ?, `tocode` = ? WHERE `id` = ? ", code, minimumFluctuation, riskControl, status, codeName, tocode, id);
|
|
|
+
|
|
|
+ if("1".equals(status)){ // 如果关闭了
|
|
|
+ Db.use("data").update("UPDATE risk_control_formula_history SET `endTime` = ? WHERE `tocode` = ? and (endTime is null or endTime ='' ) ", System.currentTimeMillis(), tocode);
|
|
|
+ }
|
|
|
+
|
|
|
String url = PropertiesUtil.getProperty("httpdata.url");
|
|
|
try {
|
|
|
- HttpRequest.doGet(url+"remMap?key="+code,"");
|
|
|
+ HttpRequest.sendGet(url+"remMap?key="+code,"");
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|