Merge branch 'deng' of http://101.43.41.9:13000/xzzn/SIPAIIS_WMS_JSSW into deng

src/main/java/com/sipai/controller/pipeline/PipelineDataController.java

@@ -0,0 +1,117 @@
+package com.sipai.controller.pipeline;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sipai.entity.pipeline.PipelineData;
+import com.sipai.entity.user.User;
+import com.sipai.service.pipeline.PipelineDataService;
+import com.sipai.tools.CommUtil;
+import net.sf.json.JSONArray;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Controller
+@RequestMapping("/pipeline/pipelineData")
+public class PipelineDataController {
+    @Resource
+    private PipelineDataService pipelineDataService;
+
+    @RequestMapping("/showList.do")
+    public String showList(HttpServletRequest request, Model model) {
+        return "/pipeline/pipelineDataList";
+    }
+
+    @RequestMapping("/getList.do")
+    public ModelAndView getList(HttpServletRequest request, Model model,
+            @RequestParam(value = "page") Integer page,
+            @RequestParam(value = "rows") Integer rows,
+            @RequestParam(value = "sort", required = false) String sort,
+            @RequestParam(value = "order", required = false) String order) {
+        User cu = (User) request.getSession().getAttribute("cu");
+        if (sort == null || sort.equals("id")) {
+            sort = " id ";
+        }
+        if (order == null) {
+            order = " desc ";
+        }
+        String orderstr = " order by " + sort + " " + order;
+        String wherestr = " where 1=1 ";
+        if (request.getParameter("search_name") != null && !request.getParameter("search_name").isEmpty()) {
+            wherestr += " and pipeline_name like '%" + request.getParameter("search_name") + "%'";
+        }
+        PageHelper.startPage(page, rows);
+        List<PipelineData> list = this.pipelineDataService.selectListByWhere(wherestr + orderstr);
+        PageInfo<PipelineData> pInfo = new PageInfo<PipelineData>(list);
+        JSONArray jsonArray = JSONArray.fromObject(list);
+        String result = "{\"total\":" + pInfo.getTotal() + ",\"rows\":" + jsonArray + "}";
+        model.addAttribute("result", result);
+        return new ModelAndView("result");
+    }
+
+    @RequestMapping("/add.do")
+    public String doadd(HttpServletRequest request, Model model) {
+        return "/pipeline/pipelineDataAdd";
+    }
+
+    @RequestMapping("/save.do")
+    public String dosave(HttpServletRequest request, Model model,
+            @ModelAttribute PipelineData pipelineData) {
+        User cu = (User) request.getSession().getAttribute("cu");
+//        pipelineData.setId(CommUtil.getUUID());
+        int result = this.pipelineDataService.save(pipelineData);
+        String resultstr = "{\"res\":\"" + result + "\",\"id\":\"" + pipelineData.getId() + "\"}";
+        model.addAttribute("result", resultstr);
+        return "result";
+    }
+
+    @RequestMapping("/delete.do")
+    public String dodelete(HttpServletRequest request, Model model,
+            @RequestParam(value = "id") String id) {
+        int result = this.pipelineDataService.deleteById(id);
+        model.addAttribute("result", result);
+        return "result";
+    }
+
+    @RequestMapping("/deletes.do")
+    public String dodeletes(HttpServletRequest request, Model model,
+            @RequestParam(value = "ids") String ids) {
+        ids = ids.replace(",", "','");
+        int result = this.pipelineDataService.deleteByWhere("where id in ('" + ids + "')");
+        model.addAttribute("result", result);
+        return "result";
+    }
+
+    @RequestMapping("/edit.do")
+    public String doedit(HttpServletRequest request, Model model,
+            @RequestParam(value = "id") String id) {
+        PipelineData pipelineData = this.pipelineDataService.selectById(id);
+        model.addAttribute("pipelineData", pipelineData);
+        return "/pipeline/pipelineDataEdit";
+    }
+
+    @RequestMapping("/update.do")
+    public String doupdate(HttpServletRequest request, Model model,
+            @ModelAttribute PipelineData pipelineData) {
+        User cu = (User) request.getSession().getAttribute("cu");
+        int result = this.pipelineDataService.update(pipelineData);
+        String resstr = "{\"res\":\"" + result + "\",\"id\":\"" + pipelineData.getId() + "\"}";
+        model.addAttribute("result", resstr);
+        return "result";
+    }
+
+    @RequestMapping("/view.do")
+    public String doview(HttpServletRequest request, Model model,
+            @RequestParam(value = "id") String id) {
+        PipelineData pipelineData = this.pipelineDataService.selectById(id);
+        model.addAttribute("pipelineData", pipelineData);
+        return "/pipeline/pipelineDataView";
+    }
+}

