feat:update product tools ban

Author: ruanrongman

docs/README.md

@@ -88,7 +88,7 @@ mysql,redis,emqx和influxdb环境。
 欢迎加入群聊一起交流讨论有关Aiot相关的话题，免费获取智控台的前端源码，链接过期了可以issue或email提醒一下作者。
 
 <div style="width: 250px;margin: 0 auto;">
-    <img src="./images/f1d07cf6a241ec0ac1601643364be3df.jpg" width="250px"/>
+    <img src="./images/ede859c2bbe032886b842748dcfdc503.jpg" width="250px"/>
 </div>
 
 

docs/images/ede859c2bbe032886b842748dcfdc503.jpg

@@ -116,7 +116,7 @@ mysql,redis,emqx和influxdb环境，安装详情请看官方文档。
 欢迎加入群聊一起交流讨论有关Aiot相关的话题，免费获取智控台的前端源码，链接过期了可以issue或email提醒一下作者。
 
 <div style="width: 250px;margin: 0 auto;">
-    <img src="./docs/images/f1d07cf6a241ec0ac1601643364be3df.jpg" width="250px"/>
+    <img src="./docs/images/ede859c2bbe032886b842748dcfdc503.jpg" width="250px"/>
 </div>
 
 ## 致谢

docs/images/f1d07cf6a241ec0ac1601643364be3df.jpg

@@ -28,10 +28,7 @@
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 import top.rslly.iot.param.request.*;
 import top.rslly.iot.services.*;
-import top.rslly.iot.services.agent.AiServiceImpl;
-import top.rslly.iot.services.agent.KnowledgeChatServiceImpl;
-import top.rslly.iot.services.agent.OtaXiaozhiPassiveServiceImpl;
-import top.rslly.iot.services.agent.OtaXiaozhiServiceImpl;
+import top.rslly.iot.services.agent.*;
 import top.rslly.iot.services.iot.AlarmEventServiceImpl;
 import top.rslly.iot.services.iot.HardWareServiceImpl;
 import top.rslly.iot.services.iot.OtaPassiveServiceImpl;
@@ -82,6 +79,8 @@ public class Tool {
   private KnowledgeChatServiceImpl knowledgeChatService;
   @Autowired
   private OtaXiaozhiPassiveServiceImpl otaXiaozhiPassiveService;
+  @Autowired
+  private ProductToolsBanServiceImpl productToolsBanService;
 
   @Operation(summary = "用于获取平台运行环境信息", description = "单位为百分比")
   @RequestMapping(value = "/machineMessage", method = RequestMethod.GET)
@@ -435,4 +434,45 @@ public JsonResult<?> deleteXiaoZhiOtaPassive(@RequestParam("id") int id,
     return otaXiaozhiPassiveService.otaXiaozhiPassiveDelete(id);
   }
 
+  // 禁止内部工具productban
+  @Operation(summary = "禁止内部工具", description = "禁止内部工具")
+  @RequestMapping(value = "/productToolsBan", method = RequestMethod.GET)
+  public JsonResult<?> getProductToolsBan(@RequestParam("productId") int productId,
+      @RequestHeader("Authorization") String header) {
+    try {
+      if (!safetyService.controlAuthorizeProduct(header, productId))
+        return ResultTool.fail(ResultCode.NO_PERMISSION);
+    } catch (NullPointerException e) {
+      return ResultTool.fail(ResultCode.PARAM_NOT_VALID);
+    }
+    return productToolsBanService.getProductToolsBan(productId);
+  }
+
+  @Operation(summary = "禁止内部工具", description = "禁止内部工具")
+  @RequestMapping(value = "/productToolsBan", method = RequestMethod.POST)
+  public JsonResult<?> postProductToolsBan(
+      @Valid @RequestBody ProductToolsBan productToolsBan,
+      @RequestHeader("Authorization") String header) {
+    try {
+      if (!safetyService.controlAuthorizeProduct(header, productToolsBan.getProductId()))
+        return ResultTool.fail(ResultCode.NO_PERMISSION);
+    } catch (NullPointerException e) {
+      return ResultTool.fail(ResultCode.PARAM_NOT_VALID);
+    }
+    return productToolsBanService.postProductToolsBan(productToolsBan);
+  }
+
+  @Operation(summary = "禁止内部工具", description = "禁止内部工具")
+  @RequestMapping(value = "/productToolsBan", method = RequestMethod.DELETE)
+  public JsonResult<?> deleteProductToolsBan(@RequestParam("productId") int productId,
+      @RequestHeader("Authorization") String header) {
+    try {
+      if (!safetyService.controlAuthorizeProduct(header, productId))
+        return ResultTool.fail(ResultCode.NO_PERMISSION);
+    } catch (NullPointerException e) {
+      return ResultTool.fail(ResultCode.PARAM_NOT_VALID);
+    }
+    return productToolsBanService.deleteProductToolsBan(productId);
+  }
+
 }

