fix
Hentua
2023-04-20 60077685d3558adee9f45d2231184fa8304b59fe
fix
10 files added
1 files modified
572 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/controller/AdminMallShopController.java 29 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ApiMallShopController.java 20 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ViewMallShopController.java 37 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallShop.java 26 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallShopMapper.java 13 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IMallShopService.java 11 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/MallShopServiceImpl.java 23 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/modules/MallShopMapper.xml 20 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/shop/add.html 217 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/shop/shopList.html 168 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/index.html 8 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/AdminMallShopController.java
New file
@@ -0,0 +1,29 @@
package cc.mrbird.febs.mall.controller;
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
import cc.mrbird.febs.mall.entity.MallShop;
import cc.mrbird.febs.mall.service.IMallShopService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@Validated
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/admin/shop")
public class AdminMallShopController extends BaseController {
    private final IMallShopService mallShopService;
    @GetMapping(value = "/shopListInPage")
    public FebsResponse shopListInPage(MallShop mallShop, QueryRequest request) {
        return new FebsResponse().success().data(getDataTable(mallShopService.findShopListInPage(mallShop, request)));
    }
}
src/main/java/cc/mrbird/febs/mall/controller/ApiMallShopController.java
New file
@@ -0,0 +1,20 @@
package cc.mrbird.febs.mall.controller;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@Validated
@RestController
@CrossOrigin("*")
@RequiredArgsConstructor
@RequestMapping(value = "/api/shop")
@Api(value = "ApiMallShopController", tags = "店铺接口类")
public class ApiMallShopController {
}
src/main/java/cc/mrbird/febs/mall/controller/ViewMallShopController.java
New file
@@ -0,0 +1,37 @@
package cc.mrbird.febs.mall.controller;
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller("shopView")
@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/shop")
@RequiredArgsConstructor
public class ViewMallShopController {
    @GetMapping("/shopList")
    @RequiresPermissions("shop:view")
    public String shopList() {
        return FebsUtil.view("modules/shop/shopList");
    }
    @RequiresPermissions("shop:add")
    @GetMapping("add")
    public String add() {
        return FebsUtil.view("modules/shop/add");
    }
    @RequiresPermissions("shop:update")
    @GetMapping("update")
    public String update() {
        return FebsUtil.view("modules/shop/update");
    }
}
src/main/java/cc/mrbird/febs/mall/entity/MallShop.java
New file
@@ -0,0 +1,26 @@
package cc.mrbird.febs.mall.entity;
import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.math.BigDecimal;
@Data
@TableName("mall_shop")
public class MallShop extends BaseEntity {
    private String shopName;
    private String shopImage;
    private String shopAddress;
    private String phone;
    private BigDecimal longitude;
    private BigDecimal latitude;
    private Integer state;
}
src/main/java/cc/mrbird/febs/mall/mapper/MallShopMapper.java
New file
@@ -0,0 +1,13 @@
package cc.mrbird.febs.mall.mapper;
import cc.mrbird.febs.mall.entity.MallShop;
import cc.mrbird.febs.mall.vo.AdminMallNewsInfoVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
public interface MallShopMapper extends BaseMapper<MallShop> {
    IPage<MallShop> selectShopListInPage(@Param("record") MallShop mallShop, Page<MallShop> page);
}
src/main/java/cc/mrbird/febs/mall/service/IMallShopService.java
New file
@@ -0,0 +1,11 @@
package cc.mrbird.febs.mall.service;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.entity.MallShop;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
public interface IMallShopService extends IService<MallShop> {
    IPage<MallShop> findShopListInPage(MallShop mallShop, QueryRequest request);
}
src/main/java/cc/mrbird/febs/mall/service/impl/MallShopServiceImpl.java
New file
@@ -0,0 +1,23 @@
package cc.mrbird.febs.mall.service.impl;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.entity.MallShop;
import cc.mrbird.febs.mall.mapper.MallShopMapper;
import cc.mrbird.febs.mall.service.IMallShopService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
@RequiredArgsConstructor
public class MallShopServiceImpl extends ServiceImpl<MallShopMapper, MallShop> implements IMallShopService {
    @Override
    public IPage<MallShop> findShopListInPage(MallShop mallShop, QueryRequest request) {
        Page<MallShop> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.baseMapper.selectShopListInPage(mallShop, page);
    }
}
src/main/resources/mapper/modules/MallShopMapper.xml
New file
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.mall.mapper.MallShopMapper">
    <select id="selectShopListInPage" resultType="cc.mrbird.febs.mall.entity.MallShop">
        select * from mall_shop
        <where>
            1=1
            <if test="record != null">
                <if test="record.shopName != null and record.shopName != ''">
                    and shop_name like concat('%', concat(#{record.shopName}, '%'))
                </if>
                <if test="record.state != null">
                    and state = #{record.state}
                </if>
            </if>
        </where>
        order by id desc
    </select>
</mapper>
src/main/resources/templates/febs/views/modules/shop/add.html
New file
@@ -0,0 +1,217 @@
<style>
    #shop-add {
        padding: 20px 25px 25px 0;
    }
    #shop-add .layui-treeSelect .ztree li a, .ztree li span {
        margin: 0 0 2px 3px !important;
    }
    #shop-add #data-permission-tree-block {
        border: 1px solid #eee;
        border-radius: 2px;
        padding: 3px 0;
    }
    #shop-add .layui-treeSelect .ztree li span.button.switch {
        top: 1px;
        left: 3px;
    }
    #shop-add img{
        max-width:100px
    }
    #panel {
        position: absolute;
        background-color: white;
        max-height: 90%;
        overflow-y: auto;
        top: 10px;
        right: 10px;
        width: 280px;
    }
    .amap-sug-result {
        z-index: 19891016;
    }
