Merge branch 'tianfu' into 'master_dev'

feat: 新功能开发：新增公共接口，批量发布

See merge request yunteng/thingskit!168

(cherry picked from commit 8fbaa13d)

8d45cdf3 feat: 新功能开发：新增公共接口，批量发布

@@ -28,10 +28,7 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDataViewInterfaceService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
@@ -144,7 +141,7 @@ public class TkDataViewInterfaceController extends BaseController {
     @ApiOperation("根据接口类型过滤数据")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     public List<TkDataViewInterfaceDTO> filterByInterfaceType(@PathVariable("type") String type) throws ThingsboardException {
-        return tkDataViewInterfaceService.filterByInterfaceType(type,getCurrentUser().getCurrentTenantId());
+        return tkDataViewInterfaceService.filterByInterfaceType(type, getCurrentUser().getCurrentTenantId());
     }
 
 
@@ -155,4 +152,42 @@ public class TkDataViewInterfaceController extends BaseController {
         return tkDataViewInterfaceService.findAll(getCurrentUser().getCurrentTenantId());
     }
 
+
+    @ApiOperation("批量发布")
+    @RequestMapping(value = "/batch_publish", params = {"ids"}, method = RequestMethod.PUT)
+    @ResponseBody
+    public ResponseEntity<Boolean> batchPublishInterface(
+            @ApiParam(value = "A list of interface ids, separated by comma ','")
+            @RequestParam("ids") String[] ids) throws ThingsboardException {
+
+        List<String> idsList = new ArrayList<>();
+        for (String strId : ids) {
+            idsList.add(strId);
+        }
+        return ResponseEntity.ok(tkDataViewInterfaceService.batchPublishInterface(idsList, getCurrentUser().getCurrentTenantId()));
+    }
+
+    @ApiOperation("批量取消发布")
+    @RequestMapping(value = "/batch_cancel_publish", params = {"ids"}, method = RequestMethod.PUT)
+    @ResponseBody
+    public ResponseEntity<Boolean> batchCancelPublishInterface(
+            @ApiParam(value = "A list of interface ids, separated by comma ','")
+            @RequestParam("ids") String[] ids) throws ThingsboardException {
+
+        List<String> idsList = new ArrayList<>();
+        for (String strId : ids) {
+            idsList.add(strId);
+        }
+        return ResponseEntity.ok(tkDataViewInterfaceService.batchCancelPublishInterface(idsList, getCurrentUser().getCurrentTenantId()));
+    }
+
+
+//    @ApiOperation("SQL查询")
+//    @RequestMapping(value = "/sql_select", params = {"sql"}, method = RequestMethod.POST)
+//    @ResponseBody
+//    public List<LinkedHashMap<String, Object>> sqlSelect(
+//            @RequestParam("sql") String sql) throws ThingsboardException {
+//        return tkDataViewInterfaceService.executeSql(sql);
+//    }
+
 }

@@ -125,7 +125,7 @@ public class TkDataViewInterfaceServiceImpl
         //Modify interface state is publish
         dataViewInterfaceEntity.setState(1);
         int resultInt = baseMapper.updateById(dataViewInterfaceEntity);
-        return resultInt > 0 ? true : false;
+        return resultInt > 0 ;
     }
 
     @Override
@@ -137,7 +137,7 @@ public class TkDataViewInterfaceServiceImpl
         //Modify interface state is cancelPublish
         dataViewInterfaceEntity.setState(0);
         int resultInt = baseMapper.updateById(dataViewInterfaceEntity);
-        return resultInt > 0 ? true : false;
+        return resultInt > 0 ;
     }
 
     @Override
@@ -164,4 +164,50 @@ public class TkDataViewInterfaceServiceImpl
         return lists;
     }
 
+
+    @Override
+    public boolean batchPublishInterface(List<String> ids, String tenantId) {
+        List<TkDataViewInterfaceEntity> interfaceEntityList =
+                baseMapper.selectList(
+                        new LambdaQueryWrapper<TkDataViewInterfaceEntity>()
+                                .in(TkDataViewInterfaceEntity::getId, ids));
+        for (TkDataViewInterfaceEntity center : interfaceEntityList) {
+            if (!center.getTenantId().equals(tenantId)) {
+                throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+            }
+        }
+        int resultInt = 0;
+        for (TkDataViewInterfaceEntity interfaceEntity : interfaceEntityList) {
+            interfaceEntity.setState(1);
+            resultInt+=baseMapper.updateById(interfaceEntity);
+        }
+        return resultInt>0;
+    }
+
+
+    @Override
+    public boolean batchCancelPublishInterface(List<String> ids, String tenantId) {
+        List<TkDataViewInterfaceEntity> interfaceEntityList =
+                baseMapper.selectList(
+                        new LambdaQueryWrapper<TkDataViewInterfaceEntity>()
+                                .in(TkDataViewInterfaceEntity::getId, ids));
+        for (TkDataViewInterfaceEntity center : interfaceEntityList) {
+            if (!center.getTenantId().equals(tenantId)) {
+                throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+            }
+        }
+        int resultInt = 0;
+        for (TkDataViewInterfaceEntity interfaceEntity : interfaceEntityList) {
+            interfaceEntity.setState(0);
+            resultInt+=baseMapper.updateById(interfaceEntity);
+        }
+        return resultInt>0;
+    }
+
+    @Override
+    public List<LinkedHashMap<String, Object>> executeSql(String sql){
+        List<LinkedHashMap<String, Object>> resultList = baseMapper.executeSql(sql);
+        return resultList;
+    }
+
 }

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.yunteng.dto.TkDataViewInterfaceDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkDataViewInterfaceEntity;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 
 /**
@@ -36,4 +37,11 @@ public interface TkDataViewInterfaceMapper extends BaseMapper<TkDataViewInterfac
      */
     List<TkDataViewInterfaceDTO> findAll(@Param("tenantIds") List<String> tenantIds);
 
+    /**
+     * SQL 查询
+     * @param sqlStr
+     * @return
+     */
+    List<LinkedHashMap<String, Object>> executeSql(@Param("sqlStr") String sqlStr);
+
 }

 package org.thingsboard.server.dao.yunteng.service;
 
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
-import org.thingsboard.server.common.data.yunteng.dto.TkDataViewDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDataViewInterfaceDTO;
-import org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
-
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -32,4 +30,10 @@ public interface TkDataViewInterfaceService {
 
     List<TkDataViewInterfaceDTO> findAll(String tenantId);
 
+    boolean batchPublishInterface(List<String> ids, String tenantId);
+
+    boolean batchCancelPublishInterface(List<String> ids, String tenantId);
+
+    List<LinkedHashMap<String, Object>> executeSql(String sql);
+
 }

@@ -74,4 +74,9 @@
         </where>
     </select>
 
+
+    <select id="executeSql"  parameterType="java.lang.String"  resultType="java.util.LinkedHashMap">
+        #{sqlStr}
+    </select>
+
 </mapper>