Merge branch 'master' of http://192.168.1.220:10080/esb/esb

hos-broker/src/main/java/com/yihu/hos/common/compiler/CamelCompiler.java

@@ -125,13 +125,13 @@ public class CamelCompiler {
    }
    public static void main(String[] args) {
        try {
            compiler("/crawler/route", "QuartzRoute","QuartzRoute001","xx000xx");
        } catch (IOException e) {
            e.printStackTrace();
        }
    }
//    public static void main(String[] args) {
//        try {
//            compiler("/crawler/route", "QuartzRoute","QuartzRoute001","xx000xx");
//        } catch (IOException e) {
//            e.printStackTrace();
//        }
//
//    }
}

src/main/java/com/yihu/hos/common/CommonPageController.java

@@ -24,9 +24,6 @@ public class CommonPageController extends BaseController {
     */
    @RequestMapping("loginPage")
    public String login(Model model) {
        System.out.println("=================登录成功===============");
        PKUtil.getUuid();
        System.out.println("=================登录结束===============");
        model.addAttribute("contentPage","/common/login");
        return "pageView";
    }

src/main/java/com/yihu/hos/common/constants/Constants.java

@@ -9,6 +9,9 @@ public class Constants {
    //流程-队列名称
    public static String FLOW_QUEUE_NAME = "configuration.service.flow";
    //流程-模板类型
    public static String JAVA = "java";
    public static String CLASS = "class";
    //流程-路由类型
    public static String FLOW_TYPE_ROUTE = "route";

src/main/java/com/yihu/hos/system/controller/AppController.java

@@ -18,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -78,7 +79,7 @@ public class AppController extends BaseController {
     * @return
     */
    @RequestMapping("/editorApp")
    public String editorAppTemplate(Model model, String id,  String categoryId) {
    public String editorAppTemplate(Model model, String id, String flag, String categoryId) {
        try {
            SystemApp app = null;
            if (id != null && id.length() > 0) {
@@ -87,6 +88,7 @@ public class AppController extends BaseController {
                app = new SystemApp();
            }
            model.addAttribute("model", app);
                model.addAttribute("flag", flag);
            model.addAttribute("categoryId", categoryId);
            model.addAttribute("contentPage", "/system/app/editorApp");
        } catch (Exception e) {
@@ -130,7 +132,7 @@ public class AppController extends BaseController {
        try {
            SystemApp obj = new SystemApp();
            BeanUtils.populate(obj, request.getParameterMap());
            obj.setCreateDate(new Date());
            return appManager.addApp(obj);
        } catch (Exception ex) {
            ex.printStackTrace();
@@ -273,7 +275,7 @@ public class AppController extends BaseController {
        try {
            SystemServiceEndpoint obj = new SystemServiceEndpoint();
            BeanUtils.populate(obj, request.getParameterMap());
            obj.setCreateDate(new Date());
            return appManager.addAppService(obj);
        } catch (Exception ex) {
            ex.printStackTrace();

src/main/java/com/yihu/hos/system/controller/FlowController.java

@@ -1,13 +1,14 @@
package com.yihu.hos.system.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.common.constants.Constants;
import com.yihu.hos.system.model.SystemServiceFlow;
import com.yihu.hos.system.model.SystemServiceFlowClass;
import com.yihu.hos.system.model.SystemServiceFlowTemp;
import com.yihu.hos.system.service.FlowManager;
import com.yihu.hos.system.service.intf.IFlowManage;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.controller.BaseController;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
@@ -84,19 +85,25 @@ public class FlowController extends BaseController {
            ObjectMapper objectMapper = new ObjectMapper();
            SystemServiceFlow flow = null;
            List<SystemServiceFlowClass> flowClassList = null;
            List<SystemServiceFlowTemp> flowTempList = null;
            if (id != null && id.length() > 0) {
                flow = flowManage.getFlowById(Integer.parseInt(id));
                flowClassList = flowManage.getFlowClassByFlowId(flow.getId());
                flowTempList = flowManage.getFlowTempByFlowId(flow.getId());
                if (Constants.CLASS.equals(flow.getFileType())){
                    model.addAttribute("flowClass", objectMapper.writeValueAsString(flowClassList));
                }else if (Constants.JAVA.equals(flow.getFileType())){
                    model.addAttribute("flowClass", objectMapper.writeValueAsString(flowTempList));
                }
            }  else {
                flow = new SystemServiceFlow();
                flowClassList = new ArrayList<>();
            }
            if (flowClassList == null){
                flowClassList = new ArrayList<>();
                flowTempList = new ArrayList<>();
            }
            flow.setFlowClassArray(flowClassList);
            flow.setFlowTempArray(flowTempList);
            model.addAttribute("model", flow);
            model.addAttribute("flowClass", objectMapper.writeValueAsString(flowClassList));
            model.addAttribute("contentPage", "/system/flow/editorFlow");
        } catch (Exception e) {
            e.printStackTrace();
@@ -112,15 +119,23 @@ public class FlowController extends BaseController {
     */
    @RequestMapping("addFlow")
    @ResponseBody
    public Result addFlow(HttpServletRequest request) {
    public Result addFlow(HttpServletRequest request,String flowClass) {
        try {
            SystemServiceFlow obj = new SystemServiceFlow();
            BeanUtils.populate(obj, request.getParameterMap());
            ObjectMapper objectMapper = new ObjectMapper();
            SystemServiceFlow flow = objectMapper.readValue(flowClass,SystemServiceFlow.class);
            List<SystemServiceFlowClass> flowClass = new ArrayList<>();
            BeanUtils.populate(flowClass, request.getParameterMap());
            obj.setFlowClassArray(flowClass);
            return flowManage.addFlow(obj);
//            SystemServiceFlow obj = new SystemServiceFlow();
//            BeanUtils.populate(obj, request.getParameterMap());
//
//            List<SystemServiceFlowClass> flowClass = new ArrayList<>();
//            BeanUtils.populate(flowClass, request.getParameterMap());
//            obj.setFlowClassArray(flowClass);
//
//            List<SystemServiceFlowTemp> flowTemps = new ArrayList<>();
//            BeanUtils.populate(flowTemps, request.getParameterMap());
//            obj.setFlowTempArray(flowTemps);
            return flowManage.addFlow(flow);
        } catch (Exception ex) {
            ex.printStackTrace();
            return Result.error(ex.getMessage());

src/main/java/com/yihu/hos/system/dao/AppDao.java

@@ -26,7 +26,7 @@ public class AppDao extends SQLGeneralDAO implements IAppDao {
        if (!StringUtils.isEmpty(name)) {
            sb.append(" and (t.name like '%" + name + "%' or t.code like '%" + name + "%')");
        }
        sb.append(" order by t.createDate desc");
        return super.getDataGridResult(sb.toString(), Integer.valueOf(params.get("page").toString()), Integer.valueOf(params.get("rows").toString()));
    }

src/main/java/com/yihu/hos/system/dao/AppServiceDao.java

@@ -30,6 +30,7 @@ public class AppServiceDao extends SQLGeneralDAO implements IAppServiceDao {
        if (!StringUtils.isEmpty(name)) {
            sb.append(" and (t.name like '%" + name + "%' or t.code like '%" + name + "%')");
        }
        sb.append(" order by t.createDate desc");
        return super.getDataGridResult(sb.toString(), Integer.valueOf(params.get("page").toString()), Integer.valueOf(params.get("rows").toString()));    }
}

src/main/java/com/yihu/hos/system/dao/FlowClassDao.java

@@ -7,6 +7,7 @@ import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Repository;
import java.util.ArrayList;
import java.util.List;
/**
@@ -26,7 +27,7 @@ public class FlowClassDao extends SQLGeneralDAO implements IFlowClassDao {
        if (flowClasses != null && flowClasses.size() > 0) {
            return flowClasses;
        }
        return null;
        return new ArrayList<>();
    }
    @Override

src/main/java/com/yihu/hos/system/dao/FlowTempDao.java

@@ -0,0 +1,46 @@
package com.yihu.hos.system.dao;
import com.yihu.hos.system.dao.intf.IFlowTempDao;
import com.yihu.hos.system.model.SystemServiceFlowTemp;
import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Repository;
import java.util.ArrayList;
import java.util.List;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2016/8/19.
 */
@Repository("flowTempDao")
public class FlowTempDao extends SQLGeneralDAO implements IFlowTempDao {
    public static final String BEAN_ID = "flowTempDao";
    @Override
    public List<SystemServiceFlowTemp> getFlowTempByFlowId(Integer flowId) throws Exception {
        List<SystemServiceFlowTemp> flowTemps = (List<SystemServiceFlowTemp>) super.hibernateTemplate.find("from SystemServiceFlowTemp s where s.flowId=? ", flowId);
        if (flowTemps != null && flowTemps.size() > 0) {
            return flowTemps;
        }
        return new ArrayList<>();
    }
    @Override
    public boolean deleteFlowTempByFlowId(Integer flowId) {
        try {
            Session session = getCurrentSession();
            String sql = "delete from system_service_flow_template where flow_id = :flowId";
            Query query = session.createSQLQuery(sql);
            query.setInteger("flowId", flowId);
            query.executeUpdate();
            return true;
        }catch (Exception e){
            e.printStackTrace();
            return false;
        }
    }
}

src/main/java/com/yihu/hos/system/dao/intf/IFlowTempDao.java

@@ -0,0 +1,17 @@
package com.yihu.hos.system.dao.intf;
import com.yihu.hos.system.model.SystemServiceFlowTemp;
import com.yihu.hos.web.framework.dao.XSQLGeneralDAO;
import java.util.List;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2016/8/19.
 */
public interface IFlowTempDao extends XSQLGeneralDAO {
    List<SystemServiceFlowTemp> getFlowTempByFlowId(Integer flowId) throws Exception;
    boolean deleteFlowTempByFlowId(Integer flowId);
}

src/main/java/com/yihu/hos/system/model/SystemApp.java

@@ -1,5 +1,7 @@
package com.yihu.hos.system.model;
import java.util.Date;
/**
 * SystemApp entity. @author MyEclipse Persistence Tools
 */
@@ -9,7 +11,7 @@ public class SystemApp implements java.io.Serializable {
	// Fields
	private String id;
	private String code; //Ó¢ÎÄÃû
	private String code; //Ӣ����
	private String name;
	private String appKey;
	private String appType;
@@ -20,6 +22,7 @@ public class SystemApp implements java.io.Serializable {
	private String appSecret;
	private String icon;
	private String developer;
	private Date createDate;
	// Constructors
	/** default constructor */
@@ -31,16 +34,6 @@ public class SystemApp implements java.io.Serializable {
		this.name = name;
	}
	/** full constructor */
	public SystemApp(String code, String name, String appKey, String appType, String orgId, String status, String appUrl) {
		this.code = code;
		this.name = name;
		this.appKey = appKey;
		this.appType = appType;
		this.orgId = orgId;
		this.status = status;
		this.appUrl = appUrl;
	}
	// Property accessors
@@ -131,4 +124,12 @@ public class SystemApp implements java.io.Serializable {
	public void setDeveloper(String developer) {
		this.developer = developer;
	}
	public Date getCreateDate() {
		return createDate;
	}
	public void setCreateDate(Date createDate) {
		this.createDate = createDate;
	}
}

src/main/java/com/yihu/hos/system/model/SystemServiceEndpoint.java

@@ -1,5 +1,7 @@
package com.yihu.hos.system.model;
import java.util.Date;
/**
 *
 * @author HZY
@@ -27,6 +29,7 @@ public class SystemServiceEndpoint implements java.io.Serializable {
    private String metricsEndpoint;
    private Integer valid;
    private String requestFormat;
    private Date createDate;
    public SystemServiceEndpoint() {
    }
@@ -182,6 +185,14 @@ public class SystemServiceEndpoint implements java.io.Serializable {
    public void setAppId(String appId) {
        this.appId = appId;
    }
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
}

src/main/java/com/yihu/hos/system/model/SystemServiceFlow.java

@@ -22,6 +22,15 @@ public class SystemServiceFlow implements java.io.Serializable {
    private String flowClassList;
    private List<SystemServiceFlowClass> flowClassArray;
    private List<SystemServiceFlowTemp> flowTempArray;
    public List<SystemServiceFlowTemp> getFlowTempArray() {
        return flowTempArray;
    }
    public void setFlowTempArray(List<SystemServiceFlowTemp> flowTempArray) {
        this.flowTempArray = flowTempArray;
    }
    public String getFileType() {
        return fileType;

src/main/java/com/yihu/hos/system/model/SystemServiceFlowTemp.java

@@ -0,0 +1,93 @@
package com.yihu.hos.system.model;
/**
 *  系统服务流程模板文件类
 * @author HZY
 * @vsrsion 1.0
 * Created at 2016/8/19.
 */
public class SystemServiceFlowTemp implements java.io.Serializable {
    private Integer id;
    private String name;
    private Integer valid;
    private String className;
    private String packageName;
    private String classPath;
    private String type;
    private Integer flowId;
    private String isUpdate;
    public String getClassName() {
        return className;
    }
    public void setClassName(String className) {
        this.className = className;
    }
    public String getClassPath() {
        return classPath;
    }
    public void setClassPath(String classPath) {
        this.classPath = classPath;
    }
    public String getIsUpdate() {
        return isUpdate;
    }
    public void setIsUpdate(String isUpdate) {
        this.isUpdate = isUpdate;
    }
    public Integer getFlowId() {
        return flowId;
    }
    public void setFlowId(Integer flowId) {
        this.flowId = flowId;
    }
    public Integer getId() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public Integer getValid() {
        return valid;
    }
    public void setValid(Integer valid) {
        this.valid = valid;
    }
    public String getPackageName() {
        return packageName;
    }
    public void setPackageName(String packageName) {
        this.packageName = packageName;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
}

src/main/java/com/yihu/hos/system/service/FlowManager.java

@@ -4,10 +4,13 @@ import com.yihu.hos.common.constants.Constants;
import com.yihu.hos.core.file.FileUtil;
import com.yihu.hos.services.ServiceFlowEventService;
import com.yihu.hos.system.dao.FlowClassDao;
import com.yihu.hos.system.dao.FlowTempDao;
import com.yihu.hos.system.dao.intf.IFlowClassDao;
import com.yihu.hos.system.dao.intf.IFlowDao;
import com.yihu.hos.system.dao.intf.IFlowTempDao;
import com.yihu.hos.system.model.SystemServiceFlow;
import com.yihu.hos.system.model.SystemServiceFlowClass;
import com.yihu.hos.system.model.SystemServiceFlowTemp;
import com.yihu.hos.system.service.intf.IFlowManage;
import com.yihu.hos.web.framework.model.DictItem;
import com.yihu.hos.web.framework.model.DictionaryResult;
@@ -42,6 +45,8 @@ public class FlowManager implements IFlowManage {
    @Resource(name = FlowClassDao.BEAN_ID)
    private IFlowClassDao flowClassDao;
    @Resource(name = FlowTempDao.BEAN_ID)
    private IFlowTempDao flowTempDao;
    @Autowired
    ServiceFlowEventService serviceFlowEventService;
@@ -59,12 +64,21 @@ public class FlowManager implements IFlowManage {
    public Result addFlow(SystemServiceFlow obj) throws Exception {
        obj.setCreateDate(new Date());
        flowDao.saveEntity(obj);
        List<SystemServiceFlowClass> flowClassList = obj.getFlowClassArray();
        for (SystemServiceFlowClass flowClass:flowClassList){
            flowClass.setFlowId(obj.getId());
            flowDao.saveEntity(flowClass);
            //发送消息到ＭＱ对列
            sendUpdateMessage(obj.getCode(), flowClass, Constants.FLOW_OP_ADD);
        if (Constants.CLASS.equals(obj.getFileType())){
            List<SystemServiceFlowClass> flowClassList = obj.getFlowClassArray();
            for (SystemServiceFlowClass flowClass:flowClassList){
                flowClass.setFlowId(obj.getId());
                flowDao.saveEntity(flowClass);
                //发送消息到ＭＱ对列
                sendUpdateMessage(obj.getCode(), flowClass, Constants.FLOW_OP_ADD);
            }
        }else if (Constants.JAVA.equals(obj.getFileType())){
            List<SystemServiceFlowTemp> flowTempList = obj.getFlowTempArray();
            for (SystemServiceFlowTemp flowTemp:flowTempList){
                flowTemp.setFlowId(obj.getId());
                flowDao.saveEntity(flowTemp);
            }
        }
        return Result.success("保存成功");
@@ -80,30 +94,45 @@ public class FlowManager implements IFlowManage {
        flow.setValid(obj.getValid());
        flow.setFileType(obj.getFileType());
        List<Integer> classIds = flowClassDao.getFlowClassIds(obj.getId());//原flowclass集合
        List<SystemServiceFlowClass> flowClassList = obj.getFlowClassArray();
        for (SystemServiceFlowClass flowClass:flowClassList){
            if (flowClass.getId()!=null) {
                classIds.remove(flowClass.getId());
                flowClassDao.updateEntity(flowClass);
                sendUpdateMessage(flow.getCode(), flowClass, Constants.FLOW_OP_UPDATE);
            }else {
                flowClassDao.saveEntity(flowClass);
                sendUpdateMessage(flow.getCode(), flowClass, Constants.FLOW_OP_ADD);
        if (Constants.JAVA.equals(flow.getFileType())){
            List<SystemServiceFlowTemp> flowTempList = obj.getFlowTempArray();
            boolean succ = flowTempDao.deleteFlowTempByFlowId(obj.getId());
            if (succ){
                for (SystemServiceFlowTemp flowTemp:flowTempList){
                    flowTempDao.saveEntity(flowTemp);
                }
            }
        }else if (Constants.CLASS.equals(flow.getFileType())){
            List<Integer> classIds = flowClassDao.getFlowClassIds(obj.getId());//原flowclass集合
            List<SystemServiceFlowClass> flowClassList = obj.getFlowClassArray();
            for (SystemServiceFlowClass flowClass:flowClassList){
                if (flowClass.getId()!=null) {
                    classIds.remove(flowClass.getId());
                    flowClassDao.updateEntity(flowClass);
                    sendUpdateMessage(flow.getCode(), flowClass, Constants.FLOW_OP_UPDATE);
                }else {
                    flowClassDao.saveEntity(flowClass);
                    sendUpdateMessage(flow.getCode(), flowClass, Constants.FLOW_OP_ADD);
                }
            }
            //删除判断
            if (classIds !=null && classIds.size()>0){
                for (Integer id:classIds){
                    SystemServiceFlowClass flowClass = getFlowClassById(id);
                    flowClassDao.deleteEntity(flowClass);
                    sendDeleteMessage(flow.getCode(), flowClass);
                }
            }
        }
        flowDao.updateEntity(flow);
        //删除判断
        if (classIds !=null && classIds.size()>0){
            for (Integer id:classIds){
                SystemServiceFlowClass flowClass = getFlowClassById(id);
                flowClassDao.deleteEntity(flowClass);
                sendDeleteMessage(flow.getCode(), flowClass);
            }
        }
        return Result.success("更新成功");
    }
@@ -117,6 +146,7 @@ public class FlowManager implements IFlowManage {
            //发送消息到ＭＱ对列
            sendDeleteMessage(flow.getCode(), flowClass);
        }
        boolean succ = flowTempDao.deleteFlowTempByFlowId(id);
        flowDao.deleteEntity(flow);
        return Result.success("删除成功");
@@ -156,6 +186,10 @@ public class FlowManager implements IFlowManage {
        return succ;
    }
    @Override
    public List<SystemServiceFlowTemp> getFlowTempByFlowId(Integer id) throws Exception {
        return flowTempDao.getFlowTempByFlowId(id);
    }
    @Override

src/main/java/com/yihu/hos/system/service/intf/IFlowManage.java

@@ -3,6 +3,7 @@ package com.yihu.hos.system.service.intf;
import com.yihu.hos.services.IBaseManager;
import com.yihu.hos.system.model.SystemServiceFlow;
import com.yihu.hos.system.model.SystemServiceFlowClass;
import com.yihu.hos.system.model.SystemServiceFlowTemp;
import com.yihu.hos.web.framework.model.Result;
import java.util.List;
@@ -38,4 +39,10 @@ public interface IFlowManage extends IBaseManager {
    boolean deleteFlowClassByFlowId(Integer flowId) ;
    /* ==========================flowTemp================================*/
    List<SystemServiceFlowTemp> getFlowTempByFlowId(Integer id) throws Exception;
}

src/main/resources/resource/SystemApp.hbm.xml

@@ -61,5 +61,10 @@
                <comment>开发者</comment>
            </column>
        </property>
        <property name="createDate" type="java.util.Date">
            <column name="create_date" length="10">
                <comment>创建时间</comment>
            </column>
        </property>
    </class>
</hibernate-mapping>

src/main/resources/resource/SystemServiceEndpoint.hbm.xml

@@ -101,5 +101,10 @@
                <comment>应用ID</comment>
            </column>
        </property>
        <property name="createDate" type="java.util.Date">
            <column name="create_date" length="10">
                <comment>创建时间</comment>
            </column>
        </property>
    </class>
</hibernate-mapping>

src/main/resources/resource/SystemServiceFlowTemp.hbm.xml

@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<!-- 
    Mapping file autogenerated by MyEclipse Persistence Tools
-->
<hibernate-mapping>
    <class name="com.yihu.hos.system.model.SystemServiceFlowTemp" table="system_service_flow_template">
        <id name="id" column="id">
            <generator class="increment"/>
        </id>
        <property name="className" type="java.lang.String">
            <column name="class_name" length="50">
                <comment>类文件名</comment>
            </column>
        </property>
        <property name="packageName" type="java.lang.String">
            <column name="package_name" length="50" not-null="true">
                <comment>包名</comment>
            </column>
        </property>
        <property name="classPath" type="java.lang.String">
            <column name="class_path" length="255">
                <comment>类文件路径</comment>
            </column>
        </property>
        <property name="name" type="java.lang.String">
            <column name="name" length="255">
                <comment>模板名称</comment>
            </column>
        </property>
        <property name="type" type="java.lang.String">
            <column name="type" length="50">
                <comment>类型</comment>
            </column>
        </property>
        <property name="valid" type="java.lang.Integer">
            <column name="valid" length="11">
                <comment>有效性</comment>
            </column>
        </property>
        <property name="flowId" type="java.lang.Integer">
            <column name="flow_id" length="11">
                <comment>流程ID</comment>
            </column>
        </property>
    </class>
</hibernate-mapping>

src/main/webapp/WEB-INF/ehr/jsp/monitor/service/sEnvManageJs.jsp

@@ -138,7 +138,7 @@
                     },
                     legend: {
                         left: 'left',
                         data: ['使用率']
                         data: ['带宽']
                     },
                     xAxis: {
                         type: 'category',
@@ -154,11 +154,10 @@
                     },
                     yAxis: {
                         type: 'log',
                         name: '使用率'
                     },
                     series: [
                         {
                             name: '使用率',
                             name: '带宽',
                             type: 'line',
                             data: y
                         },
@@ -194,7 +193,7 @@
                    },
                    legend: {
                        left: 'left',
                        data: ['使用率']
                        data: ['吞吐量']
                    },
                    xAxis: {
                        type: 'category',
@@ -210,11 +209,10 @@
                    },
                    yAxis: {
                        type: 'log',
                        name: '使用率'
                    },
                    series: [
                        {
                            name: '使用率',
                            name: '吞吐量',
                            type: 'line',
                            data: y
                        },
@@ -250,7 +248,7 @@
                    },
                    legend: {
                        left: 'left',
                        data: ['已使用']
                        data: ['延时']
                    },
                    xAxis: {
                        type: 'category',
@@ -266,11 +264,10 @@
                    },
                    yAxis: {
                        type: 'log',
                        name: '使用率'
                    },
                    series: [
                        {
                            name: '已使用',
                            name: '延时',
                            type: 'line',
                            data: y
                        }
@@ -328,7 +325,6 @@
                    },
                    yAxis: {
                        type: 'log',
                        name: '使用数'
                    },
                    series: [
                        {

src/main/webapp/WEB-INF/ehr/jsp/system/app/appDetailJs.jsp

@@ -54,6 +54,8 @@
            $(".m-form-bottom").on("click","#btnEditor",function () {
                //TODO 详情页面变编辑
                parent.app.dialog.close();
            });
            $("#status").ligerComboBox({data : [{"value":"有效","code":"1"},{"value":"无效","code":"0"}],

src/main/webapp/WEB-INF/ehr/jsp/system/app/appJs.jsp

@@ -5,8 +5,6 @@
    /* *************************** 模块初始化 ***************************** */
    var app = {
        grid: null,
        $searchStatusName: $('#status'),//转台文本匡对象
        $searchBtn: $('.l-trigger-search'),//搜索按钮
        dialog: null,
        init: function () {
            this.bindEvents();
@@ -18,7 +16,7 @@
            $("#txtName").ligerSearch({
                onClick:function(value){
                    me.reloadGrid();
                }});
            }});
            var appStatus = liger.get("statusName").value;
            if(appStatus ==undefined || appStatus ==null || appStatus.length<=0){
@@ -50,10 +48,10 @@
                        display: '操作', name: 'operator', width: '35%', render: function (row) {
                        var html = '<div class="m-inline-buttons" style="width:350px;">';
                        html += "<a class=\"m-btn\" style=\"padding-right:10px\" onclick=\"app.dialogDetail('"+row.id+"')\">查看详情</a>";
                        html += "<a class=\"m-btn\" style=\"padding-right:10px\" onclick=\"app.editorDialog('"+row.id+"','disabled')\">查看详情</a>";
                        html += "<a class=\"m-btn\" style=\"padding-right:10px\" onclick=\"app.appServiceManage('"+row.id+"')\">服务管理</a>";
//                        html += "<a class=\"m-btn\"  onclick=\"app.dialogDetail('"+row.id+"')\">应用标准</a>";
                        html += "<a class=\"m-btn-edit\" onclick=\"app.editorDialog('"+row.id+"')\"></a>";
                        html += "<a class=\"m-btn-edit\" onclick=\"app.editorDialog('"+row.id+"','')\"></a>";
                        html += "<a class=\"m-btn-delete\" onclick=\"app.delete('"+row.id+"')\"></a>";
                        html += '</div>';
                        return html;
@@ -68,16 +66,23 @@
        },
        bindEvents: function () {
            var me = this;
            var flag = false;
            $('#div_new_record').click(function () {
                me.editorDialog();
            });
            $("#statusName").ligerComboBox({data : [{"value":"全部","code":""},{"value":"有效","code":"1"},{"value":"无效","code":"0"}],
                cancelable:false,
                initIsTriggerEvent: false,
                onSelected: function (value)
                {
                    if (flag) {
                        me.reloadGrid();
                    } else {
                        flag = true;
                    }
                },
                onSuccess:function(data){
            }});
                }});
            $(".l-text").css("display","inline-block");
            $(".l-text-wrapper").css("display","inline-block");
@@ -118,17 +123,17 @@
            this.grid.reload();
        },
        //编辑弹窗
        editorDialog: function (id) {
        editorDialog: function (id, flag) {
            var me = this;
            var title = "新增应用";
            var params = null;
            if (id != undefined && id != null) {
                title = "编辑应用";
                params = {"id": id};
                params = {"id": id, "flag": flag};
            }
            me.dialog = $.ligerDialog.open({
                height: 500,
                height: 600,
                width: 500,
                title: title,
                url: '${contextRoot}/app/editorApp',

src/main/webapp/WEB-INF/ehr/jsp/system/app/appServiceDetail.jsp

@@ -25,7 +25,7 @@
            </div>
        </div>
        <label style="width:110px;"><span class="red">*&nbsp;</span>状态：</label>
        <label style="width:110px;">状态：</label>
        <div class="m-form-control">
            <div class="l-text">
@@ -46,7 +46,7 @@
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>描述：</label>
        <label>描述：</label>
        <div class="m-form-control">
            <div class="l-text" style="width:800px;">
@@ -56,7 +56,7 @@
    </div>
    <div class="m-form-group" >
        <label><span class="red">*&nbsp;</span>健康监控：</label>
        <label>健康监控：</label>
        <div class="m-form-control">
            <div class="l-text" style="width:800px;">
@@ -66,7 +66,7 @@
    </div>
    <div class="m-form-group" >
        <label><span class="red">*&nbsp;</span>指标监控：</label>
        <label>指标监控：</label>
        <div class="m-form-control">
            <div class="l-text" style="width:800px;">
@@ -77,7 +77,7 @@
    <div class="m-form-group" >
        <label><span class="red">*&nbsp;</span>输入格式：</label>
        <label>输入格式：</label>
        <div class="m-form-control">
            <div class="l-text"  style="width:800px;height:100px;" >
@@ -88,7 +88,7 @@
    <div class="m-form-group" >
        <label><span class="red"></span>参数：</label>
        <label>参数：</label>
        <div class="m-form-control" id="paramDiv">
        </div>
@@ -97,7 +97,7 @@
    <div class="m-form-group" >
        <label><span class="red">*&nbsp;</span>输出正确格式：</label>
        <label>输出正确格式：</label>
        <div class="m-form-control">
            <div class="l-text"  style="width:800px;height:100px;">
@@ -107,7 +107,7 @@
    </div>
    <div class="m-form-group" >
        <label><span class="red">*&nbsp;</span>输出错误格式：</label>
        <label>输出错误格式：</label>
        <div class="m-form-control">
            <div class="l-text"  style="width:800px;height:100px;" >

src/main/webapp/WEB-INF/ehr/jsp/system/app/appServiceJs.jsp

@@ -62,9 +62,13 @@
                me.returnAppManage();
            });
            $("#txtValid").ligerComboBox({data : [{"value":"全部","code":""},{"value":"有效","code":"1"},{"value":"无效","code":"0"}],
                cancelable:false,
                onSelected: function (value)
                {
                    me.reloadGrid();
                },
                onSuccess:function(data){
            }});

src/main/webapp/WEB-INF/ehr/jsp/system/app/editorApp.jsp

@@ -3,7 +3,7 @@
<!--######应用管理页面 > 应用详情模板页######-->
<div id="div_info_form" class="m-form-inline" style="padding-top:10px;" data-role-form>
    <input id="flag" value="${flag}" style="display: none">
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>应用名称：</label>
@@ -18,7 +18,7 @@
        <div class="m-form-control">
            <div class="l-text">
                <input type="text" class="l-text-field" placeholder="请输入英文名称" name="code"/>
                <input type="text" class="l-text-field required" placeholder="请输入英文名称" name="code"/>
            </div>
        </div>
    </div>
@@ -36,14 +36,14 @@
        <div class="m-form-control">
            <form id="form1" action="${contextRoot}/app/upload" method="post" enctype="multipart/form-data">
                <input type="text" id="name_icon" name="icon" class="l-textbox btnGrayUp" style="width: 144px;"  placeholder="点击选择应用图标" readonly="readonly" data-id="">
                <div style="float: right;">
                    <div  class="l-button l-button-no btnGrayDo" data-id="1">
                        <span style="background-color: rgb(240, 240, 240);">上传</span>
                    <input type="text" id="name_icon" name="icon" class="l-textbox btnGrayUp" style="width: 144px;"  placeholder="点击选择应用图标" readonly="readonly" data-id="">
                    <div style="float: right;">
                        <div  class="l-button l-button-no btnGrayDo" data-id="1">
                            <span style="background-color: rgb(240, 240, 240);">上传</span>
                        </div>
                        <label class="say1" style="display: inline-block;width: 70px;"></label>
                    </div>
                    <label class="say1" style="display: inline-block;width: 70px;"></label>
                </div>
                <input type="file" name="file" style="display: none" id="file1" />
                <input type="file" name="file" style="display: none" id="file1" accept="image/jpg,image/jpeg,image/gif" />
            </form>
        </div>
    </div>
@@ -63,7 +63,7 @@
        <div class="m-form-control">
            <div class="l-text">
                <input type="text" class="l-text-field" placeholder="请输入开发者名称" name="developer"/>
                <input type="text" class="l-text-field required" placeholder="请输入开发者名称" name="developer"/>
            </div>
        </div>
    </div>
@@ -77,16 +77,15 @@
        </div>
    </div>
    <div class="m-form-group">
        <label>appSecret：</label>
        <label><span class="red">*&nbsp;</span>appSecret：</label>
        <div class="m-form-control ">
            <div class="l-text">
                <input type="text"  class="l-text-field required"  name="appSecret">
                <input type="text"  class="l-text-field required"  placeholder="请输入appSecret" name="appSecret">
            </div>
        </div>
    </div>
    <div class="m-form-group">
        <label>状态：</label>
        <label><span class="red">*&nbsp;</span>状态：</label>
        <div class="m-form-control ">
            <div class="l-text">
                <input type="text" id="status"  class="l-text-field required" name="status">
@@ -102,6 +101,9 @@
        <div id="btnCancel" class="l-button l-button-no">
            <span>关闭</span>
        </div>
        <div id="btnEditor" class="l-button" style="display: none">
            <span>编辑</span>
        </div>
        <div id="btnSave" class="l-button">
            <span>保存</span>
        </div>
@@ -110,4 +112,5 @@
<style>
    .m-form-group label{width: 135px;}
    .btnGrayUp.required{border: #FF7777 1px solid; float: left;}
</style>

src/main/webapp/WEB-INF/ehr/jsp/system/app/editorAppJs.jsp

@@ -8,9 +8,26 @@
        actionUrl:"${contextRoot}/app/addApp",
        init: function () {
            this.toDisable();
            this.bindEvents();
            this.initForm();
        },
        toDisable: function () {
            debugger;
            if ($("#flag").val()=='disabled') {
                $("#btnEditor").show();
                $("#btnSave").hide();
                $("input[name='name']").attr("disabled", "disabled");
                $("input[name='code']").attr("disabled", "disabled");
                $("input[name='icon']").attr("disabled", "disabled");
                $($(".btnGrayDo")[0]).attr("disabled","disabled");
                $("input[name='appUrl']").attr("disabled", "disabled");
                $("input[name='developer']").attr("disabled", "disabled");
                $("input[name='appKey']").attr("disabled", "disabled");
                $("input[name='appSecret']").attr("disabled", "disabled");
                $("input[name='status']").attr("disabled", "disabled");
            }
        },
        initForm: function () {
            var me = this;
           var data;
@@ -35,17 +52,16 @@
            }else{
                liger.get("status").selectValue("1");//默认有效
            }
            var iconVal=$("#name_icon").attr("src");
            if(iconVal!=''){
                $("#form1").closest("div").find("span").html("重新上传<i></i>");
            }
            $("#div_info_form").ligerAutoForm({
                data:data,
                validate:{
                    name:"required",
                    appUrl:"required",
                    developer:"required",
                    code:"required",
                    icon: {
                        required:true
                    },
                    appKey:"required",
                    appSecret: {
                        required:true
@@ -54,10 +70,23 @@
                },
            });
            var iconVal=$("#name_icon").val();
            if(iconVal!=''){
                $("#form1").closest("div").find("span").html("重新上传<i></i>");
            }
        },
        bindEvents: function () {
            var me = this;
            $(".m-form-bottom").on("click","#btnSave",function () {
                $("#btnSave").css("pointer-events","none");
                $("#name_icon").removeClass("required");
                if($("#name_icon").val()=="") {
                    $("#name_icon").addClass("required");
                    if(!$("#div_info_form").ligerAutoForm("validate")){
                        return;
                    }
                    return;
                }
                if(!$("#div_info_form").ligerAutoForm("validate")){
                    return;
                }
@@ -75,13 +104,28 @@
                        else{
                            $.ligerDialog.error(data.message);
                        }
                        $("#btnSave").css("pointer-events","");
                    },
                    error :function(data){
                        $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                        $("#btnSave").css("pointer-events","");
                    }
                });
            });
            $(".m-form-bottom").on("click","#btnEditor",function () {
                        $("#btnEditor").hide();
                        $("#btnSave").show();
                        $("input[name='name']").removeAttr("disabled");
                        $("input[name='code']").removeAttr("disabled");
                        $("input[name='icon']").removeAttr("disabled");
                        $($(".btnGrayDo")[0]).removeAttr("disabled");
                        $("input[name='appUrl']").removeAttr("disabled");
                        $("input[name='developer']").removeAttr("disabled");
                        $("input[name='appKey']").removeAttr("disabled");
                        $("input[name='appSecret']").removeAttr("disabled");
                        $("input[name='status']").removeAttr("disabled");
                        $("#flag").val("");
            });
            $(".m-form-bottom").on("click","#btnCancel",function () {
                parent.app.dialog.close();
            });
@@ -96,10 +140,13 @@
                var obj=$(this).closest("div").find("input[type=file]")
                obj.change(function(){
                    inputVal.val(obj.val());
                })
                });
                obj.click();
            });
            $(".btnGrayDo").bind("click",function(){
                if ($("#flag").val()=='disabled') {
                    return;
                }
                var id = $(this).attr("data-id");
                var formId = '#form'+id;
                var formObj=$(formId);//要提交的表单
@@ -107,15 +154,15 @@
                var upObj=formObj.closest("input").find(".btnGrayUp");//浏览的按钮
                var formsay=formObj.find(".say"+id);//提示文字
                if(formObj.closest("div").find("input[type=text]").val().length!=0){//判断是否选择了文件
                    formsay.attr("class","say true").html("上传中");
                    formsay.html("上传中");
                    formObj.ajaxForm({
                        dataType: 'json',
                        success:  function processJson(data){
                            if(data.successFlg){
                                formsay.attr("class","say true").html("上传成功");
                                formObj.find("input[type=text]").attr("data-id","/upload/"+data.message)//设置已上传的文件的ID
                                formObj.find("input[type=text]").val("/upload/"+data.message)//设置已上传的文件的ID
                                $("#img_icon").attr("src","/upload/"+data.message)//设置已上传的文件的ID
                                formsay.html("上传成功");
                                formObj.find("input[type=text]").attr("data-id","${contextRoot}/upload/"+data.message)//设置已上传的文件的ID
                                formObj.find("input[type=text]").val("${contextRoot}/upload/"+data.message)//设置已上传的文件的ID
                                $("#img_icon").attr("src","${contextRoot}/upload/"+data.message)//设置已上传的文件的ID
                                formObj.closest("div").find("span").html("重新上传<i></i>");
                            }else{
                                $.ligerDialog.error("上传格式有问题");
@@ -125,7 +172,7 @@
                            //console.log(eval('('+data.data+')'));
                        },
                        error: function processJson(data){
                            formsay.attr("class","say false").html("上传失败");
                            formsay.html("上传失败");
                        }
                    });
                    formObj.submit();

src/main/webapp/WEB-INF/ehr/jsp/system/app/editorAppService.jsp

@@ -20,7 +20,7 @@
            </div>
        </div>
        <label style="width:110px;"><span class="red">*&nbsp;</span>状态：</label>
        <label style="width:110px;">状态：</label>
        <div class="m-form-control">
            <div class="l-text">
@@ -41,17 +41,17 @@
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>描述：</label>
        <label>描述：</label>
        <div class="m-form-control">
            <div class="l-text" style="width:800px;">
                <input type="text" class="l-text-field" placeholder="请填写描述内容" name="description"/>
                <input type="text" style="width:790px;" class="l-text-field" maxlength="255" placeholder="请填写描述内容" name="description"/>
            </div>
        </div>
    </div>
    <div class="m-form-group" >
        <label><span class="red">*&nbsp;</span>健康监控：</label>
        <label>健康监控：</label>
        <div class="m-form-control">
            <div class="l-text" >
@@ -61,7 +61,7 @@
    </div>
    <div class="m-form-group" >
        <label><span class="red">*&nbsp;</span>指标监控：</label>
        <label>指标监控：</label>
        <div class="m-form-control">
            <div class="l-text" >
@@ -71,7 +71,7 @@
    </div>
    <div class="m-form-group" >
        <label><span class="red">*&nbsp;</span>输入格式：</label>
        <label>输入格式：</label>
        <div class="m-form-control">
            <div class="l-text"  style="width:800px;height:100px;" >
@@ -119,7 +119,7 @@
    <div class="m-form-group" >
        <label><span class="red">*&nbsp;</span>输出正确格式：</label>
        <label>输出正确格式：</label>
        <div class="m-form-control">
            <div class="l-text"  style="width:800px;height:100px;">
@@ -129,7 +129,7 @@
    </div>
    <div class="m-form-group" >
        <label><span class="red">*&nbsp;</span>输出错误格式：</label>
        <label>输出错误格式：</label>
        <div class="m-form-control">
            <div class="l-text"  style="width:800px;height:100px;" >
@@ -155,3 +155,6 @@
        </div>
    </div>
</div>
<style>
    .paramRequired{border: #FF7777 1px solid;}
</style>

src/main/webapp/WEB-INF/ehr/jsp/system/app/editorAppServiceJs.jsp

@@ -74,9 +74,22 @@
        bindEvents: function () {
            var me = this;
            $(".m-form-bottom").on("click","#btnSave",function () {
                $("#btnSave").css("pointer-events","none");
                $(".param").each(function(){$(this).removeClass("paramRequired")});
                var flag = false;
                $(".param").each(function(){
                    if($(this).val()=="") {
                        flag = true;
                        $(this).addClass("paramRequired");
                    }
                });
                if(!$("#div_info_form").ligerAutoForm("validate")){
                    return;
                }
                if (flag) {
                    return;
                }
                me.spliceParams();
                var data = $("#div_info_form").ligerAutoForm("getData");
                $.ajax({ //ajax处理
@@ -92,9 +105,11 @@
                        else{
                            $.ligerDialog.error(data.message);
                        }
                        $("#btnSave").css("pointer-events","");
                    },
                    error :function(data){
                        $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                        $("#btnSave").css("pointer-events","");
                    }
                });
            });
@@ -142,10 +157,11 @@
                index=1;
            }
            var html = '<div class="params" dataIndex="'+index+'" id="paramGroup'+index+'">';
            html += '<div class="m-form-control" controlType="textbox" id="divName'+index+'_div" style="margin-left:0px;">参数'+index+' : ' +
                    '<input type="text" id="name'+index+'"  class="l-textbox"/></div>';
            html += '<div class="m-form-control" controlType="textbox" id="divType'+index+'_div" style="margin-left:0px;"><div class="l-text-wrapper"><p style="padding-left:10px;width: 100%;height: 100%;line-height:30px;">类型:</p></div>' +
                    '<input type="text" id="type'+index+'" data-type="select"  class="l-textbox"/></div>';
            html += '<div class="m-form-control" controlType="textbox" id="divName'+index+'_div" style="margin-left:0px;"><span class="red">*&nbsp;</span>参数'+index+' : ' +
                    '<input type="text" id="name'+index+'"  class="l-textbox param "/>' +
                    '<div class="m-from-error-msg imageRequired" style="float: right;display: none"></div></div>';
            html += '<div class="m-form-control" controlType="textbox" id="divType'+index+'_div" style="margin-left:0px;"><div class="l-text-wrapper"><p style="padding-left:10px;width: 100%;height: 100%;line-height:30px;"><span class="red">*&nbsp;</span>类型:</p></div>' +
                    '<input type="text" id="type'+index+'" data-type="select"  class="l-textbox required"/></div>';
            html += '<div class="m-form-control"><a class="m-btn-cancle" href="javascrip:void()" style="display:block;" onclick="$(\'#paramGroup'+index+'\').remove()"></a></div>';
            $("#paramDiv").append(html);

src/main/webapp/WEB-INF/ehr/jsp/system/flow/editorFlow.jsp

@@ -101,7 +101,7 @@
            <label>类别：</label>
            <div class="m-form-control ">
                <div class="l-text">
                    <input type="text" id="fileType"  class="l-text-field required" name="fileType">
                    <input type="text" id="fileType"   class="l-text-field required" name="fileType">
                </div>
            </div>
        </div>

src/main/webapp/WEB-INF/ehr/jsp/system/flow/editorFlowJs.jsp

@@ -7,6 +7,7 @@
<script type="text/javascript">
    /* *************************** 模块初始化 ***************************** */
    var fileType;
    var editorFlow = {
        //form
        actionUrl:"${contextRoot}/flow/addFlow",
@@ -24,6 +25,7 @@
            var modelString = "${model.id}";
            if(modelString!=undefined && modelString!=null && modelString.length>0)
            {
                $("#fileType").attr("disabled","disabled");
                var icon = $("#iconUrl").attr("data-id");
                if(icon!='' && icon!='undefine'){
                    if(icon!= "${model.chart}"){
@@ -38,7 +40,7 @@
                var valid = "${model.valid}";
                liger.get("valid").selectValue(valid);
                var fileType = "${model.fileType}";
                fileType = "${model.fileType}";
                liger.get("fileType").selectValue(fileType);
               data={
                    id: "${model.id}",
@@ -50,6 +52,7 @@
                   fileType:"${model.fileType}",
                   flowClassList: '${flowClass}',
                   flowClassArray:'${model.flowClassArray}',
                   flowTempArray:'${model.flowTempArray}',
                   createDate:'${model.createDate}'
                };
@@ -83,14 +86,26 @@
            }
            liger.get("type"+index).selectValue(type);
            me.flowClassData[me.$mun]= {
                "packageName": $("#packageName"+index).val(),
                "className": $("#className"+index).val(),
                "classPath": $("#classPath"+index).val(),
                "flowId": $("#flowId").val(),//流程id
                "type":$("#type"+index).val(),
                "id":$("#classId"+index).val(),
                "isUpdate":$("#isUpdate"+index).val()
            if("class"==fileType){
                me.flowClassData[me.$mun]= {
                    "packageName": $("#packageName"+index).val(),
                    "className": $("#className"+index).val(),
                    "classPath": $("#classPath"+index).val(),
                    "flowId": $("#flowId").val(),//流程id
                    "type":$("#type"+index).val(),
                    "id":$("#classId"+index).val(),
                    "isUpdate":$("#isUpdate"+index).val()
                }
            }else if("java"==fileType){
                me.flowClassData[me.$mun]= {
                    "packageName": $("#packageName"+index).val(),
                    "className": $("#className"+index).val(),
                    "classPath": $("#classPath"+index).val(),
                    "flowId": $("#flowId").val(),//流程id
                    "type":$("#type"+index).val(),
                    "id":$("#classId"+index).val(),
                    "isUpdate":$("#isUpdate"+index).val()
                }
            }
            me.$mun+=1;
        },
@@ -98,6 +113,7 @@
            var me = this;
            $(".m-form-bottom").on("click","#btnSave",function () {
                fileType =liger.get("fileType").selectedValue;
                if(!$("#div_info_form").ligerAutoForm("validate")){
                    return;
                }
@@ -109,13 +125,20 @@
                var data = $("#div_info_form").ligerAutoForm("getData");
                delete data.file;
                data.flowClassArray=me.flowClassData;
                var dataStr = JSON.stringify(data);
                debugger
                var dataList;
                if("java"==fileType){
                    data.flowTempArray = me.flowClassData;
                    dataList={"flowClass":JSON.stringify(data)}
                }else if("class"==fileType){
                    data.flowClassArray=me.flowClassData;
                    dataList={"flowClass":JSON.stringify(data)}
                }
                $.ajax({ //ajax处理
                    type: "POST",
                    url : me.actionUrl,
                    dataType : "json",
                    data:{"flowClass":dataStr},
                    data:dataList,
                    cache:false,
                    success :function(data){
                        if(data.successFlg) {

src/main/webapp/WEB-INF/ehr/jsp/system/flow/flowJs.jsp

@@ -61,13 +61,21 @@
        },
        bindEvents: function () {
            var me = this;
            var flag = false;
            $('#div_new_record').click(function () {
                me.editorDialog();
            });
            $("#statusName").ligerComboBox({data : [{"value":"全部","code":""},{"value":"有效","code":"1"},{"value":"无效","code":"0"}],
                cancelable:false,
                onSelected: function (value)
                {
                    if (flag) {
                        me.reloadGrid();
                    } else {
                        flag = true;
                    }
                },
                onSuccess:function(data){
            }});
@@ -124,7 +132,7 @@
        //刷新列表数据
        reloadGrid: function () {
            this.grid.set({
                parms: {name: $('#txtName').val(),status:$('#statusName_val').val()}
                parms: {name: $('#txtName').val(),valid:$('#statusName_val').val()}
            });
            this.grid.reload();
        },