</style>
<script type="text/javascript" src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<div class="layui-fluid" id="shop-add">
    <form class="layui-form" action="" lay-filter="shop-add-form">
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">店铺名称:</label>
            <div class="layui-input-block">
                <input type="text" name="shopName" autocomplete="off" class="layui-input" >
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">联系方式:</label>
            <div class="layui-input-block">
                <input type="text" name="shopName" autocomplete="off" class="layui-input" >
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">缩略图:</label>
            <div class="layui-input-block">
                <button type="button" class="layui-btn" id="imageUpload" style="background-color: #009688; margin-bottom: 2px">图片上传</button>
                <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
                    <div class=" layui-upload-list view-images" id="thumbImage">
                    </div>
                </blockquote>
                <div class="febs-hide">
                    <input type="text" id="thumb"  name="shopImage" autocomplete="off" class="layui-input" readonly>
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">地址:</label>
            <div class="layui-input-block">
                <input type="text" name="shopName" autocomplete="off" class="layui-input" id="tipinput">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">选择地址:</label>
            <div class="layui-input-block">
                <div style="padding: .1rem;">
                    <div id="container" class="map"></div>
                </div>
            </div>
        </div>
        <div class="layui-form-item febs-hide">
            <div class="layui-input-block">
                <input type="text" name="longitude" autocomplete="off" class="layui-input" >
                <input type="text" name="latitude" autocomplete="off" class="layui-input" >
            </div>
        </div>
        <div class="layui-form-item febs-hide">
            <button class="layui-btn" lay-submit="" lay-filter="shop-add-form-submit" id="submit"></button>
        </div>
    </form>
