diff --git a/play-admin/pom.xml b/play-admin/pom.xml index 52b87f9..f6c7840 100644 --- a/play-admin/pom.xml +++ b/play-admin/pom.xml @@ -70,20 +70,20 @@ - - - - + + + + - - - - - - - - - + + + + + + + + + com.github.binarywang @@ -95,12 +95,12 @@ com.github.binarywang weixin-java-pay - - - - - - + + + + + + diff --git a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java index d4d7f6d..d0e527d 100644 --- a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java +++ b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyTenantLineHandler.java @@ -6,7 +6,6 @@ import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; -import net.sf.jsqlparser.expression.NullValue; import net.sf.jsqlparser.expression.StringValue; import org.springframework.stereotype.Component; @@ -35,9 +34,6 @@ public class MyTenantLineHandler implements TenantLineHandler { public Expression getTenantId() { // 取出当前请求的服务商ID，通过解析器注入到SQL中。 String tenantId = SecurityUtils.getTenantId(); - if (StrUtil.isBlankIfStr(tenantId)) { - return new NullValue(); - } if (StrUtil.isBlankIfStr(tenantId)) { tenantId = "9999"; } @@ -50,9 +46,6 @@ public class MyTenantLineHandler implements TenantLineHandler { @Override public boolean ignoreTable(String tableName) { String prefix = StringUtils.substringBefore(tableName, "_"); - if (Arrays.asList(TABLE_FILTER).contains(tableName) || Arrays.asList(TABLE_PRE).contains(prefix)) { - return true; - } - return false; + return Arrays.asList(TABLE_FILTER).contains(tableName) || Arrays.asList(TABLE_PRE).contains(prefix); } } diff --git a/play-admin/src/main/java/com/starry/admin/common/oss/OssProperties.java b/play-admin/src/main/java/com/starry/admin/common/oss/OssProperties.java index f98d296..64953ad 100644 --- a/play-admin/src/main/java/com/starry/admin/common/oss/OssProperties.java +++ b/play-admin/src/main/java/com/starry/admin/common/oss/OssProperties.java @@ -12,17 +12,14 @@ import org.springframework.context.annotation.PropertySource; @PropertySource(value = {"classpath:oss.properties"}) public class OssProperties implements InitializingBean { - public String endpoint; - public String accessKeyId; - public String accessKeySecret; - public String bucketName; - - public static String ENDPOINT = ""; public static String KEY_ID = ""; public static String KEY_SECRET = ""; public static String BUCKET_NAME = ""; - + public String endpoint; + public String accessKeyId; + public String accessKeySecret; + public String bucketName; @Override public void afterPropertiesSet() throws Exception { diff --git a/play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java b/play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java index db242bd..824c4ce 100644 --- a/play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/common/oss/service/impl/OssFileServiceImpl.java @@ -30,29 +30,29 @@ public class OssFileServiceImpl implements IOssFileService { OSS ossClient = new OSSClientBuilder().build(OssProperties.ENDPOINT, OssProperties.KEY_ID, OssProperties.KEY_SECRET); log.info("OSSClient实例创建成功"); try { - //判断oss实例是否存在：如果不存在则创建，如果存在则获取 + // 判断oss实例是否存在：如果不存在则创建，如果存在则获取 if (!ossClient.doesBucketExist(OssProperties.BUCKET_NAME)) { - //创建bucket + // 创建bucket ossClient.createBucket(OssProperties.BUCKET_NAME); log.info("bucket存储空间【{}】创建成功", OssProperties.BUCKET_NAME); - //设置oss实例的访问权限：公共读 + // 设置oss实例的访问权限：公共读 ossClient.setBucketAcl(OssProperties.BUCKET_NAME, CannedAccessControlList.PublicRead); log.info("【{}】存储空间访问权限设置为公共读成功", OssProperties.BUCKET_NAME); } - //构建日期路径：avatar/2019/02/26/文件名 + // 构建日期路径：avatar/2019/02/26/文件名 String folder = new DateTime().toString("yyyy/MM/dd"); - //文件名：uuid.扩展名 + // 文件名：uuid.扩展名 filename = IdUtil.fastSimpleUUID() + FileTypeUtil.getType(inputStream); - //文件根路径 + // 文件根路径 String key = module + "/" + folder + "/" + filename; // 创建PutObjectRequest对象。 PutObjectRequest putObjectRequest = new PutObjectRequest(OssProperties.BUCKET_NAME, key, inputStream); // 创建PutObject请求。 ossClient.putObject(putObjectRequest); log.info("oss文件上传成功"); - //阿里云文件绝对路径 + // 阿里云文件绝对路径 String endpoint = OssProperties.ENDPOINT.substring(OssProperties.ENDPOINT.lastIndexOf("//") + 2); - //返回文件的访问路径 + // 返回文件的访问路径 return "https://" + OssProperties.BUCKET_NAME + "." + endpoint + "/" + key; } catch (OSSException oe) { log.error("OSSException 文件上传失败：", oe); @@ -74,7 +74,7 @@ public class OssFileServiceImpl implements IOssFileService { log.info("OSSClient实例创建成功"); try { String endpoint = OssProperties.ENDPOINT.substring(OssProperties.ENDPOINT.lastIndexOf("//") + 2); - //文件名（服务器上的文件路径） + // 文件名（服务器上的文件路径） String host = "https://" + OssProperties.BUCKET_NAME + "." + endpoint + "/"; String objectName = url.substring(host.length()); // 删除文件或目录。如果要删除目录，目录必须为空。 diff --git a/play-admin/src/main/java/com/starry/admin/common/security/config/SpringSecurityConfig.java b/play-admin/src/main/java/com/starry/admin/common/security/config/SpringSecurityConfig.java index 9a144e4..d221270 100644 --- a/play-admin/src/main/java/com/starry/admin/common/security/config/SpringSecurityConfig.java +++ b/play-admin/src/main/java/com/starry/admin/common/security/config/SpringSecurityConfig.java @@ -65,7 +65,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { "/v2/api-docs/**" ).permitAll() // 对登录注册要允许匿名访问 - .antMatchers("/login", "/captcha/get-captcha", "/wx/test/**").permitAll() + .antMatchers("/login", "/captcha/get-captcha", "/wx/test/**","/wp/clear/**").permitAll() // 跨域请求会先进行一次options请求 .antMatchers(HttpMethod.OPTIONS).permitAll() .anyRequest()// 除上面外的所有请求全部需要鉴权认证 diff --git a/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java b/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java index a8adb5f..24bcae7 100644 --- a/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java +++ b/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java @@ -15,6 +15,7 @@ import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotNull; import java.io.IOException; /** @@ -34,7 +35,23 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { private JwtToken jwtToken; @Override - protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, FilterChain filterChain) throws ServletException, IOException { + protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException { + String url = request.getRequestURL().toString(); + log.debug("url ={}", url); + // 指定URL不拦截 + if (url.contains("/wp/clear/")) { + return true; + } + // 指定URL不拦截 + if (url.contains("/wp/custom/")) { + return true; + } + return false; + } + + + @Override + protected void doFilterInternal(@NotNull HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, FilterChain filterChain) throws ServletException, IOException { LoginUser jwtUser = jwtToken.getNewLoginUser(httpServletRequest); if (null != jwtUser && null == SecurityContextHolder.getContext().getAuthentication()) { jwtToken.verifyToken(jwtUser); diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/controller/PlayClerkLevelInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clear/controller/PlayClerkLevelInfoController.java new file mode 100644 index 0000000..873ea7c --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/controller/PlayClerkLevelInfoController.java @@ -0,0 +1,90 @@ +package com.starry.admin.modules.clear.controller; + +import com.starry.admin.modules.clear.module.entity.PlayClerkLevelInfoEntity; +import com.starry.admin.modules.clear.module.vo.PlayClerkLevelAddVo; +import com.starry.admin.modules.clear.module.vo.PlayClerkLevelEditVo; +import com.starry.admin.modules.clear.service.IPlayClerkLevelInfoService; +import com.starry.common.annotation.Log; +import com.starry.common.enums.BusinessType; +import com.starry.common.result.R; +import com.starry.common.utils.ConvertUtil; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 店员等级Controller + * + * @author admin + * @since 2024-03-30 + */ +@RestController +@RequestMapping("/clerk/level") +public class PlayClerkLevelInfoController { + @Resource + private IPlayClerkLevelInfoService playClerkLevelInfoService; + + /** + * 查询店员等级列表 + */ + @PreAuthorize("@customSs.hasPermission('play:info:list')") + @GetMapping("/list") + public R list() { + return R.ok(playClerkLevelInfoService.selectAll()); + } + + /** + * 获取店员等级详细信息 + */ + @PreAuthorize("@customSs.hasPermission('play:info:query')") + @GetMapping(value = "/{id}") + public R getInfo(@PathVariable("id") String id) { + return R.ok(playClerkLevelInfoService.selectPlayClerkLevelInfoById(id)); + } + + /** + * 新增店员等级 + */ + @PreAuthorize("@customSs.hasPermission('play:info:create')") + @Log(title = "店员等级", businessType = BusinessType.INSERT) + @PostMapping("/create") + public R create(@RequestBody PlayClerkLevelAddVo vo) { + PlayClerkLevelInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkLevelInfoEntity.class); + int level = playClerkLevelInfoService.selectMaxLevel(); + entity.setLevel(level + 1); + boolean success = playClerkLevelInfoService.create(entity); + if (success) { + return R.ok(); + } + return R.error("添加失败"); + } + + /** + * 修改店员等级 + */ + @PreAuthorize("@customSs.hasPermission('play:info:edit')") + @Log(title = "店员等级", businessType = BusinessType.UPDATE) + @PostMapping(value = "/update") + public R update(@Validated @RequestBody PlayClerkLevelEditVo vo) { + PlayClerkLevelInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkLevelInfoEntity.class); + boolean success = playClerkLevelInfoService.update(entity); + if (success) { + return R.ok(); + } + return R.error("修改失败"); + } + + /** + * 删除店员等级 + */ + @PreAuthorize("@customSs.hasPermission('play:info:remove')") + @Log(title = "店员等级", businessType = BusinessType.DELETE) + @DeleteMapping("delMaxLevel") + public R remove() { + int level = playClerkLevelInfoService.selectMaxLevel(); + playClerkLevelInfoService.delMaxLevelByLevel(level); + return R.ok(); + } +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/controller/PlayClerkUserInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/clear/controller/PlayClerkUserInfoController.java new file mode 100644 index 0000000..509d48b --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/controller/PlayClerkUserInfoController.java @@ -0,0 +1,88 @@ +package com.starry.admin.modules.clear.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.starry.admin.modules.clear.module.entity.PlayClerkUserInfoEntity; +import com.starry.admin.modules.clear.module.vo.PlayClerkUserAddVo; +import com.starry.admin.modules.clear.module.vo.PlayClerkUserEditVo; +import com.starry.admin.modules.clear.service.IPlayClerkUserInfoService; +import com.starry.common.annotation.Log; +import com.starry.common.enums.BusinessType; +import com.starry.common.result.R; +import com.starry.common.utils.ConvertUtil; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 店员Controller + * + * @author admin + * @since 2024-03-30 + */ +@RestController +@RequestMapping("/clerk/user") +public class PlayClerkUserInfoController { + @Resource + private IPlayClerkUserInfoService playClerkUserInfoService; + + /** + * 查询店员列表 + */ + @PreAuthorize("@customSs.hasPermission('play:info:list')") + @GetMapping("/list") + public R list(PlayClerkUserInfoEntity playClerkUserInfo) { + IPage list = playClerkUserInfoService.selectPlayClerkUserInfoByPage(playClerkUserInfo); + return R.ok(list); + } + + /** + * 获取店员详细信息 + */ + @PreAuthorize("@customSs.hasPermission('play:info:query')") + @GetMapping(value = "/{id}") + public R getInfo(@PathVariable("id") String id) { + return R.ok(playClerkUserInfoService.selectPlayClerkUserInfoById(id)); + } + + /** + * 新增店员 + */ + @PreAuthorize("@customSs.hasPermission('play:info:create')") + @Log(title = "店员", businessType = BusinessType.INSERT) + @PostMapping("/create") + public R create(@Validated @RequestBody PlayClerkUserAddVo vo) { + PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class); + boolean success = playClerkUserInfoService.create(entity); + if (success) { + return R.ok(); + } + return R.error("添加失败"); + } + + /** + * 修改店员 + */ + @PreAuthorize("@customSs.hasPermission('play:info:edit')") + @Log(title = "店员", businessType = BusinessType.UPDATE) + @PostMapping(value = "/update") + public R update(@Validated @RequestBody PlayClerkUserEditVo vo) { + PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayClerkUserInfoEntity.class); + boolean success = playClerkUserInfoService.update(entity); + if (success) { + return R.ok(); + } + return R.error("修改失败"); + } + + /** + * 删除店员 + */ + @PreAuthorize("@customSs.hasPermission('play:info:remove')") + @Log(title = "店员", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@PathVariable String[] ids) { + return R.ok(playClerkUserInfoService.deletePlayClerkUserInfoByIds(ids)); + } +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/mapper/PlayClerkLevelInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clear/mapper/PlayClerkLevelInfoMapper.java new file mode 100644 index 0000000..f000e2d --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/mapper/PlayClerkLevelInfoMapper.java @@ -0,0 +1,16 @@ +package com.starry.admin.modules.clear.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.starry.admin.modules.clear.module.entity.PlayClerkLevelInfoEntity; + +/** + * 店员等级Mapper接口 + * + * @author admin + * @since 2024-03-30 + */ +public interface PlayClerkLevelInfoMapper extends BaseMapper { + + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/mapper/PlayClerkUserInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/clear/mapper/PlayClerkUserInfoMapper.java new file mode 100644 index 0000000..50f0548 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/mapper/PlayClerkUserInfoMapper.java @@ -0,0 +1,17 @@ +package com.starry.admin.modules.clear.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.starry.admin.modules.clear.module.entity.PlayClerkUserInfoEntity; + + +/** + * 店员Mapper接口 + * + * @author admin + * @since 2024-03-30 + */ +public interface PlayClerkUserInfoMapper extends BaseMapper { + + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/module/entity/PlayClerkLevelInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clear/module/entity/PlayClerkLevelInfoEntity.java new file mode 100644 index 0000000..8922708 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/module/entity/PlayClerkLevelInfoEntity.java @@ -0,0 +1,74 @@ +package com.starry.admin.modules.clear.module.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.starry.common.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 店员等级对象 play_clerk_level_info + * + * @author admin + * @since 2024-03-30 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("play_clerk_level_info") +public class PlayClerkLevelInfoEntity extends BaseEntity { + + + /** + * UUID + */ + private String id; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 等级名称 + */ + private String name; + + /** + * 等级数字（排序字段） + */ + private Integer level; + + /** + * 首次固定单比例[0 - 100%] + */ + private Integer firstRegularRatio; + + /** + * 非首次固定单比例[0 - 100%] + */ + private Integer notFirstRegularRatio; + + /** + * 首次打赏比例[0 - 100%] + */ + private Integer firstRewardRatio; + + /** + * 非首次打赏比例[0 - 100%] + */ + private Integer notFirstRewardRatio; + + /** + * 首次随机单比例[0 - 100%] + */ + private Integer firstRandomRadio; + + /** + * 非首次随机单比例[0 - 100%] + */ + private Integer notFirstRandomRadio; + + + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/module/entity/PlayClerkUserInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clear/module/entity/PlayClerkUserInfoEntity.java new file mode 100644 index 0000000..f5c19a2 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/module/entity/PlayClerkUserInfoEntity.java @@ -0,0 +1,161 @@ +package com.starry.admin.modules.clear.module.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.starry.common.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 【请填写功能名称】对象 play_clerk_user_info + * + * @author admin + * @since 2024-03-30 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("play_clerk_user_info") +public class PlayClerkUserInfoEntity extends BaseEntity { + + + /** + * UUID + */ + private String id; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 陪玩用户ID + */ + private String playUserId; + + /** + * 用户的标识，对当前公众号唯一 + */ + private String openid; + + /** + * 店员昵称 + */ + private String nickname; + + /** + * 店员等级 + */ + private String levelId; + + /** + * 店员性别（1：男：0：女） + */ + private String sex; + + /** + * 头像 + */ + private String avatar; + + /** + * 头像框 + */ + private String avatarFrameId; + + /** + * 音频 + */ + private String audioFrequency; + + /** + * 星座 + */ + private String constellation; + + /** + * 标签 + */ + private String label; + + /** + * 个性签名 + */ + private String signature; + + /** + * 年龄 + */ + private Long age; + + /** + * 所在国家 + */ + private String country; + + /** + * 所在省份 + */ + private String province; + + /** + * 所在城市 + */ + private String city; + + /** + * 账户余额（单位分） + */ + private String accountBalance; + + /** + * 备注 + */ + private String remark; + + /** + * 在职状态（1：在职，1：离职） + */ + private String onboardingState; + + /** + * 是否推荐状态（1：已推荐，0：未推荐） + */ + private String recommendationState; + + /** + * 是否置顶状态（1：已置顶，0：未置顶） + */ + private String pinToTopState; + + /** + * 在线状态【1：在线，0：离线】 + */ + private String onlineState; + + /** + * 上架状态【1：上架，0：下架】 + */ + private String listingState; + + /** + * 显示状态【1：显示，0：隐藏】 + */ + private String displayState; + + /** + * 实名状态【1：已实名，0：未实名】 + */ + private String realState; + + /** + * 是否必须实名【1：必须实名，0：非必须实名】 + */ + private String mandatoryRealState; + + /** + * 随机接单状态【1：允许，0：禁止】 + */ + private String randomOrder; + + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/module/vo/PlayClerkLevelAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/clear/module/vo/PlayClerkLevelAddVo.java new file mode 100644 index 0000000..6b2d238 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/module/vo/PlayClerkLevelAddVo.java @@ -0,0 +1,46 @@ +package com.starry.admin.modules.clear.module.vo; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class PlayClerkLevelAddVo { + + /** + * 等级名称 + */ + @NotBlank(message = "等级名称不能为空") + private String name; + + /** + * 首次固定单比例[0 - 100%] + */ + private Integer firstRegularRatio; + + /** + * 非首次固定单比例[0 - 100%] + */ + private Integer notFirstRegularRatio; + + /** + * 首次打赏比例[0 - 100%] + */ + private Integer firstRewardRatio; + + /** + * 非首次打赏比例[0 - 100%] + */ + private Integer notFirstRewardRatio; + + /** + * 首次随机单比例[0 - 100%] + */ + private Integer firstRandomRadio; + + /** + * 非首次随机单比例[0 - 100%] + */ + private Integer notFirstRandomRadio; + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/module/vo/PlayClerkLevelEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clear/module/vo/PlayClerkLevelEditVo.java new file mode 100644 index 0000000..1f39fb6 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/module/vo/PlayClerkLevelEditVo.java @@ -0,0 +1,52 @@ +package com.starry.admin.modules.clear.module.vo; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class PlayClerkLevelEditVo { + + /** + * 等级名称 + */ + @NotBlank(message = "ID不能为空") + private String id; + + /** + * 等级名称 + */ + @NotBlank(message = "等级名称不能为空") + private String name; + + /** + * 首次固定单比例[0 - 100%] + */ + private Integer firstRegularRatio; + + /** + * 非首次固定单比例[0 - 100%] + */ + private Integer notFirstRegularRatio; + + /** + * 首次打赏比例[0 - 100%] + */ + private Integer firstRewardRatio; + + /** + * 非首次打赏比例[0 - 100%] + */ + private Integer notFirstRewardRatio; + + /** + * 首次随机单比例[0 - 100%] + */ + private Integer firstRandomRadio; + + /** + * 非首次随机单比例[0 - 100%] + */ + private Integer notFirstRandomRadio; + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/module/vo/PlayClerkUserAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/clear/module/vo/PlayClerkUserAddVo.java new file mode 100644 index 0000000..3bb75b2 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/module/vo/PlayClerkUserAddVo.java @@ -0,0 +1,101 @@ +package com.starry.admin.modules.clear.module.vo; + +import com.starry.common.annotation.EnumValue; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + + +@Data +public class PlayClerkUserAddVo { + + /** + * 账号ID + */ + @NotBlank(message = "账号不能为空") + private String playUserId; + + /** + * 用户的标识，对当前公众号唯一 + */ + private String openid; + + /** + * 店员昵称 + */ + @NotBlank(message = "昵称不能为空") + private String nickname; + + /** + * 店员等级 + */ + @NotBlank(message = "等级不能为空") + private String levelId; + + /** + * 店员性别（1：男：0：女） + */ + @NotNull(message = "性别不能为空") + private Integer sex; + + /** + * 头像 + */ + @NotBlank(message = "头像不能为空") + private String avatar; + + /** + * 音频 + */ + @NotBlank(message = "音频不能为空") + private String audioFrequency; + + /** + * 星座 + */ + @NotBlank(message = "星座不能为空") + private String constellation; + + /** + * 标签 + */ + private String label; + + /** + * 个性签名 + */ + @NotBlank(message = "签名不能为空") + private String signature; + + /** + * 年龄 + */ + @NotNull(message = "年龄不能为空") + private Long age; + + /** + * 所在国家 + */ + @NotBlank(message = "国家不能为空") + private String country; + + /** + * 所在省份 + */ + @NotBlank(message = "省份不能为空") + private String province; + + /** + * 所在城市 + */ + @NotBlank(message = "城市不能为空") + private String city; + + + /** + * 备注 + */ + private String remark; + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/module/vo/PlayClerkUserEditVo.java b/play-admin/src/main/java/com/starry/admin/modules/clear/module/vo/PlayClerkUserEditVo.java new file mode 100644 index 0000000..642e80e --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/module/vo/PlayClerkUserEditVo.java @@ -0,0 +1,106 @@ +package com.starry.admin.modules.clear.module.vo; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + + +@Data +public class PlayClerkUserEditVo { + + /** + * id + */ + @NotBlank(message = "id不能为空") + private String id; + + /** + * 账号ID + */ + @NotBlank(message = "账号不能为空") + private String playUserId; + + /** + * 用户的标识，对当前公众号唯一 + */ + private String openid; + + /** + * 店员昵称 + */ + @NotBlank(message = "昵称不能为空") + private String nickname; + + /** + * 店员等级 + */ + @NotBlank(message = "等级不能为空") + private String levelId; + + /** + * 店员性别（1：男：0：女） + */ + @NotNull(message = "性别不能为空") + private String sex; + + /** + * 头像 + */ + @NotBlank(message = "头像不能为空") + private String avatar; + + /** + * 音频 + */ + @NotBlank(message = "音频不能为空") + private String audioFrequency; + + /** + * 星座 + */ + @NotBlank(message = "星座不能为空") + private String constellation; + + /** + * 标签 + */ + private String label; + + /** + * 个性签名 + */ + @NotBlank(message = "签名不能为空") + private String signature; + + /** + * 年龄 + */ + @NotNull(message = "年龄不能为空") + private Long age; + + /** + * 所在国家 + */ + @NotBlank(message = "国家不能为空") + private String country; + + /** + * 所在省份 + */ + @NotBlank(message = "省份不能为空") + private String province; + + /** + * 所在城市 + */ + @NotBlank(message = "城市不能为空") + private String city; + + + /** + * 备注 + */ + private String remark; + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/service/IPlayClerkLevelInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clear/service/IPlayClerkLevelInfoService.java new file mode 100644 index 0000000..a93a27a --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/service/IPlayClerkLevelInfoService.java @@ -0,0 +1,85 @@ +package com.starry.admin.modules.clear.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.starry.admin.modules.clear.module.entity.PlayClerkLevelInfoEntity; + +import java.util.List; + +/** + * 店员等级Service接口 + * + * @author admin + * @since 2024-03-30 + */ +public interface IPlayClerkLevelInfoService extends IService { + /** + * 查询店员等级 + * + * @param id 店员等级主键 + * @return 店员等级 + */ + PlayClerkLevelInfoEntity selectPlayClerkLevelInfoById(String id); + + /** + * 查询店员等级列表 + * + * @return 店员等级集合 + */ + List selectAll(); + + /** + * 分页查询店员等级列表 + * + * @param playClerkLevelInfo 店员等级 + * @return 店员等级集合 + */ + IPage selectPlayClerkLevelInfoByPage(PlayClerkLevelInfoEntity playClerkLevelInfo); + + /** + * 新增店员等级 + * + * @param playClerkLevelInfo 店员等级 + * @return 结果 + */ + boolean create(PlayClerkLevelInfoEntity playClerkLevelInfo); + + /** + * 修改店员等级 + * + * @param playClerkLevelInfo 店员等级 + * @return 结果 + */ + boolean update(PlayClerkLevelInfoEntity playClerkLevelInfo); + + /** + * 批量删除店员等级 + * + * @param ids 需要删除的店员等级主键集合 + * @return 结果 + */ + int deletePlayClerkLevelInfoByIds(String[] ids); + + /** + * 删除店员等级信息 + * + * @param id 店员等级主键 + * @return 结果 + */ + int deletePlayClerkLevelInfoById(String id); + + + /** + * 查询最大等级 + * + * @return 最大等级 + */ + int selectMaxLevel(); + + + /** + * 删除最大等级 + * + */ + void delMaxLevelByLevel(Integer level); +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/service/IPlayClerkUserInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clear/service/IPlayClerkUserInfoService.java new file mode 100644 index 0000000..a8a0125 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/service/IPlayClerkUserInfoService.java @@ -0,0 +1,58 @@ +package com.starry.admin.modules.clear.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.starry.admin.modules.clear.module.entity.PlayClerkUserInfoEntity; + + +/** + * 店员Service接口 + * + * @author admin + * @since 2024-03-30 + */ +public interface IPlayClerkUserInfoService extends IService { + /** + * 查询店员 + * @param id 店员主键 + * @return 店员 + */ + PlayClerkUserInfoEntity selectPlayClerkUserInfoById(String id); + + /** + * 查询店员列表 + * @param playClerkUserInfo 店员 + * @return 店员集合 + */ + IPage selectPlayClerkUserInfoByPage(PlayClerkUserInfoEntity playClerkUserInfo); + + /** + * 新增店员 + * @param playClerkUserInfo 店员 + * @return 结果 + */ + boolean create(PlayClerkUserInfoEntity playClerkUserInfo); + + /** + * 修改店员 + * @param playClerkUserInfo 店员 + * @return 结果 + */ + boolean update(PlayClerkUserInfoEntity playClerkUserInfo); + + /** + * 批量删除店员 + * + * @param ids 需要删除的店员主键集合 + * @return 结果 + */ + int deletePlayClerkUserInfoByIds(String[] ids); + + /** + * 删除店员信息 + * + * @param id 店员主键 + * @return 结果 + */ + int deletePlayClerkUserInfoById(String id); +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/service/impl/PlayClerkLevelInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clear/service/impl/PlayClerkLevelInfoServiceImpl.java new file mode 100644 index 0000000..e446bcd --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/service/impl/PlayClerkLevelInfoServiceImpl.java @@ -0,0 +1,123 @@ +package com.starry.admin.modules.clear.service.impl; + +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.starry.admin.modules.clear.mapper.PlayClerkLevelInfoMapper; +import com.starry.admin.modules.clear.module.entity.PlayClerkLevelInfoEntity; +import com.starry.admin.modules.clear.service.IPlayClerkLevelInfoService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; + +/** + * 店员等级Service业务层处理 + * + * @author admin + * @since 2024-03-30 + */ +@Service +public class PlayClerkLevelInfoServiceImpl extends ServiceImpl implements IPlayClerkLevelInfoService { + @Resource + private PlayClerkLevelInfoMapper playClerkLevelInfoMapper; + + /** + * 查询店员等级 + * + * @param id 店员等级主键 + * @return 店员等级 + */ + @Override + public PlayClerkLevelInfoEntity selectPlayClerkLevelInfoById(String id) { + return this.baseMapper.selectById(id); + } + + + @Override + public List selectAll() { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + lambdaQueryWrapper.orderByAsc(PlayClerkLevelInfoEntity::getLevel); + return this.baseMapper.selectList(lambdaQueryWrapper); + } + + /** + * 查询店员等级列表 + * + * @param playClerkLevelInfo 店员等级 + * @return 店员等级 + */ + @Override + public IPage selectPlayClerkLevelInfoByPage(PlayClerkLevelInfoEntity playClerkLevelInfo) { + Page page = new Page<>(1, 9999); + return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); + } + + /** + * 新增店员等级 + * + * @param playClerkLevelInfo 店员等级 + * @return 结果 + */ + @Override + public boolean create(PlayClerkLevelInfoEntity playClerkLevelInfo) { + if (StrUtil.isBlankIfStr(playClerkLevelInfo.getId())) { + playClerkLevelInfo.setId(IdUtil.fastSimpleUUID()); + } + return save(playClerkLevelInfo); + } + + /** + * 修改店员等级 + * + * @param playClerkLevelInfo 店员等级 + * @return 结果 + */ + @Override + public boolean update(PlayClerkLevelInfoEntity playClerkLevelInfo) { + return updateById(playClerkLevelInfo); + } + + /** + * 批量删除店员等级 + * + * @param ids 需要删除的店员等级主键 + * @return 结果 + */ + @Override + public int deletePlayClerkLevelInfoByIds(String[] ids) { + return playClerkLevelInfoMapper.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 删除店员等级信息 + * + * @param id 店员等级主键 + * @return 结果 + */ + @Override + public int deletePlayClerkLevelInfoById(String id) { + return playClerkLevelInfoMapper.deleteById(id); + } + + + @Override + public int selectMaxLevel() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("max(level) as level "); + PlayClerkLevelInfoEntity entity = this.baseMapper.selectOne(queryWrapper); + return entity == null ? 0 : entity.getLevel(); + } + + @Override + public void delMaxLevelByLevel(Integer level) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PlayClerkLevelInfoEntity::getLevel, level); + playClerkLevelInfoMapper.delete(queryWrapper); + } +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/clear/service/impl/PlayClerkUserInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clear/service/impl/PlayClerkUserInfoServiceImpl.java new file mode 100644 index 0000000..c1361fd --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/clear/service/impl/PlayClerkUserInfoServiceImpl.java @@ -0,0 +1,92 @@ +package com.starry.admin.modules.clear.service.impl; + +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.starry.admin.modules.clear.mapper.PlayClerkUserInfoMapper; +import com.starry.admin.modules.clear.module.entity.PlayClerkUserInfoEntity; +import com.starry.admin.modules.clear.service.IPlayClerkUserInfoService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Arrays; + + +/** + * 店员Service业务层处理 + * + * @author admin + * @since 2024-03-30 + */ +@Service +public class PlayClerkUserInfoServiceImpl extends ServiceImpl implements IPlayClerkUserInfoService { + @Resource + private PlayClerkUserInfoMapper playClerkUserInfoMapper; + + /** + * 查询店员 + * @param id 店员主键 + * @return 店员 + */ + @Override + public PlayClerkUserInfoEntity selectPlayClerkUserInfoById(String id) { + return this.baseMapper.selectById(id); + } + + /** + * 查询店员列表 + * @param playClerkUserInfo 店员 + * @return 店员 + */ + @Override + public IPage selectPlayClerkUserInfoByPage(PlayClerkUserInfoEntity playClerkUserInfo) { + Page page = new Page<>(1, 10); + return this.baseMapper.selectPage(page, new LambdaQueryWrapper()); + } + + /** + * 新增店员 + * @param playClerkUserInfo 店员 + * @return 结果 + */ + @Override + public boolean create(PlayClerkUserInfoEntity playClerkUserInfo) { + if (StrUtil.isBlankIfStr(playClerkUserInfo.getId())){ + playClerkUserInfo.setId(IdUtil.fastSimpleUUID()); + } + return save(playClerkUserInfo); + } + + /** + * 修改店员 + * @param playClerkUserInfo 店员 + * @return 结果 + */ + @Override + public boolean update(PlayClerkUserInfoEntity playClerkUserInfo) { + return updateById(playClerkUserInfo); + } + + /** + * 批量删除店员 + * @param ids 需要删除的店员主键 + * @return 结果 + */ + @Override + public int deletePlayClerkUserInfoByIds(String[] ids) { + return playClerkUserInfoMapper.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 删除店员信息 + * @param id 店员主键 + * @return 结果 + */ + @Override + public int deletePlayClerkUserInfoById(String id) { + return playClerkUserInfoMapper.deleteById(id); + } +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/commodity/controller/PlayServiceInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/commodity/controller/PlayServiceInfoController.java new file mode 100644 index 0000000..394a363 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/commodity/controller/PlayServiceInfoController.java @@ -0,0 +1,85 @@ +package com.starry.admin.modules.commodity.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity; +import com.starry.admin.modules.commodity.service.IPlayServiceInfoService; +import com.starry.common.annotation.Log; +import com.starry.common.enums.BusinessType; +import com.starry.common.result.R; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 服务项目列表Controller + * + * @author admin + * @since 2024-03-28 + */ +@RestController +@RequestMapping("/commodity/info") +public class PlayServiceInfoController { + @Resource + private IPlayServiceInfoService playServiceInfoService; + + + + /** + * 查询服务项目列表列表 + */ + @PreAuthorize("@customSs.hasPermission('play:info:list')") + @GetMapping("/list") + public R list(PlayServiceInfoEntity playServiceInfo) { + IPage list = playServiceInfoService.selectPlayServiceInfoByPage(playServiceInfo); + return R.ok(list); + } + + /** + * 获取服务项目列表详细信息 + */ + @PreAuthorize("@customSs.hasPermission('play:info:query')") + @GetMapping(value = "/{id}") + public R getInfo(@PathVariable("id") String id) { + return R.ok(playServiceInfoService.selectPlayServiceInfoById(id)); + } + + /** + * 新增服务项目列表 + */ + @PreAuthorize("@customSs.hasPermission('play:info:create')") + @Log(title = "服务项目列表", businessType = BusinessType.INSERT) + @PostMapping("/create") + public R create(@RequestBody PlayServiceInfoEntity playServiceInfo) { + boolean success = playServiceInfoService.create(playServiceInfo); + if (success) { + return R.ok(); + } + return R.error("添加失败"); + } + + /** + * 修改服务项目列表 + */ + @PreAuthorize("@customSs.hasPermission('play:info:edit')") + @Log(title = "服务项目列表", businessType = BusinessType.UPDATE) + @PostMapping(value = "/update/{id}") + public R update(@PathVariable String id, @RequestBody PlayServiceInfoEntity playServiceInfo) { + playServiceInfo.setId(id); + boolean success = playServiceInfoService.update(playServiceInfo); + if (success) { + return R.ok(); + } + return R.error("修改失败"); + } + + /** + * 删除服务项目列表 + */ + @PreAuthorize("@customSs.hasPermission('play:info:remove')") + @Log(title = "服务项目列表", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@PathVariable String[] ids) { + return R.ok(playServiceInfoService.deletePlayServiceInfoByIds(ids)); + } +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/commodity/mapper/PlayClearServiceMapper.java b/play-admin/src/main/java/com/starry/admin/modules/commodity/mapper/PlayClearServiceMapper.java new file mode 100644 index 0000000..fc191a3 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/commodity/mapper/PlayClearServiceMapper.java @@ -0,0 +1,17 @@ +package com.starry.admin.modules.commodity.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.starry.admin.modules.commodity.module.entity.PlayClearServiceEntity; + + +/** + * 陪玩引用服务项目Mapper接口 + * + * @author admin + * @since 2024-03-28 + */ +public interface PlayClearServiceMapper extends BaseMapper { + + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/commodity/mapper/PlayServiceInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/commodity/mapper/PlayServiceInfoMapper.java new file mode 100644 index 0000000..568900c --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/commodity/mapper/PlayServiceInfoMapper.java @@ -0,0 +1,17 @@ +package com.starry.admin.modules.commodity.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity; + + +/** + * 服务项目列表Mapper接口 + * + * @author admin + * @since 2024-03-28 + */ +public interface PlayServiceInfoMapper extends BaseMapper { + + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/commodity/module/entity/PlayClearServiceEntity.java b/play-admin/src/main/java/com/starry/admin/modules/commodity/module/entity/PlayClearServiceEntity.java new file mode 100644 index 0000000..850ef04 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/commodity/module/entity/PlayClearServiceEntity.java @@ -0,0 +1,51 @@ +package com.starry.admin.modules.commodity.module.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.starry.common.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 陪玩引用服务项目对象 play_clear_service + * + * @author admin + * @since 2024-03-28 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("play_clear_service") +public class PlayClearServiceEntity extends BaseEntity { + + + /** + * UUID + */ + private String id; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 店员用户ID + */ + private String playUserId; + + /** + * 服务项目ID + */ + private String serviceId; + + + /** + * 项目启用状态 + * 1:启用 + * 0:停用 + * + * @since 2024/3/28 11:20 + **/ + private String enablingState; + + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/commodity/module/entity/PlayServiceInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/commodity/module/entity/PlayServiceInfoEntity.java new file mode 100644 index 0000000..a43e932 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/commodity/module/entity/PlayServiceInfoEntity.java @@ -0,0 +1,46 @@ +package com.starry.admin.modules.commodity.module.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.starry.common.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 服务项目信息对象 play_service_info + * + * @author admin + * @since 2024-03-28 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("play_service_info") +public class PlayServiceInfoEntity extends BaseEntity { + + + /** + * UUID + */ + private String id; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 项目名称 + */ + private String itemName; + + /** + * 服务时长（文字描述信息,不参与订单计算） + */ + private String serviceDuration; + + /** + * 服务单价 + */ + private String price; + + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/commodity/service/IPlayClearServiceService.java b/play-admin/src/main/java/com/starry/admin/modules/commodity/service/IPlayClearServiceService.java new file mode 100644 index 0000000..889dfde --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/commodity/service/IPlayClearServiceService.java @@ -0,0 +1,84 @@ +package com.starry.admin.modules.commodity.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.starry.admin.modules.commodity.module.entity.PlayClearServiceEntity; + +/** + * 陪玩引用服务项目Service接口 + * + * @author admin + * @since 2024-03-28 + */ +public interface IPlayClearServiceService extends IService { + + + /** + * 初始化陪玩的服务项目 + * + * @param playUserId 陪玩用户ID + * @author 杭州世平信息科技有限公司-xuhq + * @since 2024/3/28 11:13 + **/ + void initPlayService(String playUserId); + + /** + * 查询陪玩引用服务项目 + * + * @param id 陪玩引用服务项目主键 + * @return 陪玩引用服务项目 + */ + PlayClearServiceEntity selectPlayClearServiceById(String id); + + /** + * 查询陪玩引用服务项目列表 + * + * @param playClearService 陪玩引用服务项目 + * @return 陪玩引用服务项目集合 + */ + IPage selectPlayClearServiceByPage(PlayClearServiceEntity playClearService); + + /** + * 新增陪玩引用服务项目 + * + * @param playClearService 陪玩引用服务项目 + * @return 结果 + */ + boolean create(PlayClearServiceEntity playClearService); + + + /** + * 修改陪玩服务启停状态 + * + * @param playUserId 陪玩用户ID + * @param serviceId 服务ID + * @param enablingState * 项目启用状态【0:停用，1：启用】 + * @author 杭州世平信息科技有限公司-xuhq + * @since 2024/3/28 11:35 + **/ + void updateServiceEnablingState(String playUserId, String serviceId, String enablingState); + + /** + * 修改陪玩引用服务项目 + * + * @param playClearService 陪玩引用服务项目 + * @return 结果 + */ + boolean update(PlayClearServiceEntity playClearService); + + /** + * 批量删除陪玩引用服务项目 + * + * @param ids 需要删除的陪玩引用服务项目主键集合 + * @return 结果 + */ + int deletePlayClearServiceByIds(String[] ids); + + /** + * 删除陪玩引用服务项目信息 + * + * @param id 陪玩引用服务项目主键 + * @return 结果 + */ + int deletePlayClearServiceById(String id); +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/commodity/service/IPlayServiceInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/commodity/service/IPlayServiceInfoService.java new file mode 100644 index 0000000..e3ac7cd --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/commodity/service/IPlayServiceInfoService.java @@ -0,0 +1,74 @@ +package com.starry.admin.modules.commodity.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity; + +import java.util.List; + + +/** + * 服务项目列表Service接口 + * + * @author admin + * @since 2024-03-28 + */ +public interface IPlayServiceInfoService extends IService { + + /** + * 查询服务项目列表 + * + * @param id 服务项目列表主键 + * @return 服务项目列表 + */ + PlayServiceInfoEntity selectPlayServiceInfoById(String id); + + /** + * 查询所有的服务项目 + * + * @return List + * @author 杭州世平信息科技有限公司-xuhq + * @since 2024/3/28 11:18 + **/ + List selectPlayServiceInfoAll(); + + /** + * 查询服务项目列表列表 + * + * @param playServiceInfo 服务项目列表 + * @return 服务项目列表集合 + */ + IPage selectPlayServiceInfoByPage(PlayServiceInfoEntity playServiceInfo); + + /** + * 新增服务项目列表 + * + * @param playServiceInfo 服务项目列表 + * @return 结果 + */ + boolean create(PlayServiceInfoEntity playServiceInfo); + + /** + * 修改服务项目列表 + * + * @param playServiceInfo 服务项目列表 + * @return 结果 + */ + boolean update(PlayServiceInfoEntity playServiceInfo); + + /** + * 批量删除服务项目列表 + * + * @param ids 需要删除的服务项目列表主键集合 + * @return 结果 + */ + int deletePlayServiceInfoByIds(String[] ids); + + /** + * 删除服务项目列表信息 + * + * @param id 服务项目列表主键 + * @return 结果 + */ + int deletePlayServiceInfoById(String id); +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/commodity/service/impl/PlayClearServiceServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/commodity/service/impl/PlayClearServiceServiceImpl.java new file mode 100644 index 0000000..037558d --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/commodity/service/impl/PlayClearServiceServiceImpl.java @@ -0,0 +1,134 @@ +package com.starry.admin.modules.commodity.service.impl; + +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.starry.admin.common.exception.CustomException; +import com.starry.admin.modules.commodity.mapper.PlayClearServiceMapper; +import com.starry.admin.modules.commodity.module.entity.PlayClearServiceEntity; +import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity; +import com.starry.admin.modules.commodity.service.IPlayClearServiceService; +import com.starry.admin.modules.commodity.service.IPlayServiceInfoService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; + +/** + * 陪玩引用服务项目Service业务层处理 + * + * @author admin + * @since 2024-03-28 + */ +@Service +public class PlayClearServiceServiceImpl extends ServiceImpl implements IPlayClearServiceService { + @Resource + private PlayClearServiceMapper playClearServiceMapper; + + + @Resource + private IPlayServiceInfoService playServiceInfoService; + + + @Override + public void initPlayService(String playUserId) { + for (PlayServiceInfoEntity playServiceInfoEntity : playServiceInfoService.selectPlayServiceInfoAll()) { + PlayClearServiceEntity entity = new PlayClearServiceEntity(); + entity.setServiceId(playServiceInfoEntity.getId()); + entity.setTenantId(playServiceInfoEntity.getTenantId()); + entity.setPlayUserId(playUserId); + entity.setEnablingState("0"); + this.create(entity); + } + } + + /** + * 查询陪玩引用服务项目 + * + * @param id 陪玩引用服务项目主键 + * @return 陪玩引用服务项目 + */ + @Override + public PlayClearServiceEntity selectPlayClearServiceById(String id) { + return this.baseMapper.selectById(id); + } + + /** + * 查询陪玩引用服务项目列表 + * + * @param playClearService 陪玩引用服务项目 + * @return 陪玩引用服务项目 + */ + @Override + public IPage selectPlayClearServiceByPage(PlayClearServiceEntity playClearService) { + Page page = new Page<>(1, 10); + return this.baseMapper.selectPage(page, new LambdaQueryWrapper()); + } + + /** + * 新增陪玩引用服务项目 + * + * @param playClearService 陪玩引用服务项目 + * @return 结果 + */ + @Override + public boolean create(PlayClearServiceEntity playClearService) { + if (StrUtil.isBlankIfStr(playClearService.getId())) { + playClearService.setId(IdUtil.fastSimpleUUID()); + } + return save(playClearService); + } + + + @Override + public void updateServiceEnablingState(String playUserId, String serviceId, String enablingState) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(PlayClearServiceEntity::getServiceId, serviceId); + lambdaQueryWrapper.eq(PlayClearServiceEntity::getPlayUserId, playUserId); + List list = this.baseMapper.selectList(lambdaQueryWrapper); + if (list.size() != 1) { + throw new CustomException("服务不存在，请查证"); + } + // 更新服务状态 + PlayClearServiceEntity item = list.get(0); + item.setEnablingState(enablingState); + this.update(item); + } + + /** + * 修改陪玩引用服务项目 + * + * @param playClearService 陪玩引用服务项目 + * @return 结果 + */ + @Override + public boolean update(PlayClearServiceEntity playClearService) { + return updateById(playClearService); + } + + /** + * 批量删除陪玩引用服务项目 + * + * @param ids 需要删除的陪玩引用服务项目主键 + * @return 结果 + */ + @Override + public int deletePlayClearServiceByIds(String[] ids) { + return playClearServiceMapper.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 删除陪玩引用服务项目信息 + * + * @param id 陪玩引用服务项目主键 + * @return 结果 + */ + @Override + public int deletePlayClearServiceById(String id) { + return playClearServiceMapper.deleteById(id); + } +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/commodity/service/impl/PlayServiceInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/commodity/service/impl/PlayServiceInfoServiceImpl.java new file mode 100644 index 0000000..fca9b68 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/commodity/service/impl/PlayServiceInfoServiceImpl.java @@ -0,0 +1,105 @@ +package com.starry.admin.modules.commodity.service.impl; + +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.starry.admin.modules.commodity.mapper.PlayServiceInfoMapper; +import com.starry.admin.modules.commodity.module.entity.PlayServiceInfoEntity; +import com.starry.admin.modules.commodity.service.IPlayServiceInfoService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; + +/** + * 服务项目列表Service业务层处理 + * + * @author admin + * @since 2024-03-28 + */ +@Service +public class PlayServiceInfoServiceImpl extends ServiceImpl implements IPlayServiceInfoService { + @Resource + private PlayServiceInfoMapper playServiceInfoMapper; + + + /** + * 查询服务项目列表 + * + * @param id 服务项目列表主键 + * @return 服务项目列表 + */ + @Override + public PlayServiceInfoEntity selectPlayServiceInfoById(String id) { + return this.baseMapper.selectById(id); + } + + + @Override + public List selectPlayServiceInfoAll() { + return this.baseMapper.selectList(new LambdaQueryWrapper<>()); + } + + /** + * 查询服务项目列表列表 + * + * @param playServiceInfo 服务项目列表 + * @return 服务项目列表 + */ + @Override + public IPage selectPlayServiceInfoByPage(PlayServiceInfoEntity playServiceInfo) { + Page page = new Page<>(1, 10); + return this.baseMapper.selectPage(page, new LambdaQueryWrapper()); + } + + /** + * 新增服务项目列表 + * + * @param playServiceInfo 服务项目列表 + * @return 结果 + */ + @Override + public boolean create(PlayServiceInfoEntity playServiceInfo) { + if (StrUtil.isBlankIfStr(playServiceInfo.getId())) { + playServiceInfo.setId(IdUtil.fastSimpleUUID()); + } + return save(playServiceInfo); + } + + /** + * 修改服务项目列表 + * + * @param playServiceInfo 服务项目列表 + * @return 结果 + */ + @Override + public boolean update(PlayServiceInfoEntity playServiceInfo) { + return updateById(playServiceInfo); + } + + /** + * 批量删除服务项目列表 + * + * @param ids 需要删除的服务项目列表主键 + * @return 结果 + */ + @Override + public int deletePlayServiceInfoByIds(String[] ids) { + return playServiceInfoMapper.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 删除服务项目列表信息 + * + * @param id 服务项目列表主键 + * @return 结果 + */ + @Override + public int deletePlayServiceInfoById(String id) { + return playServiceInfoMapper.deleteById(id); + } +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/coupon/mapper/CouponInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/coupon/mapper/CouponInfoMapper.java index 9fdf8a4..07b8573 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/coupon/mapper/CouponInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/coupon/mapper/CouponInfoMapper.java @@ -9,11 +9,12 @@ import java.util.List; * 商品Mapper接口 * * @author admin - * @since 2024-03-22 + * @since 2024-03-22 */ public interface CouponInfoMapper extends BaseMapper { /** * 查询商品 + * * @param id 商品主键 * @return 商品 */ @@ -21,6 +22,7 @@ public interface CouponInfoMapper extends BaseMapper { /** * 查询商品列表 + * * @param couponInfo 商品 * @return 商品集合 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/coupon/service/impl/CouponInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/coupon/service/impl/CouponInfoServiceImpl.java index e1c41c0..eebcb6d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/coupon/service/impl/CouponInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/coupon/service/impl/CouponInfoServiceImpl.java @@ -16,7 +16,7 @@ import java.util.Arrays; * 商品Service业务层处理 * * @author admin - * @since 2024-03-22 + * @since 2024-03-22 */ @Service public class CouponInfoServiceImpl extends ServiceImpl implements ICouponInfoService { @@ -25,6 +25,7 @@ public class CouponInfoServiceImpl extends ServiceImpl { /** * 查询订单 + * * @param id 订单主键 * @return 订单 */ - OrderInfoEntity selectOrderInfoById(String id); + OrderInfoEntity selectOrderInfoById(String id); /** * 查询订单列表 + * * @param orderInfoEntity 订单 * @return 订单集合 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/mapper/OrderLogInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/order/mapper/OrderLogInfoMapper.java index 6b49e51..293db6b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/mapper/OrderLogInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/mapper/OrderLogInfoMapper.java @@ -7,7 +7,7 @@ import com.starry.admin.modules.order.module.entity.OrderLogInfoEntity; * 【请填写功能名称】Mapper接口 * * @author admin - * @since 2024-03-22 + * @since 2024-03-22 */ public interface OrderLogInfoMapper extends BaseMapper { diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/OrderInfoCancellationVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/OrderInfoCancellationVo.java index 42b11cd..077d1a8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/OrderInfoCancellationVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/OrderInfoCancellationVo.java @@ -34,5 +34,4 @@ public class OrderInfoCancellationVo { private String operatorBy; - } \ No newline at end of file diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/IOrderLogInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/IOrderLogInfoService.java index 05109d5..570ac75 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/IOrderLogInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/IOrderLogInfoService.java @@ -3,22 +3,25 @@ package com.starry.admin.modules.order.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.order.module.entity.OrderLogInfoEntity; + /** * 【请填写功能名称】Service接口 * * @author admin - * @since 2024-03-22 + * @since 2024-03-22 */ public interface IOrderLogInfoService extends IService { /** * 查询【请填写功能名称】 + * * @param id 【请填写功能名称】主键 * @return 【请填写功能名称】 */ - OrderLogInfoEntity selectOrderLogInfoById(String id); + OrderLogInfoEntity selectOrderLogInfoById(String id); /** * 查询【请填写功能名称】列表 + * * @param orderLogInfo 【请填写功能名称】 * @return 【请填写功能名称】集合 */ @@ -26,6 +29,7 @@ public interface IOrderLogInfoService extends IService { /** * 新增【请填写功能名称】 + * * @param orderLogInfo 【请填写功能名称】 * @return 结果 */ @@ -33,6 +37,7 @@ public interface IOrderLogInfoService extends IService { /** * 修改【请填写功能名称】 + * * @param orderLogInfo 【请填写功能名称】 * @return 结果 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/OrderInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/OrderInfoServiceImpl.java index 9896dab..f43be4d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/OrderInfoServiceImpl.java @@ -37,6 +37,32 @@ public class OrderInfoServiceImpl extends ServiceImpl getSimpleList(); - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/platform/service/ISysTenantService.java b/play-admin/src/main/java/com/starry/admin/modules/platform/service/ISysTenantService.java index 58f45b4..13da4bf 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/platform/service/ISysTenantService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/platform/service/ISysTenantService.java @@ -82,6 +82,7 @@ public interface ISysTenantService extends IService { /** * 根据套餐ID查询租户 + * * @param packageId 套餐ID * @return */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantPackageServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantPackageServiceImpl.java index 1b7f9c6..545b31a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantPackageServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantPackageServiceImpl.java @@ -86,7 +86,7 @@ public class SysTenantPackageServiceImpl extends ServiceImpl list = playUserInfoService.selectPlayUserInfoByPage(playUserInfo); + public R list(PlayUserInfoQueryVo vo) { + IPage list = playUserInfoService.selectPlayUserInfoByPage(vo); return R.ok(list); } - /** - * 获取陪玩用户详细信息 + * 获取账号详细信息 */ @PreAuthorize("@customSs.hasPermission('play:info:query')") @GetMapping(value = "/{id}") @@ -44,13 +48,14 @@ public class PlayUserInfoController { } /** - * 新增陪玩用户 + * 新增账号 */ @PreAuthorize("@customSs.hasPermission('play:info:create')") - @Log(title = "陪玩用户", businessType = BusinessType.INSERT) + @Log(title = "账号", businessType = BusinessType.INSERT) @PostMapping("/create") - public R create(@RequestBody PlayUserInfoEntity playUserInfo) { - boolean success = playUserInfoService.create(playUserInfo); + public R create(@Validated @RequestBody PlayUserInfoAddVo vo) { + PlayUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayUserInfoEntity.class); + boolean success = playUserInfoService.create(entity); if (success) { return R.ok(); } @@ -58,14 +63,14 @@ public class PlayUserInfoController { } /** - * 修改陪玩用户 + * 修改账号 */ @PreAuthorize("@customSs.hasPermission('play:info:edit')") - @Log(title = "陪玩用户", businessType = BusinessType.UPDATE) - @PostMapping(value = "/update/{id}") - public R update(@PathVariable String id, @RequestBody PlayUserInfoEntity playUserInfo) { - playUserInfo.setId(id); - boolean success = playUserInfoService.update(playUserInfo); + @Log(title = "账号", businessType = BusinessType.UPDATE) + @PostMapping(value = "/update") + public R update(@Validated @RequestBody PlayUserInfoUpdateVo vo) { + PlayUserInfoEntity entity = ConvertUtil.entityToVo(vo, PlayUserInfoEntity.class); + boolean success = playUserInfoService.update(entity); if (success) { return R.ok(); } @@ -73,10 +78,10 @@ public class PlayUserInfoController { } /** - * 删除陪玩用户 + * 删除账号 */ @PreAuthorize("@customSs.hasPermission('play:info:remove')") - @Log(title = "陪玩用户", businessType = BusinessType.DELETE) + @Log(title = "账号", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@PathVariable String[] ids) { return R.ok(playUserInfoService.deletePlayUserInfoByIds(ids)); diff --git a/play-admin/src/main/java/com/starry/admin/modules/play/mapper/PlayUserInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/play/mapper/PlayUserInfoMapper.java index 1c1462e..74a77f3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/play/mapper/PlayUserInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/play/mapper/PlayUserInfoMapper.java @@ -1,13 +1,15 @@ package com.starry.admin.modules.play.mapper; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.starry.admin.modules.play.module.entity.PlayUserInfoEntity; + /** - * 陪玩用户Mapper接口 + * 账号Mapper接口 * * @author admin - * @since 2024-03-24 + * @since 2024-03-30 */ public interface PlayUserInfoMapper extends BaseMapper { diff --git a/play-admin/src/main/java/com/starry/admin/modules/play/module/entity/PlayUserInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/play/module/entity/PlayUserInfoEntity.java index ef04127..b198afb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/play/module/entity/PlayUserInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/play/module/entity/PlayUserInfoEntity.java @@ -6,10 +6,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 陪玩用户对象 ply_user_info + * 账号对象 play_user_info * * @author admin - * @since 2024-03-24 + * @since 2024-03-30 */ @Data @EqualsAndHashCode(callSuper = false) @@ -28,84 +28,13 @@ public class PlayUserInfoEntity extends BaseEntity { private String tenantId; /** - * 姓名 + * 账户名称（手机号码） */ - private String name; + private String username; /** - * 证件号码 + * 手机号码区号 */ - private String code; + private String areaCode; - /** - * 账户余额 - */ - private String accountBalance; - - /** - * 昵称 - */ - private String nickName; - - /** - * 头像地址 - */ - private String profilePicture; - - /** - * 陪玩状态[0,1,2] - * 0：正常， - * 1：被标记: - * 2：被封禁 - */ - private String userState; - - /** - * 陪玩等级 - */ - private Integer level; - - /** - * 陪玩在线状态[0:1] - * 0：在线 - * 1：离线 - */ - private String presenceState; - - /** - * 性别 - */ - private String sex; - - /** - * 年龄 - */ - private Long age; - - /** - * 所在城市 - */ - private String city; - - /** - * 所在国家 - */ - private String country; - - /** - * 所在省份 - */ - private String province; - - /** - * 手机号码 - */ - private String phone; - - /** - * 用户语言 - */ - private String language; - - -} \ No newline at end of file +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/play/module/vo/PlayUserInfoAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/play/module/vo/PlayUserInfoAddVo.java new file mode 100644 index 0000000..5cfb167 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/play/module/vo/PlayUserInfoAddVo.java @@ -0,0 +1,35 @@ +package com.starry.admin.modules.play.module.vo; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class PlayUserInfoAddVo { + + /** + * 账户名称（手机号码） + */ + @NotBlank(message = "手机号码不能为空") + private String username; + + /** + * 手机号码区号 + */ + @NotBlank(message = "手机号码区号不能为空") + private String areaCode; + + /** + * 验证码 + */ + @NotBlank(message = "手机号码区号不能为空") + private String verificationCode; + + /** + * 陪玩用户ID + */ + @NotBlank(message = "绑定用户不能为空") + private String playUserId; + + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/play/module/vo/PlayUserInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/play/module/vo/PlayUserInfoQueryVo.java new file mode 100644 index 0000000..1e22d95 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/play/module/vo/PlayUserInfoQueryVo.java @@ -0,0 +1,21 @@ +package com.starry.admin.modules.play.module.vo; + +import com.starry.common.domain.BasePageEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class PlayUserInfoQueryVo extends BasePageEntity { + + private String id; + + + private String username; + + + private String areaCode; + + + private String ruleId; +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/play/module/vo/PlayUserInfoUpdateVo.java b/play-admin/src/main/java/com/starry/admin/modules/play/module/vo/PlayUserInfoUpdateVo.java new file mode 100644 index 0000000..b9f14ea --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/play/module/vo/PlayUserInfoUpdateVo.java @@ -0,0 +1,20 @@ +package com.starry.admin.modules.play.module.vo; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class PlayUserInfoUpdateVo { + + @NotBlank(message = "ID不能为空") + private String id; + + /** + * 陪玩用户ID + */ + @NotBlank(message = "绑定用户不能为空") + private String playUserId; + + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/play/service/IPlayUserInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/play/service/IPlayUserInfoService.java index 2625c1e..a812201 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/play/service/IPlayUserInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/play/service/IPlayUserInfoService.java @@ -3,97 +3,60 @@ package com.starry.admin.modules.play.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.play.module.entity.PlayUserInfoEntity; +import com.starry.admin.modules.play.module.vo.PlayUserInfoQueryVo; /** - * 陪玩用户Service接口 + * 账号Service接口 * * @author admin - * @since 2024-03-24 + * @since 2024-03-30 */ public interface IPlayUserInfoService extends IService { /** - * 查询陪玩用户 + * 查询账号 * - * @param id 陪玩用户主键 - * @return 陪玩用户 + * @param id 账号主键 + * @return 账号 */ PlayUserInfoEntity selectPlayUserInfoById(String id); /** - * 查询陪玩用户列表 + * 查询账号列表 * - * @param playUserInfo 陪玩用户 - * @return 陪玩用户集合 + * @param vo 账号查询实体 + * @return 账号集合 */ - IPage selectPlayUserInfoByPage(PlayUserInfoEntity playUserInfo); + IPage selectPlayUserInfoByPage(PlayUserInfoQueryVo vo); /** - * 新增陪玩用户 + * 新增账号 * - * @param playUserInfo 陪玩用户 + * @param playUserInfo 账号 * @return 结果 */ boolean create(PlayUserInfoEntity playUserInfo); /** - * 修改陪玩用户 + * 修改账号 * - * @param playUserInfo 陪玩用户 + * @param playUserInfo 账号 * @return 结果 */ boolean update(PlayUserInfoEntity playUserInfo); /** - * 批量删除陪玩用户 + * 批量删除账号 * - * @param ids 需要删除的陪玩用户主键集合 + * @param ids 需要删除的账号主键集合 * @return 结果 */ int deletePlayUserInfoByIds(String[] ids); /** - * 删除陪玩用户信息 + * 删除账号信息 * - * @param id 陪玩用户主键 + * @param id 账号主键 * @return 结果 */ int deletePlayUserInfoById(String id); - - - /** - * 修改陪玩账户余额 - * - * @param id 陪玩ID - * @param accountBalance 账户余额 - * @param operate 余额操作【add or reduce】 - */ - void editAccountBalance(String id, String accountBalance, String operate); - - /** - * 修改陪玩账户等级 - * - * @param id 陪玩ID - * @param level 陪玩等级 - */ - void editLevel(String id, int level); - - - /** - * 修改陪玩账户等级 - * - * @param id 陪玩ID - * @param state 陪玩状态 - */ - void editState(String id, String state); - - - /** - * 修改陪玩在线状态 - * - * @param id 陪玩ID - * @param presenceState 陪玩在线状态 - */ - - void editPresenceState(String id, String presenceState); - } diff --git a/play-admin/src/main/java/com/starry/admin/modules/play/service/impl/PlayResourcesInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/play/service/impl/PlayResourcesInfoServiceImpl.java index 7d22ae7..0c02d9b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/play/service/impl/PlayResourcesInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/play/service/impl/PlayResourcesInfoServiceImpl.java @@ -77,9 +77,9 @@ public class PlayResourcesInfoServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PlayResourcesInfoEntity::getPlayUserId, entity.getPlayUserId()); lambdaQueryWrapper.eq(PlayResourcesInfoEntity::getTenantId, entity.getTenantId()); @@ -91,7 +91,7 @@ public class PlayResourcesInfoServiceImpl extends ServiceImpl implements IPlayUserInfoService { @@ -27,83 +27,42 @@ public class PlayUserInfoServiceImpl extends ServiceImpl selectPlayUserInfoByPage(PlayUserInfoEntity playUserInfo) { - Page page = new Page<>(1, 10); - return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); + public IPage selectPlayUserInfoByPage(PlayUserInfoQueryVo vo) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + if (StrUtil.isNotBlank(vo.getId())) { + lambdaQueryWrapper.eq(PlayUserInfoEntity::getId, vo.getId()); + } + if (StrUtil.isNotBlank(vo.getUsername())) { + lambdaQueryWrapper.eq(PlayUserInfoEntity::getUsername, vo.getUsername()); + } + if (StrUtil.isNotBlank(vo.getAreaCode())) { + lambdaQueryWrapper.eq(PlayUserInfoEntity::getAreaCode, vo.getAreaCode()); + } + Page page = new Page<>(vo.getPageNum(), vo.getPageSize()); + return this.baseMapper.selectPage(page, lambdaQueryWrapper); } /** - * 新增陪玩用户 + * 新增账号 * - * @param playUserInfo 陪玩用户 + * @param playUserInfo 账号 * @return 结果 */ @Override @@ -115,9 +74,9 @@ public class PlayUserInfoServiceImpl extends ServiceImpl menus = menuService.selectSimpleMenuList(); - //TODO 移除公共模块 + // TODO 移除公共模块 List forbidList = Arrays.asList(26L, 48L, 47L, 19L); List menuList = menus.stream().filter(ca -> !forbidList.contains(ca.getId()) || !forbidList.contains(ca.getParentId())).collect(Collectors.toList()); return R.ok(menus); diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/builder/ImageBuilder.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/builder/ImageBuilder.java index 50e1a71..a694101 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/builder/ImageBuilder.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/builder/ImageBuilder.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.builder; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/builder/TextBuilder.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/builder/TextBuilder.java index e089bfa..741b649 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/builder/TextBuilder.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/builder/TextBuilder.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.builder; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/config/CommonConstants.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/config/CommonConstants.java index b7fb929..8f7038d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/config/CommonConstants.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/config/CommonConstants.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.config; /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/config/WxMpConfiguration.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/config/WxMpConfiguration.java index f57b00d..d954b74 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/config/WxMpConfiguration.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/config/WxMpConfiguration.java @@ -1,28 +1,28 @@ -//package com.starry.admin.modules.weichat.config; +// package com.starry.admin.modules.weichat.config; // // -//import cn.hutool.core.util.StrUtil; -//import com.starry.admin.modules.weichat.entity.CustomWxMpProperties; -//import com.starry.admin.modules.weichat.handler.*; -//import com.starry.admin.modules.weichat.utils.WxMpPropertiesUtils; -//import lombok.AllArgsConstructor; -//import me.chanjar.weixin.common.api.WxConsts; -//import me.chanjar.weixin.mp.api.WxMpMessageRouter; -//import me.chanjar.weixin.mp.api.WxMpService; -//import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; -//import me.chanjar.weixin.mp.config.WxMpConfigStorage; -//import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; +// import cn.hutool.core.util.StrUtil; +// import com.starry.admin.modules.weichat.entity.CustomWxMpProperties; +// import com.starry.admin.modules.weichat.handler.*; +// import com.starry.admin.modules.weichat.utils.WxMpPropertiesUtils; +// import lombok.AllArgsConstructor; +// import me.chanjar.weixin.common.api.WxConsts; +// import me.chanjar.weixin.mp.api.WxMpMessageRouter; +// import me.chanjar.weixin.mp.api.WxMpService; +// import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; +// import me.chanjar.weixin.mp.config.WxMpConfigStorage; +// import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; +// import org.springframework.context.annotation.Bean; +// import org.springframework.context.annotation.Configuration; // -//import java.util.HashMap; -//import java.util.Map; +// import java.util.HashMap; +// import java.util.Map; // -//import static me.chanjar.weixin.common.api.WxConsts.EventType.SUBSCRIBE; -//import static me.chanjar.weixin.common.api.WxConsts.EventType.UNSUBSCRIBE; -//import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType.EVENT; -//import static me.chanjar.weixin.mp.constant.WxMpEventConstants.CustomerService.*; -//import static me.chanjar.weixin.mp.constant.WxMpEventConstants.POI_CHECK_NOTIFY; +// import static me.chanjar.weixin.common.api.WxConsts.EventType.SUBSCRIBE; +// import static me.chanjar.weixin.common.api.WxConsts.EventType.UNSUBSCRIBE; +// import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType.EVENT; +// import static me.chanjar.weixin.mp.constant.WxMpEventConstants.CustomerService.*; +// import static me.chanjar.weixin.mp.constant.WxMpEventConstants.POI_CHECK_NOTIFY; // ///** // * wechat mp configuration @@ -31,7 +31,7 @@ // */ //@AllArgsConstructor //@Configuration -//public class WxMpConfiguration { +// public class WxMpConfiguration { // private final LogHandler logHandler; // private final NullHandler nullHandler; // private final KfSessionHandler kfSessionHandler; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/ConfigConstant.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/ConfigConstant.java index e22184a..94272b5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/ConfigConstant.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/ConfigConstant.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.constant; /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/MyReturnCode.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/MyReturnCode.java index f248784..d0252d7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/MyReturnCode.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/MyReturnCode.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.constant; /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/WebSocketConstant.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/WebSocketConstant.java index 1f5dc77..d471e53 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/WebSocketConstant.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/WebSocketConstant.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.constant; /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/WxMaConstants.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/WxMaConstants.java index 20db7c0..7ecf085 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/WxMaConstants.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/constant/WxMaConstants.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.constant; /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxAutoReplyController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxAutoReplyController.java index 2dfe087..be039de 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxAutoReplyController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxAutoReplyController.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.controller; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -25,103 +24,109 @@ import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/wxautoreply") -public class WxAutoReplyController { +public class WxAutoReplyController { - @Resource + @Resource WxAutoReplyService wxAutoReplyService; /** - * 分页查询 - * @param page 分页对象 - * @param wxAutoReply 消息自动回复 - * @return - */ + * 分页查询 + * + * @param page 分页对象 + * @param wxAutoReply 消息自动回复 + * @return + */ @GetMapping("/page") @PreAuthorize("@customSs.hasPermission('wxmp:wxautoreply:index')") public R getWxAutoReplyPage(Page page, WxAutoReply wxAutoReply) { - return R.ok(wxAutoReplyService.page(page,Wrappers.query(wxAutoReply))); + return R.ok(wxAutoReplyService.page(page, Wrappers.query(wxAutoReply))); } /** - * 通过id查询消息自动回复 - * @param id id - * @return R - */ + * 通过id查询消息自动回复 + * + * @param id id + * @return R + */ @GetMapping("/{id}") @PreAuthorize("@customSs.hasPermission('wxmp:wxautoreply:get')") - public R getById(@PathVariable("id") String id){ - return R.ok(wxAutoReplyService.getById(id)); + public R getById(@PathVariable("id") String id) { + return R.ok(wxAutoReplyService.getById(id)); } /** - * 新增消息自动回复 - * @param wxAutoReply 消息自动回复 - * @return R - */ + * 新增消息自动回复 + * + * @param wxAutoReply 消息自动回复 + * @return R + */ @PostMapping @PreAuthorize("@customSs.hasPermission('wxmp:wxautoreply:add')") - public R save(@RequestBody WxAutoReply wxAutoReply){ - this.jude(wxAutoReply); - return R.ok(wxAutoReplyService.save(wxAutoReply)); + public R save(@RequestBody WxAutoReply wxAutoReply) { + this.jude(wxAutoReply); + return R.ok(wxAutoReplyService.save(wxAutoReply)); } /** - * 修改消息自动回复 - * @param wxAutoReply 消息自动回复 - * @return R - */ + * 修改消息自动回复 + * + * @param wxAutoReply 消息自动回复 + * @return R + */ @PutMapping @PreAuthorize("@customSs.hasPermission('wxmp:wxautoreply:edit')") - public R updateById(@RequestBody WxAutoReply wxAutoReply){ - this.jude(wxAutoReply); - return R.ok(wxAutoReplyService.updateById(wxAutoReply)); + public R updateById(@RequestBody WxAutoReply wxAutoReply) { + this.jude(wxAutoReply); + return R.ok(wxAutoReplyService.updateById(wxAutoReply)); } /** - * 通过id删除消息自动回复 - * @param id id - * @return R - */ + * 通过id删除消息自动回复 + * + * @param id id + * @return R + */ @DeleteMapping("/{id}") @PreAuthorize("@customSs.hasPermission('wxmp:wxautoreply:del')") - public R removeById(@PathVariable String id){ - return R.ok(wxAutoReplyService.removeById(id)); + public R removeById(@PathVariable String id) { + return R.ok(wxAutoReplyService.removeById(id)); } - /** - * //校验参数 - * @param wxAutoReply - */ - public void jude(WxAutoReply wxAutoReply){ - if(ConfigConstant.WX_AUTO_REPLY_TYPE_2.equals(wxAutoReply.getType())){ - Wrapper queryWrapper = Wrappers.lambdaQuery() - .eq(WxAutoReply::getReqType,wxAutoReply.getReqType()); - List list = wxAutoReplyService.list(queryWrapper); - if(StringUtils.isNotBlank(wxAutoReply.getId())){ - if(list != null && list.size() == 1){ - if(!list.get(0).getId().equals(wxAutoReply.getId())){ - throw new RuntimeException("请求消息类型重复"); - } - } - if(list != null && list.size()>1){ - throw new RuntimeException("请求消息类型重复"); - } - } - } - if(ConfigConstant.WX_AUTO_REPLY_TYPE_3.equals(wxAutoReply.getType())){ - Wrapper queryWrapper = Wrappers.lambdaQuery() - .eq(WxAutoReply::getReqKey,wxAutoReply.getReqKey()) - .eq(WxAutoReply::getRepType,wxAutoReply.getRepMate()); - List list = wxAutoReplyService.list(queryWrapper); - if(list != null && list.size() == 1){ - if(!list.get(0).getId().equals(wxAutoReply.getId())){ - throw new RuntimeException("关键词重复"); - } - } - if(list != null && list.size()>1){ - throw new RuntimeException("关键词重复"); - } - } - } + /** + * //校验参数 + * + * @param wxAutoReply + */ + public void jude(WxAutoReply wxAutoReply) { + if (ConfigConstant.WX_AUTO_REPLY_TYPE_2.equals(wxAutoReply.getType())) { + Wrapper queryWrapper = Wrappers.lambdaQuery() + .eq(WxAutoReply::getReqType, wxAutoReply.getReqType()); + List list = wxAutoReplyService.list(queryWrapper); + if (StringUtils.isNotBlank(wxAutoReply.getId())) { + if (list != null && list.size() == 1) { + if (!list.get(0).getId().equals(wxAutoReply.getId())) { + throw new RuntimeException("请求消息类型重复"); + } + } + if (list != null && list.size() > 1) { + throw new RuntimeException("请求消息类型重复"); + } + } + } + if (ConfigConstant.WX_AUTO_REPLY_TYPE_3.equals(wxAutoReply.getType())) { + Wrapper queryWrapper = Wrappers.lambdaQuery() + .eq(WxAutoReply::getReqKey, wxAutoReply.getReqKey()) + .eq(WxAutoReply::getRepType, wxAutoReply.getRepMate()); + List list = wxAutoReplyService.list(queryWrapper); + if (list != null && list.size() == 1) { + if (!list.get(0).getId().equals(wxAutoReply.getId())) { + throw new RuntimeException("关键词重复"); + } + } + if (list != null && list.size() > 1) { + throw new RuntimeException("关键词重复"); + } + } + } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxDraftController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxDraftController.java index 1506318..5c7db55 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxDraftController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxDraftController.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.controller; import cn.hutool.json.JSONArray; @@ -32,98 +31,99 @@ import java.util.List; @AllArgsConstructor @RequestMapping("/wxdraft") @Api(value = "wxdraft", tags = "微信草稿箱") -public class WxDraftController { +public class WxDraftController { - @Resource - WxMpService wxService; + @Resource + WxMpService wxService; - /** - * 新增图文消息 - * - * @param data - * @return - */ - @ApiOperation(value = "新增草稿箱") - @PostMapping - @PreAuthorize("@customSs.hasPermission('wxmp:wxdraft:add')") - public R add(@RequestBody JSONObject data) throws Exception { - JSONArray jSONArray = data.getJSONArray("articles"); - List articles = jSONArray.toList(WxMpDraftArticles.class); - WxMpAddDraft wxMpAddDraft = new WxMpAddDraft(); - wxMpAddDraft.setArticles(articles); - WxMpDraftService wxMpDraftService = wxService.getDraftService(); - String rs = wxMpDraftService.addDraft(wxMpAddDraft); - return R.ok(rs); - } + /** + * 新增图文消息 + * + * @param data + * @return + */ + @ApiOperation(value = "新增草稿箱") + @PostMapping + @PreAuthorize("@customSs.hasPermission('wxmp:wxdraft:add')") + public R add(@RequestBody JSONObject data) throws Exception { + JSONArray jSONArray = data.getJSONArray("articles"); + List articles = jSONArray.toList(WxMpDraftArticles.class); + WxMpAddDraft wxMpAddDraft = new WxMpAddDraft(); + wxMpAddDraft.setArticles(articles); + WxMpDraftService wxMpDraftService = wxService.getDraftService(); + String rs = wxMpDraftService.addDraft(wxMpAddDraft); + return R.ok(rs); + } - /** - * 修改微信草稿箱 - * - * @param data - * @return - */ - @ApiOperation(value = "修改微信草稿箱") - @PutMapping - @PreAuthorize("@customSs.hasPermission('wxmp:wxdraft:edit')") - public R edit(@RequestBody JSONObject data) throws Exception { - String mediaId = data.getStr("mediaId"); - JSONArray jSONArray = data.getJSONArray("articles"); - List articles = jSONArray.toList(WxMpDraftArticles.class); - WxMpDraftService wxMpDraftService = wxService.getDraftService(); - WxMpUpdateDraft wxMpUpdateDraft = new WxMpUpdateDraft(); - wxMpUpdateDraft.setMediaId(mediaId); - int index = 0; - for (WxMpDraftArticles article : articles) { - wxMpUpdateDraft.setIndex(index); - wxMpUpdateDraft.setArticles(article); - wxMpDraftService.updateDraft(wxMpUpdateDraft); - index++; - } - return R.ok(); - } + /** + * 修改微信草稿箱 + * + * @param data + * @return + */ + @ApiOperation(value = "修改微信草稿箱") + @PutMapping + @PreAuthorize("@customSs.hasPermission('wxmp:wxdraft:edit')") + public R edit(@RequestBody JSONObject data) throws Exception { + String mediaId = data.getStr("mediaId"); + JSONArray jSONArray = data.getJSONArray("articles"); + List articles = jSONArray.toList(WxMpDraftArticles.class); + WxMpDraftService wxMpDraftService = wxService.getDraftService(); + WxMpUpdateDraft wxMpUpdateDraft = new WxMpUpdateDraft(); + wxMpUpdateDraft.setMediaId(mediaId); + int index = 0; + for (WxMpDraftArticles article : articles) { + wxMpUpdateDraft.setIndex(index); + wxMpUpdateDraft.setArticles(article); + wxMpDraftService.updateDraft(wxMpUpdateDraft); + index++; + } + return R.ok(); + } - /** - * 通过id删除微信草稿箱 - * - * @param - * @return R - */ - @ApiOperation(value = "通过id删除微信草稿箱") - @DeleteMapping - @PreAuthorize("@customSs.hasPermission('wxmp:wxdraft:del')") - public R del(String id) throws Exception { - WxMpDraftService wxMpDraftService = wxService.getDraftService(); - return R.ok(wxMpDraftService.delDraft(id)); - } + /** + * 通过id删除微信草稿箱 + * + * @param + * @return R + */ + @ApiOperation(value = "通过id删除微信草稿箱") + @DeleteMapping + @PreAuthorize("@customSs.hasPermission('wxmp:wxdraft:del')") + public R del(String id) throws Exception { + WxMpDraftService wxMpDraftService = wxService.getDraftService(); + return R.ok(wxMpDraftService.delDraft(id)); + } - /** - * 分页查询 - * - * @param page 分页对象 - * @param - * @return - */ - @ApiOperation(value = "分页查询") - @GetMapping("/page") - @PreAuthorize("@customSs.hasPermission('wxmp:wxdraft:index')") - public R getPage(Page page) throws Exception { - WxMpDraftService wxMpDraftService = wxService.getDraftService(); - int count = (int) page.getSize(); - int offset = (int) page.getCurrent() * count - count; - return R.ok(wxMpDraftService.listDraft(offset, count)); - } + /** + * 分页查询 + * + * @param page 分页对象 + * @param + * @return + */ + @ApiOperation(value = "分页查询") + @GetMapping("/page") + @PreAuthorize("@customSs.hasPermission('wxmp:wxdraft:index')") + public R getPage(Page page) throws Exception { + WxMpDraftService wxMpDraftService = wxService.getDraftService(); + int count = (int) page.getSize(); + int offset = (int) page.getCurrent() * count - count; + return R.ok(wxMpDraftService.listDraft(offset, count)); + } - /** - * 发布草稿箱 - * @param id - * @return - */ - @ApiOperation(value = "发布草稿箱") - @PostMapping("/publish/{id}") - @PreAuthorize("@customSs.hasPermission('wxmp:wxdraft:publish')") - public R publish(@PathVariable String id) throws Exception { - WxMpFreePublishService wxMpFreePublishService = wxService.getFreePublishService(); - wxMpFreePublishService.submit(id); - return R.ok(); - } + /** + * 发布草稿箱 + * + * @param id + * @return + */ + @ApiOperation(value = "发布草稿箱") + @PostMapping("/publish/{id}") + @PreAuthorize("@customSs.hasPermission('wxmp:wxdraft:publish')") + public R publish(@PathVariable String id) throws Exception { + WxMpFreePublishService wxMpFreePublishService = wxService.getFreePublishService(); + wxMpFreePublishService.submit(id); + return R.ok(); + } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxFreePublishController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxFreePublishController.java index c22a0d0..f690c05 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxFreePublishController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxFreePublishController.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxMaterialController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxMaterialController.java index decf7de..b778e37 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxMaterialController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxMaterialController.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.controller; import cn.hutool.json.JSONUtil; @@ -43,197 +42,205 @@ import java.util.Map; @RestController @AllArgsConstructor @RequestMapping("/wxmaterial") -public class WxMaterialController { +public class WxMaterialController { - @Resource - WxMpService wxService; + @Resource + WxMpService wxService; - /** - * 上传非图文微信素材 - * @param mulFile - * @param mediaType - * @return - */ - @PostMapping("/materialFileUpload") - // @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:add')") - public R materialFileUpload(@RequestParam("file") MultipartFile mulFile, - @RequestParam("title") String title, - @RequestParam("introduction") String introduction, - @RequestParam("mediaType") String mediaType) { - try { - WxMpMaterial material = new WxMpMaterial(); - material.setName(mulFile.getOriginalFilename()); - if(WxConsts.MediaFileType.VIDEO.equals(mediaType)){ - material.setVideoTitle(title); - material.setVideoIntroduction(introduction); - } - File file = FileUtils.multipartFileToFile(mulFile); - material.setFile(file); - WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); - WxMpMaterialUploadResult wxMpMaterialUploadResult = wxMpMaterialService.materialFileUpload(mediaType,material); - WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem wxMpMaterialFileBatchGetResult = new WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem(); - wxMpMaterialFileBatchGetResult.setName(file.getName()); - wxMpMaterialFileBatchGetResult.setMediaId(wxMpMaterialUploadResult.getMediaId()); - wxMpMaterialFileBatchGetResult.setUrl(wxMpMaterialUploadResult.getUrl()); - return R.ok(wxMpMaterialFileBatchGetResult); - } catch (WxErrorException e) { - log.error("上传非图文微信素材失败" + e); - return R.error(e.getMessage()); - } catch (Exception e) { - log.error("上传失败", e); - return R.error(e.getLocalizedMessage()); - } - } + /** + * 上传非图文微信素材 + * + * @param mulFile + * @param mediaType + * @return + */ + @PostMapping("/materialFileUpload") + // @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:add')") + public R materialFileUpload(@RequestParam("file") MultipartFile mulFile, + @RequestParam("title") String title, + @RequestParam("introduction") String introduction, + @RequestParam("mediaType") String mediaType) { + try { + WxMpMaterial material = new WxMpMaterial(); + material.setName(mulFile.getOriginalFilename()); + if (WxConsts.MediaFileType.VIDEO.equals(mediaType)) { + material.setVideoTitle(title); + material.setVideoIntroduction(introduction); + } + File file = FileUtils.multipartFileToFile(mulFile); + material.setFile(file); + WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); + WxMpMaterialUploadResult wxMpMaterialUploadResult = wxMpMaterialService.materialFileUpload(mediaType, material); + WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem wxMpMaterialFileBatchGetResult = new WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem(); + wxMpMaterialFileBatchGetResult.setName(file.getName()); + wxMpMaterialFileBatchGetResult.setMediaId(wxMpMaterialUploadResult.getMediaId()); + wxMpMaterialFileBatchGetResult.setUrl(wxMpMaterialUploadResult.getUrl()); + return R.ok(wxMpMaterialFileBatchGetResult); + } catch (WxErrorException e) { + log.error("上传非图文微信素材失败" + e); + return R.error(e.getMessage()); + } catch (Exception e) { + log.error("上传失败", e); + return R.error(e.getLocalizedMessage()); + } + } - /** - * 上传图文消息内的图片获取URL - * @param mulFile - * @return - */ - @PostMapping("/newsImgUpload") - // @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:add')") - public String newsImgUpload(@RequestParam("file") MultipartFile mulFile) throws Exception { - File file = FileUtils.multipartFileToFile(mulFile); - WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); - WxMediaImgUploadResult wxMediaImgUploadResult = wxMpMaterialService.mediaImgUpload(file); - Map responseData = new HashMap<>(); - responseData.put("link", wxMediaImgUploadResult.getUrl()); - return JSONUtil.toJsonStr(responseData); - } - - /** - * 通过id删除微信素材 - * @param - * @return R - */ - @DeleteMapping - @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:del')") - public R materialDel(String id){ - WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); - try { - return R.ok(wxMpMaterialService.materialDelete(id)); - } catch (WxErrorException e) { - - log.error("删除微信素材失败", e); - return R.error(e.getMessage()); - } - } - - /** - * 分页查询 - * @param page 分页对象 - * @param type - * @return - */ - @GetMapping("/page") - @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:index')") - public R getWxMaterialPage(Page page, String type) { - try { - WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); - int count = (int)page.getSize(); - int offset = (int)page.getCurrent()*count-count; - if(WxConsts.MaterialType.NEWS.equals(type)){ - return R.ok(wxMpMaterialService.materialNewsBatchGet(offset,count)); - }else{ - return R.ok(wxMpMaterialService.materialFileBatchGet(type,offset,count)); - } - } catch (WxErrorException e) { - - log.error("查询素材失败", e); - return R.error(e.getMessage()); - } - } - - /** - * 分页查询2 - * @param type - * @return - */ - @GetMapping("/page-manager") -// @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:index')") - public String getWxMaterialPageManager(Integer count, Integer offset, String type) throws WxErrorException { - List listImageManager = new ArrayList<>(); - WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); - List list = wxMpMaterialService.materialFileBatchGet(type,offset,count).getItems(); - list.forEach(wxMaterialFileBatchGetNewsItem -> { - ImageManager imageManager = new ImageManager(); - imageManager.setName(wxMaterialFileBatchGetNewsItem.getMediaId()); - imageManager.setUrl(wxMaterialFileBatchGetNewsItem.getUrl()); - imageManager.setThumb(wxMaterialFileBatchGetNewsItem.getUrl()); - listImageManager.add(imageManager); - }); - return JSONUtil.toJsonStr(listImageManager); - } - - /** - * 获取微信视频素材 - * @param - * @return R - */ - @GetMapping("/materialVideo") - @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:get')") - public R getMaterialVideo(String mediaId){ - WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); - try { - return R.ok(wxMpMaterialService.materialVideoInfo(mediaId)); - } catch (WxErrorException e) { - - log.error("获取微信视频素材失败", e); - return R.error(e.getMessage()); - } - } - - /** - * 获取微信素材直接文件 - * @param - * @return R - */ - @GetMapping("/materialOther") - @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:get')") - public ResponseEntity getMaterialOther(String mediaId, String fileName) throws Exception { - try { - WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); - //获取文件 - InputStream is = wxMpMaterialService.materialImageOrVoiceDownload(mediaId); - byte[] body = new byte[is.available()]; - is.read(body); - HttpHeaders headers = new HttpHeaders(); - //设置文件类型 - headers.add("Content-Disposition", "attchement;filename=" + URLEncoder.encode(fileName, "UTF-8")); - headers.add("Content-Type", "application/octet-stream"); - HttpStatus statusCode = HttpStatus.OK; - //返回数据 - return new ResponseEntity<>(body, headers, statusCode); - } catch (WxErrorException e) { - - log.error("获取微信素材直接文件失败", e); - return null; - } - } - - /** - * 获取微信临时素材直接文件 - * @param - * @return R - */ - @GetMapping("/tempMaterialOther") - @PreAuthorize("@customSs.hasPermission('wxmp:wxmsg:index')") - public ResponseEntity getTempMaterialOther(String mediaId, String fileName) throws Exception { + /** + * 上传图文消息内的图片获取URL + * + * @param mulFile + * @return + */ + @PostMapping("/newsImgUpload") + // @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:add')") + public String newsImgUpload(@RequestParam("file") MultipartFile mulFile) throws Exception { + File file = FileUtils.multipartFileToFile(mulFile); WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); - try (InputStream is = Files.newInputStream(wxMpMaterialService.mediaDownload(mediaId).toPath())){ - byte[] body = new byte[is.available()]; - is.read(body); - HttpHeaders headers = new HttpHeaders(); - //设置文件类型 - headers.add("Content-Disposition", "attchement;filename=" + URLEncoder.encode(fileName, "UTF-8")); - headers.add("Content-Type", "application/octet-stream"); - HttpStatus statusCode = HttpStatus.OK; - //返回数据 + WxMediaImgUploadResult wxMediaImgUploadResult = wxMpMaterialService.mediaImgUpload(file); + Map responseData = new HashMap<>(); + responseData.put("link", wxMediaImgUploadResult.getUrl()); + return JSONUtil.toJsonStr(responseData); + } + + /** + * 通过id删除微信素材 + * + * @param + * @return R + */ + @DeleteMapping + @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:del')") + public R materialDel(String id) { + WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); + try { + return R.ok(wxMpMaterialService.materialDelete(id)); + } catch (WxErrorException e) { + + log.error("删除微信素材失败", e); + return R.error(e.getMessage()); + } + } + + /** + * 分页查询 + * + * @param page 分页对象 + * @param type + * @return + */ + @GetMapping("/page") + @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:index')") + public R getWxMaterialPage(Page page, String type) { + try { + WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); + int count = (int) page.getSize(); + int offset = (int) page.getCurrent() * count - count; + if (WxConsts.MaterialType.NEWS.equals(type)) { + return R.ok(wxMpMaterialService.materialNewsBatchGet(offset, count)); + } else { + return R.ok(wxMpMaterialService.materialFileBatchGet(type, offset, count)); + } + } catch (WxErrorException e) { + + log.error("查询素材失败", e); + return R.error(e.getMessage()); + } + } + + /** + * 分页查询2 + * + * @param type + * @return + */ + @GetMapping("/page-manager") +// @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:index')") + public String getWxMaterialPageManager(Integer count, Integer offset, String type) throws WxErrorException { + List listImageManager = new ArrayList<>(); + WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); + List list = wxMpMaterialService.materialFileBatchGet(type, offset, count).getItems(); + list.forEach(wxMaterialFileBatchGetNewsItem -> { + ImageManager imageManager = new ImageManager(); + imageManager.setName(wxMaterialFileBatchGetNewsItem.getMediaId()); + imageManager.setUrl(wxMaterialFileBatchGetNewsItem.getUrl()); + imageManager.setThumb(wxMaterialFileBatchGetNewsItem.getUrl()); + listImageManager.add(imageManager); + }); + return JSONUtil.toJsonStr(listImageManager); + } + + /** + * 获取微信视频素材 + * + * @param + * @return R + */ + @GetMapping("/materialVideo") + @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:get')") + public R getMaterialVideo(String mediaId) { + WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); + try { + return R.ok(wxMpMaterialService.materialVideoInfo(mediaId)); + } catch (WxErrorException e) { + + log.error("获取微信视频素材失败", e); + return R.error(e.getMessage()); + } + } + + /** + * 获取微信素材直接文件 + * + * @param + * @return R + */ + @GetMapping("/materialOther") + @PreAuthorize("@customSs.hasPermission('wxmp:wxmaterial:get')") + public ResponseEntity getMaterialOther(String mediaId, String fileName) throws Exception { + try { + WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); + // 获取文件 + InputStream is = wxMpMaterialService.materialImageOrVoiceDownload(mediaId); + byte[] body = new byte[is.available()]; + is.read(body); + HttpHeaders headers = new HttpHeaders(); + // 设置文件类型 + headers.add("Content-Disposition", "attchement;filename=" + URLEncoder.encode(fileName, "UTF-8")); + headers.add("Content-Type", "application/octet-stream"); + HttpStatus statusCode = HttpStatus.OK; + // 返回数据 return new ResponseEntity<>(body, headers, statusCode); - } catch (WxErrorException e) { - - log.error("获取微信素材直接文件失败", e); - return null; - } - } + } catch (WxErrorException e) { + + log.error("获取微信素材直接文件失败", e); + return null; + } + } + + /** + * 获取微信临时素材直接文件 + * + * @param + * @return R + */ + @GetMapping("/tempMaterialOther") + @PreAuthorize("@customSs.hasPermission('wxmp:wxmsg:index')") + public ResponseEntity getTempMaterialOther(String mediaId, String fileName) throws Exception { + WxMpMaterialService wxMpMaterialService = wxService.getMaterialService(); + try (InputStream is = Files.newInputStream(wxMpMaterialService.mediaDownload(mediaId).toPath())) { + byte[] body = new byte[is.available()]; + is.read(body); + HttpHeaders headers = new HttpHeaders(); + // 设置文件类型 + headers.add("Content-Disposition", "attchement;filename=" + URLEncoder.encode(fileName, "UTF-8")); + headers.add("Content-Type", "application/octet-stream"); + HttpStatus statusCode = HttpStatus.OK; + // 返回数据 + return new ResponseEntity<>(body, headers, statusCode); + } catch (WxErrorException e) { + + log.error("获取微信素材直接文件失败", e); + return null; + } + } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxMenuController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxMenuController.java index f8c2f1c..2d2f59b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxMenuController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxMenuController.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.controller; import cn.hutool.json.JSONObject; @@ -25,40 +24,40 @@ import javax.annotation.Resource; @RequestMapping("/wxmenu") public class WxMenuController { - @Resource + @Resource WxMenuService wxMenuService; - /** - * 通过appId查询自定义菜单 - * - * @return R - */ - @GetMapping("/list") - @PreAuthorize("@customSs.hasPermission('wxmp:wxmenu:get')") - public R getWxMenuButton() { - return R.ok(wxMenuService.getWxMenuButton()); - } + /** + * 通过appId查询自定义菜单 + * + * @return R + */ + @GetMapping("/list") + @PreAuthorize("@customSs.hasPermission('wxmp:wxmenu:get')") + public R getWxMenuButton() { + return R.ok(wxMenuService.getWxMenuButton()); + } - /** - * 保存并发布菜单 - * - * @param - * @return R - */ - @PostMapping("/release") - @PreAuthorize("@customSs.hasPermission('wxmp:wxmenu:add')") - public R saveAndRelease(@RequestBody String data) { - JSONObject jSONObject = JSONUtil.parseObj(data); - String strWxMenu = jSONObject.getStr("strWxMenu"); - String appId = jSONObject.getStr("appId"); - try { - wxMenuService.saveAndRelease(strWxMenu); - return R.ok(); - } catch (WxErrorException e) { - - log.error("发布自定义菜单失败appID:" + appId + ":" + e.getMessage()); - return R.error(e.getMessage()); - } - } + /** + * 保存并发布菜单 + * + * @param + * @return R + */ + @PostMapping("/release") + @PreAuthorize("@customSs.hasPermission('wxmp:wxmenu:add')") + public R saveAndRelease(@RequestBody String data) { + JSONObject jSONObject = JSONUtil.parseObj(data); + String strWxMenu = jSONObject.getStr("strWxMenu"); + String appId = jSONObject.getStr("appId"); + try { + wxMenuService.saveAndRelease(strWxMenu); + return R.ok(); + } catch (WxErrorException e) { + + log.error("发布自定义菜单失败appID:" + appId + ":" + e.getMessage()); + return R.error(e.getMessage()); + } + } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxMsgController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxMsgController.java index d90bc9e..160dbe8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxMsgController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxMsgController.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.controller; import cn.hutool.json.JSONArray; @@ -67,7 +66,7 @@ public class WxMsgController { if (StringUtils.isNotBlank(wxMsgVO.getNotInRepType())) { return R.ok(wxMsgService.listWxMsgMapGroup(page, wxMsgVO)); } - //标记为已读 + // 标记为已读 if (StringUtils.isNotBlank(wxMsgVO.getWxUserId())) { WxMsg wxMsg = new WxMsg(); wxMsg.setReadFlag(CommonConstants.YES); @@ -100,7 +99,7 @@ public class WxMsgController { public R save(@RequestBody WxMsg wxMsg) { try { WxUser wxUser = wxUserService.getById(wxMsg.getWxUserId()); - //入库 + // 入库 wxMsg.setNickName(wxUser.getNickName()); wxMsg.setHeadimgUrl(wxUser.getHeadimgUrl()); wxMsg.setCreateTime(LocalDateTime.now()); @@ -111,7 +110,7 @@ public class WxMsgController { wxMpKefuMessage = WxMpKefuMessage.TEXT().build(); wxMpKefuMessage.setContent(wxMsg.getRepContent()); } - if (WxConsts.KefuMsgType.IMAGE.equals(wxMsg.getRepType())) {//图片 + if (WxConsts.KefuMsgType.IMAGE.equals(wxMsg.getRepType())) {// 图片 wxMsg.setRepName(wxMsg.getRepName()); wxMsg.setRepUrl(wxMsg.getRepUrl()); wxMsg.setRepMediaId(wxMsg.getRepMediaId()); diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPortalController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPortalController.java index 3729cfa..706975d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPortalController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPortalController.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.controller; import lombok.AllArgsConstructor; @@ -24,7 +23,7 @@ public class WxPortalController { private final WxMpService wxService; //@Resource - //private final WxMpMessageRouter messageRouter; + // private final WxMpMessageRouter messageRouter; @GetMapping(produces = "text/plain;charset=utf-8") public String authGet(@PathVariable String appid, @@ -34,7 +33,7 @@ public class WxPortalController { @RequestParam(name = "echostr", required = false) String echostr) { log.info("\n接收到来自微信服务器的认证消息：[{}, {}, {}, {}]", signature, - timestamp, nonce, echostr); + timestamp, nonce, echostr); if (StringUtils.isAnyBlank(signature, timestamp, nonce, echostr)) { throw new IllegalArgumentException("请求参数非法，请核实!"); } @@ -60,8 +59,8 @@ public class WxPortalController { @RequestParam(name = "encrypt_type", required = false) String encType, @RequestParam(name = "msg_signature", required = false) String msgSignature) { log.info("\n接收微信请求：[openid=[{}], [signature=[{}], encType=[{}], msgSignature=[{}]," - + " timestamp=[{}], nonce=[{}], requestBody=[\n{}\n] ", - openid, signature, encType, msgSignature, timestamp, nonce, requestBody); + + " timestamp=[{}], nonce=[{}], requestBody=[\n{}\n] ", + openid, signature, encType, msgSignature, timestamp, nonce, requestBody); if (!this.wxService.switchover(appid)) { throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", appid)); @@ -84,7 +83,7 @@ public class WxPortalController { } else if ("aes".equalsIgnoreCase(encType)) { // aes加密的消息 WxMpXmlMessage inMessage = WxMpXmlMessage.fromEncryptedXml(requestBody, wxService.getWxMpConfigStorage(), - timestamp, nonce, msgSignature); + timestamp, nonce, msgSignature); log.debug("\n消息解密后内容为：\n{} ", inMessage.toString()); WxMpXmlOutMessage outMessage = this.route(inMessage); if (outMessage == null) { @@ -99,7 +98,7 @@ public class WxPortalController { } private WxMpXmlOutMessage route(WxMpXmlMessage message) { - //try { + // try { // return this.messageRouter.route(message); //} catch (Exception e) { // log.error("路由消息时出现异常！", e); diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxSummaryController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxSummaryController.java index fd06302..d476206 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxSummaryController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxSummaryController.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.controller; import com.starry.common.result.R; @@ -45,11 +44,11 @@ public class WxSummaryController { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); return R.ok(wxMpDataCubeService.getUserSummary(sdf.parse(startDate), sdf.parse(endDate))); } catch (WxErrorException e) { - + log.error("获取用户增减数据失败", e); return R.error(e.getMessage()); } catch (Exception e) { - + log.error("获取用户增减数据失败", e); return R.error("获取用户增减数据失败"); } @@ -71,11 +70,11 @@ public class WxSummaryController { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); return R.ok(wxMpDataCubeService.getUserCumulate(sdf.parse(startDate), sdf.parse(endDate))); } catch (WxErrorException e) { - + log.error("获取累计用户数据失败", e); return R.error(e.getMessage()); } catch (Exception e) { - + log.error("获取用户增减数据失败", e); return R.error("获取用户增减数据失败"); } @@ -97,11 +96,11 @@ public class WxSummaryController { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); return R.ok(wxMpDataCubeService.getInterfaceSummary(sdf.parse(startDate), sdf.parse(endDate))); } catch (WxErrorException e) { - + log.error("获取接口分析数据失败", e); return R.error(e.getMessage()); } catch (Exception e) { - + log.error("获取接口分析数据失败", e); return R.error("获取接口分析数据失败"); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxUserController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxUserController.java index 916765a..3300eca 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxUserController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxUserController.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.controller; import cn.hutool.core.util.StrUtil; @@ -122,7 +121,7 @@ public class WxUserController { wxUserService.synchroWxUser(); return R.ok(); } catch (WxErrorException e) { - + log.error("同步微信用户失败", e); return R.error(e.getMessage()); } @@ -140,7 +139,7 @@ public class WxUserController { try { return R.ok(wxUserService.updateRemark(wxUser)); } catch (WxErrorException e) { - + log.error("修改微信用户备注失败", e); return R.error(e.getMessage()); } @@ -166,7 +165,7 @@ public class WxUserController { } return R.ok(); } catch (WxErrorException e) { - + log.error("修改微信用户备注失败", e); return R.error(e.getMessage()); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxUserTagsController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxUserTagsController.java index 6f8928e..b7a6d69 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxUserTagsController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxUserTagsController.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.controller; import cn.hutool.json.JSONObject; @@ -32,124 +31,129 @@ import java.util.List; @RequestMapping("/wxusertags") public class WxUserTagsController { - @Resource - WxMpService wxService; + @Resource + WxMpService wxService; - @Resource + @Resource WxUserService wxUserService; - /** - * 获取微信用户标签 - * @return - */ - @PreAuthorize("@customSs.hasPermission('wxmp:wxusertags:list')") - @GetMapping("/list") - public R getWxUserList(String appId) { - WxMpUserTagService wxMpUserTagService = wxService.getUserTagService(); - try { - List listWxUserTag = wxMpUserTagService.tagGet(); - return R.ok(listWxUserTag); - } catch (WxErrorException e) { - - log.error("获取微信用户标签失败", e); - return R.error(e.getMessage()); - } - } + /** + * 获取微信用户标签 + * + * @return + */ + @PreAuthorize("@customSs.hasPermission('wxmp:wxusertags:list')") + @GetMapping("/list") + public R getWxUserList(String appId) { + WxMpUserTagService wxMpUserTagService = wxService.getUserTagService(); + try { + List listWxUserTag = wxMpUserTagService.tagGet(); + return R.ok(listWxUserTag); + } catch (WxErrorException e) { - /** - * 获取微信用户标签字典 - * @param appId - * @return - */ - @PreAuthorize("@customSs.hasPermission('wxmp:wxusertags:list')") - @GetMapping("/dict") - public R getWxUserTagsDict(String appId) { - WxMpUserTagService wxMpUserTagService = wxService.getUserTagService(); - try { - List listWxUserTag = wxMpUserTagService.tagGet(); - List listWxUserTagsDict = new ArrayList<>(); - WxUserTagsDict wxUserTagsDict; - for(WxUserTag wxUserTag : listWxUserTag){ - wxUserTagsDict = new WxUserTagsDict(); - wxUserTagsDict.setName(wxUserTag.getName()); - wxUserTagsDict.setValue(wxUserTag.getId()); - listWxUserTagsDict.add(wxUserTagsDict); - } - return R.ok(listWxUserTagsDict); - } catch (WxErrorException e) { - - log.error("获取微信用户标签字典失败", e); - return R.error(e.getMessage()); - } - } + log.error("获取微信用户标签失败", e); + return R.error(e.getMessage()); + } + } - /** - * 新增微信用户标签 - * @return - */ - @PreAuthorize("@customSs.hasPermission('wxmp:wxusertags:add')") - @PostMapping - public R save(@RequestBody JSONObject data){ - String appId = data.getStr("appId"); - String name = data.getStr("name"); - WxMpUserTagService wxMpUserTagService = wxService.getUserTagService(); - try { - return R.ok(wxMpUserTagService.tagCreate(name)); - } catch (WxErrorException e) { - - log.error("新增微信用户标签失败", e); - return R.error(e.getMessage()); - } - } + /** + * 获取微信用户标签字典 + * + * @param appId + * @return + */ + @PreAuthorize("@customSs.hasPermission('wxmp:wxusertags:list')") + @GetMapping("/dict") + public R getWxUserTagsDict(String appId) { + WxMpUserTagService wxMpUserTagService = wxService.getUserTagService(); + try { + List listWxUserTag = wxMpUserTagService.tagGet(); + List listWxUserTagsDict = new ArrayList<>(); + WxUserTagsDict wxUserTagsDict; + for (WxUserTag wxUserTag : listWxUserTag) { + wxUserTagsDict = new WxUserTagsDict(); + wxUserTagsDict.setName(wxUserTag.getName()); + wxUserTagsDict.setValue(wxUserTag.getId()); + listWxUserTagsDict.add(wxUserTagsDict); + } + return R.ok(listWxUserTagsDict); + } catch (WxErrorException e) { - /** - * 修改微信用户标签 - * @return - */ - @PreAuthorize("@customSs.hasPermission('wxmp:wxusertags:edit')") - @PutMapping - public R updateById(@RequestBody JSONObject data){ - String appId = data.getStr("appId"); - Long id = data.getLong("id"); - String name = data.getStr("name"); - WxMpUserTagService wxMpUserTagService = wxService.getUserTagService(); - try { - return R.ok(wxMpUserTagService.tagUpdate(id,name)); - } catch (WxErrorException e) { - - log.error("修改微信用户标签失败", e); - return R.error(e.getMessage()); - } - } + log.error("获取微信用户标签字典失败", e); + return R.error(e.getMessage()); + } + } - /** - * 删除微信用户标签 - * @param id - * @param appId - * @return - */ - @PreAuthorize("@customSs.hasPermission('wxmp:wxusertags:del')") - @DeleteMapping - public R removeById(Long id,String appId){ - int count = (int) wxUserService.count(Wrappers.lambdaQuery() - .and(wrapper -> wrapper - .eq(WxUser::getTagidList,"["+id+"]") - .or() - .like(WxUser::getTagidList,","+id+",") - .or() - .likeRight(WxUser::getTagidList,"["+id+",") - .or() - .likeLeft(WxUser::getTagidList,","+id+"]"))); - if(count>0){ - return R.error("该标签下有用户存在，无法删除"); - } - WxMpUserTagService wxMpUserTagService = wxService.getUserTagService(); - try { - return R.ok(wxMpUserTagService.tagDelete(id)); - } catch (WxErrorException e) { - - log.error("删除微信用户标签失败", e); - return R.error(e.getMessage()); - } - } + /** + * 新增微信用户标签 + * + * @return + */ + @PreAuthorize("@customSs.hasPermission('wxmp:wxusertags:add')") + @PostMapping + public R save(@RequestBody JSONObject data) { + String appId = data.getStr("appId"); + String name = data.getStr("name"); + WxMpUserTagService wxMpUserTagService = wxService.getUserTagService(); + try { + return R.ok(wxMpUserTagService.tagCreate(name)); + } catch (WxErrorException e) { + + log.error("新增微信用户标签失败", e); + return R.error(e.getMessage()); + } + } + + /** + * 修改微信用户标签 + * + * @return + */ + @PreAuthorize("@customSs.hasPermission('wxmp:wxusertags:edit')") + @PutMapping + public R updateById(@RequestBody JSONObject data) { + String appId = data.getStr("appId"); + Long id = data.getLong("id"); + String name = data.getStr("name"); + WxMpUserTagService wxMpUserTagService = wxService.getUserTagService(); + try { + return R.ok(wxMpUserTagService.tagUpdate(id, name)); + } catch (WxErrorException e) { + + log.error("修改微信用户标签失败", e); + return R.error(e.getMessage()); + } + } + + /** + * 删除微信用户标签 + * + * @param id + * @param appId + * @return + */ + @PreAuthorize("@customSs.hasPermission('wxmp:wxusertags:del')") + @DeleteMapping + public R removeById(Long id, String appId) { + int count = (int) wxUserService.count(Wrappers.lambdaQuery() + .and(wrapper -> wrapper + .eq(WxUser::getTagidList, "[" + id + "]") + .or() + .like(WxUser::getTagidList, "," + id + ",") + .or() + .likeRight(WxUser::getTagidList, "[" + id + ",") + .or() + .likeLeft(WxUser::getTagidList, "," + id + "]"))); + if (count > 0) { + return R.error("该标签下有用户存在，无法删除"); + } + WxMpUserTagService wxMpUserTagService = wxService.getUserTagService(); + try { + return R.ok(wxMpUserTagService.tagDelete(id)); + } catch (WxErrorException e) { + + log.error("删除微信用户标签失败", e); + return R.error(e.getMessage()); + } + } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/CustomWxMpProperties.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/CustomWxMpProperties.java index aa61bac..a779b76 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/CustomWxMpProperties.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/CustomWxMpProperties.java @@ -2,28 +2,31 @@ package com.starry.admin.modules.weichat.entity; import lombok.Data; +/** + * @author admin + */ @Data public class CustomWxMpProperties { /** * 微信APPID */ - public String appid; + public String appid = "wx917f3f747c7dc5dd"; /** * 微信公众号的app secret */ - public String secret; + public String secret = "85012dec2ba8bdc9d0174dd800ef1dec"; /** * 微信公众号的token */ - public String token; + public String token = "AkzAW8yqUhOWAFN550"; /** * 微信公众号的EncodingAESKey */ - public String aesKey; + public String aesKey = "tsoM88UUQ5uEHJ29xgNiaHHaoswZapS5ijWpaN6hUZF"; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/ImageManager.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/ImageManager.java index ad33435..6d75ef3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/ImageManager.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/ImageManager.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.entity; import lombok.Data; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/Menu.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/Menu.java index ad2c6de..a135203 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/Menu.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/Menu.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.entity; import cn.hutool.json.JSONUtil; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/MenuButton.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/MenuButton.java index e404c09..7b66143 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/MenuButton.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/MenuButton.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.entity; import cn.hutool.json.JSONObject; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/ThirdSession.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/ThirdSession.java index 640dcb9..427360d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/ThirdSession.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/ThirdSession.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.entity; import lombok.Data; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxAutoReply.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxAutoReply.java index 77ca68d..3c96803 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxAutoReply.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxAutoReply.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.entity; import cn.hutool.json.JSONObject; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxMenu.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxMenu.java index a479e50..352bb48 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxMenu.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxMenu.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.entity; import cn.hutool.json.JSONObject; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxMsg.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxMsg.java index 454d840..eb6b0f2 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxMsg.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxMsg.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.entity; import cn.hutool.json.JSONObject; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxMsgVO.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxMsgVO.java index 955fbac..634ecaa 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxMsgVO.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxMsgVO.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.entity; import lombok.Data; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxOpenDataDTO.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxOpenDataDTO.java index e7f996a..c8e3702 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxOpenDataDTO.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxOpenDataDTO.java @@ -4,6 +4,7 @@ import lombok.Data; /** * 微信开发数据 + * * @author admin */ @Data diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUser.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUser.java index 0aa32e6..47ebe84 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUser.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUser.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.entity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUserTagsDict.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUserTagsDict.java index 79eaff2..c328331 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUserTagsDict.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxUserTagsDict.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.entity; import lombok.Data; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/AbstractHandler.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/AbstractHandler.java index 430bd4f..f21e11a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/AbstractHandler.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/AbstractHandler.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.handler; import me.chanjar.weixin.mp.api.WxMpMessageHandler; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/KfSessionHandler.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/KfSessionHandler.java index 1d45210..f77df09 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/KfSessionHandler.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/KfSessionHandler.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.handler; import me.chanjar.weixin.common.session.WxSessionManager; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/LocationHandler.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/LocationHandler.java index e9790a7..03ef33d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/LocationHandler.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/LocationHandler.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.handler; import com.starry.admin.modules.weichat.builder.TextBuilder; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/LogHandler.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/LogHandler.java index d497176..ccfe889 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/LogHandler.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/LogHandler.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.handler; import cn.hutool.core.util.StrUtil; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/MenuHandler.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/MenuHandler.java index e9cf73d..f1a3af7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/MenuHandler.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/MenuHandler.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.handler; import cn.hutool.json.JSONObject; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/MsgHandler.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/MsgHandler.java index 32de0b3..012e359 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/MsgHandler.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/MsgHandler.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.handler; import cn.hutool.json.JSONObject; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/NullHandler.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/NullHandler.java index c61687b..3266d9b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/NullHandler.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/NullHandler.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.handler; import me.chanjar.weixin.common.session.WxSessionManager; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/ScanHandler.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/ScanHandler.java index ed8994e..843a49e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/ScanHandler.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/ScanHandler.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.handler; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/StoreCheckNotifyHandler.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/StoreCheckNotifyHandler.java index 6f6347a..1a8a486 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/StoreCheckNotifyHandler.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/StoreCheckNotifyHandler.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.handler; import me.chanjar.weixin.common.session.WxSessionManager; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/SubscribeHandler.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/SubscribeHandler.java index da1b133..84d74c8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/SubscribeHandler.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/SubscribeHandler.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.handler; import cn.hutool.json.JSONUtil; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/UnsubscribeHandler.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/UnsubscribeHandler.java index 3b63fa1..4492ed4 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/UnsubscribeHandler.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/handler/UnsubscribeHandler.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.handler; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxAutoReplyMapper.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxAutoReplyMapper.java index a27736f..724af31 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxAutoReplyMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxAutoReplyMapper.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.mapper; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxMenuMapper.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxMenuMapper.java index 6b3d2bd..7be061e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxMenuMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxMenuMapper.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxMsgMapper.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxMsgMapper.java index 22fc8ff..f1021c1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxMsgMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxMsgMapper.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.mapper; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxUserMapper.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxUserMapper.java index 7467da9..12cbc63 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxUserMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/mapper/WxUserMapper.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxAutoReplyService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxAutoReplyService.java index d7bdcaf..4756ff8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxAutoReplyService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxAutoReplyService.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxMenuService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxMenuService.java index 28b3a55..e2ade35 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxMenuService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxMenuService.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxMpApi.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxMpApi.java index 80ef20a..732c5a3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxMpApi.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxMpApi.java @@ -65,7 +65,7 @@ public class WxMpApi { return mpService.getOAuth2Service().buildAuthorizationUrl(url, "snsapi_userinfo", "mystate"); } - //public String oauth2Callback(String code, String appId) { + // public String oauth2Callback(String code, String appId) { // if (StringUtils.isEmpty(code)) { // throw new RuntimeException("授权码不能为空"); // } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxMsgService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxMsgService.java index 0e06b87..ee716e6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxMsgService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxMsgService.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.service; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxAutoReplyServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxAutoReplyServiceImpl.java index 69b5768..72ec61d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxAutoReplyServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxAutoReplyServiceImpl.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxMenuServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxMenuServiceImpl.java index 08c47aa..3a0efc4 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxMenuServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxMenuServiceImpl.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxMsgServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxMsgServiceImpl.java index feeae0a..3b3d07b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxMsgServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxMsgServiceImpl.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxUserServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxUserServiceImpl.java index 1be917f..c45d50b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxUserServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/impl/WxUserServiceImpl.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/FileUtils.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/FileUtils.java index 7de6a47..3228006 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/FileUtils.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/FileUtils.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.utils; import cn.hutool.core.lang.UUID; @@ -12,6 +11,7 @@ import java.nio.file.Files; /** * file工具 + * * @author admin */ public class FileUtils { diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/JsonUtils.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/JsonUtils.java index 3f95245..5739ced 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/JsonUtils.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/JsonUtils.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.utils; import com.google.gson.Gson; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/LocalDateTimeUtils.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/LocalDateTimeUtils.java index f34393d..27098df 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/LocalDateTimeUtils.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/LocalDateTimeUtils.java @@ -1,4 +1,3 @@ - package com.starry.admin.modules.weichat.utils; import java.time.Instant; @@ -10,6 +9,7 @@ import java.time.temporal.ChronoField; /** * LocalDateTime时间工具 + * * @author admin */ public class LocalDateTimeUtils { diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/WxMpPropertiesUtils.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/WxMpPropertiesUtils.java index cbaff66..b70f37d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/WxMpPropertiesUtils.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/utils/WxMpPropertiesUtils.java @@ -12,12 +12,6 @@ public class WxMpPropertiesUtils { private static ISysTenantService tenantService; - - @Autowired - public void setTenantService(ISysTenantService tenantService) { - WxMpPropertiesUtils.tenantService = tenantService; - } - public static CustomWxMpProperties getWeiChatProperties() { CustomWxMpProperties properties = new CustomWxMpProperties(); String tenantId = CustomSecurityContextHolder.getTenantId(); @@ -46,4 +40,9 @@ public class WxMpPropertiesUtils { return properties; } + @Autowired + public void setTenantService(ISysTenantService tenantService) { + WxMpPropertiesUtils.tenantService = tenantService; + } + } diff --git a/play-admin/src/main/resources/mapper/order/OrderDetailsInfoMapper.xml b/play-admin/src/main/resources/mapper/order/OrderDetailsInfoMapper.xml index 138c5e0..01a78cf 100644 --- a/play-admin/src/main/resources/mapper/order/OrderDetailsInfoMapper.xml +++ b/play-admin/src/main/resources/mapper/order/OrderDetailsInfoMapper.xml @@ -3,23 +3,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - + + + + + + + + + + + - select id, order_id, commodity_id, commodity_type, commodity_money, remake, updated_by, created_time, created_by, deleted, version + select id, + order_id, + commodity_id, + commodity_type, + commodity_money, + remake, + updated_by, + created_time, + created_by, + deleted, + version from order_details_info @@ -32,9 +41,7 @@ - - \ No newline at end of file diff --git a/play-admin/src/main/resources/mapper/system/SysUserMapper.xml b/play-admin/src/main/resources/mapper/system/SysUserMapper.xml index ba64e45..f8ba997 100644 --- a/play-admin/src/main/resources/mapper/system/SysUserMapper.xml +++ b/play-admin/src/main/resources/mapper/system/SysUserMapper.xml @@ -70,21 +70,21 @@ select a.*, - b.count_msg + b.count_msg from wx_msg as a - right join + right join (select `wx_user_id`, - max(`create_time`) as maxtime, - count(`wx_user_id`) as count_msg - from wx_msg + max(`create_time`) as maxtime, + count(`wx_user_id`) as count_msg + from wx_msg AND `type` = #{query.type} @@ -29,7 +29,7 @@ group by `wx_user_id`) as b on a.`wx_user_id` = b.`wx_user_id` - and a.`create_time` = b.maxtime + and a.`create_time` = b.maxtime order by a.`create_time` desc ; diff --git a/play-admin/src/main/resources/spy.properties b/play-admin/src/main/resources/spy.properties index 0387344..6e093b2 100644 --- a/play-admin/src/main/resources/spy.properties +++ b/play-admin/src/main/resources/spy.properties @@ -1,31 +1,21 @@ #3.2.1以上使用modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory - # 自定义日志打印 logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger - #日志输出到控制台 appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger - # 使用日志系统记录 sql #appender=com.p6spy.engine.spy.appender.Slf4JLogger - # 设置 p6spy driver 代理 deregisterdrivers=true - # 取消JDBC URL前缀 useprefix=true - # 配置记录 Log 例外,可去掉的结果集error,info,batch,debug,statement,commit,rollback,result,resultset. excludecategories=info,debug,result,commit,resultset - # 日期格式 dateformat=yyyy-MM-dd HH:mm:ss - # 实际驱动可多个 #driverlist=org.h2.Driver - # 是否开启慢SQL记录 outagedetection=true - # 慢SQL记录标准 2 秒 outagedetectioninterval=2 \ No newline at end of file diff --git a/play-common/src/main/java/com/starry/common/domain/BasePageEntity.java b/play-common/src/main/java/com/starry/common/domain/BasePageEntity.java index 728e2ae..c475399 100644 --- a/play-common/src/main/java/com/starry/common/domain/BasePageEntity.java +++ b/play-common/src/main/java/com/starry/common/domain/BasePageEntity.java @@ -2,15 +2,12 @@ package com.starry.common.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.Version; import lombok.Data; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Transient; import java.io.Serializable; import java.util.Date; -import java.util.Map; /** * @author admin @@ -31,7 +28,7 @@ public class BasePageEntity implements Serializable { private Boolean deleted = Boolean.FALSE; @TableField(fill = FieldFill.INSERT) - private Long createdBy; + private String createdBy; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @@ -41,16 +38,7 @@ public class BasePageEntity implements Serializable { private Date updatedTime; @TableField(fill = FieldFill.UPDATE) - private Long updatedBy; - - @Version - private Long version; - - /** - * 搜索值 - */ - @TableField(exist = false) - private String searchValue; + private String updatedBy; /** * 开始日期 @@ -63,11 +51,5 @@ public class BasePageEntity implements Serializable { */ @TableField(exist = false) private String endTime; - - /** - * 请求参数 - */ - @Transient - @TableField(exist = false) - private Map params; } + diff --git a/play-common/src/main/java/com/starry/common/result/IBaseEnum.java b/play-common/src/main/java/com/starry/common/result/IBaseEnum.java index 78db2b6..2b7fc86 100644 --- a/play-common/src/main/java/com/starry/common/result/IBaseEnum.java +++ b/play-common/src/main/java/com/starry/common/result/IBaseEnum.java @@ -7,13 +7,11 @@ public interface IBaseEnum { /** * 获取枚举值 - * */ int getCode(); /** * 获取枚举描述 - * */ String getMessage(); } diff --git a/play-common/src/main/java/com/starry/common/sensitive/Sensitive.java b/play-common/src/main/java/com/starry/common/sensitive/Sensitive.java index dd6f5bf..9b5d7b3 100644 --- a/play-common/src/main/java/com/starry/common/sensitive/Sensitive.java +++ b/play-common/src/main/java/com/starry/common/sensitive/Sensitive.java @@ -12,7 +12,6 @@ import java.lang.annotation.Target; * 脱敏注解 * * @author admin - * **/ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/play-common/src/main/java/com/starry/common/sensitive/SensitiveSerialize.java b/play-common/src/main/java/com/starry/common/sensitive/SensitiveSerialize.java index 456c2a9..15f452e 100644 --- a/play-common/src/main/java/com/starry/common/sensitive/SensitiveSerialize.java +++ b/play-common/src/main/java/com/starry/common/sensitive/SensitiveSerialize.java @@ -14,7 +14,7 @@ import java.util.Objects; /** * @author admin - * + *

* 脱敏序列化 */ @NoArgsConstructor diff --git a/play-common/src/main/java/com/starry/common/sensitive/SensitiveUtils.java b/play-common/src/main/java/com/starry/common/sensitive/SensitiveUtils.java index 60ae016..7b7365d 100644 --- a/play-common/src/main/java/com/starry/common/sensitive/SensitiveUtils.java +++ b/play-common/src/main/java/com/starry/common/sensitive/SensitiveUtils.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil; /** * 数据脱敏工具类 * - * @author admin + * @author admin * @since 2021/7/19 16:21 */ public class SensitiveUtils { diff --git a/play-common/src/main/java/com/starry/common/utils/ServletUtils.java b/play-common/src/main/java/com/starry/common/utils/ServletUtils.java index d59b282..7300029 100644 --- a/play-common/src/main/java/com/starry/common/utils/ServletUtils.java +++ b/play-common/src/main/java/com/starry/common/utils/ServletUtils.java @@ -101,7 +101,7 @@ public class ServletUtils { response.setCharacterEncoding("utf-8"); response.getWriter().print(string); } catch (IOException e) { - + } } diff --git a/play-generator/src/main/java/com/starry/generator/utils/GenUtils.java b/play-generator/src/main/java/com/starry/generator/utils/GenUtils.java index 75c6eb5..91e0e5d 100644 --- a/play-generator/src/main/java/com/starry/generator/utils/GenUtils.java +++ b/play-generator/src/main/java/com/starry/generator/utils/GenUtils.java @@ -49,7 +49,7 @@ public class GenUtils { * 批量替换前缀 * * @param replacement 替换值 - * @param searchList 替换列表 + * @param searchList 替换列表 * @return */ public static String replaceFirst(String replacement, String[] searchList) { diff --git a/play-generator/src/main/java/com/starry/generator/utils/VelocityUtils.java b/play-generator/src/main/java/com/starry/generator/utils/VelocityUtils.java index 21cfb30..d500dbc 100644 --- a/play-generator/src/main/java/com/starry/generator/utils/VelocityUtils.java +++ b/play-generator/src/main/java/com/starry/generator/utils/VelocityUtils.java @@ -148,9 +148,7 @@ public class VelocityUtils { */ public static void addDicts(Set dicts, List columns) { for (GenTableColumnEntity column : columns) { - if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny( - column.getHtmlType(), - new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) { + if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(column.getHtmlType(), new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) { dicts.add("'" + column.getDictType() + "'"); } } @@ -206,8 +204,7 @@ public class VelocityUtils { * @return 上级菜单ID字段 */ public static String getParentMenuId(JSONObject paramsObj) { - if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) - && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) { + if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) { return paramsObj.getString(GenConstants.PARENT_MENU_ID); } return DEFAULT_PARENT_MENU_ID; @@ -317,8 +314,8 @@ public class VelocityUtils { String mybatisPath = MYBATIS_PATH + "/" + moduleName; String vuePath = "vue"; - if (template.contains("domain.java.vm")) { - fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); + if (template.contains("entity.java.vm")) { + fileName = StringUtils.format("{}/module/entity/{}Entity.java", javaPath, className); } else if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTableEntity.getTplCategory())) { fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTableEntity.getSubTable().getClassName()); } else if (template.contains("mapper.java.vm")) { diff --git a/play-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/play-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 253c481..8ed6301 100644 --- a/play-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/play-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -46,9 +46,26 @@ - select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, - package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, - created_by, created_time, updated_by, updated_time from gen_table + select table_id, + table_name, + table_comment, + sub_table_name, + sub_table_fk_name, + class_name, + tpl_category, + package_name, + module_name, + business_name, + function_name, + function_author, + gen_type, + gen_path, + options, + created_by, + created_time, + updated_by, + updated_time + from gen_table