Commit 367d1858 authored by qinhu's avatar qinhu

产值统计优化(减少查询;添加缓存)

parent df0614f4
package cn.wise.sc.cement.business.config; package cn.wise.sc.cement.business.config;
import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.parser.ParserConfig;
import org.redisson.Redisson;
import org.redisson.api.RedissonClient;
import org.redisson.config.Config;
import org.redisson.config.SingleServerConfig;
import org.redisson.config.TransportMode;
import org.springframework.cache.CacheManager; import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
...@@ -83,4 +88,17 @@ public class RedisCacheConfig { ...@@ -83,4 +88,17 @@ public class RedisCacheConfig {
return RedisCacheManager.builder(factory).cacheDefaults(redisCacheConfiguration).build(); return RedisCacheManager.builder(factory).cacheDefaults(redisCacheConfiguration).build();
} }
// @Bean
// public RedissonClient redissonClient() {
// Config config = new Config();
// config.useSingleServer()
// .setAddress("redis://127.0.0.1:6379")
// .setConnectionMinimumIdleSize(10)
// .setConnectionPoolSize(50)
// .setPingConnectionInterval(60)
// .setIdleConnectionTimeout(6000)
// .setConnectTimeout(10000)
// .setTimeout(3000);
// return Redisson.create(config);
// }
} }
...@@ -5,14 +5,12 @@ import cn.wise.sc.cement.business.model.BaseResponse; ...@@ -5,14 +5,12 @@ import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.service.impl.WeiXinService; import cn.wise.sc.cement.business.service.impl.WeiXinService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Date; import java.util.Date;
......
...@@ -28,4 +28,5 @@ public class EntrustSample { ...@@ -28,4 +28,5 @@ public class EntrustSample {
private Integer teamGroupId; private Integer teamGroupId;
private Integer userId; private Integer userId;
private LocalDateTime finishTime; private LocalDateTime finishTime;
private String content;
} }
...@@ -103,7 +103,8 @@ public class NormProduction implements Serializable { ...@@ -103,7 +103,8 @@ public class NormProduction implements Serializable {
* 标准产值详情 * 标准产值详情
*/ */
@Data @Data
public static class NormProductionDetail { public static class NormProductionDetail implements Serializable{
private static final long serialVersionUID = 42L;
private String userName; private String userName;
private Integer distributionId; private Integer distributionId;
private Integer userId; private Integer userId;
......
...@@ -27,6 +27,7 @@ import java.util.Map; ...@@ -27,6 +27,7 @@ import java.util.Map;
@Mapper @Mapper
public interface SampleHandleMapper extends BaseMapper<SampleHandle> { public interface SampleHandleMapper extends BaseMapper<SampleHandle> {
List<SampleHandleVo> getSampleHandleList(@Param("params") Map<String, Object> params); List<SampleHandleVo> getSampleHandleList(@Param("params") Map<String, Object> params);
SampleHandleVo getDetail(Integer id); SampleHandleVo getDetail(Integer id);
...@@ -35,4 +36,6 @@ public interface SampleHandleMapper extends BaseMapper<SampleHandle> { ...@@ -35,4 +36,6 @@ public interface SampleHandleMapper extends BaseMapper<SampleHandle> {
LocalDateTime getNo1AcceptTime(Integer sampleId); LocalDateTime getNo1AcceptTime(Integer sampleId);
List<EntrustSample> getEntrustSample(); List<EntrustSample> getEntrustSample();
List<EntrustSample> getEntrustSampleOptimize(@Param("params") Map<String, Object> params);
} }
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</sql> </sql>
<sql id="sampleDisWhere"> <sql id="sampleDisWhere">
<where> <where>
`status` > 5 `status` > 5 AND d.distribution_id IS NOT NULL
<if test="params.start_time != null and params.start_time != ''"> <if test="params.start_time != null and params.start_time != ''">
and d.finish_time <![CDATA[>=]]> #{params.start_time} and d.finish_time <![CDATA[>=]]> #{params.start_time}
</if> </if>
...@@ -88,13 +88,13 @@ ...@@ -88,13 +88,13 @@
<select id="getEntrustSample" <select id="getEntrustSample"
resultType="cn.wise.sc.cement.business.entity.EntrustSample"> resultType="cn.wise.sc.cement.business.entity.EntrustSample">
SELECT e.project_name,e.entrust_code,g.distribution_id,g.entrust_id,g.`sample_name`,g.user_id,g.sample_id FROM SELECT e.project_name,e.entrust_code,g.distribution_id,g.entrust_id,g.`sample_name`,g.user_id,g.sample_id,e.`status` FROM entrust e
entrust e
RIGHT JOIN RIGHT JOIN
(SELECT s.`name` as sample_name,d.distribution_id,s.entrust_id,d.user_id,s.id as sample_id FROM sample s (SELECT s.`name` as sample_name,d.distribution_id,s.entrust_id,d.user_id,s.id as sample_id FROM sample s
RIGHT JOIN RIGHT JOIN
(SELECT user_id, id as distribution_id,sample_id FROM sample_distribution ) d on s.id = d.sample_id ) g (SELECT user_id, id as distribution_id,sample_id FROM sample_distribution ) d on s.id = d.sample_id ) g
ON g.entrust_id = e.id ON g.entrust_id = e.id
WHERE e.status > 5
</select> </select>
<select id="getSampleDistribution" resultType="cn.wise.sc.cement.business.entity.EntrustSample"> <select id="getSampleDistribution" resultType="cn.wise.sc.cement.business.entity.EntrustSample">
......
...@@ -28,8 +28,21 @@ ...@@ -28,8 +28,21 @@
</if> </if>
</where> </where>
</sql> </sql>
<sql id="sampleDisWhere">
<where>
e.status > 4 AND h.id IS NOT NULL
<if test="params.start_time != null and params.start_time != ''">
and h.finish_time <![CDATA[>=]]> #{params.start_time}
</if>
<if test="params.end_time != null and params.end_time != ''">
and h.finish_time <![CDATA[<=]]> #{params.end_time}
</if>
<if test="params.user_id != null and params.user_id != ''">
and h.user_id = #{params.user_id}
</if>
</where>
</sql>
<select id="getSampleHandleList" resultType="cn.wise.sc.cement.business.model.vo.SampleHandleVo"> <select id="getSampleHandleList" resultType="cn.wise.sc.cement.business.model.vo.SampleHandleVo">
select t.*, p.id as projectId, p.name as projectName, p.code as projectCode, select t.*, p.id as projectId, p.name as projectName, p.code as projectCode,
e.sample_num as sampleNum, e.sample_num as sampleNum,
...@@ -76,7 +89,7 @@ ...@@ -76,7 +89,7 @@
</select> </select>
<select id="getEntrustSample" resultType="cn.wise.sc.cement.business.entity.EntrustSample"> <select id="getEntrustSample" resultType="cn.wise.sc.cement.business.entity.EntrustSample">
SELECT project_name,entrust_code,h.id,s.entrust_id,h.user_id,s.id as sample_id,e.status FROM entrust e SELECT project_name,entrust_code,h.id as distribution_id ,s.entrust_id,h.user_id,s.id as sample_id,e.status FROM entrust e
LEFT JOIN LEFT JOIN
(SELECT * FROM sample) s (SELECT * FROM sample) s
ON e.id = s.entrust_id ON e.id = s.entrust_id
...@@ -85,6 +98,18 @@ ...@@ -85,6 +98,18 @@
ON h.sample_id = s.id ON h.sample_id = s.id
WHERE e.status > 4 AND h.id IS NOT NULL WHERE e.status > 4 AND h.id IS NOT NULL
</select> </select>
<select id="getEntrustSampleOptimize" resultType="cn.wise.sc.cement.business.entity.EntrustSample">
SELECT project_name,entrust_code,h.id,s.entrust_id,h.user_id,s.id as sample_id,e.status,h.content,h.finish_time
FROM entrust e
LEFT JOIN
(SELECT * FROM sample) s
ON e.id = s.entrust_id
LEFT JOIN
(SELECT * FROM sample_handle) h
ON h.sample_id = s.id
<include refid="sampleDisWhere"/>
</select>
</mapper> </mapper>
...@@ -3,8 +3,10 @@ package cn.wise.sc.cement.business.service; ...@@ -3,8 +3,10 @@ package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.EntrustSample; import cn.wise.sc.cement.business.entity.EntrustSample;
import cn.wise.sc.cement.business.entity.SampleHandle; import cn.wise.sc.cement.business.entity.SampleHandle;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
...@@ -18,8 +20,14 @@ public interface ISampleHandleService extends IService<SampleHandle> { ...@@ -18,8 +20,14 @@ public interface ISampleHandleService extends IService<SampleHandle> {
/** /**
* 获取处理信息 * 获取处理信息
*
* @return list * @return list
*/ */
List<EntrustSample> getEntrustSample(); List<EntrustSample> getEntrustSample();
/**
* 根据条件获取处理信息
* @param params 参数条件
* @return
*/
List<EntrustSample> getEntrustSampleOptimize(Map<String, Object> params);
} }
...@@ -5,10 +5,12 @@ import cn.wise.sc.cement.business.entity.SampleHandle; ...@@ -5,10 +5,12 @@ import cn.wise.sc.cement.business.entity.SampleHandle;
import cn.wise.sc.cement.business.mapper.SampleHandleMapper; import cn.wise.sc.cement.business.mapper.SampleHandleMapper;
import cn.wise.sc.cement.business.service.ISampleHandleService; import cn.wise.sc.cement.business.service.ISampleHandleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
...@@ -28,4 +30,9 @@ public class SampleHandleServiceImpl extends ServiceImpl<SampleHandleMapper, Sam ...@@ -28,4 +30,9 @@ public class SampleHandleServiceImpl extends ServiceImpl<SampleHandleMapper, Sam
public List<EntrustSample> getEntrustSample() { public List<EntrustSample> getEntrustSample() {
return sampleHandleMapper.getEntrustSample(); return sampleHandleMapper.getEntrustSample();
} }
@Override
public List<EntrustSample> getEntrustSampleOptimize(Map<String, Object> params) {
return sampleHandleMapper.getEntrustSampleOptimize(params);
}
} }
...@@ -167,15 +167,14 @@ public class RedisUtil { ...@@ -167,15 +167,14 @@ public class RedisUtil {
* 将list集合放入List缓存,并设置时间 * 将list集合放入List缓存,并设置时间
* *
* @param key key值 * @param key key值
* @param value 数据的值 * @param listStr 数据的值
* @param time 缓存的时间 * @param time 缓存的时间
* @return true插入成功,否则返回异常信息 * @return true插入成功,否则返回异常信息
*/ */
public Boolean setListAll(String key, Object value, long time) { public Boolean setListAll(String key, String listStr, long time) {
try { try {
if (time > 0) { if (time > 0) {
redisTemplate.opsForList().rightPushAll(key, value); setString(key,listStr,time);
this.expire(key, time);
return true; return true;
} }
return false; return false;
......
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