</div>
<script data-th-inline="javascript">
    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree','layedit', 'laydate', 'upload'], function () {
        var $ = layui.$,
            febs = layui.febs,
            layer = layui.layer,
            upload = layui.upload,
            formSelects = layui.formSelects,
            form = layui.form,
            laydate = layui.laydate,
            layedit = layui.layedit,
            $view = $('#shop-add'),
            validate = layui.validate;
        form.render();
        laydate.render({
            elem: '#febs-form-group-date'
        });
        layedit.set({    //设置图片接口
            uploadImage: {
                url: 'admin/goods/uploadFileBase64', //接口url
                type: 'post',
            }
        });
        //创建一个编辑器
        var index = layedit.build('lay_edit',{
            height: 300
        });
        form.verify({
            //content富文本域中的lay-verify值
            content: function(value) {
                return layedit.sync(index);
            }
        });
        formSelects.render();
        form.on('submit(shop-add-form-submit)', function (data) {
            febs.post(ctx + 'admin/news/addNewsInfo', data.field, function () {
                layer.closeAll();
                febs.alert.success('操作成功');
                $('#febs-newInfo').find('#reset').click();
            });
            return false;
        });
        upload.render({
            elem: '#imageUpload'
            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
            ,multiple: false
            ,before: function(obj){
                //预读本地文件示例,不支持ie8
                obj.preview(function(index, file, result){
                    $('#thumbImage').html('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img" style="width: 100px">')
                });
            }
            ,done: function(res){
                $("#thumb").val(res.data.src);
            }
        });
        bindUpload();
        function bindUpload() {
            upload.render({
                elem: '.upload'
                ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
                ,accept: 'file'
                ,before: function(obj){
                    layer.msg('上传中', {icon: 16, time: 0});
                }
                ,done: function(res){
                    var item = this.item;
                    //如果上传失败
                    if(res.code !== 0){
                        return layer.msg('上传失败');
                    }
                    // $(item).parent().prev().find('input').val(res.data[0]);
                    $("#videoUrl").val(res.data.src);
                    layer.msg('上传完毕', {icon: 1});
                }
                ,error: function(err){
                    return layer.msg('上传失败');
                }
            });
        }
        $view.find('#container').css({"height": document.documentElement.clientHeight - 97 + 'px'});
        var map = new AMap.Map("container", {
            resizeEnable: true,
            zoom: 14 //初始地图级别
        });
        AMap.plugin('AMap.AutoComplete', function() {
            var auto = new AMap.AutoComplete({
                input: "tipinput"
            });
            // AMap.Event.addListener(auto, "select", function(e) {
            //     console.log(e);
            // })
        })
        // function currentLocationInfo() {
        //     map.getCity(function (info) {
        //         febs.alert.success('当前位置:' + info.province + ',' + info.city + ',' + info.district + ',区号:' + info.citycode);
        //     });
        // }
        // currentLocationInfo();
        //
        // //为地图注册click事件获取鼠标点击出的经纬度坐标
        // map.on('click', function (e) {
        //     febs.alert.success('经度:' + e.lnglat.getLng() + ',纬度:' + e.lnglat.getLat());
        // });
    });
</script>
<script type="text/javascript" src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
src/main/resources/templates/febs/views/modules/shop/shopList.html
New file
@@ -0,0 +1,168 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-shopInfo" lay-title="店铺管理">
    <div class="layui-row febs-container">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body febs-table-full">
                    <form class="layui-form layui-table-form" lay-filter="user-table-form">
                        <div class="layui-row">
                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="add">
                                    新增
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
                                    <i class="layui-icon">&#xe848;</i>
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                    <i class="layui-icon">&#xe79b;</i>
                                </div>
                            </div>
                        </div>
                    </form>
                    <table lay-filter="shopInfoTable" lay-data="{id: 'shopInfoTable'}"></table>
                </div>
            </div>
        </div>
    </div>
</div>
<style>
    .layui-table-cell {
        height: auto;
    }
    .layui-form-onswitch {
        background-color: #5FB878 !important;
    }
