|
|
@@ -1,33 +1,30 @@
|
|
1
|
1
|
package com.unissoft.grainManage.service.impl;
|
|
2
|
2
|
|
|
3
|
|
-import cn.hutool.core.util.StrUtil;
|
|
4
|
3
|
import com.alibaba.fastjson.JSON;
|
|
5
|
4
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
6
|
5
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
7
|
6
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
8
|
|
-import com.github.pagehelper.PageHelper;
|
|
9
|
|
-import com.github.pagehelper.PageInfo;
|
|
10
|
7
|
import com.unissoft.MyConstant;
|
|
|
8
|
+import com.unissoft.grainManage.service.GrainConditionRecordService;
|
|
11
|
9
|
import com.unissoft.mapper.GrainAbnormalDescribeMapper;
|
|
12
|
10
|
import com.unissoft.mapper.GrainCheckChooseRecordMapper;
|
|
13
|
11
|
import com.unissoft.mapper.GrainConditionRecordMapper;
|
|
14
|
12
|
import com.unissoft.mapper.SysResourceRoleMapper;
|
|
15
|
|
-import com.unissoft.model.*;
|
|
|
13
|
+import com.unissoft.model.GrainAbnormalDescribe;
|
|
|
14
|
+import com.unissoft.model.GrainCheckChooseRecord;
|
|
|
15
|
+import com.unissoft.model.GrainConditionRecord;
|
|
|
16
|
+import com.unissoft.model.SysResourceRole;
|
|
16
|
17
|
import com.unissoft.result.PageParam;
|
|
17
|
|
-import com.unissoft.grainManage.service.GrainConditionRecordService;
|
|
18
|
|
-import com.unissoft.result.ResultView;
|
|
19
|
|
-import com.unissoft.utils.DateUtil;
|
|
20
|
18
|
import org.apache.commons.lang.ObjectUtils;
|
|
21
|
19
|
import org.json.JSONObject;
|
|
22
|
20
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
23
|
|
-import org.springframework.data.redis.core.RedisTemplate;
|
|
24
|
|
-import org.springframework.data.redis.core.StringRedisTemplate;
|
|
25
|
21
|
import org.springframework.stereotype.Service;
|
|
26
|
22
|
import org.springframework.transaction.annotation.Transactional;
|
|
27
|
23
|
import org.springframework.util.StringUtils;
|
|
28
|
24
|
|
|
29
|
|
-import java.util.*;
|
|
30
|
|
-import java.util.concurrent.TimeUnit;
|
|
|
25
|
+import java.util.ArrayList;
|
|
|
26
|
+import java.util.List;
|
|
|
27
|
+import java.util.Map;
|
|
31
|
28
|
import java.util.stream.Collectors;
|
|
32
|
29
|
|
|
33
|
30
|
/**
|