月能月报右侧树形数据添加

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceController.java

@@ -237,5 +237,17 @@ public class DeviceController {
         deviceService.deviceImport(file);
         return ApiResult.success();
     }
+
+    /**
+     *  数据管理-需量分析-用能月报查询
+     * @param siteId 站点ID
+     * @return
+     */
+    @GetMapping("deviceBoxList")
+    public ApiResult<List<DeviceOneVo>> deviceBoxList(@RequestParam (required = false) Integer siteId) {
+        return ApiResult.success(deviceService.deviceBoxList(siteId));
+    }
+
+
 }
 

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/DeviceMapper.java

@@ -5,6 +5,7 @@ import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.model.DeviceList;
 import com.bizmatics.model.vo.CorrespondDeviceVO;
+import com.bizmatics.model.vo.DeviceOneVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -55,5 +56,7 @@ public interface DeviceMapper extends CrudMapper<Device> {
 
     List<DeviceAnalogVariableList> deviceAnalogVariableList(@Param("siteId") Integer siteId);
 
+    List<DeviceOneVo> deviceBoxList(@Param("siteId") Integer siteId);
+
 
 }

fiveep-persistence/src/main/resources/mapper/mysql/DeviceMapper.xml

@@ -144,4 +144,23 @@
         </where>
     </select>
 
+    <select id="deviceBoxList" resultType="com.bizmatics.model.vo.DeviceOneVo">
+        SELECT
+        a.monitor_device_name as device_name, c.device_code
+        FROM
+        device_attribute AS a
+        LEFT JOIN device_analog_variable_list AS b ON a.id = b.monitoring_equipment
+        JOIN device AS c ON b.communication_equipment = c.id
+        <where>
+            a.status = 1
+            AND b.status = 1
+            AND c.enable = 1
+            <if test="siteId != null and siteId != 0">
+                AND a.site_id = #{siteId}
+            </if>
+        </where>
+        GROUP BY
+        a.id
+    </select>
+
 </mapper>

fiveep-service/src/main/java/com/bizmatics/service/DeviceService.java

@@ -64,4 +64,7 @@ public interface DeviceService extends CrudService<Device> {
     String correspondDeviceExport(String deviceName);
 
     void deviceImport(MultipartFile multipartFile);
+
+
+    List<DeviceOneVo> deviceBoxList(Integer siteId);
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java

@@ -149,6 +149,13 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
         return deviceOneVo;
     }
 
+    @Override
+    public List<DeviceOneVo> deviceBoxList(Integer siteId){
+        List<DeviceOneVo> deviceOneVo = baseMapper.deviceBoxList(siteId);
+        return deviceOneVo;
+    }
+
+
     @Override
     public void correspondDeviceAdd(Device device) {
         SysUser user = SecurityUtils.getLoginUser().getUser();