Преглед изворни кода

添加bus实现自动刷新配置信息

my-csc-config-file.git пре 5 година
родитељ
комит
440c14cc99

+ 2 - 13
pom.xml

@@ -41,10 +41,10 @@
41 41
             <groupId>org.springframework.boot</groupId>
42 42
             <artifactId>spring-boot-starter-actuator</artifactId>
43 43
         </dependency>
44
-        <!-- <dependency>
44
+         <dependency>
45 45
              <groupId>org.springframework.cloud</groupId>
46 46
              <artifactId>spring-cloud-starter-bus-amqp</artifactId>
47
-         </dependency>-->
47
+         </dependency>
48 48
         <!--spring boot-->
49 49
         <dependency>
50 50
             <groupId>org.springframework.boot</groupId>
@@ -125,17 +125,6 @@
125 125
             <artifactId>spring-boot-configuration-processor</artifactId>
126 126
             <optional>true</optional>
127 127
         </dependency>
128
-        <!-- 引入spring boot自带的pagehelper插件 -->
129
-        <dependency>
130
-            <groupId>com.github.pagehelper</groupId>
131
-            <artifactId>pagehelper</artifactId>
132
-            <version>5.1.10</version>
133
-        </dependency>
134
-        <dependency>
135
-            <groupId>com.github.jsqlparser</groupId>
136
-            <artifactId>jsqlparser</artifactId>
137
-            <version>3.1</version>
138
-        </dependency>
139 128
     </dependencies>
140 129
 
141 130
     <build>

+ 8 - 11
src/main/java/com/unissoft/grainManage/service/impl/GrainConditionRecordServiceImpl.java

@@ -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
 /**

+ 5 - 15
src/main/java/com/unissoft/ventilation/controller/ProcessAuditController.java

@@ -1,28 +1,18 @@
1 1
 package com.unissoft.ventilation.controller;
2 2
 
3 3
 
4
-import java.util.List;
5
-import java.util.Map;
6
-
7
-
8 4
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
9
-import org.springframework.beans.factory.annotation.Autowired;
10
-import org.springframework.web.bind.annotation.GetMapping;
11
-import org.springframework.web.bind.annotation.PathVariable;
12
-import org.springframework.web.bind.annotation.PostMapping;
13
-import org.springframework.web.bind.annotation.RequestBody;
14
-import org.springframework.web.bind.annotation.RequestMapping;
15
-
16
-import org.springframework.web.bind.annotation.RestController;
17
-
18
-import com.github.pagehelper.PageInfo;
19 5
 import com.unissoft.model.ProcessAudit;
20 6
 import com.unissoft.result.PageParam;
21 7
 import com.unissoft.result.ResultView;
22 8
 import com.unissoft.ventilation.service.ProcessAuditService;
23
-
24 9
 import io.swagger.annotations.Api;
25 10
 import io.swagger.annotations.ApiOperation;
11
+import org.springframework.beans.factory.annotation.Autowired;
12
+import org.springframework.web.bind.annotation.*;
13
+
14
+import java.util.List;
15
+import java.util.Map;
26 16
 
27 17
 /**
28 18
  * <p>

+ 2 - 14
src/main/java/com/unissoft/ventilation/service/impl/ProcessSubServiceImpl.java

@@ -1,21 +1,9 @@
1 1
 package com.unissoft.ventilation.service.impl;
2 2
 
3
-import com.unissoft.model.ProcessSub;
4
-import com.unissoft.result.PageParam;
5
-import com.unissoft.MyConstant;
3
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 4
 import com.unissoft.mapper.ProcessSubMapper;
5
+import com.unissoft.model.ProcessSub;
7 6
 import com.unissoft.ventilation.service.ProcessSubService;
8
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9
-import com.github.pagehelper.PageHelper;
10
-import com.github.pagehelper.PageInfo;
11
-import com.google.common.collect.Maps;
12
-
13
-import java.util.HashMap;
14
-import java.util.List;
15
-
16
-import org.apache.commons.lang.StringUtils;
17
-import org.json.JSONObject;
18
-import org.springframework.beans.factory.annotation.Autowired;
19 7
 import org.springframework.stereotype.Service;
20 8
 
21 9
 /**