提交代码

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/designer/controller/DesignerController.java

@@ -50,19 +50,6 @@ public class DesignerController extends BaseController {
     }
 
     /**
-     * 导出设计师列表
-     */
-    @RequiresPermissions("master:designer:export")
-    @Log(title = "设计师", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(Designer designer) {
-        List<Designer> list = designerService.selectDesignerList(designer);
-        ExcelUtil<Designer> util = new ExcelUtil<>(Designer.class);
-        return util.exportExcel(list, "设计师数据");
-    }
-
-    /**
      * 新增设计师
      */
     @GetMapping("/add")

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/ipInfo/controller/IpInfoController.java

@@ -30,7 +30,7 @@ public class IpInfoController extends BaseController {
     @Resource
     private IIpInfoService ipInfoService;
 
-    @RequiresPermissions("system:ipInfo:view")
+    @RequiresPermissions("master:ipInfo:view")
     @GetMapping()
     public String ipInfo() {
         return prefix + "/ipInfo";
@@ -39,7 +39,7 @@ public class IpInfoController extends BaseController {
     /**
      * 查询文创品牌列表
      */
-    @RequiresPermissions("system:ipInfo:list")
+    @RequiresPermissions("master:ipInfo:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(IpInfo ipInfo) {
@@ -49,19 +49,6 @@ public class IpInfoController extends BaseController {
     }
 
     /**
-     * 导出文创品牌列表
-     */
-    @RequiresPermissions("system:ipInfo:export")
-    @Log(title = "文创品牌", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(IpInfo ipInfo) {
-        List<IpInfo> list = ipInfoService.selectIpInfoList(ipInfo);
-        ExcelUtil<IpInfo> util = new ExcelUtil<>(IpInfo.class);
-        return util.exportExcel(list, "文创品牌数据");
-    }
-
-    /**
      * 新增文创品牌
      */
     @GetMapping("/add")
@@ -72,7 +59,7 @@ public class IpInfoController extends BaseController {
     /**
      * 新增保存文创品牌
      */
-    @RequiresPermissions("system:ipInfo:add")
+    @RequiresPermissions("master:ipInfo:add")
     @Log(title = "文创品牌", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -83,7 +70,7 @@ public class IpInfoController extends BaseController {
     /**
      * 修改文创品牌
      */
-    @RequiresPermissions("system:ipInfo:edit")
+    @RequiresPermissions("master:ipInfo:edit")
     @GetMapping("/edit/{ipInfoId}")
     public String edit(@PathVariable("ipInfoId") Long ipInfoId, ModelMap mMap) {
         IpInfo ipInfo = ipInfoService.selectIpInfoByIpId(ipInfoId);
@@ -94,7 +81,7 @@ public class IpInfoController extends BaseController {
     /**
      * 修改保存文创品牌
      */
-    @RequiresPermissions("system:ipInfo:edit")
+    @RequiresPermissions("master:ipInfo:edit")
     @Log(title = "文创品牌", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -105,7 +92,7 @@ public class IpInfoController extends BaseController {
     /**
      * 删除文创品牌
      */
-    @RequiresPermissions("system:ipInfo:remove")
+    @RequiresPermissions("master:ipInfo:remove")
     @Log(title = "文创品牌", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody
@@ -113,7 +100,7 @@ public class IpInfoController extends BaseController {
         return toAjax(ipInfoService.logicDeleteIpInfoByIpIds(ids));
     }
 
-    @RequiresPermissions("system:ipInfo:edit")
+    @RequiresPermissions("master:ipInfo:edit")
     @Log(title = "文创品牌拖动排序", businessType = BusinessType.UPDATE)
     @PostMapping("/sorted")
     @ResponseBody

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/controller/ProdAttrController.java

@@ -34,10 +34,9 @@ public class ProdAttrController extends BaseController {
     @Resource
     private IProdAttrVoService prodAttrVoService;
 
-    @RequiresPermissions("master:product:prod:viewAttrs")
+    @RequiresPermissions("master:product:prod:editAttrs")
     @GetMapping("/{id}")
     public String prodAttr(@PathVariable("id") Long id, ModelMap mMap) {
-
         mMap.put("prodId", id);
         mMap.put("prod", prodVoService.selectProdById(id));
 
@@ -47,7 +46,7 @@ public class ProdAttrController extends BaseController {
     /**
      * 查询商品属性列表
      */
-    @RequiresPermissions("master:product:list")
+    @RequiresPermissions("master:product:prodAttr:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(ProdAttrVo prodAttrVo) {
@@ -59,7 +58,7 @@ public class ProdAttrController extends BaseController {
     /**
      * 查询商品属性列表
      */
-    @RequiresPermissions("master:product:list")
+    @RequiresPermissions("master:product:prodAttr:list")
     @PostMapping("/jointList")
     @ResponseBody
     public TableDataInfo jointList(ProdAttrVo prodAttrVo) {
@@ -71,7 +70,7 @@ public class ProdAttrController extends BaseController {
     /**
      * 新增商品属性
      */
-    @RequiresPermissions("master:product:addAttr")
+    @RequiresPermissions("master:product:prodAttr:add")
     @GetMapping("/add/{id}")
     public String add(@PathVariable("id") Long id, ModelMap mMap) {
         mMap.put("prodId", id);
@@ -81,7 +80,7 @@ public class ProdAttrController extends BaseController {
     /**
      * 修改商品属性
      */
-    @RequiresPermissions("master:product:editAttr")
+    @RequiresPermissions("master:product:prodAttr:edit")
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") Long prodAttrId, ModelMap mMap) {
         ProdAttrVo prodAttrVo = prodAttrVoService.selectProdAttrVoByProdAttrId(prodAttrId);
@@ -94,7 +93,7 @@ public class ProdAttrController extends BaseController {
     /**
      * 添加商品属性
      */
-    @RequiresPermissions("master:product:addAttr")
+    @RequiresPermissions("master:product:prodAttr:add")
     @Log(title = "商品属性", businessType = BusinessType.INSERT)
     @PostMapping("/addAttr")
     @ResponseBody
@@ -105,7 +104,7 @@ public class ProdAttrController extends BaseController {
     /**
      * 修改商品属性
      */
-    @RequiresPermissions("master:product:editAttr")
+    @RequiresPermissions("master:product:prodAttr:edit")
     @Log(title = "商品属性", businessType = BusinessType.UPDATE)
     @PostMapping("/editAttr")
     @ResponseBody
@@ -116,7 +115,7 @@ public class ProdAttrController extends BaseController {
     /**
      * 删除商品属性
      */
-    @RequiresPermissions("master:product:tag:remove")
+    @RequiresPermissions("master:product:prodAttr:remove")
     @Log(title = "商品属性", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/controller/ProdAttrJointController.java

@@ -22,15 +22,13 @@ import java.util.List;
 @Controller
 @RequestMapping("/master/product/prodAttrJoint")
 public class ProdAttrJointController extends BaseController {
-    private final String prefix = "/master/product/attr/joint";
-
     @Resource
     private IProdAttrJointVoService prodAttrJointVoService;
 
     /**
      * 查询商品属性组合列表
      */
-    @RequiresPermissions("master:product:attr:joint:list")
+    @RequiresPermissions("master:product:prodAttrJoint:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(ProdAttrJointVo prodAttrJointVo) {

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/controller/ProdClassController.java

@@ -53,19 +53,6 @@ public class ProdClassController extends BaseController {
     }
 
     /**
-     * 导出商品分类列表
-     */
-    @RequiresPermissions("master:product:class:export")
-    @Log(title = "商品分类", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(ProdClass prodClass) {
-        List<ProdClass> list = prodClassService.selectProdClassList(prodClass);
-        ExcelUtil<ProdClass> util = new ExcelUtil<>(ProdClass.class);
-        return util.exportExcel(list, "商品分类数据");
-    }
-
-    /**
      * 新增商品分类
      */
     @GetMapping("/add")

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/controller/ProdController.java

@@ -41,7 +41,7 @@ public class ProdController extends BaseController {
     @Resource
     private IProdAttrPriceVoService prodAttrPriceVoService;
 
-    @RequiresPermissions("master:product:view")
+    @RequiresPermissions("master:product:prod:view")
     @GetMapping()
     public String prod() {
         return prefix + "/prod";
@@ -50,7 +50,7 @@ public class ProdController extends BaseController {
     /**
      * 查询商品列表
      */
-    @RequiresPermissions("master:product:list")
+    @RequiresPermissions("master:product:prod:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(ProdVo prodVo) {
@@ -60,19 +60,6 @@ public class ProdController extends BaseController {
     }
 
     /**
-     * 导出商品列表
-     */
-    @RequiresPermissions("master:product:export")
-    @Log(title = "商品", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(Prod prod) {
-        List<Prod> list = prodVoService.selectProdList(prod);
-        ExcelUtil<Prod> util = new ExcelUtil<>(Prod.class);
-        return util.exportExcel(list, "商品数据");
-    }
-
-    /**
      * 新增商品
      */
     @GetMapping("/add")
@@ -83,7 +70,7 @@ public class ProdController extends BaseController {
     /**
      * 新增保存商品
      */
-    @RequiresPermissions("master:product:add")
+    @RequiresPermissions("master:product:prod:add")
     @Log(title = "商品", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -95,7 +82,7 @@ public class ProdController extends BaseController {
     /**
      * 修改商品
      */
-    @RequiresPermissions("master:product:edit")
+    @RequiresPermissions("master:product:prod:edit")
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") Long id, ModelMap mMap) {
         ProdVo prodVo = prodVoService.selectProdVoById(id);
@@ -106,7 +93,7 @@ public class ProdController extends BaseController {
     /**
      * 修改保存商品
      */
-    @RequiresPermissions("master:product:edit")
+    @RequiresPermissions("master:product:prod:edit")
     @Log(title = "商品", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -117,7 +104,7 @@ public class ProdController extends BaseController {
     /**
      * 删除商品
      */
-    @RequiresPermissions("master:product:remove")
+    @RequiresPermissions("master:product:prod:remove")
     @Log(title = "商品", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody
@@ -128,7 +115,7 @@ public class ProdController extends BaseController {
     /**
      * 审核商品
      */
-    @RequiresPermissions("master:product:approve")
+    @RequiresPermissions("master:product:prod:submitt")
     @PostMapping("/submitt")
     @ResponseBody
     public AjaxResult submitProd(Prod prod) {
@@ -153,7 +140,7 @@ public class ProdController extends BaseController {
     /**
      * 审核商品
      */
-    @RequiresPermissions("master:product:approve")
+    @RequiresPermissions("master:product:prod:approve")
     @PostMapping("/approve")
     @ResponseBody
     public AjaxResult approve(Prod prod) {
@@ -164,7 +151,7 @@ public class ProdController extends BaseController {
     /**
      * 审核商品
      */
-    @RequiresPermissions("master:product:approve")
+    @RequiresPermissions("master:product:prod:approve")
     @PostMapping("/reject")
     @ResponseBody
     public AjaxResult reject(Prod prod) {

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/controller/ProdPicController.java

@@ -36,7 +36,7 @@ public class ProdPicController extends BaseController {
     /**
      * 修改商品图片
      */
-    @RequiresPermissions("master:product:editPic")
+    @RequiresPermissions("master:product:prod:editPics")
     @GetMapping("/editPic/{id}")
     public String editPic(@PathVariable("id") Long id, ModelMap mMap) {
         ProdPicVo cond = new ProdPicVo();
@@ -55,7 +55,7 @@ public class ProdPicController extends BaseController {
     /**
      * 添加商品图片
      */
-    @RequiresPermissions("master:product:addPic")
+    @RequiresPermissions("master:product:prodPic:add")
     @Log(title = "商品图片", businessType = BusinessType.INSERT)
     @PostMapping("/addProdPic")
     @ResponseBody
@@ -66,7 +66,7 @@ public class ProdPicController extends BaseController {
     /**
      * 删除商品图片
      */
-    @RequiresPermissions("master:product:Pic:remove")
+    @RequiresPermissions("master:product:prodPic:remove")
     @Log(title = "商品图片", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/controller/ProdTagController.java

@@ -32,7 +32,7 @@ public class ProdTagController extends BaseController {
     /**
      * 修改商品标签
      */
-    @RequiresPermissions("master:product:editTag")
+    @RequiresPermissions("master:product:prod:editTags")
     @GetMapping("/editTag/{id}")
     public String editTag(@PathVariable("id") Long id, ModelMap mMap) {
         ProdTagVo cond = new ProdTagVo();
@@ -50,7 +50,7 @@ public class ProdTagController extends BaseController {
     /**
      * 添加商品标签
      */
-    @RequiresPermissions("master:product:addTag")
+    @RequiresPermissions("master:product:prodTag:add")
     @Log(title = "商品标签", businessType = BusinessType.INSERT)
     @PostMapping("/addTags")
     @ResponseBody
@@ -61,7 +61,7 @@ public class ProdTagController extends BaseController {
     /**
      * 删除商品标签
      */
-    @RequiresPermissions("master:product:tag:remove")
+    @RequiresPermissions("master:product:prodTag:remove")
     @Log(title = "商品标签", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/vendor/controller/VendorController.java

@@ -56,19 +56,6 @@ public class VendorController extends BaseController {
     }
 
     /**
-     * 导出供应商列表
-     */
-    @RequiresPermissions("master:vendor:export")
-    @Log(title = "供应商", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(Vendor vendor) {
-        List<Vendor> list = vendorService.selectVendorList(vendor);
-        ExcelUtil<Vendor> util = new ExcelUtil<>(Vendor.class);
-        return util.exportExcel(list, "供应商数据");
-    }
-
-    /**
      * 新增供应商
      */
     @GetMapping("/add")

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

@@ -45,8 +45,8 @@
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: bootstrap-table-reorder-rows-js"/>
     <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:ipInfo:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:ipInfo:remove')}]];
+        var editFlag = [[${@permission.hasPermi('master:ipInfo:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('master:ipInfo:remove')}]];
         var prefix = ctx + "master/ipInfo";
 
         $(function() {

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

@@ -60,7 +60,8 @@
         var prefix = ctx + "master/merchant/prod";
         var removeFlag = [[${@permission.hasPermi('master:merchant:prod:remove')}]];
         var editPriceFlag = [[${@permission.hasPermi('master:merchant:prod:editPrice')}]];
-        var shelfFlags = [[${@dict.getType('shelf_flag')}]];
+        var shelfFlag = [[${@permission.hasPermi('master:merchant:prod:shelf')}]];
+        var shelfFlagDatas = [[${@dict.getType('shelf_flag')}]];
 
         $(function() {
             var options = {
@@ -87,7 +88,7 @@
                         field: 'shelfFlag',
                         title: '上架状态',
                         formatter: function (value, row, index) {
-                            return $.table.selectDictLabel(shelfFlags, value);
+                            return $.table.selectDictLabel(shelfFlagDatas, value);
                         }
                     },
                     {
@@ -107,10 +108,10 @@
                         formatter: function(value, row, index) {
                             var actions = [];
                             if (row.shelfFlag !== "1") {
-                                actions.push('<a class="btn btn-success btn-xs ' + shelfFlags + '" href="javascript:void(0)" onclick="shelf(\'' + row.mercProdId + '\', \'1\')"><i class="fa fa-uplevel"></i>上架</a> ');
+                                actions.push('<a class="btn btn-success btn-xs ' + shelfFlag + '" href="javascript:void(0)" onclick="shelf(\'' + row.mercProdId + '\', \'1\')"><i class="fa fa-uplevel"></i>上架</a> ');
                                 actions.push('<a class="btn btn-info btn-xs ' + editPriceFlag + '" href="javascript:void(0)" onclick="showEditPrice(\'' + row.mercProdId + '\')"><i class="fa fa-money"></i>编辑价格</a> ');
                             } else {
-                                actions.push('<a class="btn btn-success btn-xs ' + shelfFlags + '" href="javascript:void(0)" onclick="shelf(\'' + row.mercProdId + '\', \'0\')"><i class="fa fa-uplevel"></i>下架</a> ');
+                                actions.push('<a class="btn btn-success btn-xs ' + shelfFlag + '" href="javascript:void(0)" onclick="shelf(\'' + row.mercProdId + '\', \'0\')"><i class="fa fa-uplevel"></i>下架</a> ');
                             }
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.mercProdId + '\')"><i class="fa fa-remove"></i>删除</a> ');
                             return actions.join('');

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

@@ -88,9 +88,11 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('master:product:prod:edit')}]];
         var removeFlag = [[${@permission.hasPermi('master:product:prod:remove')}]];
+        var editAttrFlag = [[${@permission.hasPermi('master:product:prod:editAttrs')}]];
+        var editPicFlag = [[${@permission.hasPermi('master:product:prod:editPics')}]];
+        var editTagFlag = [[${@permission.hasPermi('master:product:prod:editTags')}]];
+        var submittFlag = [[${@permission.hasPermi('master:product:prod:submitt')}]];
         var approveFlag = [[${@permission.hasPermi('master:product:prod:approve')}]];
-        var editAttrFlag = [[${@permission.hasPermi('master:product:prod:viewAttrs')}]];
-        var editTagFlag = [[${@permission.hasPermi('master:product:prod:editTag')}]];
         var prefix = ctx + "master/product/prod";
         var prodStatuses = [[${@dict.getType('prod_status')}]];
 
@@ -136,8 +138,8 @@
                                 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-warning btn-xs ' + editAttrFlag + '" href="javascript:void(0)" onclick="editAttr(\'' + row.id + '\')"><i class="fa fa-at"></i>编辑属性</a> ');
                                 // actions.push('<a class="btn btn-info btn-xs ' + editTagFlag + '" href="javascript:void(0)" onclick="editTag(\'' + row.id + '\')"><i class="fa fa-info"></i>编辑标签</a> ');
-                                actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="editPic(\'' + row.id + '\')"><i class="fa fa-file-picture-o"></i>商品图片</a> ');
-                                actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="submitt(\'' + row.id + '\')"><i class="fa fa-file-picture-o"></i>提交</a> ');
+                                actions.push('<a class="btn btn-primary btn-xs ' + editPicFlag + '" href="javascript:void(0)" onclick="editPic(\'' + row.id + '\')"><i class="fa fa-file-picture-o"></i>商品图片</a> ');
+                                actions.push('<a class="btn btn-info btn-xs ' + submittFlag + '" href="javascript:void(0)" onclick="submitt(\'' + row.id + '\')"><i class="fa fa-file-picture-o"></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/vendor/vendor.html

@@ -40,7 +40,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="master:designer:add">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="master:vendor:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
             </div>