Browse Source

用能指标支持时间范围查询

lv.wenbin 10 months ago
parent
commit
bad4371e6f

+ 1 - 1
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/CommonController.java

@@ -96,7 +96,7 @@ public class CommonController extends BaseController {
 
 
     @GetMapping("/devProcess")
-    @ApiOperation(value = "getEmsTag", notes = "维表-查询标签列表")
+    @ApiOperation(value = "getDevProcess", notes = "维表-查询工艺类型")
     public AjaxResult getDevProcess(DevProcess devProcess)
     {
         List<DevProcess> list =  processService.selectDevProcessList(devProcess);

+ 8 - 8
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/ElecStoreController.java

@@ -42,9 +42,9 @@ public class ElecStoreController extends BaseController {
      * 查询储能计量-小时列表
      */
     @GetMapping("/hour/list")
-    public TableDataInfo listHour(ElecStoreH admEmsElecStoreH) {
+    public TableDataInfo listHour(ElecStoreH elecStoreH) {
         startPage();
-        List<ElecStoreH> list = elecStoreService.selectHourList(admEmsElecStoreH);
+        List<ElecStoreH> list = elecStoreService.selectHourList(elecStoreH);
         return getDataTable(list);
     }
 
@@ -62,8 +62,8 @@ public class ElecStoreController extends BaseController {
      */
     @Log(title = "储能计量-小时", businessType = BusinessType.EXPORT)
     @PostMapping("/hour/export")
-    public void export(HttpServletResponse response, ElecStoreH admEmsElecStoreH) {
-        List<ElecStoreH> list = elecStoreService.selectHourList(admEmsElecStoreH);
+    public void export(HttpServletResponse response, ElecStoreH elecStoreH) {
+        List<ElecStoreH> list = elecStoreService.selectHourList(elecStoreH);
         ExcelUtil<ElecStoreH> util = new ExcelUtil<ElecStoreH>(ElecStoreH.class);
         util.exportExcel(response, list, "储能计量-小时数据");
     }
@@ -82,8 +82,8 @@ public class ElecStoreController extends BaseController {
     @RequiresPermissions("power-mgr:gs:add")
     @Log(title = "储能计量-小时", businessType = BusinessType.INSERT)
     @PostMapping("/hour")
-    public AjaxResult add(@RequestBody ElecStoreH admEmsElecStoreH) {
-        return toAjax(elecStoreService.insertHour(admEmsElecStoreH));
+    public AjaxResult add(@RequestBody ElecStoreH elecStoreH) {
+        return toAjax(elecStoreService.insertHour(elecStoreH));
     }
 
     /**
@@ -92,8 +92,8 @@ public class ElecStoreController extends BaseController {
     @RequiresPermissions("power-mgr:gs:edit")
     @Log(title = "储能计量-小时", businessType = BusinessType.UPDATE)
     @PutMapping("/hour")
-    public AjaxResult edit(@RequestBody ElecStoreH admEmsElecStoreH) {
-        return toAjax(elecStoreService.updateHour(admEmsElecStoreH));
+    public AjaxResult edit(@RequestBody ElecStoreH elecStoreH) {
+        return toAjax(elecStoreService.updateHour(elecStoreH));
     }
 
     /**

+ 6 - 0
ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/ElecUseHMapper.xml

@@ -48,7 +48,13 @@
             <if test="time != null ">and u.`time` = #{time}</if>
             <if test="timeIndex != null ">and u.time_index = #{timeIndex}</if>
             <if test="elecQuantity != null ">and u.elec_quantity = #{elecQuantity}</if>
+            <if test="startRecTime != null  and startRecTime != '' and endRecTime != null and endRecTime !=''">
+                and u.`record_time` &gt;= #{startRecTime} and u.`record_time` &lt;= #{endRecTime}
+            </if>
         </where>
+        ORDER BY u.`date` DESC,
+        u.`time` DESC,
+        u.`time_index`
     </select>
 
     <select id="selectElecUseHById" parameterType="Long" resultMap="elecUseHResult">