|
@ -17,6 +17,9 @@ |
|
|
|
|
|
|
|
|
package com.epmet.service.impl; |
|
|
package com.epmet.service.impl; |
|
|
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
|
|
import com.alibaba.fastjson.TypeReference; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; |
|
@ -24,6 +27,8 @@ import com.epmet.commons.tools.constant.FieldConstant; |
|
|
import com.epmet.commons.tools.exception.EpmetErrorCode; |
|
|
import com.epmet.commons.tools.exception.EpmetErrorCode; |
|
|
import com.epmet.commons.tools.exception.RenException; |
|
|
import com.epmet.commons.tools.exception.RenException; |
|
|
import com.epmet.commons.tools.page.PageData; |
|
|
import com.epmet.commons.tools.page.PageData; |
|
|
|
|
|
import com.epmet.commons.tools.redis.RedisKeys; |
|
|
|
|
|
import com.epmet.commons.tools.redis.RedisUtils; |
|
|
import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
import com.epmet.dao.IcFormDao; |
|
|
import com.epmet.dao.IcFormDao; |
|
|
import com.epmet.dto.IcFormDTO; |
|
|
import com.epmet.dto.IcFormDTO; |
|
@ -36,12 +41,15 @@ import com.epmet.redis.CustomerFootBarRedis; |
|
|
import com.epmet.service.IcFormService; |
|
|
import com.epmet.service.IcFormService; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
|
import org.springframework.data.redis.core.RedisTemplate; |
|
|
|
|
|
import org.springframework.data.redis.core.ValueOperations; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
import java.util.Arrays; |
|
|
import java.util.Arrays; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
import java.util.Map; |
|
|
import java.util.Map; |
|
|
|
|
|
import java.util.Optional; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 配置表单 |
|
|
* 配置表单 |
|
@ -54,6 +62,9 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity> |
|
|
@Autowired |
|
|
@Autowired |
|
|
private CustomerFootBarRedis customerFootBarRedis; |
|
|
private CustomerFootBarRedis customerFootBarRedis; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private RedisUtils redisUtils; |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public PageData<IcFormDTO> page(Map<String, Object> params) { |
|
|
public PageData<IcFormDTO> page(Map<String, Object> params) { |
|
|
IPage<IcFormEntity> page = baseDao.selectPage( |
|
|
IPage<IcFormEntity> page = baseDao.selectPage( |
|
@ -134,6 +145,16 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity> |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public List<FormItem> listItems(String customerId, String formCode) { |
|
|
public List<FormItem> listItems(String customerId, String formCode) { |
|
|
|
|
|
// 从redis取
|
|
|
|
|
|
String icFormItemsKey = RedisKeys.getIcFormItemsKey(customerId, formCode); |
|
|
|
|
|
|
|
|
|
|
|
Object objValue = redisUtils.get(icFormItemsKey); |
|
|
|
|
|
if (objValue != null) { |
|
|
|
|
|
return ((JSONArray) objValue).toJavaList(FormItem.class); |
|
|
|
|
|
//return JSON.parseObject((String) objValue, type);
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 从db取
|
|
|
CustomerFormResultDTO formResultDto=baseDao.selectByCode(customerId, formCode); |
|
|
CustomerFormResultDTO formResultDto=baseDao.selectByCode(customerId, formCode); |
|
|
if (null == formResultDto) { |
|
|
if (null == formResultDto) { |
|
|
throw new RenException(EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getCode(),EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getMsg()); |
|
|
throw new RenException(EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getCode(),EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getMsg()); |
|
@ -144,6 +165,9 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity> |
|
|
i.setOptions(baseDao.selectListOption(i.getItemId())); |
|
|
i.setOptions(baseDao.selectListOption(i.getItemId())); |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
// 缓存
|
|
|
|
|
|
redisUtils.set(icFormItemsKey, formItems); |
|
|
|
|
|
|
|
|
return formItems; |
|
|
return formItems; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|