readme.md

@@ -0,0 +1,33 @@
+/**
+ * Copyright © 2023-2030 The ruanrongman Authors
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package top.rslly.iot.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.transaction.annotation.Transactional;
+import top.rslly.iot.models.ProductToolsBanEntity;
+
+import java.util.List;
+
+public interface ProductToolsBanRepository extends JpaRepository<ProductToolsBanEntity, Long> {
+  List<ProductToolsBanEntity> findAllByProductId(int productId);
+
+  @Transactional
+  List<ProductToolsBanEntity> deleteAllByProductId(int productId);
+}

src/main/java/top/rslly/iot/controllers/Tool.java

@@ -0,0 +1,78 @@
+/**
+ * Copyright © 2023-2030 The ruanrongman Authors
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package top.rslly.iot.models;
+
+import javax.persistence.*;
+import java.util.Objects;
+
+@Entity
+@Table(name = "product_tools_ban", schema = "cwliot1.8", catalog = "")
+public class ProductToolsBanEntity {
+  private int id;
+  private int productId;
+  private String toolsName;
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id")
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+  @Basic
+  @Column(name = "product_id")
+  public int getProductId() {
+    return productId;
+  }
+
+  public void setProductId(int productId) {
+    this.productId = productId;
+  }
+
+  @Basic
+  @Column(name = "tools_name")
+  public String getToolsName() {
+    return toolsName;
+  }
+
+  public void setToolsName(String toolsName) {
+    this.toolsName = toolsName;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (o == null || getClass() != o.getClass())
+      return false;
+    ProductToolsBanEntity that = (ProductToolsBanEntity) o;
+    return id == that.id && productId == that.productId
+        && Objects.equals(toolsName, that.toolsName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, productId, toolsName);
+  }
+}

src/main/java/top/rslly/iot/dao/ProductToolsBanRepository.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright © 2023-2030 The ruanrongman Authors
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package top.rslly.iot.param.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+public class ProductToolsBan {
+  private int productId;
+  @NotEmpty(message = "工具名称列表不能为空")
+  private List<String> toolsName;
+}

src/main/java/top/rslly/iot/models/ProductToolsBanEntity.java

@@ -244,7 +244,6 @@ public boolean controlAuthorizeProduct(String token, int productId) {
     String token_deal = token.replace(JwtTokenUtil.TOKEN_PREFIX, "");
     String role = JwtTokenUtil.getUserRole(token_deal);
     String username = JwtTokenUtil.getUsername(token_deal);
-    log.info("role {}", role);
     if (role.equals("ROLE_" + "wx_user")) {
       if (wxUserService.findAllByName(username).isEmpty()) {
         return false;

src/main/java/top/rslly/iot/param/request/ProductToolsBan.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright © 2023-2030 The ruanrongman Authors
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package top.rslly.iot.services.agent;
+
+import com.alibaba.fastjson.JSON;
+import top.rslly.iot.param.request.ProductToolsBan;
+import top.rslly.iot.utility.result.JsonResult;
+
+import java.util.List;
+
+public interface ProductToolsBanService {
+
+  List<String> getProductToolsBanList(int productId);
+
+  JsonResult<?> getProductToolsBan(int productId);
+
+  JsonResult<?> postProductToolsBan(ProductToolsBan productToolsBan);
+
+  JsonResult<?> deleteProductToolsBan(int productId);
+}