提交代码

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/tag/controller/TagController.java

@@ -5,6 +5,7 @@ import com.xingxi.common.core.controller.BaseController;
 import com.xingxi.common.core.domain.AjaxResult;
 import com.xingxi.common.core.page.TableDataInfo;
 import com.xingxi.common.enums.BusinessType;
+import com.xingxi.common.enums.EDelFlag;
 import com.xingxi.common.utils.poi.ExcelUtil;
 import com.xingxi.master.tag.domain.Tag;
 import com.xingxi.master.tag.service.ITagService;
@@ -19,7 +20,7 @@ import java.util.List;
 /**
  * 标签Controller
  *
- * @author ruoyi
+ * @author xingxi
  * @date 2025-03-09
  */
 @Controller
@@ -42,9 +43,9 @@ public class TagController extends BaseController {
     @RequiresPermissions("master:tag:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(Tag mTag) {
+    public TableDataInfo list(Tag tag) {
         startPage();
-        List<Tag> list = tagService.selectTagList(mTag);
+        List<Tag> list = tagService.selectTagList(tag);
         return getDataTable(list);
     }
 
@@ -55,8 +56,8 @@ public class TagController extends BaseController {
     @Log(title = "标签", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(Tag mTag) {
-        List<Tag> list = tagService.selectTagList(mTag);
+    public AjaxResult export(Tag tag) {
+        List<Tag> list = tagService.selectTagList(tag);
         ExcelUtil<Tag> util = new ExcelUtil<>(Tag.class);
         return util.exportExcel(list, "标签数据");
     }
@@ -76,8 +77,8 @@ public class TagController extends BaseController {
     @Log(title = "标签", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(Tag mTag) {
-        return toAjax(tagService.insertTag(mTag));
+    public AjaxResult addSave(Tag tag) {
+        return toAjax(tagService.insertTag(tag));
     }
 
     /**
@@ -86,8 +87,8 @@ public class TagController extends BaseController {
     @RequiresPermissions("master:tag:edit")
     @GetMapping("/edit/{tagId}")
     public String edit(@PathVariable("tagId") Long tagId, ModelMap mMap) {
-        Tag mTag = tagService.selectTagByTagId(tagId);
-        mMap.put("mTag", mTag);
+        Tag tag = tagService.selectTagByTagId(tagId);
+        mMap.put("tag", tag);
         return prefix + "/edit";
     }
 
@@ -98,8 +99,8 @@ public class TagController extends BaseController {
     @Log(title = "标签", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(Tag mTag) {
-        return toAjax(tagService.updateTag(mTag));
+    public AjaxResult editSave(Tag tag) {
+        return toAjax(tagService.updateTag(tag));
     }
 
     /**
@@ -110,6 +111,6 @@ public class TagController extends BaseController {
     @PostMapping("/remove")
     @ResponseBody
     public AjaxResult remove(String ids) {
-        return toAjax(tagService.deleteTagByTagIds(ids));
+        return toAjax(tagService.logicDeleteTagByTagIds(ids));
     }
 }

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/product/prod/prod.html

@@ -121,6 +121,7 @@
                             if (row.prodStatus === 'SAVED') {
                                 actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                                 actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                             }
                             if (row.prodStatus === 'SUBMITTED') {
                                 actions.push('<a class="btn btn-warning btn-xs ' + approveFlag + '" href="javascript:void(0)" onclick="approve(\'' + row.id + '\')"><i class="fa fa-thumbs-o-up"></i>审核</a> ');

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/tag/add.html

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增用户避雷标签')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-tag-add">
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">标签：</label>
+                    <div class="col-sm-8">
+                        <input name="tagName" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "master/tag"
+        $("#form-tag-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-tag-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/tag/edit.html

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改用户避雷标签')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-tag-edit" th:object="${tag}">
+            <input name="userRefuseid" th:field="*{tagId}" type="hidden">
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">标签ID：</label>
+                    <div class="col-sm-8">
+                        <input name="tagName" th:field="*{tagName}" class="form-control" type="text">
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "master/tag";
+        $("#form-tag-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-tag-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

08.src/Xingxi/xingxi-admin/src/main/resources/templates/master/tag/tag.html

@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('用户避雷标签列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:tag:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:tag:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:tag:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('master:tag:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('master:tag:remove')}]];
+        var prefix = ctx + "master/tag";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "用户避雷标签",
+                columns: [
+                    {
+                        checkbox: true
+                    },
+                    {
+                        field: 'tagName',
+                        title: '标签名称'
+                    },
+                    {
+                        title: '操作',
+                        align: 'center',
+                        formatter: function(value, row, index) {
+                            var actions = [];
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.tagId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.tagId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                            return actions.join('');
+                        }
+                    }
+                ]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

08.src/Xingxi/xingxi-system/src/main/java/com/xingxi/master/tag/service/ITagService.java

@@ -81,7 +81,7 @@ public interface ITagService {
      * @param tagIds 需要删除的数据主键集合
      * @return 结果
      */
-    int logicDeleteTagByTagIds(String[] tagIds);
+    int logicDeleteTagByTagIds(String tagIds);
 
     /**
      * 逻辑批量删除标签

08.src/Xingxi/xingxi-system/src/main/java/com/xingxi/master/tag/service/impl/TagServiceImpl.java

@@ -1,7 +1,9 @@
 package com.xingxi.master.tag.service.impl;
 
 import com.xingxi.common.core.text.Convert;
+import com.xingxi.common.enums.EDelFlag;
 import com.xingxi.common.utils.DateUtils;
+import com.xingxi.common.utils.ShiroUtils;
 import com.xingxi.master.tag.domain.Tag;
 import com.xingxi.master.tag.mapper.TagMapper;
 import com.xingxi.master.tag.service.ITagService;
@@ -51,6 +53,8 @@ public class TagServiceImpl implements ITagService {
      */
     @Override
     public int insertTag(Tag tag) {
+        tag.setDelFlag(EDelFlag.NO.getVal());
+        tag.setCreateUser(ShiroUtils.getLoginName());
         tag.setCreateTime(DateUtils.getNowDate());
         return tagMapper.insertTag(tag);
     }
@@ -74,6 +78,7 @@ public class TagServiceImpl implements ITagService {
      */
     @Override
     public int updateTag(Tag tag) {
+        tag.setUpdateUser(ShiroUtils.getLoginName());
         tag.setUpdateTime(DateUtils.getNowDate());
         return tagMapper.updateTag(tag);
     }
@@ -118,8 +123,8 @@ public class TagServiceImpl implements ITagService {
      * @return 结果
      */
     @Override
-    public int logicDeleteTagByTagIds(String[] tagIds) {
-        return tagMapper.logicDeleteTagByTagIds(tagIds);
+    public int logicDeleteTagByTagIds(String tagIds) {
+        return tagMapper.logicDeleteTagByTagIds(Convert.toStrArray(tagIds));
     }
 
     /**