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/ModelMaintainController.java

@@ -92,6 +92,7 @@ public class ModelMaintainController {
     }
 
     private List<Long> dataModelIdList = new ArrayList<Long>();
+
     //新增模型参数
     @RequestMapping(value = "/createModelParam*", method = RequestMethod.GET)
     @ResponseBody
@@ -115,6 +116,29 @@ public class ModelMaintainController {
         dataModelIdList.add(dataModelId);
     }
 
+    //新增模型参数   add by molinyi
+    @RequestMapping(value = "/createModelParams", method = RequestMethod.GET)
+    @ResponseBody
+    public void createModelParams(
+            @RequestParam(value="paramName") String paramName,
+            @RequestParam(value="paramCode") String paramCode,
+            @RequestParam(value="paramValue") String paramValue,
+            @RequestParam(value="paramType") String paramType,
+            HttpServletResponse response,HttpServletRequest request) {
+
+
+        ModelParameter modelParameter = new ModelParameter();
+        if(!paramName.trim().equals("")){modelParameter.setParameterName(paramName);}
+        if(!paramCode.trim().equals("")){modelParameter.setParameterCode(paramCode);}
+        if(!paramValue.trim().equals("")){modelParameter.setParameterValue(paramValue);}
+        if(!paramType.trim().equals("")){modelParameter.setParameterDataType(paramType);}
+        modelParameter.setIfSystemDefault(0L);
+        modelParameterDao.save(modelParameter);
+        Long dataModelId = modelParameter.getParameterId();
+        dataModelIdList.add(dataModelId);
+    }
+
+
     //新增数据模型
     @RequestMapping(value = "/saveModelDataForm", method = RequestMethod.POST)
     public String saveModelDataForm(HttpServletResponse response,HttpServletRequest request) throws ParseException{

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

@@ -159,6 +159,33 @@ 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/ModelMaintain.jsp

@@ -91,8 +91,14 @@
 									<tr><td>业务开始时间（<font color="red">必填</font>）：</td><td><input id="businessStartTime" name="businessStartTime" class="form-control" type="text" onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'businessEndTime\')}'})"> </td></tr>
 									<tr><td>已添加参数：</td>
 										<td><table class="table table-hover table-striped" id="displayParam">
-											<thead>
-												<tr><th>参数名</th><th>参数值</th><th>参数类型</th><th><a href="javascript:deleteAllTr()">删除所有参数</a></th></tr>
+											<thead class='col-md-15'>
+												<tr>
+                                                    <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>
+                                                    <th class="col-3 text-center"><a href="javascript:deleteAllTr()">删除所有参数</a></th>
+                                                </tr>
 											</thead>
 											<tbody id="addTr"></tbody>
 										</table></td></tr>
@@ -103,6 +109,7 @@
 			    									</c:forEach>
 										    </select></td></tr>
 									<tr><td>参数名：</td><td><input type="text"  class="form-control" name="paramName" id="paramName"/></td></tr>
+                                    <tr><td>参数编码：</td><td><input type="text"  class="form-control" name="paramCode" id="paramCode"/></td></tr>
 									<tr><td>参数值：</td><td id="addParamVal"></td></tr>
 									<tr><td></td>
 										<td><button type="button" id="addParam" class="btn btn-primary">添加参数</button></td></tr>
@@ -194,11 +201,13 @@
 		$("#addTr").find("tr").removeClass("orange-tr");
 		$(elementTag).parents("tr").eq(0).addClass("orange-tr");
 		var paramName = $(elementTag).parents("tr").find("td").eq(0).html();
-		var paramValue = $(elementTag).parents("tr").find("td").eq(1).html();
-		var paramType = $(elementTag).parents("tr").find("td").eq(2).html();
+        var paramCode = $(elementTag).parents("tr").find("td").eq(1).html();
+		var paramValue = $(elementTag).parents("tr").find("td").eq(2).html();
+		var paramType = $(elementTag).parents("tr").find("td").eq(3).html();
 		$("#paramDataType option[value='"+paramType+"']").attr("selected","selected");
 		$("#paramDataType").change();
 		$("#paramName").val(paramName);
+		$("#paramCode").val(paramCode);
 		$("#paramValue").val(paramValue);
 	}
 	
@@ -207,19 +216,24 @@
 		var paramDataType = $("#paramDataType").val();
 		var paramName = $.trim($("#paramName").val());
 		var paramValue = $("#paramValue").val();
