feat(os-ems): 新增震动实时数据管理模块

新增震动实时数据管理模块，包含数据对象、Mapper、Service、Controller的实现。支持震动数据的增删查改

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

@@ -80,13 +80,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 175.27.215.92
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 6
     # 密码
-    password: redis@2023
+    password: 123456
     # 连接超时时间
     timeout: 30s
     lettuce:

os-ems/src/main/java/com/os/ems/record/controller/EmsVibrationInstanceController.java

@@ -1,106 +0,0 @@
-package com.os.ems.record.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.os.common.annotation.Log;
-import com.os.common.core.controller.BaseController;
-import com.os.common.core.domain.AjaxResult;
-import com.os.common.enums.BusinessType;
-import com.os.ems.record.domain.EmsVibrationInstance;
-import com.os.ems.record.service.IEmsVibrationInstanceService;
-import com.os.common.utils.poi.ExcelUtil;
-import com.os.common.core.page.TableDataInfo;
-
-/**
- * 震动实时数据Controller
- * 
- * @author ZangCH
- * @date 2024-08-21
- */
-@RestController
-@RequestMapping("/ems/record/recordVibrateInstance")
-public class EmsVibrationInstanceController extends BaseController
-{
-    @Autowired
-    private IEmsVibrationInstanceService emsVibrationInstanceService;
-
-    /**
-     * 查询震动实时数据列表
-     */
-    @PreAuthorize("@ss.hasPermi('ems/record:recordVibrateInstance:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(EmsVibrationInstance emsVibrationInstance)
-    {
-        startPage();
-        List<EmsVibrationInstance> list = emsVibrationInstanceService.selectEmsVibrationInstanceList(emsVibrationInstance);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出震动实时数据列表
-     */
-    @PreAuthorize("@ss.hasPermi('ems/record:recordVibrateInstance:export')")
-    @Log(title = "震动实时数据", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsVibrationInstance emsVibrationInstance)
-    {
-        List<EmsVibrationInstance> list = emsVibrationInstanceService.selectEmsVibrationInstanceList(emsVibrationInstance);
-        ExcelUtil<EmsVibrationInstance> util = new ExcelUtil<EmsVibrationInstance>(EmsVibrationInstance.class);
-        util.exportExcel(response, list, "震动实时数据数据");
-    }
-
-    /**
-     * 获取震动实时数据详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('ems/record:recordVibrateInstance:query')")
-    @GetMapping(value = "/{objId}")
-    public AjaxResult getInfo(@PathVariable("objId") Long objId)
-    {
-        return success(emsVibrationInstanceService.selectEmsVibrationInstanceByObjId(objId));
-    }
-
-    /**
-     * 新增震动实时数据
-     */
-    @PreAuthorize("@ss.hasPermi('ems/record:recordVibrateInstance:add')")
-    @Log(title = "震动实时数据", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody EmsVibrationInstance emsVibrationInstance)
-    {
-        emsVibrationInstance.setCreateBy(getUsername());
-        return toAjax(emsVibrationInstanceService.insertEmsVibrationInstance(emsVibrationInstance));
-    }
-
-    /**
-     * 修改震动实时数据
-     */
-    @PreAuthorize("@ss.hasPermi('ems/record:recordVibrateInstance:edit')")
-    @Log(title = "震动实时数据", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody EmsVibrationInstance emsVibrationInstance)
-    {
-        emsVibrationInstance.setUpdateBy(getUsername());
-        return toAjax(emsVibrationInstanceService.updateEmsVibrationInstance(emsVibrationInstance));
-    }
-
-    /**
-     * 删除震动实时数据
-     */
-    @PreAuthorize("@ss.hasPermi('ems/record:recordVibrateInstance:remove')")
-    @Log(title = "震动实时数据", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{objIds}")
-    public AjaxResult remove(@PathVariable Long[] objIds)
-    {
-        return toAjax(emsVibrationInstanceService.deleteEmsVibrationInstanceByObjIds(objIds));
-    }
-}

os-ems/src/main/java/com/os/ems/record/controller/EmsVibrationInstantController.java

@@ -0,0 +1,118 @@
+package com.os.ems.record.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.os.common.annotation.Log;
+import com.os.common.core.controller.BaseController;
+import com.os.common.core.domain.AjaxResult;
+import com.os.common.enums.BusinessType;
+import com.os.ems.record.domain.EmsVibrationInstant;
+import com.os.ems.record.service.IEmsVibrationInstantService;
+import com.os.common.utils.poi.ExcelUtil;
+import com.os.common.core.page.TableDataInfo;
+
+/**
+ * 震动实时数据Controller
+ * 
+ * @author ZangCH
+ * @date 2024-08-22
+ */
+@RestController
+@RequestMapping("/ems/record/recordVibrationInstant")
+public class EmsVibrationInstantController extends BaseController
+{
+    @Autowired
+    private IEmsVibrationInstantService emsVibrationInstantService;
+
+    /**
+     * 查询震动实时数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('ems/record:recordVibrationInstant:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(EmsVibrationInstant emsVibrationInstant)
+    {
+        startPage();
+        List<EmsVibrationInstant> list = emsVibrationInstantService.selectEmsVibrationInstantList(emsVibrationInstant);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出震动实时数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('ems/record:recordVibrationInstant:export')")
+    @Log(title = "震动实时数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmsVibrationInstant emsVibrationInstant)
+    {
+        List<EmsVibrationInstant> list = emsVibrationInstantService.selectEmsVibrationInstantList(emsVibrationInstant);
+        ExcelUtil<EmsVibrationInstant> util = new ExcelUtil<EmsVibrationInstant>(EmsVibrationInstant.class);
+        util.exportExcel(response, list, "震动实时数据数据");
+    }
+
+    /**
+     * 获取震动实时数据详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('ems/record:recordVibrationInstant:query')")
+    @GetMapping(value = "/{objId}")
+    public AjaxResult getInfo(@PathVariable("objId") Long objId)
+    {
+        return success(emsVibrationInstantService.selectEmsVibrationInstantByObjId(objId));
+    }
+
+    /**
+     * 新增震动实时数据
+     */
+    @PreAuthorize("@ss.hasPermi('ems/record:recordVibrationInstant:add')")
+    @Log(title = "震动实时数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmsVibrationInstant emsVibrationInstant)
+    {
+        emsVibrationInstant.setCreateBy(getUsername());
+        return toAjax(emsVibrationInstantService.insertEmsVibrationInstant(emsVibrationInstant));
+    }
+
+    /**
+     * 修改震动实时数据
+     */
+    @PreAuthorize("@ss.hasPermi('ems/record:recordVibrationInstant:edit')")
+    @Log(title = "震动实时数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmsVibrationInstant emsVibrationInstant)
+    {
+        emsVibrationInstant.setUpdateBy(getUsername());
+        return toAjax(emsVibrationInstantService.updateEmsVibrationInstant(emsVibrationInstant));
+    }
+
+    /**
+     * 删除震动实时数据
+     */
+    @PreAuthorize("@ss.hasPermi('ems/record:recordVibrationInstant:remove')")
+    @Log(title = "震动实时数据", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{objIds}")
+    public AjaxResult remove(@PathVariable Long[] objIds)
+    {
+        return toAjax(emsVibrationInstantService.deleteEmsVibrationInstantByObjIds(objIds));
+    }
+
+    /**
+     * 查询电实时数据
+     * @param emsVibrationInstant
+     * @return
+     */
+    @GetMapping("/vibrationInstantList")
+    public AjaxResult vibrationInstantList(EmsVibrationInstant emsVibrationInstant) {
+        List<EmsVibrationInstant> list = emsVibrationInstantService
+                .selectVibrationInstantList(emsVibrationInstant);
+        return success(list);
+    }
+}

os-ems/src/main/java/com/os/ems/record/domain/EmsVibrationInstant.java

@@ -12,9 +12,9 @@ import com.os.common.core.domain.BaseEntity;
  * 震动实时数据对象 T_VibrationSensor_Data
  * 
  * @author ZangCH
- * @date 2024-08-21
+ * @date 2024-08-22
  */
-public class EmsVibrationInstance extends BaseEntity
+public class EmsVibrationInstant extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

os-ems/src/main/java/com/os/ems/record/mapper/EmsVibrationInstanceMapper.java

@@ -1,61 +0,0 @@
-package com.os.ems.record.mapper;
-
-import java.util.List;
-import com.os.ems.record.domain.EmsVibrationInstance;
-
-/**
- * 震动实时数据Mapper接口
- * 
- * @author ZangCH
- * @date 2024-08-21
- */
-public interface EmsVibrationInstanceMapper 
-{
-    /**
-     * 查询震动实时数据
-     * 
-     * @param objId 震动实时数据主键
-     * @return 震动实时数据
-     */
-    public EmsVibrationInstance selectEmsVibrationInstanceByObjId(Long objId);
-
-    /**
-     * 查询震动实时数据列表
-     * 
-     * @param emsVibrationInstance 震动实时数据
-     * @return 震动实时数据集合
-     */
-    public List<EmsVibrationInstance> selectEmsVibrationInstanceList(EmsVibrationInstance emsVibrationInstance);
-
-    /**
-     * 新增震动实时数据
-     * 
-     * @param emsVibrationInstance 震动实时数据
-     * @return 结果
-     */
-    public int insertEmsVibrationInstance(EmsVibrationInstance emsVibrationInstance);
-
-    /**
-     * 修改震动实时数据
-     * 
-     * @param emsVibrationInstance 震动实时数据
-     * @return 结果
-     */
-    public int updateEmsVibrationInstance(EmsVibrationInstance emsVibrationInstance);
-
-    /**
-     * 删除震动实时数据
-     * 
-     * @param objId 震动实时数据主键
-     * @return 结果
-     */
-    public int deleteEmsVibrationInstanceByObjId(Long objId);
-
-    /**
-     * 批量删除震动实时数据
-     * 
-     * @param objIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteEmsVibrationInstanceByObjIds(Long[] objIds);
-}

os-ems/src/main/java/com/os/ems/record/mapper/EmsVibrationInstantMapper.java

@@ -0,0 +1,69 @@
+package com.os.ems.record.mapper;
+
+import java.util.List;
+import com.os.ems.record.domain.EmsVibrationInstant;
+
+/**
+ * 震动实时数据Mapper接口
+ * 
+ * @author ZangCH
+ * @date 2024-08-22
+ */
+public interface EmsVibrationInstantMapper 
+{
+    /**
+     * 查询震动实时数据
+     * 
+     * @param objId 震动实时数据主键
+     * @return 震动实时数据
+     */
+    public EmsVibrationInstant selectEmsVibrationInstantByObjId(Long objId);
+
+    /**
+     * 查询震动实时数据列表
+     * 
+     * @param emsVibrationInstant 震动实时数据
+     * @return 震动实时数据集合
+     */
+    public List<EmsVibrationInstant> selectEmsVibrationInstantList(EmsVibrationInstant emsVibrationInstant);
+
+    /**
+     * 新增震动实时数据
+     * 
+     * @param emsVibrationInstant 震动实时数据
+     * @return 结果
+     */
+    public int insertEmsVibrationInstant(EmsVibrationInstant emsVibrationInstant);
+
+    /**
+     * 修改震动实时数据
+     * 
+     * @param emsVibrationInstant 震动实时数据
+     * @return 结果
+     */
+    public int updateEmsVibrationInstant(EmsVibrationInstant emsVibrationInstant);
+
+    /**
+     * 删除震动实时数据
+     * 
+     * @param objId 震动实时数据主键
+     * @return 结果
+     */
+    public int deleteEmsVibrationInstantByObjId(Long objId);
+
+    /**
+     * 批量删除震动实时数据
+     * 
+     * @param objIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsVibrationInstantByObjIds(Long[] objIds);
+
+    /**mapper.java
+     * 查询震动实时数据
+     * @param emsVibrationInstance
+     * @return
+     */
+    List<EmsVibrationInstant> selectVibrationInstantList(EmsVibrationInstant emsVibrationInstant);
+
+}

os-ems/src/main/java/com/os/ems/record/service/IEmsVibrationInstanceService.java

@@ -1,61 +0,0 @@
-package com.os.ems.record.service;
-
-import java.util.List;
-import com.os.ems.record.domain.EmsVibrationInstance;
-
-/**
- * 震动实时数据Service接口
- * 
- * @author ZangCH
- * @date 2024-08-21
- */
-public interface IEmsVibrationInstanceService 
-{
-    /**
-     * 查询震动实时数据
-     * 
-     * @param objId 震动实时数据主键
-     * @return 震动实时数据
-     */
-    public EmsVibrationInstance selectEmsVibrationInstanceByObjId(Long objId);
-
-    /**
-     * 查询震动实时数据列表
-     * 
-     * @param emsVibrationInstance 震动实时数据
-     * @return 震动实时数据集合
-     */
-    public List<EmsVibrationInstance> selectEmsVibrationInstanceList(EmsVibrationInstance emsVibrationInstance);
-
-    /**
-     * 新增震动实时数据
-     * 
-     * @param emsVibrationInstance 震动实时数据
-     * @return 结果
-     */
-    public int insertEmsVibrationInstance(EmsVibrationInstance emsVibrationInstance);
-
-    /**
-     * 修改震动实时数据
-     * 
-     * @param emsVibrationInstance 震动实时数据
-     * @return 结果
-     */
-    public int updateEmsVibrationInstance(EmsVibrationInstance emsVibrationInstance);
-
-    /**
-     * 批量删除震动实时数据
-     * 
-     * @param objIds 需要删除的震动实时数据主键集合
-     * @return 结果
-     */
-    public int deleteEmsVibrationInstanceByObjIds(Long[] objIds);
-
-    /**
-     * 删除震动实时数据信息
-     * 
-     * @param objId 震动实时数据主键
-     * @return 结果
-     */
-    public int deleteEmsVibrationInstanceByObjId(Long objId);
-}

os-ems/src/main/java/com/os/ems/record/service/IEmsVibrationInstantService.java

@@ -0,0 +1,70 @@
+package com.os.ems.record.service;
+
+import java.util.List;
+import com.os.ems.record.domain.EmsVibrationInstant;
+
+/**
+ * 震动实时数据Service接口
+ * 
+ * @author ZangCH
+ * @date 2024-08-22
+ */
+public interface IEmsVibrationInstantService 
+{
+    /**
+     * 查询震动实时数据
+     * 
+     * @param objId 震动实时数据主键
+     * @return 震动实时数据
+     */
+    public EmsVibrationInstant selectEmsVibrationInstantByObjId(Long objId);
+
+    /**
+     * 查询震动实时数据列表
+     * 
+     * @param emsVibrationInstant 震动实时数据
+     * @return 震动实时数据集合
+     */
+    public List<EmsVibrationInstant> selectEmsVibrationInstantList(EmsVibrationInstant emsVibrationInstant);
+
+    /**
+     * 新增震动实时数据
+     * 
+     * @param emsVibrationInstant 震动实时数据
+     * @return 结果
+     */
+    public int insertEmsVibrationInstant(EmsVibrationInstant emsVibrationInstant);
+
+    /**
+     * 修改震动实时数据
+     * 
+     * @param emsVibrationInstant 震动实时数据
+     * @return 结果
+     */
+    public int updateEmsVibrationInstant(EmsVibrationInstant emsVibrationInstant);
+
+    /**
+     * 批量删除震动实时数据
+     * 
+     * @param objIds 需要删除的震动实时数据主键集合
+     * @return 结果
+     */
+    public int deleteEmsVibrationInstantByObjIds(Long[] objIds);
+
+    /**
+     * 删除震动实时数据信息
+     * 
+     * @param objId 震动实时数据主键
+     * @return 结果
+     */
+    public int deleteEmsVibrationInstantByObjId(Long objId);
+
+
+    /**ervice
+     * 查询震动实时数据
+     * @param emsVibrationInstant
+     * @return
+     */
+    List<EmsVibrationInstant> selectVibrationInstantList(EmsVibrationInstant emsVibrationInstant);
+
+}

os-ems/src/main/java/com/os/ems/record/service/impl/EmsVibrationInstanceServiceImpl.java

@@ -1,93 +0,0 @@
-package com.os.ems.record.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.os.ems.record.mapper.EmsVibrationInstanceMapper;
-import com.os.ems.record.domain.EmsVibrationInstance;
-import com.os.ems.record.service.IEmsVibrationInstanceService;
-
-/**
- * 震动实时数据Service业务层处理
- * 
- * @author ZangCH
- * @date 2024-08-21
- */
-@Service
-public class EmsVibrationInstanceServiceImpl implements IEmsVibrationInstanceService 
-{
-    @Autowired
-    private EmsVibrationInstanceMapper emsVibrationInstanceMapper;
-
-    /**
-     * 查询震动实时数据
-     * 
-     * @param objId 震动实时数据主键
-     * @return 震动实时数据
-     */
-    @Override
-    public EmsVibrationInstance selectEmsVibrationInstanceByObjId(Long objId)
-    {
-        return emsVibrationInstanceMapper.selectEmsVibrationInstanceByObjId(objId);
-    }
-
-    /**
-     * 查询震动实时数据列表
-     * 
-     * @param emsVibrationInstance 震动实时数据
-     * @return 震动实时数据
-     */
-    @Override
-    public List<EmsVibrationInstance> selectEmsVibrationInstanceList(EmsVibrationInstance emsVibrationInstance)
-    {
-        return emsVibrationInstanceMapper.selectEmsVibrationInstanceList(emsVibrationInstance);
-    }
-
-    /**
-     * 新增震动实时数据
-     * 
-     * @param emsVibrationInstance 震动实时数据
-     * @return 结果
-     */
-    @Override
-    public int insertEmsVibrationInstance(EmsVibrationInstance emsVibrationInstance)
-    {
-        return emsVibrationInstanceMapper.insertEmsVibrationInstance(emsVibrationInstance);
-    }
-
-    /**
-     * 修改震动实时数据
-     * 
-     * @param emsVibrationInstance 震动实时数据
-     * @return 结果
-     */
-    @Override
-    public int updateEmsVibrationInstance(EmsVibrationInstance emsVibrationInstance)
-    {
-        return emsVibrationInstanceMapper.updateEmsVibrationInstance(emsVibrationInstance);
-    }
-
-    /**
-     * 批量删除震动实时数据
-     * 
-     * @param objIds 需要删除的震动实时数据主键
-     * @return 结果
-     */
-    @Override
-    public int deleteEmsVibrationInstanceByObjIds(Long[] objIds)
-    {
-        return emsVibrationInstanceMapper.deleteEmsVibrationInstanceByObjIds(objIds);
-    }
-
-    /**
-     * 删除震动实时数据信息
-     * 
-     * @param objId 震动实时数据主键
-     * @return 结果
-     */
-    @Override
-    public int deleteEmsVibrationInstanceByObjId(Long objId)
-    {
-        return emsVibrationInstanceMapper.deleteEmsVibrationInstanceByObjId(objId);
-    }
-}

os-ems/src/main/java/com/os/ems/record/service/impl/EmsVibrationInstantServiceImpl.java

@@ -0,0 +1,103 @@
+package com.os.ems.record.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.os.ems.record.mapper.EmsVibrationInstantMapper;
+import com.os.ems.record.domain.EmsVibrationInstant;
+import com.os.ems.record.service.IEmsVibrationInstantService;
+
+/**
+ * 震动实时数据Service业务层处理
+ * 
+ * @author ZangCH
+ * @date 2024-08-22
+ */
+@Service
+public class EmsVibrationInstantServiceImpl implements IEmsVibrationInstantService 
+{
+    @Autowired
+    private EmsVibrationInstantMapper emsVibrationInstantMapper;
+
+    /**
+     * 查询震动实时数据
+     * 
+     * @param objId 震动实时数据主键
+     * @return 震动实时数据
+     */
+    @Override
+    public EmsVibrationInstant selectEmsVibrationInstantByObjId(Long objId)
+    {
+        return emsVibrationInstantMapper.selectEmsVibrationInstantByObjId(objId);
+    }
+
+    /**
+     * 查询震动实时数据列表
+     * 
+     * @param emsVibrationInstant 震动实时数据
+     * @return 震动实时数据
+     */
+    @Override
+    public List<EmsVibrationInstant> selectEmsVibrationInstantList(EmsVibrationInstant emsVibrationInstant)
+    {
+        return emsVibrationInstantMapper.selectEmsVibrationInstantList(emsVibrationInstant);
+    }
+
+    /**
+     * 新增震动实时数据
+     * 
+     * @param emsVibrationInstant 震动实时数据
+     * @return 结果
+     */
+    @Override
+    public int insertEmsVibrationInstant(EmsVibrationInstant emsVibrationInstant)
+    {
+        return emsVibrationInstantMapper.insertEmsVibrationInstant(emsVibrationInstant);
+    }
+
+    /**
+     * 修改震动实时数据
+     * 
+     * @param emsVibrationInstant 震动实时数据
+     * @return 结果
+     */
+    @Override
+    public int updateEmsVibrationInstant(EmsVibrationInstant emsVibrationInstant)
+    {
+        return emsVibrationInstantMapper.updateEmsVibrationInstant(emsVibrationInstant);
+    }
+
+    /**
+     * 批量删除震动实时数据
+     * 
+     * @param objIds 需要删除的震动实时数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsVibrationInstantByObjIds(Long[] objIds)
+    {
+        return emsVibrationInstantMapper.deleteEmsVibrationInstantByObjIds(objIds);
+    }
+
+    /**
+     * 删除震动实时数据信息
+     * 
+     * @param objId 震动实时数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsVibrationInstantByObjId(Long objId)
+    {
+        return emsVibrationInstantMapper.deleteEmsVibrationInstantByObjId(objId);
+    }
+
+    /**impl
+     * 查询震动实时数据
+     * @param emsVibrationInstant
+     * @return
+     */
+    @Override
+    public List<EmsVibrationInstant> selectVibrationInstantList(EmsVibrationInstant emsVibrationInstant) {
+        return emsVibrationInstantMapper.selectVibrationInstantList(emsVibrationInstant);
+    }
+}

os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.os.ems.record.mapper.EmsVibrationInstanceMapper">
+<mapper namespace="com.os.ems.record.mapper.EmsVibrationInstantMapper">
     
-    <resultMap type="EmsVibrationInstance" id="EmsVibrationInstanceResult">
+    <resultMap type="EmsVibrationInstant" id="EmsVibrationInstantResult">
         <result property="objId"    column="objId"    />
         <result property="collectTime"    column="collectTime"    />
         <result property="sensorId"    column="sensor_id"    />
@@ -16,12 +16,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
     </resultMap>
 
-    <sql id="selectEmsVibrationInstanceVo">
+    <sql id="selectEmsVibrationInstantVo">
         select objId, collectTime, sensor_id, speed, displacement, acceleration, temperature, recodeTime, remark from T_VibrationSensor_Data
     </sql>
 
-    <select id="selectEmsVibrationInstanceList" parameterType="EmsVibrationInstance" resultMap="EmsVibrationInstanceResult">
-        <include refid="selectEmsVibrationInstanceVo"/>
+    <select id="selectVibrationInstantList" parameterType="EmsVibrationInstant" resultMap="EmsVibrationInstantResult">
+        <include refid="selectEmsVibrationInstantVo"/>
+        <where>
+            <if test="objId != null  and objId != ''">and rdi.obj_id = #{objId}</if>
+            <if test="monitorCode != null  and monitorCode != ''">and rdi.monitor_code = #{monitorCode}</if>
+            <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
+                and rdi.collect_time between #{params.beginCollectTime} and #{params.endCollectTime}</if>
+            <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''">
+                and rdi.record_time between #{params.beginRecordTime} and #{params.endRecordTime}</if>
+        </where>
+        order by rdi.collect_time
+    </select>
+
+
+
+    <select id="selectEmsVibrationInstantList" parameterType="EmsVibrationInstant" resultMap="EmsVibrationInstantResult">
+        <include refid="selectEmsVibrationInstantVo"/>
         <where>  
             <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''"> and collectTime between #{params.beginCollectTime} and #{params.endCollectTime}</if>
             <if test="sensorId != null  and sensorId != ''"> and sensor_id = #{sensorId}</if>
@@ -33,12 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectEmsVibrationInstanceByObjId" parameterType="Long" resultMap="EmsVibrationInstanceResult">
-        <include refid="selectEmsVibrationInstanceVo"/>
+    <select id="selectEmsVibrationInstantByObjId" parameterType="Long" resultMap="EmsVibrationInstantResult">
+        <include refid="selectEmsVibrationInstantVo"/>
         where objId = #{objId}
     </select>
         
-    <insert id="insertEmsVibrationInstance" parameterType="EmsVibrationInstance" useGeneratedKeys="true" keyProperty="objId">
+    <insert id="insertEmsVibrationInstant" parameterType="EmsVibrationInstant" useGeneratedKeys="true" keyProperty="objId">
         insert into T_VibrationSensor_Data
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="collectTime != null">collectTime,</if>
@@ -62,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateEmsVibrationInstance" parameterType="EmsVibrationInstance">
+    <update id="updateEmsVibrationInstant" parameterType="EmsVibrationInstant">
         update T_VibrationSensor_Data
         <trim prefix="SET" suffixOverrides=",">
             <if test="collectTime != null">collectTime = #{collectTime},</if>
@@ -77,11 +92,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where objId = #{objId}
     </update>
 
-    <delete id="deleteEmsVibrationInstanceByObjId" parameterType="Long">
+    <delete id="deleteEmsVibrationInstantByObjId" parameterType="Long">
         delete from T_VibrationSensor_Data where objId = #{objId}
     </delete>
 
-    <delete id="deleteEmsVibrationInstanceByObjIds" parameterType="String">
+    <delete id="deleteEmsVibrationInstantByObjIds" parameterType="String">
         delete from T_VibrationSensor_Data where objId in 
         <foreach item="objId" collection="array" open="(" separator="," close=")">
             #{objId}

os-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
         order by so.create_date desc
 	</select>
-	
+
 	<select id="selectDbTableListByNames" resultMap="GenTableResult">
 		SELECT
 		SO.name table_name,