</style>
<script type="text/html" id="isTopSwitch">
    {{# if(d.state === 1) { }}
    <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="isTopSwitch">
    {{# } else { }}
    <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="isTopSwitch">
    {{# } }}
</script>
<!-- 表格操作栏 start -->
<script type="text/html" id="user-option">
    <span shiro:lacksPermission="shop:view,shop:update,shop:delete">
        <span class="layui-badge-dot febs-bg-orange"></span> 无权限
    </span>
    <a lay-event="edit" shiro:hasPermission="shop:update"><i
            class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
    // 引入组件并初始化
    layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
            table = layui.table,
            $view = $('#febs-shopInfo'),
            $query = $view.find('#query'),
            $add = $view.find('#add'),
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            sortObject = {field: 'phone', type: null},
            tableIns;
        form.render();
        // 表格初始化
        initTable();
        // 初始化表格操作栏各个按钮功能
        table.on('tool(shopInfoTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            if (layEvent === 'shopInfoUpdate') {
                febs.modal.open('编辑', 'modules/news/shopInfoUpdate/' + data.id, {
                    btn: ['提交', '取消'],
                    yes: function (index, layero) {
                        $('#newsInfo-update').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }
            if (layEvent === 'delShopInfo') {
                febs.modal.confirm('删除', '确认删除?', function () {
                    delShopInfo(data.id);
                });
            }
        });
        function delShopInfo(id) {
            febs.get(ctx + 'admin/news/delShopInfo/' + id, null, function () {
                febs.alert.success('操作成功');
                $query.click();
            });
        }
        // 查询按钮
        $query.on('click', function () {
            var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
            tableIns.reload({where: params, page: {curr: 1}});
        });
        // 刷新按钮
        $reset.on('click', function () {
            $searchForm[0].reset();
            sortObject.type = 'null';
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
        });
        $add.on('click', function () {
            febs.modal.open('新增', 'modules/shop/add/', {
                btn: ['提交', '取消'],
                yes: function (index, layero) {
                    $('#newsInfo-add').find('#submit').trigger('click');
                },
                btn2: function () {
                    layer.closeAll();
                }
            });
        });
        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'shopInfoTable',
                url: ctx + 'admin/shop/shopListInPage',
                cols: [[
                    {field: 'shopImage', title: '店铺图片',
                        templet: function (d) {
                            return '<a lay-event="seeImgThumb"><img id="seeImgThumb'+d.id+'" src="'+d.thumb+'" alt=""></a>';
                        }, minWidth: 150,align:'center'},
                    {field: 'shopName', title: '店铺名称', minWidth: 120,align:'center'},
                    {field: 'phone', title: '联系方式', minWidth: 120,align:'center'},
                    {templet: '#isTopSwitch', title: '是否上线', minWidth: 120,align:'center'},
                    {title: '操作',
                        templet: function (d) {
                            return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="shopInfoUpdate" shiro:hasPermission="shop:update">编辑</button>'
                                +'<button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delShopInfo" shiro:hasPermission="shop:del">删除</button>'
                        },minWidth: 300,align:'center'}
                ]]
            });
        }
        // 获取查询参数
        function getQueryParams() {
            return {
            };
        }
        form.on('switch(isTopSwitch)', function (data) {
            console.log(data.value);
            if (data.elem.checked) {
                febs.post(ctx + 'admin/news/topNews/' + data.value, null, function () {
                    febs.alert.success('设置成功');
                    $query.click();
                });
            } else {
                febs.post(ctx + 'admin/news/unTopNews/' + data.value, null, function () {
                    febs.alert.success('设置成功');
                    $query.click();
                });
            }
        })
    })
</script>
src/main/resources/templates/index.html
@@ -14,8 +14,12 @@
    <link rel="stylesheet" th:href="@{febs/css/eleTree.css}" media="all">
    <link rel="stylesheet" th:href="@{febs/css/apexcharts.min.css}" media="all">
    <link rel="stylesheet" th:href="@{febs/css/formSelects-v4.css}" media="all">
    <!-- 高德地图,key为演示作用,请勿滥用-->
    <script src="https://webapi.amap.com/maps?v=1.4.15&key=0e8a587317998a5e03cf608649b229d6&plugin=AMap.Autocomplete"></script>
    <script>
        window._AMapSecurityConfig = {
            securityJsCode : '3d6014e2619ab82ab4f10fa908e15ba2'
        }
    </script>
    <script src="https://webapi.amap.com/maps?v=2.0&key=f734eff869207f9afbd5462a3ac6bff5&plugin=AMap.AutoComplete,AMap.PlaceSearch"></script>
    <link href="https://unpkg.com/@wangeditor/editor@5.0.1/dist/css/style.css" rel="stylesheet">
    <script src="https://unpkg.com/@wangeditor/editor@latest/dist/index.js"></script>
    <link rel="icon" th:href="@{febs/images/favicon.ico}" type="image/x-icon"/>