Browse Source

设备模型接口提交

lv.wenbin 10 months ago
parent
commit
836e05d1bc

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
@@ -48,24 +49,21 @@ public class EmsObjModelController extends BaseController
     }
 
     /**
-     * 导出能源对象属性列表
+     * 获取能源对象属性详细信息
      */
-    @Log(title = "能源对象属性", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsObjModel objModel)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        List<EmsObjModel> list = objModelService.selectObjModelList(objModel);
-        ExcelUtil<EmsObjModel> util = new ExcelUtil<>(EmsObjModel.class);
-        util.exportExcel(response, list, "能源对象属性数据");
+        return success(objModelService.selectObjModelById(id));
     }
 
     /**
      * 获取能源对象属性详细信息
      */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    @GetMapping(value = "/getByModelCode")
+    public AjaxResult getInfo(@RequestParam(name="modeCode") String modeCode)
     {
-        return success(objModelService.selectObjModelById(id));
+        return success(objModelService.selectByModelCode(modeCode));
     }
 
     /**

+ 8 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/EmsObjModelMapper.java

@@ -21,6 +21,14 @@ public interface EmsObjModelMapper
      EmsObjModel selectObjModelById(Long id);
 
     /**
+     * 查询能源对象属性
+     *
+     * @param code 能源对象属性code
+     * @return 能源对象属性
+     */
+    EmsObjModel selectByModelCode(String code);
+
+    /**
      * 查询能源对象属性列表
      * 
      * @param emsObjModel 能源对象属性

+ 8 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IEmsObjModelService.java

@@ -20,6 +20,14 @@ public interface IEmsObjModelService {
     EmsObjModel selectObjModelById(Long id);
 
     /**
+     * 查询能源对象属性
+     *
+     * @param code 能源对象属性code
+     * @return 能源对象属性
+     */
+    EmsObjModel selectByModelCode(String code);
+
+    /**
      * 查询能源对象属性列表
      *
      * @param objModel 能源对象属性

+ 13 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/EmsObjModelServiceImpl.java

@@ -50,6 +50,19 @@ public class EmsObjModelServiceImpl implements IEmsObjModelService {
         return objModel;
     }
 
+    @Override
+    public EmsObjModel selectByModelCode(String code) {
+        EmsObjModel objModel = objModelMapper.selectByModelCode(code);
+
+        if (null != objModel) {
+            objModel.setAttrList(attrService.selectByModelCode(objModel.getModelCode()));
+            objModel.setAbilityList(abilityService.selectByModelCode(objModel.getModelCode()));
+            objModel.setEventList(eventService.selectByModelCode(objModel.getModelCode()));
+        }
+
+        return objModel;
+    }
+
     /**
      * 查询能源对象属性列表
      *

+ 5 - 0
ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsObjModelMapper.xml

@@ -28,6 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectObjModelVo"/>
         where id = #{id}
     </select>
+
+    <select id="selectByModelCode" parameterType="String" resultMap="objModelResult">
+        <include refid="selectObjModelVo"/>
+        where model_code = #{code}
+    </select>
         
     <insert id="insertObjModel" parameterType="com.ruoyi.ems.domain.EmsObjModel" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_obj_model

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

@@ -250,7 +250,7 @@ insert into sys_menu values ('1620',  '设备模型',   '162', '1',  'basecfg-de
 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 ('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, '计量设备');
 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, '碳排因子');