Browse Source

增加设备模型下拉接口

lv.wenbin 10 months ago
parent
commit
b73d03f3c2

+ 15 - 16
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/EmsObjModelController.java

@@ -25,15 +25,14 @@ import java.util.List;
 
 /**
  * 能源对象属性Controller
- * 
+ *
  * @author ruoyi
  * @date 2024-09-23
  */
 @RestController
 @RequestMapping("/object/model")
 @Api(value = "EmsObjModelController", description = "能源对象模型管理")
-public class EmsObjModelController extends BaseController
-{
+public class EmsObjModelController extends BaseController {
     @Autowired
     private IEmsObjModelService objModelService;
 
@@ -41,19 +40,23 @@ public class EmsObjModelController extends BaseController
      * 查询能源对象属性列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(EmsObjModel objModel)
-    {
+    public TableDataInfo list(EmsObjModel objModel) {
         startPage();
         List<EmsObjModel> list = objModelService.selectObjModelList(objModel);
         return getDataTable(list);
     }
 
+    @GetMapping("/listAll")
+    public AjaxResult listAll(EmsObjModel objModel) {
+        List<EmsObjModel> list = objModelService.selectObjModelList(objModel);
+        return success(list);
+    }
+
     /**
      * 获取能源对象属性详细信息
      */
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(objModelService.selectObjModelById(id));
     }
 
@@ -61,8 +64,7 @@ public class EmsObjModelController extends BaseController
      * 获取能源对象属性详细信息
      */
     @GetMapping(value = "/getByModelCode")
-    public AjaxResult getInfo(@RequestParam(name="modelCode") String modelCode)
-    {
+    public AjaxResult getInfo(@RequestParam(name = "modelCode") String modelCode) {
         return success(objModelService.selectByModelCode(modelCode));
     }
 
@@ -71,8 +73,7 @@ public class EmsObjModelController extends BaseController
      */
     @Log(title = "能源对象属性", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EmsObjModel objModel)
-    {
+    public AjaxResult add(@RequestBody EmsObjModel objModel) {
         return toAjax(objModelService.insertObjModel(objModel));
     }
 
@@ -81,8 +82,7 @@ public class EmsObjModelController extends BaseController
      */
     @Log(title = "能源对象属性", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody EmsObjModel objModel)
-    {
+    public AjaxResult edit(@RequestBody EmsObjModel objModel) {
         return toAjax(objModelService.updateObjModel(objModel));
     }
 
@@ -90,9 +90,8 @@ public class EmsObjModelController 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(objModelService.deleteObjModelByIds(ids));
     }
 }

+ 2 - 0
ems-cloud/sql/ems_init_data.sql

@@ -127,6 +127,7 @@ INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`) VALUES
 INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`) VALUES ('M_E503', '主路光伏设施模型', 1);
 INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`) VALUES ('M_C101', '北区储能模型', 1);
 INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`) VALUES ('M_C102', '南区储能模型', 1);
+INSERT INTO `adm_ems_obj_model` (`model_code`, `model_name`, `obj_type`) VALUES ('M_Z010', '照明设备模型', 2);
 
 -- 对象属性DEMO数据
 INSERT INTO `adm_ems_obj_attr` (`model_code`, `attr_key`, `attr_name`, `attr_value`, `attr_unit`) VALUES ('M_W2',    'voltageLevel',      '电压等级', '10', 'kV');
@@ -135,6 +136,7 @@ INSERT INTO `adm_ems_obj_attr` (`model_code`, `attr_key`, `attr_name`, `attr_val
 INSERT INTO `adm_ems_obj_attr` (`model_code`, `attr_key`, `attr_name`, `attr_value`, `attr_unit`) VALUES ('M_E503',  'installedCapacity', '装机容量', '150', 'kw');
 INSERT INTO `adm_ems_obj_attr` (`model_code`, `attr_key`, `attr_name`, `attr_value`, `attr_unit`) VALUES ('M_C101',  'storageCapacity',   '储能容量', '100', 'kW-h');
 INSERT INTO `adm_ems_obj_attr` (`model_code`, `attr_key`, `attr_name`, `attr_value`, `attr_unit`) VALUES ('M_C102',  'storageCapacity',   '储能容量', '100', 'kW-h');
+INSERT INTO `adm_ems_obj_attr` (`model_code`, `attr_key`, `attr_name`, `attr_value`, `attr_unit`) VALUES ('M_Z010',  'power',   '功率', '100', 'kW-h');
 
 -- 对象能力DEMO数据
 INSERT INTO `adm_ems_obj_ability` (`model_code`, `ability_key`, `ability_name`, `ability_desc`, `ability_param`) VALUES ('M_W2', 'checkLine', '线路检测', '执行xx方法进行测试', '{\"enable\":\"1\"}');

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

@@ -247,9 +247,9 @@ insert into sys_menu values ('1610',  '地块划分',   '161', '1',  'basecfg-se
 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-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 ('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-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-facscfg',        'basecfg/emsfacs/index',      '', 1, 0, 'C', '0', '0',   'basecfg:emsfacs:list',         'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
 insert into sys_menu values ('1624',  '能源设备',   '162', '5',  'basecfg-devccfg',        'basecfg/device/index',       '', 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, '计量设备');