在实时数据界面，通过修改可以修改表达式和描述信息，增加界面批量删除item

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/controller/ItemGroupController.java

@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping("itemGroup")
@@ -73,13 +74,22 @@ public class ItemGroupController {
         return itemGroupService.getItemValueById(id);
     }
 
-    @PostMapping("/updateItemDescribe")
+    @PostMapping("/updateItem")
     @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.DATAGROUP, OperationEnum = OperationEnum.UPDATE)
-    public Result updateItemDescribe(@RequestBody Item item) {
-        if (Blank.isEmpty(item, item.getId(), item.getDescribe())) {
+    public Result updateItem(@RequestBody Item item) {
+        if (Blank.isEmpty(item, item.getId())) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
         }
-        return itemGroupService.updateItemDescribe(item);
+        return itemGroupService.updateItem(item);
+    }
+
+    @PostMapping("/deleteItemByIdList")
+    @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.DATAGROUP, OperationEnum = OperationEnum.DELETE)
+    public Result deleteItemByIdList(@RequestBody List<Integer> idList) {
+        if (Blank.isEmpty(idList)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return itemGroupService.deleteItemByIdList(idList);
     }
 
     @GetMapping("/getTableItemGroupById/{id}")

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/dao/ItemGroupDao.java

@@ -37,11 +37,13 @@ public interface ItemGroupDao {
 
     List<String> getItemReadNameById(Integer itemGroupId);
 
-    Integer updateItemDescribe(Item item);
+    Integer updateItem(Item item);
 
     List<Item> getItemListDescribe(List<Item> itemList);
 
     Item getItemByGroupIdName(Integer itemGroupId, String itemName);
 
     List<ItemGroup> getItemGroupByDataSourceId(Integer dataSourceId);
+
+    Integer deleteItemByIdList(List<Integer> idList);
 }

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/service/ItemGroupService.java

@@ -4,6 +4,8 @@ import com.example.opc_common.entity.Item;
 import com.example.opc_common.entity.ItemGroup;
 import com.example.opc_common.util.Result;
 
+import java.util.List;
+
 public interface ItemGroupService {
     Result addItemGroup(ItemGroup itemGroup);
 
@@ -17,7 +19,9 @@ public interface ItemGroupService {
 
     Result getItemValueById(Integer id);
 
-    Result updateItemDescribe(Item item);
+    Result updateItem(Item item);
 
     Result getTableItemGroupById(Integer id);
+
+    Result deleteItemByIdList(List<Integer> idList);
 }

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/service/impl/ItemGroupServiceImpl.java

@@ -288,8 +288,8 @@ public class ItemGroupServiceImpl implements ItemGroupService {
     }
 
     @Override
-    public Result updateItemDescribe(Item item) {
-        if (itemGroupDao.updateItemDescribe(item) <= 0) {
+    public Result updateItem(Item item) {
+        if (itemGroupDao.updateItem(item) <= 0) {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改item描述失败");
         }
         return Result.ok("修改item描述成功");
@@ -315,4 +315,12 @@ public class ItemGroupServiceImpl implements ItemGroupService {
         }
         return Result.ok(itemGroup);
     }
+
+    @Override
+    public Result deleteItemByIdList(List<Integer> idList) {
+        if (itemGroupDao.deleteItemByIdList(idList) <= 0) {
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), ResultEnum.SERVER_ERROR.getRespMsg());
+        }
+        return Result.ok("删除成功");
+    }
 }

chaunyi_opc/opc_da/src/main/resources/mapper/ItemGroupDao.xml

@@ -49,9 +49,10 @@
         where id = #{id}
     </update>
 
-    <update id="updateItemDescribe">
+    <update id="updateItem">
         update t_item
-        set `describe`=#{describe}
+        set data_model_id=#{dataModelId},
+            `describe`=#{describe}
         where id = #{id}
     </update>
 
@@ -76,6 +77,17 @@
         </foreach>
     </delete>
 
+    <delete id="deleteItemByIdList">
+        delete from t_item
+        where 1=1
+        <if test="idList!= null and idList.size() >0">
+            AND id IN
+            <foreach collection="idList" item="id" separator="," open="(" close=")">
+                #{id}
+            </foreach>
+        </if>
+    </delete>
+
     <select id="getItemGroupByName" resultType="com.example.opc_common.entity.ItemGroup">
         select
         <include refid="itemGroup"/>
@@ -118,7 +130,7 @@
                ti.data_model_id,
                tdm.operation_rule
         FROM t_item ti
-        LEFT JOIN t_data_model tdm ON ti.data_model_id = tdm.id
+                 LEFT JOIN t_data_model tdm ON ti.data_model_id = tdm.id
         where item_group_id = #{itemGroupId}
         order by item_name
     </select>