Skip to content

C
cmszMonitorAnalysis
Commit 25f5709d authored by 胡斌's avatar 胡斌
Browse files
Options

Merge remote-tracking branch 'origin/moly'

parents eb583153 6f6f5639
Hide whitespace changes
Inline Side-by-side
Showing with 543 additions and 396 deletions
src/main/java/com/hp/cmsz/entity/ModelParameter.java
View file @ 25f5709d
...@@ -28,6 +28,8 @@ public class ModelParameter implements Serializable{ ...@@ -28,6 +28,8 @@ public class ModelParameter implements Serializable{
private Long taskId;//任务表ID private Long taskId;//任务表ID
private Long ifSystemDefault;//是否系统默认 private Long ifSystemDefault;//是否系统默认
private String parameterCode; /// 参数编码 by molinyi
@Id @Id
@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="ModelParameterSequence") @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="ModelParameterSequence")
@SequenceGenerator(name = "ModelParameterSequence", sequenceName = "fxjm_model_parameter_info_t_seq", allocationSize=1) @SequenceGenerator(name = "ModelParameterSequence", sequenceName = "fxjm_model_parameter_info_t_seq", allocationSize=1)
...@@ -73,4 +75,12 @@ public class ModelParameter implements Serializable{ ...@@ -73,4 +75,12 @@ public class ModelParameter implements Serializable{
public void setIfSystemDefault(Long ifSystemDefault) { public void setIfSystemDefault(Long ifSystemDefault) {
this.ifSystemDefault = 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
View file @ 25f5709d
...@@ -27,6 +27,11 @@ public interface ModelParameterDao extends JpaSpecificationExecutor<ModelParamet ...@@ -27,6 +27,11 @@ public interface ModelParameterDao extends JpaSpecificationExecutor<ModelParamet
@Modifying @Modifying
@Query("update ModelParameter mp set mp.parameterName=:parameterName,mp.parameterValue=:parameterValue, mp.parameterDataType=:parameterDataType where mp.parameterId =:parameterId") @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); 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 //根据数据模型ID查找参数d
List<ModelParameter> findByDataModelId(Long dataModelId); List<ModelParameter> findByDataModelId(Long dataModelId);
......
src/main/java/com/hp/cmsz/service/modelmanage/ModelParameterService.java
View file @ 25f5709d
...@@ -30,6 +30,11 @@ public class ModelParameterService { ...@@ -30,6 +30,11 @@ public class ModelParameterService {
public void updateParameterByParameterId(String parameterName,String parameterValue,String parameterDataType,Long parameterId){ public void updateParameterByParameterId(String parameterName,String parameterValue,String parameterDataType,Long parameterId){
modelParameterDao.updateParamByParameterId(parameterName, parameterValue, parameterDataType, 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删除一条参数信息 //根据参数ID删除一条参数信息
@Transactional(readOnly=false) @Transactional(readOnly=false)
......
src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java
View file @ 25f5709d
...@@ -48,250 +48,274 @@ import com.hp.cmsz.web.PageURLController; ...@@ -48,250 +48,274 @@ import com.hp.cmsz.web.PageURLController;
/** /**
* 模型维护的控制类 * 模型维护的控制类
* *
* @author Zhang Wei * @author Zhang Wei
* *
*/ */
@Controller @Controller
@RequestMapping(value="/ModelManage/ModelMaintain") @RequestMapping(value="/ModelManage/ModelMaintain")
public class ModelMaintainController { public class ModelMaintainController {
@Autowired @Autowired
private DataModelTypeDao dataModelTypeDao; private DataModelTypeDao dataModelTypeDao;
@Autowired @Autowired
private DeployedServerDao deployedServerDao; private DeployedServerDao deployedServerDao;
@Autowired @Autowired
private DataTypeDao dataTypeDao; private DataTypeDao dataTypeDao;
@Autowired @Autowired
private ModelParameterDao modelParameterDao; private ModelParameterDao modelParameterDao;
@Autowired @Autowired
private DataModelDao dataModelDao; private DataModelDao dataModelDao;
@Autowired @Autowired
private ModelParameterService modelParameterService; private ModelParameterService modelParameterService;
@Autowired @Autowired
private SystemParameterDao systemParameterDao; private SystemParameterDao systemParameterDao;
@Autowired @Autowired
private CmszOperationLogService cmszOperationLogService; private CmszOperationLogService cmszOperationLogService;
@RequestMapping(value = "") @RequestMapping(value = "")
public String modelMaintainHome(Map model){ public String modelMaintainHome(Map model){
List<DataModelType> dataModelTypeList = (List<DataModelType>)dataModelTypeDao.findAll();
List<DeployedServer>deployedServerList = (List<DeployedServer>) deployedServerDao.findAll(); List<DataModelType> dataModelTypeList = (List<DataModelType>)dataModelTypeDao.findAll();
List<DataType> dataTypeList =(List<DataType>) dataTypeDao.findAll();
List<DeployedServer>deployedServerList = (List<DeployedServer>) deployedServerDao.findAll();
model.put("dataModelTypeList", dataModelTypeList); List<DataType> dataTypeList =(List<DataType>) dataTypeDao.findAll();
model.put("deployedServerList", deployedServerList);
model.put("dataTypeList", dataTypeList); model.put("dataModelTypeList", dataModelTypeList);
model.put("deployedServerList", deployedServerList);
return PageURLController.ModelMaintain; model.put("dataTypeList", dataTypeList);
}
return PageURLController.ModelMaintain;
private List<Long> dataModelIdList = new ArrayList<Long>(); }
//新增模型参数
@RequestMapping(value = "/createModelParam*", method = RequestMethod.GET) private List<Long> dataModelIdList = new ArrayList<Long>();
@ResponseBody
public void createModelParam( //新增模型参数
@RequestParam(value="paramName") String paramName, @RequestMapping(value = "/createModelParam*", method = RequestMethod.GET)
@RequestParam(value="paramValue") String paramValue, @ResponseBody
@RequestParam(value="paramType") String paramType, public void createModelParam(
HttpServletResponse response,HttpServletRequest request) { @RequestParam(value="paramName") String paramName,
@RequestParam(value="paramValue") String paramValue,
@RequestParam(value="paramType") String paramType,
HttpServletResponse response,HttpServletRequest request) {
/*paramName=java.net.URLDecoder.decode(paramName, "UTF-8");//一次解码 /*paramName=java.net.URLDecoder.decode(paramName, "UTF-8");//一次解码
paramValue=java.net.URLDecoder.decode(paramValue, "UTF-8");//一次解码 paramValue=java.net.URLDecoder.decode(paramValue, "UTF-8");//一次解码
paramType=java.net.URLDecoder.decode(paramType, "UTF-8");//一次解码 paramType=java.net.URLDecoder.decode(paramType, "UTF-8");//一次解码
*/ */
ModelParameter modelParameter = new ModelParameter(); ModelParameter modelParameter = new ModelParameter();
if(!paramName.trim().equals("")){modelParameter.setParameterName(paramName);} if(!paramName.trim().equals("")){modelParameter.setParameterName(paramName);}
if(!paramValue.trim().equals("")){modelParameter.setParameterValue(paramValue);} if(!paramValue.trim().equals("")){modelParameter.setParameterValue(paramValue);}
if(!paramType.trim().equals("")){modelParameter.setParameterDataType(paramType);} if(!paramType.trim().equals("")){modelParameter.setParameterDataType(paramType);}
modelParameter.setIfSystemDefault(0L); modelParameter.setIfSystemDefault(0L);
modelParameterDao.save(modelParameter); modelParameterDao.save(modelParameter);
Long dataModelId = modelParameter.getParameterId(); Long dataModelId = modelParameter.getParameterId();
dataModelIdList.add(dataModelId); dataModelIdList.add(dataModelId);
} }
//新增数据模型 //新增模型参数 add by molinyi
@RequestMapping(value = "/saveModelDataForm", method = RequestMethod.POST) @RequestMapping(value = "/createModelParams", method = RequestMethod.GET)
public String saveModelDataForm(HttpServletResponse response,HttpServletRequest request) throws ParseException{ @ResponseBody
String modelSavePath = systemParameterDao.findByParameterName("MODEL_SCRIPT_FILE_DIR").get(0).getParameterValue(); public void createModelParams(
String dataModelName = ""; @RequestParam(value="paramName") String paramName,
String modelDesc = ""; @RequestParam(value="paramCode") String paramCode,
String ruleDefinition = ""; @RequestParam(value="paramValue") String paramValue,
String evaluationMethod = ""; @RequestParam(value="paramType") String paramType,
String evaluationStandard = ""; HttpServletResponse response,HttpServletRequest request) {
String modelType = "";
String deployedServer = "";
String modelStatus = ""; ModelParameter modelParameter = new ModelParameter();
//String cycleMinutes = ""; if(!paramName.trim().equals("")){modelParameter.setParameterName(paramName);}
String modelExeScriptName = ""; if(!paramCode.trim().equals("")){modelParameter.setParameterCode(paramCode);}
String kpiTypeId = ""; if(!paramValue.trim().equals("")){modelParameter.setParameterValue(paramValue);}
String businessEndTime = ""; if(!paramType.trim().equals("")){modelParameter.setParameterDataType(paramType);}
String businessStartTime = ""; modelParameter.setIfSystemDefault(0L);
Date publishTime = new Date(); modelParameterDao.save(modelParameter);
Date updateTime = new Date(); Long dataModelId = modelParameter.getParameterId();
DataModel dataModel = new DataModel(); dataModelIdList.add(dataModelId);
try{ }
if(ServletFileUpload.isMultipartContent(request)){
DiskFileItemFactory disk = new DiskFileItemFactory();
disk.setSizeThreshold(20*1024); //新增数据模型
disk.setRepository(disk.getRepository()); @RequestMapping(value = "/saveModelDataForm", method = RequestMethod.POST)
ServletFileUpload up = new ServletFileUpload(disk); public String saveModelDataForm(HttpServletResponse response,HttpServletRequest request) throws ParseException{
List list = up.parseRequest(request); String modelSavePath = systemParameterDao.findByParameterName("MODEL_SCRIPT_FILE_DIR").get(0).getParameterValue();
Iterator i = list.iterator(); String dataModelName = "";
while(i.hasNext()){ String modelDesc = "";
FileItem fm = (FileItem) i.next(); String ruleDefinition = "";
if(fm.isFormField()){ String evaluationMethod = "";
String formName = fm.getFieldName(); String evaluationStandard = "";
String tempName = fm.getString("UTF-8"); String modelType = "";
if(formName.equals("dataModelName")){ String deployedServer = "";
dataModelName = tempName; String modelStatus = "";
}else if(formName.equals("modelDesc")){ //String cycleMinutes = "";
modelDesc = tempName; String modelExeScriptName = "";
}else if(formName.equals("ruleDefinition")){ String kpiTypeId = "";
ruleDefinition = tempName; String businessEndTime = "";
}else if(formName.equals("evaluationMethod")){ String businessStartTime = "";
evaluationMethod = tempName; Date publishTime = new Date();
}else if(formName.equals("evaluationStandard")){ Date updateTime = new Date();
evaluationStandard = tempName; DataModel dataModel = new DataModel();
}else if(formName.equals("modelType")){ try{
modelType = tempName; if(ServletFileUpload.isMultipartContent(request)){
}else if(formName.equals("deployedServer")){ DiskFileItemFactory disk = new DiskFileItemFactory();
deployedServer = tempName; disk.setSizeThreshold(20*1024);
}else if(formName.equals("modelStatus")){ disk.setRepository(disk.getRepository());
modelStatus = tempName; ServletFileUpload up = new ServletFileUpload(disk);
}else if(formName.equals("kpiTypeId")){ List list = up.parseRequest(request);
kpiTypeId = tempName; Iterator i = list.iterator();
}/*else if(formName.equals("cycleMinutes")){ while(i.hasNext()){
FileItem fm = (FileItem) i.next();
if(fm.isFormField()){
String formName = fm.getFieldName();
String tempName = fm.getString("UTF-8");
if(formName.equals("dataModelName")){
dataModelName = tempName;
}else if(formName.equals("modelDesc")){
modelDesc = tempName;
}else if(formName.equals("ruleDefinition")){
ruleDefinition = tempName;
}else if(formName.equals("evaluationMethod")){
evaluationMethod = tempName;
}else if(formName.equals("evaluationStandard")){
evaluationStandard = tempName;
}else if(formName.equals("modelType")){
modelType = tempName;
}else if(formName.equals("deployedServer")){
deployedServer = tempName;
}else if(formName.equals("modelStatus")){
modelStatus = tempName;
}else if(formName.equals("kpiTypeId")){
kpiTypeId = tempName;
}/*else if(formName.equals("cycleMinutes")){
cycleMinutes = tempName; cycleMinutes = tempName;
}*/else if(formName.equals("businessStartTime")){ }*/else if(formName.equals("businessStartTime")){
businessStartTime = tempName; businessStartTime = tempName;
}else if(formName.equals("businessEndTime")){ }else if(formName.equals("businessEndTime")){
businessEndTime = tempName; businessEndTime = tempName;
} }
}else{ }else{
String fullFilePath = fm.getName(); String fullFilePath = fm.getName();
int startIndex=fullFilePath.lastIndexOf("\\"); int startIndex=fullFilePath.lastIndexOf("\\");
if(startIndex!=-1){ if(startIndex!=-1){
modelExeScriptName = fullFilePath.substring(startIndex+1); modelExeScriptName = fullFilePath.substring(startIndex+1);
}else{ }else{
modelExeScriptName = fullFilePath; modelExeScriptName = fullFilePath;
} }
if(!modelExeScriptName.trim().equals("")){ if(!modelExeScriptName.trim().equals("")){
dataModel.setModelScriptName(modelExeScriptName); dataModel.setModelScriptName(modelExeScriptName);
File file = new File(modelSavePath,modelExeScriptName); File file = new File(modelSavePath,modelExeScriptName);
if(!file.exists()){ if(!file.exists()){
fm.write(file); fm.write(file);
} }
} }
} }
} }
} }
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
} }
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat batchFormat = new SimpleDateFormat("yyyyMMdd000001"); SimpleDateFormat batchFormat = new SimpleDateFormat("yyyyMMdd000001");
dataModel.setBatchNo(Long.parseLong(batchFormat.format(sd.parse(businessStartTime)))); dataModel.setBatchNo(Long.parseLong(batchFormat.format(sd.parse(businessStartTime))));
dataModel.setDataModelName(dataModelName); dataModel.setDataModelName(dataModelName);
if(!modelDesc.trim().equals("")){dataModel.setModelDesc(modelDesc);} if(!modelDesc.trim().equals("")){dataModel.setModelDesc(modelDesc);}
if(!ruleDefinition.trim().equals("")){dataModel.setRuleDefinition(ruleDefinition);} if(!ruleDefinition.trim().equals("")){dataModel.setRuleDefinition(ruleDefinition);}
if(!evaluationMethod.trim().equals("")){dataModel.setEvaluationMethod(evaluationMethod);} if(!evaluationMethod.trim().equals("")){dataModel.setEvaluationMethod(evaluationMethod);}
if(!evaluationStandard.trim().equals("")){dataModel.setEvaluationStandard(evaluationStandard);} if(!evaluationStandard.trim().equals("")){dataModel.setEvaluationStandard(evaluationStandard);}
if(!modelType.trim().equals("")){dataModel.setDataModelTypeId(Long.parseLong(modelType));} if(!modelType.trim().equals("")){dataModel.setDataModelTypeId(Long.parseLong(modelType));}
if(!deployedServer.trim().equals("")){dataModel.setServerId(Long.parseLong(deployedServer));} if(!deployedServer.trim().equals("")){dataModel.setServerId(Long.parseLong(deployedServer));}
if(!modelStatus.trim().equals("")){dataModel.setModelStatus(Long.parseLong(modelStatus));} if(!modelStatus.trim().equals("")){dataModel.setModelStatus(Long.parseLong(modelStatus));}
if(!kpiTypeId.trim().equals("")){dataModel.setKpiTypeId(Long.parseLong(kpiTypeId));} if(!kpiTypeId.trim().equals("")){dataModel.setKpiTypeId(Long.parseLong(kpiTypeId));}
/*if(!cycleMinutes.trim().equals("")){dataModel.setCycleMinutes(Long.parseLong(cycleMinutes));}*/ /*if(!cycleMinutes.trim().equals("")){dataModel.setCycleMinutes(Long.parseLong(cycleMinutes));}*/
dataModel.setModelPublishTime(publishTime); dataModel.setModelPublishTime(publishTime);
dataModel.setModelUpdateTime(updateTime); dataModel.setModelUpdateTime(updateTime);
dataModel.setBusinessStartTime(sd.parse(businessStartTime)); dataModel.setBusinessStartTime(sd.parse(businessStartTime));
dataModel.setBusinessEndTime(sd.parse(businessEndTime)); dataModel.setBusinessEndTime(sd.parse(businessEndTime));
dataModelDao.save(dataModel); dataModelDao.save(dataModel);
cmszOperationLogService.createLog("增加","新建数据模型","fxjm_data_model_info_t. DATA_MODEL_ID="+dataModel.getDataModelId().toString()); cmszOperationLogService.createLog("增加","新建数据模型","fxjm_data_model_info_t. DATA_MODEL_ID="+dataModel.getDataModelId().toString());
Long dataModelId = dataModel.getDataModelId(); Long dataModelId = dataModel.getDataModelId();
if(!dataModelIdList.isEmpty()){ if(!dataModelIdList.isEmpty()){
modelParameterService.updateParameterByParameterIds(dataModelId, dataModelIdList); modelParameterService.updateParameterByParameterIds(dataModelId, dataModelIdList);
dataModelIdList.clear(); dataModelIdList.clear();
} }
List<DeployedServer> deployedServerList = deployedServerDao.findByServerId(Long.parseLong(deployedServer)); List<DeployedServer> deployedServerList = deployedServerDao.findByServerId(Long.parseLong(deployedServer));
if(!deployedServerList.isEmpty()){ if(!deployedServerList.isEmpty()){
if(deployedServerList.get(0).getIfWebserver().equals("0")){ if(deployedServerList.get(0).getIfWebserver().equals("0")){
String ftpServer = deployedServerList.get(0).getServerIpAddress(); String ftpServer = deployedServerList.get(0).getServerIpAddress();
String ftpUser = deployedServerList.get(0).getFtpUser(); String ftpUser = deployedServerList.get(0).getFtpUser();
String ftpPwd = deployedServerList.get(0).getFtpPassword(); String ftpPwd = deployedServerList.get(0).getFtpPassword();
String ftpFilePath = modelSavePath; String ftpFilePath = modelSavePath;
String ftpFileName = modelExeScriptName; String ftpFileName = modelExeScriptName;
FileInputStream ftpFileInput = null; FileInputStream ftpFileInput = null;
try { try {
ftpFileInput = new FileInputStream(new File(modelSavePath,ftpFileName)); ftpFileInput = new FileInputStream(new File(modelSavePath,ftpFileName));
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
//创建FTP //创建FTP
FTPClient ftpClient = new FTPClient(); FTPClient ftpClient = new FTPClient();
ftpClient.setDefaultTimeout(1 * 1000); ftpClient.setDefaultTimeout(1 * 1000);
ftpClient.setDataTimeout(1 * 1000); ftpClient.setDataTimeout(1 * 1000);
try { try {
//连接ftp //连接ftp
ftpClient.connect(ftpServer); ftpClient.connect(ftpServer);
//使用用户名和密码登陆 //使用用户名和密码登陆
if(ftpClient.login(ftpUser, ftpPwd)){ if(ftpClient.login(ftpUser, ftpPwd)){
//变更到文件存储目录 //变更到文件存储目录
ftpClient.changeWorkingDirectory(ftpFilePath); ftpClient.changeWorkingDirectory(ftpFilePath);
//保存文件 //保存文件
ftpClient.storeFile(ftpFileName, ftpFileInput); ftpClient.storeFile(ftpFileName, ftpFileInput);
} }
//关闭 //关闭
ftpFileInput.close(); ftpFileInput.close();
ftpClient.logout(); ftpClient.logout();
ftpClient.disconnect(); ftpClient.disconnect();
// File oldFile = new File(modelSavePath,ftpFileName); // File oldFile = new File(modelSavePath,ftpFileName);
// if(oldFile.isFile() && oldFile.exists()){ // if(oldFile.isFile() && oldFile.exists()){
// oldFile.delete(); // oldFile.delete();
// } // }
} catch (SocketException e) { } catch (SocketException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
}finally{ }finally{
if(ftpClient.isConnected()){ if(ftpClient.isConnected()){
try{ try{
ftpClient.disconnect(); ftpClient.disconnect();
}catch(IOException ioe){ }catch(IOException ioe){
ioe.printStackTrace(); ioe.printStackTrace();
} }
} }
} }
} }
} }
return "redirect:/ModelManage/ModelResult"; return "redirect:/ModelManage/ModelResult";
} }
//判断模型名称是否已存在 //判断模型名称是否已存在
@RequestMapping(value = "/select_modelName/{modelName}" ,method=RequestMethod.GET) @RequestMapping(value = "/select_modelName/{modelName}" ,method=RequestMethod.GET)
public void select_modelName(@PathVariable("modelName")String modelName,HttpServletResponse response,HttpServletRequest request) throws UnsupportedEncodingException{ public void select_modelName(@PathVariable("modelName")String modelName,HttpServletResponse response,HttpServletRequest request) throws UnsupportedEncodingException{
Long modelNumber = dataModelDao.getNumOfDataModelByDataModelName(modelName); Long modelNumber = dataModelDao.getNumOfDataModelByDataModelName(modelName);
Gson gson = new Gson(); Gson gson = new Gson();
response.setContentType("text/Xml;chartset=gbk"); response.setContentType("text/Xml;chartset=gbk");
PrintWriter out = null; PrintWriter out = null;
try { try {
out = response.getWriter(); out = response.getWriter();
out.print(gson.toJson(modelNumber)); out.print(gson.toJson(modelNumber));
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
} }
} }
src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java
View file @ 25f5709d
...@@ -158,7 +158,34 @@ public class ModelParameterConfigurationController { ...@@ -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) @RequestMapping(value = "/updateDataModelForm",method=RequestMethod.POST)
public String updateDataModelForm(HttpServletResponse response,HttpServletRequest request) throws NumberFormatException, ParseException{ public String updateDataModelForm(HttpServletResponse response,HttpServletRequest request) throws NumberFormatException, ParseException{
......
src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.java
View file @ 25f5709d
...@@ -15,6 +15,7 @@ import org.springframework.ui.ModelMap; ...@@ -15,6 +15,7 @@ import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -95,8 +96,28 @@ public class AssociateDiagosisDetailController { ...@@ -95,8 +96,28 @@ public class AssociateDiagosisDetailController {
return ""; return "";
} }
@RequestMapping("") @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) public String list(Map model, ServletRequest request, HttpSession session)
throws UnsupportedEncodingException, ParseException { throws UnsupportedEncodingException, ParseException {
......
src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp
View file @ 25f5709d
...@@ -91,8 +91,14 @@ ...@@ -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>业务开始时间（<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> <tr><td>已添加参数：</td>
<td><table class="table table-hover table-striped" id="displayParam"> <td><table class="table table-hover table-striped" id="displayParam">
<thead> <thead class='col-md-15'>
<tr><th>参数名</th><th>参数值</th><th>参数类型</th><th><a href="javascript:deleteAllTr()">删除所有参数</a></th></tr> <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> </thead>
<tbody id="addTr"></tbody> <tbody id="addTr"></tbody>
</table></td></tr> </table></td></tr>
...@@ -103,6 +109,7 @@ ...@@ -103,6 +109,7 @@
</c:forEach> </c:forEach>
</select></td></tr> </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="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 id="addParamVal"></td></tr>
<tr><td></td> <tr><td></td>
<td><button type="button" id="addParam" class="btn btn-primary">添加参数</button></td></tr> <td><button type="button" id="addParam" class="btn btn-primary">添加参数</button></td></tr>
...@@ -194,11 +201,13 @@ ...@@ -194,11 +201,13 @@
$("#addTr").find("tr").removeClass("orange-tr"); $("#addTr").find("tr").removeClass("orange-tr");
$(elementTag).parents("tr").eq(0).addClass("orange-tr"); $(elementTag).parents("tr").eq(0).addClass("orange-tr");
var paramName = $(elementTag).parents("tr").find("td").eq(0).html(); var paramName = $(elementTag).parents("tr").find("td").eq(0).html();
var paramValue = $(elementTag).parents("tr").find("td").eq(1).html(); var paramCode = $(elementTag).parents("tr").find("td").eq(1).html();
var paramType = $(elementTag).parents("tr").find("td").eq(2).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 option[value='"+paramType+"']").attr("selected","selected");
$("#paramDataType").change(); $("#paramDataType").change();
$("#paramName").val(paramName); $("#paramName").val(paramName);
$("#paramCode").val(paramCode);
$("#paramValue").val(paramValue); $("#paramValue").val(paramValue);
} }
...@@ -207,19 +216,24 @@ ...@@ -207,19 +216,24 @@
var paramDataType = $("#paramDataType").val(); var paramDataType = $("#paramDataType").val();
var paramName = $.trim($("#paramName").val()); var paramName = $.trim($("#paramName").val());
var paramValue = $("#paramValue").val(); var paramValue = $("#paramValue").val();
var paramCode = $.trim($("#paramCode").val());
if(paramName==""){ if(paramName==""){
$.alert("参数名不能为空"); $.alert("参数名不能为空");
}else{ }else if(paramCode == ""){
$.alert("参数编码不能为空");
}else{
if($("#addTr").find("tr.orange-tr").html()==null){ 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); $("#addTr").append(addRow);
$("#paramName").attr("value",""); $("#paramName").attr("value","");
$("#paramValue").attr("value",""); $("#paramValue").attr("value","");
$("#paramCode").attr("value","");
}else{ }else{
var findTr = $("#addTr").find("tr.orange-tr"); var findTr = $("#addTr").find("tr.orange-tr");
$(findTr).find("td").eq(0).html(paramName); $(findTr).find("td").eq(0).html(paramName);
$(findTr).find("td").eq(1).html(paramValue); $(findTr).find("td").eq(1).html(paramCode);
$(findTr).find("td").eq(2).html(paramDataType); $(findTr).find("td").eq(2).html(paramValue);
$(findTr).find("td").eq(3).html(paramDataType);
$("#addTr").find("tr").removeClass(); $("#addTr").find("tr").removeClass();
$("#addParam").text("添加参数"); $("#addParam").text("添加参数");
} }
...@@ -247,89 +261,91 @@ ...@@ -247,89 +261,91 @@
}else if($("#businessEndTime").val()==""){ }else if($("#businessEndTime").val()==""){
$.alert("业务结束时间不能为空"); $.alert("业务结束时间不能为空");
}else{ }else{
if($.trim($("#paramName").val())!=""){ if($.trim($("#paramName").val())!=""){
$.dialog({ $.dialog({
title: "提醒", title: "提醒",
content: "有参数尚未添加，确定提交", content: "有参数尚未添加，确定提交",
ok: function(){ ok: function(){
$("#modelSubmit").attr("disabled",true);
$("#modelSubmit").attr("disabled",true); var i = $("#addTr").find("tr").size();
var i = $("#addTr").find("tr").size(); if(i==0){
var createForm=$("#modelMaintainForm");
if(i==0){ createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm");
var createForm=$("#modelMaintainForm"); createForm.submit();
createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm"); createForm.attr("action","#");
createForm.submit(); }else{
createForm.attr("action","#"); $("#addTr").find("tr").each(function(){
}else{ //alert($(this).find("td").eq(0).html());
$("#addTr").find("tr").each(function(){ var paramName = $(this).find("td").eq(0).html();
//alert($(this).find("td").eq(0).html()); var paramCode = $(this).find("td").eq(1).html();
var paramName = $(this).find("td").eq(0).html(); var paramValue = $(this).find("td").eq(2).html();
var paramValue = $(this).find("td").eq(1).html(); var paramType = $(this).find("td").eq(3).html();
var paramType = $(this).find("td").eq(2).html();
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", 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", dataType : "text",
async: false, async: false,
beforeSend: function(data) {}, beforeSend: function(data) {},
success: function(){ success: function(){
i--; i--;
if(i==0){ if(i==0){
var createForm=$("#modelMaintainForm"); var createForm=$("#modelMaintainForm");
createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm"); createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm");
createForm.submit(); createForm.submit();
createForm.attr("action","#"); createForm.attr("action","#");
} }
} }
}); });
}); });
} }
}, },
okValue: "确定", okValue: "确定",
cancel: function(){}, cancel: function(){},
cancelValue: "取消", cancelValue: "取消",
}); });
} }else{
else{ $("#modelSubmit").attr("disabled",true);
$("#modelSubmit").attr("disabled",true); var i = $("#addTr").find("tr").size();
var i = $("#addTr").find("tr").size();
if(i==0){
if(i==0){ var createForm=$("#modelMaintainForm");
var createForm=$("#modelMaintainForm"); createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm");
createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm"); createForm.submit();
createForm.submit(); createForm.attr("action","#");
createForm.attr("action","#"); }else{
}else{ $("#addTr").find("tr").each(function(){
$("#addTr").find("tr").each(function(){ //alert($(this).find("td").eq(0).html());
//alert($(this).find("td").eq(0).html()); var paramName = $(this).find("td").eq(0).html();
var paramName = $(this).find("td").eq(0).html(); var paramCode = $(this).find("td").eq(1).html();
var paramValue = $(this).find("td").eq(1).html(); var paramValue = $(this).find("td").eq(2).html();
var paramType = $(this).find("td").eq(2).html(); var paramType = $(this).find("td").eq(3).html();
$.ajax({
type : "GET", $.ajax({
contentType : "application/json", type : "GET",
url: "${ctx}/ModelManage/ModelMaintain/createModelParam?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType), contentType : "application/json",
dataType : "text", /*url: "${ctx}/ModelManage/ModelMaintain/createModelParam?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),*/
async: false, url: "${ctx}/ModelManage/ModelMaintain/createModelParams?paramName="+encodeURIComponent(paramCode)+"&paramCode="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
beforeSend: function(data) {}, dataType : "text",
success: function(){ async: false,
i--; beforeSend: function(data) {},
if(i==0){ success: function(){
var createForm=$("#modelMaintainForm"); i--;
createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm"); if(i==0){
createForm.submit(); var createForm=$("#modelMaintainForm");
createForm.attr("action","#"); createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm");
} createForm.submit();
} createForm.attr("action","#");
}); }
}); }
} });
});
}
}
} }
} });
});
$("#modelBack").click(function(){ $("#modelBack").click(function(){
location.href="${ctx}/ModelManage/ModelResult"; location.href="${ctx}/ModelManage/ModelResult";
......
src/main/webapp/WEB-INF/views/ModelManage/ModelParameterConfiguration.jsp
View file @ 25f5709d
...@@ -93,16 +93,32 @@ ...@@ -93,16 +93,32 @@
<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>业务开始时间（<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>业务结束时间（<font color="red">必填</font>）：</td><td><input type="text" class="form-control" id="businessEndTime" name="businessEndTime" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'businessStartTime\')}'})" /></td></tr> <tr><td>业务结束时间（<font color="red">必填</font>）：</td><td><input type="text" class="form-control" id="businessEndTime" name="businessEndTime" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'businessStartTime\')}'})" /></td></tr>
<tr><td>参数：</td> <tr><td>参数：</td>
<td><table class="table table-hover table-striped" id="displayParam"> <td>
<thead> <table class="table table-hover table-striped" id="displayParam">
<tr><th>参数名</th><th>参数值</th><th>参数类型</th><th><a href="javascript:deleteAllTr()">删除所有参数</a></th></tr> <thead class='col-md-15'>
</thead> <tr class="row mx-0">
<tbody id="addTr"> <th class="col-3 text-center">参数名</th>
<c:forEach var="modelParameterList" items="${modelParameterList}"> <th class="col-3 text-center">参数编码</th>
<tr><td>${modelParameterList.parameterName}</td><td>${modelParameterList.parameterValue}</td><td>${modelParameterList.parameterDataType}</td><td><a href="javascript:;" title="参数ID:${modelParameterList.parameterId}" onclick="deleteRow(this,'${modelParameterList.parameterId}')">删除</a>&nbsp;&nbsp;<a href="javascript:;" onclick="updateRow(this)">修改</a></td></tr> <th class="col-3 text-center">参数值</th>
</c:forEach> <th class="col-3 text-center">参数类型</th>
</tbody> <th class="col-3 text-center"><a href="javascript:deleteAllTr()">删除所有参数</a></th>
</table></td></tr> </tr>
</thead>
<tbody id="addTr" class='col-md-15'>
<c:forEach var="modelParameterList" items="${modelParameterList}">
<tr class='row mx-0'>
<td class='col-3'>${modelParameterList.parameterCode}</td>
<td class='col-3'>${modelParameterList.parameterName}</td>
<td class='col-3'>${modelParameterList.parameterValue}</td>
<td class='col-3'>${modelParameterList.parameterDataType}</td>
<td class='col-3'>
<a href="javascript:;" title="参数ID:${modelParameterList.parameterId}" onclick="deleteRow(this,'${modelParameterList.parameterId}')">删除</a><a href="javascript:;" onclick="updateRow(this)">修改</a>
</td>
</tr>
</c:forEach>
</tbody>
</table>
</td></tr>
<tr><td>参数数据类型：</td> <tr><td>参数数据类型：</td>
<td><select class="form-control" id="paramDataType" name="paramDataType"> <td><select class="form-control" id="paramDataType" name="paramDataType">
<c:forEach var="dataTypes" items="${dataTypeList}"> <c:forEach var="dataTypes" items="${dataTypeList}">
...@@ -110,6 +126,7 @@ ...@@ -110,6 +126,7 @@
</c:forEach> </c:forEach>
</select></td></tr> </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="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"><input type="text" class="form-control" name="paramValue" id="paramValue" onkeyup="(this.v=function(){this.value=this.value.replace(/[^0-9]+/,'');}).call(this)" onblur="this.v();" /></td></tr> <tr><td>参数值：</td><td id="addParamVal"><input type="text" class="form-control" name="paramValue" id="paramValue" onkeyup="(this.v=function(){this.value=this.value.replace(/[^0-9]+/,'');}).call(this)" onblur="this.v();" /></td></tr>
<tr><td></td><td> <tr><td></td><td>
<button type="button" id="addParam" class="btn btn-primary">添加参数</button></td></tr> <button type="button" id="addParam" class="btn btn-primary">添加参数</button></td></tr>
...@@ -214,11 +231,13 @@ ...@@ -214,11 +231,13 @@
$("#addTr").find("tr").removeClass("orange-tr"); $("#addTr").find("tr").removeClass("orange-tr");
$(elementTag).parents("tr").eq(0).addClass("orange-tr"); $(elementTag).parents("tr").eq(0).addClass("orange-tr");
var paramName = $(elementTag).parents("tr").find("td").eq(0).html(); var paramName = $(elementTag).parents("tr").find("td").eq(0).html();
var paramValue = $(elementTag).parents("tr").find("td").eq(1).html(); var paramCode = $(elementTag).parents("tr").find("td").eq(1).html();
var paramType = $(elementTag).parents("tr").find("td").eq(2).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 option[value='"+paramType+"']").attr("selected","selected");
$("#paramDataType").change(); $("#paramDataType").change();
$("#paramName").val(paramName); $("#paramName").val(paramName);
$("#paramCode").val(paramCode);
$("#paramValue").val(paramValue); $("#paramValue").val(paramValue);
} }
...@@ -261,22 +280,28 @@ ...@@ -261,22 +280,28 @@
var paramDataType = $("#paramDataType").val(); var paramDataType = $("#paramDataType").val();
var paramName = $.trim($("#paramName").val()); var paramName = $.trim($("#paramName").val());
var paramValue = $("#paramValue").val(); var paramValue = $("#paramValue").val();
var paramCode = $.trim($("#paramCode").val());
if(paramName==""){ if(paramName==""){
$.alert("参数名不能为空"); $.alert("参数名不能为空");
}else{ }else if(paramCode == ""){
$.alert("参数编码不能为空");
}else{
if($("#addTr").find("tr.orange-tr").html()==null){ 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 class='row mx-0'><td class='col-3'>"+paramName+"</td><td class='col-3'>"+paramCode+"</td><td class='col-3'>"+paramValue+"</td><td class='col-3'>"+paramDataType+"</td><td class='col-3'><a href='javascript:;' title='' onclick='deleteRow(this,\"\")'>删除</a><a href='javascript:;' onclick='updateRow(this)'>修改</a></td></tr>");
$("#addTr").append(addRow); $("#addTr").append(addRow);
$("#paramName").attr("value",""); $("#paramName").attr("value","");
$("#paramCode").attr("value","");
$("#paramValue").attr("value",""); $("#paramValue").attr("value","");
}else{ }else{
var findTr = $("#addTr").find("tr.orange-tr"); var findTr = $("#addTr").find("tr.orange-tr");
$(findTr).find("td").eq(0).html(paramName); $(findTr).find("td").eq(0).html(paramName);
$(findTr).find("td").eq(1).html(paramValue); $(findTr).find("td").eq(1).html(paramCode);
$(findTr).find("td").eq(2).html(paramDataType); $(findTr).find("td").eq(2).html(paramValue);
$(findTr).find("td").eq(3).html(paramDataType);
$("#addTr").find("tr").removeClass(); $("#addTr").find("tr").removeClass();
$("#addParam").text("添加参数"); $("#addParam").text("添加参数");
$("#paramName").attr("value",""); $("#paramName").attr("value","");
$("#paramCode").attr("value","");
$("#paramValue").attr("value",""); $("#paramValue").attr("value","");
} }
} }
...@@ -298,7 +323,7 @@ ...@@ -298,7 +323,7 @@
}else if($("#businessEndTime").val()==""){ }else if($("#businessEndTime").val()==""){
$.alert("业务结束时间不能为空"); $.alert("业务结束时间不能为空");
}else{ }else{
if($.trim($("#paramName").val())!=""){ if($.trim($("#paramName").val())!=""){//如果 参数填写框 存在未填写的 数据
$.dialog({ $.dialog({
title: "提醒", title: "提醒",
content: "有参数尚未添加，确定提交", content: "有参数尚未添加，确定提交",
...@@ -311,55 +336,60 @@ ...@@ -311,55 +336,60 @@
form.attr("action","#"); form.attr("action","#");
}else{ }else{
$("#addTr").find("tr").each(function(){ $("#addTr").find("tr").each(function(){
var paramName = $(this).find("td").eq(0).html(); var paramName = $(this).find("td").eq(0).html();
var paramValue = $(this).find("td").eq(1).html(); var paramCode = $(this).find("td").eq(1).html();
var paramType = $(this).find("td").eq(2).html(); var paramValue = $(this).find("td").eq(2).html();
var paramId = $(this).find("td").find("a").attr("title"); var paramType = $(this).find("td").eq(3).html();
if(paramId!=""){ var paramId = $(this).find("td").find("a").attr("title");
$.ajax({
type : "GET", if(paramId!=""){//不是新增参数
contentType : "application/json", $.ajax({
url:"${ctx}/ModelManage/ModelParameterConfiguration/updateParameter?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType)+"&paramId="+paramId, type : "GET",
dataType : "text", contentType : "application/json",
async: false, //url:"${ctx}/ModelManage/ModelParameterConfiguration/updateParameter?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType)+"&paramId="+paramId,
beforeSend: function(data){}, url:"${ctx}/ModelManage/ModelParameterConfiguration/UpdateParameter?paramName="+encodeURIComponent(paramCode)+"&paramCode="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType)+"&paramId="+paramId,
success:function(){ dataType : "text",
i--; async: false,
if(i==0){ beforeSend: function(data){},
var form = $("#modelUpdateForm"); success:function(){
form.attr("action","${ctx}/ModelManage/ModelParameterConfiguration/updateDataModelForm"); i--;
form.submit(); if(i==0){
form.attr("action","#"); var form = $("#modelUpdateForm");
} form.attr("action","${ctx}/ModelManage/ModelParameterConfiguration/updateDataModelForm");
} form.submit();
}); form.attr("action","#");
}else{ }
$.ajax({ }
type : "GET", });
contentType : "application/json", }
url:"${ctx}/ModelManage/ModelParameterConfiguration/updateParameter?dataModelId="+getDataModelId+"&paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType), else{//是新增参数
dataType : "text", $.ajax({
beforeSend: function(data){ }, type : "GET",
success:function(){ contentType : "application/json",
i--; //url:"${ctx}/ModelManage/ModelParameterConfiguration/updateParameter?dataModelId="+getDataModelId+"&paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
if(i==0){ url:"${ctx}/ModelManage/ModelParameterConfiguration/UpdateParameter?dataModelId="+getDataModelId+"&paramName="+encodeURIComponent(paramCode)+"&paramCode="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
var form = $("#modelUpdateForm"); dataType : "text",
form.attr("action","${ctx}/ModelManage/ModelParameterConfiguration/updateDataModelForm"); beforeSend: function(data){ },
success:function(){
form.submit(); i--;
form.attr("action","#"); if(i==0){
} var form = $("#modelUpdateForm");
} form.attr("action","${ctx}/ModelManage/ModelParameterConfiguration/updateDataModelForm");
});
} form.submit();
}); form.attr("action","#");
} }
}
});
}
});
}
}, },
okValue: "确定", okValue: "确定",
cancel:function(){}, cancel:function(){},
cancelValue: "取消" cancelValue: "取消"
}); });
}else{ }else{//如果 参数填写框 不存在未填写的 数据
var i = $("#addTr").find("tr").size(); var i = $("#addTr").find("tr").size();
if(0==i){ if(0==i){
var form = $("#modelUpdateForm"); var form = $("#modelUpdateForm");
...@@ -367,16 +397,19 @@ ...@@ -367,16 +397,19 @@
form.submit(); form.submit();
form.attr("action","#"); form.attr("action","#");
}else{ }else{
$("#addTr").find("tr").each(function(){ $("#addTr").find("tr").each(function(){
var paramName = $(this).find("td").eq(0).html(); var paramName = $(this).find("td").eq(0).html();
var paramValue = $(this).find("td").eq(1).html(); var paramCode = $(this).find("td").eq(1).html();
var paramType = $(this).find("td").eq(2).html(); var paramValue = $(this).find("td").eq(2).html();
var paramType = $(this).find("td").eq(3).html();
var paramId = $(this).find("td").find("a").attr("title"); var paramId = $(this).find("td").find("a").attr("title");
if(paramId!=""){ if(paramId!=""){//不是新增参数
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", contentType : "application/json",
url:"${ctx}/ModelManage/ModelParameterConfiguration/updateParameter?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType)+"&paramId="+paramId, //url:"${ctx}/ModelManage/ModelParameterConfiguration/updateParameter?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType)+"&paramId="+paramId,
//url:"${ctx}/ModelManage/ModelParameterConfiguration/UpdateParameter?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType)+"&paramId="+paramId,
url:"${ctx}/ModelManage/ModelParameterConfiguration/UpdateParameter?paramName="+encodeURIComponent(paramCode)+"&paramCode="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType)+"&paramId="+paramId,
dataType : "text", dataType : "text",
async: false, async: false,
beforeSend: function(data){}, beforeSend: function(data){},
...@@ -389,12 +422,14 @@ ...@@ -389,12 +422,14 @@
form.attr("action","#"); form.attr("action","#");
} }
} }
}); });
}else{ }else{//是新增参数
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", contentType : "application/json",
url:"${ctx}/ModelManage/ModelParameterConfiguration/updateParameter?dataModelId="+getDataModelId+"&paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType), //url:"${ctx}/ModelManage/ModelParameterConfiguration/updateParameter?dataModelId="+getDataModelId+"&paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
//url:"${ctx}/ModelManage/ModelParameterConfiguration/UpdateParameter?dataModelId="+getDataModelId+"&paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
url:"${ctx}/ModelManage/ModelParameterConfiguration/UpdateParameter?dataModelId="+getDataModelId+"&paramName="+encodeURIComponent(paramCode)+"&paramCode="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
dataType : "text", dataType : "text",
beforeSend: function(data){ }, beforeSend: function(data){ },
success:function(){ success:function(){
......
src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp
View file @ 25f5709d
...@@ -263,11 +263,14 @@ ...@@ -263,11 +263,14 @@
function lookParm(dataModelId,dataModelTitle){ function lookParm(dataModelId,dataModelTitle){
$.dialog({ $.dialog({
title:"数据模型标题："+dataModelTitle, title:"数据模型标题："+dataModelTitle,
content:"<div id='paramList'>"+ /*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-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>", "</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, lock:true,
width:800, width:700,
initialize:function(){ initialize:function(){
$.ajax({ $.ajax({
type : 'GET', type : 'GET',
...@@ -289,10 +292,11 @@ ...@@ -289,10 +292,11 @@
if(data[i].parameterValue=="undefined" || data[i].parameterValue==null || data[i].parameterValue==""){ if(data[i].parameterValue=="undefined" || data[i].parameterValue==null || data[i].parameterValue==""){
data[i].parameterValue=""; data[i].parameterValue="";
} }
paramTbody.append($("<tr></tr>").append("<td>"+data[i].parameterId+"</td>") paramTbody.append($("<tr class='row mx-0'></tr>").append("<td class='col-3'>"+data[i].parameterId+"</td>")
.append("<td>"+data[i].parameterName+"</td>") .append("<td class='col-3'>"+data[i].parameterCode+"</td>")
.append("<td>"+data[i].parameterValue+"</td>") .append("<td class='col-3'>"+data[i].parameterName+"</td>")
.append("<td>"+data[i].parameterDataType+"</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
View file @ 25f5709d
...@@ -570,7 +570,7 @@ table_pagging.prototype = { ...@@ -570,7 +570,7 @@ table_pagging.prototype = {
} }
function radioChoose(clickObj){ function radioChoose(clickObj){
alert();
var obj = eval("(" + jsonData + ")"); var obj = eval("(" + jsonData + ")");
//alert(obj); //alert(obj);
if(clickObj.checked){ if(clickObj.checked){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment