test

沈斌

2017-11-20 44bfab8ff28cbeb54686f9398699615324ca879b

 src/main/java/com/moral/monitor/controller/MonitorPointController.java

@@ -1,6 +1,6 @@
package com.moral.monitor.controller;



import com.moral.monitor.entity.Monitorpoint;

import com.moral.monitor.entity.MonitorPoint;

import com.moral.monitor.entity.QueryHelper;

import com.moral.monitor.service.MonitorpointService;

import org.apache.commons.logging.Log;

@@ -36,7 +36,7 @@
        }



        LinkedHashMap<String, Object> s = new LinkedHashMap<String, Object>();

        List<Monitorpoint> equs = monitorPointService.allMonitorpoint(queryHelper);

        List<MonitorPoint> equs = monitorPointService.allMonitorpoint(queryHelper);

        s.put("rows",equs);



        int total = monitorPointService.monitorCount(queryHelper);

@@ -69,7 +69,7 @@


    @RequestMapping("/addMonitorpoint")

    @ResponseBody

    public String addMonitorpoint(@RequestBody Monitorpoint monitorPoint){

    public String addMonitorpoint(@RequestBody MonitorPoint monitorPoint){



        try {

            String name = monitorPoint.getName();

@@ -90,7 +90,7 @@


    @RequestMapping("/editMonitorPoint")

    @ResponseBody

    public String editMonitorPoint(@RequestBody Monitorpoint monitorPoint){

    public String editMonitorPoint(@RequestBody MonitorPoint monitorPoint){

        try {

            monitorPointService.updateMonitorpoint(monitorPoint);

        }catch (Exception e){