fix: add Configuration Center thumbnail and device script return id

@@ -59,205 +59,207 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequestMapping("api/yt/js")
 @Api(tags = {"设备数据解析脚本管理"})
 public class YtDeviceScriptController extends BaseController {
-    private final YtDeviceScriptService scriptService;
-    private final YtDeviceProfileService ytDeviceProfileService;
-    private final YtScriptInvokeService jsEngine;
-    private static final JsonParser parser = new JsonParser();
-
-    private static final ObjectMapper objectMapper = new ObjectMapper();
-
-    @PostMapping()
-    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:js:post','api:yt:js:update'})")
-    @ApiOperation("创建 | 编辑")
-    public ResponseEntity<YtDeviceScriptDTO> saveJavaScript(
-            @RequestBody YtDeviceScriptDTO scriptDTO) throws ThingsboardException {
-        String id = scriptDTO.getId();
-        boolean created = StringUtils.isBlank(id);
-        String tenantId = getCurrentUser().getCurrentTenantId();
-        scriptDTO.setTenantId(tenantId);
-        scriptService.validateFormdata(scriptDTO,created);
-        /**
-         * 业务流程
-         * 1/3.编辑时同步刷新相关的设备配置
-         * 2/3.处理TB业务逻辑
-         * 3/3.处理业务平台的业务逻辑
-         */
-        if(!created){
-            List<DeviceProfileDTO> usedProfiles =ytDeviceProfileService.findDeviceProfile(tenantId,id);
-            for(DeviceProfileDTO profile:usedProfiles){
-                DeviceProfile tbDeviceProfile = buildTbDeviceProfileFromDeviceProfileDTO(profile,scriptDTO.getTenantId(),scriptDTO.getConvertJs());
-                updateTbDeviceProfile(tbDeviceProfile);
-            }
-
-        }
-
-
-        String creator = getCurrentUser().getCurrentUserId();
-        scriptDTO.setCreator(creator);
-        scriptDTO.setUpdater(creator);
-        scriptService.insertOrUpdate(scriptDTO);
-
-        return ResponseEntity.ok(scriptDTO);
+  private static final JsonParser parser = new JsonParser();
+  private static final ObjectMapper objectMapper = new ObjectMapper();
+  private final YtDeviceScriptService scriptService;
+  private final YtDeviceProfileService ytDeviceProfileService;
+  private final YtScriptInvokeService jsEngine;
+
+  @PostMapping()
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:js:post','api:yt:js:update'})")
+  @ApiOperation("创建 | 编辑")
+  public ResponseEntity<YtDeviceScriptDTO> saveJavaScript(@RequestBody YtDeviceScriptDTO scriptDTO)
+      throws ThingsboardException {
+    String id = scriptDTO.getId();
+    boolean created = StringUtils.isBlank(id);
+    String tenantId = getCurrentUser().getCurrentTenantId();
+    scriptDTO.setTenantId(tenantId);
+    scriptService.validateFormdata(scriptDTO, created);
+    /** 业务流程 1/3.编辑时同步刷新相关的设备配置 2/3.处理TB业务逻辑 3/3.处理业务平台的业务逻辑 */
+    if (!created) {
+      List<DeviceProfileDTO> usedProfiles = ytDeviceProfileService.findDeviceProfile(tenantId, id);
+      for (DeviceProfileDTO profile : usedProfiles) {
+        DeviceProfile tbDeviceProfile =
+            buildTbDeviceProfileFromDeviceProfileDTO(
+                profile, scriptDTO.getTenantId(), scriptDTO.getConvertJs());
+        updateTbDeviceProfile(tbDeviceProfile);
+      }
     }
 
-    /**
-     * 更新thingsboard的设备配置信息
-     *
-     * @param deviceProfile 设备配置
-     * @throws ThingsboardException
-     */
-    private DeviceProfile updateTbDeviceProfile(DeviceProfile deviceProfile) throws ThingsboardException {
-        boolean isFirmwareChanged = false;
-        boolean isSoftwareChanged = false;
-
-        DeviceProfile oldDeviceProfile = deviceProfileService.findDeviceProfileById(getTenantId(), deviceProfile.getId());
-        if (!Objects.equals(deviceProfile.getFirmwareId(), oldDeviceProfile.getFirmwareId())) {
-            isFirmwareChanged = true;
-        }
-        if (!Objects.equals(deviceProfile.getSoftwareId(), oldDeviceProfile.getSoftwareId())) {
-            isSoftwareChanged = true;
-        }
-        if (FastIotConstants.ASSERT_DEFAULT_NAME.equals(oldDeviceProfile.getName()) && !Objects.equals(deviceProfile.getName(), oldDeviceProfile.getName())) {
-            throw new YtDataValidationException(ErrorMessage.ASSERT_DEFAULT_NAME_NO_CHANGED.getMessage());
-        }
-
-        DeviceProfile savedDeviceProfile = checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));
-
-        tbClusterService.onDeviceProfileChange(savedDeviceProfile, null);
-        tbClusterService.broadcastEntityStateChangeEvent(deviceProfile.getTenantId(), savedDeviceProfile.getId(), ComponentLifecycleEvent.UPDATED);
-
-        logEntityAction(savedDeviceProfile.getId(), savedDeviceProfile,
-                null,ActionType.UPDATED, null);
-
-        otaPackageStateService.update(savedDeviceProfile, isFirmwareChanged, isSoftwareChanged);
-
-        sendEntityNotificationMsg(getTenantId(), savedDeviceProfile.getId(),EdgeEventActionType.UPDATED);
-        return savedDeviceProfile;
+    String creator = getCurrentUser().getCurrentUserId();
+    scriptDTO.setCreator(creator);
+    scriptDTO.setUpdater(creator);
+    return ResponseEntity.ok(scriptService.insertOrUpdate(scriptDTO));
+  }
+
+  /**
+   * 更新thingsboard的设备配置信息
+   *
+   * @param deviceProfile 设备配置
+   * @throws ThingsboardException
+   */
+  private DeviceProfile updateTbDeviceProfile(DeviceProfile deviceProfile)
+      throws ThingsboardException {
+    boolean isFirmwareChanged = false;
+    boolean isSoftwareChanged = false;
+
+    DeviceProfile oldDeviceProfile =
+        deviceProfileService.findDeviceProfileById(getTenantId(), deviceProfile.getId());
+    if (!Objects.equals(deviceProfile.getFirmwareId(), oldDeviceProfile.getFirmwareId())) {
+      isFirmwareChanged = true;
     }
-
-    @GetMapping("{id}")
-    @ApiOperation("详情")
-//    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:get'})")
-    public ResponseEntity<YtDeviceScriptDTO> getDevice(@PathVariable("id") String id) throws ThingsboardException {
-        return ResponseEntity.of(scriptService.getDeviceScript(getCurrentUser().getCurrentTenantId(), id));
+    if (!Objects.equals(deviceProfile.getSoftwareId(), oldDeviceProfile.getSoftwareId())) {
+      isSoftwareChanged = true;
     }
-    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
-    @GetMapping(params = {PAGE_SIZE, PAGE})
-    @ApiOperation("分页查询")
-    public YtPageData<YtDeviceScriptDTO> pageDeviceProfile(
-            @RequestParam(PAGE_SIZE) int pageSize,
-            @RequestParam(PAGE) int page,
-            @RequestParam(value = "name", required = false) String name,
-            @RequestParam(value = "transportType", required = false) String transportType,
-            @RequestParam(value = ORDER_FILED, required = false) String orderFiled,
-            @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) throws ThingsboardException {
-
-        return scriptService.page(page, pageSize, orderFiled, orderType, getCurrentUser().getCurrentTenantId());
+    if (FastIotConstants.ASSERT_DEFAULT_NAME.equals(oldDeviceProfile.getName())
+        && !Objects.equals(deviceProfile.getName(), oldDeviceProfile.getName())) {
+      throw new YtDataValidationException(ErrorMessage.ASSERT_DEFAULT_NAME_NO_CHANGED.getMessage());
     }
 
-    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
-    @GetMapping("/me/list")
-    @ApiOperation("选项列表")
-    public ResponseEntity listDeviceProfile() throws ThingsboardException {
-        List<YtDeviceScriptDTO> results = scriptService.findDeviceScript(getCurrentUser().getCurrentTenantId());
-        return ResponseEntity.ok(results);
+    DeviceProfile savedDeviceProfile =
+        checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));
+
+    tbClusterService.onDeviceProfileChange(savedDeviceProfile, null);
+    tbClusterService.broadcastEntityStateChangeEvent(
+        deviceProfile.getTenantId(), savedDeviceProfile.getId(), ComponentLifecycleEvent.UPDATED);
+
+    logEntityAction(savedDeviceProfile.getId(), savedDeviceProfile, null, ActionType.UPDATED, null);
+
+    otaPackageStateService.update(savedDeviceProfile, isFirmwareChanged, isSoftwareChanged);
+
+    sendEntityNotificationMsg(
+        getTenantId(), savedDeviceProfile.getId(), EdgeEventActionType.UPDATED);
+    return savedDeviceProfile;
+  }
+
+  @GetMapping("{id}")
+  @ApiOperation("详情")
+  //    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:get'})")
+  public ResponseEntity<YtDeviceScriptDTO> getDevice(@PathVariable("id") String id)
+      throws ThingsboardException {
+    return ResponseEntity.of(
+        scriptService.getDeviceScript(getCurrentUser().getCurrentTenantId(), id));
+  }
+
+  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  @ApiOperation("分页查询")
+  public YtPageData<YtDeviceScriptDTO> pageDeviceProfile(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "name", required = false) String name,
+      @RequestParam(value = "transportType", required = false) String transportType,
+      @RequestParam(value = ORDER_FILED, required = false) String orderFiled,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
+
+    return scriptService.page(
+        page, pageSize, orderFiled, orderType, getCurrentUser().getCurrentTenantId());
+  }
+
+  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
+  @GetMapping("/me/list")
+  @ApiOperation("选项列表")
+  public ResponseEntity listDeviceProfile() throws ThingsboardException {
+    List<YtDeviceScriptDTO> results =
+        scriptService.findDeviceScript(getCurrentUser().getCurrentTenantId());
+    return ResponseEntity.ok(results);
+  }
+
+  @DeleteMapping
+  @ApiOperation("删除")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:delete'})")
+  public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException {
+    scriptService.deleteScriptes(getCurrentUser().getCurrentTenantId(), deleteDTO.getIds());
+  }
+
+  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
+  @PostMapping("/test")
+  @ApiOperation("测试脚本执行结果")
+  public ResponseEntity<JsonNode> test(@RequestBody JsonNode inputParams)
+      throws ThingsboardException {
+    try {
+      String script = inputParams.get("script").asText();
+      String jsParam = inputParams.get("params").asText();
+
+      String output = "";
+      String errorText = "";
+      ScriptEngine engine = null;
+      try {
+        UUID scriptId = jsEngine.eval(YtScriptType.TCP_TRANSPORT_SCRIPT, script).get();
+        ListenableFuture<String> result =
+            Futures.transformAsync(
+                jsEngine.invokeFunction(scriptId, jsParam),
+                o -> {
+                  try {
+                    JsonElement json = parser.parse(o.toString());
+                    return Futures.immediateFuture(json.toString());
+                  } catch (Exception e) {
+                    return Futures.immediateFailedFuture(e);
+                  }
+                },
+                MoreExecutors.directExecutor());
+
+        output = result.get(20, TimeUnit.SECONDS);
+      } catch (Exception e) {
+        errorText = e.getMessage();
+      } finally {
+        if (engine != null) {
+          engine.destroy();
+        }
+      }
+      ObjectNode result = objectMapper.createObjectNode();
+      result.put("output", output);
+      result.put("error", errorText);
+      return ResponseEntity.ok(result);
+    } catch (Exception e) {
+      throw handleException(e);
     }
-
-    @DeleteMapping
-    @ApiOperation("删除")
-    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:delete'})")
-    public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
-        scriptService.deleteScriptes(getCurrentUser().getCurrentTenantId(), deleteDTO.getIds());
+  }
+
+  /**
+   * 构造调用TBDeviceProfile需要的参数
+   *
+   * @param deviceProfileDTO 页面接收的参数
+   * @return 封装好的TBDeviceProfile
+   */
+  private DeviceProfile buildTbDeviceProfileFromDeviceProfileDTO(
+      DeviceProfileDTO deviceProfileDTO, String scriptId, String scriptText) {
+    DeviceProfile tbDeviceProfile = new DeviceProfile();
+    if (StringUtils.isNotBlank(deviceProfileDTO.getId())) {
+      UUID profileId = UUID.fromString(deviceProfileDTO.getId());
+      tbDeviceProfile.setId(new DeviceProfileId(profileId));
+      tbDeviceProfile.setCreatedTime(
+          deviceProfileDTO.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli());
+    } else {
+      tbDeviceProfile.setCreatedTime(
+          LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
     }
-
-
-    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
-    @PostMapping("/test")
-    @ApiOperation("测试脚本执行结果")
-    public ResponseEntity<JsonNode> test(@RequestBody JsonNode inputParams) throws ThingsboardException {
-        try {
-            String script = inputParams.get("script").asText();
-            String jsParam  = inputParams.get("params").asText();
-
-
-            String output = "";
-            String errorText = "";
-            ScriptEngine engine = null;
-            try {
-                UUID scriptId = jsEngine.eval(YtScriptType.TCP_TRANSPORT_SCRIPT, script).get();
-                ListenableFuture<String> result = Futures.transformAsync(jsEngine.invokeFunction(scriptId, jsParam),
-                        o -> {
-                            try {
-                                JsonElement json = parser.parse(o.toString());
-                                return Futures.immediateFuture(json.toString());
-                            } catch (Exception e) {
-                                return Futures.immediateFailedFuture(e);
-                            }
-                        }, MoreExecutors.directExecutor());
-
-                output =result.get(20, TimeUnit.SECONDS);
-            } catch (Exception e) {
-                errorText = e.getMessage();
-            } finally {
-                if (engine != null) {
-                    engine.destroy();
-                }
-            }
-            ObjectNode result = objectMapper.createObjectNode();
-            result.put("output", output);
-            result.put("error", errorText);
-            return ResponseEntity.ok(result);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
-
-
+    tbDeviceProfile.setName(deviceProfileDTO.getName());
+    tbDeviceProfile.setImage(deviceProfileDTO.getImage());
+    tbDeviceProfile.setDescription(deviceProfileDTO.getDescription());
+    tbDeviceProfile.setType(DeviceProfileType.DEFAULT);
+    UUID tenantId = UUID.fromString(deviceProfileDTO.getTenantId());
+    tbDeviceProfile.setTenantId(TenantId.fromUUID(tenantId));
+    tbDeviceProfile.setDefault(deviceProfileDTO.isDefault());
+
+    // 获取当前租户的默认规则链
+    if (StringUtils.isNotBlank(deviceProfileDTO.getDefaultRuleChainId())) {
+      UUID chainId = UUID.fromString(deviceProfileDTO.getDefaultRuleChainId());
+      tbDeviceProfile.setDefaultRuleChainId(new RuleChainId(chainId));
     }
 
+    tbDeviceProfile.setDefaultQueueName(ServiceQueue.MAIN);
+    tbDeviceProfile.setProvisionType(DeviceProfileProvisionType.DISABLED);
 
+    // 传输类型默认都是Default
+    String transportType = deviceProfileDTO.getTransportType();
+    tbDeviceProfile.setTransportType(DeviceTransportType.valueOf(transportType));
 
-
-
-    /**
-     * 构造调用TBDeviceProfile需要的参数
-     *
-     * @param deviceProfileDTO 页面接收的参数
-     * @return 封装好的TBDeviceProfile
-     */
-    private DeviceProfile buildTbDeviceProfileFromDeviceProfileDTO(DeviceProfileDTO deviceProfileDTO,String scriptId,String scriptText) {
-        DeviceProfile tbDeviceProfile = new DeviceProfile();
-        if (StringUtils.isNotBlank(deviceProfileDTO.getId())) {
-            UUID profileId = UUID.fromString(deviceProfileDTO.getId());
-            tbDeviceProfile.setId(new DeviceProfileId(profileId));
-            tbDeviceProfile.setCreatedTime(deviceProfileDTO.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli());
-        }else{
-            tbDeviceProfile.setCreatedTime(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
-        }
-        tbDeviceProfile.setName(deviceProfileDTO.getName());
-        tbDeviceProfile.setImage(deviceProfileDTO.getImage());
-        tbDeviceProfile.setDescription(deviceProfileDTO.getDescription());
-        tbDeviceProfile.setType(DeviceProfileType.DEFAULT);
-        UUID tenantId = UUID.fromString(deviceProfileDTO.getTenantId());
-        tbDeviceProfile.setTenantId(TenantId.fromUUID(tenantId));
-        tbDeviceProfile.setDefault(deviceProfileDTO.isDefault());
-
-        // 获取当前租户的默认规则链
-        if (StringUtils.isNotBlank(deviceProfileDTO.getDefaultRuleChainId())) {
-            UUID chainId = UUID.fromString(deviceProfileDTO.getDefaultRuleChainId());
-            tbDeviceProfile.setDefaultRuleChainId(new RuleChainId(chainId));
-        }
-
-        tbDeviceProfile.setDefaultQueueName(ServiceQueue.MAIN);
-        tbDeviceProfile.setProvisionType(DeviceProfileProvisionType.DISABLED);
-
-
-        // 传输类型默认都是Default
-        String transportType = deviceProfileDTO.getTransportType();
-        tbDeviceProfile.setTransportType(DeviceTransportType.valueOf(transportType));
-
-
-        deviceProfileDTO.setScriptId(scriptId);
-        tbDeviceProfile.setProfileData(buildDeviceProfileData(transportType,deviceProfileDTO.getProfileData(),scriptText));
-        return tbDeviceProfile;
-    }
+    deviceProfileDTO.setScriptId(scriptId);
+    tbDeviceProfile.setProfileData(
+        buildDeviceProfileData(transportType, deviceProfileDTO.getProfileData(), scriptText));
+    return tbDeviceProfile;
+  }
 }

@@ -32,5 +32,8 @@ public class ConfigurationCenterDTO extends TenantDTO {
           groups = {UpdateGroup.class, AddGroup.class})
   private String platform;
 
+  @ApiModelProperty(value = "组态缩略图")
+  private String thumbnail;
+
   private OrganizationDTO organizationDTO;
 }

@@ -14,4 +14,5 @@ public class ConfigurationCenter extends TenantBaseEntity {
   private String remark;
   private String organizationId;
   private String platform;
+  private String thumbnail;
 }

@@ -13,6 +13,7 @@
         <result property="creator" column="creator"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="updater" column="updater"/>
+        <result property="thumbnail" column="thumbnail"/>
         <association property="organizationDTO"
                      javaType="org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO">
             <result property="name" column="organization_name"/>
@@ -29,7 +30,7 @@
     </resultMap>
 
     <sql id="columns">
-        a.id,a.name,a.platform,a.organization_id,a.remark,a.update_time,a.create_time,a.creator,a.tenant_id,a.updater,io.name AS organization_name
+        a.id,a.name,a.platform,a.organization_id,a.thumbnail, a.remark,a.update_time,a.create_time,a.creator,a.tenant_id,a.updater,io.name AS organization_name
     </sql>
     <select id="getConfigurationCenterPage" resultMap="configurationCenterMap">
         SELECT
@@ -56,7 +57,7 @@
     </select>
 
     <select id="getConfigurationInfoById" resultMap="configurationInfoMap">
-        SELECT icc.id,icc.name,icc.platform,icct.id AS content_id,icct.content FROM iotfs_configuration_center icc LEFT JOIN
+        SELECT icc.id,icc.name,icc.platform,icc.thumbnail,icct.id AS content_id,icct.content FROM iotfs_configuration_center icc LEFT JOIN
         iotfs_configuration_content icct ON icc.id = icct.configuration_id
         WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId}
     </select>