Browse Source

设备查询精细化

lv.wenbin 10 months ago
parent
commit
6ee5ec4457

+ 15 - 20
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/EmsFacsController.java

@@ -37,8 +37,7 @@ import io.swagger.annotations.Api;
 @RestController
 @RequestMapping("/basecfg/emsfacs")
 @Api(value = "EmsFacsController", description = "能源设施管理")
-public class EmsFacsController extends BaseController
-{
+public class EmsFacsController extends BaseController {
     @Autowired
     private IEmsFacsService emsFacsService;
 
@@ -47,8 +46,7 @@ public class EmsFacsController extends BaseController
      */
     @RequiresPermissions("basecfg:emsfacs:list")
     @GetMapping("/list")
-    public TableDataInfo list(EmsFacs emsFacs)
-    {
+    public TableDataInfo list(EmsFacs emsFacs) {
         startPage();
         List<EmsFacs> list = emsFacsService.selectEmsFacsList(emsFacs);
         return getDataTable(list);
@@ -60,8 +58,7 @@ public class EmsFacsController extends BaseController
     @RequiresPermissions("basecfg:emsfacs:export")
     @Log(title = "能源设施/系统", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsFacs emsFacs)
-    {
+    public void export(HttpServletResponse response, EmsFacs emsFacs) {
         List<EmsFacs> list = emsFacsService.selectEmsFacsList(emsFacs);
         ExcelUtil<EmsFacs> util = new ExcelUtil<EmsFacs>(EmsFacs.class);
         util.exportExcel(response, list, "能源设施/系统数据");
@@ -72,8 +69,7 @@ public class EmsFacsController extends BaseController
      */
     @RequiresPermissions("basecfg:emsfacs:query")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(emsFacsService.selectEmsFacsById(id));
     }
 
@@ -83,8 +79,7 @@ public class EmsFacsController extends BaseController
     @RequiresPermissions("basecfg:emsfacs:add")
     @Log(title = "能源设施/系统", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EmsFacs emsFacs)
-    {
+    public AjaxResult add(@RequestBody EmsFacs emsFacs) {
         return toAjax(emsFacsService.insertEmsFacs(emsFacs));
     }
 
@@ -94,8 +89,7 @@ public class EmsFacsController extends BaseController
     @RequiresPermissions("basecfg:emsfacs:edit")
     @Log(title = "能源设施/系统", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody EmsFacs emsFacs)
-    {
+    public AjaxResult edit(@RequestBody EmsFacs emsFacs) {
         return toAjax(emsFacsService.updateEmsFacs(emsFacs));
     }
 
@@ -104,23 +98,24 @@ public class EmsFacsController extends BaseController
      */
     @RequiresPermissions("basecfg:emsfacs:remove")
     @Log(title = "能源设施/系统", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(emsFacsService.deleteEmsFacsByIds(ids));
     }
 
     /**
      * 获取所有能源设施/系统列表
+     *
      * @return 能源设施/系统列表
      */
     @GetMapping("/listall")
-    public AjaxResult listAll(@RequestParam(name = "refArea", required = false) String refArea) {
+    public AjaxResult listAll(@RequestParam(name = "refArea", required = false) String refArea,
+        @RequestParam(name = "facsCategory", required = false) String facsCategory,
+        @RequestParam(name = "subCategory", required = false) String subCategory) {
         EmsFacs emsFacs = new EmsFacs();
-
-        if (StringUtils.isNotBlank(refArea)) {
-            emsFacs.setRefArea(refArea);
-        }
+        emsFacs.setRefArea(refArea);
+        emsFacs.setFacsCategory(facsCategory);
+        emsFacs.setFacsSubCategory(subCategory);
 
         return success(emsFacsService.selectEmsFacsList(emsFacs));
     }

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

@@ -61,9 +61,9 @@ public class EmsObjModelController extends BaseController
      * 获取能源对象属性详细信息
      */
     @GetMapping(value = "/getByModelCode")
-    public AjaxResult getInfo(@RequestParam(name="modeCode") String modeCode)
+    public AjaxResult getInfo(@RequestParam(name="modelCode") String modelCode)
     {
-        return success(objModelService.selectByModelCode(modeCode));
+        return success(objModelService.selectByModelCode(modelCode));
     }
 
     /**

+ 6 - 6
ems-cloud/sql/ems_init_data.sql

@@ -110,13 +110,13 @@ INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_sub
 INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('E503', '主路-光伏',   'E', 'E5', 1, '321283124S3003', 'M_E503');
 INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('C101', '北区-储能',   'C', 'C1', 1, '321283124S3001', 'M_C101');
 INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('C102', '南区-储能',   'C', 'C1', 1, '321283124S3002', 'M_C102');
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z101', '北区-室内照明', 'Z', 'Z001', 1, '321283124S3001', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z102', '北区-室外照明', 'Z', 'Z002', 1, '321283124S3001', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z110', '北区-公共设施', 'Z', 'Z010', 1, '321283124S3001', null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z101', '北区-室内照明', 'Z', 'Z010', 1, '321283124S3001', null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z102', '北区-室外照明', 'Z', 'Z010', 1, '321283124S3001', null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z110', '北区-公共设施', 'Z', 'Z040', 1, '321283124S3001', null);
 INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z120', '北区-空调设施', 'Z', 'Z020', 1, '321283124S3001', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z201', '南区-室内照明', 'Z', 'Z001', 1, '321283124S3002', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z202', '南区-室外照明', 'Z', 'Z002', 1, '321283124S3002', null);
-INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z210', '南区-公共设施', 'Z', 'Z010', 1, '321283124S3002', null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z201', '南区-室内照明', 'Z', 'Z010', 1, '321283124S3002', null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z202', '南区-室外照明', 'Z', 'Z010', 1, '321283124S3002', null);
+INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z210', '南区-公共设施', 'Z', 'Z040', 1, '321283124S3002', null);
 INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_category`, `facs_subcategory`, `enable`, `ref_area`, `facs_model`) VALUES ('Z220', '南区-空调设施', 'Z', 'Z020', 1, '321283124S3002', null);