Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/devicegroup/IotDeviceGroupController.java

@@ -1,15 +1,22 @@
 package cn.iocoder.yudao.module.pms.controller.admin.devicegroup;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.vo.IotInspectOrderRespVO;
+import cn.iocoder.yudao.module.pms.ThingsModelDTO;
+import cn.iocoder.yudao.module.pms.controller.admin.TableDataInfo;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.devicegroup.IotDeviceGroupDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.devicegroup.IotDeviceGroupDetailDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDetailDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.tdparams.IotTdParamsDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.tdparams.IotTdParamsMapper;
+import cn.iocoder.yudao.module.pms.service.IotDeviceService;
 import cn.iocoder.yudao.module.pms.service.devicegroup.IotDeviceGroupDetailService;
 import cn.iocoder.yudao.module.pms.service.devicegroup.IotDeviceGroupService;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import com.alibaba.fastjson.JSON;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -19,7 +26,6 @@ import io.swagger.v3.oas.annotations.Operation;
 
 import java.util.*;
 import java.io.IOException;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -31,6 +37,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -51,6 +58,16 @@ public class IotDeviceGroupController {
     private IotDeviceGroupDetailService iotDeviceGroupDetailService;
     @Autowired
     private DeptApi deptApi;
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+    @Autowired
+    private IotTdParamsMapper iotTdParamsMapper;
+    @Value("${yanfan.url}")
+    private String yanfanUrl;
+    @Resource
+    private IotDeviceService iotDeviceService;
+    @Resource
+    private RestTemplate restTemplate;
 
     @PostMapping("/create")
     @Operation(summary = "创建PMS成套")
@@ -140,4 +157,22 @@ public class IotDeviceGroupController {
         return success(new PageResult<>(collect, deviceGroupList.getTotal()));
 //        return success(deviceGroupList);
     }
+
+    @GetMapping("/td/{id}")
+    @Operation(summary = "获得某设备的成套信息")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('rq:iot-device-group:query')")
+    public CommonResult<Map<String, Object>> getIotDeviceGroupDetail(@PathVariable("id") Long id) {
+        List<IotDeviceGroupDetailDO> details = iotDeviceGroupDetailService.getIotDeviceGroupDetailListByGroupId(id);
+        Map<String, Object> resultMap = new HashMap<>();
+        details.forEach(e ->{
+            IotDeviceDO iotDevice = iotDeviceService.getIotDevice(e.getDeviceId());
+            TableDataInfo tableDataInfo = restTemplate.getForObject(yanfanUrl + "/prod-api/iot/device/listThingsModel?deviceId="+iotDevice.getYfDeviceId()+"&pageNum=1&pageSize=200", TableDataInfo.class);
+            if (Objects.nonNull(tableDataInfo)) {
+                List<ThingsModelDTO> rows = JSON.parseArray(JSON.toJSONString(tableDataInfo.getRows()), ThingsModelDTO.class);
+                resultMap.put(e.getDeviceCode(), rows);
+            }
+        });
+        return success(resultMap);
+    }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/devicegroup/IotDeviceGroupRespVO.java

@@ -37,6 +37,7 @@ public class IotDeviceGroupRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
+    private String type;
 
     private String deptName;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/devicegroup/IotDeviceGroupSaveReqVO.java

@@ -25,7 +25,7 @@ public class IotDeviceGroupSaveReqVO {
     @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "646")
     @NotNull(message = "部门id不能为空")
     private Long deptId;
-
+    private String type;
 
     private List<IotDeviceGroupDetailSaveReqVO> details;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/devicegroup/IotDeviceGroupDO.java

@@ -41,4 +41,5 @@ public class IotDeviceGroupDO extends BaseDO {
      */
     private Long deptId;
 
+    private String type;
 }