Browse Source

物模型接口补充

lv.wenbin 10 months ago
parent
commit
433123731c

+ 0 - 12
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/DeviceComponentController.java

@@ -61,18 +61,6 @@ public class DeviceComponentController extends BaseController {
     }
 
     /**
-     * 导出能源设备部件列表
-     */
-    @RequiresPermissions("ems:device:export")
-    @Log(title = "能源设备部件", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsDeviceComponent deviceComponent) {
-        List<EmsDeviceComponent> list = deviceComponentService.selectDeviceComponentList(deviceComponent);
-        ExcelUtil<EmsDeviceComponent> util = new ExcelUtil<>(EmsDeviceComponent.class);
-        util.exportExcel(response, list, "能源设备部件数据");
-    }
-
-    /**
      * 获取能源设备部件详细信息
      */
     @RequiresPermissions("ems:device:query")

+ 18 - 16
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/EmsObjAbilityController.java

@@ -24,15 +24,14 @@ import java.util.List;
 
 /**
  * 能源对象能力Controller
- * 
+ *
  * @author ruoyi
  * @date 2024-09-23
  */
 @RestController
 @RequestMapping("/object/ability")
 @Api(value = "EmsObjAbilityController", description = "能源对象能力管理")
-public class EmsObjAbilityController extends BaseController
-{
+public class EmsObjAbilityController extends BaseController {
     @Autowired
     private IEmsObjAbilityService abilityService;
 
@@ -40,8 +39,7 @@ public class EmsObjAbilityController extends BaseController
      * 查询能源对象能力列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(EmsObjAbility objAbility)
-    {
+    public TableDataInfo list(EmsObjAbility objAbility) {
         startPage();
         List<EmsObjAbility> list = abilityService.selectObjAbilityList(objAbility);
         return getDataTable(list);
@@ -52,8 +50,7 @@ public class EmsObjAbilityController extends BaseController
      */
     @Log(title = "能源对象能力", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsObjAbility objAbility)
-    {
+    public void export(HttpServletResponse response, EmsObjAbility objAbility) {
         List<EmsObjAbility> list = abilityService.selectObjAbilityList(objAbility);
         ExcelUtil<EmsObjAbility> util = new ExcelUtil<>(EmsObjAbility.class);
         util.exportExcel(response, list, "能源对象能力数据");
@@ -63,8 +60,7 @@ public class EmsObjAbilityController extends BaseController
      * 获取能源对象能力详细信息
      */
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(abilityService.selectObjAbilityById(id));
     }
 
@@ -73,18 +69,25 @@ public class EmsObjAbilityController extends BaseController
      */
     @Log(title = "能源对象能力", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EmsObjAbility objAbility)
-    {
+    public AjaxResult add(@RequestBody EmsObjAbility objAbility) {
         return toAjax(abilityService.insertObjAbility(objAbility));
     }
 
     /**
+     * 新增能源对象能力
+     */
+    @Log(title = "能源对象能力", businessType = BusinessType.INSERT)
+    @PostMapping("/batch")
+    public AjaxResult addBatch(@RequestBody List<EmsObjAbility> list) {
+        return toAjax(abilityService.insertBatch(list));
+    }
+
+    /**
      * 修改能源对象能力
      */
     @Log(title = "能源对象能力", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody EmsObjAbility objAbility)
-    {
+    public AjaxResult edit(@RequestBody EmsObjAbility objAbility) {
         return toAjax(abilityService.updateObjAbility(objAbility));
     }
 
@@ -92,9 +95,8 @@ public class EmsObjAbilityController extends BaseController
      * 删除能源对象能力
      */
     @Log(title = "能源对象能力", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(abilityService.deleteObjAbilityByIds(ids));
     }
 }

+ 10 - 14
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/EmsObjAttrController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.ems.controller;
 
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -48,18 +46,6 @@ public class EmsObjAttrController extends BaseController
     }
 
     /**
-     * 导出能源对象属性列表
-     */
-    @Log(title = "能源对象属性", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsObjAttr objAttr)
-    {
-        List<EmsObjAttr> list = attrService.selectObjAttrList(objAttr);
-        ExcelUtil<EmsObjAttr> util = new ExcelUtil<>(EmsObjAttr.class);
-        util.exportExcel(response, list, "能源对象属性数据");
-    }
-
-    /**
      * 获取能源对象属性详细信息
      */
     @GetMapping(value = "/{id}")
@@ -79,6 +65,16 @@ public class EmsObjAttrController extends BaseController
     }
 
     /**
+     * 新增能源对象属性
+     */
+    @Log(title = "能源对象属性", businessType = BusinessType.INSERT)
+    @PostMapping("/batch")
+    public AjaxResult addBatch(@RequestBody List<EmsObjAttr> list)
+    {
+        return toAjax(attrService.insertBatch(list));
+    }
+
+    /**
      * 修改能源对象属性
      */
     @Log(title = "能源对象属性", businessType = BusinessType.UPDATE)

+ 16 - 20
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/EmsObjEventController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.ems.controller;
 
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -40,26 +38,14 @@ public class EmsObjEventController extends BaseController
      * 查询能源对象事件列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(EmsObjEvent admEmsObjEvent)
+    public TableDataInfo list(EmsObjEvent objEvent)
     {
         startPage();
-        List<EmsObjEvent> list = objEventService.selectObjEventList(admEmsObjEvent);
+        List<EmsObjEvent> list = objEventService.selectObjEventList(objEvent);
         return getDataTable(list);
     }
 
     /**
-     * 导出能源对象事件列表
-     */
-    @Log(title = "能源对象事件", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsObjEvent admEmsObjEvent)
-    {
-        List<EmsObjEvent> list = objEventService.selectObjEventList(admEmsObjEvent);
-        ExcelUtil<EmsObjEvent> util = new ExcelUtil<>(EmsObjEvent.class);
-        util.exportExcel(response, list, "能源对象事件数据");
-    }
-
-    /**
      * 获取能源对象事件详细信息
      */
     @GetMapping(value = "/{id}")
@@ -73,9 +59,19 @@ public class EmsObjEventController extends BaseController
      */
     @Log(title = "能源对象事件", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EmsObjEvent admEmsObjEvent)
+    public AjaxResult add(@RequestBody EmsObjEvent objEvent)
+    {
+        return toAjax(objEventService.insertObjEvent(objEvent));
+    }
+
+    /**
+     * 新增能源对象事件
+     */
+    @Log(title = "能源对象事件", businessType = BusinessType.INSERT)
+    @PostMapping("/batch")
+    public AjaxResult addBatch(@RequestBody List<EmsObjEvent> list)
     {
-        return toAjax(objEventService.insertObjEvent(admEmsObjEvent));
+        return toAjax(objEventService.insertBatch(list));
     }
 
     /**
@@ -83,9 +79,9 @@ public class EmsObjEventController extends BaseController
      */
     @Log(title = "能源对象事件", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody EmsObjEvent admEmsObjEvent)
+    public AjaxResult edit(@RequestBody EmsObjEvent objEvent)
     {
-        return toAjax(objEventService.updateObjEvent(admEmsObjEvent));
+        return toAjax(objEventService.updateObjEvent(objEvent));
     }
 
     /**

+ 8 - 8
ems-cloud/sql/ems_sys.sql

@@ -197,7 +197,7 @@ insert into sys_menu values ('144',  '手动抄表',       '5',    '4',  'meterR
 INSERT INTO sys_menu VALUES ('151',  '告警策略',       '6',    '1',  'warn-strategy',       'alarm/index',            '', 1, 0, 'C', '0', '0',    'warn:strategy', 'warnstrategy', 'admin', '2024-08-29 15:40:27', 'admin', '2024-08-29 16:01:10', '告警策略');
 INSERT INTO sys_menu VALUES ('152',  '告警列表',       '6',    '2',  'warn-list',           'alarm/alarm-info/index', '', 1, 0, 'C', '0', '0',    'warn:list', 'warnmsg', 'admin', '2024-08-29 15:40:27', 'admin', '2024-08-29 16:01:36', '告警策略');
 INSERT INTO sys_menu VALUES ('153',  '巡检任务',       '6',    '3',  'oper-task',           'task/index',             '', 1, 0, 'C', '0', '0',    'oper-mgr:task', 'task', 'admin', '2024-08-29 15:40:27', 'admin', '2024-08-29 16:02:38', '巡检任务');
-insert into sys_menu values ('154',  '巡检报告',       '6',    '4',  'oper-report',        'task/report/index',        '', 1, 0, 'C', '0', '0',   'oper-mgr:report',        'note',           'admin', sysdate(), '', null, '巡检报告');
+insert into sys_menu values ('154',  '巡检报告',       '6',    '4',  'oper-report',         'task/report/index',      '', 1, 0, 'C', '0', '0',    'oper-mgr:report',        'note',           'admin', sysdate(), '', null, '巡检报告');
 
 insert into sys_menu values ('161',  '建筑区块',       '7',    '1',  'buildingcfg',        '',                       '', 1, 0, 'M', '0', '0',   'basecfg:building',       'building',       'admin', sysdate(), '', null, '用户管理菜单');
 insert into sys_menu values ('162',  '设备设施',       '7',    '2',  'devicecfg',          '',                       '', 1, 0, 'M', '0', '0',   'basecfg:device',         'devicemgr',      'admin', sysdate(), '', null, '用户管理菜单');
@@ -243,16 +243,16 @@ insert into sys_menu values ('1211',  '用能报表',   '121', '2',  'statement-
 insert into sys_menu values ('1212',  '告警报表',   '121', '3',  'statement-warn',    'analysis/statement/warn',     '', 1, 0, 'C', '0', '0',    'analysis:statement:warn',      'warn',     'admin', sysdate(), '', null, '告警报表');
 insert into sys_menu values ('1213',  '自定义',     '121', '4',  'statement-warn',    'analysis/statement/custom',   '', 1, 0, 'C', '0', '0',   'analysis:statement:custom',    'statement-zdy',   'admin', sysdate(), '', null, '自定义报表');
 -- 业务配置菜单
-insert into sys_menu values ('1610',  '地块划分',   '161', '1',  'basecfg-servicearea',    'basecfg/area/index',         '', 1, 0, 'C', '0', '0',   'basecfg:area:list',           'cfgwrite',   'admin', sysdate(), '', null, '服务区配置');
+insert into sys_menu values ('1610',  '地块划分',   '161', '1',  'basecfg-servicearea',    'basecfg/area/index',         '', 1, 0, 'C', '0', '0',   'basecfg:area:list',            'cfgwrite',   'admin', sysdate(), '', null, '服务区配置');
 insert into sys_menu values ('1611',  '建筑配置',   '161', '2',  'basecfg-building',       'basecfg/building/index',     '', 1, 0, 'C', '0', '0',   'basecfg:building:list',        'cfgwrite',   'admin', sysdate(), '', null, '楼宇建筑配置');
 insert into sys_menu values ('1612',  '功能分区',   '161', '3',  'basecfg-zoning',         'basecfg/zoning/index',       '', 1, 0, 'C', '0', '0',   'basecfg:zoning:list',          'cfgwrite',   'admin', sysdate(), '', null, '区块配置');
-insert into sys_menu values ('1620',  '设施类别',   '162', '1',  'basecfg-facscategory',   'basecfg/facscategory/index', '', 1, 0, 'C', '0', '0',   'basecfg:facscategory:list',    'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
-insert into sys_menu values ('1621',  '能源设施',   '162', '2',  'basecfg-facscfg',        'basecfg/emsfacs/index',      '', 1, 0, 'C', '0', '0',   'basecfg:emsfacs:list',         'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
-insert into sys_menu values ('1622',  '能流关系',   '162', '3',  'basecfg-flowrel',        'basecfg/flowrel/index',      '', 1, 0, 'C', '0', '0',   'basecfg:flowrel:list',         'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
-insert into sys_menu values ('1623',  '能源设备',   '162', '4',  'basecfg-devccfg',        'basecfg/device/index',       '', 1, 0, 'C', '0', '0',   'basecfg:device:list',          'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
-insert into sys_menu values ('1624',  '设备模型',   '162', '5',  'basecfg-devmode',        'basecfg/devmode/index',     '', 1, 0, 'C', '0', '0',   'ems:devmode:list',            'cfgwrite',   'admin', sysdate(), '', null, '设备模型');
+insert into sys_menu values ('1620',  '设备模型',   '162', '1',  'basecfg-devmode',        'basecfg/device/model',      '', 1, 0, 'C', '0', '0',   'ems:devmode:list',             'cfgwrite',   'admin', sysdate(), '', null, '设备模型');
+insert into sys_menu values ('1621',  '设施类别',   '162', '2',  'basecfg-facscategory',   'basecfg/facscategory/index', '', 1, 0, 'C', '0', '0',   'basecfg:facscategory:list',    'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
+insert into sys_menu values ('1622',  '能源设施',   '162', '3',  'basecfg-facscfg',        'basecfg/emsfacs/index',      '', 1, 0, 'C', '0', '0',   'basecfg:emsfacs:list',         'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
+insert into sys_menu values ('1623',  '能流关系',   '162', '4',  'basecfg-flowrel',        'basecfg/flowrel/index',      '', 1, 0, 'C', '0', '0',   'basecfg:flowrel:list',         'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
+insert into sys_menu values ('1624',  '能源设备',   '162', '5',  'basecfg-devccfg',        'basecfg/device/model',       '', 1, 0, 'C', '0', '0',   'basecfg:device:list',          'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
 insert into sys_menu values ('1630',  '价格策略',   '163', '1',  'basecfg-electricity',    'basecfg/price/index',        '', 1, 0, 'C', '0', '0',   'basecfg:price:list',           'cfgwrite',   'admin', sysdate(), '', null, '价格策略');
-insert into sys_menu values ('1631',  '计量设备',   '163', '2',  'basecfg-meterdevc',      'basecfg/meterdevc/index',     '', 1, 0, 'C', '0', '0',  'ems:meterdevc:list',           'cfgwrite',   'admin', sysdate(), '', null, '计量设备');
+insert into sys_menu values ('1631',  '计量设备',   '163', '2',  'basecfg-meterdevc',      'basecfg/meterdevc/index',    '', 1, 0, 'C', '0', '0',  'ems:meterdevc:list',            'cfgwrite',   'admin', sysdate(), '', null, '计量设备');
 insert into sys_menu values ('1632',  '碳核算',     '163', '3',  'basecfg-cacfg',          'basecfg/cacfg/index',        '', 1, 0, 'C', '0', '0',   'basecfg:cacfg:list',           'cfgwrite',   'admin', sysdate(), '', null, '碳排因子');
 
 -- 用户管理按钮