diff --git a/hope-winery/pom.xml b/hope-winery/pom.xml new file mode 100644 index 000000000..7cf372a34 --- /dev/null +++ b/hope-winery/pom.xml @@ -0,0 +1,27 @@ + + + + ruoyi + com.ruoyi + 3.3.0 + + 4.0.0 + + hope-winery + + 葡萄酒模块 + + + + + + + com.ruoyi + ruoyi-common + + + + + \ No newline at end of file diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/WineryMauserController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/WineryMauserController.java new file mode 100644 index 000000000..d6f219909 --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/WineryMauserController.java @@ -0,0 +1,125 @@ +package com.ruoyi.winery.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; + +import java.util.List; +import java.util.Arrays; + +import com.ruoyi.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +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.winery.domain.WineryMauser; +import com.ruoyi.winery.service.IWineryMauserService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 小程序用户Controller + * + * @author ruoyi + * @date 2020-12-17 + */ +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/winery/winery_mauser" ) +public class WineryMauserController extends BaseController { + + private final IWineryMauserService iWineryMauserService; + + /** + * 查询小程序用户列表 + */ + @PreAuthorize("@ss.hasPermi('winery:winery_mauser:list')") + @GetMapping("/list") + public TableDataInfo list(WineryMauser wineryMauser) + { + startPage(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(wineryMauser); + if (StringUtils.isNotBlank(wineryMauser.getStatus())){ + lqw.eq(WineryMauser::getStatus ,wineryMauser.getStatus()); + } + if (StringUtils.isNotBlank(wineryMauser.getMobile())){ + lqw.eq(WineryMauser::getMobile ,wineryMauser.getMobile()); + } + if (StringUtils.isNotBlank(wineryMauser.getNickName())){ + lqw.like(WineryMauser::getNickName ,wineryMauser.getNickName()); + } + if (StringUtils.isNotBlank(wineryMauser.getUnionId())){ + lqw.eq(WineryMauser::getUnionId ,wineryMauser.getUnionId()); + } + if (wineryMauser.getCreateTime() != null){ + lqw.eq(WineryMauser::getCreateTime ,wineryMauser.getCreateTime()); + } + if (StringUtils.isNotBlank(wineryMauser.getTenantId())){ + lqw.eq(WineryMauser::getTenantId ,wineryMauser.getTenantId()); + } + List list = iWineryMauserService.list(lqw); + return getDataTable(list); + } + + /** + * 导出小程序用户列表 + */ + @PreAuthorize("@ss.hasPermi('winery:winery_mauser:export')" ) + @Log(title = "小程序用户" , businessType = BusinessType.EXPORT) + @GetMapping("/export" ) + public AjaxResult export(WineryMauser wineryMauser) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper(wineryMauser); + List list = iWineryMauserService.list(lqw); + ExcelUtil util = new ExcelUtil(WineryMauser. class); + return util.exportExcel(list, "winery_mauser" ); + } + + /** + * 获取小程序用户详细信息 + */ + @PreAuthorize("@ss.hasPermi('winery:winery_mauser:query')" ) + @GetMapping(value = "/{openId}" ) + public AjaxResult getInfo(@PathVariable("openId" ) String openId) { + return AjaxResult.success(iWineryMauserService.getById(openId)); + } + + /** + * 新增小程序用户 + */ + @PreAuthorize("@ss.hasPermi('winery:winery_mauser:add')" ) + @Log(title = "小程序用户" , businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WineryMauser wineryMauser) { + return toAjax(iWineryMauserService.save(wineryMauser) ? 1 : 0); + } + + /** + * 修改小程序用户 + */ + @PreAuthorize("@ss.hasPermi('winery:winery_mauser:edit')" ) + @Log(title = "小程序用户" , businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WineryMauser wineryMauser) { + return toAjax(iWineryMauserService.updateById(wineryMauser) ? 1 : 0); + } + + /** + * 删除小程序用户 + */ + @PreAuthorize("@ss.hasPermi('winery:winery_mauser:remove')" ) + @Log(title = "小程序用户" , businessType = BusinessType.DELETE) + @DeleteMapping("/{openIds}" ) + public AjaxResult remove(@PathVariable String[] openIds) { + return toAjax(iWineryMauserService.removeByIds(Arrays.asList(openIds)) ? 1 : 0); + } +} diff --git a/hope-winery/src/main/java/com/ruoyi/winery/domain/WineryMauser.java b/hope-winery/src/main/java/com/ruoyi/winery/domain/WineryMauser.java new file mode 100644 index 000000000..bf0091c09 --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/domain/WineryMauser.java @@ -0,0 +1,67 @@ +package com.ruoyi.winery.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 小程序用户对象 winery_mauser + * + * @author ruoyi + * @date 2020-12-17 + */ +@Data +@ToString +@EqualsAndHashCode +@NoArgsConstructor +@Accessors(chain = true) +@TableName("winery_mauser") +public class WineryMauser implements Serializable { + +private static final long serialVersionUID=1L; + + + /** 小程序userid */ + @Excel(name = "小程序userid") + @TableId(value = "open_id") + private String openId; + + /** 状态 */ + @Excel(name = "状态") + private String status; + + /** 手机号 */ + @Excel(name = "手机号") + private String mobile; + + /** 昵称 */ + @Excel(name = "昵称") + private String nickName; + + /** unionid */ + @Excel(name = "unionid") + private String unionId; + + /** 创建时间 */ + @Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 更新时间 */ + private Date updateTime; + + /** 租户id */ + @Excel(name = "租户id") + private String tenantId; +} diff --git a/hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryMauserMapper.java b/hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryMauserMapper.java new file mode 100644 index 000000000..2ec5b337e --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryMauserMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.winery.mapper; + +import com.ruoyi.winery.domain.WineryMauser; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 小程序用户Mapper接口 + * + * @author ruoyi + * @date 2020-12-17 + */ +public interface WineryMauserMapper extends BaseMapper { + +} diff --git a/hope-winery/src/main/java/com/ruoyi/winery/service/IWineryMauserService.java b/hope-winery/src/main/java/com/ruoyi/winery/service/IWineryMauserService.java new file mode 100644 index 000000000..c9c153a35 --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/service/IWineryMauserService.java @@ -0,0 +1,14 @@ +package com.ruoyi.winery.service; + +import com.ruoyi.winery.domain.WineryMauser; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 小程序用户Service接口 + * + * @author ruoyi + * @date 2020-12-17 + */ +public interface IWineryMauserService extends IService { + +} diff --git a/hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryMauserServiceImpl.java b/hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryMauserServiceImpl.java new file mode 100644 index 000000000..8599a1318 --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryMauserServiceImpl.java @@ -0,0 +1,18 @@ +package com.ruoyi.winery.service.impl; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.winery.mapper.WineryMauserMapper; +import com.ruoyi.winery.domain.WineryMauser; +import com.ruoyi.winery.service.IWineryMauserService; + +/** + * 小程序用户Service业务层处理 + * + * @author ruoyi + * @date 2020-12-17 + */ +@Service +public class WineryMauserServiceImpl extends ServiceImpl implements IWineryMauserService { + +} diff --git a/hope-winery/src/main/resources/mapper/winery/WineryMauserMapper.xml b/hope-winery/src/main/resources/mapper/winery/WineryMauserMapper.xml new file mode 100644 index 000000000..12fccd01f --- /dev/null +++ b/hope-winery/src/main/resources/mapper/winery/WineryMauserMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0933d5d6b..be294d5e0 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ 3.3.0 + 1.0.0 UTF-8 UTF-8 1.8 @@ -218,6 +219,14 @@ ${ruoyi.version} + + + + com.ruoyi + hope-winery + ${ruoyi.version} + + @@ -228,6 +237,7 @@ ruoyi-quartz ruoyi-generator ruoyi-common + hope-winery pom diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index febca0402..ca87c60a4 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -73,6 +73,12 @@ ruoyi-generator + + + com.ruoyi + hope-winery + + diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 37d4e8964..4b4a3e19a 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.0.222:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + url: jdbc:mysql://175.24.17.162:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true username: root - password: root + password: 26616494 # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -58,11 +58,11 @@ spring: # redis 配置 redis: # 地址 - host: 192.168.0.222 + host: 175.24.17.162 # 端口，默认为6379 port: 6379 # 密码 - password: + password: 26616494 # 连接超时时间 timeout: 10s lettuce: diff --git a/ruoyi-ui/src/api/winery/winery_mauser.js b/ruoyi-ui/src/api/winery/winery_mauser.js new file mode 100644 index 000000000..4f151a459 --- /dev/null +++ b/ruoyi-ui/src/api/winery/winery_mauser.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询小程序用户列表 +export function listWinery_mauser(query) { + return request({ + url: '/winery/winery_mauser/list', + method: 'get', + params: query + }) +} + +// 查询小程序用户详细 +export function getWinery_mauser(openId) { + return request({ + url: '/winery/winery_mauser/' + openId, + method: 'get' + }) +} + +// 新增小程序用户 +export function addWinery_mauser(data) { + return request({ + url: '/winery/winery_mauser', + method: 'post', + data: data + }) +} + +// 修改小程序用户 +export function updateWinery_mauser(data) { + return request({ + url: '/winery/winery_mauser', + method: 'put', + data: data + }) +} + +// 删除小程序用户 +export function delWinery_mauser(openId) { + return request({ + url: '/winery/winery_mauser/' + openId, + method: 'delete' + }) +} + +// 导出小程序用户 +export function exportWinery_mauser(query) { + return request({ + url: '/winery/winery_mauser/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/winery/winery_mauser/index.vue b/ruoyi-ui/src/views/winery/winery_mauser/index.vue new file mode 100644 index 000000000..fdac29fee --- /dev/null +++ b/ruoyi-ui/src/views/winery/winery_mauser/index.vue @@ -0,0 +1,347 @@ + + +