Augcl
/
pet-admin
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' of https://gitee.com/oracular-wind/pet-admin

tb-branch
cc 7 months ago
parent
f374a263f5 ffcadcc6f9
commit
6b25d76079
10 changed files with 813 additions and 1 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +44
    -0
      CatmDogd-Mall-Front-test/api/model/AppTourist.js
  2. +269
    -0
      CatmDogd-Mall-Front-test/views/model/AppTourist/index.vue
  3. +1
    -1
      ruoyi-admin/src/main/resources/application-druid.yml
  4. +26
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletUserController.java
  5. +104
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppTouristController.java
  6. +69
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppTourist.java
  7. +68
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppTouristMapper.java
  8. +68
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppTouristService.java
  9. +98
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppTouristServiceImpl.java
  10. +66
    -0
      ruoyi-catdog/src/main/resources/mapper/model/AppTouristMapper.xml

+ 44
- 0
CatmDogd-Mall-Front-test/api/model/AppTourist.js View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询游客列表
export function listAppTourist(query) {
return request({
url: '/model/AppTourist/list',
method: 'get',
params: query
})
}
// 查询游客详细
export function getAppTourist(id) {
return request({
url: '/model/AppTourist/' + id,
method: 'get'
})
}
// 新增游客
export function addAppTourist(data) {
return request({
url: '/model/AppTourist',
method: 'post',
data: data
})
}
// 修改游客
export function updateAppTourist(data) {
return request({
url: '/model/AppTourist',
method: 'put',
data: data
})
}
// 删除游客
export function delAppTourist(id) {
return request({
url: '/model/AppTourist/' + id,
method: 'delete'
})
}

+ 269
- 0
CatmDogd-Mall-Front-test/views/model/AppTourist/index.vue View File

