提交admin管理

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-generator/src/main/resources/generator.yml

@@ -4,8 +4,8 @@ gen:
   # 作者
   author: ruoyi
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.liquidnet.client.admin.system
+  packageName: com.liquidnet.client.admin.zhengzai.kylin
   # 自动去除表前缀，默认是false
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: sys_
+  tablePrefix: adam_,kylin_
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/pom.xml

@@ -66,7 +66,10 @@
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-client-admin-framework</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-client-admin-zhengzai</artifactId>
+        </dependency>
         <!-- 定时任务-->
 <!--        <dependency>-->
 <!--            <groupId>com.liquidnet</groupId>-->

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformanceCalendarController.java

+package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
+
+import com.liquidnet.client.admin.common.core.controller.BaseController;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.zhengzai.kylin.domain.KylinPerformances;
+import com.liquidnet.client.admin.zhengzai.kylin.service.IKylinPerformancesService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: PerformanceCalendar
+ * @Package com.liquidnet.client.admin.web.controller.zhengzai.kylin
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/5/24 19:58
+ */
+@Controller
+@RequestMapping("/kylin/performanceCalendar")
+public class PerformanceCalendarController extends BaseController{
+    private String prefix = "zhengzai/kylin/performanceCalendar";
+
+    @Autowired
+    private IKylinPerformancesService kylinPerformancesService;
+
+    @RequiresPermissions("kylin:performanceCalendar:view")
+    @GetMapping()
+    public String performances()
+    {
+        return prefix + "/performanceCalendar";
+    }
+
+    /**
+     * 查询演出列表
+     */
+    @RequiresPermissions("kylin:performanceCalendar:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(KylinPerformances kylinPerformances)
+    {
+        startPage();
+        List<KylinPerformances> list = kylinPerformancesService.selectKylinPerformancesList(kylinPerformances);
+        return getDataTable(list);
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-client-admin-web.yml

@@ -41,8 +41,12 @@ logging:
   level:
     root: info
     #以下是为指定包设置日志级别
-    com.liquidnet.client.admin: debug
-    org.springframework: warn
+    com:
+      liquidnet:
+        client:
+          admin: debug
+    org:
+      springframework: warn
 
 # -----------------------------------------------------------
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-druid.yml

@@ -12,7 +12,7 @@ spring:
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
-                enabled: true
+                enabled: false
                 url: jdbc:mysql://${liquidnet.mysql.slave.urlHostAndPort}/${liquidnet.mysql.slave.database-name}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: ${liquidnet.mysql.slave.username}
                 password: ${liquidnet.mysql.slave.password}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application.yml

 spring:
     profiles:
-        active: dev
+        active: test
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performanceCalendar/performanceCalendar.html

+<!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="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li class="select-time">
+                                <label th:style="'width:120px'">请选择时间范围： </label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始日期" name="params[beginTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束日期" name="params[endTime]"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+            <div class="col-sm-12 select-table table-bordered">
+                <table id="bootstrap-table"></table>
+            </div>
+            <div>
+                <div class="calendar-day" :class="data.isSelected ? 'is-selected' : ''">
+                    {{ data.day.split('-').slice(1).join('-') }} {{ data.isSelected ? '✔️' : '' }}
+                </div>
+                <div  id="index" class="calendar-data">
+                    <div>
+                        <div>
+                            <div th:each="entries,stat:${resultList}" effect="dark" value="item.title">
+                                <div>
+                                    <div class="city">
+                                        <el-button size="mini" type="primary" plain>
+                                            {{ item.city_name }}
+                                        </el-button>
+                                        {{ item.time_start }}
+                                    </div>
+                                    <div class="title">
+                                        {{ item.title }}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('kylin:performances:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('kylin:performances:remove')}]];
+        var prefix = ctx + "kylin/performanceCalendar";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                sortName: "sort",
+                modalName: "演出",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'title',
+                    title: '演出名称'
+                },
+                {
+                    field: 'timeStart',
+                    title: '开演时间'
+                },
+                {
+                    field: 'imgPoster',
+                    title: '供票总量'
+                },
+                {
+                    field: 'provinceId',
+                    title: '实销'
+                },
+                {
+                    field: 'provinceName',
+                    title: '余票'
+                },
+                {
+                    field: 'provinceName',
+                    title: '总销售款'
+                },
+                {
+                    field: 'provinceName',
+                    title: '演出状态'
+                },
+                {
+                    field: 'provinceName',
+                    title: '分销状态'
+                },
+                {
+                    field: 'provinceName',
+                    title: '转增状态'
+                },
+                {
+                    field: 'sort',
+                    title: '排序',
+                    sortable: true
+                },
+                {
+                    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.mid + '\')"><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.mid + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+<style lang="scss">
+    .sline {
+        margin: 10px 0 20px;
+        border-top: 1px dashed #d7dbe2;
+    }
+    .calendar-day{
+        text-align: center;
+        height: 30px;
+        font-size: 14px;
+    }
+    .calendar-data {
+        font-size: 12px;
+    }
+    .city{
+        padding-top: 5px;
+    }
+    .title{
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        margin: 4px auto;
+    }
+    .is-selected{
+        color: #409EFF;
+        font-size: 14px;
+    }
+</style>
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/pom.xml

@@ -228,7 +228,12 @@
                 <artifactId>liquidnet-client-admin-common</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
-
+            <!-- zhengzai模块-->
+            <dependency>
+                <groupId>com.liquidnet</groupId>
+                <artifactId>liquidnet-client-admin-zhengzai</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -239,6 +244,7 @@
 <!--        <module>liquidnet-client-admin-quartz</module>-->
         <module>liquidnet-client-admin-generator</module>
         <module>liquidnet-client-admin-common</module>
+        <module>liquidnet-client-admin-zhengzai</module>
     </modules>
     <packaging>pom</packaging>
 

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-dev.yml

@@ -6,5 +6,11 @@ liquidnet:
     logfile:
         path: ./logs
         name: client-admin-web
+        config: classpath:logback-spring.xml
+        file-max-size: 200MB
+        pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+        pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+        pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
+        level-root: info
     mysql:
         database-name: liquidnet_admin