Browse Source

接口调整

lv.wenbin 10 months ago
parent
commit
ac2b980ee1

+ 15 - 19
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/AdmEmsDeviceRbookController.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/EmsDeviceRbookController.java

@@ -1,7 +1,6 @@
 package com.ruoyi.ems.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,15 +14,13 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.AdmEmsDeviceRbook;
-import com.ruoyi.ems.service.IAdmEmsDeviceRbookService;
+import com.ruoyi.ems.domain.EmsDeviceRbook;
+import com.ruoyi.ems.service.IEmsDeviceRbookService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 
-import static com.ruoyi.ems.task.BaseTask.log;
-
 /**
  * 设备台账Controller
  * 
@@ -32,22 +29,21 @@ import static com.ruoyi.ems.task.BaseTask.log;
  */
 @RestController
 @RequestMapping("/device/rbook")
-public class AdmEmsDeviceRbookController extends BaseController
+public class EmsDeviceRbookController extends BaseController
 {
     @Autowired
-    private IAdmEmsDeviceRbookService admEmsDeviceRbookService;
+    private IEmsDeviceRbookService admEmsDeviceRbookService;
 
     /**
      * 查询设备台账列表
      */
     @RequiresPermissions("ems:rbook:list")
     @GetMapping("/list")
-    public TableDataInfo list(AdmEmsDeviceRbook admEmsDeviceRbook)
+    public TableDataInfo list(EmsDeviceRbook admEmsDeviceRbook)
     {
         startPage();
-        List<AdmEmsDeviceRbook> list = admEmsDeviceRbookService.selectAdmEmsDeviceRbookList(admEmsDeviceRbook);
+        List<EmsDeviceRbook> list = admEmsDeviceRbookService.selectDeviceRbookList(admEmsDeviceRbook);
         return getDataTable(list);
-
     }
 
     /**
@@ -56,10 +52,10 @@ public class AdmEmsDeviceRbookController extends BaseController
     @RequiresPermissions("ems:rbook:export")
     @Log(title = "设备台账", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmEmsDeviceRbook admEmsDeviceRbook)
+    public void export(HttpServletResponse response, EmsDeviceRbook admEmsDeviceRbook)
     {
-        List<AdmEmsDeviceRbook> list = admEmsDeviceRbookService.selectAdmEmsDeviceRbookList(admEmsDeviceRbook);
-        ExcelUtil<AdmEmsDeviceRbook> util = new ExcelUtil<AdmEmsDeviceRbook>(AdmEmsDeviceRbook.class);
+        List<EmsDeviceRbook> list = admEmsDeviceRbookService.selectDeviceRbookList(admEmsDeviceRbook);
+        ExcelUtil<EmsDeviceRbook> util = new ExcelUtil<EmsDeviceRbook>(EmsDeviceRbook.class);
         util.exportExcel(response, list, "设备台账数据");
     }
 
@@ -70,7 +66,7 @@ public class AdmEmsDeviceRbookController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(admEmsDeviceRbookService.selectAdmEmsDeviceRbookById(id));
+        return success(admEmsDeviceRbookService.selectDeviceRbookById(id));
     }
 
     /**
@@ -79,9 +75,9 @@ public class AdmEmsDeviceRbookController extends BaseController
     @RequiresPermissions("ems:rbook:add")
     @Log(title = "设备台账", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AdmEmsDeviceRbook admEmsDeviceRbook)
+    public AjaxResult add(@RequestBody EmsDeviceRbook admEmsDeviceRbook)
     {
-        return toAjax(admEmsDeviceRbookService.insertAdmEmsDeviceRbook(admEmsDeviceRbook));
+        return toAjax(admEmsDeviceRbookService.insertDeviceRbook(admEmsDeviceRbook));
     }
 
     /**
@@ -90,9 +86,9 @@ public class AdmEmsDeviceRbookController extends BaseController
     @RequiresPermissions("ems:rbook:edit")
     @Log(title = "设备台账", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody AdmEmsDeviceRbook admEmsDeviceRbook)
+    public AjaxResult edit(@RequestBody EmsDeviceRbook admEmsDeviceRbook)
     {
-        return toAjax(admEmsDeviceRbookService.updateAdmEmsDeviceRbook(admEmsDeviceRbook));
+        return toAjax(admEmsDeviceRbookService.updateDeviceRbook(admEmsDeviceRbook));
     }
 
     /**
@@ -103,6 +99,6 @@ public class AdmEmsDeviceRbookController extends BaseController
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(admEmsDeviceRbookService.deleteAdmEmsDeviceRbookByIds(ids));
+        return toAjax(admEmsDeviceRbookService.deleteDeviceRbookByIds(ids));
     }
 }

+ 29 - 14
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/MeterReadingController.java

@@ -14,6 +14,7 @@ import com.ruoyi.ems.util.DateUtils;
 import com.ruoyi.ems.util.exception.Assert;
 import com.ruoyi.ems.util.exception.BusinessException;
 import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -68,10 +69,12 @@ public class MeterReadingController extends BaseController {
     @RequiresPermissions("ems:meterReading:add")
     @Log(title = "抄表记录", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody MeterReading meterRec) {
+    public AjaxResult add(@RequestBody MeterReading nowItem) {
         try {
-            fillData(meterRec);
-            int count = meterReadingService.insert(meterRec);
+            MeterReading lastItem = meterReadingService.selectLastItem(nowItem.getAreaCode(), nowItem.getDeviceCode());
+            checkAdd(lastItem, nowItem);
+            fillData(lastItem, nowItem);
+            int count = meterReadingService.insert(nowItem);
             return toAjax(count);
         }
         catch (BusinessException e) {
@@ -85,14 +88,14 @@ public class MeterReadingController extends BaseController {
     @RequiresPermissions("ems:meterReading:edit")
     @Log(title = "抄表记录", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody MeterReading meterRec) {
+    public AjaxResult edit(@RequestBody MeterReading nowItem) {
         try {
-            MeterReading dbItem = meterReadingService.selectById(meterRec.getId());
-            Assert.notNull(dbItem, -1, "该记录不存在");
-            meterReadingService.deleteById(meterRec.getId());
-            dbItem.setMeterReading(meterRec.getMeterReading());
-            fillData(meterRec);
-            int count = meterReadingService.insert(meterRec);
+            MeterReading lastItem = meterReadingService.selectLastItem(nowItem.getAreaCode(), nowItem.getDeviceCode());
+            checkMod(lastItem, nowItem);
+            meterReadingService.deleteById(nowItem.getId());
+            nowItem.setMeterReading(nowItem.getMeterReading());
+            fillData(lastItem, nowItem);
+            int count = meterReadingService.insert(nowItem);
             return toAjax(count);
         }
         catch (BusinessException e) {
@@ -110,15 +113,27 @@ public class MeterReadingController extends BaseController {
         return toAjax(meterReadingService.deleteById(id));
     }
 
-    private void fillData(MeterReading meterRec) {
-        MeterReading lastItem = meterReadingService.selectLastItem(meterRec.getAreaCode(),
-            meterRec.getDeviceCode());
+    private void checkAdd(MeterReading lastItem, MeterReading nowItem) {
+        if (null != lastItem) {
+            Date date = new Date();
+            String nowMonth = DateUtils.dateToString(date, "yyyyMM");
+            Assert.isTrue(!StringUtils.equals(nowMonth, lastItem.getMeterMonth()), -1, "本月已存在抄表记录");
+            Assert.isTrue(nowItem.getMeterReading() >= lastItem.getMeterReading(), -1, "抄表值不能小于上一条记录");
+        }
+    }
+
+    private void checkMod(MeterReading lastItem, MeterReading nowItem) {
+        if (null != lastItem) {
+            Assert.isTrue(nowItem.getMeterReading() >= lastItem.getMeterReading(), -1, "抄表值不能小于上一条记录");
+        }
+    }
+
+    private void fillData(MeterReading lastItem, MeterReading meterRec) {
         MeterDevice meterDevice = meterDeviceService.selectMeterDeviceByCode(meterRec.getAreaCode(),
             meterRec.getDeviceCode());
         Date date = new Date();
 
         if (null != lastItem) {
-            Assert.isTrue(meterRec.getMeterReading() >= lastItem.getMeterReading(), -1, "抄表值不能小于上一条记录");
             meterRec.setYear(DateUtils.dateToString(date, "yyyy"));
             meterRec.setMeterMonth(DateUtils.dateToString(date, "yyyyMM"));
             meterRec.setLastReading(lastItem.getMeterReading());

+ 1 - 1
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsDeviceRbook.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/EmsDeviceRbook.java

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-09-10
  */
-public class AdmEmsDeviceRbook extends BaseEntity
+public class EmsDeviceRbook extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

+ 11 - 11
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsDeviceRbookMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/EmsDeviceRbookMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsDeviceRbook;
+import com.ruoyi.ems.domain.EmsDeviceRbook;
 
 /**
  * 设备台账Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsDeviceRbook;
  * @author ruoyi
  * @date 2024-09-10
  */
-public interface AdmEmsDeviceRbookMapper 
+public interface EmsDeviceRbookMapper
 {
     /**
      * 查询设备台账
@@ -17,31 +17,31 @@ public interface AdmEmsDeviceRbookMapper
      * @param id 设备台账主键
      * @return 设备台账
      */
-    public AdmEmsDeviceRbook selectAdmEmsDeviceRbookById(Long id);
+     EmsDeviceRbook selectDeviceRbookById(Long id);
 
     /**
      * 查询设备台账列表
      * 
-     * @param admEmsDeviceRbook 设备台账
+     * @param deviceRbook 设备台账
      * @return 设备台账集合
      */
-    public List<AdmEmsDeviceRbook> selectAdmEmsDeviceRbookList(AdmEmsDeviceRbook admEmsDeviceRbook);
+     List<EmsDeviceRbook> selectDeviceRbookList(EmsDeviceRbook deviceRbook);
 
     /**
      * 新增设备台账
      * 
-     * @param admEmsDeviceRbook 设备台账
+     * @param deviceRbook 设备台账
      * @return 结果
      */
-    public int insertAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
+     int insertDeviceRbook(EmsDeviceRbook deviceRbook);
 
     /**
      * 修改设备台账
      * 
-     * @param admEmsDeviceRbook 设备台账
+     * @param deviceRbook 设备台账
      * @return 结果
      */
-    public int updateAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
+     int updateDeviceRbook(EmsDeviceRbook deviceRbook);
 
     /**
      * 删除设备台账
@@ -49,7 +49,7 @@ public interface AdmEmsDeviceRbookMapper
      * @param id 设备台账主键
      * @return 结果
      */
-    public int deleteAdmEmsDeviceRbookById(Long id);
+     int deleteDeviceRbookById(Long id);
 
     /**
      * 批量删除设备台账
@@ -57,5 +57,5 @@ public interface AdmEmsDeviceRbookMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAdmEmsDeviceRbookByIds(Long[] ids);
+     int deleteDeviceRbookByIds(Long[] ids);
 }

+ 11 - 11
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsDeviceRbookService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IEmsDeviceRbookService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsDeviceRbook;
+import com.ruoyi.ems.domain.EmsDeviceRbook;
 
 /**
  * 设备台账Service接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsDeviceRbook;
  * @author ruoyi
  * @date 2024-09-10
  */
-public interface IAdmEmsDeviceRbookService 
+public interface IEmsDeviceRbookService
 {
     /**
      * 查询设备台账
@@ -17,31 +17,31 @@ public interface IAdmEmsDeviceRbookService
      * @param id 设备台账主键
      * @return 设备台账
      */
-    public AdmEmsDeviceRbook selectAdmEmsDeviceRbookById(Long id);
+     EmsDeviceRbook selectDeviceRbookById(Long id);
 
     /**
      * 查询设备台账列表
      * 
-     * @param admEmsDeviceRbook 设备台账
+     * @param deviceRbook 设备台账
      * @return 设备台账集合
      */
-    public List<AdmEmsDeviceRbook> selectAdmEmsDeviceRbookList(AdmEmsDeviceRbook admEmsDeviceRbook);
+     List<EmsDeviceRbook> selectDeviceRbookList(EmsDeviceRbook deviceRbook);
 
     /**
      * 新增设备台账
      * 
-     * @param admEmsDeviceRbook 设备台账
+     * @param deviceRbook 设备台账
      * @return 结果
      */
-    public int insertAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
+     int insertDeviceRbook(EmsDeviceRbook deviceRbook);
 
     /**
      * 修改设备台账
      * 
-     * @param admEmsDeviceRbook 设备台账
+     * @param deviceRbook 设备台账
      * @return 结果
      */
-    public int updateAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
+     int updateDeviceRbook(EmsDeviceRbook deviceRbook);
 
     /**
      * 批量删除设备台账
@@ -49,7 +49,7 @@ public interface IAdmEmsDeviceRbookService
      * @param ids 需要删除的设备台账主键集合
      * @return 结果
      */
-    public int deleteAdmEmsDeviceRbookByIds(Long[] ids);
+     int deleteDeviceRbookByIds(Long[] ids);
 
     /**
      * 删除设备台账信息
@@ -57,5 +57,5 @@ public interface IAdmEmsDeviceRbookService
      * @param id 设备台账主键
      * @return 结果
      */
-    public int deleteAdmEmsDeviceRbookById(Long id);
+     int deleteDeviceRbookById(Long id);
 }

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

@@ -1,96 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-import com.ruoyi.common.core.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.AdmEmsDeviceRbookMapper;
-import com.ruoyi.ems.domain.AdmEmsDeviceRbook;
-import com.ruoyi.ems.service.IAdmEmsDeviceRbookService;
-
-/**
- * 设备台账Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-09-10
- */
-@Service
-public class AdmEmsDeviceRbookServiceImpl implements IAdmEmsDeviceRbookService 
-{
-    @Autowired
-    private AdmEmsDeviceRbookMapper admEmsDeviceRbookMapper;
-
-    /**
-     * 查询设备台账
-     * 
-     * @param id 设备台账主键
-     * @return 设备台账
-     */
-    @Override
-    public AdmEmsDeviceRbook selectAdmEmsDeviceRbookById(Long id)
-    {
-        return admEmsDeviceRbookMapper.selectAdmEmsDeviceRbookById(id);
-    }
-
-    /**
-     * 查询设备台账列表
-     * 
-     * @param admEmsDeviceRbook 设备台账
-     * @return 设备台账
-     */
-    @Override
-    public List<AdmEmsDeviceRbook> selectAdmEmsDeviceRbookList(AdmEmsDeviceRbook admEmsDeviceRbook)
-    {
-        return admEmsDeviceRbookMapper.selectAdmEmsDeviceRbookList(admEmsDeviceRbook);
-    }
-
-    /**
-     * 新增设备台账
-     * 
-     * @param admEmsDeviceRbook 设备台账
-     * @return 结果
-     */
-    @Override
-    public int insertAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook)
-    {
-        admEmsDeviceRbook.setCreateTime(DateUtils.getNowDate());
-        return admEmsDeviceRbookMapper.insertAdmEmsDeviceRbook(admEmsDeviceRbook);
-    }
-
-    /**
-     * 修改设备台账
-     * 
-     * @param admEmsDeviceRbook 设备台账
-     * @return 结果
-     */
-    @Override
-    public int updateAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook)
-    {
-        admEmsDeviceRbook.setUpdateTime(DateUtils.getNowDate());
-        return admEmsDeviceRbookMapper.updateAdmEmsDeviceRbook(admEmsDeviceRbook);
-    }
-
-    /**
-     * 批量删除设备台账
-     * 
-     * @param ids 需要删除的设备台账主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsDeviceRbookByIds(Long[] ids)
-    {
-        return admEmsDeviceRbookMapper.deleteAdmEmsDeviceRbookByIds(ids);
-    }
-
-    /**
-     * 删除设备台账信息
-     * 
-     * @param id 设备台账主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsDeviceRbookById(Long id)
-    {
-        return admEmsDeviceRbookMapper.deleteAdmEmsDeviceRbookById(id);
-    }
-}

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

@@ -0,0 +1,94 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.core.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.ems.mapper.EmsDeviceRbookMapper;
+import com.ruoyi.ems.domain.EmsDeviceRbook;
+import com.ruoyi.ems.service.IEmsDeviceRbookService;
+
+/**
+ * 设备台账Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-09-10
+ */
+@Service
+public class EmsDeviceRbookServiceImpl implements IEmsDeviceRbookService
+{
+    @Autowired
+    private EmsDeviceRbookMapper deviceRbookMapper;
+
+    /**
+     * 查询设备台账
+     * 
+     * @param id 设备台账主键
+     * @return 设备台账
+     */
+    @Override
+    public EmsDeviceRbook selectDeviceRbookById(Long id)
+    {
+        return deviceRbookMapper.selectDeviceRbookById(id);
+    }
+
+    /**
+     * 查询设备台账列表
+     * 
+     * @param deviceRbook 设备台账
+     * @return 设备台账
+     */
+    @Override
+    public List<EmsDeviceRbook> selectDeviceRbookList(EmsDeviceRbook deviceRbook)
+    {
+        return deviceRbookMapper.selectDeviceRbookList(deviceRbook);
+    }
+
+    /**
+     * 新增设备台账
+     * 
+     * @param DeviceRbook 设备台账
+     * @return 结果
+     */
+    @Override
+    public int insertDeviceRbook(EmsDeviceRbook deviceRbook)
+    {
+        return deviceRbookMapper.insertDeviceRbook(deviceRbook);
+    }
+
+    /**
+     * 修改设备台账
+     * 
+     * @param DeviceRbook 设备台账
+     * @return 结果
+     */
+    @Override
+    public int updateDeviceRbook(EmsDeviceRbook deviceRbook)
+    {
+        return deviceRbookMapper.updateDeviceRbook(deviceRbook);
+    }
+
+    /**
+     * 批量删除设备台账
+     * 
+     * @param ids 需要删除的设备台账主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDeviceRbookByIds(Long[] ids)
+    {
+        return deviceRbookMapper.deleteDeviceRbookByIds(ids);
+    }
+
+    /**
+     * 删除设备台账信息
+     * 
+     * @param id 设备台账主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDeviceRbookById(Long id)
+    {
+        return deviceRbookMapper.deleteDeviceRbookById(id);
+    }
+}

+ 79 - 8
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/EmsDeviceServiceImpl.java

@@ -89,8 +89,18 @@ public class EmsDeviceServiceImpl implements IEmsDeviceService {
         List<EmsDevice> list = emsDeviceMapper.selectEmsDeviceList(queryDevice);
 
         if (CollectionUtils.isNotEmpty(list)) {
+            List<Area> areas = areaService.selectAreaList(new Area());
+            Map<String, Area> areaMap = areas.stream()
+                .collect(Collectors.toMap(Area::getAreaCode, Function.identity()));
+            List<AreaBuilding> buildings = buildingService.selectAreaBuildingList(new AreaBuilding());
+            Map<String, AreaBuilding> buildingMap = buildings.stream()
+                .collect(Collectors.toMap(AreaBuilding::getBldgCode, Function.identity()));
+            List<AreaBuildingZoning> zonings = zoningService.selectAreaBuildingZoningList(new AreaBuildingZoning());
+            Map<String, AreaBuildingZoning> zoningMap = zonings.stream()
+                .collect(Collectors.toMap(AreaBuildingZoning::getZoningCode, Function.identity()));
+
             for (EmsDevice device : list) {
-                fillAreaName(device);
+                fillAreaName(device, areaMap, buildingMap, zoningMap);
             }
         }
 
@@ -108,8 +118,18 @@ public class EmsDeviceServiceImpl implements IEmsDeviceService {
         List<EmsDevice> list = emsDeviceMapper.selectByAreaTree(queryDevice);
 
         if (CollectionUtils.isNotEmpty(list)) {
+            List<Area> areas = areaService.selectAreaList(new Area());
+            Map<String, Area> areaMap = areas.stream()
+                .collect(Collectors.toMap(Area::getAreaCode, Function.identity()));
+            List<AreaBuilding> buildings = buildingService.selectAreaBuildingList(new AreaBuilding());
+            Map<String, AreaBuilding> buildingMap = buildings.stream()
+                .collect(Collectors.toMap(AreaBuilding::getBldgCode, Function.identity()));
+            List<AreaBuildingZoning> zonings = zoningService.selectAreaBuildingZoningList(new AreaBuildingZoning());
+            Map<String, AreaBuildingZoning> zoningMap = zonings.stream()
+                .collect(Collectors.toMap(AreaBuildingZoning::getZoningCode, Function.identity()));
+
             for (EmsDevice device : list) {
-                fillAreaName(device);
+                fillAreaName(device, areaMap, buildingMap, zoningMap);
             }
         }
 
@@ -125,6 +145,7 @@ public class EmsDeviceServiceImpl implements IEmsDeviceService {
     @Override
     public List<TreeEntity> getTreeByFacs(QueryDevice queryDevice) {
         List<TreeEntity> retList = new ArrayList<>();
+
         List<Area> areas = areaService.selectAreaList(new Area());
         List<AreaBuilding> buildings = buildingService.selectAreaBuildingList(new AreaBuilding());
         List<AreaBuildingZoning> zonings = zoningService.selectAreaBuildingZoningList(new AreaBuildingZoning());
@@ -161,8 +182,8 @@ public class EmsDeviceServiceImpl implements IEmsDeviceService {
         return retList;
     }
 
-    private List<TreeEntity> buildFacsDevSub(QueryDevice queryParam, List<EmsFacs> facsList, List<Area> areas, List<AreaBuilding> buildings,
-        List<AreaBuildingZoning> zonings) {
+    private List<TreeEntity> buildFacsDevSub(QueryDevice queryParam, List<EmsFacs> facsList, List<Area> areas,
+        List<AreaBuilding> buildings, List<AreaBuildingZoning> zonings) {
         List<TreeEntity> retList = new ArrayList<>();
         Map<String, Area> areaMap = areas.stream().collect(Collectors.toMap(Area::getAreaCode, Function.identity()));
         Map<String, AreaBuilding> buildingMap = buildings.stream()
@@ -189,12 +210,14 @@ public class EmsDeviceServiceImpl implements IEmsDeviceService {
                 else if (StringUtils.equals(AreaTier.Zoning.name(), device.getAreaType())) {
                     AreaBuildingZoning zoning = zoningMap.get(device.getRefArea());
                     AreaBuilding building = zoning != null ? buildingMap.get(zoning.getBldgCode()) : null;
-                    namePrefix = (building != null ? building.getBldgName() : "") + "/"
-                        + (zoning != null ? zoning.getZoningName() : "");
+                    namePrefix = (building != null ? building.getBldgName() : "") + "/" + (zoning != null ?
+                        zoning.getZoningName() :
+                        "");
                 }
 
-                String label = StringUtils.isNotBlank(namePrefix) ? namePrefix + " - " + device.getDeviceName()
-                    : device.getDeviceName();
+                String label = StringUtils.isNotBlank(namePrefix) ?
+                    namePrefix + " - " + device.getDeviceName() :
+                    device.getDeviceName();
 
                 TreeEntity entity = new TreeEntity();
                 entity.setId(device.getDeviceCode());
@@ -314,6 +337,54 @@ public class EmsDeviceServiceImpl implements IEmsDeviceService {
         }
     }
 
+    public void fillAreaName(EmsDevice emsDevice, Map<String, Area> areaMap, Map<String, AreaBuilding> buildingMap,
+        Map<String, AreaBuildingZoning> zoningMap) {
+        if (StringUtils.equals(emsDevice.getAreaType(), AreaTier.Area.name())) {
+            Area area = areaMap.get(emsDevice.getRefArea());
+
+            if (null != area) {
+                emsDevice.setRefAreaName(area.getAreaName());
+                emsDevice.setAreaPath(null != area.getShortName() ? area.getShortName() : area.getAreaName());
+            }
+            else {
+                emsDevice.setRefAreaName("未知");
+                emsDevice.setAreaPath("未知/");
+            }
+        }
+        else if (StringUtils.equals(emsDevice.getAreaType(), AreaTier.Building.name())) {
+            AreaBuilding building = buildingMap.get(emsDevice.getRefArea());
+
+            if (null != building) {
+                emsDevice.setRefAreaName(building.getBldgName());
+                emsDevice.setAreaPath(building.getAreaShortName() + "/" + building.getBldgName());
+            }
+            else {
+                emsDevice.setRefAreaName("未知");
+                emsDevice.setAreaPath("未知/");
+            }
+        }
+        else if (StringUtils.equals(emsDevice.getAreaType(), AreaTier.Zoning.name())) {
+            AreaBuildingZoning zoning = zoningMap.get(emsDevice.getRefArea());
+
+            if (null != zoning) {
+                emsDevice.setRefAreaName(zoning.getZoningName());
+
+                AreaBuilding building = buildingMap.get(zoning.getBldgCode());
+
+                if (null != building) {
+                    emsDevice.setAreaPath(
+                        building.getAreaShortName() + "/" + building.getBldgName() + "/" + zoning.getZoningName());
+                }
+                else {
+                    emsDevice.setAreaPath("未知/");
+                }
+            }
+            else {
+                emsDevice.setRefAreaName("未知");
+            }
+        }
+    }
+
     @Override
     public List<Map<String, Object>> cntDeviceStatus(String areaCode) {
         return emsDeviceMapper.cntDeviceStatus(areaCode);

+ 25 - 9
ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsDeviceRbookMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsDeviceRbookMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.AdmEmsDeviceRbookMapper">
-    <resultMap type="com.ruoyi.ems.domain.AdmEmsDeviceRbook" id="AdmEmsDeviceRbookResult">
+<mapper namespace="com.ruoyi.ems.mapper.EmsDeviceRbookMapper">
+    <resultMap type="com.ruoyi.ems.domain.EmsDeviceRbook" id="deviceRbookResult">
         <result property="id" column="id"/>
         <result property="recordCode" column="record_code"/>
         <result property="objType" column="obj_type"/>
@@ -17,8 +17,22 @@
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
-    <sql id="selectAdmEmsDeviceRbookVo"> select id, record_code, obj_type, obj_code, obj_name, record_time, ins_location, maintain_title, maintain_content, maintain_person, create_time, update_time from adm_ems_device_rbook </sql>
-    <select id="selectAdmEmsDeviceRbookList" parameterType="com.ruoyi.ems.domain.AdmEmsDeviceRbook" resultMap="AdmEmsDeviceRbookResult">
+    <sql id="selectAdmEmsDeviceRbookVo">
+        select id,
+               record_code,
+               obj_type,
+               obj_code,
+               obj_name,
+               record_time,
+               ins_location,
+               maintain_title,
+               maintain_content,
+               maintain_person,
+               create_time,
+               update_time
+        from adm_ems_device_rbook
+    </sql>
+    <select id="selectDeviceRbookList" parameterType="com.ruoyi.ems.domain.EmsDeviceRbook" resultMap="deviceRbookResult">
         <include refid="selectAdmEmsDeviceRbookVo"/>
         <where>
             <if test="recordCode != null and recordCode != ''"> and record_code = #{recordCode}</if>
@@ -32,11 +46,11 @@
             <if test="maintainPerson != null and maintainPerson != ''"> and maintain_person = #{maintainPerson}</if>
         </where>
     </select>
-    <select id="selectAdmEmsDeviceRbookById" parameterType="Long" resultMap="AdmEmsDeviceRbookResult">
+    <select id="selectDeviceRbookById" parameterType="Long" resultMap="deviceRbookResult">
         <include refid="selectAdmEmsDeviceRbookVo"/>
         where id = #{id}
     </select>
-    <insert id="insertAdmEmsDeviceRbook" parameterType="com.ruoyi.ems.domain.AdmEmsDeviceRbook" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertDeviceRbook" parameterType="com.ruoyi.ems.domain.EmsDeviceRbook" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_device_rbook
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="recordCode != null and recordCode != ''">record_code,</if>
@@ -65,7 +79,7 @@
             <if test="updateTime != null">#{updateTime},</if>
         </trim>
     </insert>
-    <update id="updateAdmEmsDeviceRbook" parameterType="com.ruoyi.ems.domain.AdmEmsDeviceRbook">
+    <update id="updateDeviceRbook" parameterType="com.ruoyi.ems.domain.EmsDeviceRbook">
         update adm_ems_device_rbook
         <trim prefix="SET" suffixOverrides=",">
             <if test="recordCode != null and recordCode != ''">record_code = #{recordCode},</if>
@@ -84,8 +98,10 @@
         where id = #{id}
         
     </update>
-    <delete id="deleteAdmEmsDeviceRbookById" parameterType="Long"> delete from adm_ems_device_rbook where id = #{id} </delete>
-    <delete id="deleteAdmEmsDeviceRbookByIds" parameterType="String">
+    <delete id="deleteDeviceRbookById" parameterType="Long">
+        delete from adm_ems_device_rbook where id = #{id}
+    </delete>
+    <delete id="deleteDeviceRbookByIds" parameterType="String">
         delete from adm_ems_device_rbook where id in
         <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach>
     </delete>