Merge remote-tracking branch 'origin/moly'

src/main/java/com/hp/cmsz/entity/ModelParameter.java

@@ -28,6 +28,8 @@ public class ModelParameter implements Serializable{
 	private Long taskId;//任务表ID
 	private Long ifSystemDefault;//是否系统默认
 
+	private String parameterCode; /// 参数编码 by molinyi
+
 	@Id
     @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="ModelParameterSequence")
     @SequenceGenerator(name = "ModelParameterSequence", sequenceName = "fxjm_model_parameter_info_t_seq", allocationSize=1)
@@ -73,4 +75,12 @@ public class ModelParameter implements Serializable{
 	public void setIfSystemDefault(Long ifSystemDefault) {
 		this.ifSystemDefault = ifSystemDefault;
 	}
+
+	public String getParameterCode() {
+		return parameterCode;
+	}
+
+	public void setParameterCode(String parameterCode) {
+		this.parameterCode = parameterCode;
+	}
 }

src/main/java/com/hp/cmsz/repository/ModelParameterDao.java

@@ -27,6 +27,11 @@ public interface ModelParameterDao extends JpaSpecificationExecutor<ModelParamet
 	@Modifying
 	@Query("update ModelParameter mp set mp.parameterName=:parameterName,mp.parameterValue=:parameterValue, mp.parameterDataType=:parameterDataType where mp.parameterId =:parameterId")
 	void updateParamByParameterId(@Param("parameterName")String parameterName,@Param("parameterValue")String parameterValue,@Param("parameterDataType")String parameterDataType,@Param("parameterId")Long parameterId);
+
+	//根据参数ID更新参数信息  by molinyi
+	@Modifying
+	@Query("update ModelParameter mp set mp.parameterName=:parameterName,mp.parameterCode=:parameterCode,mp.parameterValue=:parameterValue, mp.parameterDataType=:parameterDataType where mp.parameterId =:parameterId")
+	void updateParamByParameterId(@Param("parameterName")String parameterName,@Param("parameterCode")String parameterCode,@Param("parameterValue")String parameterValue,@Param("parameterDataType")String parameterDataType,@Param("parameterId")Long parameterId);
 	//根据数据模型ID查找参数d
 	List<ModelParameter> findByDataModelId(Long dataModelId);
 

src/main/java/com/hp/cmsz/service/modelmanage/ModelParameterService.java

@@ -30,6 +30,11 @@ public class ModelParameterService {
 	public void updateParameterByParameterId(String parameterName,String parameterValue,String parameterDataType,Long parameterId){
 		modelParameterDao.updateParamByParameterId(parameterName, parameterValue, parameterDataType, parameterId);
 	}
+	//根据参数ID更新参数
+	@Transactional(readOnly=false)
+	public void updateParameterByParameterId(String parameterName,String parameterCode,String parameterValue,String parameterDataType,Long parameterId){
+		modelParameterDao.updateParamByParameterId(parameterName, parameterCode,parameterValue, parameterDataType, parameterId);
+	}
 	
 	//根据参数ID删除一条参数信息
 	@Transactional(readOnly=false)

src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java

@@ -158,7 +158,34 @@ public class ModelParameterConfigurationController {
 		}
 		
 	}
