From 69891d133d11f615170ea5d9b32f30e216a2df7a Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Sun, 28 Apr 2024 21:10:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=81=8A=E5=A4=A9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChatMessageController.java | 14 +- .../system/controller/CompanyController.java | 26 ++++ .../system/controller/MainController.java | 12 +- .../controller/UserCollectionController.java | 136 ++++++++++++++++++ .../common/system/entity/Company.java | 29 +++- .../common/system/entity/UserCollection.java | 44 ++++++ .../system/mapper/UserCollectionMapper.java | 37 +++++ .../system/mapper/xml/ChatMessageMapper.xml | 8 ++ .../system/mapper/xml/CompanyMapper.xml | 6 + .../mapper/xml/UserCollectionMapper.xml | 38 +++++ .../common/system/param/ChatMessageParam.java | 6 + .../common/system/param/CompanyParam.java | 7 + .../system/param/UserCollectionParam.java | 37 +++++ .../system/service/UserCollectionService.java | 42 ++++++ .../service/impl/TenantServiceImpl.java | 7 + .../impl/UserCollectionServiceImpl.java | 47 ++++++ .../com/gxwebsoft/generator/SysGenerator.java | 3 +- 17 files changed, 492 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/UserCollectionController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/UserCollection.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/UserCollectionMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/UserCollectionMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/param/UserCollectionParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/UserCollectionService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/UserCollectionServiceImpl.java diff --git a/src/main/java/com/gxwebsoft/common/system/controller/ChatMessageController.java b/src/main/java/com/gxwebsoft/common/system/controller/ChatMessageController.java index f8f72f6..4d9927f 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/ChatMessageController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/ChatMessageController.java @@ -16,6 +16,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -95,10 +96,17 @@ public class ChatMessageController extends BaseController { @ApiOperation("批量添加聊天消息表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { - if (chatMessageService.saveBatch(list)) { - return success("添加成功"); + final ArrayList saveData = new ArrayList<>(); + list.forEach(d -> { + d.setFormUserId(getLoginUserId()); + saveData.add(d); + }); + if(!saveData.isEmpty()){ + if (chatMessageService.saveBatch(saveData)) { + return success("发送成功"); + } } - return fail("添加失败"); + return fail("发送失败"); } @PreAuthorize("hasAuthority('sys:chatMessage:update')") diff --git a/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java b/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java index dcde4c9..8301c8d 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java @@ -7,10 +7,12 @@ import com.gxwebsoft.common.core.exception.BusinessException; import com.gxwebsoft.common.core.web.*; import com.gxwebsoft.common.system.entity.Company; import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.entity.UserCollection; import com.gxwebsoft.common.system.mapper.CompanyMapper; import com.gxwebsoft.common.system.param.CompanyParam; import com.gxwebsoft.common.system.service.CompanyService; import com.gxwebsoft.common.system.service.TenantService; +import com.gxwebsoft.common.system.service.UserCollectionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; @@ -19,7 +21,10 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Arrays; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** * 企业信息控制器 @@ -37,10 +42,31 @@ public class CompanyController extends BaseController { private TenantService tenantService; @Resource private CompanyMapper companyMapper; + @Resource + private UserCollectionService userCollectionService; @ApiOperation("分页查询企业信息不限租户") @GetMapping("/pageAll") public ApiResult> pageAll(CompanyParam param) { + + final User loginUser = getLoginUser(); + if(loginUser != null){ + // 我的收藏 + final List myFocus = userCollectionService.list(new LambdaQueryWrapper().eq(UserCollection::getUserId, getLoginUserId())); + if (!CollectionUtils.isEmpty(myFocus)) { + final Set collect = myFocus.stream().map(UserCollection::getTid).collect(Collectors.toSet()); + if (param.getVersion() != null && param.getVersion().equals(99)) { + param.setVersion(null); + param.setCompanyIds(collect); + } + final PageResult result = companyService.pageRelAll(param); + System.out.println("collect = " + collect); + result.getList().forEach(d -> { + d.setCollection(collect.contains(d.getCompanyId())); + }); + return success(result); + } + } // 使用关联查询 return success(companyService.pageRelAll(param)); } diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java index 87403e1..c2be3d2 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java @@ -507,8 +507,15 @@ public class MainController extends BaseController { company.setCompanyLogo("/logo.svg"); company.setPhone(phone); company.setMembers(20); - company.setServerUrl("https://server.gxwebosoft.com"); - company.setModulesUrl("https://modules.gxwebosoft.com"); + company.setServerUrl("https://server.gxwebsoft.com"); + company.setModulesUrl("https://modules.gxwebsoft.com"); + company.setSocketUrl("wss://server.gxwebsoft.com"); + company.setAdminUrl("http://".concat(tenant.getTenantId().toString()).concat(".adm.wsdns.cn")); + company.setMerchantUrl("http://".concat(tenant.getTenantId().toString()).concat(".m.wsdns.cn")); + company.setWebsiteUrl("http://".concat(tenant.getTenantId().toString()).concat(".wsdns.cn")); + company.setH5Code("http://".concat(tenant.getTenantId().toString()).concat(".h5.wsdns.cn")); + company.setAndroidUrl("http://".concat(tenant.getTenantId().toString()).concat(".android.wsdns.cn")); + company.setIosUrl("http://".concat(tenant.getTenantId().toString()).concat(".ios.wsdns.cn")); company.setVersion(10); company.setIndustryParent(""); company.setIndustryChild(""); @@ -519,6 +526,7 @@ public class MainController extends BaseController { company.setUsers(2); company.setClicks(1L); company.setLikes(0L); + company.setTid(tenant.getTenantId()); company.setCompanyType("企业"); company.setEmail(user.getEmail()); company.setUserId(admin.getUserId()); diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserCollectionController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserCollectionController.java new file mode 100644 index 0000000..560a84f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserCollectionController.java @@ -0,0 +1,136 @@ +package com.gxwebsoft.common.system.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.UserCollectionService; +import com.gxwebsoft.common.system.entity.UserCollection; +import com.gxwebsoft.common.system.param.UserCollectionParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 我的收藏控制器 + * + * @author 科技小王子 + * @since 2024-04-28 18:08:32 + */ +@Api(tags = "我的收藏管理") +@RestController +@RequestMapping("/api/system/user-collection") +public class UserCollectionController extends BaseController { + @Resource + private UserCollectionService userCollectionService; + + @PreAuthorize("hasAuthority('sys:userCollection:list')") + @ApiOperation("分页查询我的收藏") + @GetMapping("/page") + public ApiResult> page(UserCollectionParam param) { + // 使用关联查询 + return success(userCollectionService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:userCollection:list')") + @ApiOperation("查询全部我的收藏") + @GetMapping() + public ApiResult> list(UserCollectionParam param) { + // 使用关联查询 + return success(userCollectionService.listRel(param)); + } + + @PreAuthorize("hasAuthority('sys:userCollection:list')") + @ApiOperation("根据id查询我的收藏") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + // 使用关联查询 + return success(userCollectionService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('sys:userCollection:save')") + @OperationLog + @ApiOperation("添加和取消收藏") + @PostMapping() + public ApiResult save(@RequestBody UserCollection userCollection) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + userCollection.setUserId(loginUser.getUserId()); + userCollection.setTid(userCollection.getTid()); + final UserCollection one = userCollectionService.getOne(new LambdaQueryWrapper().eq(UserCollection::getUserId, loginUser.getUserId()).eq(UserCollection::getTid, userCollection.getTid()).last("limit 1")); + if (one != null) { + userCollectionService.removeById(one.getId()); + return success("已取消收藏"); + } + if (userCollectionService.save(userCollection)) { + return success("已添加收藏"); + } + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:userCollection:update')") + @OperationLog + @ApiOperation("修改我的收藏") + @PutMapping() + public ApiResult update(@RequestBody UserCollection userCollection) { + if (userCollectionService.updateById(userCollection)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('sys:userCollection:remove')") + @OperationLog + @ApiOperation("删除我的收藏") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userCollectionService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('sys:userCollection:save')") + @OperationLog + @ApiOperation("批量添加我的收藏") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userCollectionService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:userCollection:update')") + @OperationLog + @ApiOperation("批量修改我的收藏") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userCollectionService, "id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('sys:userCollection:remove')") + @OperationLog + @ApiOperation("批量删除我的收藏") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userCollectionService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Company.java b/src/main/java/com/gxwebsoft/common/system/entity/Company.java index 4938362..faa960a 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Company.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Company.java @@ -136,7 +136,7 @@ public class Company implements Serializable { @ApiModelProperty(value = "主控端节点") private String serverUrl; - @ApiModelProperty(value = "模块服务器节点") + @ApiModelProperty(value = "模块节点") private String modulesUrl; @ApiModelProperty(value = "重定向节点") @@ -148,6 +148,27 @@ public class Company implements Serializable { @ApiModelProperty(value = "socket合法域名") private String socketUrl; + @ApiModelProperty(value = "总后台管理入口") + private String adminUrl; + + @ApiModelProperty(value = "商户端管理入口") + private String merchantUrl; + + @ApiModelProperty(value = "默认网站URL") + private String websiteUrl; + + @ApiModelProperty(value = "微信小程序二维码") + private String mpWeixinCode; + + @ApiModelProperty(value = "H5端应用二维码") + private String h5Code; + + @ApiModelProperty(value = "安卓APP二维码") + private String androidUrl; + + @ApiModelProperty(value = "苹果APP二维码") + private String iosUrl; + @ApiModelProperty(value = "应用类型") private String appType; @@ -185,6 +206,9 @@ public class Company implements Serializable { @ApiModelProperty("商户ID") private Integer merchantId; + @ApiModelProperty(value = "租户ID") + private Integer tid; + @ApiModelProperty(value = "租户id") private Integer tenantId; @@ -208,4 +232,7 @@ public class Company implements Serializable { @TableField(exist = false) private Object config; + @ApiModelProperty(value = "是否已收藏") + private Boolean collection; + } diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserCollection.java b/src/main/java/com/gxwebsoft/common/system/entity/UserCollection.java new file mode 100644 index 0000000..ec2c581 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserCollection.java @@ -0,0 +1,44 @@ +package com.gxwebsoft.common.system.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.io.Serializable; +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 我的收藏 + * + * @author 科技小王子 + * @since 2024-04-28 18:08:32 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserCollection对象", description = "我的收藏") +@TableName("sys_user_collection") +public class UserCollection implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty(value = "租户ID") + private Integer tid; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/UserCollectionMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/UserCollectionMapper.java new file mode 100644 index 0000000..b7330da --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/UserCollectionMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.common.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.common.system.entity.UserCollection; +import com.gxwebsoft.common.system.param.UserCollectionParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 我的收藏Mapper + * + * @author 科技小王子 + * @since 2024-04-28 18:08:32 + */ +public interface UserCollectionMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserCollectionParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserCollectionParam param); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/ChatMessageMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/ChatMessageMapper.xml index 79f377a..e387466 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/ChatMessageMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/ChatMessageMapper.xml @@ -54,6 +54,14 @@ AND a.create_time <= #{param.createTimeEnd} + + AND ( + a.content LIKE CONCAT('%', #{param.keywords}, '%') + OR b.nickname LIKE CONCAT('%', #{param.keywords}, '%') + OR b.phone LIKE CONCAT('%', #{param.keywords}, '%') + OR b.real_name LIKE CONCAT('%', #{param.keywords}, '%') + ) + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml index 6f4b37e..9477662 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml @@ -113,6 +113,12 @@ AND a.merchant_id = #{param.merchantId} + + AND a.company_id IN + + #{item} + + AND (a.company_name LIKE CONCAT('%', #{param.keywords}, '%') OR a.short_name LIKE CONCAT('%', #{param.keywords}, '%') diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserCollectionMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserCollectionMapper.xml new file mode 100644 index 0000000..9b60a69 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserCollectionMapper.xml @@ -0,0 +1,38 @@ + + + + + + + SELECT a.* + FROM sys_user_collection a + + + AND a.id = #{param.id} + + + AND a.tid = #{param.tid} + + + AND a.user_id = #{param.userId} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/param/ChatMessageParam.java b/src/main/java/com/gxwebsoft/common/system/param/ChatMessageParam.java index 270a179..4f535ad 100644 --- a/src/main/java/com/gxwebsoft/common/system/param/ChatMessageParam.java +++ b/src/main/java/com/gxwebsoft/common/system/param/ChatMessageParam.java @@ -6,9 +6,12 @@ import com.gxwebsoft.common.core.annotation.QueryType; import com.gxwebsoft.common.core.web.BaseParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Set; + /** * 聊天消息表查询参数 * @@ -67,4 +70,7 @@ public class ChatMessageParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer deleted; + @ApiModelProperty(value = "接收人ID集合") + private Set toUserIds; + } diff --git a/src/main/java/com/gxwebsoft/common/system/param/CompanyParam.java b/src/main/java/com/gxwebsoft/common/system/param/CompanyParam.java index 56adf9c..ba26c48 100644 --- a/src/main/java/com/gxwebsoft/common/system/param/CompanyParam.java +++ b/src/main/java/com/gxwebsoft/common/system/param/CompanyParam.java @@ -1,5 +1,6 @@ package com.gxwebsoft.common.system.param; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonInclude; import com.gxwebsoft.common.core.annotation.QueryField; import com.gxwebsoft.common.core.annotation.QueryType; @@ -9,6 +10,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Set; + /** * 企业信息查询参数 * @@ -143,4 +146,8 @@ public class CompanyParam extends BaseParam { @QueryField(type = QueryType.EQ) private String appName; + @ApiModelProperty(value = "企业id集合") + @TableField(exist = false) + private Set companyIds; + } diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserCollectionParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserCollectionParam.java new file mode 100644 index 0000000..bd95efb --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/UserCollectionParam.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.common.system.param; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 我的收藏查询参数 + * + * @author 科技小王子 + * @since 2024-04-28 18:08:32 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserCollectionParam对象", description = "我的收藏查询参数") +public class UserCollectionParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @QueryField(type = QueryType.EQ) + private Integer id; + + @ApiModelProperty(value = "租户ID") + @QueryField(type = QueryType.EQ) + private Integer tid; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/UserCollectionService.java b/src/main/java/com/gxwebsoft/common/system/service/UserCollectionService.java new file mode 100644 index 0000000..421c682 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/UserCollectionService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.common.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.UserCollection; +import com.gxwebsoft.common.system.param.UserCollectionParam; + +import java.util.List; + +/** + * 我的收藏Service + * + * @author 科技小王子 + * @since 2024-04-28 18:08:32 + */ +public interface UserCollectionService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserCollectionParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserCollectionParam param); + + /** + * 根据id查询 + * + * @param id 主键ID + * @return UserCollection + */ + UserCollection getByIdRel(Integer id); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java index 1efb59e..ac844fe 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java @@ -1,7 +1,10 @@ package com.gxwebsoft.common.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.entity.Company; import com.gxwebsoft.common.system.mapper.TenantMapper; +import com.gxwebsoft.common.system.service.CompanyService; import com.gxwebsoft.common.system.service.TenantService; import com.gxwebsoft.common.system.entity.Tenant; import com.gxwebsoft.common.system.param.TenantParam; @@ -9,6 +12,7 @@ import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -20,6 +24,9 @@ import java.util.List; @Service public class TenantServiceImpl extends ServiceImpl implements TenantService { + @Resource + private CompanyService companyService; + @Override public PageResult pageRel(TenantParam param) { PageParam page = new PageParam<>(param); diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserCollectionServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserCollectionServiceImpl.java new file mode 100644 index 0000000..01307f2 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserCollectionServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.common.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.mapper.UserCollectionMapper; +import com.gxwebsoft.common.system.service.UserCollectionService; +import com.gxwebsoft.common.system.entity.UserCollection; +import com.gxwebsoft.common.system.param.UserCollectionParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 我的收藏Service实现 + * + * @author 科技小王子 + * @since 2024-04-28 18:08:32 + */ +@Service +public class UserCollectionServiceImpl extends ServiceImpl implements UserCollectionService { + + @Override + public PageResult pageRel(UserCollectionParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(UserCollectionParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserCollection getByIdRel(Integer id) { + UserCollectionParam param = new UserCollectionParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/test/java/com/gxwebsoft/generator/SysGenerator.java b/src/test/java/com/gxwebsoft/generator/SysGenerator.java index a91bf60..79ae071 100644 --- a/src/test/java/com/gxwebsoft/generator/SysGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/SysGenerator.java @@ -68,7 +68,8 @@ public class SysGenerator { // "sys_website", // "sys_website_field", // "sys_white_domain" -// "sys_order" +// "sys_order", + "sys_user_collection" }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{