From 171c4d17306ea4b43afe65014ccbcce6ba9eefa6 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期一, 08 四月 2024 17:26:59 +0800
Subject: [PATCH] 4.8
---
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/VersionMapper.xml | 37 ++++++
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/VersionAddDto.java | 0
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/VersionServiceImpl.java | 26 ++++
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/entity/Version.java | 89 ++++++++++++++
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/IVersionService.java | 18 +++
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CounsellingOrderServiceImpl.java | 2
guns/src/main/java/cn/stylefeng/guns/modular/business/controller/VersionController.java | 135 ++++++++++++++++++++++
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java | 11 +
roses/kernel-d-im/im-sdk-rongcloud/src/main/java/cn/stylefeng/roses/kernel/im/rongcloud/RongCloudImServer.java | 1
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/VersionMapper.java | 19 +++
10 files changed, 337 insertions(+), 1 deletions(-)
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/VersionAddDto.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/VersionAddDto.java
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/dto/VersionAddDto.java
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/entity/Version.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/entity/Version.java
new file mode 100644
index 0000000..f555407
--- /dev/null
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/entity/Version.java
@@ -0,0 +1,89 @@
+package cn.stylefeng.guns.modular.business.entity;
+
+import java.util.Date;
+
+import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
+import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-04-07
+ */
+@Data
+@TableName("t_version")
+@ApiModel(value = "")
+public class Version extends BaseRequest {
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value="id", type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "")
+ @ChineseDescription("")
+ private Long id;
+ @ApiModelProperty(value = "版本号")
+ @ChineseDescription("")
+ private String version;
+ @TableField("create_time")
+ @ApiModelProperty(value = "")
+ @ChineseDescription("")
+ private Date createTime;
+ @TableField("create_user")
+ @ApiModelProperty(value = "")
+ @ChineseDescription("")
+ private Long createUser;
+ @TableField("create_name")
+ private String createName;
+ /**
+ * 删除状态 是否删除 1-是，0-否
+ */
+ @TableField("is_delete")
+ @ApiModelProperty(value = "删除状态 是否删除 1-是，0-否")
+ @ChineseDescription("删除状态 是否删除 1-是，0-否")
+ private Integer isDelete;
+ /**
+ * 更新人
+ */
+ @TableField("update_user")
+ @ApiModelProperty(value = "更新人")
+ @ChineseDescription("更新人")
+ private Long updateUser;
+ /**
+ * 更新时间
+ */
+ @TableField("update_time")
+ @ApiModelProperty(value = "更新时间")
+ @ChineseDescription("更新时间")
+ private Date updateTime;
+ @ApiModelProperty(value = "备注")
+ @ChineseDescription("")
+ private String remark;
+ @TableField("ios_user")
+ @ApiModelProperty(value = "ios用户")
+ @ChineseDescription("")
+ private String iosUser;
+ @TableField("ios_employee")
+ @ApiModelProperty(value = "ios员工")
+ @ChineseDescription("")
+ private String iosEmployee;
+ @TableField("android_user")
+ @ApiModelProperty(value = "安卓用户")
+ @ChineseDescription("")
+ private String androidUser;
+ @TableField("android_employee")
+ @ApiModelProperty(value = "安卓员工")
+ @ChineseDescription("")
+ private String androidEmployee;
+
+}
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/VersionMapper.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/VersionMapper.java
new file mode 100644
index 0000000..1263266
--- /dev/null
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/VersionMapper.java
@@ -0,0 +1,19 @@
+package cn.stylefeng.guns.modular.business.mapper;
+
+import cn.stylefeng.guns.modular.business.entity.Version;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-04-07
+ */
+public interface VersionMapper extends BaseMapper<Version> {
+
+ Page<Version> listCreateUser(@Param("page") Page<Object> objectPage,@Param("param") Version version);
+}
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/VersionMapper.xml b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/VersionMapper.xml
new file mode 100644
index 0000000..80cc3de
--- /dev/null
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/VersionMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.stylefeng.guns.modular.business.mapper.VersionMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="cn.stylefeng.guns.modular.business.entity.Version">
+ <id column="id" property="id" />
+ <result column="version" property="version" />
+ <result column="create_time" property="createTime" />
+ <result column="create_user" property="createUser" />
+ <result column="is_delete" property="isDelete" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="remark" property="remark" />
+ <result column="ios_user" property="iosUser" />
+ <result column="ios_employee" property="iosEmployee" />
+ <result column="android_user" property="androidUser" />
+ <result column="android_employee" property="androidEmployee" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, version, create_time, create_user, is_delete, update_user, update_time, remark, ios_user, ios_employee, android_user, android_employee
+ </sql>
+ <select id="listCreateUser" resultType="cn.stylefeng.guns.modular.business.entity.Version">
+ select *,su.real_name as createName from t_version tv
+ left join sys_user su on tv.create_user = su.user_id
+ <where>
+ tv.is_delete = 0
+ <if test="param.version != '' and param.version != null">
+ and tv.version like concat('%',#{param.version},'%')
+ </if>
+
+ </where>
+ </select>
+
+</mapper>
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/IVersionService.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/IVersionService.java
new file mode 100644
index 0000000..ec6ad95
--- /dev/null
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/IVersionService.java
@@ -0,0 +1,18 @@
+package cn.stylefeng.guns.modular.business.service;
+
+import cn.stylefeng.guns.modular.business.entity.Version;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-04-07
+ */
+public interface IVersionService extends IService<Version> {
+
+ Page<Version> listCreateUser(Page<Object> objectPage, Version version);
+}
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CounsellingOrderServiceImpl.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CounsellingOrderServiceImpl.java
index b1ab904..1e08628 100644
--- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CounsellingOrderServiceImpl.java
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CounsellingOrderServiceImpl.java
@@ -457,6 +457,8 @@
//预约状态 1-待审批，2-待服务，3-服务中，4-已完成，5-已取消，6-已拒绝 - 首次面诊直接待服务
counsellingOrderReservation.setStauts(2);
this.counsellingOrderReservationService.save(counsellingOrderReservation);
+ //新增
+ iImGroupService.createGroup(2,null,null,counsellingInfo.getUserId(),null,null,counsellingOrder.getUserId(),counsellingOrder.getCounsellingInfoId());
// 推送消息内容
// String pushContent = "我购买了心理咨询疗程，需要咨询";
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/VersionServiceImpl.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/VersionServiceImpl.java
new file mode 100644
index 0000000..487390b
--- /dev/null
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/VersionServiceImpl.java
@@ -0,0 +1,26 @@
+package cn.stylefeng.guns.modular.business.service.impl;
+
+import cn.stylefeng.guns.modular.business.entity.Version;
+import cn.stylefeng.guns.modular.business.mapper.VersionMapper;
+import cn.stylefeng.guns.modular.business.service.IVersionService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-04-07
+ */
+@Service
+public class VersionServiceImpl extends ServiceImpl<VersionMapper, Version> implements IVersionService {
+
+ @Override
+ public Page<Version> listCreateUser(Page<Object> objectPage, Version version) {
+ return this.baseMapper.listCreateUser(objectPage,version);
+ }
+}
diff --git a/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/VersionController.java b/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/VersionController.java
new file mode 100644
index 0000000..6c1122d
--- /dev/null
+++ b/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/VersionController.java
@@ -0,0 +1,135 @@
+package cn.stylefeng.guns.modular.business.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.stylefeng.guns.modular.business.dto.VersionAddDto;
+import cn.stylefeng.guns.modular.business.entity.Version;
+import cn.stylefeng.guns.modular.business.service.IVersionService;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
+import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
+import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
+import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
+import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog;
+import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum;
+import cn.stylefeng.roses.kernel.rule.pojo.response.ErrorResponseData;
+import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
+import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource;
+import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser;
+import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.Query;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sun.org.apache.bcel.internal.generic.NEW;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 管理类
+ * @author guo
+ */
+@RestController
+@Api(tags = "版本管理")
+@ApiResource(name = "版本管理", resBizType = ResBizTypeEnum.BUSINESS)
+@RequestMapping("/business/version")
+public class VersionController {
+
+ @Resource
+ private IVersionService versionService;
+ @Autowired
+ private SysUserService userService;
+
+ /**
+ * 添加
+ */
+ @ApiOperation("添加")
+ @PostResource(name = "添加", path = "/version/add")
+ @BusinessLog
+ public ResponseData<?> add(@RequestBody VersionAddDto version) {
+ Version version1 = new Version();
+ BeanUtil.copyProperties(version,version1);
+ version1.setCreateUser(LoginContext.me().getLoginUser().getUserId());
+ version1.setCreateTime(new Date());
+ version1.setUpdateUser(LoginContext.me().getLoginUser().getUserId());
+
+ SysUser byId = userService.getById(LoginContext.me().getLoginUser().getUserId());
+ version1.setCreateName(byId.getRealName());
+ this.versionService.save(version1);
+ return new SuccessResponseData<>();
+ }
+
+ /**
+ * 删除
+ */
+ @ApiOperation("删除")
+ @PostResource(name = "删除", path = "/version/delete")
+ @BusinessLog
+ public ResponseData<?> delete(@RequestParam String ids) {
+ if (StrUtil.isBlank(ids)){
+ return new ErrorResponseData<>("500","id不能为空");
+ }
+ LambdaUpdateWrapper<Version> lambdaUpdateWrapper = new LambdaUpdateWrapper<Version>().set(Version::getIsDelete,true);
+ lambdaUpdateWrapper.in(Version::getId, ListUtil.toList(ids.split(",")));
+ this.versionService.update(lambdaUpdateWrapper);
+ return new SuccessResponseData<>();
+ }
+
+ /**
+ * 修改
+ */
+ @ApiOperation("修改")
+ @PostResource(name = "修改", path = "/version/edit")
+ @BusinessLog
+ public ResponseData<?> edit(@RequestBody Version version) {
+ this.versionService.updateById(version);
+ return new SuccessResponseData<>();
+ }
+
+
+
+ /**
+ * 获取详情
+ */
+ @ApiOperation("获取详情")
+ @GetResource(name = "获取详情", path = "/version/detail/{id}", requiredPermission = false)
+ public ResponseData<Version> detail(@PathVariable("id") Long id) {
+ Version version = this.versionService.getById(id);
+ SysUser byId = userService.getById(version.getCreateUser());
+ version.setCreateName(byId.getRealName());
+ return new SuccessResponseData<>(version);
+ }
+
+ /**
+ * 获取列表
+ */
+ @ApiOperation("获取列表")
+ @GetResource(name = "获取列表", path = "/version/list", requiredPermission = false)
+ public ResponseData<List<Version>> list(Version version) {
+ LambdaQueryWrapper<Version> lambdaQueryWrapper = new LambdaQueryWrapper<Version>().eq(Version::getIsDelete,false)
+ .orderByDesc(Version::getId);
+ return new SuccessResponseData<>(versionService.list(lambdaQueryWrapper));
+ }
+
+ /**
+ * 获取列表(分页)
+ */
+ @ApiOperation("获取列表(分页)")
+ @GetResource(name = "获取列表(分页)", path = "/version/page", requiredPermission = false)
+ public ResponseData<PageResult<Version>> page(Version version) {
+ LambdaQueryWrapper<Version> lambdaQueryWrapper = new LambdaQueryWrapper<Version>().eq(Version::getIsDelete,0)
+ .orderByDesc(Version::getId);
+ Page<Version> page = this.versionService.listCreateUser(PageFactory.defaultPage(), version);
+ return new SuccessResponseData<>(PageResultFactory.createPageResult(page));
+ }
+
+}
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
index 9cfe666..814b782 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
@@ -13,9 +13,11 @@
import cn.stylefeng.guns.modular.business.dto.request.CustomerWxOpenIdLoginRequest;
import cn.stylefeng.guns.modular.business.entity.Help;
import cn.stylefeng.guns.modular.business.entity.MentalTestRecord;
+import cn.stylefeng.guns.modular.business.entity.Version;
import cn.stylefeng.guns.modular.business.service.IAreaService;
import cn.stylefeng.guns.modular.business.service.IHelpService;
import cn.stylefeng.guns.modular.business.service.IMentalTestRecordService;
+import cn.stylefeng.guns.modular.business.service.IVersionService;
import cn.stylefeng.rest.modular.user.service.CustomerLoginBizService;
import cn.stylefeng.roses.kernel.auth.api.AuthServiceApi;
import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
@@ -99,6 +101,15 @@
@Resource
private IAreaService areaService;
+ @Resource
+ private IVersionService versionService;
+
+ @ApiOperation(value = "获取当前最新版本")
+ @PostResource(name = "获取当前最新版本", path = RuleConstants.NOT_LOGIN +"/newversion")
+ public ResponseData<Version> newversion() {
+ Version one = versionService.getOne(Wrappers.lambdaQuery(Version.class).orderByDesc(Version::getCreateTime).eq(Version::getIsDelete, 0).last("limit 1"));
+ return new SuccessResponseData<>(one);
+ }
@ApiOperation(value = "获取微信openId")
@GetResource(name = "获取微信openId", path = RuleConstants.NOT_LOGIN + "/getWxOpenId", requiredPermission = false, requiredLogin = false)
diff --git a/roses/kernel-d-im/im-sdk-rongcloud/src/main/java/cn/stylefeng/roses/kernel/im/rongcloud/RongCloudImServer.java b/roses/kernel-d-im/im-sdk-rongcloud/src/main/java/cn/stylefeng/roses/kernel/im/rongcloud/RongCloudImServer.java
index 5cd57dc..2f1437c 100644
--- a/roses/kernel-d-im/im-sdk-rongcloud/src/main/java/cn/stylefeng/roses/kernel/im/rongcloud/RongCloudImServer.java
+++ b/roses/kernel-d-im/im-sdk-rongcloud/src/main/java/cn/stylefeng/roses/kernel/im/rongcloud/RongCloudImServer.java
@@ -346,7 +346,6 @@
@Override
public HistoryMessageResult historyMessage(String date) {
History history = getRongCloud().message.history;
-
// 获取历史消息日志文件
HistoryMessageResult historyMessageResult = (HistoryMessageResult) history.get(date);
--
Gitblit v1.7.1