Skip to content

G
gic-platform-enterprise
Commit c1de5a98 by guojuxing
Options

数据配置：年龄段配置

parent 201c4e3a
Showing with 457 additions and 29 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataGenerationConfigDTO.java
......@@ -44,7 +44,7 @@ public class DataGenerationConfigDTO implements Serializable{
/**
* 展示名称
*/
private Integer description;
private String description;
/**
* 1:有效
......@@ -124,11 +124,11 @@ public class DataGenerationConfigDTO implements Serializable{
return this;
}
public Integer getDescription() {
public String getDescription() {
return description;
}
public DataGenerationConfigDTO setDescription(Integer description) {
public DataGenerationConfigDTO setDescription(String description) {
this.description = description;
return this;
}
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/DataConfigApiService.java
package com.gic.enterprise.service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
import com.gic.enterprise.dto.data.*;
import java.util.List;
......@@ -113,4 +110,34 @@ public interface DataConfigApiService {

*/
ServiceResponse<Void> initPerformanceConfig(Integer enterpriseId);
/**
* 年龄段配置
* @Title: saveGenerationConfig

* @Description:

* @author guojuxing
* @param dtoList

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> saveGenerationConfig(List<DataGenerationConfigDTO> dtoList);
/**
* 查询年龄段配置信息
* @Title: listGenerationConfig

* @Description:

* @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.data.DataGenerationConfigDTO>>


*/
ServiceResponse<List<DataGenerationConfigDTO>> listGenerationConfig(Integer enterpriseId);
/**
* 新增商户初始化年龄段配置数据
* @Title: initGenerationConfig

* @Description:

* @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> initGenerationConfig(Integer enterpriseId);
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabDataGenerationConfigMapper.java 0 → 100644
package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.entity.TabDataGenerationConfig;
import java.util.List;
public interface TabDataGenerationConfigMapper {
/**
* 根据主键删除
*
* @param generationConfigId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer generationConfigId);
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabDataGenerationConfig record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabDataGenerationConfig record);
/**
* 根据主键查询
*
* @param generationConfigId 主键
* @return 实体对象
*/
TabDataGenerationConfig selectByPrimaryKey(Integer generationConfigId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabDataGenerationConfig record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabDataGenerationConfig record);
void deleteGenerationConfig(Integer enterpriseId);
List<TabDataGenerationConfig> listGenerationByEnterpriseId(Integer enterpriseId);
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataGenerationConfig.java
......@@ -44,7 +44,7 @@ public class TabDataGenerationConfig {
/**
* 展示名称
*/
private Integer description;
private String description;
/**
* 1:有效
......@@ -124,11 +124,11 @@ public class TabDataGenerationConfig {
return this;
}
public Integer getDescription() {
public String getDescription() {
return description;
}
public TabDataGenerationConfig setDescription(Integer description) {
public TabDataGenerationConfig setDescription(String description) {
this.description = description;
return this;
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/DataGenerationConfigService.java
......@@ -22,10 +22,9 @@ public interface DataGenerationConfigService {
* @Description:

* @author guojuxing
* @param enterpriseId
* @param ageLevel
档位
* @return void


*/
void deleteGenerationConfig(Integer enterpriseId, Integer ageLevel);
void deleteGenerationConfig(Integer enterpriseId);
/**
* 查询年龄段配置数据
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/DataGenerationConfigServiceImpl.java
package com.gic.enterprise.service.impl;
public class DataGenerationConfigServiceImpl {
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabDataGenerationConfigMapper;
import com.gic.enterprise.dto.data.DataGenerationConfigDTO;
import com.gic.enterprise.entity.TabDataGenerationConfig;
import com.gic.enterprise.service.DataGenerationConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
@Service("dataGenerationConfigService")
public class DataGenerationConfigServiceImpl implements DataGenerationConfigService{
@Autowired
private TabDataGenerationConfigMapper tabDataGenerationConfigMapper;
@Override
public void saveGenerationConfig(DataGenerationConfigDTO dto) {
Date now = new Date();
dto.setUpdateTime(now);
dto.setCreateTime(now);
dto.setStatus(1);
TabDataGenerationConfig record = EntityUtil.changeEntityNew(TabDataGenerationConfig.class, dto);
tabDataGenerationConfigMapper.insert(record);
}
@Override
public void deleteGenerationConfig(Integer enterpriseId) {
tabDataGenerationConfigMapper.deleteGenerationConfig(enterpriseId);
}
@Override
public List<TabDataGenerationConfig> listGenerationByEnterpriseId(Integer enterpriseId) {
return tabDataGenerationConfigMapper.listGenerationByEnterpriseId(enterpriseId);
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/DataConfigApiServiceImpl.java
......@@ -4,20 +4,14 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import com.gic.enterprise.dto.data.*;
import com.gic.enterprise.entity.*;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
import com.gic.enterprise.entity.TabDataActuallyPaidConfig;
import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
import com.gic.enterprise.entity.TabDataPerformanceConfig;
import com.gic.enterprise.entity.TabDataSingleEffectConfig;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.*;
......@@ -33,6 +27,8 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
private DataSingleEffectConfigService dataSingleEffectConfigService;
@Autowired
private DataPerformanceConfigService dataPerformanceConfigService;
@Autowired
private DataGenerationConfigService dataGenerationConfigService;
@Override
public ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto) {
......@@ -168,4 +164,32 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
configPerformance(dto);
return ServiceResponse.success();
}
@Override
public ServiceResponse<Void> saveGenerationConfig(List<DataGenerationConfigDTO> dtoList) {
if (CollectionUtils.isEmpty(dtoList)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "年龄段配置内容为空");
}
dataGenerationConfigService.deleteGenerationConfig(dtoList.get(0).getEnterpriseId());
dtoList.stream()
.forEach(e -> dataGenerationConfigService.saveGenerationConfig(e));
return ServiceResponse.success();
}
@Override
public ServiceResponse<List<DataGenerationConfigDTO>> listGenerationConfig(Integer enterpriseId) {
List<TabDataGenerationConfig> list = dataGenerationConfigService.listGenerationByEnterpriseId(enterpriseId);
return ServiceResponse.success(CollectionUtils.isEmpty(list) ?
EntityUtil.changeEntityListNew(DataGenerationConfigDTO.class, dataGenerationConfigService.listGenerationByEnterpriseId(-1)) :
EntityUtil.changeEntityListNew(DataGenerationConfigDTO.class, list));
}
@Override
public ServiceResponse<Void> initGenerationConfig(Integer enterpriseId) {
List<DataGenerationConfigDTO> dtoList = EntityUtil.changeEntityListNew(DataGenerationConfigDTO.class,
dataGenerationConfigService.listGenerationByEnterpriseId(-1));
saveGenerationConfig(dtoList.stream().map(e -> e.setEnterpriseId(enterpriseId))
.map(e -> e.setGenerationConfigId(null)).collect(Collectors.toList()));
return ServiceResponse.success();
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/EnterpriseApiServiceImpl.java
......@@ -152,6 +152,8 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
dataConfigApiService.initSingleEffectConfig(enterpriseId);
//业绩指标配置默认数据
dataConfigApiService.initPerformanceConfig(enterpriseId);
//年龄段配置
dataConfigApiService.initGenerationConfig(enterpriseId);
UserDTO userDTO = EntityUtil.changeEntityNew(UserDTO.class, enterpriseDTO);
//新增超级管理员
......
gic-platform-enterprise-service/src/main/resources/mapper/TabDataGenerationConfigMapper.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.gic.enterprise.dao.mapper.TabDataGenerationConfigMapper">
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabDataGenerationConfig">
<id column="generation_config_id" jdbcType="INTEGER" property="generationConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="age_level" jdbcType="INTEGER" property="ageLevel" />
<result column="first_sign" jdbcType="INTEGER" property="firstSign" />
<result column="age_first_value" jdbcType="INTEGER" property="ageFirstValue" />
<result column="second_sign" jdbcType="INTEGER" property="secondSign" />
<result column="age_second_value" jdbcType="INTEGER" property="ageSecondValue" />
<result column="description" jdbcType="VARCHAR" property="description" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
generation_config_id, enterprise_id, age_level, first_sign, age_first_value, second_sign,
age_second_value, description, status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_data_generation_config
where generation_config_id = #{generationConfigId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_data_generation_config
where generation_config_id = #{generationConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabDataGenerationConfig">
insert into tab_data_generation_config (generation_config_id, enterprise_id,
age_level, first_sign, age_first_value,
second_sign, age_second_value, description,
status, create_time, update_time
)
values (#{generationConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{ageLevel,jdbcType=INTEGER}, #{firstSign,jdbcType=INTEGER}, #{ageFirstValue,jdbcType=INTEGER},
#{secondSign,jdbcType=INTEGER}, #{ageSecondValue,jdbcType=INTEGER}, #{description,jdbcType=VARCHAR},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataGenerationConfig">
insert into tab_data_generation_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="generationConfigId != null">
generation_config_id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="ageLevel != null">
age_level,
</if>
<if test="firstSign != null">
first_sign,
</if>
<if test="ageFirstValue != null">
age_first_value,
</if>
<if test="secondSign != null">
second_sign,
</if>
<if test="ageSecondValue != null">
age_second_value,
</if>
<if test="description != null">
description,
</if>
<if test="status != null">
status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="generationConfigId != null">
#{generationConfigId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="ageLevel != null">
#{ageLevel,jdbcType=INTEGER},
</if>
<if test="firstSign != null">
#{firstSign,jdbcType=INTEGER},
</if>
<if test="ageFirstValue != null">
#{ageFirstValue,jdbcType=INTEGER},
</if>
<if test="secondSign != null">
#{secondSign,jdbcType=INTEGER},
</if>
<if test="ageSecondValue != null">
#{ageSecondValue,jdbcType=INTEGER},
</if>
<if test="description != null">
#{description,jdbcType=VARCHAR},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabDataGenerationConfig">
update tab_data_generation_config
<set>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="ageLevel != null">
age_level = #{ageLevel,jdbcType=INTEGER},
</if>
<if test="firstSign != null">
first_sign = #{firstSign,jdbcType=INTEGER},
</if>
<if test="ageFirstValue != null">
age_first_value = #{ageFirstValue,jdbcType=INTEGER},
</if>
<if test="secondSign != null">
second_sign = #{secondSign,jdbcType=INTEGER},
</if>
<if test="ageSecondValue != null">
age_second_value = #{ageSecondValue,jdbcType=INTEGER},
</if>
<if test="description != null">
description = #{description,jdbcType=VARCHAR},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where generation_config_id = #{generationConfigId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataGenerationConfig">
update tab_data_generation_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
age_level = #{ageLevel,jdbcType=INTEGER},
first_sign = #{firstSign,jdbcType=INTEGER},
age_first_value = #{ageFirstValue,jdbcType=INTEGER},
second_sign = #{secondSign,jdbcType=INTEGER},
age_second_value = #{ageSecondValue,jdbcType=INTEGER},
description = #{description,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where generation_config_id = #{generationConfigId,jdbcType=INTEGER}
</update>
<update id="deleteGenerationConfig">
update tab_data_generation_config set status = 0
where enterprise_id = #{enterpriseId}
and status = 1
</update>
<select id="listGenerationByEnterpriseId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_data_generation_config
where enterprise_id = #{enterpriseId}
and status = 1
order by age_level
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/DataConfigController.java
......@@ -3,7 +3,8 @@ package com.gic.enterprise.web.controller;
import java.util.List;
import java.util.stream.Collectors;
import com.gic.enterprise.web.vo.data.MemberConsumeConfigVO;
import com.gic.enterprise.dto.data.*;
import com.gic.enterprise.web.vo.data.*;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -14,17 +15,10 @@ import com.alibaba.fastjson.JSON;
import com.gic.commons.util.StringUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.OperationResultUtils;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.DataConfigApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.enterprise.web.vo.data.ActuallyPaidConfigVO;
import com.gic.enterprise.web.vo.data.DataSingleEffectConfigVO;
import com.gic.enterprise.web.vo.data.PerformanceVO;
@RestController
@RequestMapping("/data-config")
......@@ -101,4 +95,20 @@ public class DataConfigController {
dataConfigApiService.getPerformanceConfig(UserDetailUtils.getUserDetail().getEnterpriseId()),
PerformanceVO.class);
}
@RequestMapping("/config-generation")
public RestResponse configGeneration(List<DataGenerationConfigDTO> dtoList) {
return OperationResultUtils.operationResult(dataConfigApiService.saveGenerationConfig(dtoList.stream()
.map(e -> e.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId())).collect(Collectors.toList())),
OperationResultUtils.LOG_EDIT + "数据统计配置-年龄段配置",
UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
}
@RequestMapping("/get-generation-config")
public RestResponse getGenerationConfig() {
return ResultControllerUtils.commonResult(
dataConfigApiService.listGenerationConfig(UserDetailUtils.getUserDetail().getEnterpriseId()),
GenerationConfigVO.class);
}
}
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/data/GenerationConfigVO.java 0 → 100644
package com.gic.enterprise.web.vo.data;
import java.io.Serializable;
public class GenerationConfigVO implements Serializable{
private static final long serialVersionUID = 5559419377425622656L;
/**
* 档位 1:第一档 2:第二档...
*/
private Integer ageLevel;
/**
* 第一个区间符号 1:小于等于 2:小于 3:大于等于 4:大于
*/
private Integer firstSign;
/**
* 第一个区间值
*/
private Integer ageFirstValue;
/**
* 第二个区间符号 1:小于等于 2:小于 3:大于等于 4:大于不一定有值（第一档和最后一档没有值）
*/
private Integer secondSign;
/**
* 第二个区间值，不一定有值（第一档和最后一档没有值）
*/
private Integer ageSecondValue;
/**
* 展示名称
*/
private String description;
public Integer getAgeLevel() {
return ageLevel;
}
public GenerationConfigVO setAgeLevel(Integer ageLevel) {
this.ageLevel = ageLevel;
return this;
}
public Integer getFirstSign() {
return firstSign;
}
public GenerationConfigVO setFirstSign(Integer firstSign) {
this.firstSign = firstSign;
return this;
}
public Integer getAgeFirstValue() {
return ageFirstValue;
}
public GenerationConfigVO setAgeFirstValue(Integer ageFirstValue) {
this.ageFirstValue = ageFirstValue;
return this;
}
public Integer getSecondSign() {
return secondSign;
}
public GenerationConfigVO setSecondSign(Integer secondSign) {
this.secondSign = secondSign;
return this;
}
public Integer getAgeSecondValue() {
return ageSecondValue;
}
public GenerationConfigVO setAgeSecondValue(Integer ageSecondValue) {
this.ageSecondValue = ageSecondValue;
return this;
}
public String getDescription() {
return description;
}
public GenerationConfigVO setDescription(String description) {
this.description = description;
return this;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment