设备详情和去除物联网token

src/main/java/com/zoniot/ccrc/controller/system/DeviceController.java

@@ -124,6 +124,16 @@ public class DeviceController {
         return new AjaxMessage<>(ResultStatus.OK, list);
     }
 
+    @ResponseBody
+    @GetMapping("/deviceDetailV2")
+    @ApiOperation(value = "设备详情V2")
+    public AjaxMessage<DeviceDto> deviceDetailV2(
+            @ApiParam(value = "设备id", required = true) @RequestParam(required = true) Long deviceId
+    ) {
+        DeviceDto device = deviceService.deviceDetailV2(deviceId);
+        return new AjaxMessage<>(ResultStatus.OK, device);
+    }
+
     @ResponseBody
     @GetMapping("/getData")
     @ApiOperation(value = "获取设备数据")

src/main/java/com/zoniot/ccrc/dao/DeviceMapper.java

@@ -81,4 +81,6 @@ public interface DeviceMapper {
     List<PriceInfo> getPriceInfo();
 
     Device findByDeviceId(@Param("deviceId") Long deviceId);
+
+    DeviceDto findDeviceDetail(@Param("deviceId") Long deviceId);
 }

src/main/java/com/zoniot/ccrc/service/DeviceService.java

@@ -28,4 +28,6 @@ public interface DeviceService{
     List<BuildingSelectDto> deviceAreaList(Integer sysId, Integer deviceTypeId, Integer orgId, Integer province, Integer city, Integer region, Integer communityId, Integer buildingId, String deviceNo, String clientName, String locDesc, Integer status, Integer valveStatus);
 
     void syncDevice(DeviceData deviceData);
+
+    DeviceDto deviceDetailV2(Long deviceId);
 }

src/main/java/com/zoniot/ccrc/service/impl/DeviceServiceImpl.java

@@ -140,6 +140,11 @@ public class DeviceServiceImpl implements DeviceService{
         return buildingService.areaList(list);
     }
 
+    @Override
+    public DeviceDto deviceDetailV2(Long deviceId) {
+        return deviceMapper.findDeviceDetail(deviceId);
+    }
+
     @Override
     public void syncDevice(DeviceData deviceData) {
 

src/main/resources/mapper/DeviceMapper.xml

@@ -647,4 +647,30 @@
   <select id="findByDeviceId" resultMap="BaseResultMap">
     select * from sc_device where status = 1 and id = #{deviceId}
   </select>
+
+  <select id="findDeviceDetail" resultType="com.zoniot.ccrc.dto.DeviceDto">
+    select
+            sd.*,
+            sb.name as building_name,
+            sc.name as community_name,
+            so.name as org_name,
+            sdt.equipment_type,
+            sdt.model,
+            sdt.is_valve,
+            sdm.name manufacturer_name,
+            sgm.customer_no,
+            sgm.customer_phone,
+            sgm.customer_name,
+            sgm.label,
+            su.username
+    from sc_device sd
+                 left join sc_building sb on(sb.id = sd.building_id)
+                 left join sc_community sc on(sc.id = sd.community_id)
+                 left join sc_organization so on(so.id = sc.org_id)
+                 left join sc_device_type sdt on(sdt.id = sd.device_type_id)
+                 left join sc_device_manufacturer sdm on(sdm.id = sd.manufacturer_id)
+                 left join sc_grid_management sgm on(sgm.device_id = sd.id)
+                 left join sc_user su on(su.id = sgm.user_id)
+    where sd.status = 1 and sd.id = #{deviceId}
+  </select>
 </mapper>