src/main/java/com/sipai/dao/pipeline/PipelineDataDao.java

@@ -0,0 +1,13 @@
+package com.sipai.dao.pipeline;
+
+import com.sipai.dao.base.CommDaoImpl;
+import com.sipai.entity.pipeline.PipelineData;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class PipelineDataDao extends CommDaoImpl<PipelineData> {
+    public PipelineDataDao() {
+        super();
+        this.setMappernamespace("pipeline.PipelineDataMapper");
+    }
+}

src/main/java/com/sipai/entity/pipeline/PipelineData.java

@@ -0,0 +1,165 @@
+package com.sipai.entity.pipeline;
+
+import com.sipai.entity.base.SQLAdapter;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 管道数据实体类
+ */
+public class PipelineData extends SQLAdapter implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+    /**
+     * 自增主键ID，唯一标识每条记录
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /**
+     * 管道的名称、编号或位置描述
+     */
+    @Column(name = "pipeline_name", length = 100)
+    private String pipelineName;
+
+    /**
+     * 管道的直径，通常指公称直径或内径，单位：毫米(mm)
+     */
+    @Column(name = "diameter_mm", precision = 10, scale = 5)
+    private BigDecimal diameterMm;
+
+    /**
+     * 管道的实际铺设总长度，单位：米(m)
+     */
+    @Column(name = "length_m", precision = 10, scale = 5)
+    private BigDecimal lengthM;
+
+    /**
+     * 管道起点处的埋设深度，从地面到管道顶部的垂直距离，单位：米(m)
+     */
+    @Column(name = "start_burial_depth_m", precision = 10, scale = 5)
+    private BigDecimal startBurialDepthM;
+
+    /**
+     * 管道终点处的埋设深度，从地面到管道顶部的垂直距离，单位：米(m)
+     */
+    @Column(name = "end_burial_depth_m", precision = 10, scale = 5)
+    private BigDecimal endBurialDepthM;
+
+    /**
+     * 管道起点处的地面高程（海拔或相对标高），单位：米(m)
+     */
+    @Column(name = "start_ground_elevation_m", precision = 10, scale = 5)
+    private BigDecimal startGroundElevationM;
+
+    /**
+     * 管道终点处的地面高程（海拔或相对标高），单位：米(m)
+     */
+    @Column(name = "end_ground_elevation_m", precision = 10, scale = 5)
+    private BigDecimal endGroundElevationM;
+
+    /**
+     * 管道内部底部的标高，常用于水力坡降计算，单位：米(m)
+     */
+    @Column(name = "pipeline_invert_elevation_m", precision = 10, scale = 5)
+    private BigDecimal pipelineInvertElevationM;
+
+    // 构造方法
+    public PipelineData() {
+    }
+
+    // Getters 和 Setters
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPipelineName() {
+        return pipelineName;
+    }
+
+    public void setPipelineName(String pipelineName) {
+        this.pipelineName = pipelineName;
+    }
+
+    public BigDecimal getDiameterMm() {
+        return diameterMm;
+    }
+
+    public void setDiameterMm(BigDecimal diameterMm) {
+        this.diameterMm = diameterMm;
+    }
+
+    public BigDecimal getLengthM() {
+        return lengthM;
+    }
+
+    public void setLengthM(BigDecimal lengthM) {
+        this.lengthM = lengthM;
+    }
+
+    public BigDecimal getStartBurialDepthM() {
+        return startBurialDepthM;
+    }
+
+    public void setStartBurialDepthM(BigDecimal startBurialDepthM) {
+        this.startBurialDepthM = startBurialDepthM;
+    }
+
+    public BigDecimal getEndBurialDepthM() {
+        return endBurialDepthM;
+    }
+
+    public void setEndBurialDepthM(BigDecimal endBurialDepthM) {
+        this.endBurialDepthM = endBurialDepthM;
+    }
+
+    public BigDecimal getStartGroundElevationM() {
+        return startGroundElevationM;
+    }
+
+    public void setStartGroundElevationM(BigDecimal startGroundElevationM) {
+        this.startGroundElevationM = startGroundElevationM;
+    }
+
+    public BigDecimal getEndGroundElevationM() {
+        return endGroundElevationM;
+    }
+
+    public void setEndGroundElevationM(BigDecimal endGroundElevationM) {
+        this.endGroundElevationM = endGroundElevationM;
+    }
+
+    public BigDecimal getPipelineInvertElevationM() {
+        return pipelineInvertElevationM;
+    }
+
+    public void setPipelineInvertElevationM(BigDecimal pipelineInvertElevationM) {
+        this.pipelineInvertElevationM = pipelineInvertElevationM;
+    }
+
+    @Override
+    public String toString() {
+        return "PipelineData{" +
+                "id=" + id +
+                ", pipelineName='" + pipelineName + '\'' +
+                ", diameterMm=" + diameterMm +
+                ", lengthM=" + lengthM +
+                ", startBurialDepthM=" + startBurialDepthM +
+                ", endBurialDepthM=" + endBurialDepthM +
+                ", startGroundElevationM=" + startGroundElevationM +
+                ", endGroundElevationM=" + endGroundElevationM +
+                ", pipelineInvertElevationM=" + pipelineInvertElevationM +
+                '}';
+    }
+}