@ -0,0 +1,269 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
<el-form-item label="游客昵称为未登录" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入游客昵称为未登录"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item class="flex_one tr">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['model:AppTourist:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['model:AppTourist:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['model:AppTourist:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
:loading="exportLoading"
@click="handleExport"
v-hasPermi="['model:AppTourist:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="AppTouristList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="游客昵称为未登录" align="center" prop="name" v-if="columns[0].visible"/>
<el-table-column label="默认小程序logo" align="center" prop="icon" v-if="columns[1].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['model:AppTourist:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['model:AppTourist:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改游客对话框 -->
<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
<el-form-item label="游客昵称为未登录" prop="name">
<el-input v-model="form.name" placeholder="请输入游客昵称为未登录" />
</el-form-item>
<el-form-item label="默认小程序logo">
<imageUpload v-model="form.icon"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listAppTourist, getAppTourist, delAppTourist, addAppTourist, updateAppTourist, exportAppTourist } from "@/api/model/AppTourist";
export default {
name: "AppTourist",
data() {
return {
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 游客表格数据
AppTouristList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
name: null,
icon: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
},
columns: [
{ key: 1, label: "游客昵称为未登录", visible: true },
{ key: 2, label: "默认小程序logo", visible: false },
],
};
},
created() {
this.getList();
},
methods: {
/** 查询游客列表 */
getList() {
this.loading = true;
listAppTourist(this.queryParams).then(response => {
this.AppTouristList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
name: null,
icon: null,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加游客";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getAppTourist(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改游客";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateAppTourist(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addAppTourist(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除游客编号为"' + ids + '"的数据项？').then(function() {
return delAppTourist(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$modal.confirm('是否确认导出所有游客数据项？').then(() => {
this.exportLoading = true;
return exportAppTourist(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>

+ 1
- 1
ruoyi-admin/src/main/resources/application-druid.yml View File

@ -29,7 +29,7 @@ spring:
# 数据库索引 # 数据库索引
database: 5 database: 5
# 密码 # 密码
# password: 123456
password: 123456
redisson: redisson:
address: "redis://ip" address: "redis://ip"
password: "password" # 如果有密码的话 password: "password" # 如果有密码的话


+ 26
- 0
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletUserController.java View File

@ -0,0 +1,26 @@
package com.ruoyi.applet.contoller;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.model.service.IAppTouristService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(description = "用户")
@RestController
@RequestMapping("/applet/user")
public class AppletUserController extends BaseController {
@Autowired
private IAppTouristService appTouristService;
@ApiOperation("游客模式")
@GetMapping("/touristOne")
public AjaxResult getTouristOne(){
return AjaxResult.success(appTouristService.getAppTouristLimitOne());
}
}

+ 104
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppTouristController.java View File

@ -0,0 +1,104 @@
package com.ruoyi.model.controller;
import java.io.IOException;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.model.domain.AppTourist;
import com.ruoyi.model.service.IAppTouristService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 游客Controller
*
* @author ruoyi
* @date 2025-03-06
*/
@RestController
@RequestMapping("/model/AppTourist")
public class AppTouristController extends BaseController
{
@Autowired
private IAppTouristService appTouristService;
/**
* 查询游客列表
*/
@PreAuthorize("@ss.hasPermi('model:AppTourist:list')")
@GetMapping("/list")
public TableDataInfo list(AppTourist appTourist)
{
startPage();
List<AppTourist> list = appTouristService.selectAppTouristList(appTourist);
return getDataTable(list);
}
/**
* 导出游客列表
*/
@PreAuthorize("@ss.hasPermi('model:AppTourist:export')")
@Log(title = "游客", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, AppTourist appTourist) throws IOException {
List<AppTourist> list = appTouristService.selectAppTouristList(appTourist);
ExcelUtil<AppTourist> util = new ExcelUtil<AppTourist>(AppTourist.class);
util.exportExcel(response, list, "游客数据");
}
/**
* 获取游客详细信息
*/
@PreAuthorize("@ss.hasPermi('model:AppTourist:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(appTouristService.selectAppTouristById(id));
}
/**
* 新增游客
*/
@PreAuthorize("@ss.hasPermi('model:AppTourist:add')")
@Log(title = "游客", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody AppTourist appTourist)
{
return toAjax(appTouristService.insertAppTourist(appTourist));
}
/**
* 修改游客
*/
@PreAuthorize("@ss.hasPermi('model:AppTourist:edit')")
@Log(title = "游客", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody AppTourist appTourist)
{
return toAjax(appTouristService.updateAppTourist(appTourist));
}
/**
* 删除游客
*/
@PreAuthorize("@ss.hasPermi('model:AppTourist:remove')")
@Log(title = "游客", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(appTouristService.deleteAppTouristByIds(ids));
}
}

+ 69
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppTourist.java View File

@ -0,0 +1,69 @@
package com.ruoyi.model.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 游客对象 app_tourist
*
* @author ruoyi
* @date 2025-03-06
*/
@ApiModel("游客")
public class AppTourist extends BaseEntity
{
private static final long serialVersionUID = 1L;
@ApiModelProperty("编号")
/** $column.columnComment */
private Long id;
/** 游客昵称为未登录 */
@Excel(name = "游客昵称为未登录")
private String name;
/** 默认小程序logo */
@Excel(name = "默认小程序logo")
private String icon;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setName(String name)
{
this.name = name;
}
public String getName()
{
return name;
}
public void setIcon(String icon)
{
this.icon = icon;
}
public String getIcon()
{
return icon;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("name", getName())
.append("icon", getIcon())
.toString();
}
}

+ 68
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppTouristMapper.java View File

@ -0,0 +1,68 @@
package com.ruoyi.model.mapper;
import java.util.List;
import com.ruoyi.model.domain.AppTourist;
/**
* 游客Mapper接口
*
* @author ruoyi
* @date 2025-03-06
*/
public interface AppTouristMapper
{
/**
* 查询游客
*
* @param id 游客主键
* @return 游客
*/
public AppTourist selectAppTouristById(Long id);
/**
* 查询游客列表
*
* @param appTourist 游客
* @return 游客集合
*/
public List<AppTourist> selectAppTouristList(AppTourist appTourist);
/**
* 新增游客
*
* @param appTourist 游客
* @return 结果
*/
public int insertAppTourist(AppTourist appTourist);
/**
* 修改游客
*
* @param appTourist 游客
* @return 结果
*/
public int updateAppTourist(AppTourist appTourist);
/**
* 删除游客
*
* @param id 游客主键
* @return 结果
*/
public int deleteAppTouristById(Long id);
/**
* 批量删除游客
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteAppTouristByIds(Long[] ids);
/**
* 查询单个游客
*
* @return 游客
*/
public AppTourist getAppTouristLimitOne();
}

+ 68
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppTouristService.java View File

@ -0,0 +1,68 @@
package com.ruoyi.model.service;
import java.util.List;
import com.ruoyi.model.domain.AppTourist;
/**
* 游客Service接口
*
* @author ruoyi
* @date 2025-03-06
*/
public interface IAppTouristService
{
/**
* 查询游客
*
* @param id 游客主键
* @return 游客
*/
public AppTourist selectAppTouristById(Long id);
/**
* 查询游客列表
*
* @param appTourist 游客
* @return 游客集合
*/
public List<AppTourist> selectAppTouristList(AppTourist appTourist);
/**
* 新增游客
*
* @param appTourist 游客
* @return 结果
*/
public int insertAppTourist(AppTourist appTourist);
/**
* 修改游客
*
* @param appTourist 游客
* @return 结果
*/
public int updateAppTourist(AppTourist appTourist);
/**
* 批量删除游客
*
* @param ids 需要删除的游客主键集合
* @return 结果
*/
public int deleteAppTouristByIds(Long[] ids);
/**
* 删除游客信息
*
* @param id 游客主键
* @return 结果
*/
public int deleteAppTouristById(Long id);
/**
* 查询单个游客
*
* @return 游客
*/
public AppTourist getAppTouristLimitOne();
}

+ 98
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppTouristServiceImpl.java View File

@ -0,0 +1,98 @@
package com.ruoyi.model.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.model.mapper.AppTouristMapper;
import com.ruoyi.model.domain.AppTourist;
import com.ruoyi.model.service.IAppTouristService;
/**
* 游客Service业务层处理
*
* @author ruoyi
* @date 2025-03-06
*/
@Service
public class AppTouristServiceImpl implements IAppTouristService
{
@Autowired
private AppTouristMapper appTouristMapper;
/**
* 查询游客
*
* @param id 游客主键
* @return 游客
*/
@Override
public AppTourist selectAppTouristById(Long id)
{
return appTouristMapper.selectAppTouristById(id);
}
/**
* 查询游客列表
*
* @param appTourist 游客
* @return 游客
*/
@Override
public List<AppTourist> selectAppTouristList(AppTourist appTourist)
{
return appTouristMapper.selectAppTouristList(appTourist);
}
/**
* 新增游客
*
* @param appTourist 游客
* @return 结果
*/
@Override
public int insertAppTourist(AppTourist appTourist)
{
return appTouristMapper.insertAppTourist(appTourist);
}
/**
* 修改游客
*
* @param appTourist 游客
* @return 结果
*/
@Override
public int updateAppTourist(AppTourist appTourist)
{
return appTouristMapper.updateAppTourist(appTourist);
}
/**
* 批量删除游客
*
* @param ids 需要删除的游客主键
* @return 结果
*/
@Override
public int deleteAppTouristByIds(Long[] ids)
{
return appTouristMapper.deleteAppTouristByIds(ids);
}
/**
* 删除游客信息
*
* @param id 游客主键
* @return 结果
*/
@Override
public int deleteAppTouristById(Long id)
{
return appTouristMapper.deleteAppTouristById(id);
}
@Override
public AppTourist getAppTouristLimitOne() {
return appTouristMapper.getAppTouristLimitOne();
}
}

+ 66
- 0
ruoyi-catdog/src/main/resources/mapper/model/AppTouristMapper.xml View File

@ -0,0 +1,66 @@
<?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="com.ruoyi.model.mapper.AppTouristMapper">
<resultMap type="AppTourist" id="AppTouristResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="icon" column="icon" />
</resultMap>
<sql id="selectAppTouristVo">
select id, name, icon from app_tourist
</sql>
<select id="selectAppTouristList" parameterType="AppTourist" resultMap="AppTouristResult">
<include refid="selectAppTouristVo"/>
<where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="icon != null and icon != ''"> and icon = #{icon}</if>
</where>
</select>
<select id="selectAppTouristById" parameterType="Long" resultMap="AppTouristResult">
<include refid="selectAppTouristVo"/>
where id = #{id}
</select>
<select id="getAppTouristLimitOne" resultType="com.ruoyi.model.domain.AppTourist">
<include refid="selectAppTouristVo"/>
</select>
<insert id="insertAppTourist" parameterType="AppTourist">
insert into app_tourist
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="name != null">name,</if>
<if test="icon != null">icon,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="name != null">#{name},</if>
<if test="icon != null">#{icon},</if>
</trim>
</insert>
<update id="updateAppTourist" parameterType="AppTourist">
update app_tourist
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="icon != null">icon = #{icon},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteAppTouristById" parameterType="Long">
delete from app_tourist where id = #{id}
</delete>
<delete id="deleteAppTouristByIds" parameterType="String">
delete from app_tourist where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

Write Preview
Loading…
Cancel
Save