+        var paramCode = $.trim($("#paramCode").val());
 		if(paramName==""){
 			$.alert("参数名不能为空");
+		}else if(paramCode == ""){
+            $.alert("参数编码不能为空");
         }else{
 			if($("#addTr").find("tr.orange-tr").html()==null){
-				var addRow = $("<tr><td>"+paramName+"</td><td>"+paramValue+"</td><td>"+paramDataType+"</td><td><a href='javascript:;' title='' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;<a href='javascript:;' onclick='updateRow(this)'>修改</a></td></tr>");
+				var addRow = $("<tr><td>"+paramName+"</td><td>"+paramCode+"</td><td>"+paramValue+"</td><td>"+paramDataType+"</td><td><a href='javascript:;' title='' onclick='deleteRow(this)'>删除</a><a href='javascript:;' onclick='updateRow(this)'>修改</a></td></tr>");
 				$("#addTr").append(addRow);
 				$("#paramName").attr("value","");
 				$("#paramValue").attr("value","");
+				$("#paramCode").attr("value","");
 			}else{
 				 var findTr = $("#addTr").find("tr.orange-tr");
 				 $(findTr).find("td").eq(0).html(paramName);
-				 $(findTr).find("td").eq(1).html(paramValue);
-				 $(findTr).find("td").eq(2).html(paramDataType);
+				 $(findTr).find("td").eq(1).html(paramCode);
+				 $(findTr).find("td").eq(2).html(paramValue);
+				 $(findTr).find("td").eq(3).html(paramDataType);
 				 $("#addTr").find("tr").removeClass();
 				 $("#addParam").text("添加参数");
 			}
@@ -252,10 +266,8 @@
                     title: "提醒",
                     content: "有参数尚未添加，确定提交",
                     ok: function(){
-					
                         $("#modelSubmit").attr("disabled",true);
                         var i = $("#addTr").find("tr").size();
-			 
                         if(i==0){
                             var createForm=$("#modelMaintainForm");
                             createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm");
@@ -265,12 +277,14 @@
                             $("#addTr").find("tr").each(function(){
                                 //alert($(this).find("td").eq(0).html());
                                 var paramName = $(this).find("td").eq(0).html();
-						var paramValue = $(this).find("td").eq(1).html();
-						var paramType = $(this).find("td").eq(2).html();
+                                var paramCode = $(this).find("td").eq(1).html();
+                                var paramValue = $(this).find("td").eq(2).html();
+                                var paramType = $(this).find("td").eq(3).html();
+
                                 $.ajax({
                                     type : "GET",
                                     contentType : "application/json",
-							url: "${ctx}/ModelManage/ModelMaintain/createModelParam?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
+                                    url: "${ctx}/ModelManage/ModelMaintain/createModelParams?paramName="+encodeURIComponent(paramCode)+"&paramCode="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
                                     dataType : "text",
                                     async: false,
                                     beforeSend: function(data) {},
@@ -291,8 +305,7 @@
                     cancel: function(){},
                     cancelValue: "取消",
                 });
-			}
-			else{
+            }else{
                 $("#modelSubmit").attr("disabled",true);
                 var i = $("#addTr").find("tr").size();
 
@@ -305,12 +318,15 @@
                     $("#addTr").find("tr").each(function(){
                         //alert($(this).find("td").eq(0).html());
                         var paramName = $(this).find("td").eq(0).html();
-					var paramValue = $(this).find("td").eq(1).html();
-					var paramType = $(this).find("td").eq(2).html();
+                        var paramCode = $(this).find("td").eq(1).html();
+                        var paramValue = $(this).find("td").eq(2).html();
+                        var paramType = $(this).find("td").eq(3).html();
+
                         $.ajax({
                             type : "GET",
                             contentType : "application/json",
-						url: "${ctx}/ModelManage/ModelMaintain/createModelParam?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
+                            /*url: "${ctx}/ModelManage/ModelMaintain/createModelParam?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),*/
+                            url: "${ctx}/ModelManage/ModelMaintain/createModelParams?paramName="+encodeURIComponent(paramCode)+"&paramCode="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
                             dataType : "text",
                             async: false,
                             beforeSend: function(data) {},
@@ -327,9 +343,9 @@
                     });
                 }
             }
-			
 		}
-});
+
+    });
 
 $("#modelBack").click(function(){
 		location.href="${ctx}/ModelManage/ModelResult";

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' 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-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 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){