src/main/java/com/sipai/mapper/pipeline/PipelineDataMapper.xml

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="pipeline.PipelineDataMapper" >
+  <resultMap id="BaseResultMap" type="com.sipai.entity.pipeline.PipelineData" >
+    <id column="id" property="id" jdbcType="BIGINT" />
+    <result column="pipeline_name" property="pipelineName" jdbcType="VARCHAR" />
+    <result column="diameter_mm" property="diameterMm" jdbcType="DECIMAL" />
+    <result column="length_m" property="lengthM" jdbcType="DECIMAL" />
+    <result column="start_burial_depth_m" property="startBurialDepthM" jdbcType="DECIMAL" />
+    <result column="end_burial_depth_m" property="endBurialDepthM" jdbcType="DECIMAL" />
+    <result column="start_ground_elevation_m" property="startGroundElevationM" jdbcType="DECIMAL" />
+    <result column="end_ground_elevation_m" property="endGroundElevationM" jdbcType="DECIMAL" />
+    <result column="pipeline_invert_elevation_m" property="pipelineInvertElevationM" jdbcType="DECIMAL" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, pipeline_name, diameter_mm, length_m, start_burial_depth_m, end_burial_depth_m, 
+    start_ground_elevation_m, end_ground_elevation_m, pipeline_invert_elevation_m
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from pipeline_data
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from pipeline_data
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.sipai.entity.pipeline.PipelineData" >
+    insert into pipeline_data (id, pipeline_name, diameter_mm, 
+      length_m, start_burial_depth_m, end_burial_depth_m, 
+      start_ground_elevation_m, end_ground_elevation_m, 
+      pipeline_invert_elevation_m)
+    values (#{id,jdbcType=VARCHAR}, #{pipelineName,jdbcType=VARCHAR}, #{diameterMm,jdbcType=DECIMAL}, 
+      #{lengthM,jdbcType=DECIMAL}, #{startBurialDepthM,jdbcType=DECIMAL}, #{endBurialDepthM,jdbcType=DECIMAL}, 
+      #{startGroundElevationM,jdbcType=DECIMAL}, #{endGroundElevationM,jdbcType=DECIMAL}, 
+      #{pipelineInvertElevationM,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.sipai.entity.pipeline.PipelineData" >
+    insert into pipeline_data
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="pipelineName != null" >
+        pipeline_name,
+      </if>
+      <if test="diameterMm != null" >
+        diameter_mm,
+      </if>
+      <if test="lengthM != null" >
+        length_m,
+      </if>
+      <if test="startBurialDepthM != null" >
+        start_burial_depth_m,
+      </if>
+      <if test="endBurialDepthM != null" >
+        end_burial_depth_m,
+      </if>
+      <if test="startGroundElevationM != null" >
+        start_ground_elevation_m,
+      </if>
+      <if test="endGroundElevationM != null" >
+        end_ground_elevation_m,
+      </if>
+      <if test="pipelineInvertElevationM != null" >
+        pipeline_invert_elevation_m,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="pipelineName != null" >
+        #{pipelineName,jdbcType=VARCHAR},
+      </if>
+      <if test="diameterMm != null" >
+        #{diameterMm,jdbcType=DECIMAL},
+      </if>
+      <if test="lengthM != null" >
+        #{lengthM,jdbcType=DECIMAL},
+      </if>
+      <if test="startBurialDepthM != null" >
+        #{startBurialDepthM,jdbcType=DECIMAL},
+      </if>
+      <if test="endBurialDepthM != null" >
+        #{endBurialDepthM,jdbcType=DECIMAL},
+      </if>
+      <if test="startGroundElevationM != null" >
+        #{startGroundElevationM,jdbcType=DECIMAL},
+      </if>
+      <if test="endGroundElevationM != null" >
+        #{endGroundElevationM,jdbcType=DECIMAL},
+      </if>
+      <if test="pipelineInvertElevationM != null" >
+        #{pipelineInvertElevationM,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.sipai.entity.pipeline.PipelineData" >
+    update pipeline_data
+    <set >
+      <if test="pipelineName != null" >
+        pipeline_name = #{pipelineName,jdbcType=VARCHAR},
+      </if>
+      <if test="diameterMm != null" >
+        diameter_mm = #{diameterMm,jdbcType=DECIMAL},
+      </if>
+      <if test="lengthM != null" >
+        length_m = #{lengthM,jdbcType=DECIMAL},
+      </if>
+      <if test="startBurialDepthM != null" >
+        start_burial_depth_m = #{startBurialDepthM,jdbcType=DECIMAL},
+      </if>
+      <if test="endBurialDepthM != null" >
+        end_burial_depth_m = #{endBurialDepthM,jdbcType=DECIMAL},
+      </if>
+      <if test="startGroundElevationM != null" >
+        start_ground_elevation_m = #{startGroundElevationM,jdbcType=DECIMAL},
+      </if>
+      <if test="endGroundElevationM != null" >
+        end_ground_elevation_m = #{endGroundElevationM,jdbcType=DECIMAL},
+      </if>
+      <if test="pipelineInvertElevationM != null" >
+        pipeline_invert_elevation_m = #{pipelineInvertElevationM,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.sipai.entity.pipeline.PipelineData" >
+    update pipeline_data
+    set pipeline_name = #{pipelineName,jdbcType=VARCHAR},
+      diameter_mm = #{diameterMm,jdbcType=DECIMAL},
+      length_m = #{lengthM,jdbcType=DECIMAL},
+      start_burial_depth_m = #{startBurialDepthM,jdbcType=DECIMAL},
+      end_burial_depth_m = #{endBurialDepthM,jdbcType=DECIMAL},
+      start_ground_elevation_m = #{startGroundElevationM,jdbcType=DECIMAL},
+      end_ground_elevation_m = #{endGroundElevationM,jdbcType=DECIMAL},
+      pipeline_invert_elevation_m = #{pipelineInvertElevationM,jdbcType=DECIMAL}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectListByWhere" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from pipeline_data
+    ${where}
+  </select>
+  <delete id="deleteByWhere" parameterType="java.lang.String">
+    delete from
+    pipeline_data
+    ${where}
+  </delete>
+</mapper>

src/main/java/com/sipai/service/pipeline/PipelineDataService.java

@@ -0,0 +1,51 @@
+package com.sipai.service.pipeline;
+
+import com.sipai.dao.pipeline.PipelineDataDao;
+import com.sipai.entity.pipeline.PipelineData;
+import com.sipai.tools.CommService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class PipelineDataService implements CommService<PipelineData> {
+    @Resource
+    private PipelineDataDao pipelineDataDao;
+
+    @Override
+    public PipelineData selectById(String id) {
+        PipelineData pipelineData = pipelineDataDao.selectByPrimaryKey(id);
+        return pipelineData;
+    }
+
+    @Override
+    public int deleteById(String id) {
+        return pipelineDataDao.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int save(PipelineData pipelineData) {
+        return pipelineDataDao.insert(pipelineData);
+    }
+
+    @Override
+    public int update(PipelineData pipelineData) {
+        return pipelineDataDao.updateByPrimaryKeySelective(pipelineData);
+    }
+
+    @Override
+    public List<PipelineData> selectListByWhere(String wherestr) {
+        PipelineData pipelineData = new PipelineData();
+        pipelineData.setWhere(wherestr);
+        List<PipelineData> list = pipelineDataDao.selectListByWhere(pipelineData);
+        return list;
+    }
+
+    @Override
+    public int deleteByWhere(String wherestr) {
+        PipelineData pipelineData = new PipelineData();
+        pipelineData.setWhere(wherestr);
+        return pipelineDataDao.deleteByWhere(pipelineData);
+    }
+}

src/main/webapp/jsp/pipeline/pipelineDataAdd.jsp

@@ -0,0 +1,159 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<style type="text/css">
+.select2-container . select2-selection--single {
+    height: 34px;
+    line-height: 34px;
+}
+.select2-selection__arrow {
+    margin-top: 3px;
+}
+</style>
+<script type="text/javascript">
+    function dosave() {
+        $("#subForm").bootstrapValidator('validate');
+        if ($("#subForm").data('bootstrapValidator').isValid()) {
+            $.post(ext.contextPath + "/pipeline/pipelineData/save.do", $("#subForm").serialize(), function(data) {
+                if (data.res == 1) {
+                    closeModal('subModal');
+                    $("#table").bootstrapTable('refresh');
+                    showAlert('s', '保存成功', 'mainAlertdiv');
+                } else if (data.res == 0) {
+                    showAlert('d', '保存失败', 'alertDiv');
+                } else {
+                    showAlert('d', data.res, 'alertDiv');
+                }
+            }, 'json');
+        }
+    }
+
+    $("#subForm").bootstrapValidator({
+        live: 'disabled',
+        fields: {
+            pipelineName: {
+                validators: {
+                    notEmpty: {
+                        message: '管道名称不能为空'
+                    }
+                }
+            },
+            diameterMm: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            },
+            lengthM: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            },
+            startBurialDepthM: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            },
+            endBurialDepthM: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            },
+            startGroundElevationM: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            },
+            endGroundElevationM: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            },
+            pipelineInvertElevationM: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            }
+        }
+    });
+</script>
+<div class="modal fade" id="subModal">
+    <div class="modal-dialog" style="width: 700px;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title">新增管道数据</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal" id="subForm">
+                    <div id="alertDiv"></div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">*管道名称</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="pipelineName" name="pipelineName" placeholder="请输入管道名称">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">直径(mm)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="diameterMm" name="diameterMm" placeholder="请输入管道直径">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">长度(m)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="lengthM" name="lengthM" placeholder="请输入管道长度">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">起点埋深(m)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="startBurialDepthM" name="startBurialDepthM" placeholder="请输入起点埋深">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">终点埋深(m)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="endBurialDepthM" name="endBurialDepthM" placeholder="请输入终点埋深">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">起点地面高程(m)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="startGroundElevationM" name="startGroundElevationM" placeholder="请输入起点地面高程">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">终点地面高程(m)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="endGroundElevationM" name="endGroundElevationM" placeholder="请输入终点地面高程">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">管道底部标高(m)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="pipelineInvertElevationM" name="pipelineInvertElevationM" placeholder="请输入管道底部标高">
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary" onclick="dosave()" id="btn_save">保存</button>
+            </div>
+        </div>
+    </div>
+</div>

