三个模æ块

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DseignCeiteriaController.java

@@ -0,0 +1,126 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.DseignCeiteria;
+import com.ruoyi.system.service.IDseignCeiteriaService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 设计标准Controller
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+@Controller
+@RequestMapping("/system/ceiteria")
+public class DseignCeiteriaController extends BaseController
+{
+    private String prefix = "system/ceiteria";
+
+    @Autowired
+    private IDseignCeiteriaService dseignCeiteriaService;
+
+    @RequiresPermissions("system:ceiteria:view")
+    @GetMapping()
+    public String ceiteria()
+    {
+        return prefix + "/ceiteria";
+    }
+
+    /**
+     * 查询设计标准列表
+     */
+    @RequiresPermissions("system:ceiteria:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(DseignCeiteria dseignCeiteria)
+    {
+        startPage();
+        List<DseignCeiteria> list = dseignCeiteriaService.selectDseignCeiteriaList(dseignCeiteria);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出设计标准列表
+     */
+    @RequiresPermissions("system:ceiteria:export")
+    @Log(title = "设计标准", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(DseignCeiteria dseignCeiteria)
+    {
+        List<DseignCeiteria> list = dseignCeiteriaService.selectDseignCeiteriaList(dseignCeiteria);
+        ExcelUtil<DseignCeiteria> util = new ExcelUtil<DseignCeiteria>(DseignCeiteria.class);
+        return util.exportExcel(list, "设计标准数据");
+    }
+
+    /**
+     * 新增设计标准
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存设计标准
+     */
+    @RequiresPermissions("system:ceiteria:add")
+    @Log(title = "设计标准", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(DseignCeiteria dseignCeiteria)
+    {
+        return toAjax(dseignCeiteriaService.insertDseignCeiteria(dseignCeiteria));
+    }
+
+    /**
+     * 修改设计标准
+     */
+    @GetMapping("/edit/{designStandardNumber}")
+    public String edit(@PathVariable("designStandardNumber") Long designStandardNumber, ModelMap mmap)
+    {
+        DseignCeiteria dseignCeiteria = dseignCeiteriaService.selectDseignCeiteriaById(designStandardNumber);
+        mmap.put("dseignCeiteria", dseignCeiteria);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存设计标准
+     */
+    @RequiresPermissions("system:ceiteria:edit")
+    @Log(title = "设计标准", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(DseignCeiteria dseignCeiteria)
+    {
+        return toAjax(dseignCeiteriaService.updateDseignCeiteria(dseignCeiteria));
+    }
+
+    /**
+     * 删除设计标准
+     */
+    @RequiresPermissions("system:ceiteria:remove")
+    @Log(title = "设计标准", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(dseignCeiteriaService.deleteDseignCeiteriaByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/EheologicalParametersController.java

@@ -0,0 +1,126 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.EheologicalParameters;
+import com.ruoyi.system.service.IEheologicalParametersService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 流变参数Controller
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+@Controller
+@RequestMapping("/system/parameters")
+public class EheologicalParametersController extends BaseController
+{
+    private String prefix = "system/parameters";
+
+    @Autowired
+    private IEheologicalParametersService eheologicalParametersService;
+
+    @RequiresPermissions("system:parameters:view")
+    @GetMapping()
+    public String parameters()
+    {
+        return prefix + "/parameters";
+    }
+
+    /**
+     * 查询流变参数列表
+     */
+    @RequiresPermissions("system:parameters:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(EheologicalParameters eheologicalParameters)
+    {
+        startPage();
+        List<EheologicalParameters> list = eheologicalParametersService.selectEheologicalParametersList(eheologicalParameters);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出流变参数列表
+     */
+    @RequiresPermissions("system:parameters:export")
+    @Log(title = "流变参数", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(EheologicalParameters eheologicalParameters)
+    {
+        List<EheologicalParameters> list = eheologicalParametersService.selectEheologicalParametersList(eheologicalParameters);
+        ExcelUtil<EheologicalParameters> util = new ExcelUtil<EheologicalParameters>(EheologicalParameters.class);
+        return util.exportExcel(list, "流变参数数据");
+    }
+
+    /**
+     * 新增流变参数
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存流变参数
+     */
+    @RequiresPermissions("system:parameters:add")
+    @Log(title = "流变参数", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(EheologicalParameters eheologicalParameters)
+    {
+        return toAjax(eheologicalParametersService.insertEheologicalParameters(eheologicalParameters));
+    }
+
+    /**
+     * 修改流变参数
+     */
+    @GetMapping("/edit/{rheologicalParameternumber}")
+    public String edit(@PathVariable("rheologicalParameternumber") Long rheologicalParameternumber, ModelMap mmap)
+    {
+        EheologicalParameters eheologicalParameters = eheologicalParametersService.selectEheologicalParametersById(rheologicalParameternumber);
+        mmap.put("eheologicalParameters", eheologicalParameters);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存流变参数
+     */
+    @RequiresPermissions("system:parameters:edit")
+    @Log(title = "流变参数", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(EheologicalParameters eheologicalParameters)
+    {
+        return toAjax(eheologicalParametersService.updateEheologicalParameters(eheologicalParameters));
+    }
+
+    /**
+     * 删除流变参数
+     */
+    @RequiresPermissions("system:parameters:remove")
+    @Log(title = "流变参数", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(eheologicalParametersService.deleteEheologicalParametersByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/LiquidController.java

@@ -0,0 +1,126 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.Liquid;
+import com.ruoyi.system.service.ILiquidService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 液体数据Controller
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+@Controller
+@RequestMapping("/system/liquid")
+public class LiquidController extends BaseController
+{
+    private String prefix = "system/liquid";
+
+    @Autowired
+    private ILiquidService liquidService;
+
+    @RequiresPermissions("system:liquid:view")
+    @GetMapping()
+    public String liquid()
+    {
+        return prefix + "/liquid";
+    }
+
+    /**
+     * 查询液体数据列表
+     */
+    @RequiresPermissions("system:liquid:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(Liquid liquid)
+    {
+        startPage();
+        List<Liquid> list = liquidService.selectLiquidList(liquid);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出液体数据列表
+     */
+    @RequiresPermissions("system:liquid:export")
+    @Log(title = "液体数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(Liquid liquid)
+    {
+        List<Liquid> list = liquidService.selectLiquidList(liquid);
+        ExcelUtil<Liquid> util = new ExcelUtil<Liquid>(Liquid.class);
+        return util.exportExcel(list, "液体数据数据");
+    }
+
+    /**
+     * 新增液体数据
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存液体数据
+     */
+    @RequiresPermissions("system:liquid:add")
+    @Log(title = "液体数据", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(Liquid liquid)
+    {
+        return toAjax(liquidService.insertLiquid(liquid));
+    }
+
+    /**
+     * 修改液体数据
+     */
+    @GetMapping("/edit/{liquidNumber}")
+    public String edit(@PathVariable("liquidNumber") Long liquidNumber, ModelMap mmap)
+    {
+        Liquid liquid = liquidService.selectLiquidById(liquidNumber);
+        mmap.put("liquid", liquid);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存液体数据
+     */
+    @RequiresPermissions("system:liquid:edit")
+    @Log(title = "液体数据", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(Liquid liquid)
+    {
+        return toAjax(liquidService.updateLiquid(liquid));
+    }
+
+    /**
+     * 删除液体数据
+     */
+    @RequiresPermissions("system:liquid:remove")
+    @Log(title = "液体数据", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(liquidService.deleteLiquidByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RheologicalDesignController.java

@@ -0,0 +1,126 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.RheologicalDesign;
+import com.ruoyi.system.service.IRheologicalDesignService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 流变学设计数据Controller
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+@Controller
+@RequestMapping("/system/design")
+public class RheologicalDesignController extends BaseController
+{
+    private String prefix = "system/design";
+
+    @Autowired
+    private IRheologicalDesignService rheologicalDesignService;
+
+    @RequiresPermissions("system:design:view")
+    @GetMapping()
+    public String design()
+    {
+        return prefix + "/design";
+    }
+
+    /**
+     * 查询流变学设计数据列表
+     */
+    @RequiresPermissions("system:design:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(RheologicalDesign rheologicalDesign)
+    {
+        startPage();
+        List<RheologicalDesign> list = rheologicalDesignService.selectRheologicalDesignList(rheologicalDesign);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出流变学设计数据列表
+     */
+    @RequiresPermissions("system:design:export")
+    @Log(title = "流变学设计数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(RheologicalDesign rheologicalDesign)
+    {
+        List<RheologicalDesign> list = rheologicalDesignService.selectRheologicalDesignList(rheologicalDesign);
+        ExcelUtil<RheologicalDesign> util = new ExcelUtil<RheologicalDesign>(RheologicalDesign.class);
+        return util.exportExcel(list, "流变学设计数据数据");
+    }
+
+    /**
+     * 新增流变学设计数据
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存流变学设计数据
+     */
+    @RequiresPermissions("system:design:add")
+    @Log(title = "流变学设计数据", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(RheologicalDesign rheologicalDesign)
+    {
+        return toAjax(rheologicalDesignService.insertRheologicalDesign(rheologicalDesign));
+    }
+
+    /**
+     * 修改流变学设计数据
+     */
+    @GetMapping("/edit/{rheologicalDesignNumber}")
+    public String edit(@PathVariable("rheologicalDesignNumber") Long rheologicalDesignNumber, ModelMap mmap)
+    {
+        RheologicalDesign rheologicalDesign = rheologicalDesignService.selectRheologicalDesignById(rheologicalDesignNumber);
+        mmap.put("rheologicalDesign", rheologicalDesign);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存流变学设计数据
+     */
+    @RequiresPermissions("system:design:edit")
+    @Log(title = "流变学设计数据", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(RheologicalDesign rheologicalDesign)
+    {
+        return toAjax(rheologicalDesignService.updateRheologicalDesign(rheologicalDesign));
+    }
+
+    /**
+     * 删除流变学设计数据
+     */
+    @RequiresPermissions("system:design:remove")
+    @Log(title = "流变学设计数据", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(rheologicalDesignService.deleteRheologicalDesignByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ShuiniController.java

@@ -0,0 +1,126 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.Shuini;
+import com.ruoyi.system.service.IShuiniService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 水泥浆Controller
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+@Controller
+@RequestMapping("/system/Shuini")
+public class ShuiniController extends BaseController
+{
+    private String prefix = "system/Shuini";
+
+    @Autowired
+    private IShuiniService shuiniService;
+
+    @RequiresPermissions("system:Shuini:view")
+    @GetMapping()
+    public String Shuini()
+    {
+        return prefix + "/Shuini";
+    }
+
+    /**
+     * 查询水泥浆列表
+     */
+    @RequiresPermissions("system:Shuini:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(Shuini shuini)
+    {
+        startPage();
+        List<Shuini> list = shuiniService.selectShuiniList(shuini);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出水泥浆列表
+     */
+    @RequiresPermissions("system:Shuini:export")
+    @Log(title = "水泥浆", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(Shuini shuini)
+    {
+        List<Shuini> list = shuiniService.selectShuiniList(shuini);
+        ExcelUtil<Shuini> util = new ExcelUtil<Shuini>(Shuini.class);
+        return util.exportExcel(list, "水泥浆数据");
+    }
+
+    /**
+     * 新增水泥浆
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存水泥浆
+     */
+    @RequiresPermissions("system:Shuini:add")
+    @Log(title = "水泥浆", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(Shuini shuini)
+    {
+        return toAjax(shuiniService.insertShuini(shuini));
+    }
+
+    /**
+     * 修改水泥浆
+     */
+    @GetMapping("/edit/{liquidNumber}")
+    public String edit(@PathVariable("liquidNumber") Long liquidNumber, ModelMap mmap)
+    {
+        Shuini shuini = shuiniService.selectShuiniById(liquidNumber);
+        mmap.put("shuini", shuini);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存水泥浆
+     */
+    @RequiresPermissions("system:Shuini:edit")
+    @Log(title = "水泥浆", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(Shuini shuini)
+    {
+        return toAjax(shuiniService.updateShuini(shuini));
+    }
+
+    /**
+     * 删除水泥浆
+     */
+    @RequiresPermissions("system:Shuini:remove")
+    @Log(title = "水泥浆", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(shuiniService.deleteShuiniByIds(ids));
+    }
+}

ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: password
+                password: 123
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 80
+  port: 8080
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-system/src/main/java/com/ruoyi/system/domain/DseignCeiteria.java

@@ -0,0 +1,78 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 设计标准对象 dseign_ceiteria
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public class DseignCeiteria extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 设计标准编号 */
+    private Long designStandardNumber;
+
+    /** 井编号 */
+    private Long oilWellId;
+
+    /** 设计标准名称 */
+    @Excel(name = "设计标准名称")
+    private String designStandardName;
+
+    /** 设计标准的指定排量 */
+    @Excel(name = "设计标准的指定排量")
+    private Long designDisplacementofdesignstandard;
+
+    public void setDesignStandardNumber(Long designStandardNumber) 
+    {
+        this.designStandardNumber = designStandardNumber;
+    }
+
+    public Long getDesignStandardNumber() 
+    {
+        return designStandardNumber;
+    }
+    public void setOilWellId(Long oilWellId) 
+    {
+        this.oilWellId = oilWellId;
+    }
+
+    public Long getOilWellId() 
+    {
+        return oilWellId;
+    }
+    public void setDesignStandardName(String designStandardName) 
+    {
+        this.designStandardName = designStandardName;
+    }
+
+    public String getDesignStandardName() 
+    {
+        return designStandardName;
+    }
+    public void setDesignDisplacementofdesignstandard(Long designDisplacementofdesignstandard) 
+    {
+        this.designDisplacementofdesignstandard = designDisplacementofdesignstandard;
+    }
+
+    public Long getDesignDisplacementofdesignstandard() 
+    {
+        return designDisplacementofdesignstandard;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("designStandardNumber", getDesignStandardNumber())
+            .append("oilWellId", getOilWellId())
+            .append("designStandardName", getDesignStandardName())
+            .append("designDisplacementofdesignstandard", getDesignDisplacementofdesignstandard())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/EheologicalParameters.java

@@ -0,0 +1,149 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 流变参数对象 eheological_parameters
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public class EheologicalParameters extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 流变参数编号 */
+    private Long rheologicalParameternumber;
+
+    /** 流体名称 */
+    @Excel(name = "流体名称")
+    private String rheologicalName;
+
+    /** 流体密度 */
+    @Excel(name = "流体密度")
+    private String rheologicalDensity;
+
+    /** 流变模式 */
+    @Excel(name = "流变模式")
+    private String rheologicalModel;
+
+    /** 塑性粘度 */
+    @Excel(name = "塑性粘度")
+    private String plasticViscosity;
+
+    /** 动切力 */
+    @Excel(name = "动切力")
+    private String dynamicShear;
+
+    /** 稠度系数 */
+    @Excel(name = "稠度系数")
+    private String consistencyCoefficient;
+
+    /** 流性指数 */
+    @Excel(name = "流性指数")
+    private String fluidityIndex;
+
+    /** 牛顿粘度 */
+    @Excel(name = "牛顿粘度")
+    private String newtonianViscosity;
+
+    public void setRheologicalParameternumber(Long rheologicalParameternumber) 
+    {
+        this.rheologicalParameternumber = rheologicalParameternumber;
+    }
+
+    public Long getRheologicalParameternumber() 
+    {
+        return rheologicalParameternumber;
+    }
+    public void setRheologicalName(String rheologicalName) 
+    {
+        this.rheologicalName = rheologicalName;
+    }
+
+    public String getRheologicalName() 
+    {
+        return rheologicalName;
+    }
+    public void setRheologicalDensity(String rheologicalDensity) 
+    {
+        this.rheologicalDensity = rheologicalDensity;
+    }
+
+    public String getRheologicalDensity() 
+    {
+        return rheologicalDensity;
+    }
+    public void setRheologicalModel(String rheologicalModel) 
+    {
+        this.rheologicalModel = rheologicalModel;
+    }
+
+    public String getRheologicalModel() 
+    {
+        return rheologicalModel;
+    }
+    public void setPlasticViscosity(String plasticViscosity) 
+    {
+        this.plasticViscosity = plasticViscosity;
+    }
+
+    public String getPlasticViscosity() 
+    {
+        return plasticViscosity;
+    }
+    public void setDynamicShear(String dynamicShear) 
+    {
+        this.dynamicShear = dynamicShear;
+    }
+
+    public String getDynamicShear() 
+    {
+        return dynamicShear;
+    }
+    public void setConsistencyCoefficient(String consistencyCoefficient) 
+    {
+        this.consistencyCoefficient = consistencyCoefficient;
+    }
+
+    public String getConsistencyCoefficient() 
+    {
+        return consistencyCoefficient;
+    }
+    public void setFluidityIndex(String fluidityIndex) 
+    {
+        this.fluidityIndex = fluidityIndex;
+    }
+
+    public String getFluidityIndex() 
+    {
+        return fluidityIndex;
+    }
+    public void setNewtonianViscosity(String newtonianViscosity) 
+    {
+        this.newtonianViscosity = newtonianViscosity;
+    }
+
+    public String getNewtonianViscosity() 
+    {
+        return newtonianViscosity;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("rheologicalParameternumber", getRheologicalParameternumber())
+            .append("rheologicalName", getRheologicalName())
+            .append("rheologicalDensity", getRheologicalDensity())
+            .append("rheologicalModel", getRheologicalModel())
+            .append("plasticViscosity", getPlasticViscosity())
+            .append("dynamicShear", getDynamicShear())
+            .append("consistencyCoefficient", getConsistencyCoefficient())
+            .append("fluidityIndex", getFluidityIndex())
+            .append("newtonianViscosity", getNewtonianViscosity())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/Liquid.java

@@ -0,0 +1,237 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 液体数据对象 liquid
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public class Liquid extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 液体编号 */
+    private Long liquidNumber;
+
+    /** 流变参数编号 */
+    private Long rheologicalParameterNumber;
+
+    /** 井编号 */
+    private Long oilWellId;
+
+    /** 液体名称 */
+    @Excel(name = "液体名称")
+    private String liquidName;
+
+    /** 液体密度 */
+    @Excel(name = "液体密度")
+    private Long liquidDensity;
+
+    /** 液体返深 */
+    private Long liquidReturnDepth;
+
+    /** 液体容积 */
+    private Long liquidVolume;
+
+    /** 液体附加 */
+    private Long liquidAdditional;
+
+    /** 液体附加量 */
+    private Long liquidAdditionalCapacity;
+
+    /** 液体用量 */
+    @Excel(name = "液体用量")
+    private Long liquidDosage;
+
+    /** 液体基本性能 */
+    private String liquidBasicProperties;
+
+    /** 液体失水量 */
+    private Long liquidWaterLoss;
+
+    /** 液体稠化时间(min/50BC) */
+    private Long fivebcLiquidThickeningTime;
+
+    /** 液体稠化时间(min/100BC) */
+    private Long onehbcLiquidThickeningTime;
+
+    /** 液体使用长度 */
+    @Excel(name = "液体使用长度")
+    private Long liquidServiceLength;
+
+    /** 液体配方 */
+    @Excel(name = "液体配方")
+    private String liquidFormula;
+
+    public void setLiquidNumber(Long liquidNumber) 
+    {
+        this.liquidNumber = liquidNumber;
+    }
+
+    public Long getLiquidNumber() 
+    {
+        return liquidNumber;
+    }
+    public void setRheologicalParameterNumber(Long rheologicalParameterNumber) 
+    {
+        this.rheologicalParameterNumber = rheologicalParameterNumber;
+    }
+
+    public Long getRheologicalParameterNumber() 
+    {
+        return rheologicalParameterNumber;
+    }
+    public void setOilWellId(Long oilWellId) 
+    {
+        this.oilWellId = oilWellId;
+    }
+
+    public Long getOilWellId() 
+    {
+        return oilWellId;
+    }
+    public void setLiquidName(String liquidName) 
+    {
+        this.liquidName = liquidName;
+    }
+
+    public String getLiquidName() 
+    {
+        return liquidName;
+    }
+    public void setLiquidDensity(Long liquidDensity) 
+    {
+        this.liquidDensity = liquidDensity;
+    }
+
+    public Long getLiquidDensity() 
+    {
+        return liquidDensity;
+    }
+    public void setLiquidReturnDepth(Long liquidReturnDepth) 
+    {
+        this.liquidReturnDepth = liquidReturnDepth;
+    }
+
+    public Long getLiquidReturnDepth() 
+    {
+        return liquidReturnDepth;
+    }
+    public void setLiquidVolume(Long liquidVolume) 
+    {
+        this.liquidVolume = liquidVolume;
+    }
+
+    public Long getLiquidVolume() 
+    {
+        return liquidVolume;
+    }
+    public void setLiquidAdditional(Long liquidAdditional) 
+    {
+        this.liquidAdditional = liquidAdditional;
+    }
+
+    public Long getLiquidAdditional() 
+    {
+        return liquidAdditional;
+    }
+    public void setLiquidAdditionalCapacity(Long liquidAdditionalCapacity) 
+    {
+        this.liquidAdditionalCapacity = liquidAdditionalCapacity;
+    }
+
+    public Long getLiquidAdditionalCapacity() 
+    {
+        return liquidAdditionalCapacity;
+    }
+    public void setLiquidDosage(Long liquidDosage) 
+    {
+        this.liquidDosage = liquidDosage;
+    }
+
+    public Long getLiquidDosage() 
+    {
+        return liquidDosage;
+    }
+    public void setLiquidBasicProperties(String liquidBasicProperties) 
+    {
+        this.liquidBasicProperties = liquidBasicProperties;
+    }
+
+    public String getLiquidBasicProperties() 
+    {
+        return liquidBasicProperties;
+    }
+    public void setLiquidWaterLoss(Long liquidWaterLoss) 
+    {
+        this.liquidWaterLoss = liquidWaterLoss;
+    }
+
+    public Long getLiquidWaterLoss() 
+    {
+        return liquidWaterLoss;
+    }
+    public void setFivebcLiquidThickeningTime(Long fivebcLiquidThickeningTime) 
+    {
+        this.fivebcLiquidThickeningTime = fivebcLiquidThickeningTime;
+    }
+
+    public Long getFivebcLiquidThickeningTime() 
+    {
+        return fivebcLiquidThickeningTime;
+    }
+    public void setOnehbcLiquidThickeningTime(Long onehbcLiquidThickeningTime) 
+    {
+        this.onehbcLiquidThickeningTime = onehbcLiquidThickeningTime;
+    }
+
+    public Long getOnehbcLiquidThickeningTime() 
+    {
+        return onehbcLiquidThickeningTime;
+    }
+    public void setLiquidServiceLength(Long liquidServiceLength) 
+    {
+        this.liquidServiceLength = liquidServiceLength;
+    }
+
+    public Long getLiquidServiceLength() 
+    {
+        return liquidServiceLength;
+    }
+    public void setLiquidFormula(String liquidFormula) 
+    {
+        this.liquidFormula = liquidFormula;
+    }
+
+    public String getLiquidFormula() 
+    {
+        return liquidFormula;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("liquidNumber", getLiquidNumber())
+            .append("rheologicalParameterNumber", getRheologicalParameterNumber())
+            .append("oilWellId", getOilWellId())
+            .append("liquidName", getLiquidName())
+            .append("liquidDensity", getLiquidDensity())
+            .append("liquidReturnDepth", getLiquidReturnDepth())
+            .append("liquidVolume", getLiquidVolume())
+            .append("liquidAdditional", getLiquidAdditional())
+            .append("liquidAdditionalCapacity", getLiquidAdditionalCapacity())
+            .append("liquidDosage", getLiquidDosage())
+            .append("liquidBasicProperties", getLiquidBasicProperties())
+            .append("liquidWaterLoss", getLiquidWaterLoss())
+            .append("fivebcLiquidThickeningTime", getFivebcLiquidThickeningTime())
+            .append("onehbcLiquidThickeningTime", getOnehbcLiquidThickeningTime())
+            .append("liquidServiceLength", getLiquidServiceLength())
+            .append("liquidFormula", getLiquidFormula())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/RheologicalDesign.java

@@ -0,0 +1,162 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 流变学设计数据对象 rheological_design
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public class RheologicalDesign extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 流变学设计编号 */
+    private Long rheologicalDesignNumber;
+
+    /** 井编号 */
+    private Long oilWellId;
+
+    /** 顶替排量设计 */
+    @Excel(name = "顶替排量设计")
+    private Long displacementDisplacementDesign;
+
+    /** 关注点（3292）压力 */
+    @Excel(name = "关注点", readConverterExp = "3=292")
+    private Long focusOn3292Pressure;
+
+    /** 关注点（3342）压力 */
+    @Excel(name = "关注点", readConverterExp = "3=342")
+    private Long focusOn3342Pressure;
+
+    /** 全井静液压差 */
+    @Excel(name = "全井静液压差")
+    private Long overallWellStatichydraulicdifference;
+
+    /** 环空循环压耗 */
+    @Excel(name = "环空循环压耗")
+    private Long annularCirculationpressureloss;
+
+    /** 管内循环压耗 */
+    @Excel(name = "管内循环压耗")
+    private Long circulatingPressurelossinthetube;
+
+    /** 全井循环压耗 */
+    @Excel(name = "全井循环压耗")
+    private Long circulatingPressurelossthroughoutthewell;
+
+    /** 最终顶替泵压 */
+    @Excel(name = "最终顶替泵压")
+    private Long finalDisplacementpumppressure;
+
+    public void setRheologicalDesignNumber(Long rheologicalDesignNumber) 
+    {
+        this.rheologicalDesignNumber = rheologicalDesignNumber;
+    }
+
+    public Long getRheologicalDesignNumber() 
+    {
+        return rheologicalDesignNumber;
+    }
+    public void setOilWellId(Long oilWellId) 
+    {
+        this.oilWellId = oilWellId;
+    }
+
+    public Long getOilWellId() 
+    {
+        return oilWellId;
+    }
+    public void setDisplacementDisplacementDesign(Long displacementDisplacementDesign) 
+    {
+        this.displacementDisplacementDesign = displacementDisplacementDesign;
+    }
+
+    public Long getDisplacementDisplacementDesign() 
+    {
+        return displacementDisplacementDesign;
+    }
+    public void setFocusOn3292Pressure(Long focusOn3292Pressure) 
+    {
+        this.focusOn3292Pressure = focusOn3292Pressure;
+    }
+
+    public Long getFocusOn3292Pressure() 
+    {
+        return focusOn3292Pressure;
+    }
+    public void setFocusOn3342Pressure(Long focusOn3342Pressure) 
+    {
+        this.focusOn3342Pressure = focusOn3342Pressure;
+    }
+
+    public Long getFocusOn3342Pressure() 
+    {
+        return focusOn3342Pressure;
+    }
+    public void setOverallWellStatichydraulicdifference(Long overallWellStatichydraulicdifference) 
+    {
+        this.overallWellStatichydraulicdifference = overallWellStatichydraulicdifference;
+    }
+
+    public Long getOverallWellStatichydraulicdifference() 
+    {
+        return overallWellStatichydraulicdifference;
+    }
+    public void setAnnularCirculationpressureloss(Long annularCirculationpressureloss) 
+    {
+        this.annularCirculationpressureloss = annularCirculationpressureloss;
+    }
+
+    public Long getAnnularCirculationpressureloss() 
+    {
+        return annularCirculationpressureloss;
+    }
+    public void setCirculatingPressurelossinthetube(Long circulatingPressurelossinthetube) 
+    {
+        this.circulatingPressurelossinthetube = circulatingPressurelossinthetube;
+    }
+
+    public Long getCirculatingPressurelossinthetube() 
+    {
+        return circulatingPressurelossinthetube;
+    }
+    public void setCirculatingPressurelossthroughoutthewell(Long circulatingPressurelossthroughoutthewell) 
+    {
+        this.circulatingPressurelossthroughoutthewell = circulatingPressurelossthroughoutthewell;
+    }
+
+    public Long getCirculatingPressurelossthroughoutthewell() 
+    {
+        return circulatingPressurelossthroughoutthewell;
+    }
+    public void setFinalDisplacementpumppressure(Long finalDisplacementpumppressure) 
+    {
+        this.finalDisplacementpumppressure = finalDisplacementpumppressure;
+    }
+
+    public Long getFinalDisplacementpumppressure() 
+    {
+        return finalDisplacementpumppressure;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("rheologicalDesignNumber", getRheologicalDesignNumber())
+            .append("oilWellId", getOilWellId())
+            .append("displacementDisplacementDesign", getDisplacementDisplacementDesign())
+            .append("focusOn3292Pressure", getFocusOn3292Pressure())
+            .append("focusOn3342Pressure", getFocusOn3342Pressure())
+            .append("overallWellStatichydraulicdifference", getOverallWellStatichydraulicdifference())
+            .append("annularCirculationpressureloss", getAnnularCirculationpressureloss())
+            .append("circulatingPressurelossinthetube", getCirculatingPressurelossinthetube())
+            .append("circulatingPressurelossthroughoutthewell", getCirculatingPressurelossthroughoutthewell())
+            .append("finalDisplacementpumppressure", getFinalDisplacementpumppressure())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/Shuini.java

@@ -0,0 +1,239 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 水泥浆对象 liquid
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public class Shuini extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 液体编号 */
+    private Long liquidNumber;
+
+    /** 流变参数编号 */
+    private Long rheologicalParameterNumber;
+
+    /** 井编号 */
+    private Long oilWellId;
+
+    /** 液体名称 */
+    @Excel(name = "液体名称")
+    private String liquidName;
+
+    /** 液体密度 */
+    @Excel(name = "液体密度")
+    private Long liquidDensity;
+
+    /** 液体返深 */
+    @Excel(name = "液体返深")
+    private Long liquidReturnDepth;
+
+    /** 液体容积 */
+    @Excel(name = "液体容积")
+    private Long liquidVolume;
+
+    /** 液体附加 */
+    @Excel(name = "液体附加")
+    private Long liquidAdditional;
+
+    /** 液体附加量 */
+    @Excel(name = "液体附加量")
+    private Long liquidAdditionalCapacity;
+
+    /** 液体用量 */
+    @Excel(name = "液体用量")
+    private Long liquidDosage;
+
+    /** 液体基本性能 */
+    private String liquidBasicProperties;
+
+    /** 液体失水量 */
+    private Long liquidWaterLoss;
+
+    /** 液体稠化时间(min/50BC) */
+    private Long fivebcLiquidThickeningTime;
+
+    /** 液体稠化时间(min/100BC) */
+    private Long onehbcLiquidThickeningTime;
+
+    /** 液体使用长度 */
+    private Long liquidServiceLength;
+
+    /** 液体配方 */
+    private String liquidFormula;
+
+    public void setLiquidNumber(Long liquidNumber) 
+    {
+        this.liquidNumber = liquidNumber;
+    }
+
+    public Long getLiquidNumber() 
+    {
+        return liquidNumber;
+    }
+    public void setRheologicalParameterNumber(Long rheologicalParameterNumber) 
+    {
+        this.rheologicalParameterNumber = rheologicalParameterNumber;
+    }
+
+    public Long getRheologicalParameterNumber() 
+    {
+        return rheologicalParameterNumber;
+    }
+    public void setOilWellId(Long oilWellId) 
+    {
+        this.oilWellId = oilWellId;
+    }
+
+    public Long getOilWellId() 
+    {
+        return oilWellId;
+    }
+    public void setLiquidName(String liquidName) 
+    {
+        this.liquidName = liquidName;
+    }
+
+    public String getLiquidName() 
+    {
+        return liquidName;
+    }
+    public void setLiquidDensity(Long liquidDensity) 
+    {
+        this.liquidDensity = liquidDensity;
+    }
+
+    public Long getLiquidDensity() 
+    {
+        return liquidDensity;
+    }
+    public void setLiquidReturnDepth(Long liquidReturnDepth) 
+    {
+        this.liquidReturnDepth = liquidReturnDepth;
+    }
+
+    public Long getLiquidReturnDepth() 
+    {
+        return liquidReturnDepth;
+    }
+    public void setLiquidVolume(Long liquidVolume) 
+    {
+        this.liquidVolume = liquidVolume;
+    }
+
+    public Long getLiquidVolume() 
+    {
+        return liquidVolume;
+    }
+    public void setLiquidAdditional(Long liquidAdditional) 
+    {
+        this.liquidAdditional = liquidAdditional;
+    }
+
+    public Long getLiquidAdditional() 
+    {
+        return liquidAdditional;
+    }
+    public void setLiquidAdditionalCapacity(Long liquidAdditionalCapacity) 
+    {
+        this.liquidAdditionalCapacity = liquidAdditionalCapacity;
+    }
+
+    public Long getLiquidAdditionalCapacity() 
+    {
+        return liquidAdditionalCapacity;
+    }
+    public void setLiquidDosage(Long liquidDosage) 
+    {
+        this.liquidDosage = liquidDosage;
+    }
+
+    public Long getLiquidDosage() 
+    {
+        return liquidDosage;
+    }
+    public void setLiquidBasicProperties(String liquidBasicProperties) 
+    {
+        this.liquidBasicProperties = liquidBasicProperties;
+    }
+
+    public String getLiquidBasicProperties() 
+    {
+        return liquidBasicProperties;
+    }
+    public void setLiquidWaterLoss(Long liquidWaterLoss) 
+    {
+        this.liquidWaterLoss = liquidWaterLoss;
+    }
+
+    public Long getLiquidWaterLoss() 
+    {
+        return liquidWaterLoss;
+    }
+    public void setFivebcLiquidThickeningTime(Long fivebcLiquidThickeningTime) 
+    {
+        this.fivebcLiquidThickeningTime = fivebcLiquidThickeningTime;
+    }
+
+    public Long getFivebcLiquidThickeningTime() 
+    {
+        return fivebcLiquidThickeningTime;
+    }
+    public void setOnehbcLiquidThickeningTime(Long onehbcLiquidThickeningTime) 
+    {
+        this.onehbcLiquidThickeningTime = onehbcLiquidThickeningTime;
+    }
+
+    public Long getOnehbcLiquidThickeningTime() 
+    {
+        return onehbcLiquidThickeningTime;
+    }
+    public void setLiquidServiceLength(Long liquidServiceLength) 
+    {
+        this.liquidServiceLength = liquidServiceLength;
+    }
+
+    public Long getLiquidServiceLength() 
+    {
+        return liquidServiceLength;
+    }
+    public void setLiquidFormula(String liquidFormula) 
+    {
+        this.liquidFormula = liquidFormula;
+    }
+
+    public String getLiquidFormula() 
+    {
+        return liquidFormula;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("liquidNumber", getLiquidNumber())
+            .append("rheologicalParameterNumber", getRheologicalParameterNumber())
+            .append("oilWellId", getOilWellId())
+            .append("liquidName", getLiquidName())
+            .append("liquidDensity", getLiquidDensity())
+            .append("liquidReturnDepth", getLiquidReturnDepth())
+            .append("liquidVolume", getLiquidVolume())
+            .append("liquidAdditional", getLiquidAdditional())
+            .append("liquidAdditionalCapacity", getLiquidAdditionalCapacity())
+            .append("liquidDosage", getLiquidDosage())
+            .append("liquidBasicProperties", getLiquidBasicProperties())
+            .append("liquidWaterLoss", getLiquidWaterLoss())
+            .append("fivebcLiquidThickeningTime", getFivebcLiquidThickeningTime())
+            .append("onehbcLiquidThickeningTime", getOnehbcLiquidThickeningTime())
+            .append("liquidServiceLength", getLiquidServiceLength())
+            .append("liquidFormula", getLiquidFormula())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/DseignCeiteriaMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.DseignCeiteria;
+
+/**
+ * 设计标准Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public interface DseignCeiteriaMapper 
+{
+    /**
+     * 查询设计标准
+     * 
+     * @param designStandardNumber 设计标准ID
+     * @return 设计标准
+     */
+    public DseignCeiteria selectDseignCeiteriaById(Long designStandardNumber);
+
+    /**
+     * 查询设计标准列表
+     * 
+     * @param dseignCeiteria 设计标准
+     * @return 设计标准集合
+     */
+    public List<DseignCeiteria> selectDseignCeiteriaList(DseignCeiteria dseignCeiteria);
+
+    /**
+     * 新增设计标准
+     * 
+     * @param dseignCeiteria 设计标准
+     * @return 结果
+     */
+    public int insertDseignCeiteria(DseignCeiteria dseignCeiteria);
+
+    /**
+     * 修改设计标准
+     * 
+     * @param dseignCeiteria 设计标准
+     * @return 结果
+     */
+    public int updateDseignCeiteria(DseignCeiteria dseignCeiteria);
+
+    /**
+     * 删除设计标准
+     * 
+     * @param designStandardNumber 设计标准ID
+     * @return 结果
+     */
+    public int deleteDseignCeiteriaById(Long designStandardNumber);
+
+    /**
+     * 批量删除设计标准
+     * 
+     * @param designStandardNumbers 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteDseignCeiteriaByIds(String[] designStandardNumbers);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/EheologicalParametersMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.EheologicalParameters;
+
+/**
+ * 流变参数Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public interface EheologicalParametersMapper 
+{
+    /**
+     * 查询流变参数
+     * 
+     * @param rheologicalParameternumber 流变参数ID
+     * @return 流变参数
+     */
+    public EheologicalParameters selectEheologicalParametersById(Long rheologicalParameternumber);
+
+    /**
+     * 查询流变参数列表
+     * 
+     * @param eheologicalParameters 流变参数
+     * @return 流变参数集合
+     */
+    public List<EheologicalParameters> selectEheologicalParametersList(EheologicalParameters eheologicalParameters);
+
+    /**
+     * 新增流变参数
+     * 
+     * @param eheologicalParameters 流变参数
+     * @return 结果
+     */
+    public int insertEheologicalParameters(EheologicalParameters eheologicalParameters);
+
+    /**
+     * 修改流变参数
+     * 
+     * @param eheologicalParameters 流变参数
+     * @return 结果
+     */
+    public int updateEheologicalParameters(EheologicalParameters eheologicalParameters);
+
+    /**
+     * 删除流变参数
+     * 
+     * @param rheologicalParameternumber 流变参数ID
+     * @return 结果
+     */
+    public int deleteEheologicalParametersById(Long rheologicalParameternumber);
+
+    /**
+     * 批量删除流变参数
+     * 
+     * @param rheologicalParameternumbers 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteEheologicalParametersByIds(String[] rheologicalParameternumbers);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/LiquidMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.Liquid;
+
+/**
+ * 液体数据Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public interface LiquidMapper 
+{
+    /**
+     * 查询液体数据
+     * 
+     * @param liquidNumber 液体数据ID
+     * @return 液体数据
+     */
+    public Liquid selectLiquidById(Long liquidNumber);
+
+    /**
+     * 查询液体数据列表
+     * 
+     * @param liquid 液体数据
+     * @return 液体数据集合
+     */
+    public List<Liquid> selectLiquidList(Liquid liquid);
+
+    /**
+     * 新增液体数据
+     * 
+     * @param liquid 液体数据
+     * @return 结果
+     */
+    public int insertLiquid(Liquid liquid);
+
+    /**
+     * 修改液体数据
+     * 
+     * @param liquid 液体数据
+     * @return 结果
+     */
+    public int updateLiquid(Liquid liquid);
+
+    /**
+     * 删除液体数据
+     * 
+     * @param liquidNumber 液体数据ID
+     * @return 结果
+     */
+    public int deleteLiquidById(Long liquidNumber);
+
+    /**
+     * 批量删除液体数据
+     * 
+     * @param liquidNumbers 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteLiquidByIds(String[] liquidNumbers);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/RheologicalDesignMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.RheologicalDesign;
+
+/**
+ * 流变学设计数据Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public interface RheologicalDesignMapper 
+{
+    /**
+     * 查询流变学设计数据
+     * 
+     * @param rheologicalDesignNumber 流变学设计数据ID
+     * @return 流变学设计数据
+     */
+    public RheologicalDesign selectRheologicalDesignById(Long rheologicalDesignNumber);
+
+    /**
+     * 查询流变学设计数据列表
+     * 
+     * @param rheologicalDesign 流变学设计数据
+     * @return 流变学设计数据集合
+     */
+    public List<RheologicalDesign> selectRheologicalDesignList(RheologicalDesign rheologicalDesign);
+
+    /**
+     * 新增流变学设计数据
+     * 
+     * @param rheologicalDesign 流变学设计数据
+     * @return 结果
+     */
+    public int insertRheologicalDesign(RheologicalDesign rheologicalDesign);
+
+    /**
+     * 修改流变学设计数据
+     * 
+     * @param rheologicalDesign 流变学设计数据
+     * @return 结果
+     */
+    public int updateRheologicalDesign(RheologicalDesign rheologicalDesign);
+
+    /**
+     * 删除流变学设计数据
+     * 
+     * @param rheologicalDesignNumber 流变学设计数据ID
+     * @return 结果
+     */
+    public int deleteRheologicalDesignById(Long rheologicalDesignNumber);
+
+    /**
+     * 批量删除流变学设计数据
+     * 
+     * @param rheologicalDesignNumbers 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteRheologicalDesignByIds(String[] rheologicalDesignNumbers);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ShuiniMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.Shuini;
+
+/**
+ * 水泥浆Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public interface ShuiniMapper 
+{
+    /**
+     * 查询水泥浆
+     * 
+     * @param liquidNumber 水泥浆ID
+     * @return 水泥浆
+     */
+    public Shuini selectShuiniById(Long liquidNumber);
+
+    /**
+     * 查询水泥浆列表
+     * 
+     * @param shuini 水泥浆
+     * @return 水泥浆集合
+     */
+    public List<Shuini> selectShuiniList(Shuini shuini);
+
+    /**
+     * 新增水泥浆
+     * 
+     * @param shuini 水泥浆
+     * @return 结果
+     */
+    public int insertShuini(Shuini shuini);
+
+    /**
+     * 修改水泥浆
+     * 
+     * @param shuini 水泥浆
+     * @return 结果
+     */
+    public int updateShuini(Shuini shuini);
+
+    /**
+     * 删除水泥浆
+     * 
+     * @param liquidNumber 水泥浆ID
+     * @return 结果
+     */
+    public int deleteShuiniById(Long liquidNumber);
+
+    /**
+     * 批量删除水泥浆
+     * 
+     * @param liquidNumbers 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteShuiniByIds(String[] liquidNumbers);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IDseignCeiteriaService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.DseignCeiteria;
+
+/**
+ * 设计标准Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public interface IDseignCeiteriaService 
+{
+    /**
+     * 查询设计标准
+     * 
+     * @param designStandardNumber 设计标准ID
+     * @return 设计标准
+     */
+    public DseignCeiteria selectDseignCeiteriaById(Long designStandardNumber);
+
+    /**
+     * 查询设计标准列表
+     * 
+     * @param dseignCeiteria 设计标准
+     * @return 设计标准集合
+     */
+    public List<DseignCeiteria> selectDseignCeiteriaList(DseignCeiteria dseignCeiteria);
+
+    /**
+     * 新增设计标准
+     * 
+     * @param dseignCeiteria 设计标准
+     * @return 结果
+     */
+    public int insertDseignCeiteria(DseignCeiteria dseignCeiteria);
+
+    /**
+     * 修改设计标准
+     * 
+     * @param dseignCeiteria 设计标准
+     * @return 结果
+     */
+    public int updateDseignCeiteria(DseignCeiteria dseignCeiteria);
+
+    /**
+     * 批量删除设计标准
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteDseignCeiteriaByIds(String ids);
+
+    /**
+     * 删除设计标准信息
+     * 
+     * @param designStandardNumber 设计标准ID
+     * @return 结果
+     */
+    public int deleteDseignCeiteriaById(Long designStandardNumber);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IEheologicalParametersService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.EheologicalParameters;
+
+/**
+ * 流变参数Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public interface IEheologicalParametersService 
+{
+    /**
+     * 查询流变参数
+     * 
+     * @param rheologicalParameternumber 流变参数ID
+     * @return 流变参数
+     */
+    public EheologicalParameters selectEheologicalParametersById(Long rheologicalParameternumber);
+
+    /**
+     * 查询流变参数列表
+     * 
+     * @param eheologicalParameters 流变参数
+     * @return 流变参数集合
+     */
+    public List<EheologicalParameters> selectEheologicalParametersList(EheologicalParameters eheologicalParameters);
+
+    /**
+     * 新增流变参数
+     * 
+     * @param eheologicalParameters 流变参数
+     * @return 结果
+     */
+    public int insertEheologicalParameters(EheologicalParameters eheologicalParameters);
+
+    /**
+     * 修改流变参数
+     * 
+     * @param eheologicalParameters 流变参数
+     * @return 结果
+     */
+    public int updateEheologicalParameters(EheologicalParameters eheologicalParameters);
+
+    /**
+     * 批量删除流变参数
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteEheologicalParametersByIds(String ids);
+
+    /**
+     * 删除流变参数信息
+     * 
+     * @param rheologicalParameternumber 流变参数ID
+     * @return 结果
+     */
+    public int deleteEheologicalParametersById(Long rheologicalParameternumber);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ILiquidService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.Liquid;
+
+/**
+ * 液体数据Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public interface ILiquidService 
+{
+    /**
+     * 查询液体数据
+     * 
+     * @param liquidNumber 液体数据ID
+     * @return 液体数据
+     */
+    public Liquid selectLiquidById(Long liquidNumber);
+
+    /**
+     * 查询液体数据列表
+     * 
+     * @param liquid 液体数据
+     * @return 液体数据集合
+     */
+    public List<Liquid> selectLiquidList(Liquid liquid);
+
+    /**
+     * 新增液体数据
+     * 
+     * @param liquid 液体数据
+     * @return 结果
+     */
+    public int insertLiquid(Liquid liquid);
+
+    /**
+     * 修改液体数据
+     * 
+     * @param liquid 液体数据
+     * @return 结果
+     */
+    public int updateLiquid(Liquid liquid);
+
+    /**
+     * 批量删除液体数据
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteLiquidByIds(String ids);
+
+    /**
+     * 删除液体数据信息
+     * 
+     * @param liquidNumber 液体数据ID
+     * @return 结果
+     */
+    public int deleteLiquidById(Long liquidNumber);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IRheologicalDesignService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.RheologicalDesign;
+
+/**
+ * 流变学设计数据Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public interface IRheologicalDesignService 
+{
+    /**
+     * 查询流变学设计数据
+     * 
+     * @param rheologicalDesignNumber 流变学设计数据ID
+     * @return 流变学设计数据
+     */
+    public RheologicalDesign selectRheologicalDesignById(Long rheologicalDesignNumber);
+
+    /**
+     * 查询流变学设计数据列表
+     * 
+     * @param rheologicalDesign 流变学设计数据
+     * @return 流变学设计数据集合
+     */
+    public List<RheologicalDesign> selectRheologicalDesignList(RheologicalDesign rheologicalDesign);
+
+    /**
+     * 新增流变学设计数据
+     * 
+     * @param rheologicalDesign 流变学设计数据
+     * @return 结果
+     */
+    public int insertRheologicalDesign(RheologicalDesign rheologicalDesign);
+
+    /**
+     * 修改流变学设计数据
+     * 
+     * @param rheologicalDesign 流变学设计数据
+     * @return 结果
+     */
+    public int updateRheologicalDesign(RheologicalDesign rheologicalDesign);
+
+    /**
+     * 批量删除流变学设计数据
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteRheologicalDesignByIds(String ids);
+
+    /**
+     * 删除流变学设计数据信息
+     * 
+     * @param rheologicalDesignNumber 流变学设计数据ID
+     * @return 结果
+     */
+    public int deleteRheologicalDesignById(Long rheologicalDesignNumber);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IShuiniService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.Shuini;
+
+/**
+ * 水泥浆Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+public interface IShuiniService 
+{
+    /**
+     * 查询水泥浆
+     * 
+     * @param liquidNumber 水泥浆ID
+     * @return 水泥浆
+     */
+    public Shuini selectShuiniById(Long liquidNumber);
+
+    /**
+     * 查询水泥浆列表
+     * 
+     * @param shuini 水泥浆
+     * @return 水泥浆集合
+     */
+    public List<Shuini> selectShuiniList(Shuini shuini);
+
+    /**
+     * 新增水泥浆
+     * 
+     * @param shuini 水泥浆
+     * @return 结果
+     */
+    public int insertShuini(Shuini shuini);
+
+    /**
+     * 修改水泥浆
+     * 
+     * @param shuini 水泥浆
+     * @return 结果
+     */
+    public int updateShuini(Shuini shuini);
+
+    /**
+     * 批量删除水泥浆
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteShuiniByIds(String ids);
+
+    /**
+     * 删除水泥浆信息
+     * 
+     * @param liquidNumber 水泥浆ID
+     * @return 结果
+     */
+    public int deleteShuiniById(Long liquidNumber);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DseignCeiteriaServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.DseignCeiteriaMapper;
+import com.ruoyi.system.domain.DseignCeiteria;
+import com.ruoyi.system.service.IDseignCeiteriaService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 设计标准Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+@Service
+public class DseignCeiteriaServiceImpl implements IDseignCeiteriaService 
+{
+    @Autowired
+    private DseignCeiteriaMapper dseignCeiteriaMapper;
+
+    /**
+     * 查询设计标准
+     * 
+     * @param designStandardNumber 设计标准ID
+     * @return 设计标准
+     */
+    @Override
+    public DseignCeiteria selectDseignCeiteriaById(Long designStandardNumber)
+    {
+        return dseignCeiteriaMapper.selectDseignCeiteriaById(designStandardNumber);
+    }
+
+    /**
+     * 查询设计标准列表
+     * 
+     * @param dseignCeiteria 设计标准
+     * @return 设计标准
+     */
+    @Override
+    public List<DseignCeiteria> selectDseignCeiteriaList(DseignCeiteria dseignCeiteria)
+    {
+        return dseignCeiteriaMapper.selectDseignCeiteriaList(dseignCeiteria);
+    }
+
+    /**
+     * 新增设计标准
+     * 
+     * @param dseignCeiteria 设计标准
+     * @return 结果
+     */
+    @Override
+    public int insertDseignCeiteria(DseignCeiteria dseignCeiteria)
+    {
+        return dseignCeiteriaMapper.insertDseignCeiteria(dseignCeiteria);
+    }
+
+    /**
+     * 修改设计标准
+     * 
+     * @param dseignCeiteria 设计标准
+     * @return 结果
+     */
+    @Override
+    public int updateDseignCeiteria(DseignCeiteria dseignCeiteria)
+    {
+        return dseignCeiteriaMapper.updateDseignCeiteria(dseignCeiteria);
+    }
+
+    /**
+     * 删除设计标准对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDseignCeiteriaByIds(String ids)
+    {
+        return dseignCeiteriaMapper.deleteDseignCeiteriaByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除设计标准信息
+     * 
+     * @param designStandardNumber 设计标准ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDseignCeiteriaById(Long designStandardNumber)
+    {
+        return dseignCeiteriaMapper.deleteDseignCeiteriaById(designStandardNumber);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EheologicalParametersServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.EheologicalParametersMapper;
+import com.ruoyi.system.domain.EheologicalParameters;
+import com.ruoyi.system.service.IEheologicalParametersService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 流变参数Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+@Service
+public class EheologicalParametersServiceImpl implements IEheologicalParametersService 
+{
+    @Autowired
+    private EheologicalParametersMapper eheologicalParametersMapper;
+
+    /**
+     * 查询流变参数
+     * 
+     * @param rheologicalParameternumber 流变参数ID
+     * @return 流变参数
+     */
+    @Override
+    public EheologicalParameters selectEheologicalParametersById(Long rheologicalParameternumber)
+    {
+        return eheologicalParametersMapper.selectEheologicalParametersById(rheologicalParameternumber);
+    }
+
+    /**
+     * 查询流变参数列表
+     * 
+     * @param eheologicalParameters 流变参数
+     * @return 流变参数
+     */
+    @Override
+    public List<EheologicalParameters> selectEheologicalParametersList(EheologicalParameters eheologicalParameters)
+    {
+        return eheologicalParametersMapper.selectEheologicalParametersList(eheologicalParameters);
+    }
+
+    /**
+     * 新增流变参数
+     * 
+     * @param eheologicalParameters 流变参数
+     * @return 结果
+     */
+    @Override
+    public int insertEheologicalParameters(EheologicalParameters eheologicalParameters)
+    {
+        return eheologicalParametersMapper.insertEheologicalParameters(eheologicalParameters);
+    }
+
+    /**
+     * 修改流变参数
+     * 
+     * @param eheologicalParameters 流变参数
+     * @return 结果
+     */
+    @Override
+    public int updateEheologicalParameters(EheologicalParameters eheologicalParameters)
+    {
+        return eheologicalParametersMapper.updateEheologicalParameters(eheologicalParameters);
+    }
+
+    /**
+     * 删除流变参数对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteEheologicalParametersByIds(String ids)
+    {
+        return eheologicalParametersMapper.deleteEheologicalParametersByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除流变参数信息
+     * 
+     * @param rheologicalParameternumber 流变参数ID
+     * @return 结果
+     */
+    @Override
+    public int deleteEheologicalParametersById(Long rheologicalParameternumber)
+    {
+        return eheologicalParametersMapper.deleteEheologicalParametersById(rheologicalParameternumber);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LiquidServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.LiquidMapper;
+import com.ruoyi.system.domain.Liquid;
+import com.ruoyi.system.service.ILiquidService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 液体数据Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+@Service
+public class LiquidServiceImpl implements ILiquidService 
+{
+    @Autowired
+    private LiquidMapper liquidMapper;
+
+    /**
+     * 查询液体数据
+     * 
+     * @param liquidNumber 液体数据ID
+     * @return 液体数据
+     */
+    @Override
+    public Liquid selectLiquidById(Long liquidNumber)
+    {
+        return liquidMapper.selectLiquidById(liquidNumber);
+    }
+
+    /**
+     * 查询液体数据列表
+     * 
+     * @param liquid 液体数据
+     * @return 液体数据
+     */
+    @Override
+    public List<Liquid> selectLiquidList(Liquid liquid)
+    {
+        return liquidMapper.selectLiquidList(liquid);
+    }
+
+    /**
+     * 新增液体数据
+     * 
+     * @param liquid 液体数据
+     * @return 结果
+     */
+    @Override
+    public int insertLiquid(Liquid liquid)
+    {
+        return liquidMapper.insertLiquid(liquid);
+    }
+
+    /**
+     * 修改液体数据
+     * 
+     * @param liquid 液体数据
+     * @return 结果
+     */
+    @Override
+    public int updateLiquid(Liquid liquid)
+    {
+        return liquidMapper.updateLiquid(liquid);
+    }
+
+    /**
+     * 删除液体数据对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLiquidByIds(String ids)
+    {
+        return liquidMapper.deleteLiquidByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除液体数据信息
+     * 
+     * @param liquidNumber 液体数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLiquidById(Long liquidNumber)
+    {
+        return liquidMapper.deleteLiquidById(liquidNumber);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RheologicalDesignServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.RheologicalDesignMapper;
+import com.ruoyi.system.domain.RheologicalDesign;
+import com.ruoyi.system.service.IRheologicalDesignService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 流变学设计数据Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+@Service
+public class RheologicalDesignServiceImpl implements IRheologicalDesignService 
+{
+    @Autowired
+    private RheologicalDesignMapper rheologicalDesignMapper;
+
+    /**
+     * 查询流变学设计数据
+     * 
+     * @param rheologicalDesignNumber 流变学设计数据ID
+     * @return 流变学设计数据
+     */
+    @Override
+    public RheologicalDesign selectRheologicalDesignById(Long rheologicalDesignNumber)
+    {
+        return rheologicalDesignMapper.selectRheologicalDesignById(rheologicalDesignNumber);
+    }
+
+    /**
+     * 查询流变学设计数据列表
+     * 
+     * @param rheologicalDesign 流变学设计数据
+     * @return 流变学设计数据
+     */
+    @Override
+    public List<RheologicalDesign> selectRheologicalDesignList(RheologicalDesign rheologicalDesign)
+    {
+        return rheologicalDesignMapper.selectRheologicalDesignList(rheologicalDesign);
+    }
+
+    /**
+     * 新增流变学设计数据
+     * 
+     * @param rheologicalDesign 流变学设计数据
+     * @return 结果
+     */
+    @Override
+    public int insertRheologicalDesign(RheologicalDesign rheologicalDesign)
+    {
+        return rheologicalDesignMapper.insertRheologicalDesign(rheologicalDesign);
+    }
+
+    /**
+     * 修改流变学设计数据
+     * 
+     * @param rheologicalDesign 流变学设计数据
+     * @return 结果
+     */
+    @Override
+    public int updateRheologicalDesign(RheologicalDesign rheologicalDesign)
+    {
+        return rheologicalDesignMapper.updateRheologicalDesign(rheologicalDesign);
+    }
+
+    /**
+     * 删除流变学设计数据对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteRheologicalDesignByIds(String ids)
+    {
+        return rheologicalDesignMapper.deleteRheologicalDesignByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除流变学设计数据信息
+     * 
+     * @param rheologicalDesignNumber 流变学设计数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteRheologicalDesignById(Long rheologicalDesignNumber)
+    {
+        return rheologicalDesignMapper.deleteRheologicalDesignById(rheologicalDesignNumber);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ShuiniServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.ShuiniMapper;
+import com.ruoyi.system.domain.Shuini;
+import com.ruoyi.system.service.IShuiniService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 水泥浆Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-05-05
+ */
+@Service
+public class ShuiniServiceImpl implements IShuiniService 
+{
+    @Autowired
+    private ShuiniMapper shuiniMapper;
+
+    /**
+     * 查询水泥浆
+     * 
+     * @param liquidNumber 水泥浆ID
+     * @return 水泥浆
+     */
+    @Override
+    public Shuini selectShuiniById(Long liquidNumber)
+    {
+        return shuiniMapper.selectShuiniById(liquidNumber);
+    }
+
+    /**
+     * 查询水泥浆列表
+     * 
+     * @param shuini 水泥浆
+     * @return 水泥浆
+     */
+    @Override
+    public List<Shuini> selectShuiniList(Shuini shuini)
+    {
+        return shuiniMapper.selectShuiniList(shuini);
+    }
+
+    /**
+     * 新增水泥浆
+     * 
+     * @param shuini 水泥浆
+     * @return 结果
+     */
+    @Override
+    public int insertShuini(Shuini shuini)
+    {
+        return shuiniMapper.insertShuini(shuini);
+    }
+
+    /**
+     * 修改水泥浆
+     * 
+     * @param shuini 水泥浆
+     * @return 结果
+     */
+    @Override
+    public int updateShuini(Shuini shuini)
+    {
+        return shuiniMapper.updateShuini(shuini);
+    }
+
+    /**
+     * 删除水泥浆对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteShuiniByIds(String ids)
+    {
+        return shuiniMapper.deleteShuiniByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除水泥浆信息
+     * 
+     * @param liquidNumber 水泥浆ID
+     * @return 结果
+     */
+    @Override
+    public int deleteShuiniById(Long liquidNumber)
+    {
+        return shuiniMapper.deleteShuiniById(liquidNumber);
+    }
+}

ruoyi-system/src/main/resources/mapper/system/DseignCeiteriaMapper.xml

@@ -0,0 +1,67 @@
+<?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="com.ruoyi.system.mapper.DseignCeiteriaMapper">
+    
+    <resultMap type="DseignCeiteria" id="DseignCeiteriaResult">
+        <result property="designStandardNumber"    column="design_standard_Number"    />
+        <result property="oilWellId"    column="oil_well_ID"    />
+        <result property="designStandardName"    column="design_standard_Name"    />
+        <result property="designDisplacementofdesignstandard"    column="design_DisplacementOfDesignStandard"    />
+    </resultMap>
+
+    <sql id="selectDseignCeiteriaVo">
+        select design_standard_Number, oil_well_ID, design_standard_Name, design_DisplacementOfDesignStandard from dseign_ceiteria
+    </sql>
+
+    <select id="selectDseignCeiteriaList" parameterType="DseignCeiteria" resultMap="DseignCeiteriaResult">
+        <include refid="selectDseignCeiteriaVo"/>
+        <where>  
+            <if test="oilWellId != null "> and oil_well_ID = #{oilWellId}</if>
+            <if test="designStandardName != null  and designStandardName != ''"> and design_standard_Name like concat('%', #{designStandardName}, '%')</if>
+            <if test="designDisplacementofdesignstandard != null "> and design_DisplacementOfDesignStandard = #{designDisplacementofdesignstandard}</if>
+        </where>
+    </select>
+    
+    <select id="selectDseignCeiteriaById" parameterType="Long" resultMap="DseignCeiteriaResult">
+        <include refid="selectDseignCeiteriaVo"/>
+        where design_standard_Number = #{designStandardNumber}
+    </select>
+        
+    <insert id="insertDseignCeiteria" parameterType="DseignCeiteria" useGeneratedKeys="true" keyProperty="designStandardNumber">
+        insert into dseign_ceiteria
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="oilWellId != null">oil_well_ID,</if>
+            <if test="designStandardName != null">design_standard_Name,</if>
+            <if test="designDisplacementofdesignstandard != null">design_DisplacementOfDesignStandard,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="oilWellId != null">#{oilWellId},</if>
+            <if test="designStandardName != null">#{designStandardName},</if>
+            <if test="designDisplacementofdesignstandard != null">#{designDisplacementofdesignstandard},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDseignCeiteria" parameterType="DseignCeiteria">
+        update dseign_ceiteria
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="oilWellId != null">oil_well_ID = #{oilWellId},</if>
+            <if test="designStandardName != null">design_standard_Name = #{designStandardName},</if>
+            <if test="designDisplacementofdesignstandard != null">design_DisplacementOfDesignStandard = #{designDisplacementofdesignstandard},</if>
+        </trim>
+        where design_standard_Number = #{designStandardNumber}
+    </update>
+
+    <delete id="deleteDseignCeiteriaById" parameterType="Long">
+        delete from dseign_ceiteria where design_standard_Number = #{designStandardNumber}
+    </delete>
+
+    <delete id="deleteDseignCeiteriaByIds" parameterType="String">
+        delete from dseign_ceiteria where design_standard_Number in 
+        <foreach item="designStandardNumber" collection="array" open="(" separator="," close=")">
+            #{designStandardNumber}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/system/EheologicalParametersMapper.xml

@@ -0,0 +1,92 @@
+<?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="com.ruoyi.system.mapper.EheologicalParametersMapper">
+    
+    <resultMap type="EheologicalParameters" id="EheologicalParametersResult">
+        <result property="rheologicalParameternumber"    column="rheological_ParameterNumber"    />
+        <result property="rheologicalName"    column="rheological_Name"    />
+        <result property="rheologicalDensity"    column="rheological_Density"    />
+        <result property="rheologicalModel"    column="rheological_Model"    />
+        <result property="plasticViscosity"    column="plastic_Viscosity"    />
+        <result property="dynamicShear"    column="dynamic_Shear"    />
+        <result property="consistencyCoefficient"    column="consistency_Coefficient"    />
+        <result property="fluidityIndex"    column="fluidity_Index"    />
+        <result property="newtonianViscosity"    column="newtonian_Viscosity"    />
+    </resultMap>
+
+    <sql id="selectEheologicalParametersVo">
+        select rheological_ParameterNumber, rheological_Name, rheological_Density, rheological_Model, plastic_Viscosity, dynamic_Shear, consistency_Coefficient, fluidity_Index, newtonian_Viscosity from eheological_parameters
+    </sql>
+
+    <select id="selectEheologicalParametersList" parameterType="EheologicalParameters" resultMap="EheologicalParametersResult">
+        <include refid="selectEheologicalParametersVo"/>
+        <where>  
+            <if test="rheologicalName != null  and rheologicalName != ''"> and rheological_Name like concat('%', #{rheologicalName}, '%')</if>
+            <if test="rheologicalDensity != null  and rheologicalDensity != ''"> and rheological_Density = #{rheologicalDensity}</if>
+            <if test="rheologicalModel != null  and rheologicalModel != ''"> and rheological_Model = #{rheologicalModel}</if>
+            <if test="plasticViscosity != null  and plasticViscosity != ''"> and plastic_Viscosity = #{plasticViscosity}</if>
+            <if test="dynamicShear != null  and dynamicShear != ''"> and dynamic_Shear = #{dynamicShear}</if>
+            <if test="consistencyCoefficient != null  and consistencyCoefficient != ''"> and consistency_Coefficient = #{consistencyCoefficient}</if>
+            <if test="fluidityIndex != null  and fluidityIndex != ''"> and fluidity_Index = #{fluidityIndex}</if>
+            <if test="newtonianViscosity != null  and newtonianViscosity != ''"> and newtonian_Viscosity = #{newtonianViscosity}</if>
+        </where>
+    </select>
+    
+    <select id="selectEheologicalParametersById" parameterType="Long" resultMap="EheologicalParametersResult">
+        <include refid="selectEheologicalParametersVo"/>
+        where rheological_ParameterNumber = #{rheologicalParameternumber}
+    </select>
+        
+    <insert id="insertEheologicalParameters" parameterType="EheologicalParameters" useGeneratedKeys="true" keyProperty="rheologicalParameternumber">
+        insert into eheological_parameters
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="rheologicalName != null and rheologicalName != ''">rheological_Name,</if>
+            <if test="rheologicalDensity != null and rheologicalDensity != ''">rheological_Density,</if>
+            <if test="rheologicalModel != null and rheologicalModel != ''">rheological_Model,</if>
+            <if test="plasticViscosity != null">plastic_Viscosity,</if>
+            <if test="dynamicShear != null">dynamic_Shear,</if>
+            <if test="consistencyCoefficient != null">consistency_Coefficient,</if>
+            <if test="fluidityIndex != null">fluidity_Index,</if>
+            <if test="newtonianViscosity != null">newtonian_Viscosity,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="rheologicalName != null and rheologicalName != ''">#{rheologicalName},</if>
+            <if test="rheologicalDensity != null and rheologicalDensity != ''">#{rheologicalDensity},</if>
+            <if test="rheologicalModel != null and rheologicalModel != ''">#{rheologicalModel},</if>
+            <if test="plasticViscosity != null">#{plasticViscosity},</if>
+            <if test="dynamicShear != null">#{dynamicShear},</if>
+            <if test="consistencyCoefficient != null">#{consistencyCoefficient},</if>
+            <if test="fluidityIndex != null">#{fluidityIndex},</if>
+            <if test="newtonianViscosity != null">#{newtonianViscosity},</if>
+         </trim>
+    </insert>
+
+    <update id="updateEheologicalParameters" parameterType="EheologicalParameters">
+        update eheological_parameters
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="rheologicalName != null and rheologicalName != ''">rheological_Name = #{rheologicalName},</if>
+            <if test="rheologicalDensity != null and rheologicalDensity != ''">rheological_Density = #{rheologicalDensity},</if>
+            <if test="rheologicalModel != null and rheologicalModel != ''">rheological_Model = #{rheologicalModel},</if>
+            <if test="plasticViscosity != null">plastic_Viscosity = #{plasticViscosity},</if>
+            <if test="dynamicShear != null">dynamic_Shear = #{dynamicShear},</if>
+            <if test="consistencyCoefficient != null">consistency_Coefficient = #{consistencyCoefficient},</if>
+            <if test="fluidityIndex != null">fluidity_Index = #{fluidityIndex},</if>
+            <if test="newtonianViscosity != null">newtonian_Viscosity = #{newtonianViscosity},</if>
+        </trim>
+        where rheological_ParameterNumber = #{rheologicalParameternumber}
+    </update>
+
+    <delete id="deleteEheologicalParametersById" parameterType="Long">
+        delete from eheological_parameters where rheological_ParameterNumber = #{rheologicalParameternumber}
+    </delete>
+
+    <delete id="deleteEheologicalParametersByIds" parameterType="String">
+        delete from eheological_parameters where rheological_ParameterNumber in 
+        <foreach item="rheologicalParameternumber" collection="array" open="(" separator="," close=")">
+            #{rheologicalParameternumber}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/system/LiquidMapper.xml

@@ -0,0 +1,119 @@
+<?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="com.ruoyi.system.mapper.LiquidMapper">
+    
+    <resultMap type="Liquid" id="LiquidResult">
+        <result property="liquidNumber"    column="liquid_Number"    />
+        <result property="rheologicalParameterNumber"    column="rheological_Parameter_Number"    />
+        <result property="oilWellId"    column="oil_well_ID"    />
+        <result property="liquidName"    column="liquid_Name"    />
+        <result property="liquidDensity"    column="liquid_density"    />
+        <result property="liquidReturnDepth"    column="liquid_Return_Depth"    />
+        <result property="liquidVolume"    column="liquid_Volume"    />
+        <result property="liquidAdditional"    column="liquid_Additional"    />
+        <result property="liquidAdditionalCapacity"    column="liquid_Additional_Capacity"    />
+        <result property="liquidDosage"    column="liquid_Dosage"    />
+        <result property="liquidBasicProperties"    column="liquid_Basic_Properties"    />
+        <result property="liquidWaterLoss"    column="liquid_Water_Loss"    />
+        <result property="fivebcLiquidThickeningTime"    column="FiveBC_liquid_Thickening_Time"    />
+        <result property="onehbcLiquidThickeningTime"    column="OneHBC_liquid_Thickening_Time"    />
+        <result property="liquidServiceLength"    column="liquid_Service_Length"    />
+        <result property="liquidFormula"    column="liquid_Formula"    />
+    </resultMap>
+
+    <sql id="selectLiquidVo">
+        select liquid_Number, rheological_Parameter_Number, oil_well_ID, liquid_Name, liquid_density, liquid_Return_Depth, liquid_Volume, liquid_Additional, liquid_Additional_Capacity, liquid_Dosage, liquid_Basic_Properties, liquid_Water_Loss, FiveBC_liquid_Thickening_Time, OneHBC_liquid_Thickening_Time, liquid_Service_Length, liquid_Formula from liquid
+    </sql>
+
+    <select id="selectLiquidList" parameterType="Liquid" resultMap="LiquidResult">
+        <include refid="selectLiquidVo"/>
+        <where>  
+            <if test="liquidNumber != null "> and liquid_Number = #{liquidNumber}</if>
+            <if test="oilWellId != null "> and oil_well_ID = #{oilWellId}</if>
+            <if test="liquidName != null  and liquidName != ''"> and liquid_Name like concat('%', #{liquidName}, '%')</if>
+            <if test="liquidDensity != null "> and liquid_density = #{liquidDensity}</if>
+            <if test="liquidDosage != null "> and liquid_Dosage = #{liquidDosage}</if>
+            <if test="liquidServiceLength != null "> and liquid_Service_Length = #{liquidServiceLength}</if>
+            <if test="liquidFormula != null  and liquidFormula != ''"> and liquid_Formula = #{liquidFormula}</if>
+        </where>
+    </select>
+    
+    <select id="selectLiquidById" parameterType="Long" resultMap="LiquidResult">
+        <include refid="selectLiquidVo"/>
+        where liquid_Number = #{liquidNumber}
+    </select>
+        
+    <insert id="insertLiquid" parameterType="Liquid" useGeneratedKeys="true" keyProperty="liquidNumber">
+        insert into liquid
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="rheologicalParameterNumber != null">rheological_Parameter_Number,</if>
+            <if test="oilWellId != null">oil_well_ID,</if>
+            <if test="liquidName != null and liquidName != ''">liquid_Name,</if>
+            <if test="liquidDensity != null">liquid_density,</if>
+            <if test="liquidReturnDepth != null">liquid_Return_Depth,</if>
+            <if test="liquidVolume != null">liquid_Volume,</if>
+            <if test="liquidAdditional != null">liquid_Additional,</if>
+            <if test="liquidAdditionalCapacity != null">liquid_Additional_Capacity,</if>
+            <if test="liquidDosage != null">liquid_Dosage,</if>
+            <if test="liquidBasicProperties != null">liquid_Basic_Properties,</if>
+            <if test="liquidWaterLoss != null">liquid_Water_Loss,</if>
+            <if test="fivebcLiquidThickeningTime != null">FiveBC_liquid_Thickening_Time,</if>
+            <if test="onehbcLiquidThickeningTime != null">OneHBC_liquid_Thickening_Time,</if>
+            <if test="liquidServiceLength != null">liquid_Service_Length,</if>
+            <if test="liquidFormula != null">liquid_Formula,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="rheologicalParameterNumber != null">#{rheologicalParameterNumber},</if>
+            <if test="oilWellId != null">#{oilWellId},</if>
+            <if test="liquidName != null and liquidName != ''">#{liquidName},</if>
+            <if test="liquidDensity != null">#{liquidDensity},</if>
+            <if test="liquidReturnDepth != null">#{liquidReturnDepth},</if>
+            <if test="liquidVolume != null">#{liquidVolume},</if>
+            <if test="liquidAdditional != null">#{liquidAdditional},</if>
+            <if test="liquidAdditionalCapacity != null">#{liquidAdditionalCapacity},</if>
+            <if test="liquidDosage != null">#{liquidDosage},</if>
+            <if test="liquidBasicProperties != null">#{liquidBasicProperties},</if>
+            <if test="liquidWaterLoss != null">#{liquidWaterLoss},</if>
+            <if test="fivebcLiquidThickeningTime != null">#{fivebcLiquidThickeningTime},</if>
+            <if test="onehbcLiquidThickeningTime != null">#{onehbcLiquidThickeningTime},</if>
+            <if test="liquidServiceLength != null">#{liquidServiceLength},</if>
+            <if test="liquidFormula != null">#{liquidFormula},</if>
+         </trim>
+    </insert>
+
+    <update id="updateLiquid" parameterType="Liquid">
+        update liquid
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="rheologicalParameterNumber != null">rheological_Parameter_Number = #{rheologicalParameterNumber},</if>
+            <if test="oilWellId != null">oil_well_ID = #{oilWellId},</if>
+            <if test="liquidName != null and liquidName != ''">liquid_Name = #{liquidName},</if>
+            <if test="liquidDensity != null">liquid_density = #{liquidDensity},</if>
+            <if test="liquidReturnDepth != null">liquid_Return_Depth = #{liquidReturnDepth},</if>
+            <if test="liquidVolume != null">liquid_Volume = #{liquidVolume},</if>
+            <if test="liquidAdditional != null">liquid_Additional = #{liquidAdditional},</if>
+            <if test="liquidAdditionalCapacity != null">liquid_Additional_Capacity = #{liquidAdditionalCapacity},</if>
+            <if test="liquidDosage != null">liquid_Dosage = #{liquidDosage},</if>
+            <if test="liquidBasicProperties != null">liquid_Basic_Properties = #{liquidBasicProperties},</if>
+            <if test="liquidWaterLoss != null">liquid_Water_Loss = #{liquidWaterLoss},</if>
+            <if test="fivebcLiquidThickeningTime != null">FiveBC_liquid_Thickening_Time = #{fivebcLiquidThickeningTime},</if>
+            <if test="onehbcLiquidThickeningTime != null">OneHBC_liquid_Thickening_Time = #{onehbcLiquidThickeningTime},</if>
+            <if test="liquidServiceLength != null">liquid_Service_Length = #{liquidServiceLength},</if>
+            <if test="liquidFormula != null">liquid_Formula = #{liquidFormula},</if>
+        </trim>
+        where liquid_Number = #{liquidNumber}
+    </update>
+
+    <delete id="deleteLiquidById" parameterType="Long">
+        delete from liquid where liquid_Number = #{liquidNumber}
+    </delete>
+
+    <delete id="deleteLiquidByIds" parameterType="String">
+        delete from liquid where liquid_Number in 
+        <foreach item="liquidNumber" collection="array" open="(" separator="," close=")">
+            #{liquidNumber}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/system/RheologicalDesignMapper.xml

@@ -0,0 +1,96 @@
+<?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="com.ruoyi.system.mapper.RheologicalDesignMapper">
+    
+    <resultMap type="RheologicalDesign" id="RheologicalDesignResult">
+        <result property="rheologicalDesignNumber"    column="rheological_design_Number"    />
+        <result property="oilWellId"    column="oil_well_ID"    />
+        <result property="displacementDisplacementDesign"    column="displacement_displacement_Design"    />
+        <result property="focusOn3292Pressure"    column="focus_on_3292_Pressure"    />
+        <result property="focusOn3342Pressure"    column="focus_on_3342_Pressure"    />
+        <result property="overallWellStatichydraulicdifference"    column="overall_well_StaticHydraulicDifference"    />
+        <result property="annularCirculationpressureloss"    column="annular_CirculationPressureLoss"    />
+        <result property="circulatingPressurelossinthetube"    column="circulating_PressureLossInTheTube"    />
+        <result property="circulatingPressurelossthroughoutthewell"    column="circulating_PressureLossThroughoutTheWell"    />
+        <result property="finalDisplacementpumppressure"    column="final_DisplacementPumpPressure"    />
+    </resultMap>
+
+    <sql id="selectRheologicalDesignVo">
+        select rheological_design_Number, oil_well_ID, displacement_displacement_Design, focus_on_3292_Pressure, focus_on_3342_Pressure, overall_well_StaticHydraulicDifference, annular_CirculationPressureLoss, circulating_PressureLossInTheTube, circulating_PressureLossThroughoutTheWell, final_DisplacementPumpPressure from rheological_design
+    </sql>
+
+    <select id="selectRheologicalDesignList" parameterType="RheologicalDesign" resultMap="RheologicalDesignResult">
+        <include refid="selectRheologicalDesignVo"/>
+        <where>  
+            <if test="displacementDisplacementDesign != null "> and displacement_displacement_Design = #{displacementDisplacementDesign}</if>
+            <if test="focusOn3292Pressure != null "> and focus_on_3292_Pressure = #{focusOn3292Pressure}</if>
+            <if test="focusOn3342Pressure != null "> and focus_on_3342_Pressure = #{focusOn3342Pressure}</if>
+            <if test="overallWellStatichydraulicdifference != null "> and overall_well_StaticHydraulicDifference = #{overallWellStatichydraulicdifference}</if>
+            <if test="annularCirculationpressureloss != null "> and annular_CirculationPressureLoss = #{annularCirculationpressureloss}</if>
+            <if test="circulatingPressurelossinthetube != null "> and circulating_PressureLossInTheTube = #{circulatingPressurelossinthetube}</if>
+            <if test="circulatingPressurelossthroughoutthewell != null "> and circulating_PressureLossThroughoutTheWell = #{circulatingPressurelossthroughoutthewell}</if>
+            <if test="finalDisplacementpumppressure != null "> and final_DisplacementPumpPressure = #{finalDisplacementpumppressure}</if>
+        </where>
+    </select>
+    
+    <select id="selectRheologicalDesignById" parameterType="Long" resultMap="RheologicalDesignResult">
+        <include refid="selectRheologicalDesignVo"/>
+        where rheological_design_Number = #{rheologicalDesignNumber}
+    </select>
+        
+    <insert id="insertRheologicalDesign" parameterType="RheologicalDesign" useGeneratedKeys="true" keyProperty="rheologicalDesignNumber">
+        insert into rheological_design
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="oilWellId != null">oil_well_ID,</if>
+            <if test="displacementDisplacementDesign != null">displacement_displacement_Design,</if>
+            <if test="focusOn3292Pressure != null">focus_on_3292_Pressure,</if>
+            <if test="focusOn3342Pressure != null">focus_on_3342_Pressure,</if>
+            <if test="overallWellStatichydraulicdifference != null">overall_well_StaticHydraulicDifference,</if>
+            <if test="annularCirculationpressureloss != null">annular_CirculationPressureLoss,</if>
+            <if test="circulatingPressurelossinthetube != null">circulating_PressureLossInTheTube,</if>
+            <if test="circulatingPressurelossthroughoutthewell != null">circulating_PressureLossThroughoutTheWell,</if>
+            <if test="finalDisplacementpumppressure != null">final_DisplacementPumpPressure,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="oilWellId != null">#{oilWellId},</if>
+            <if test="displacementDisplacementDesign != null">#{displacementDisplacementDesign},</if>
+            <if test="focusOn3292Pressure != null">#{focusOn3292Pressure},</if>
+            <if test="focusOn3342Pressure != null">#{focusOn3342Pressure},</if>
+            <if test="overallWellStatichydraulicdifference != null">#{overallWellStatichydraulicdifference},</if>
+            <if test="annularCirculationpressureloss != null">#{annularCirculationpressureloss},</if>
+            <if test="circulatingPressurelossinthetube != null">#{circulatingPressurelossinthetube},</if>
+            <if test="circulatingPressurelossthroughoutthewell != null">#{circulatingPressurelossthroughoutthewell},</if>
+            <if test="finalDisplacementpumppressure != null">#{finalDisplacementpumppressure},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRheologicalDesign" parameterType="RheologicalDesign">
+        update rheological_design
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="oilWellId != null">oil_well_ID = #{oilWellId},</if>
+            <if test="displacementDisplacementDesign != null">displacement_displacement_Design = #{displacementDisplacementDesign},</if>
+            <if test="focusOn3292Pressure != null">focus_on_3292_Pressure = #{focusOn3292Pressure},</if>
+            <if test="focusOn3342Pressure != null">focus_on_3342_Pressure = #{focusOn3342Pressure},</if>
+            <if test="overallWellStatichydraulicdifference != null">overall_well_StaticHydraulicDifference = #{overallWellStatichydraulicdifference},</if>
+            <if test="annularCirculationpressureloss != null">annular_CirculationPressureLoss = #{annularCirculationpressureloss},</if>
+            <if test="circulatingPressurelossinthetube != null">circulating_PressureLossInTheTube = #{circulatingPressurelossinthetube},</if>
+            <if test="circulatingPressurelossthroughoutthewell != null">circulating_PressureLossThroughoutTheWell = #{circulatingPressurelossthroughoutthewell},</if>
+            <if test="finalDisplacementpumppressure != null">final_DisplacementPumpPressure = #{finalDisplacementpumppressure},</if>
+        </trim>
+        where rheological_design_Number = #{rheologicalDesignNumber}
+    </update>
+
+    <delete id="deleteRheologicalDesignById" parameterType="Long">
+        delete from rheological_design where rheological_design_Number = #{rheologicalDesignNumber}
+    </delete>
+
+    <delete id="deleteRheologicalDesignByIds" parameterType="String">
+        delete from rheological_design where rheological_design_Number in 
+        <foreach item="rheologicalDesignNumber" collection="array" open="(" separator="," close=")">
+            #{rheologicalDesignNumber}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/mapper/system/ShuiniMapper.xml

@@ -0,0 +1,119 @@
+<?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="com.ruoyi.system.mapper.ShuiniMapper">
+    
+    <resultMap type="Shuini" id="ShuiniResult">
+        <result property="liquidNumber"    column="liquid_Number"    />
+        <result property="rheologicalParameterNumber"    column="rheological_Parameter_Number"    />
+        <result property="oilWellId"    column="oil_well_ID"    />
+        <result property="liquidName"    column="liquid_Name"    />
+        <result property="liquidDensity"    column="liquid_density"    />
+        <result property="liquidReturnDepth"    column="liquid_Return_Depth"    />
+        <result property="liquidVolume"    column="liquid_Volume"    />
+        <result property="liquidAdditional"    column="liquid_Additional"    />
+        <result property="liquidAdditionalCapacity"    column="liquid_Additional_Capacity"    />
+        <result property="liquidDosage"    column="liquid_Dosage"    />
+        <result property="liquidBasicProperties"    column="liquid_Basic_Properties"    />
+        <result property="liquidWaterLoss"    column="liquid_Water_Loss"    />
+        <result property="fivebcLiquidThickeningTime"    column="FiveBC_liquid_Thickening_Time"    />
+        <result property="onehbcLiquidThickeningTime"    column="OneHBC_liquid_Thickening_Time"    />
+        <result property="liquidServiceLength"    column="liquid_Service_Length"    />
+        <result property="liquidFormula"    column="liquid_Formula"    />
+    </resultMap>
+
+    <sql id="selectShuiniVo">
+        select liquid_Number, rheological_Parameter_Number, oil_well_ID, liquid_Name, liquid_density, liquid_Return_Depth, liquid_Volume, liquid_Additional, liquid_Additional_Capacity, liquid_Dosage, liquid_Basic_Properties, liquid_Water_Loss, FiveBC_liquid_Thickening_Time, OneHBC_liquid_Thickening_Time, liquid_Service_Length, liquid_Formula from liquid
+    </sql>
+
+    <select id="selectShuiniList" parameterType="Shuini" resultMap="ShuiniResult">
+        <include refid="selectShuiniVo"/>
+        <where>  
+            <if test="liquidName != null  and liquidName != ''"> and liquid_Name like concat('%', #{liquidName}, '%')</if>
+            <if test="liquidDensity != null "> and liquid_density = #{liquidDensity}</if>
+            <if test="liquidReturnDepth != null "> and liquid_Return_Depth = #{liquidReturnDepth}</if>
+            <if test="liquidVolume != null "> and liquid_Volume = #{liquidVolume}</if>
+            <if test="liquidAdditional != null "> and liquid_Additional = #{liquidAdditional}</if>
+            <if test="liquidAdditionalCapacity != null "> and liquid_Additional_Capacity = #{liquidAdditionalCapacity}</if>
+            <if test="liquidDosage != null "> and liquid_Dosage = #{liquidDosage}</if>
+        </where>
+    </select>
+    
+    <select id="selectShuiniById" parameterType="Long" resultMap="ShuiniResult">
+        <include refid="selectShuiniVo"/>
+        where liquid_Number = #{liquidNumber}
+    </select>
+        
+    <insert id="insertShuini" parameterType="Shuini" useGeneratedKeys="true" keyProperty="liquidNumber">
+        insert into liquid
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="rheologicalParameterNumber != null">rheological_Parameter_Number,</if>
+            <if test="oilWellId != null">oil_well_ID,</if>
+            <if test="liquidName != null">liquid_Name,</if>
+            <if test="liquidDensity != null">liquid_density,</if>
+            <if test="liquidReturnDepth != null">liquid_Return_Depth,</if>
+            <if test="liquidVolume != null">liquid_Volume,</if>
+            <if test="liquidAdditional != null">liquid_Additional,</if>
+            <if test="liquidAdditionalCapacity != null">liquid_Additional_Capacity,</if>
+            <if test="liquidDosage != null">liquid_Dosage,</if>
+            <if test="liquidBasicProperties != null">liquid_Basic_Properties,</if>
+            <if test="liquidWaterLoss != null">liquid_Water_Loss,</if>
+            <if test="fivebcLiquidThickeningTime != null">FiveBC_liquid_Thickening_Time,</if>
+            <if test="onehbcLiquidThickeningTime != null">OneHBC_liquid_Thickening_Time,</if>
+            <if test="liquidServiceLength != null">liquid_Service_Length,</if>
+            <if test="liquidFormula != null">liquid_Formula,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="rheologicalParameterNumber != null">#{rheologicalParameterNumber},</if>
+            <if test="oilWellId != null">#{oilWellId},</if>
+            <if test="liquidName != null">#{liquidName},</if>
+            <if test="liquidDensity != null">#{liquidDensity},</if>
+            <if test="liquidReturnDepth != null">#{liquidReturnDepth},</if>
+            <if test="liquidVolume != null">#{liquidVolume},</if>
+            <if test="liquidAdditional != null">#{liquidAdditional},</if>
+            <if test="liquidAdditionalCapacity != null">#{liquidAdditionalCapacity},</if>
+            <if test="liquidDosage != null">#{liquidDosage},</if>
+            <if test="liquidBasicProperties != null">#{liquidBasicProperties},</if>
+            <if test="liquidWaterLoss != null">#{liquidWaterLoss},</if>
+            <if test="fivebcLiquidThickeningTime != null">#{fivebcLiquidThickeningTime},</if>
+            <if test="onehbcLiquidThickeningTime != null">#{onehbcLiquidThickeningTime},</if>
+            <if test="liquidServiceLength != null">#{liquidServiceLength},</if>
+            <if test="liquidFormula != null">#{liquidFormula},</if>
+         </trim>
+    </insert>
+
+    <update id="updateShuini" parameterType="Shuini">
+        update liquid
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="rheologicalParameterNumber != null">rheological_Parameter_Number = #{rheologicalParameterNumber},</if>
+            <if test="oilWellId != null">oil_well_ID = #{oilWellId},</if>
+            <if test="liquidName != null">liquid_Name = #{liquidName},</if>
+            <if test="liquidDensity != null">liquid_density = #{liquidDensity},</if>
+            <if test="liquidReturnDepth != null">liquid_Return_Depth = #{liquidReturnDepth},</if>
+            <if test="liquidVolume != null">liquid_Volume = #{liquidVolume},</if>
+            <if test="liquidAdditional != null">liquid_Additional = #{liquidAdditional},</if>
+            <if test="liquidAdditionalCapacity != null">liquid_Additional_Capacity = #{liquidAdditionalCapacity},</if>
+            <if test="liquidDosage != null">liquid_Dosage = #{liquidDosage},</if>
+            <if test="liquidBasicProperties != null">liquid_Basic_Properties = #{liquidBasicProperties},</if>
+            <if test="liquidWaterLoss != null">liquid_Water_Loss = #{liquidWaterLoss},</if>
+            <if test="fivebcLiquidThickeningTime != null">FiveBC_liquid_Thickening_Time = #{fivebcLiquidThickeningTime},</if>
+            <if test="onehbcLiquidThickeningTime != null">OneHBC_liquid_Thickening_Time = #{onehbcLiquidThickeningTime},</if>
+            <if test="liquidServiceLength != null">liquid_Service_Length = #{liquidServiceLength},</if>
+            <if test="liquidFormula != null">liquid_Formula = #{liquidFormula},</if>
+        </trim>
+        where liquid_Number = #{liquidNumber}
+    </update>
+
+    <delete id="deleteShuiniById" parameterType="Long">
+        delete from liquid where liquid_Number = #{liquidNumber}
+    </delete>
+
+    <delete id="deleteShuiniByIds" parameterType="String">
+        delete from liquid where liquid_Number in 
+        <foreach item="liquidNumber" collection="array" open="(" separator="," close=")">
+            #{liquidNumber}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-system/src/main/resources/templates/system/Shuini/Shuini.html

@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('水泥浆列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>液体名称：</label>
+                                <input type="text" name="liquidName"/>
+                            </li>
+                            <li>
+                                <label>液体密度：</label>
+                                <input type="text" name="liquidDensity"/>
+                            </li>
+                            <li>
+                                <label>液体返深：</label>
+                                <input type="text" name="liquidReturnDepth"/>
+                            </li>
+                            <li>
+                                <label>液体容积：</label>
+                                <input type="text" name="liquidVolume"/>
+                            </li>
+                            <li>
+                                <label>液体附加：</label>
+                                <input type="text" name="liquidAdditional"/>
+                            </li>
+                            <li>
+                                <label>液体附加量：</label>
+                                <input type="text" name="liquidAdditionalCapacity"/>
+                            </li>
+                            <li>
+                                <label>液体用量：</label>
+                                <input type="text" name="liquidDosage"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:Shuini:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:Shuini:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:Shuini:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:Shuini:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:Shuini:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:Shuini:remove')}]];
+        var prefix = ctx + "system/Shuini";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "水泥浆",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'liquidNumber',
+                    title: '液体编号',
+                    visible: false
+                },
+                {
+                    field: 'liquidName',
+                    title: '液体名称'
+                },
+                {
+                    field: 'liquidDensity',
+                    title: '液体密度'
+                },
+                {
+                    field: 'liquidReturnDepth',
+                    title: '液体返深'
+                },
+                {
+                    field: 'liquidVolume',
+                    title: '液体容积'
+                },
+                {
+                    field: 'liquidAdditional',
+                    title: '液体附加'
+                },
+                {
+                    field: 'liquidAdditionalCapacity',
+                    title: '液体附加量'
+                },
+                {
+                    field: 'liquidDosage',
+                    title: '液体用量'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.liquidNumber + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.liquidNumber + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/Shuini/add.html

@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增水泥浆')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-Shuini-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流变参数编号：</label>
+                <div class="col-sm-8">
+                    <input name="rheologicalParameterNumber" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">井编号：</label>
+                <div class="col-sm-8">
+                    <input name="oilWellId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体名称：</label>
+                <div class="col-sm-8">
+                    <input name="liquidName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体密度：</label>
+                <div class="col-sm-8">
+                    <input name="liquidDensity" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体返深：</label>
+                <div class="col-sm-8">
+                    <input name="liquidReturnDepth" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体容积：</label>
+                <div class="col-sm-8">
+                    <input name="liquidVolume" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体附加：</label>
+                <div class="col-sm-8">
+                    <input name="liquidAdditional" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体附加量：</label>
+                <div class="col-sm-8">
+                    <input name="liquidAdditionalCapacity" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体用量：</label>
+                <div class="col-sm-8">
+                    <input name="liquidDosage" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/Shuini"
+        $("#form-Shuini-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-Shuini-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/Shuini/edit.html

@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改水泥浆')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-Shuini-edit" th:object="${shuini}">
+            <input name="liquidNumber" th:field="*{liquidNumber}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流变参数编号：</label>
+                <div class="col-sm-8">
+                    <input name="rheologicalParameterNumber" th:field="*{rheologicalParameterNumber}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">井编号：</label>
+                <div class="col-sm-8">
+                    <input name="oilWellId" th:field="*{oilWellId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体名称：</label>
+                <div class="col-sm-8">
+                    <input name="liquidName" th:field="*{liquidName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体密度：</label>
+                <div class="col-sm-8">
+                    <input name="liquidDensity" th:field="*{liquidDensity}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体返深：</label>
+                <div class="col-sm-8">
+                    <input name="liquidReturnDepth" th:field="*{liquidReturnDepth}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体容积：</label>
+                <div class="col-sm-8">
+                    <input name="liquidVolume" th:field="*{liquidVolume}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体附加：</label>
+                <div class="col-sm-8">
+                    <input name="liquidAdditional" th:field="*{liquidAdditional}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体附加量：</label>
+                <div class="col-sm-8">
+                    <input name="liquidAdditionalCapacity" th:field="*{liquidAdditionalCapacity}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">液体用量：</label>
+                <div class="col-sm-8">
+                    <input name="liquidDosage" th:field="*{liquidDosage}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/Shuini";
+        $("#form-Shuini-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-Shuini-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/ceiteria/add.html

@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增设计标准')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-ceiteria-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">井编号：</label>
+                <div class="col-sm-8">
+                    <input name="oilWellId" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设计标准名称：</label>
+                <div class="col-sm-8">
+                    <select name="designStandardName" class="form-control m-b" th:with="type=${@dict.getType('ceiteria')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">水泥浆1紊流临界排量</option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">水泥浆2紊流临界排量</option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">水泥浆3紊流临界排量</option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">环空返速1m/s排量</option>-->
+
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设计标准的指定排量：</label>
+                <div class="col-sm-8">
+                    <input name="designDisplacementofdesignstandard" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/ceiteria"
+        $("#form-ceiteria-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-ceiteria-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/ceiteria/ceiteria.html

@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('设计标准列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>井编号：</label>
+                                <input type="text" name="oilWellId"/>
+                            </li>
+                            <li>
+                                <label>设计标准名称：</label>
+                                <select name="designStandardName" th:with="type=${@dict.getType('ceiteria')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+<!--                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">水泥浆1紊流临界排量</option>-->
+<!--                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">水泥浆2紊流临界排量</option>-->
+<!--                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">水泥浆3紊流临界排量</option>-->
+<!--                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">环空返速1m/s排量</option>-->
+
+                                </select>
+                            </li>
+                            <li>
+                                <label>设计标准的指定排量：</label>
+                                <input type="text" name="designDisplacementofdesignstandard"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:ceiteria:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:ceiteria:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:ceiteria:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:ceiteria:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:ceiteria:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:ceiteria:remove')}]];
+        var designStandardNameDatas = [[${@dict.getType('ceiteria')}]];
+        var prefix = ctx + "system/ceiteria";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "设计标准",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'designStandardNumber',
+                    title: '设计标准编号',
+                    visible: false
+                },
+                {
+                    field: 'designStandardName',
+                    title: '设计标准名称',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(designStandardNameDatas, value);
+                    }
+                },
+                {
+                    field: 'designDisplacementofdesignstandard',
+                    title: '设计标准的指定排量'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.designStandardNumber + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.designStandardNumber + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/ceiteria/edit.html

@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改设计标准')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-ceiteria-edit" th:object="${dseignCeiteria}">
+            <input name="designStandardNumber" th:field="*{designStandardNumber}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">井编号：</label>
+                <div class="col-sm-8">
+                    <input name="oilWellId" th:field="*{oilWellId}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设计标准名称：</label>
+                <div class="col-sm-8">
+                    <select name="designStandardName" class="form-control m-b" th:with="type=${@dict.getType('ceiteria')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{designStandardName}"></option>
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{designStandardName}">水泥浆1紊流临界排量</option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{designStandardName}">水泥浆2紊流临界排量</option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{designStandardName}">水泥浆3紊流临界排量</option>-->
+<!--                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{designStandardName}">环空返速1m/s排量</option>-->
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设计标准的指定排量：</label>
+                <div class="col-sm-8">
+                    <input name="designDisplacementofdesignstandard" th:field="*{designDisplacementofdesignstandard}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/ceiteria";
+        $("#form-ceiteria-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-ceiteria-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/design/add.html

@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增流变学设计数据')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-design-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">井编号：</label>
+                <div class="col-sm-8">
+                    <input name="oilWellId" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">顶替排量设计：</label>
+                <div class="col-sm-8">
+                    <input name="displacementDisplacementDesign" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关注点：</label>
+                <div class="col-sm-8">
+                    <input name="focusOn3292Pressure" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关注点：</label>
+                <div class="col-sm-8">
+                    <input name="focusOn3342Pressure" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">全井静液压差：</label>
+                <div class="col-sm-8">
+                    <input name="overallWellStatichydraulicdifference" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">环空循环压耗：</label>
+                <div class="col-sm-8">
+                    <input name="annularCirculationpressureloss" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">管内循环压耗：</label>
+                <div class="col-sm-8">
+                    <input name="circulatingPressurelossinthetube" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">全井循环压耗：</label>
+                <div class="col-sm-8">
+                    <input name="circulatingPressurelossthroughoutthewell" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">最终顶替泵压：</label>
+                <div class="col-sm-8">
+                    <input name="finalDisplacementpumppressure" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/design"
+        $("#form-design-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-design-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/design/design.html

@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('流变学设计数据列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>顶替排量设计：</label>
+                                <input type="text" name="displacementDisplacementDesign"/>
+                            </li>
+                            <li>
+                                <label>关注点：</label>
+                                <input type="text" name="focusOn3292Pressure"/>
+                            </li>
+                            <li>
+                                <label>关注点：</label>
+                                <input type="text" name="focusOn3342Pressure"/>
+                            </li>
+                            <li>
+                                <label>全井静液压差：</label>
+                                <input type="text" name="overallWellStatichydraulicdifference"/>
+                            </li>
+                            <li>
+                                <label>环空循环压耗：</label>
+                                <input type="text" name="annularCirculationpressureloss"/>
+                            </li>
+                            <li>
+                                <label>管内循环压耗：</label>
+                                <input type="text" name="circulatingPressurelossinthetube"/>
+                            </li>
+                            <li>
+                                <label>全井循环压耗：</label>
+                                <input type="text" name="circulatingPressurelossthroughoutthewell"/>
+                            </li>
+                            <li>
+                                <label>最终顶替泵压：</label>
+                                <input type="text" name="finalDisplacementpumppressure"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:design:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:design:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:design:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:design:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:design:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:design:remove')}]];
+        var prefix = ctx + "system/design";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "流变学设计数据",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'rheologicalDesignNumber',
+                    title: '流变学设计编号',
+                    visible: false
+                },
+                {
+                    field: 'displacementDisplacementDesign',
+                    title: '顶替排量设计'
+                },
+                {
+                    field: 'focusOn3292Pressure',
+                    title: '关注点'
+                },
+                {
+                    field: 'focusOn3342Pressure',
+                    title: '关注点'
+                },
+                {
+                    field: 'overallWellStatichydraulicdifference',
+                    title: '全井静液压差'
+                },
+                {
+                    field: 'annularCirculationpressureloss',
+                    title: '环空循环压耗'
+                },
+                {
+                    field: 'circulatingPressurelossinthetube',
+                    title: '管内循环压耗'
+                },
+                {
+                    field: 'circulatingPressurelossthroughoutthewell',
+                    title: '全井循环压耗'
+                },
+                {
+                    field: 'finalDisplacementpumppressure',
+                    title: '最终顶替泵压'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.rheologicalDesignNumber + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.rheologicalDesignNumber + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/design/edit.html

@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改流变学设计数据')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-design-edit" th:object="${rheologicalDesign}">
+            <input name="rheologicalDesignNumber" th:field="*{rheologicalDesignNumber}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">井编号：</label>
+                <div class="col-sm-8">
+                    <input name="oilWellId" th:field="*{oilWellId}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">顶替排量设计：</label>
+                <div class="col-sm-8">
+                    <input name="displacementDisplacementDesign" th:field="*{displacementDisplacementDesign}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关注点：</label>
+                <div class="col-sm-8">
+                    <input name="focusOn3292Pressure" th:field="*{focusOn3292Pressure}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">关注点：</label>
+                <div class="col-sm-8">
+                    <input name="focusOn3342Pressure" th:field="*{focusOn3342Pressure}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">全井静液压差：</label>
+                <div class="col-sm-8">
+                    <input name="overallWellStatichydraulicdifference" th:field="*{overallWellStatichydraulicdifference}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">环空循环压耗：</label>
+                <div class="col-sm-8">
+                    <input name="annularCirculationpressureloss" th:field="*{annularCirculationpressureloss}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">管内循环压耗：</label>
+                <div class="col-sm-8">
+                    <input name="circulatingPressurelossinthetube" th:field="*{circulatingPressurelossinthetube}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">全井循环压耗：</label>
+                <div class="col-sm-8">
+                    <input name="circulatingPressurelossthroughoutthewell" th:field="*{circulatingPressurelossthroughoutthewell}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">最终顶替泵压：</label>
+                <div class="col-sm-8">
+                    <input name="finalDisplacementpumppressure" th:field="*{finalDisplacementpumppressure}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/design";
+        $("#form-design-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-design-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/liquid/add.html

@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增前置液数据')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-liquid-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">井编号：</label>
+                <div class="col-sm-8">
+                    <input name="oilWellId" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">前置液名称：</label>
+                <div class="col-sm-8">
+                    <input name="liquidName" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">前置液密度：</label>
+                <div class="col-sm-8">
+                    <input name="liquidDensity" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">前置液用量：</label>
+                <div class="col-sm-8">
+                    <input name="liquidDosage" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">前置液长度：</label>
+                <div class="col-sm-8">
+                    <input name="liquidServiceLength" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">前置液配方：</label>
+                <div class="col-sm-8">
+                    <input name="liquidFormula" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/liquid"
+        $("#form-liquid-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-liquid-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/liquid/edit.html

@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改液体数据')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-liquid-edit" th:object="${liquid}">
+            <input name="liquidNumber" th:field="*{liquidNumber}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">井编号：</label>
+                <div class="col-sm-8">
+                    <input name="oilWellId" th:field="*{oilWellId}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">前置液名称：</label>
+                <div class="col-sm-8">
+                    <input name="liquidName" th:field="*{liquidName}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">前置液密度：</label>
+                <div class="col-sm-8">
+                    <input name="liquidDensity" th:field="*{liquidDensity}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">前置液用量：</label>
+                <div class="col-sm-8">
+                    <input name="liquidDosage" th:field="*{liquidDosage}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">前置液使用长度：</label>
+                <div class="col-sm-8">
+                    <input name="liquidServiceLength" th:field="*{liquidServiceLength}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">前置液配方：</label>
+                <div class="col-sm-8">
+                    <input name="liquidFormula" th:field="*{liquidFormula}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/liquid";
+        $("#form-liquid-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-liquid-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/liquid/liquid.html

@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('前置液数据列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+         <div class="box">
+             <div class="box-1">
+                 <div class="row">
+                     <div class="col-sm-12 search-collapse">
+                         <form id="formId">
+                             <div class="select-list">
+                                 <ul>
+                                     <li>
+                                         <label>前置液编号：</label>
+                                         <input type="text" name="liquidNumber"/>
+                                     </li>
+                                     <li>
+                                         <label>井编号：</label>
+                                         <input type="text" name="oilWellId"/>
+                                     </li>
+                                     <li>
+                                         <label>前置液名称：</label>
+                                         <input type="text" name="liquidName"/>
+                                     </li>
+                                     <li>
+                                         <label>前置液密度：</label>
+                                         <input type="text" name="liquidDensity"/>
+                                     </li>
+                                     <li>
+                                         <label>前置液用量：</label>
+                                         <input type="text" name="liquidDosage"/>
+                                     </li>
+                                     <li>
+                                         <label>前置液使用长度：</label>
+                                         <input type="text" name="liquidServiceLength"/>
+                                     </li>
+                                     <li>
+                                         <label>前置液配方：</label>
+                                         <input type="text" name="liquidFormula"/>
+                                     </li>
+                                     <li>
+                                         <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                         <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                     </li>
+                                 </ul>
+                             </div>
+                         </form>
+                     </div>
+
+                     <div class="btn-group-sm" id="toolbar" role="group">
+                         <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:liquid:add">
+                             <i class="fa fa-plus"></i> 添加
+                         </a>
+                         <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:liquid:edit">
+                             <i class="fa fa-edit"></i> 修改
+                         </a>
+                         <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:liquid:remove">
+                             <i class="fa fa-remove"></i> 删除
+                         </a>
+                         <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:liquid:export">
+                             <i class="fa fa-download"></i> 导出
+                         </a>
+                     </div>
+                     <div class="col-sm-12 select-table table-striped">
+                         <table id="bootstrap-table"></table>
+                     </div>
+
+                 </div>
+             </div>
+
+
+         </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:liquid:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:liquid:remove')}]];
+        var prefix = ctx + "system/liquid";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "液体数据",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'liquidNumber',
+                    title: '前置液编号',
+                    visible: false
+                },
+                {
+                    field: 'liquidName',
+                    title: '前置液名称'
+                },
+                {
+                    field: 'liquidDensity',
+                    title: '前置液密度'
+                },
+                {
+                    field: 'liquidDosage',
+                    title: '前置液用量'
+                },
+                {
+                    field: 'liquidServiceLength',
+                    title: '前置液使用长度'
+                },
+                {
+                    field: 'liquidFormula',
+                    title: '前置液配方'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.liquidNumber + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.liquidNumber + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/parameters/add.html

@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增流变参数')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-parameters-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">流体名称：</label>
+                <div class="col-sm-8">
+                    <input name="rheologicalName" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">流体密度：</label>
+                <div class="col-sm-8">
+                    <input name="rheologicalDensity" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">流变模式：</label>
+                <div class="col-sm-8">
+                    <input name="rheologicalModel" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">塑性粘度：</label>
+                <div class="col-sm-8">
+                    <input name="plasticViscosity" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">动切力：</label>
+                <div class="col-sm-8">
+                    <input name="dynamicShear" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">稠度系数：</label>
+                <div class="col-sm-8">
+                    <input name="consistencyCoefficient" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流性指数：</label>
+                <div class="col-sm-8">
+                    <input name="fluidityIndex" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">牛顿粘度：</label>
+                <div class="col-sm-8">
+                    <input name="newtonianViscosity" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/parameters"
+        $("#form-parameters-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-parameters-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/parameters/edit.html

@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改流变参数')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-parameters-edit" th:object="${eheologicalParameters}">
+            <input name="rheologicalParameternumber" th:field="*{rheologicalParameternumber}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">流体名称：</label>
+                <div class="col-sm-8">
+                    <input name="rheologicalName" th:field="*{rheologicalName}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">流体密度：</label>
+                <div class="col-sm-8">
+                    <input name="rheologicalDensity" th:field="*{rheologicalDensity}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">流变模式：</label>
+                <div class="col-sm-8">
+                    <input name="rheologicalModel" th:field="*{rheologicalModel}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">塑性粘度：</label>
+                <div class="col-sm-8">
+                    <input name="plasticViscosity" th:field="*{plasticViscosity}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">动切力：</label>
+                <div class="col-sm-8">
+                    <input name="dynamicShear" th:field="*{dynamicShear}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">稠度系数：</label>
+                <div class="col-sm-8">
+                    <input name="consistencyCoefficient" th:field="*{consistencyCoefficient}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">流性指数：</label>
+                <div class="col-sm-8">
+                    <input name="fluidityIndex" th:field="*{fluidityIndex}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">牛顿粘度：</label>
+                <div class="col-sm-8">
+                    <input name="newtonianViscosity" th:field="*{newtonianViscosity}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/parameters";
+        $("#form-parameters-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-parameters-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/parameters/parameters.html

@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('流变参数列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>流体名称：</label>
+                                <input type="text" name="rheologicalName"/>
+                            </li>
+                            <li>
+                                <label>流体密度：</label>
+                                <input type="text" name="rheologicalDensity"/>
+                            </li>
+                            <li>
+                                <label>流变模式：</label>
+                                <input type="text" name="rheologicalModel"/>
+                            </li>
+                            <li>
+                                <label>塑性粘度：</label>
+                                <input type="text" name="plasticViscosity"/>
+                            </li>
+                            <li>
+                                <label>动切力：</label>
+                                <input type="text" name="dynamicShear"/>
+                            </li>
+                            <li>
+                                <label>稠度系数：</label>
+                                <input type="text" name="consistencyCoefficient"/>
+                            </li>
+                            <li>
+                                <label>流性指数：</label>
+                                <input type="text" name="fluidityIndex"/>
+                            </li>
+                            <li>
+                                <label>牛顿粘度：</label>
+                                <input type="text" name="newtonianViscosity"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:parameters:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:parameters:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:parameters:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:parameters:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:parameters:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:parameters:remove')}]];
+        var prefix = ctx + "system/parameters";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "流变参数",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'rheologicalParameternumber',
+                    title: '流变参数编号',
+                    visible: false
+                },
+                {
+                    field: 'rheologicalName',
+                    title: '流体名称'
+                },
+                {
+                    field: 'rheologicalDensity',
+                    title: '流体密度'
+                },
+                {
+                    field: 'rheologicalModel',
+                    title: '流变模式'
+                },
+                {
+                    field: 'plasticViscosity',
+                    title: '塑性粘度'
+                },
+                {
+                    field: 'dynamicShear',
+                    title: '动切力'
+                },
+                {
+                    field: 'consistencyCoefficient',
+                    title: '稠度系数'
+                },
+                {
+                    field: 'fluidityIndex',
+                    title: '流性指数'
+                },
+                {
+                    field: 'newtonianViscosity',
+                    title: '牛顿粘度'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.rheologicalParameternumber + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.rheologicalParameternumber + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

sql/ShuiniMenu.sql

@@ -0,0 +1,22 @@
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('水泥浆', '2000', '1', '/system/Shuini', 'C', '0', 'system:Shuini:view', '#', 'admin', sysdate(), '', null, '水泥浆菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('水泥浆查询', @parentId, '1',  '#',  'F', '0', 'system:Shuini:list',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('水泥浆新增', @parentId, '2',  '#',  'F', '0', 'system:Shuini:add',          '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('水泥浆修改', @parentId, '3',  '#',  'F', '0', 'system:Shuini:edit',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('水泥浆删除', @parentId, '4',  '#',  'F', '0', 'system:Shuini:remove',       '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('水泥浆导出', @parentId, '5',  '#',  'F', '0', 'system:Shuini:export',       '#', 'admin', sysdate(), '', null, '');

sql/liquidMenu.sql

@@ -0,0 +1,22 @@
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('液体数据', '0', '1', '/system/liquid', 'C', '0', 'system:liquid:view', '#', 'admin', sysdate(), '', null, '液体数据菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('液体数据查询', @parentId, '1',  '#',  'F', '0', 'system:liquid:list',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('液体数据新增', @parentId, '2',  '#',  'F', '0', 'system:liquid:add',          '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('液体数据修改', @parentId, '3',  '#',  'F', '0', 'system:liquid:edit',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('液体数据删除', @parentId, '4',  '#',  'F', '0', 'system:liquid:remove',       '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('液体数据导出', @parentId, '5',  '#',  'F', '0', 'system:liquid:export',       '#', 'admin', sysdate(), '', null, '');

sql/quartz.sql

@@ -1,170 +0,0 @@
--- ----------------------------
--- 1、存储每一个已配置的 jobDetail 的详细信息
--- ----------------------------
-drop table if exists QRTZ_JOB_DETAILS;
-create table QRTZ_JOB_DETAILS (
-    sched_name           varchar(120)    not null,
-    job_name             varchar(200)    not null,
-    job_group            varchar(200)    not null,
-    description          varchar(250)    null,
-    job_class_name       varchar(250)    not null,
-    is_durable           varchar(1)      not null,
-    is_nonconcurrent     varchar(1)      not null,
-    is_update_data       varchar(1)      not null,
-    requests_recovery    varchar(1)      not null,
-    job_data             blob            null,
-    primary key (sched_name,job_name,job_group)
-) engine=innodb;
-
--- ----------------------------
--- 2、 存储已配置的 Trigger 的信息
--- ----------------------------
-drop table if exists QRTZ_TRIGGERS;
-create table QRTZ_TRIGGERS (
-    sched_name           varchar(120)    not null,
-    trigger_name         varchar(200)    not null,
-    trigger_group        varchar(200)    not null,
-    job_name             varchar(200)    not null,
-    job_group            varchar(200)    not null,
-    description          varchar(250)    null,
-    next_fire_time       bigint(13)      null,
-    prev_fire_time       bigint(13)      null,
-    priority             integer         null,
-    trigger_state        varchar(16)     not null,
-    trigger_type         varchar(8)      not null,
-    start_time           bigint(13)      not null,
-    end_time             bigint(13)      null,
-    calendar_name        varchar(200)    null,
-    misfire_instr        smallint(2)     null,
-    job_data             blob            null,
-    primary key (sched_name,trigger_name,trigger_group),
-    foreign key (sched_name,job_name,job_group) references QRTZ_JOB_DETAILS(sched_name,job_name,job_group)
-) engine=innodb;
-
--- ----------------------------
--- 3、 存储简单的 Trigger，包括重复次数，间隔，以及已触发的次数
--- ----------------------------
-drop table if exists QRTZ_SIMPLE_TRIGGERS;
-create table QRTZ_SIMPLE_TRIGGERS (
-    sched_name           varchar(120)    not null,
-    trigger_name         varchar(200)    not null,
-    trigger_group        varchar(200)    not null,
-    repeat_count         bigint(7)       not null,
-    repeat_interval      bigint(12)      not null,
-    times_triggered      bigint(10)      not null,
-    primary key (sched_name,trigger_name,trigger_group),
-    foreign key (sched_name,trigger_name,trigger_group) references QRTZ_TRIGGERS(sched_name,trigger_name,trigger_group)
-) engine=innodb;
-
--- ----------------------------
--- 4、 存储 Cron Trigger，包括 Cron 表达式和时区信息
--- ---------------------------- 
-drop table if exists QRTZ_CRON_TRIGGERS;
-create table QRTZ_CRON_TRIGGERS (
-    sched_name           varchar(120)    not null,
-    trigger_name         varchar(200)    not null,
-    trigger_group        varchar(200)    not null,
-    cron_expression      varchar(200)    not null,
-    time_zone_id         varchar(80),
-    primary key (sched_name,trigger_name,trigger_group),
-    foreign key (sched_name,trigger_name,trigger_group) references QRTZ_TRIGGERS(sched_name,trigger_name,trigger_group)
-) engine=innodb;
-
--- ----------------------------
--- 5、 Trigger 作为 Blob 类型存储(用于 Quartz 用户用 JDBC 创建他们自己定制的 Trigger 类型，JobStore 并不知道如何存储实例的时候)
--- ---------------------------- 
-drop table if exists QRTZ_BLOB_TRIGGERS;
-create table QRTZ_BLOB_TRIGGERS (
-    sched_name           varchar(120)    not null,
-    trigger_name         varchar(200)    not null,
-    trigger_group        varchar(200)    not null,
-    blob_data            blob            null,
-    primary key (sched_name,trigger_name,trigger_group),
-    foreign key (sched_name,trigger_name,trigger_group) references QRTZ_TRIGGERS(sched_name,trigger_name,trigger_group)
-) engine=innodb;
-
--- ----------------------------
--- 6、 以 Blob 类型存储存放日历信息， quartz可配置一个日历来指定一个时间范围
--- ---------------------------- 
-drop table if exists QRTZ_CALENDARS;
-create table QRTZ_CALENDARS (
-    sched_name           varchar(120)    not null,
-    calendar_name        varchar(200)    not null,
-    calendar             blob            not null,
-    primary key (sched_name,calendar_name)
-) engine=innodb;
-
--- ----------------------------
--- 7、 存储已暂停的 Trigger 组的信息
--- ---------------------------- 
-drop table if exists QRTZ_PAUSED_TRIGGER_GRPS;
-create table QRTZ_PAUSED_TRIGGER_GRPS (
-    sched_name           varchar(120)    not null,
-    trigger_group        varchar(200)    not null,
-    primary key (sched_name,trigger_group)
-) engine=innodb;
-
--- ----------------------------
--- 8、 存储与已触发的 Trigger 相关的状态信息，以及相联 Job 的执行信息
--- ---------------------------- 
-drop table if exists QRTZ_FIRED_TRIGGERS;
-create table QRTZ_FIRED_TRIGGERS (
-    sched_name           varchar(120)    not null,
-    entry_id             varchar(95)     not null,
-    trigger_name         varchar(200)    not null,
-    trigger_group        varchar(200)    not null,
-    instance_name        varchar(200)    not null,
-    fired_time           bigint(13)      not null,
-    sched_time           bigint(13)      not null,
-    priority             integer         not null,
-    state                varchar(16)     not null,
-    job_name             varchar(200)    null,
-    job_group            varchar(200)    null,
-    is_nonconcurrent     varchar(1)      null,
-    requests_recovery    varchar(1)      null,
-    primary key (sched_name,entry_id)
-) engine=innodb;
-
--- ----------------------------
--- 9、 存储少量的有关 Scheduler 的状态信息，假如是用于集群中，可以看到其他的 Scheduler 实例
--- ---------------------------- 
-drop table if exists QRTZ_SCHEDULER_STATE; 
-create table QRTZ_SCHEDULER_STATE (
-    sched_name           varchar(120)    not null,
-    instance_name        varchar(200)    not null,
-    last_checkin_time    bigint(13)      not null,
-    checkin_interval     bigint(13)      not null,
-    primary key (sched_name,instance_name)
-) engine=innodb;
-
--- ----------------------------
--- 10、 存储程序的悲观锁的信息(假如使用了悲观锁)
--- ---------------------------- 
-drop table if exists QRTZ_LOCKS;
-create table QRTZ_LOCKS (
-    sched_name           varchar(120)    not null,
-    lock_name            varchar(40)     not null,
-    primary key (sched_name,lock_name)
-) engine=innodb;
-
-drop table if exists QRTZ_SIMPROP_TRIGGERS;
-create table QRTZ_SIMPROP_TRIGGERS (
-    sched_name           varchar(120)    not null,
-    trigger_name         varchar(200)    not null,
-    trigger_group        varchar(200)    not null,
-    str_prop_1           varchar(512)    null,
-    str_prop_2           varchar(512)    null,
-    str_prop_3           varchar(512)    null,
-    int_prop_1           int             null,
-    int_prop_2           int             null,
-    long_prop_1          bigint          null,
-    long_prop_2          bigint          null,
-    dec_prop_1           numeric(13,4)   null,
-    dec_prop_2           numeric(13,4)   null,
-    bool_prop_1          varchar(1)      null,
-    bool_prop_2          varchar(1)      null,
-    primary key (sched_name,trigger_name,trigger_group),
-    foreign key (sched_name,trigger_name,trigger_group) references QRTZ_TRIGGERS(sched_name,trigger_name,trigger_group)
-) engine=innodb;
-
-commit;

sql/ry_20210210.sql

@@ -1,712 +0,0 @@
--- ----------------------------
--- 1、部门表
--- ----------------------------
-drop table if exists sys_dept;
-create table sys_dept (
-  dept_id           bigint(20)      not null auto_increment    comment '部门id',
-  parent_id         bigint(20)      default 0                  comment '父部门id',
-  ancestors         varchar(50)     default ''                 comment '祖级列表',
-  dept_name         varchar(30)     default ''                 comment '部门名称',
-  order_num         int(4)          default 0                  comment '显示顺序',
-  leader            varchar(20)     default null               comment '负责人',
-  phone             varchar(11)     default null               comment '联系电话',
-  email             varchar(50)     default null               comment '邮箱',
-  status            char(1)         default '0'                comment '部门状态（0正常 1停用）',
-  del_flag          char(1)         default '0'                comment '删除标志（0代表存在 2代表删除）',
-  create_by         varchar(64)     default ''                 comment '创建者',
-  create_time 	    datetime                                   comment '创建时间',
-  update_by         varchar(64)     default ''                 comment '更新者',
-  update_time       datetime                                   comment '更新时间',
-  primary key (dept_id)
-) engine=innodb auto_increment=200 comment = '部门表';
-
--- ----------------------------
--- 初始化-部门表数据
--- ----------------------------
-insert into sys_dept values(100,  0,   '0',          '若依科技',   0, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
-insert into sys_dept values(101,  100, '0,100',      '深圳总公司', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
-insert into sys_dept values(102,  100, '0,100',      '长沙分公司', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
-insert into sys_dept values(103,  101, '0,100,101',  '研发部门',   1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
-insert into sys_dept values(104,  101, '0,100,101',  '市场部门',   2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
-insert into sys_dept values(105,  101, '0,100,101',  '测试部门',   3, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
-insert into sys_dept values(106,  101, '0,100,101',  '财务部门',   4, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
-insert into sys_dept values(107,  101, '0,100,101',  '运维部门',   5, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
-insert into sys_dept values(108,  102, '0,100,102',  '市场部门',   1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
-insert into sys_dept values(109,  102, '0,100,102',  '财务部门',   2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
-
-
--- ----------------------------
--- 2、用户信息表
--- ----------------------------
-drop table if exists sys_user;
-create table sys_user (
-  user_id           bigint(20)      not null auto_increment    comment '用户ID',
-  dept_id           bigint(20)      default null               comment '部门ID',
-  login_name        varchar(30)     not null                   comment '登录账号',
-  user_name         varchar(30)     default ''                 comment '用户昵称',
-  user_type         varchar(2)      default '00'               comment '用户类型（00系统用户 01注册用户）',
-  email             varchar(50)     default ''                 comment '用户邮箱',
-  phonenumber       varchar(11)     default ''                 comment '手机号码',
-  sex               char(1)         default '0'                comment '用户性别（0男 1女 2未知）',
-  avatar            varchar(100)    default ''                 comment '头像路径',
-  password          varchar(50)     default ''                 comment '密码',
-  salt              varchar(20)     default ''                 comment '盐加密',
-  status            char(1)         default '0'                comment '帐号状态（0正常 1停用）',
-  del_flag          char(1)         default '0'                comment '删除标志（0代表存在 2代表删除）',
-  login_ip          varchar(128)    default ''                 comment '最后登录IP',
-  login_date        datetime                                   comment '最后登录时间',
-  pwd_update_date   datetime                                   comment '密码最后更新时间',
-  create_by         varchar(64)     default ''                 comment '创建者',
-  create_time       datetime                                   comment '创建时间',
-  update_by         varchar(64)     default ''                 comment '更新者',
-  update_time       datetime                                   comment '更新时间',
-  remark            varchar(500)    default null               comment '备注',
-  primary key (user_id)
-) engine=innodb auto_increment=100 comment = '用户信息表';
-
--- ----------------------------
--- 初始化-用户信息表数据
--- ----------------------------
-insert into sys_user values(1,  103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '29c67a30398638269fe600f73a054934', '111111', '0', '0', '127.0.0.1', sysdate(), sysdate(), 'admin', sysdate(), '', null, '管理员');
-insert into sys_user values(2,  105, 'ry',    '若依', '00', 'ry@qq.com',  '15666666666', '1', '', '8e6d98b90472783cc73c17047ddccf36', '222222', '0', '0', '127.0.0.1', sysdate(), sysdate(), 'admin', sysdate(), '', null, '测试员');
-
-
--- ----------------------------
--- 3、岗位信息表
--- ----------------------------
-drop table if exists sys_post;
-create table sys_post
-(
-  post_id       bigint(20)      not null auto_increment    comment '岗位ID',
-  post_code     varchar(64)     not null                   comment '岗位编码',
-  post_name     varchar(50)     not null                   comment '岗位名称',
-  post_sort     int(4)          not null                   comment '显示顺序',
-  status        char(1)         not null                   comment '状态（0正常 1停用）',
-  create_by     varchar(64)     default ''                 comment '创建者',
-  create_time   datetime                                   comment '创建时间',
-  update_by     varchar(64)     default ''			       comment '更新者',
-  update_time   datetime                                   comment '更新时间',
-  remark        varchar(500)    default null               comment '备注',
-  primary key (post_id)
-) engine=innodb comment = '岗位信息表';
-
--- ----------------------------
--- 初始化-岗位信息表数据
--- ----------------------------
-insert into sys_post values(1, 'ceo',  '董事长',    1, '0', 'admin', sysdate(), '', null, '');
-insert into sys_post values(2, 'se',   '项目经理',  2, '0', 'admin', sysdate(), '', null, '');
-insert into sys_post values(3, 'hr',   '人力资源',  3, '0', 'admin', sysdate(), '', null, '');
-insert into sys_post values(4, 'user', '普通员工',  4, '0', 'admin', sysdate(), '', null, '');
-
-
--- ----------------------------
--- 4、角色信息表
--- ----------------------------
-drop table if exists sys_role;
-create table sys_role (
-  role_id           bigint(20)      not null auto_increment    comment '角色ID',
-  role_name         varchar(30)     not null                   comment '角色名称',
-  role_key          varchar(100)    not null                   comment '角色权限字符串',
-  role_sort         int(4)          not null                   comment '显示顺序',
-  data_scope        char(1)         default '1'                comment '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）',
-  status            char(1)         not null                   comment '角色状态（0正常 1停用）',
-  del_flag          char(1)         default '0'                comment '删除标志（0代表存在 2代表删除）',
-  create_by         varchar(64)     default ''                 comment '创建者',
-  create_time       datetime                                   comment '创建时间',
-  update_by         varchar(64)     default ''                 comment '更新者',
-  update_time       datetime                                   comment '更新时间',
-  remark            varchar(500)    default null               comment '备注',
-  primary key (role_id)
-) engine=innodb auto_increment=100 comment = '角色信息表';
-
--- ----------------------------
--- 初始化-角色信息表数据
--- ----------------------------
-insert into sys_role values('1', '超级管理员', 'admin',  1, 1, '0', '0', 'admin', sysdate(), '', null, '超级管理员');
-insert into sys_role values('2', '普通角色',   'common', 2, 2, '0', '0', 'admin', sysdate(), '', null, '普通角色');
-
-
--- ----------------------------
--- 5、菜单权限表
--- ----------------------------
-drop table if exists sys_menu;
-create table sys_menu (
-  menu_id           bigint(20)      not null auto_increment    comment '菜单ID',
-  menu_name         varchar(50)     not null                   comment '菜单名称',
-  parent_id         bigint(20)      default 0                  comment '父菜单ID',
-  order_num         int(4)          default 0                  comment '显示顺序',
-  url               varchar(200)    default '#'                comment '请求地址',
-  target            varchar(20)     default ''                 comment '打开方式（menuItem页签 menuBlank新窗口）',
-  menu_type         char(1)         default ''                 comment '菜单类型（M目录 C菜单 F按钮）',
-  visible           char(1)         default 0                  comment '菜单状态（0显示 1隐藏）',
-  is_refresh        char(1)         default 1                  comment '是否刷新（0刷新 1不刷新）',
-  perms             varchar(100)    default null               comment '权限标识',
-  icon              varchar(100)    default '#'                comment '菜单图标',
-  create_by         varchar(64)     default ''                 comment '创建者',
-  create_time       datetime                                   comment '创建时间',
-  update_by         varchar(64)     default ''                 comment '更新者',
-  update_time       datetime                                   comment '更新时间',
-  remark            varchar(500)    default ''                 comment '备注',
-  primary key (menu_id)
-) engine=innodb auto_increment=2000 comment = '菜单权限表';
-
--- ----------------------------
--- 初始化-菜单信息表数据
--- ----------------------------
--- 一级菜单
-insert into sys_menu values('1', '系统管理', '0', '1', '#',                '',          'M', '0', '1', '', 'fa fa-gear',           'admin', sysdate(), '', null, '系统管理目录');
-insert into sys_menu values('2', '系统监控', '0', '2', '#',                '',          'M', '0', '1', '', 'fa fa-video-camera',   'admin', sysdate(), '', null, '系统监控目录');
-insert into sys_menu values('3', '系统工具', '0', '3', '#',                '',          'M', '0', '1', '', 'fa fa-bars',           'admin', sysdate(), '', null, '系统工具目录');
-insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', 'menuBlank', 'C', '0', '1', '', 'fa fa-location-arrow', 'admin', sysdate(), '', null, '若依官网地址');
--- 二级菜单
-insert into sys_menu values('100',  '用户管理', '1', '1', '/system/user',          '', 'C', '0', '1', 'system:user:view',         'fa fa-user-o',          'admin', sysdate(), '', null, '用户管理菜单');
-insert into sys_menu values('101',  '角色管理', '1', '2', '/system/role',          '', 'C', '0', '1', 'system:role:view',         'fa fa-user-secret',     'admin', sysdate(), '', null, '角色管理菜单');
-insert into sys_menu values('102',  '菜单管理', '1', '3', '/system/menu',          '', 'C', '0', '1', 'system:menu:view',         'fa fa-th-list',         'admin', sysdate(), '', null, '菜单管理菜单');
-insert into sys_menu values('103',  '部门管理', '1', '4', '/system/dept',          '', 'C', '0', '1', 'system:dept:view',         'fa fa-outdent',         'admin', sysdate(), '', null, '部门管理菜单');
-insert into sys_menu values('104',  '岗位管理', '1', '5', '/system/post',          '', 'C', '0', '1', 'system:post:view',         'fa fa-address-card-o',  'admin', sysdate(), '', null, '岗位管理菜单');
-insert into sys_menu values('105',  '字典管理', '1', '6', '/system/dict',          '', 'C', '0', '1', 'system:dict:view',         'fa fa-bookmark-o',      'admin', sysdate(), '', null, '字典管理菜单');
-insert into sys_menu values('106',  '参数设置', '1', '7', '/system/config',        '', 'C', '0', '1', 'system:config:view',       'fa fa-sun-o',           'admin', sysdate(), '', null, '参数设置菜单');
-insert into sys_menu values('107',  '通知公告', '1', '8', '/system/notice',        '', 'C', '0', '1', 'system:notice:view',       'fa fa-bullhorn',        'admin', sysdate(), '', null, '通知公告菜单');
-insert into sys_menu values('108',  '日志管理', '1', '9', '#',                     '', 'M', '0', '1', '',                         'fa fa-pencil-square-o', 'admin', sysdate(), '', null, '日志管理菜单');
-insert into sys_menu values('109',  '在线用户', '2', '1', '/monitor/online',       '', 'C', '0', '1', 'monitor:online:view',      'fa fa-user-circle',     'admin', sysdate(), '', null, '在线用户菜单');
-insert into sys_menu values('110',  '定时任务', '2', '2', '/monitor/job',          '', 'C', '0', '1', 'monitor:job:view',         'fa fa-tasks',           'admin', sysdate(), '', null, '定时任务菜单');
-insert into sys_menu values('111',  '数据监控', '2', '3', '/monitor/data',         '', 'C', '0', '1', 'monitor:data:view',        'fa fa-bug',             'admin', sysdate(), '', null, '数据监控菜单');
-insert into sys_menu values('112',  '服务监控', '2', '4', '/monitor/server',       '', 'C', '0', '1', 'monitor:server:view',      'fa fa-server',          'admin', sysdate(), '', null, '服务监控菜单');
-insert into sys_menu values('113',  '缓存监控', '2', '5', '/monitor/cache',        '', 'C', '0', '1', 'monitor:cache:view',       'fa fa-cube',            'admin', sysdate(), '', null, '缓存监控菜单');
-insert into sys_menu values('114',  '表单构建', '3', '1', '/tool/build',           '', 'C', '0', '1', 'tool:build:view',          'fa fa-wpforms',         'admin', sysdate(), '', null, '表单构建菜单');
-insert into sys_menu values('115',  '代码生成', '3', '2', '/tool/gen',             '', 'C', '0', '1', 'tool:gen:view',            'fa fa-code',            'admin', sysdate(), '', null, '代码生成菜单');
-insert into sys_menu values('116',  '系统接口', '3', '3', '/tool/swagger',         '', 'C', '0', '1', 'tool:swagger:view',        'fa fa-gg',              'admin', sysdate(), '', null, '系统接口菜单');
--- 三级菜单
-insert into sys_menu values('500',  '操作日志', '108', '1', '/monitor/operlog',    '', 'C', '0', '1', 'monitor:operlog:view',     'fa fa-address-book',    'admin', sysdate(), '', null, '操作日志菜单');
-insert into sys_menu values('501',  '登录日志', '108', '2', '/monitor/logininfor', '', 'C', '0', '1', 'monitor:logininfor:view',  'fa fa-file-image-o',    'admin', sysdate(), '', null, '登录日志菜单');
--- 用户管理按钮
-insert into sys_menu values('1000', '用户查询', '100', '1',  '#', '',  'F', '0', '1', 'system:user:list',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1001', '用户新增', '100', '2',  '#', '',  'F', '0', '1', 'system:user:add',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1002', '用户修改', '100', '3',  '#', '',  'F', '0', '1', 'system:user:edit',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1003', '用户删除', '100', '4',  '#', '',  'F', '0', '1', 'system:user:remove',      '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1004', '用户导出', '100', '5',  '#', '',  'F', '0', '1', 'system:user:export',      '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1005', '用户导入', '100', '6',  '#', '',  'F', '0', '1', 'system:user:import',      '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1006', '重置密码', '100', '7',  '#', '',  'F', '0', '1', 'system:user:resetPwd',    '#', 'admin', sysdate(), '', null, '');
--- 角色管理按钮
-insert into sys_menu values('1007', '角色查询', '101', '1',  '#', '',  'F', '0', '1', 'system:role:list',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1008', '角色新增', '101', '2',  '#', '',  'F', '0', '1', 'system:role:add',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1009', '角色修改', '101', '3',  '#', '',  'F', '0', '1', 'system:role:edit',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1010', '角色删除', '101', '4',  '#', '',  'F', '0', '1', 'system:role:remove',      '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1011', '角色导出', '101', '5',  '#', '',  'F', '0', '1', 'system:role:export',      '#', 'admin', sysdate(), '', null, '');
--- 菜单管理按钮
-insert into sys_menu values('1012', '菜单查询', '102', '1',  '#', '',  'F', '0', '1', 'system:menu:list',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1013', '菜单新增', '102', '2',  '#', '',  'F', '0', '1', 'system:menu:add',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1014', '菜单修改', '102', '3',  '#', '',  'F', '0', '1', 'system:menu:edit',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1015', '菜单删除', '102', '4',  '#', '',  'F', '0', '1', 'system:menu:remove',      '#', 'admin', sysdate(), '', null, '');
--- 部门管理按钮
-insert into sys_menu values('1016', '部门查询', '103', '1',  '#', '',  'F', '0', '1', 'system:dept:list',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1017', '部门新增', '103', '2',  '#', '',  'F', '0', '1', 'system:dept:add',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1018', '部门修改', '103', '3',  '#', '',  'F', '0', '1', 'system:dept:edit',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1019', '部门删除', '103', '4',  '#', '',  'F', '0', '1', 'system:dept:remove',      '#', 'admin', sysdate(), '', null, '');
--- 岗位管理按钮
-insert into sys_menu values('1020', '岗位查询', '104', '1',  '#', '',  'F', '0', '1', 'system:post:list',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1021', '岗位新增', '104', '2',  '#', '',  'F', '0', '1', 'system:post:add',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1022', '岗位修改', '104', '3',  '#', '',  'F', '0', '1', 'system:post:edit',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1023', '岗位删除', '104', '4',  '#', '',  'F', '0', '1', 'system:post:remove',      '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1024', '岗位导出', '104', '5',  '#', '',  'F', '0', '1', 'system:post:export',      '#', 'admin', sysdate(), '', null, '');
--- 字典管理按钮
-insert into sys_menu values('1025', '字典查询', '105', '1',  '#', '',  'F', '0', '1', 'system:dict:list',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1026', '字典新增', '105', '2',  '#', '',  'F', '0', '1', 'system:dict:add',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1027', '字典修改', '105', '3',  '#', '',  'F', '0', '1', 'system:dict:edit',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1028', '字典删除', '105', '4',  '#', '',  'F', '0', '1', 'system:dict:remove',      '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1029', '字典导出', '105', '5',  '#', '',  'F', '0', '1', 'system:dict:export',      '#', 'admin', sysdate(), '', null, '');
--- 参数设置按钮
-insert into sys_menu values('1030', '参数查询', '106', '1',  '#', '',  'F', '0', '1', 'system:config:list',      '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1031', '参数新增', '106', '2',  '#', '',  'F', '0', '1', 'system:config:add',       '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1032', '参数修改', '106', '3',  '#', '',  'F', '0', '1', 'system:config:edit',      '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1033', '参数删除', '106', '4',  '#', '',  'F', '0', '1', 'system:config:remove',    '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1034', '参数导出', '106', '5',  '#', '',  'F', '0', '1', 'system:config:export',    '#', 'admin', sysdate(), '', null, '');
--- 通知公告按钮
-insert into sys_menu values('1035', '公告查询', '107', '1',  '#', '',  'F', '0', '1', 'system:notice:list',      '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1036', '公告新增', '107', '2',  '#', '',  'F', '0', '1', 'system:notice:add',       '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1037', '公告修改', '107', '3',  '#', '',  'F', '0', '1', 'system:notice:edit',      '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1038', '公告删除', '107', '4',  '#', '',  'F', '0', '1', 'system:notice:remove',    '#', 'admin', sysdate(), '', null, '');
--- 操作日志按钮
-insert into sys_menu values('1039', '操作查询', '500', '1',  '#', '',  'F', '0', '1', 'monitor:operlog:list',    '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1040', '操作删除', '500', '2',  '#', '',  'F', '0', '1', 'monitor:operlog:remove',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1041', '详细信息', '500', '3',  '#', '',  'F', '0', '1', 'monitor:operlog:detail',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1042', '日志导出', '500', '4',  '#', '',  'F', '0', '1', 'monitor:operlog:export',  '#', 'admin', sysdate(), '', null, '');
--- 登录日志按钮
-insert into sys_menu values('1043', '登录查询', '501', '1',  '#', '',  'F', '0', '1', 'monitor:logininfor:list',         '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1044', '登录删除', '501', '2',  '#', '',  'F', '0', '1', 'monitor:logininfor:remove',       '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1045', '日志导出', '501', '3',  '#', '',  'F', '0', '1', 'monitor:logininfor:export',       '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1046', '账户解锁', '501', '4',  '#', '',  'F', '0', '1', 'monitor:logininfor:unlock',       '#', 'admin', sysdate(), '', null, '');
--- 在线用户按钮
-insert into sys_menu values('1047', '在线查询', '109', '1',  '#', '',  'F', '0', '1', 'monitor:online:list',             '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1048', '批量强退', '109', '2',  '#', '',  'F', '0', '1', 'monitor:online:batchForceLogout', '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1049', '单条强退', '109', '3',  '#', '',  'F', '0', '1', 'monitor:online:forceLogout',      '#', 'admin', sysdate(), '', null, '');
--- 定时任务按钮
-insert into sys_menu values('1050', '任务查询', '110', '1',  '#', '',  'F', '0', '1', 'monitor:job:list',                '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1051', '任务新增', '110', '2',  '#', '',  'F', '0', '1', 'monitor:job:add',                 '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1052', '任务修改', '110', '3',  '#', '',  'F', '0', '1', 'monitor:job:edit',                '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1053', '任务删除', '110', '4',  '#', '',  'F', '0', '1', 'monitor:job:remove',              '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1054', '状态修改', '110', '5',  '#', '',  'F', '0', '1', 'monitor:job:changeStatus',        '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1055', '任务详细', '110', '6',  '#', '',  'F', '0', '1', 'monitor:job:detail',              '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1056', '任务导出', '110', '7',  '#', '',  'F', '0', '1', 'monitor:job:export',              '#', 'admin', sysdate(), '', null, '');
--- 代码生成按钮
-insert into sys_menu values('1057', '生成查询', '115', '1',  '#', '',  'F', '0', '1', 'tool:gen:list',     '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1058', '生成修改', '115', '2',  '#', '',  'F', '0', '1', 'tool:gen:edit',     '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1059', '生成删除', '115', '3',  '#', '',  'F', '0', '1', 'tool:gen:remove',   '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1060', '预览代码', '115', '4',  '#', '',  'F', '0', '1', 'tool:gen:preview',  '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1061', '生成代码', '115', '5',  '#', '',  'F', '0', '1', 'tool:gen:code',     '#', 'admin', sysdate(), '', null, '');
-
-
--- ----------------------------
--- 6、用户和角色关联表  用户N-1角色
--- ----------------------------
-drop table if exists sys_user_role;
-create table sys_user_role (
-  user_id   bigint(20) not null comment '用户ID',
-  role_id   bigint(20) not null comment '角色ID',
-  primary key(user_id, role_id)
-) engine=innodb comment = '用户和角色关联表';
-
--- ----------------------------
--- 初始化-用户和角色关联表数据
--- ----------------------------
-insert into sys_user_role values ('1', '1');
-insert into sys_user_role values ('2', '2');
-
-
--- ----------------------------
--- 7、角色和菜单关联表  角色1-N菜单
--- ----------------------------
-drop table if exists sys_role_menu;
-create table sys_role_menu (
-  role_id   bigint(20) not null comment '角色ID',
-  menu_id   bigint(20) not null comment '菜单ID',
-  primary key(role_id, menu_id)
-) engine=innodb comment = '角色和菜单关联表';
-
--- ----------------------------
--- 初始化-角色和菜单关联表数据
--- ----------------------------
-insert into sys_role_menu values ('2', '1');
-insert into sys_role_menu values ('2', '2');
-insert into sys_role_menu values ('2', '3');
-insert into sys_role_menu values ('2', '4');
-insert into sys_role_menu values ('2', '100');
-insert into sys_role_menu values ('2', '101');
-insert into sys_role_menu values ('2', '102');
-insert into sys_role_menu values ('2', '103');
-insert into sys_role_menu values ('2', '104');
-insert into sys_role_menu values ('2', '105');
-insert into sys_role_menu values ('2', '106');
-insert into sys_role_menu values ('2', '107');
-insert into sys_role_menu values ('2', '108');
-insert into sys_role_menu values ('2', '109');
-insert into sys_role_menu values ('2', '110');
-insert into sys_role_menu values ('2', '111');
-insert into sys_role_menu values ('2', '112');
-insert into sys_role_menu values ('2', '113');
-insert into sys_role_menu values ('2', '114');
-insert into sys_role_menu values ('2', '115');
-insert into sys_role_menu values ('2', '116');
-insert into sys_role_menu values ('2', '500');
-insert into sys_role_menu values ('2', '501');
-insert into sys_role_menu values ('2', '1000');
-insert into sys_role_menu values ('2', '1001');
-insert into sys_role_menu values ('2', '1002');
-insert into sys_role_menu values ('2', '1003');
-insert into sys_role_menu values ('2', '1004');
-insert into sys_role_menu values ('2', '1005');
-insert into sys_role_menu values ('2', '1006');
-insert into sys_role_menu values ('2', '1007');
-insert into sys_role_menu values ('2', '1008');
-insert into sys_role_menu values ('2', '1009');
-insert into sys_role_menu values ('2', '1010');
-insert into sys_role_menu values ('2', '1011');
-insert into sys_role_menu values ('2', '1012');
-insert into sys_role_menu values ('2', '1013');
-insert into sys_role_menu values ('2', '1014');
-insert into sys_role_menu values ('2', '1015');
-insert into sys_role_menu values ('2', '1016');
-insert into sys_role_menu values ('2', '1017');
-insert into sys_role_menu values ('2', '1018');
-insert into sys_role_menu values ('2', '1019');
-insert into sys_role_menu values ('2', '1020');
-insert into sys_role_menu values ('2', '1021');
-insert into sys_role_menu values ('2', '1022');
-insert into sys_role_menu values ('2', '1023');
-insert into sys_role_menu values ('2', '1024');
-insert into sys_role_menu values ('2', '1025');
-insert into sys_role_menu values ('2', '1026');
-insert into sys_role_menu values ('2', '1027');
-insert into sys_role_menu values ('2', '1028');
-insert into sys_role_menu values ('2', '1029');
-insert into sys_role_menu values ('2', '1030');
-insert into sys_role_menu values ('2', '1031');
-insert into sys_role_menu values ('2', '1032');
-insert into sys_role_menu values ('2', '1033');
-insert into sys_role_menu values ('2', '1034');
-insert into sys_role_menu values ('2', '1035');
-insert into sys_role_menu values ('2', '1036');
-insert into sys_role_menu values ('2', '1037');
-insert into sys_role_menu values ('2', '1038');
-insert into sys_role_menu values ('2', '1039');
-insert into sys_role_menu values ('2', '1040');
-insert into sys_role_menu values ('2', '1041');
-insert into sys_role_menu values ('2', '1042');
-insert into sys_role_menu values ('2', '1043');
-insert into sys_role_menu values ('2', '1044');
-insert into sys_role_menu values ('2', '1045');
-insert into sys_role_menu values ('2', '1046');
-insert into sys_role_menu values ('2', '1047');
-insert into sys_role_menu values ('2', '1048');
-insert into sys_role_menu values ('2', '1049');
-insert into sys_role_menu values ('2', '1050');
-insert into sys_role_menu values ('2', '1051');
-insert into sys_role_menu values ('2', '1052');
-insert into sys_role_menu values ('2', '1053');
-insert into sys_role_menu values ('2', '1054');
-insert into sys_role_menu values ('2', '1055');
-insert into sys_role_menu values ('2', '1056');
-insert into sys_role_menu values ('2', '1057');
-insert into sys_role_menu values ('2', '1058');
-insert into sys_role_menu values ('2', '1059');
-insert into sys_role_menu values ('2', '1060');
-insert into sys_role_menu values ('2', '1061');
-
--- ----------------------------
--- 8、角色和部门关联表  角色1-N部门
--- ----------------------------
-drop table if exists sys_role_dept;
-create table sys_role_dept (
-  role_id   bigint(20) not null comment '角色ID',
-  dept_id   bigint(20) not null comment '部门ID',
-  primary key(role_id, dept_id)
-) engine=innodb comment = '角色和部门关联表';
-
--- ----------------------------
--- 初始化-角色和部门关联表数据
--- ----------------------------
-insert into sys_role_dept values ('2', '100');
-insert into sys_role_dept values ('2', '101');
-insert into sys_role_dept values ('2', '105');
-
--- ----------------------------
--- 9、用户与岗位关联表  用户1-N岗位
--- ----------------------------
-drop table if exists sys_user_post;
-create table sys_user_post
-(
-  user_id   bigint(20) not null comment '用户ID',
-  post_id   bigint(20) not null comment '岗位ID',
-  primary key (user_id, post_id)
-) engine=innodb comment = '用户与岗位关联表';
-
--- ----------------------------
--- 初始化-用户与岗位关联表数据
--- ----------------------------
-insert into sys_user_post values ('1', '1');
-insert into sys_user_post values ('2', '2');
-
-
--- ----------------------------
--- 10、操作日志记录
--- ----------------------------
-drop table if exists sys_oper_log;
-create table sys_oper_log (
-  oper_id           bigint(20)      not null auto_increment    comment '日志主键',
-  title             varchar(50)     default ''                 comment '模块标题',
-  business_type     int(2)          default 0                  comment '业务类型（0其它 1新增 2修改 3删除）',
-  method            varchar(100)    default ''                 comment '方法名称',
-  request_method    varchar(10)     default ''                 comment '请求方式',
-  operator_type     int(1)          default 0                  comment '操作类别（0其它 1后台用户 2手机端用户）',
-  oper_name         varchar(50)     default ''                 comment '操作人员',
-  dept_name         varchar(50)     default ''                 comment '部门名称',
-  oper_url          varchar(255)    default ''                 comment '请求URL',
-  oper_ip           varchar(128)    default ''                 comment '主机地址',
-  oper_location     varchar(255)    default ''                 comment '操作地点',
-  oper_param        varchar(2000)   default ''                 comment '请求参数',
-  json_result       varchar(2000)   default ''                 comment '返回参数',
-  status            int(1)          default 0                  comment '操作状态（0正常 1异常）',
-  error_msg         varchar(2000)   default ''                 comment '错误消息',
-  oper_time         datetime                                   comment '操作时间',
-  primary key (oper_id)
-) engine=innodb auto_increment=100 comment = '操作日志记录';
-
-
--- ----------------------------
--- 11、字典类型表
--- ----------------------------
-drop table if exists sys_dict_type;
-create table sys_dict_type
-(
-  dict_id          bigint(20)      not null auto_increment    comment '字典主键',
-  dict_name        varchar(100)    default ''                 comment '字典名称',
-  dict_type        varchar(100)    default ''                 comment '字典类型',
-  status           char(1)         default '0'                comment '状态（0正常 1停用）',
-  create_by        varchar(64)     default ''                 comment '创建者',
-  create_time      datetime                                   comment '创建时间',
-  update_by        varchar(64)     default ''                 comment '更新者',
-  update_time      datetime                                   comment '更新时间',
-  remark           varchar(500)    default null               comment '备注',
-  primary key (dict_id),
-  unique (dict_type)
-) engine=innodb auto_increment=100 comment = '字典类型表';
-
-insert into sys_dict_type values(1,  '用户性别', 'sys_user_sex',        '0', 'admin', sysdate(), '', null, '用户性别列表');
-insert into sys_dict_type values(2,  '菜单状态', 'sys_show_hide',       '0', 'admin', sysdate(), '', null, '菜单状态列表');
-insert into sys_dict_type values(3,  '系统开关', 'sys_normal_disable',  '0', 'admin', sysdate(), '', null, '系统开关列表');
-insert into sys_dict_type values(4,  '任务状态', 'sys_job_status',      '0', 'admin', sysdate(), '', null, '任务状态列表');
-insert into sys_dict_type values(5,  '任务分组', 'sys_job_group',       '0', 'admin', sysdate(), '', null, '任务分组列表');
-insert into sys_dict_type values(6,  '系统是否', 'sys_yes_no',          '0', 'admin', sysdate(), '', null, '系统是否列表');
-insert into sys_dict_type values(7,  '通知类型', 'sys_notice_type',     '0', 'admin', sysdate(), '', null, '通知类型列表');
-insert into sys_dict_type values(8,  '通知状态', 'sys_notice_status',   '0', 'admin', sysdate(), '', null, '通知状态列表');
-insert into sys_dict_type values(9,  '操作类型', 'sys_oper_type',       '0', 'admin', sysdate(), '', null, '操作类型列表');
-insert into sys_dict_type values(10, '系统状态', 'sys_common_status',   '0', 'admin', sysdate(), '', null, '登录状态列表');
-
-
--- ----------------------------
--- 12、字典数据表
--- ----------------------------
-drop table if exists sys_dict_data;
-create table sys_dict_data
-(
-  dict_code        bigint(20)      not null auto_increment    comment '字典编码',
-  dict_sort        int(4)          default 0                  comment '字典排序',
-  dict_label       varchar(100)    default ''                 comment '字典标签',
-  dict_value       varchar(100)    default ''                 comment '字典键值',
-  dict_type        varchar(100)    default ''                 comment '字典类型',
-  css_class        varchar(100)    default null               comment '样式属性（其他样式扩展）',
-  list_class       varchar(100)    default null               comment '表格回显样式',
-  is_default       char(1)         default 'N'                comment '是否默认（Y是 N否）',
-  status           char(1)         default '0'                comment '状态（0正常 1停用）',
-  create_by        varchar(64)     default ''                 comment '创建者',
-  create_time      datetime                                   comment '创建时间',
-  update_by        varchar(64)     default ''                 comment '更新者',
-  update_time      datetime                                   comment '更新时间',
-  remark           varchar(500)    default null               comment '备注',
-  primary key (dict_code)
-) engine=innodb auto_increment=100 comment = '字典数据表';
-
-insert into sys_dict_data values(1,  1,  '男',       '0',       'sys_user_sex',        '',   '',        'Y', '0', 'admin', sysdate(), '', null, '性别男');
-insert into sys_dict_data values(2,  2,  '女',       '1',       'sys_user_sex',        '',   '',        'N', '0', 'admin', sysdate(), '', null, '性别女');
-insert into sys_dict_data values(3,  3,  '未知',     '2',       'sys_user_sex',        '',   '',        'N', '0', 'admin', sysdate(), '', null, '性别未知');
-insert into sys_dict_data values(4,  1,  '显示',     '0',       'sys_show_hide',       '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '显示菜单');
-insert into sys_dict_data values(5,  2,  '隐藏',     '1',       'sys_show_hide',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '隐藏菜单');
-insert into sys_dict_data values(6,  1,  '正常',     '0',       'sys_normal_disable',  '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态');
-insert into sys_dict_data values(7,  2,  '停用',     '1',       'sys_normal_disable',  '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '停用状态');
-insert into sys_dict_data values(8,  1,  '正常',     '0',       'sys_job_status',      '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态');
-insert into sys_dict_data values(9,  2,  '暂停',     '1',       'sys_job_status',      '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '停用状态');
-insert into sys_dict_data values(10, 1,  '默认',     'DEFAULT', 'sys_job_group',       '',   '',        'Y', '0', 'admin', sysdate(), '', null, '默认分组');
-insert into sys_dict_data values(11, 2,  '系统',     'SYSTEM',  'sys_job_group',       '',   '',        'N', '0', 'admin', sysdate(), '', null, '系统分组');
-insert into sys_dict_data values(12, 1,  '是',       'Y',       'sys_yes_no',          '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '系统默认是');
-insert into sys_dict_data values(13, 2,  '否',       'N',       'sys_yes_no',          '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '系统默认否');
-insert into sys_dict_data values(14, 1,  '通知',     '1',       'sys_notice_type',     '',   'warning', 'Y', '0', 'admin', sysdate(), '', null, '通知');
-insert into sys_dict_data values(15, 2,  '公告',     '2',       'sys_notice_type',     '',   'success', 'N', '0', 'admin', sysdate(), '', null, '公告');
-insert into sys_dict_data values(16, 1,  '正常',     '0',       'sys_notice_status',   '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态');
-insert into sys_dict_data values(17, 2,  '关闭',     '1',       'sys_notice_status',   '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '关闭状态');
-insert into sys_dict_data values(18, 99, '其他',     '0',       'sys_oper_type',       '',   'info',    'N', '0', 'admin', sysdate(), '', null, '其他操作');
-insert into sys_dict_data values(19, 1,  '新增',     '1',       'sys_oper_type',       '',   'info',    'N', '0', 'admin', sysdate(), '', null, '新增操作');
-insert into sys_dict_data values(20, 2,  '修改',     '2',       'sys_oper_type',       '',   'info',    'N', '0', 'admin', sysdate(), '', null, '修改操作');
-insert into sys_dict_data values(21, 3,  '删除',     '3',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '删除操作');
-insert into sys_dict_data values(22, 4,  '授权',     '4',       'sys_oper_type',       '',   'primary', 'N', '0', 'admin', sysdate(), '', null, '授权操作');
-insert into sys_dict_data values(23, 5,  '导出',     '5',       'sys_oper_type',       '',   'warning', 'N', '0', 'admin', sysdate(), '', null, '导出操作');
-insert into sys_dict_data values(24, 6,  '导入',     '6',       'sys_oper_type',       '',   'warning', 'N', '0', 'admin', sysdate(), '', null, '导入操作');
-insert into sys_dict_data values(25, 7,  '强退',     '7',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '强退操作');
-insert into sys_dict_data values(26, 8,  '生成代码', '8',       'sys_oper_type',       '',   'warning', 'N', '0', 'admin', sysdate(), '', null, '生成操作');
-insert into sys_dict_data values(27, 9,  '清空数据', '9',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '清空操作');
-insert into sys_dict_data values(28, 1,  '成功',     '0',       'sys_common_status',   '',   'primary', 'N', '0', 'admin', sysdate(), '', null, '正常状态');
-insert into sys_dict_data values(29, 2,  '失败',     '1',       'sys_common_status',   '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '停用状态');
-
-
--- ----------------------------
--- 13、参数配置表
--- ----------------------------
-drop table if exists sys_config;
-create table sys_config (
-  config_id         int(5)          not null auto_increment    comment '参数主键',
-  config_name       varchar(100)    default ''                 comment '参数名称',
-  config_key        varchar(100)    default ''                 comment '参数键名',
-  config_value      varchar(500)    default ''                 comment '参数键值',
-  config_type       char(1)         default 'N'                comment '系统内置（Y是 N否）',
-  create_by         varchar(64)     default ''                 comment '创建者',
-  create_time       datetime                                   comment '创建时间',
-  update_by         varchar(64)     default ''                 comment '更新者',
-  update_time       datetime                                   comment '更新时间',
-  remark            varchar(500)    default null               comment '备注',
-  primary key (config_id)
-) engine=innodb auto_increment=100 comment = '参数配置表';
-
-insert into sys_config values(1, '主框架页-默认皮肤样式名称',     'sys.index.skinName',               'skin-blue',     'Y', 'admin', sysdate(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow');
-insert into sys_config values(2, '用户管理-账号初始密码',         'sys.user.initPassword',            '123456',        'Y', 'admin', sysdate(), '', null, '初始化密码 123456');
-insert into sys_config values(3, '主框架页-侧边栏主题',           'sys.index.sideTheme',              'theme-dark',    'Y', 'admin', sysdate(), '', null, '深黑主题theme-dark，浅色主题theme-light，深蓝主题theme-blue');
-insert into sys_config values(4, '账号自助-是否开启用户注册功能', 'sys.account.registerUser',         'false',         'Y', 'admin', sysdate(), '', null, '是否开启注册用户功能（true开启，false关闭）');
-insert into sys_config values(5, '用户管理-密码字符范围',         'sys.account.chrtype',              '0',             'Y', 'admin', sysdate(), '', null, '默认任意字符范围，0任意（密码可以输入任意字符），1数字（密码只能为0-9数字），2英文字母（密码只能为a-z和A-Z字母），3字母和数字（密码必须包含字母，数字）,4字母数字和特殊字符（目前支持的特殊字符包括：~!@#$%^&*()-=_+）');
-insert into sys_config values(6, '用户管理-初始密码修改策略',     'sys.account.initPasswordModify',   '0',             'Y', 'admin', sysdate(), '', null, '0：初始密码修改策略关闭，没有任何提示，1：提醒用户，如果未修改初始密码，则在登录时就会提醒修改密码对话框');
-insert into sys_config values(7, '用户管理-账号密码更新周期',     'sys.account.passwordValidateDays', '0',             'Y', 'admin', sysdate(), '', null, '密码更新周期（填写数字，数据初始化值为0不限制，若修改必须为大于0小于365的正整数），如果超过这个周期登录系统时，则在登录时就会提醒修改密码对话框');
-insert into sys_config values(8, '主框架页-菜单导航显示风格',     'sys.index.menuStyle',              'default',       'Y', 'admin', sysdate(), '', null, '菜单导航显示风格（default为左侧导航菜单，topnav为顶部导航菜单）');
-insert into sys_config values(9, '主框架页-是否开启页脚',         'sys.index.ignoreFooter',           'true',          'Y', 'admin', sysdate(), '', null, '是否开启底部页脚显示（true显示，false隐藏）');
-
-
--- ----------------------------
--- 14、系统访问记录
--- ----------------------------
-drop table if exists sys_logininfor;
-create table sys_logininfor (
-  info_id        bigint(20)     not null auto_increment   comment '访问ID',
-  login_name     varchar(50)    default ''                comment '登录账号',
-  ipaddr         varchar(128)   default ''                comment '登录IP地址',
-  login_location varchar(255)   default ''                comment '登录地点',
-  browser        varchar(50)    default ''                comment '浏览器类型',
-  os             varchar(50)    default ''                comment '操作系统',
-  status         char(1)        default '0'               comment '登录状态（0成功 1失败）',
-  msg            varchar(255)   default ''                comment '提示消息',
-  login_time     datetime                                 comment '访问时间',
-  primary key (info_id)
-) engine=innodb auto_increment=100 comment = '系统访问记录';
-
-
--- ----------------------------
--- 15、在线用户记录
--- ----------------------------
-drop table if exists sys_user_online;
-create table sys_user_online (
-  sessionId         varchar(50)   default ''                comment '用户会话id',
-  login_name        varchar(50)   default ''                comment '登录账号',
-  dept_name         varchar(50)   default ''                comment '部门名称',
-  ipaddr            varchar(128)  default ''                comment '登录IP地址',
-  login_location    varchar(255)  default ''                comment '登录地点',
-  browser           varchar(50)   default ''                comment '浏览器类型',
-  os                varchar(50)   default ''                comment '操作系统',
-  status            varchar(10)   default ''                comment '在线状态on_line在线off_line离线',
-  start_timestamp   datetime                                comment 'session创建时间',
-  last_access_time  datetime                                comment 'session最后访问时间',
-  expire_time       int(5)        default 0                 comment '超时时间，单位为分钟',
-  primary key (sessionId)
-) engine=innodb comment = '在线用户记录';
-
-
--- ----------------------------
--- 16、定时任务调度表
--- ----------------------------
-drop table if exists sys_job;
-create table sys_job (
-  job_id              bigint(20)    not null auto_increment    comment '任务ID',
-  job_name            varchar(64)   default ''                 comment '任务名称',
-  job_group           varchar(64)   default 'DEFAULT'          comment '任务组名',
-  invoke_target       varchar(500)  not null                   comment '调用目标字符串',
-  cron_expression     varchar(255)  default ''                 comment 'cron执行表达式',
-  misfire_policy      varchar(20)   default '3'                comment '计划执行错误策略（1立即执行 2执行一次 3放弃执行）',
-  concurrent          char(1)       default '1'                comment '是否并发执行（0允许 1禁止）',
-  status              char(1)       default '0'                comment '状态（0正常 1暂停）',
-  create_by           varchar(64)   default ''                 comment '创建者',
-  create_time         datetime                                 comment '创建时间',
-  update_by           varchar(64)   default ''                 comment '更新者',
-  update_time         datetime                                 comment '更新时间',
-  remark              varchar(500)  default ''                 comment '备注信息',
-  primary key (job_id, job_name, job_group)
-) engine=innodb auto_increment=100 comment = '定时任务调度表';
-
-insert into sys_job values(1, '系统默认（无参）', 'DEFAULT', 'ryTask.ryNoParams',        '0/10 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
-insert into sys_job values(2, '系统默认（有参）', 'DEFAULT', 'ryTask.ryParams(\'ry\')',  '0/15 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
-insert into sys_job values(3, '系统默认（多参）', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)',  '0/20 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
-
-
--- ----------------------------
--- 17、定时任务调度日志表
--- ----------------------------
-drop table if exists sys_job_log;
-create table sys_job_log (
-  job_log_id          bigint(20)     not null auto_increment    comment '任务日志ID',
-  job_name            varchar(64)    not null                   comment '任务名称',
-  job_group           varchar(64)    not null                   comment '任务组名',
-  invoke_target       varchar(500)   not null                   comment '调用目标字符串',
-  job_message         varchar(500)                              comment '日志信息',
-  status              char(1)        default '0'                comment '执行状态（0正常 1失败）',
-  exception_info      varchar(2000)  default ''                 comment '异常信息',
-  create_time         datetime                                  comment '创建时间',
-  primary key (job_log_id)
-) engine=innodb comment = '定时任务调度日志表';
-
-
--- ----------------------------
--- 18、通知公告表
--- ----------------------------
-drop table if exists sys_notice;
-create table sys_notice (
-  notice_id         int(4)          not null auto_increment    comment '公告ID',
-  notice_title      varchar(50)     not null                   comment '公告标题',
-  notice_type       char(1)         not null                   comment '公告类型（1通知 2公告）',
-  notice_content    varchar(2000)   default null               comment '公告内容',
-  status            char(1)         default '0'                comment '公告状态（0正常 1关闭）',
-  create_by         varchar(64)     default ''                 comment '创建者',
-  create_time       datetime                                   comment '创建时间',
-  update_by         varchar(64)     default ''                 comment '更新者',
-  update_time       datetime                                   comment '更新时间',
-  remark            varchar(255)    default null               comment '备注',
-  primary key (notice_id)
-) engine=innodb auto_increment=10 comment = '通知公告表';
-
--- ----------------------------
--- 初始化-公告信息表数据
--- ----------------------------
-insert into sys_notice values('1', '温馨提醒：2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员');
-insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容',   '0', 'admin', sysdate(), '', null, '管理员');
-
-
--- ----------------------------
--- 19、代码生成业务表
--- ----------------------------
-drop table if exists gen_table;
-create table gen_table (
-  table_id             bigint(20)      not null auto_increment    comment '编号',
-  table_name           varchar(200)    default ''                 comment '表名称',
-  table_comment        varchar(500)    default ''                 comment '表描述',
-  sub_table_name       varchar(64)     default null               comment '关联子表的表名',
-  sub_table_fk_name    varchar(64)     default null               comment '子表关联的外键名',
-  class_name           varchar(100)    default ''                 comment '实体类名称',
-  tpl_category         varchar(200)    default 'crud'             comment '使用的模板（crud单表操作 tree树表操作 sub主子表操作）',
-  package_name         varchar(100)                               comment '生成包路径',
-  module_name          varchar(30)                                comment '生成模块名',
-  business_name        varchar(30)                                comment '生成业务名',
-  function_name        varchar(50)                                comment '生成功能名',
-  function_author      varchar(50)                                comment '生成功能作者',
-  gen_type             char(1)         default '0'                comment '生成代码方式（0zip压缩包 1自定义路径）',
-  gen_path             varchar(200)    default '/'                comment '生成路径（不填默认项目路径）',
-  options              varchar(1000)                              comment '其它生成选项',
-  create_by            varchar(64)     default ''                 comment '创建者',
-  create_time 	       datetime                                   comment '创建时间',
-  update_by            varchar(64)     default ''                 comment '更新者',
-  update_time          datetime                                   comment '更新时间',
-  remark               varchar(500)    default null               comment '备注',
-  primary key (table_id)
-) engine=innodb auto_increment=1 comment = '代码生成业务表';
-
-
--- ----------------------------
--- 20、代码生成业务表字段
--- ----------------------------
-drop table if exists gen_table_column;
-create table gen_table_column (
-  column_id         bigint(20)      not null auto_increment    comment '编号',
-  table_id          varchar(64)                                comment '归属表编号',
-  column_name       varchar(200)                               comment '列名称',
-  column_comment    varchar(500)                               comment '列描述',
-  column_type       varchar(100)                               comment '列类型',
-  java_type         varchar(500)                               comment 'JAVA类型',
-  java_field        varchar(200)                               comment 'JAVA字段名',
-  is_pk             char(1)                                    comment '是否主键（1是）',
-  is_increment      char(1)                                    comment '是否自增（1是）',
-  is_required       char(1)                                    comment '是否必填（1是）',
-  is_insert         char(1)                                    comment '是否为插入字段（1是）',
-  is_edit           char(1)                                    comment '是否编辑字段（1是）',
-  is_list           char(1)                                    comment '是否列表字段（1是）',
-  is_query          char(1)                                    comment '是否查询字段（1是）',
-  query_type        varchar(200)    default 'EQ'               comment '查询方式（等于、不等于、大于、小于、范围）',
-  html_type         varchar(200)                               comment '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）',
-  dict_type         varchar(200)    default ''                 comment '字典类型',
-  sort              int                                        comment '排序',
-  create_by         varchar(64)     default ''                 comment '创建者',
-  create_time 	    datetime                                   comment '创建时间',
-  update_by         varchar(64)     default ''                 comment '更新者',
-  update_time       datetime                                   comment '更新时间',
-  primary key (column_id)
-) engine=innodb auto_increment=1 comment = '代码生成业务表字段';