Skip to content

C
cms
提交 dff6b2f6 作者: 恶龙咆哮
操作

Merge branch 'develop'

上级 85f6af36 55459d0a
流水线 #8526 已通过 于阶段
in 2 分 11 秒
正在显示 包含 597 行增加 和 3 行删除
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/UserPartnerQO.java 0 → 100644
package com.mmc.iuav.user.model.qo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.data.domain.Page;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
/**
* @author Admin
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class UserPartnerQO implements Serializable {
private String userAddress;
private String userName;
private String phoneNumber;
private Integer id;
/**
* 1同意 2拒绝
*/
private Integer status;
@ApiModelProperty(value = "页码", required = true, example = "1")
@NotNull(message = "页码不能为空", groups = Page.class)
@Min(value = 1, groups = Page.class)
private Integer pageNo;
@ApiModelProperty(value = "每页显示数", required = true, example = "10")
@NotNull(message = "每页显示数不能为空", groups = Page.class)
@Min(value = 1, groups = Page.class)
private Integer pageSize;
public void buildCurrentPage() {
this.pageNo = (pageNo - 1) * pageSize;
}
}
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/UserPartnerVO.java 0 → 100644
package com.mmc.iuav.user.model.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class UserPartnerVO {
@ApiModelProperty(value = "用户地址")
private String userAddress;
@ApiModelProperty(value = "用户名称")
private String userName;
@ApiModelProperty(value = "用户电话")
private String phoneNumber;
private Integer id;
private Date createTime;
private Date updateTime;
/**
* 1同意 2拒绝
*/
private Integer status;
private Integer userAccountId;
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/MessageController.java
...@@ -160,7 +160,7 @@ public class MessageController extends BaseController{ ...@@ -160,7 +160,7 @@ public class MessageController extends BaseController{
@ApiOperation(value = "根据类型ID返回聊天时长选购类型") @ApiOperation(value = "根据类型ID返回聊天时长选购类型")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@GetMapping("/timeTypeById") @GetMapping("/timeTypeById")
public Integer timeTypeById(@ApiParam(value = "购买聊天时长的类型id，唯一识别id", required = true) Integer typeId,HttpServletRequest request){ public Integer timeTypeById(@ApiParam(value = "购买聊天时长的类型id，唯一识别id", required = true) Integer typeId, Integer userId){
return messageService.timeTypeById(typeId,this.getUserLoginInfoFromRedis(request).getUserAccountId()); return messageService.timeTypeById(typeId,userId);
} }
} }
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/UserPartnerController.java 0 → 100644
package com.mmc.iuav.user.controller;
import com.mmc.iuav.response.ResultBody;
import com.mmc.iuav.user.entity.UserPartnerDO;
import com.mmc.iuav.user.model.qo.UserPartnerQO;
import com.mmc.iuav.user.model.vo.UserPartnerVO;
import com.mmc.iuav.user.service.UserPartnerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
/**
* (UserPartner)表控制层
*
* @author makejava
* @since 2024-03-18 18:09:51
*/
@Api(tags = "合伙人相关接口")
@RestController
@RequestMapping("/Partner/")
public class UserPartnerController extends BaseController {
@Resource
private UserPartnerService userPartnerService;
@ApiOperation(value = "合伙人列表")
@ApiResponses({@ApiResponse(code = 200, message = "success", response = UserPartnerDO.class)})
@PostMapping("listPartner")
public ResultBody queryByPage(@RequestBody UserPartnerQO userPartner) {
return userPartnerService.queryByPage(userPartner);
}
@ApiOperation(value = "获取合伙人信息详情")
@ApiResponses({@ApiResponse(code = 200, message = "success", response = UserPartnerDO.class)})
@GetMapping("getPartnerInfo")
public ResultBody<UserPartnerVO> queryById(@RequestParam Integer id) {
return ResultBody.success(this.userPartnerService.queryById(id));
}
/**
* 新增数据
*
* @param userPartnerDO 实体
* @return 新增结果
*/
@ApiOperation(value = "新增合伙人")
@ApiResponses({@ApiResponse(code = 200, message = "success", response = UserPartnerDO.class)})
@PostMapping("insertPartner")
public ResultBody<UserPartnerDO> insertPartner(@RequestBody UserPartnerDO userPartnerDO, HttpServletRequest request) {
Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
userPartnerDO.setUserAccountId(userAccountId);
return ResultBody.success(userPartnerService.insertPartner(userPartnerDO));
}
/**
* 编辑数据
*
* @param userPartnerDO 实体
* @return 编辑结果
*/
@ApiOperation(value = "修改合伙人信息")
@ApiResponses({@ApiResponse(code = 200, message = "success", response = UserPartnerDO.class)})
@PostMapping("updatePartner")
public ResultBody edit(@RequestBody UserPartnerDO userPartnerDO) {
return userPartnerService.update(userPartnerDO);
}
/**
* 删除数据
*
* @param id 主键
* @return 删除是否成功
*/
@ApiOperation(value = "删除合伙人信息")
@ApiResponses({@ApiResponse(code = 200, message = "success", response = UserPartnerDO.class)})
@PostMapping("deletePartner")
public ResultBody deleteById(Integer id) {
return this.userPartnerService.deleteById(id);
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/UserPartnerDao.java 0 → 100644
package com.mmc.iuav.user.dao;
import com.mmc.iuav.user.entity.UserPartnerDO;
import com.mmc.iuav.user.model.qo.UserPartnerQO;
import com.mmc.iuav.user.model.vo.UserPartnerVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* (UserPartner)表数据库访问层
*
* @author makejava
* @since 2024-03-18 18:05:36
*/
@Mapper
public interface UserPartnerDao {
/**
* 通过ID查询单条数据
*
* @param id 主键
* @return 实例对象
*/
UserPartnerVO queryById(Integer id);
/**
* 查询指定行数据
*
* @param userPartner 查询条件
* @return 对象列表
*/
List<UserPartnerVO> queryAllByLimit(UserPartnerQO userPartner);
/**
* 统计总行数
*
* @param userPartner 查询条件
* @return 总行数
*/
int count(UserPartnerQO userPartner);
/**
* 新增数据
*
* @param userPartnerDO 实例对象
* @return 影响行数
*/
int insertPartner(UserPartnerDO userPartnerDO);
/**
* 批量新增数据（MyBatis原生foreach方法）
*
* @param entities List<UserPartner> 实例对象列表
* @return 影响行数
*/
int insertBatch(@Param("entities") List<UserPartnerDO> entities);
/**
* 批量新增或按主键更新数据（MyBatis原生foreach方法）
*
* @param entities List<UserPartner> 实例对象列表
* @return 影响行数
* @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
*/
int insertOrUpdateBatch(@Param("entities") List<UserPartnerDO> entities);
/**
* 修改数据
*
* @param userPartnerDO 实例对象
* @return 影响行数
*/
int update(UserPartnerDO userPartnerDO);
/**
* 通过主键删除数据
*
* @param id 主键
* @return 影响行数
*/
int deleteById(Integer id);
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserPartnerDO.java 0 → 100644
package com.mmc.iuav.user.entity;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Date;
import java.io.Serializable;
/**
* (UserPartner)实体类
*
* @author makejava
* @since 2024-03-18 18:05:36
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class UserPartnerDO implements Serializable {
private static final long serialVersionUID = -92314541450500730L;
@ApiModelProperty(value = "用户地址")
private String userAddress;
@ApiModelProperty(value = "用户名称")
private String userName;
@ApiModelProperty(value = "用户电话")
private String phoneNumber;
private Integer id;
@JsonIgnore
private Date createTime;
@JsonIgnore
private Date updateTime;
/**
* 1同意 2拒绝
*/
private Integer status;
@JsonIgnore
private Integer userAccountId;
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/UserPartnerService.java 0 → 100644
package com.mmc.iuav.user.service;
import com.mmc.iuav.response.ResultBody;
import com.mmc.iuav.user.entity.UserPartnerDO;
import com.mmc.iuav.user.model.qo.UserPartnerQO;
import com.mmc.iuav.user.model.vo.UserPartnerVO;
/**
* (UserPartner)表服务接口
*
* @author makejava
* @since 2024-03-18 18:09:51
*/
public interface UserPartnerService {
/**
* 通过ID查询单条数据
*
* @param id 主键
* @return 实例对象
*/
UserPartnerVO queryById(Integer id);
ResultBody queryByPage(UserPartnerQO userPartner);
/**
* 新增数据
*
* @param userPartnerDO 实例对象
* @return 实例对象
*/
UserPartnerDO insertPartner(UserPartnerDO userPartnerDO);
/**
* 修改数据
*
* @param userPartnerDO 实例对象
* @return 实例对象
*/
ResultBody update(UserPartnerDO userPartnerDO);
/**
* 通过主键删除数据
*
* @param id 主键
* @return 是否成功
*/
ResultBody deleteById(Integer id);
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserPartnerServiceImpl.java 0 → 100644
package com.mmc.iuav.user.service.impl;
import com.mmc.iuav.page.PageResult;
import com.mmc.iuav.response.ResultBody;
import com.mmc.iuav.user.entity.UserPartnerDO;
import com.mmc.iuav.user.dao.UserPartnerDao;
import com.mmc.iuav.user.model.qo.UserPartnerQO;
import com.mmc.iuav.user.model.vo.UserPartnerVO;
import com.mmc.iuav.user.service.UserPartnerService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* (UserPartner)表服务实现类
*
* @author makejava
* @since 2024-03-18 18:09:51
*/
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class UserPartnerServiceImpl implements UserPartnerService {
@Autowired
private UserPartnerDao userPartnerDao;
/**
* 通过ID查询单条数据
*
* @param id 主键
* @return 实例对象
*/
@Override
public UserPartnerVO queryById(Integer id) {
return userPartnerDao.queryById(id);
}
/**
* 分页查询
*
* @param userPartner 筛选条件
* @return 查询结果
*/
@Override
public ResultBody queryByPage(UserPartnerQO userPartner) {
int total = userPartnerDao.count(userPartner);
int pageNo = userPartner.getPageNo();
userPartner.buildCurrentPage();
List<UserPartnerVO> userPartnerDOS = userPartnerDao.queryAllByLimit(userPartner);
return ResultBody.success(PageResult.buildPage(pageNo, userPartner.getPageSize(), total, userPartnerDOS));
}
/**
* 新增数据
*
* @param userPartnerDO 实例对象
* @return 实例对象
*/
@Override
public UserPartnerDO insertPartner(UserPartnerDO userPartnerDO) {
userPartnerDao.insertPartner(userPartnerDO);
return userPartnerDO;
}
/**
* 修改数据
*
* @param userPartnerDO 实例对象
* @return 实例对象
*/
@Override
public ResultBody update(UserPartnerDO userPartnerDO) {
userPartnerDao.update(userPartnerDO);
return ResultBody.success();
}
/**
* 通过主键删除数据
*
* @param id 主键
* @return 是否成功
*/
@Override
public ResultBody deleteById(Integer id) {
if (userPartnerDao.deleteById(id) > 0) {
return ResultBody.success();
}
return ResultBody.error("删除失败");
}
}
csm-service/cms-service-user/src/main/resources/mapper/UserPartnerDao.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mmc.iuav.user.dao.UserPartnerDao">
<update id="update">
update user_partner
<set>
<if test="userAddress != null and userAddress != ''">
user_address = #{userAddress},
</if>
<if test="userName != null and userName != ''">
user_name = #{userName},
</if>
<if test="phoneNumber != null and phoneNumber != ''">
phone_number = #{phoneNumber},
</if>
<if test="updateTime != null">
update_time = NOW(),
</if>
<if test="status != null">
status = #{status},
</if>
</set>
where id = #{id}
</update>
<!--查询单个-->
<!--查询指定行数据-->
<!--统计总行数-->
<select id="count" resultType="java.lang.Integer">
select count(*)
from user_partner
<where>
<if test="userAddress != null and userAddress != ''">
and user_address = #{userAddress}
</if>
<if test="userName != null and userName != ''">
and user_name = #{userName}
</if>
<if test="phoneNumber != null and phoneNumber != ''">
and phone_number = #{phoneNumber}
</if>
<if test="id != null">
and id = #{id}
</if>
<if test="status != null">
and status = #{status}
</if>
</where>
</select>
<select id="queryAllByLimit" resultType="com.mmc.iuav.user.model.vo.UserPartnerVO">
select
id,user_address, user_name, phone_number, id, create_time, update_time, status,user_account_id
from user_partner
<where>
<if test="userAddress != null and userAddress != ''">
and user_address = #{userAddress}
</if>
<if test="userName != null and userName != ''">
and user_name = #{userName}
</if>
<if test="phoneNumber != null and phoneNumber != ''">
and phone_number = #{phoneNumber}
</if>
<if test="id != null">
and id = #{id}
</if>
<if test="status != null">
and status = #{status}
</if>
</where>
limit #{pageNo},#{pageSize}
</select>
<select id="queryById" resultType="com.mmc.iuav.user.model.vo.UserPartnerVO">
select user_address,
user_name,
phone_number,
id,
create_time,
update_time,
status
from user_partner
where id = #{id}
</select>
<!--新增所有列-->
<insert id="insertPartner" keyProperty="id" useGeneratedKeys="true">
insert into user_partner(user_address, user_name, phone_number, create_time, update_time, status,user_account_id)
values (#{userAddress}, #{userName}, #{phoneNumber},NOW(), #{updateTime}, #{status},#{userAccountId})
</insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into user_partner(user_address, user_name, phone_number, create_time, update_time, status)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.userAddress}, #{entity.userName}, #{entity.phoneNumber}, #{entity.createTime},
#{entity.updateTime}, #{entity.status})
</foreach>
</insert>
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into user_partner(user_address, user_name, phone_number, create_time, update_time, status)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.userAddress}, #{entity.userName}, #{entity.phoneNumber}, #{entity.createTime},
#{entity.updateTime}, #{entity.status})
</foreach>
on duplicate key update
user_address = values(user_address),
user_name = values(user_name),
phone_number = values(phone_number),
create_time = values(create_time),
update_time = values(update_time),
status = values(status)
</insert>
<!--通过主键修改数据-->
<!--通过主键删除-->
<delete id="deleteById">
delete
from user_partner
where id = #{id}
</delete>
</mapper>
kustomization/overlays/dev/kustomization.yaml
...@@ -18,4 +18,4 @@ patches: ...@@ -18,4 +18,4 @@ patches:
images: images:
- name: REGISTRY/NAMESPACE/IMAGE:TAG - name: REGISTRY/NAMESPACE/IMAGE:TAG
newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
newTag: 47715b5fd3aa9a3b895f9b0e926e9e70464210c8 newTag: 13c6141293cf398db441e015c3446f269ced8300
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论