src/main/webapp/jsp/pipeline/pipelineDataEdit.jsp

@@ -0,0 +1,169 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<style type="text/css">
+.select2-container .select2-selection--single {
+    height: 34px;
+    line-height: 34px;
+}
+.select2-selection__arrow {
+    margin-top: 3px;
+}
+</style>
+<script type="text/javascript">
+    function doupdate() {
+        $("#subForm").bootstrapValidator('validate');
+        if ($("#subForm").data('bootstrapValidator').isValid()) {
+            $.post(ext.contextPath + "/pipeline/pipelineData/update.do", $("#subForm").serialize(), function(data) {
+                if (data.res == 1) {
+                    closeModal('subModal');
+                    $("#table").bootstrapTable('refresh');
+                    showAlert('s', '更新成功', 'mainAlertdiv');
+                } else if (data.res == 0) {
+                    showAlert('d', '更新失败', 'alertDiv');
+                } else {
+                    showAlert('d', data.res, 'alertDiv');
+                }
+            }, 'json');
+        }
+    }
+
+    $("#subForm").bootstrapValidator({
+        live: 'disabled',
+        fields: {
+            pipelineName: {
+                validators: {
+                    notEmpty: {
+                        message: '管道名称不能为空'
+                    }
+                }
+            },
+            diameterMm: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            },
+            lengthM: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            },
+            startBurialDepthM: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            },
+            endBurialDepthM: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            },
+            startGroundElevationM: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            },
+            endGroundElevationM: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            },
+            pipelineInvertElevationM: {
+                validators: {
+                    numeric: {
+                        message: '请输入有效数字'
+                    }
+                }
+            }
+        }
+    });
+</script>
+<div class="modal fade" id="subModal">
+    <div class="modal-dialog" style="width: 700px;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title">编辑管道数据</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal" id="subForm">
+                    <input type="hidden" id="id" name="id" value="${pipelineData.id}">
+                    <div id="alertDiv"></div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">*管道名称</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="pipelineName" name="pipelineName" 
+                                   value="${pipelineData.pipelineName}" placeholder="请输入管道名称">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">直径(mm)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="diameterMm" name="diameterMm" 
+                                   value="${pipelineData.diameterMm}" placeholder="请输入管道直径">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">长度(m)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="lengthM" name="lengthM" 
+                                   value="${pipelineData.lengthM}" placeholder="请输入管道长度">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">起点埋深(m)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="startBurialDepthM" name="startBurialDepthM" 
+                                   value="${pipelineData.startBurialDepthM}" placeholder="请输入起点埋深">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">终点埋深(m)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="endBurialDepthM" name="endBurialDepthM" 
+                                   value="${pipelineData.endBurialDepthM}" placeholder="请输入终点埋深">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">起点地面高程(m)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="startGroundElevationM" name="startGroundElevationM" 
+                                   value="${pipelineData.startGroundElevationM}" placeholder="请输入起点地面高程">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">终点地面高程(m)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="endGroundElevationM" name="endGroundElevationM" 
+                                   value="${pipelineData.endGroundElevationM}" placeholder="请输入终点地面高程">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">管道底部标高(m)</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="pipelineInvertElevationM" name="pipelineInvertElevationM" 
+                                   value="${pipelineData.pipelineInvertElevationM}" placeholder="请输入管道底部标高">
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary" onclick="doupdate()" id="btn_update">保存</button>
+            </div>
+        </div>
+    </div>
+</div>

