添加表字段

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantGroupAlbumController.java

@@ -0,0 +1,90 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.microsvc.toolkit.common.response.template.R;
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.microsvc.toolkit.config.jwt.utils.JwtUserInfo;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import springfox.documentation.annotations.ApiIgnore;
+
+import com.yonge.cooleshow.biz.dal.service.TenantGroupAlbumService;
+import com.yonge.cooleshow.biz.dal.wrapper.TenantGroupAlbumWrapper;
+import com.yonge.cooleshow.biz.dal.entity.TenantGroupAlbum;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/tenantGroupAlbum")
+@Api(tags = "机构小组专辑配置表")
+public class TenantGroupAlbumController {
+
+    @Autowired
+    private TenantGroupAlbumService tenantGroupAlbumService;
+
+	@ApiOperation(value = "详情", notes = "机构小组专辑配置表-根据详情ID查询单条, 传入id")
+    @PreAuthorize("@auditsvc.hasPermissions('tenantGroupAlbum/detail', {'BACKEND'})")
+    //@GetMapping("/detail/{id}")
+    public R<TenantGroupAlbum> detail(@PathVariable("id") Long id) {
+    
+    	TenantGroupAlbum wrapper = tenantGroupAlbumService.detail(id);
+        
+        return R.from(wrapper);
+	}
+    
+    @ApiOperation(value = "查询分页", notes = "机构小组专辑配置表- 传入 TenantGroupAlbumWrapper.TenantGroupAlbumQuery") 
+    @PreAuthorize("@auditsvc.hasPermissions('tenantGroupAlbum/page', {'BACKEND'})") 
+    @PostMapping("/page")
+    public R<PageInfo<TenantGroupAlbum>> page(@RequestBody TenantGroupAlbumWrapper.TenantGroupAlbumQuery query) {
+        
+        IPage<TenantGroupAlbum> pages = tenantGroupAlbumService.selectPage(QueryInfo.getPage(query), query);
+        
+        return R.from(QueryInfo.pageInfo(pages));
+	}
+    
+    @ApiOperation(value = "新增", notes = "机构小组专辑配置表- 传入 TenantGroupAlbumWrapper.TenantGroupAlbum")
+    @PreAuthorize("@auditsvc.hasPermissions('tenantGroupAlbum/save', {'BACKEND'})")
+	//@PostMapping("/save")
+	public R<JSONObject> add(@Validated @RequestBody TenantGroupAlbum tenantGroupAlbum) {
+        
+        // 新增数据
+        tenantGroupAlbumService.save(tenantGroupAlbum);
+        
+        return R.defaultR();
+	}
+    
+    @ApiOperation(value = "修改", notes = "机构小组专辑配置表- 传入 TenantGroupAlbumWrapper.TenantGroupAlbum")
+    @PreAuthorize("@auditsvc.hasPermissions('tenantGroupAlbum/update', {'BACKEND'})")
+	//@PostMapping("/update")
+	public R<JSONObject> update(@Validated @RequestBody TenantGroupAlbum tenantGroupAlbum) {
+        
+        // 更新数据
+        tenantGroupAlbumService.updateById(tenantGroupAlbum);
+        
+        return R.defaultR();
+	}
+
+	@ApiOperation(value = "删除", notes = "机构小组专辑配置表- 传入id")
+    @PreAuthorize("@auditsvc.hasPermissions('tenantGroupAlbum/remove', {'BACKEND'})")
+	//@PostMapping("/remove")    
+	public R<Boolean> remove(@RequestParam Long id) {
+    
+		return R.from(tenantGroupAlbumService.removeById(id));
+	}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantAlbum.java

@@ -88,4 +88,15 @@ public class TenantAlbum implements Serializable {
     @TableField(value = "category_level_id_")
     private Long categoryLevelId;
 
+
+    @ApiModelProperty("采购周期类型")
+    @TableField(value = "purchase_types_")
+    private String purchaseTypes;
+
+
+
+    @ApiModelProperty("采购金额数据")
+    @TableField(value = "purchase_json_")
+    private String purchaseJson;
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantAlbumPurchase.java

@@ -77,4 +77,9 @@ public class TenantAlbumPurchase implements Serializable {
 	@TableField(value = "create_time_")
     private Date createTime;
 
+
+    @ApiModelProperty("采购周期类型")
+    @TableField(value = "purchase_type_")
+    private String purchaseType;
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantGroupAlbum.java

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import lombok.Data;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+/**
+ * 机构小组专辑配置表
+ * 2024-01-24 13:32:00
+ */
+@Data
+@ApiModel(" TenantGroupAlbum-机构小组专辑配置表")
+@TableName("tenant_group_album")
+public class TenantGroupAlbum implements Serializable {
+
+    @ApiModelProperty("主键ID") 
+	    @TableId(value = "id_")
+	    private Long id;
+
+    @ApiModelProperty("机构小组ID") 
+	@TableField(value = "tenant_group_id_")
+    private Long tenantGroupId;
+
+    @ApiModelProperty("专辑ID") 
+	@TableField(value = "tenant_album_id_")
+    private Long tenantAlbumId;
+
+    @ApiModelProperty("状态") 
+	@TableField(value = "status_")
+    private Boolean status;
+
+    @ApiModelProperty("采购数量") 
+	@TableField(value = "purchase_num_")
+    private Integer purchaseNum;
+
+    @ApiModelProperty("采购周期") 
+	@TableField(value = "purchase_period_")
+    private String purchasePeriod;
+
+    @ApiModelProperty("原价") 
+	@TableField(value = "original_price_")
+    private BigDecimal originalPrice;
+
+    @ApiModelProperty("售价") 
+	@TableField(value = "actual_price_")
+    private BigDecimal actualPrice;
+
+    @ApiModelProperty("购买次数限制") 
+	@TableField(value = "buy_times_flag_")
+    private Boolean buyTimesFlag;
+
+    @ApiModelProperty("购买次数") 
+	@TableField(value = "buy_times_")
+    private Integer buyTimes;
+
+    @ApiModelProperty("是否删除") 
+	@TableField(value = "del_flag_")
+    private Boolean delFlag;
+
+    @ApiModelProperty("创建时间") 
+	@TableField(value = "create_time_")
+    private Date createTime;
+
+    @ApiModelProperty("创建人") 
+	@TableField(value = "create_by_")
+    private Long createBy;
+
+    @ApiModelProperty("更新人") 
+	@TableField(value = "update_by_")
+    private Long updateBy;
+
+    @ApiModelProperty("更新时间") 
+	@TableField(value = "update_time_")
+    private Date updateTime;
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/TenantGroupAlbumMapper.java

@@ -0,0 +1,27 @@
+package com.yonge.cooleshow.biz.dal.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import com.yonge.cooleshow.biz.dal.entity.TenantGroupAlbum;
+import com.yonge.cooleshow.biz.dal.wrapper.TenantGroupAlbumWrapper;
+
+/**
+ * 机构小组专辑配置表
+ * 2024-01-24 13:32:00
+ */
+@Repository
+public interface TenantGroupAlbumMapper extends BaseMapper<TenantGroupAlbum> {
+
+	/**
+	 * 分页查询
+	 * @param page IPage<TenantGroupAlbumWrapper.TenantGroupAlbum>
+	 * @param param TenantGroupAlbumWrapper.TenantGroupAlbumQuery
+	 * @return List<TenantGroupAlbumWrapper.TenantGroupAlbum>
+	 */
+	List<TenantGroupAlbum> selectPage(@Param("page") IPage<TenantGroupAlbum> page, @Param("param") TenantGroupAlbumWrapper.TenantGroupAlbumQuery param);
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TenantGroupAlbumService.java

@@ -0,0 +1,43 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.wrapper.TenantGroupAlbumWrapper;
+import com.yonge.cooleshow.biz.dal.entity.TenantGroupAlbum;
+
+/**
+ * 机构小组专辑配置表
+ * 2024-01-24 13:32:00
+ */
+public interface TenantGroupAlbumService extends IService<TenantGroupAlbum>  {
+
+	/**
+     * 查询详情
+     * @param id 详情ID
+     * @return TenantGroupAlbum
+     */
+	TenantGroupAlbum detail(Long id);
+
+    /**
+     * 分页查询
+     * @param page IPage<TenantGroupAlbum>
+     * @param query TenantGroupAlbumWrapper.TenantGroupAlbumQuery
+     * @return IPage<TenantGroupAlbum>
+     */
+    IPage<TenantGroupAlbum> selectPage(IPage<TenantGroupAlbum> page, TenantGroupAlbumWrapper.TenantGroupAlbumQuery query);
+	
+    /**
+     * 添加
+     * @param tenantGroupAlbum TenantGroupAlbumWrapper.TenantGroupAlbum
+     * @return Boolean
+     */
+     Boolean add(TenantGroupAlbumWrapper.TenantGroupAlbum tenantGroupAlbum);   
+
+    /**
+     * 更新
+     * @param tenantGroupAlbum TenantGroupAlbumWrapper.TenantGroupAlbum
+     * @return Boolean
+     */
+     Boolean update(TenantGroupAlbumWrapper.TenantGroupAlbum tenantGroupAlbum);
+     
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantGroupAlbumServiceImpl.java

@@ -0,0 +1,66 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.BeanUtils;
+import lombok.extern.slf4j.Slf4j;
+import com.yonge.cooleshow.biz.dal.entity.TenantGroupAlbum;
+import com.yonge.cooleshow.biz.dal.wrapper.TenantGroupAlbumWrapper;
+import com.yonge.cooleshow.biz.dal.mapper.TenantGroupAlbumMapper;
+import com.yonge.cooleshow.biz.dal.service.TenantGroupAlbumService;
+
+/**
+ * 机构小组专辑配置表
+ * 2024-01-24 13:32:00
+ */
+@Slf4j
+@Service
+public class TenantGroupAlbumServiceImpl extends ServiceImpl<TenantGroupAlbumMapper, TenantGroupAlbum> implements TenantGroupAlbumService {
+
+	/**
+     * 查询详情
+     * @param id 详情ID
+     * @return TenantGroupAlbum
+     */
+	@Override
+    public TenantGroupAlbum detail(Long id) {
+        
+        return baseMapper.selectById(id);
+    }
+    
+    /**
+     * 分页查询
+     * @param page IPage<TenantGroupAlbum>
+     * @param query TenantGroupAlbumWrapper.TenantGroupAlbumQuery
+     * @return IPage<TenantGroupAlbum>
+     */
+    @Override
+    public IPage<TenantGroupAlbum> selectPage(IPage<TenantGroupAlbum> page, TenantGroupAlbumWrapper.TenantGroupAlbumQuery query) {
+        
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+    /**
+     * 添加
+     * @param tenantGroupAlbum TenantGroupAlbumWrapper.TenantGroupAlbum
+     * @return Boolean
+     */
+    @Override
+    public Boolean add(TenantGroupAlbumWrapper.TenantGroupAlbum tenantGroupAlbum) {    	
+        
+        return this.save(JSON.parseObject(tenantGroupAlbum.jsonString(), TenantGroupAlbum.class));
+    }
+
+    /**
+     * 更新
+     * @param tenantGroupAlbum TenantGroupAlbumWrapper.TenantGroupAlbum
+     * @return Boolean
+     */
+    @Override
+    public Boolean update(TenantGroupAlbumWrapper.TenantGroupAlbum tenantGroupAlbum){
+
+        return this.updateById(JSON.parseObject(tenantGroupAlbum.jsonString(), TenantGroupAlbum.class));       
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantGroupAlbumWrapper.java

@@ -0,0 +1,63 @@
+package com.yonge.cooleshow.biz.dal.wrapper;
+
+import com.alibaba.fastjson.JSON;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Optional;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 机构小组专辑配置表
+ * 2024-01-24 13:32:00
+ */
+@ApiModel(value = "TenantGroupAlbumWrapper对象", description = "机构小组专辑配置表查询对象")
+public class TenantGroupAlbumWrapper {
+
+    @Data
+	@Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(" TenantGroupAlbumQuery-机构小组专辑配置表")
+    public static class TenantGroupAlbumQuery implements QueryInfo {
+    
+    	@ApiModelProperty("当前页")
+        private Integer page;
+        
+        @ApiModelProperty("分页行数")
+        private Integer rows;
+        
+        @ApiModelProperty("关键字匹配")
+		private String keyword;
+        
+        public String getKeyword() {
+            return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
+        }
+        
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static TenantGroupAlbumQuery from(String json) {
+            return JSON.parseObject(json, TenantGroupAlbumQuery.class);
+        }
+    }  
+
+	@ApiModel(" TenantGroupAlbum-机构小组专辑配置表")
+    public static class TenantGroupAlbum {
+        
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static TenantGroupAlbum from(String json) {
+            return JSON.parseObject(json, TenantGroupAlbum.class);
+        }
+	}
+
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMapper.xml

@@ -19,6 +19,8 @@
         , t.cost_price_ AS costPrice
         , t.category_type_id_ AS categoryTypeId
         , t.category_level_id_ AS categoryLevelId
+        , t.purchase_types_ AS purchaseTypes
+        , t.purchase_json_ AS purchaseJson
     </sql>
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper$TenantAlbum">

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantGroupAlbumMapper.xml

@@ -0,0 +1,32 @@
+<?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.yonge.cooleshow.biz.dal.mapper.TenantGroupAlbumMapper">
+
+	 
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_ AS id
+        , t.tenant_group_id_ AS tenantGroupId
+        , t.tenant_album_id_ AS tenantAlbumId
+        , t.status_ AS status
+        , t.purchase_num_ AS purchaseNum
+        , t.purchase_period_ AS purchasePeriod
+        , t.original_price_ AS originalPrice
+        , t.actual_price_ AS actualPrice
+        , t.buy_times_flag_ AS buyTimesFlag
+        , t.buy_times_ AS buyTimes
+        , t.del_flag_ AS delFlag
+        , t.create_time_ AS createTime
+        , t.create_by_ AS createBy
+        , t.update_by_ AS updateBy
+        , t.update_time_ AS updateTime
+        </sql> 
+    
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.entity.TenantGroupAlbum">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM tenant_group_album t
+	</select>
+    
+</mapper>