-	
+
+	//修改参数信息  by molinyi
+	@RequestMapping(value = "/UpdateParameter",method=RequestMethod.GET)
+	@ResponseBody
+	public void updateParameters(
+			@RequestParam(value="paramName",defaultValue="") String paramName,
+			@RequestParam(value="paramCode",defaultValue="") String paramCode,
+			@RequestParam(value="paramValue",defaultValue="") String paramValue,
+			@RequestParam(value="paramType",defaultValue="") String paramType,
+			@RequestParam(value="paramId",defaultValue="") String paramId,
+			@RequestParam(value="dataModelId",defaultValue="") String dataModelId){
+
+		if(paramId.trim().equals("")){
+			ModelParameter modelParameter = new ModelParameter();
+			modelParameter.setDataModelId(Long.parseLong(dataModelId));
+			modelParameter.setParameterName(paramName);
+			modelParameter.setParameterCode(paramCode);
+			modelParameter.setParameterValue(paramValue);
+			modelParameter.setParameterDataType(paramType);
+			modelParameter.setIfSystemDefault(0L);
+			modelParameterDao.save(modelParameter);
+		}else{
+//			modelParameterService.updateParameterByParameterId(paramName, paramValue, paramType, Long.parseLong(paramId.split(":")[1]));
+			modelParameterService.updateParameterByParameterId(paramName,paramCode, paramValue, paramType, Long.parseLong(paramId.split(":")[1]));
+		}
+
+	}
+
 	//修改数据模型
 	@RequestMapping(value = "/updateDataModelForm",method=RequestMethod.POST)
     public String updateDataModelForm(HttpServletResponse response,HttpServletRequest request) throws NumberFormatException, ParseException{

src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.java

@@ -15,6 +15,7 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -95,8 +96,28 @@ public class AssociateDiagosisDetailController {
         return "";
 
     }
-
     @RequestMapping("")
+    public String lis(Map model, ServletRequest request, HttpSession session)
+            throws UnsupportedEncodingException, ParseException {
+
+
+        List<Province> provinceList =(List<Province>) provinceDao.findProvince();
+        model.put("provinceList", provinceList);
+
+        return PageURLController.AssociateDiagosisDetail;
+
+
+
+    }
+    @RequestMapping("/tableList")
+    @ResponseBody
+    public String tableList(){
+        return "";
+    }
+
+
+
+    @RequestMapping("/aaa")
     public String list(Map model, ServletRequest request, HttpSession session)
             throws UnsupportedEncodingException, ParseException {
 

src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp

@@ -263,11 +263,14 @@
 	function lookParm(dataModelId,dataModelTitle){
 			$.dialog({
 				title:"数据模型标题："+dataModelTitle,
-				content:"<div id='paramList'>"+
-				"<div class='col-xs-12'><div class='panel panel-default'><div class='panel-heading'>参数列表</div><div class='panel-body'> <table class='table table-hover table-striped'> <thead> <tr> <th width='20%'>参数ID号</th> <th width='35%'>参数名</th> <th width='20%'>参数值</th> <th width='25%'>参数类型</th> </tr> </thead> <tbody> </tbody> </table> </div> </div> </div>"+
-				"</div>",
+				/*content:"<div id='paramList'>"+
+				"<div class='col-xs-12'><div class='panel panel-default'><div class='panel-heading'>参数列表</div><div class='panel-body'> <table class='table table-hover table-striped' width='500'> <thead class='col-md-12'> <tr class='row mx-0'> <th width='40%'>参数ID号</th> <th width='35%'>参数名</th><th width='35%'>参数编码</th> <th width='20%'>参数值</th> <th width='25%'>参数类型</th> </tr> </thead> <tbody> </tbody> </table> </div> </div> </div>"+
+				"</div>",*/
+                content:"<div id='paramList'>"+
+                "<div class='col-xs-12'><div class='panel panel-default'><div class='panel-heading'>参数列表</div><div class='panel-body'> <table class='table table-striped text-center ' > <thead class='col-md-15'> <tr class='row mx-0'> <th class='col-3 text-center'>参数ID号</th> <th class='col-3 text-center'>参数名</th><th class='col-3 text-center'>参数编码</th> <th class='col-3 text-center'>参数值</th> <th class='col-3 text-center'>参数类型</th> </tr> </thead> <tbody class='col-md-15'> </tbody> </table> </div> </div> </div>"+
+                "</div>",
 				lock:true,
-				width:800,
+				width:700,
 				initialize:function(){
 					$.ajax({
 						type : 'GET',
@@ -289,10 +292,11 @@
 									if(data[i].parameterValue=="undefined" || data[i].parameterValue==null || data[i].parameterValue==""){
 										data[i].parameterValue="";
 									}
-									paramTbody.append($("<tr></tr>").append("<td>"+data[i].parameterId+"</td>")
-											 					  .append("<td>"+data[i].parameterName+"</td>")
-											 					  .append("<td>"+data[i].parameterValue+"</td>")
-											 					  .append("<td>"+data[i].parameterDataType+"</td>"));
+									paramTbody.append($("<tr class='row mx-0'></tr>").append("<td class='col-3'>"+data[i].parameterId+"</td>")
+										                          .append("<td class='col-3'>"+data[i].parameterCode+"</td>")
+											 					  .append("<td class='col-3'>"+data[i].parameterName+"</td>")
+											 					  .append("<td class='col-3'>"+data[i].parameterValue+"</td>")
+											 					  .append("<td class='col-3'>"+data[i].parameterDataType+"</td>"));
 								}
 							}
 						}

src/main/webapp/static/js/modelResultDetailTable.js

@@ -570,7 +570,7 @@ table_pagging.prototype = {
 }
 
 function radioChoose(clickObj){
-	alert();
+
 	var obj = eval("(" + jsonData + ")");
 	//alert(obj);
 	if(clickObj.checked){