src/main/webapp/jsp/pipeline/pipelineDataList.jsp

@@ -0,0 +1,293 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ page import="com.sipai.entity.base.ServerObject"%>
+<%@ taglib uri="http://www.springsecurity.org/jsp" prefix="security"%>
+<!DOCTYPE html>
+<head>
+<title><%= ServerObject.atttable.get("TOPTITLE")%></title>
+<jsp:include page="/jsp/inc.jsp"></jsp:include>
+<style type="text/css">
+.select2-container .select2-selection--single {
+    height: 30px;
+    line-height: 30px;
+}
+.select2-selection__arrow {
+    margin-top: 3px;
+}
+.table-hover>tbody>tr:hover {
+    cursor: pointer;
+}
+.fixed-table-toolbar .bs-bars, .fixed-table-toolbar .columns {
+    margin-top: 0px;
+    margin-bottom: 0px;
+    line-height: 20px;
+}
+</style>
+<script type="text/javascript">
+    var addFun = function() {
+        $.post(ext.contextPath + '/pipeline/pipelineData/add.do', function(data) {
+            $("#subDiv").html(data);
+            openModal('subModal');
+        });
+    };
+    
+    var editFun = function(id) {
+        stopBubbleDefaultEvent();
+        $.post(ext.contextPath + '/pipeline/pipelineData/edit.do', {id: id}, function(data) {
+            $("#subDiv").html(data);
+            openModal('subModal');
+        });
+    };
+    
+    var viewFun = function(id) {
+        stopBubbleDefaultEvent();
+        $.post(ext.contextPath + '/pipeline/pipelineData/view.do', {id: id}, function(data) {
+            $("#subDiv").html(data);
+            openModal('subModal');
+        });
+    };
+    
+    var deleteFun = function(id) {
+        stopBubbleDefaultEvent();
+        swal({
+            text: "您确定要删除此记录？",
+            dangerMode: true,
+            buttons: {
+                cancel: {
+                    text: "取消",
+                    value: null,
+                    visible: true,
+                    className: "btn btn-default btn-sm",
+                    closeModal: true,
+                },
+                confirm: {
+                    text: "确定",
+                    value: true,
+                    visible: true,
+                    className: "btn btn-danger btn-sm",
+                    closeModal: true
+                }
+            }
+        }).then(function(willDelete) {
+            if (willDelete) {
+                $.post(ext.contextPath + '/pipeline/pipelineData/delete.do', {id: id}, function(data) {
+                    if (data == 1) {
+                        $("#table").bootstrapTable('refresh');
+                        showAlert('s', '删除成功', 'mainAlertdiv');
+                    } else {
+                        showAlert('d', '删除失败', 'mainAlertdiv');
+                    }
+                });
+            }
+        });
+    };
+
+    var deletesFun = function() {
+        var checkedItems = $("#table").bootstrapTable('getSelections');
+        var datas = "";
+        $.each(checkedItems, function(index, item) {
+            datas += item.id + ",";
+        });
+        if (datas == "") {
+            showAlert('d', '请先选择记录', 'mainAlertdiv');
+        } else {
+            swal({
+                text: "您确定要删除选中记录？",
+                dangerMode: true,
+                buttons: {
+                    cancel: {
+                        text: "取消",
+                        value: null,
+                        visible: true,
+                        className: "btn btn-default btn-sm",
+                        closeModal: true,
+                    },
+                    confirm: {
+                        text: "确定",
+                        value: true,
+                        visible: true,
+                        className: "btn btn-danger btn-sm",
+                        closeModal: true
+                    }
+                }
+            }).then(function(willDelete) {
+                if (willDelete) {
+                    $.post(ext.contextPath + '/pipeline/pipelineData/deletes.do', {ids: datas}, function(data) {
+                        if (data > 0) {
+                            $("#table").bootstrapTable('refresh');
+                            showAlert('s', '删除成功', 'mainAlertdiv');
+                        } else {
+                            showAlert('d', '删除失败', 'mainAlertdiv');
+                        }
+                    });
+                }
+            });
+        }
+    };
+
+    var dosearch = function() {
+        $("#table").bootstrapTable('refresh');
+    };
+
+    function queryParamsFun(params) {
+        return {
+            rows: params.limit,
+            page: params.offset / params.limit + 1,
+            sort: params.sort,
+            order: params.order,
+            search_name: $('#search_name').val()
+        };
+    }
+
+    var initFun = function() {
+        $("#table").bootstrapTable({
+            url: ext.contextPath + '/pipeline/pipelineData/getList.do',
+            cache: false,
+            striped: true,
+            pagination: true,
+            pageList: [10, 20, 50],
+            pageSize: 20,
+            pageNumber: 1,
+            sidePagination: 'server',
+            queryParams: queryParamsFun,
+            sortName: 'id',
+            sortOrder: 'desc',
+            onClickRow: function(row) {
+                viewFun(row.id);
+            },
+            columns: [
+                {
+                    checkbox: true,
+                }, {
+                    field: 'pipelineName',
+                    title: '管道名称',
+                    align: 'center',
+                    valign: 'middle',
+                    width: '15%',
+                    formatter: function(value, row, index) {
+                        return '<span onclick="viewFun(\'' + row.id + '\');" style="color:#004B97;cursor:pointer;">' + row.pipelineName + '</span>';
+                    }
+                }, {
+                    field: 'diameterMm',
+                    title: '直径(mm)',
+                    align: 'center',
+                    valign: 'middle',
+                    width: '10%'
+                }, {
+                    field: 'lengthM',
+                    title: '长度(m)',
+                    align: 'center',
+                    valign: 'middle',
+                    width: '10%'
+                }, {
+                    field: 'startBurialDepthM',
+                    title: '起点埋深(m)',
+                    align: 'center',
+                    valign: 'middle',
+                    width: '12%'
+                }, {
+                    field: 'endBurialDepthM',
+                    title: '终点埋深(m)',
+                    align: 'center',
+                    valign: 'middle',
+                    width: '12%'
+                }, {
+                    field: 'startGroundElevationM',
+                    title: '起点地面高程(m)',
+                    align: 'center',
+                    valign: 'middle',
+                    width: '13%'
+                }, {
+                    field: 'endGroundElevationM',
+                    title: '终点地面高程(m)',
+                    align: 'center',
+                    valign: 'middle',
+                    width: '13%'
+                }, {
+                    field: 'pipelineInvertElevationM',
+                    title: '管道底部标高(m)',
+                    align: 'center',
+                    valign: 'middle',
+                    width: '13%'
+                }, {
+                    title: "操作",
+                    align: 'center',
+                    valign: 'middle',
+                    width: '12%',
+                    formatter: function(value, row, index) {
+                        var buts = "";
+                        buts += '<security:authorize buttonUrl="pipeline/pipelineData/edit.do">';
+                        buts += '<button class="btn btn-default btn-sm" title="编辑" onclick="editFun(\'' + row.id + '\')"><i class="fa fa-edit"></i><span class="hidden-md hidden-lg"> 编辑</span></button>';
+                        buts += '</security:authorize>';
+
+                        buts += '<security:authorize buttonUrl="pipeline/pipelineData/delete.do">';
+                        buts += '<button class="btn btn-default btn-sm" title="删除" onclick="deleteFun(\'' + row.id + '\')"><i class="fa fa fa-trash-o"></i><span class="hidden-md hidden-lg">删除</span></button>';
+                        buts += '</security:authorize>';
+
+                        buts = '<div class="btn-group" >' + buts + '</div>';
+                        return buts;
+                    }
+                }
+            ],
+            onLoadSuccess: function() {
+                adjustBootstrapTableView("table");
+            },
+            onLoadError: function() {
+                console.info("加载数据失败");
+            }
+        });
+    };
+
+    $(function() {
+        initFun();
+    });
+</script>
+</head>
+<body onload="initMenu()" class="hold-transition ${cu.themeclass} sidebar-mini">
+    <div class="wrapper">
+        <div class="content-wrapper">
+            <section class="content-header">
+                <h1 id="head_title"></h1>
+                <ol class="breadcrumb">
+                    <li><a id='head_firstlevel' href="#"><i class="fa fa-dashboard"></i> </a></li>
+                </ol>
+            </section>
+            <section class="content container-fluid">
+                <div id="mainAlertdiv"></div>
+                <div id="subDiv"></div>
+                <form id="searchForm">
+                    <div>
+                        <div class="form-group" style="padding:0;">
+                            <div class="btn-group" style="width: 100%;">
+                                <security:authorize buttonUrl="pipeline/pipelineData/add.do">
+                                    <button type="button" class="btn btn-default btn-sm" onclick="addFun();">
+                                        <i class="fa fa-plus"></i> 新增
+                                    </button>
+                                </security:authorize>
+                                <security:authorize buttonUrl="pipeline/pipelineData/delete.do">
+                                    <button type="button" class="btn btn-default btn-sm" onclick="deletesFun();">
+                                        <i class="fa fa-trash-o"></i> 删除
+                                    </button>
+                                </security:authorize>
+                                <div class="form-group pull-right form-inline">
+                                    <div class="input-group input-group-sm" style="width: 250px;">
+                                        <input type="text" id="search_name" name="search_name" class="form-control pull-right" placeholder="管道名称">
+                                        <div class="input-group-btn">
+                                            <button type="button" class="btn btn-default" onclick="dosearch();">
+                                                <i class="fa fa-search"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+                <table id="table"></table>
+            </section>
+        </div>
+    </div>
+</body>
+</html>

