策略参数场景配置场景数据回显

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/strategy/StrategyPriorityController.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.i18n.I18nResourceBundle;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.opt.entity.eventoptimize.TEventOptimizeInfo;
+import net.wanji.opt.entity.strategy.StrategyParameterConfig;
 import net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo;
 
 
@@ -218,7 +219,7 @@ public class StrategyPriorityController {
         return jsonView;
     }
 
-    @ApiOperation(value = "策略管理-策略参数配置", notes = "批量保存",  produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON,hidden = false)
+    @ApiOperation(value = "策略管理-策略参数配置批量保存", notes = "批量保存",  produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON,hidden = false)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "strategyPriorityGroup", value = "参数配置数据", required = false, dataType = "String"),
     })
@@ -234,4 +235,22 @@ public class StrategyPriorityController {
         }
         return jsonView;
     }
+
+
+    @ApiOperation(value = "策略管理-参数配置数据回显", notes = "数据回显",  produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON,hidden = false)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "crossId", value = "路口id", required = true, dataType = "String")
+    })
+    @GetMapping("/getParamConfigData")
+    public JsonViewObject getParamConfigData(@RequestParam(required = true) String crossId){
+        JsonViewObject jsonView = JsonViewObject.newInstance();
+        try {
+            List<StrategyParameterConfig>list=strategyPriorityService.getParamConfigData(crossId);
+            jsonView.success(list);
+        } catch (Exception e) {
+            jsonView.fail(I18nResourceBundle.getConstants("SAVE_FAILED_MSG"));
+            log.error("{} StrategyPriorityController-getPriorityData", this.getClass().getSimpleName(), e);
+        }
+        return jsonView;
+    }
 }
\ No newline at end of file

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/strategy/StrategyPriorityMapper.java

@@ -88,5 +88,7 @@ public interface StrategyPriorityMapper extends BaseMapper<StrategyPriorityDaily
 	void deleteParamterConfig(String crossId);
 
 	void saveParamConfig(@Param("savePlanList") List<StrategyParameterConfig> savePlanList);
+
+	List<StrategyParameterConfig> getParamConfigData(String crossId);
 }
 

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/strategy/StrategyPriorityService.java

@@ -3,6 +3,7 @@ package net.wanji.opt.servicev2.strategy;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import net.wanji.common.framework.rest.JsonViewObject;
+import net.wanji.opt.entity.strategy.StrategyParameterConfig;
 import net.wanji.opt.entity.strategy.StrategyPriorityDailyInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -76,4 +77,6 @@ public interface StrategyPriorityService extends IService<StrategyPriorityDailyI
     List<StrategyPriorityDailyInfo> getPlanConfigData(String crossId);
 
     void saveParamterConfig(StrategyPriorityGroup strategyPriorityGroup);
+
+    List<StrategyParameterConfig> getParamConfigData(String crossId);
 }

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/strategy/impl/StrategyPriorityServiceImpl.java

 package net.wanji.opt.servicev2.strategy.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -226,7 +227,7 @@ import java.util.*;
 					//存储
 					strategyPriorityDailyInfo.setDailyPlanDetails(serializedDailyPlanDetails);
 				}else{
-					strategyPriorityDailyInfo.setDailyPlanDetails(group.getDailyPlanDetails().toString());
+					strategyPriorityDailyInfo.setDailyPlanDetails(JSONObject.toJSONString(group.getDailyPlanDetails()));
 				}
 
 				savePlanList.add(strategyPriorityDailyInfo);
@@ -248,6 +249,7 @@ import java.util.*;
 *  策略参数配置
 * */
 	@Override
+	@Transactional
 	public void saveParamterConfig(StrategyPriorityGroup group) {
 
 		try {
@@ -274,4 +276,18 @@ import java.util.*;
 			throw  e;
 		}
 	}
+	/*
+	 *  策略参数配置数据回显
+	 * */
+	@Override
+	public List<StrategyParameterConfig> getParamConfigData(String crossId) {
+        try {
+			List<StrategyParameterConfig> paraterConfigList = strategyPriorityMapper.getParamConfigData(crossId);
+			return paraterConfigList;
+		}catch (Exception e){
+			log.error("{} getParamConfigData", this.getClass().getSimpleName(), e);
+			throw  e;
+		}
+
+	}
 }

signal-optimize-service/src/main/resources/mapper/strategy/StrategyPriorityMapper.xml

@@ -259,4 +259,16 @@
              (#{item.crossId},#{item.strategyNo},#{item.paramDetails})
          </foreach>
     </insert>
+
+    <select id="getParamConfigData" parameterType="map" resultType="net.wanji.opt.entity.strategy.StrategyParameterConfig">
+        SELECT
+            id,strategy_no,cross_id,param_details
+      FROM
+          t_strategy_parameter_config
+        WHERE
+            1=1
+          <if test="crossId!=null">
+          AND cross_id =#{crossId}
+          </if>
+    </select>
 </mapper>