src/main/webapp/jsp/pipeline/pipelineDataView.jsp

@@ -0,0 +1,84 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<style type="text/css">
+.select2-container .select2-selection--single {
+    height: 34px;
+    line-height: 34px;
+}
+.select2-selection__arrow {
+    margin-top: 3px;
+}
+.form-control-static {
+    min-height: 34px;
+    padding-top: 7px;
+    padding-bottom: 7px;
+    margin-bottom: 0;
+}
+</style>
+<div class="modal fade" id="subModal">
+    <div class="modal-dialog" style="width: 700px;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title">查看管道数据</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal" id="subForm">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">管道名称</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-static">${pipelineData.pipelineName}</p>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">直径(mm)</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-static">${pipelineData.diameterMm}</p>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">长度(m)</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-static">${pipelineData.lengthM}</p>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">起点埋深(m)</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-static">${pipelineData.startBurialDepthM}</p>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">终点埋深(m)</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-static">${pipelineData.endBurialDepthM}</p>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">起点地面高程(m)</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-static">${pipelineData.startGroundElevationM}</p>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">终点地面高程(m)</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-static">${pipelineData.endGroundElevationM}</p>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">管道底部标高(m)</label>
+                        <div class="col-sm-8">
+                            <p class="form-control-static">${pipelineData.pipelineInvertElevationM}</p>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>