zlq 2 роки тому
батько
коміт
00a30a4f4d

+ 0 - 6
src/main/java/com/unissoft/basic/controller/BasicEnumController.java

@@ -5,7 +5,6 @@ import java.util.Date;
5 5
 import java.util.List;
6 6
 
7 7
 import com.unissoft.common.*;
8
-import com.unissoft.mqProducer.Producer;
9 8
 import org.springframework.beans.factory.annotation.Autowired;
10 9
 import org.springframework.http.MediaType;
11 10
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,8 +32,6 @@ import io.swagger.annotations.ApiOperation;
33 32
 @RestController
34 33
 @RequestMapping("/basic-enum")
35 34
 public class BasicEnumController {
36
-    @Autowired
37
-    private Producer producer;
38 35
 
39 36
 	private BasicEnumService enumService;
40 37
 
@@ -68,7 +65,6 @@ public class BasicEnumController {
68 65
     	basicEnum.setUpdateTime(date);
69 66
         boolean save = enumService.save(basicEnum);
70 67
         if (save) {
71
-            producer.send(basicEnum, MessageEnum.SAVE, ServiceEnum.BASIC_ENUM);
72 68
             return ResultView.success();
73 69
         }else {
74 70
             return ResultView.error();
@@ -87,8 +83,6 @@ public class BasicEnumController {
87 83
     	basicEnum.setUpdateTime(new Date());
88 84
         boolean b = enumService.updateById(basicEnum);
89 85
         if (b) {
90
-            //发送消息
91
-            producer.send(basicEnum, MessageEnum.UPDATE,ServiceEnum.BASIC_ENUM);
92 86
             return ResultView.success();
93 87
         }else {
94 88
             return ResultView.error();

+ 0 - 6
src/main/java/com/unissoft/interaction/service/impl/TeDataServiceImpl.java

@@ -14,7 +14,6 @@ import com.unissoft.interaction.mapper.ReMsgMapper;
14 14
 import com.unissoft.interaction.mapper.STaskMapper;
15 15
 import com.unissoft.interaction.mapper.TeDataMapper;
16 16
 import com.unissoft.interaction.service.TeDataService;
17
-import com.unissoft.mqProducer.Producer;
18 17
 import com.unissoft.parameter.mapper.HardwareParameterMapper;
19 18
 import com.unissoft.parameter.model.HardwareParameter;
20 19
 import com.unissoft.systemManage.mapper.NBasicEdgeMapper;
@@ -77,8 +76,6 @@ public class TeDataServiceImpl implements TeDataService {
77 76
     private OrgInfoMapper orgInfoMapper;
78 77
     @Resource
79 78
     private DensityDataMapper densityDataMapper;
80
-    @Resource
81
-    private Producer producer;
82 79
 
83 80
     /**
84 81
      * todo-----------暂时不用
@@ -393,9 +390,6 @@ public class TeDataServiceImpl implements TeDataService {
393 390
 			nBasicEdge.setHStatus("2");
394 391
 		}
395 392
         int insert = nBasicEdgeMapper.insert(nBasicEdge);
396
-        if (insert>0){
397
-            producer.send(nBasicEdge, MessageEnum.SAVE, ServiceEnum.NBASIC_EDGE);
398
-        }
399 393
     }
400 394
 
401 395
     

+ 0 - 87
src/main/java/com/unissoft/mqConsumer/Consumer.java

@@ -1,87 +0,0 @@
1
-package com.unissoft.mqConsumer;
2
-
3
-import com.alibaba.fastjson.JSON;
4
-import com.alibaba.fastjson.JSONObject;
5
-import com.unissoft.mqConsumer.Manager.ServiceManager;
6
-import com.unissoft.parameter.model.HardwareParameter;
7
-import com.unissoft.parameter.service.HardwareParameterService;
8
-import lombok.extern.slf4j.Slf4j;
9
-import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
10
-import org.apache.rocketmq.spring.core.RocketMQListener;
11
-import org.springframework.beans.factory.annotation.Autowired;
12
-import org.springframework.stereotype.Component;
13
-
14
-/**
15
- * ClassName: HardwareParameterConsumer
16
- * Package: com.unissoft.mqConsumer
17
- * Description: 消费者
18
- *
19
- * @Author zlq
20
- * @Create 2023/3/3 10:42
21
- * @Version 1.0
22
- */
23
-@Slf4j
24
-@Component
25
-public class Consumer {
26
-    @Autowired
27
-    private ServiceManager serviceManager;
28
-
29
-
30
-    //库端TOPIK,云端使用
31
-    private final static String topicLocal="TOPIC_LOCAL";
32
-    //云端topic,库端使用
33
-    private final static String topicCloud="TOPIC_CLOUD";
34
-
35
-
36
-    @Component
37
-    @RocketMQMessageListener(topic = topicLocal,consumerGroup = "local")
38
-    public class HPSave implements RocketMQListener<String>{
39
-        @Override
40
-        public void onMessage(String message) {
41
-            if (message == null) {
42
-                log.info("消息为空:{}",message);
43
-                return;
44
-            }
45
-            log.info("接收到的消息:{}",message);
46
-            JSONObject message1 = JSON.parseObject(message);
47
-            JSONObject headers = message1.getJSONObject("headers");
48
-
49
-            String type = headers.getString("type");
50
-            String payload = message1.getString("payload");
51
-            //获取消息所在业务
52
-            String service = headers.getString("service");
53
-
54
-            switch (service){
55
-                case "HD_PARAMETER":
56
-                    serviceManager.HDManager(payload,type);
57
-                    break;
58
-                case "BASIC_ENUM":
59
-                    serviceManager.BasicEnumManager(payload,type);
60
-                    break;
61
-                case "NBASIC_EDGE":
62
-                    serviceManager.NBasicEdgeManager(payload,type);
63
-                    break;
64
-                case "ROLE_INFO":
65
-                    serviceManager.RoleInfoManager(payload,type);
66
-                    break;
67
-                case "USER_INFO":
68
-                    serviceManager.UserInfoManager(payload,type);
69
-                    break;
70
-                case "ORG_INFO":
71
-                    serviceManager.OrgInfoManager(payload,type);
72
-                    break;
73
-                case "ORG_ANNOUNCEMENT":
74
-                    //公告管理
75
-                    serviceManager.OrgAnnouncementManager(payload,type);
76
-                    break;
77
-                case "STORE_HOUSE":
78
-                    //仓房明细
79
-                    serviceManager.StorehouseClxxManager(payload,type);
80
-                    break;
81
-                default:
82
-                    log.info("没有可用的业务类型!!{}",message);
83
-            }
84
-        }
85
-    }
86
-
87
-}

+ 0 - 245
src/main/java/com/unissoft/mqConsumer/Manager/ServiceManager.java

@@ -1,245 +0,0 @@
1
-package com.unissoft.mqConsumer.Manager;
2
-
3
-import com.alibaba.fastjson.JSON;
4
-import com.unissoft.basic.model.BasicEnum;
5
-import com.unissoft.basic.service.BasicEnumService;
6
-import com.unissoft.parameter.model.HardwareParameter;
7
-import com.unissoft.parameter.service.HardwareParameterService;
8
-import com.unissoft.systemManage.model.*;
9
-import com.unissoft.systemManage.service.*;
10
-import lombok.extern.slf4j.Slf4j;
11
-import org.springframework.beans.factory.annotation.Autowired;
12
-import org.springframework.stereotype.Component;
13
-
14
-import javax.annotation.Resource;
15
-
16
-/**
17
- * ClassName: HDManager
18
- * Package: com.unissoft.mqConsumer.Manager
19
- * Description: 接收处理业务数据
20
- *
21
- * @Author zlq
22
- * @Create 2023/3/6 15:08
23
- * @Version 1.0
24
- */
25
-@Slf4j
26
-@Component
27
-public class ServiceManager {
28
-    @Resource
29
-    private RoleInfoService roleInfoService;
30
-    @Resource
31
-    private NBasicEdgeService nBasicEdgeService;
32
-    @Autowired
33
-    private BasicEnumService basicEnumService;
34
-
35
-    @Autowired
36
-    private HardwareParameterService hardwareParameterService;
37
-
38
-    /**
39
-     * 硬件参数
40
-     * @param payload
41
-     * @param type
42
-     */
43
-    public void HDManager(String payload,String type){
44
-        //对不同的业务操作进行处理:SAVE,UPDATE,DELETE;
45
-        switch (type){
46
-            case "SAVE":
47
-                //获取硬件参数对象
48
-                HardwareParameter hardwareParameter = JSON.parseObject(payload, HardwareParameter.class);
49
-                //新增硬件数据
50
-                    boolean save = hardwareParameterService.save(hardwareParameter);
51
-                log.info("新增硬件信息{},是否成功:{}",payload,save);
52
-                break;
53
-            case "UPDATE":
54
-                //获取硬件参数对象
55
-
56
-                HardwareParameter hardwareParameter1 = JSON.parseObject(payload, HardwareParameter.class);
57
-                    boolean b1 = hardwareParameterService.updateById(hardwareParameter1);
58
-                log.info("修改硬件信息{},是否成功:{}",payload,b1);
59
-                break;
60
-            case "DELETE":
61
-                    boolean b2 = hardwareParameterService.removeById(payload);
62
-                log.info("删除硬件id{},是否成功:{}",payload,b2);
63
-                break;
64
-        }
65
-    }
66
-
67
-    /**
68
-     * 字典
69
-     * @param payload
70
-     * @param type
71
-     */
72
-    public void BasicEnumManager(String payload,String type){
73
-        //对不同的业务操作进行处理:SAVE,UPDATE,DELETE;
74
-        switch (type){
75
-            case "SAVE":
76
-                BasicEnum basicEnum = JSON.parseObject(payload, BasicEnum.class);
77
-                boolean save = basicEnumService.save(basicEnum);
78
-                log.info("新增字典{},是否成功:{}",payload,save);
79
-                break;
80
-            case "UPDATE":
81
-                BasicEnum basicEnum1 = JSON.parseObject(payload, BasicEnum.class);
82
-                boolean b = basicEnumService.updateById(basicEnum1);
83
-                log.info("修改字典信息{},是否成功:{}",payload,b);
84
-                break;
85
-        }
86
-    }
87
-
88
-    /**
89
-     *打点的数据查询表
90
-     * @param payload
91
-     * @param type
92
-     */
93
-    public void NBasicEdgeManager(String payload,String type){
94
-        //对不同的业务操作进行处理:SAVE,UPDATE,DELETE;
95
-        switch (type){
96
-            case "SAVE":
97
-                NBasicEdge nBasicEdge = JSON.parseObject(payload, NBasicEdge.class);
98
-                boolean save = nBasicEdgeService.save(nBasicEdge);
99
-                log.info("新增打点的数据信息{},是否成功:{}",payload,save);
100
-                break;
101
-            case "UPDATE":
102
-                NBasicEdge nBasicEdge1 = JSON.parseObject(payload, NBasicEdge.class);
103
-                boolean b = nBasicEdgeService.updateById(nBasicEdge1);
104
-                log.info("修改打点的数据信息{},是否成功:{}",payload,b);
105
-                break;
106
-        }
107
-    }
108
-
109
-
110
-    /**
111
-     *用户角色消息
112
-     * @param payload
113
-     * @param type
114
-     */
115
-    public void RoleInfoManager(String payload,String type){
116
-        //对不同的业务操作进行处理:SAVE,UPDATE,DELETE;
117
-        switch (type){
118
-            case "SAVE":
119
-                RoleInfo roleInfo = JSON.parseObject(payload, RoleInfo.class);
120
-                boolean save = roleInfoService.save(roleInfo);
121
-                log.info("新增角色消息{},是否成功:{}",payload,save);
122
-                break;
123
-            case "UPDATE":
124
-                RoleInfo roleInfo1 = JSON.parseObject(payload, RoleInfo.class);
125
-                boolean b = roleInfoService.updateById(roleInfo1);
126
-                log.info("修改角色消息{},是否成功:{}",payload,b);
127
-                break;
128
-            case "DELETE":
129
-                boolean b2 = roleInfoService.removeById(payload);
130
-                log.info("删除角色id{},是否成功:{}",payload,b2);
131
-                break;
132
-        }
133
-    }
134
-
135
-    @Resource
136
-    private UserInfoService userInfoService;
137
-
138
-    /**
139
-     *用户消息
140
-     * @param payload
141
-     * @param type
142
-     */
143
-    public void UserInfoManager(String payload,String type){
144
-        //对不同的业务操作进行处理:SAVE,UPDATE,DELETE;
145
-        switch (type){
146
-            case "SAVE":
147
-                UserInfo userInfo = JSON.parseObject(payload, UserInfo.class);
148
-                boolean save = userInfoService.save(userInfo);
149
-                log.info("新增用户{},是否成功:{}",payload,save);
150
-                break;
151
-            case "UPDATE":
152
-                UserInfo userInfo1 = JSON.parseObject(payload, UserInfo.class);
153
-                boolean b = userInfoService.updateById(userInfo1);
154
-                log.info("修改用户{},是否成功:{}",payload,b);
155
-                break;
156
-            case "DELETE":
157
-                boolean b2 = userInfoService.removeById(payload);
158
-                log.info("删除用户{},是否成功:{}",payload,b2);
159
-                break;
160
-        }
161
-    }
162
-    @Resource
163
-    private OrgInfoService orgInfoService;
164
-    /**
165
-     *组织机构消息
166
-     * @param payload
167
-     * @param type
168
-     */
169
-    public void OrgInfoManager(String payload,String type){
170
-        //对不同的业务操作进行处理:SAVE,UPDATE,DELETE;
171
-        switch (type){
172
-            case "SAVE":
173
-                OrgInfo orgInfo = JSON.parseObject(payload, OrgInfo.class);
174
-                boolean save = orgInfoService.save(orgInfo);
175
-                log.info("新增组织机构{},是否成功:{}",payload,save);
176
-                break;
177
-            case "UPDATE":
178
-                OrgInfo orgInfo1 = JSON.parseObject(payload, OrgInfo.class);
179
-                boolean b = orgInfoService.updateById(orgInfo1);
180
-                log.info("修改组织机构信息{},是否成功:{}",payload,b);
181
-                break;
182
-            case "DELETE":
183
-                boolean b2 = orgInfoService.removeById(payload);
184
-                log.info("删除组织机构{},是否成功:{}",payload,b2);
185
-                break;
186
-        }
187
-    }
188
-
189
-    @Resource
190
-    private OrgAnnouncementService orgAnnouncementService;
191
-    /**
192
-     * 公告管理
193
-     * @param payload
194
-     * @param type
195
-     */
196
-    public void OrgAnnouncementManager(String payload,String type){
197
-        //对不同的业务操作进行处理:SAVE,UPDATE,DELETE;
198
-        switch (type){
199
-            case "SAVE":
200
-                OrgAnnouncement orgAnnouncement = JSON.parseObject(payload, OrgAnnouncement.class);
201
-                boolean save = orgAnnouncementService.save(orgAnnouncement);
202
-                log.info("新增公告{},是否成功:{}",payload,save);
203
-                break;
204
-            case "UPDATE":
205
-                OrgAnnouncement orgAnnouncement1 = JSON.parseObject(payload, OrgAnnouncement.class);
206
-                boolean b = orgAnnouncementService.updateById(orgAnnouncement1);
207
-                log.info("修改公告{},是否成功:{}",payload,b);
208
-                break;
209
-            case "DELETE":
210
-                boolean b2 = orgAnnouncementService.removeById(payload);
211
-                log.info("删除公告{},是否成功:{}",payload,b2);
212
-                break;
213
-        }
214
-    }
215
-
216
-    @Resource
217
-    private StorehouseClxxService storehouseClxxService;
218
-    /**
219
-     * 仓房明细
220
-     * @param payload
221
-     * @param type
222
-     */
223
-    public void StorehouseClxxManager(String payload,String type){
224
-        //对不同的业务操作进行处理:SAVE,UPDATE,DELETE;
225
-        switch (type){
226
-            case "DELETE_STORE_HOUSE":
227
-                boolean b1 = storehouseClxxService.deleteStorehouse(Integer.parseInt(payload));
228
-                log.info("删除仓房信息{},是否成功:{}",payload,b1);
229
-                break;
230
-            case "UPDATE":
231
-                boolean  b = false;
232
-                try {
233
-                  b = orgInfoService.updateStorehouse(payload);
234
-                } catch (Exception e) {
235
-                    e.printStackTrace();
236
-                }
237
-                log.info("修改仓房明细{},是否成功:{}",payload,b);
238
-                break;
239
-            case "DELETE":
240
-                boolean b2 = storehouseClxxService.removeById(payload);
241
-                log.info("删除仓房明细中的一条{},是否成功:{}",payload,b2);
242
-                break;
243
-        }
244
-    }
245
-}

+ 0 - 63
src/main/java/com/unissoft/mqProducer/Producer.java

@@ -1,63 +0,0 @@
1
-package com.unissoft.mqProducer;
2
-
3
-
4
-import com.unissoft.common.MessageEnum;
5
-import com.unissoft.common.ServiceEnum;
6
-import lombok.extern.slf4j.Slf4j;
7
-import org.apache.rocketmq.client.producer.SendResult;
8
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
9
-import org.springframework.beans.factory.annotation.Autowired;
10
-import org.springframework.beans.factory.annotation.Value;
11
-import org.springframework.messaging.MessageHeaders;
12
-import org.springframework.messaging.support.MessageBuilder;
13
-import org.springframework.stereotype.Component;
14
-
15
-import java.util.HashMap;
16
-import java.util.Map;
17
-
18
-/**
19
- * ClassName: ProService
20
- * Package: com.unissoft.mqProducer
21
- * Description: rocketmq生产者
22
- *
23
- * @Author zlq
24
- * @Create 2023/3/2 9:44
25
- * @Version 1.0
26
- */
27
-@Slf4j
28
-@Component("producer")
29
-public class Producer {
30
-    //库端TOPIK,库端使用
31
-    private final String topicLocal="TOPIC_LOCAL";
32
-    //云端topic,云端使用
33
-    private final String topicCloud="TOPIC_CLOUD";
34
-
35
-    @Autowired
36
-    private RocketMQTemplate rocketMQTemplate;
37
-
38
-    /**
39
-     *
40
-     * @param body 消息内容
41
-     * @param type  消息属性
42
-     */
43
-    public void send(Object body, MessageEnum type, ServiceEnum ser){
44
-//        Map<String, Object> map = new HashMap<>();
45
-//        map.put("type",type);
46
-//        map.put("service",ser);
47
-//        org.springframework.messaging.Message<Object> message = MessageBuilder.createMessage(body, new MessageHeaders(map));
48
-//        rocketMQTemplate.convertAndSend(topicCloud,message);
49
-//        log.info("发送消息:{}",message);
50
-    }
51
-
52
-    /**
53
-     *
54
-     * @param msgBody  同步发送的消息
55
-     * @param tag  消息类型
56
-     * @return
57
-     */
58
-    /*public SendResult sendMsg(String msgBody,String tag) {
59
-        SendResult sendResult = rocketMQTemplate.syncSend(topicLocal+tag, MessageBuilder.withPayload(msgBody).build());
60
-        return sendResult;
61
-    }*/
62
-
63
-}

+ 0 - 7
src/main/java/com/unissoft/parameter/controller/HardwareParameterController.java

@@ -3,7 +3,6 @@ package com.unissoft.parameter.controller;
3 3
 
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.unissoft.common.*;
6
-import com.unissoft.mqProducer.Producer;
7 6
 import com.unissoft.parameter.model.HardwareParameter;
8 7
 import com.unissoft.parameter.service.HardwareParameterService;
9 8
 
@@ -30,9 +29,6 @@ public class HardwareParameterController {
30 29
     private HardwareParameterService hdService;
31 30
 
32 31
     @Autowired
33
-    private Producer producer;
34
-
35
-    @Autowired
36 32
     public void setHardwareParameterController(HardwareParameterService hdService) {
37 33
         this.hdService = hdService;
38 34
     }
@@ -62,7 +58,6 @@ public class HardwareParameterController {
62 58
     	hdParameter.setCreateTime(new Date());
63 59
         boolean save = hdService.save(hdParameter);
64 60
         if (save) {
65
-            producer.send(hdParameter, MessageEnum.SAVE, ServiceEnum.HD_PARAMETER);
66 61
             return ResultView.success();
67 62
         }else
68 63
             return ResultView.error();
@@ -78,7 +73,6 @@ public class HardwareParameterController {
78 73
     public ResultView updateUser(@RequestBody HardwareParameter hdParameter) {
79 74
         boolean b = hdService.updateById(hdParameter);
80 75
         if (b) {
81
-            producer.send(hdParameter, MessageEnum.UPDATE,ServiceEnum.HD_PARAMETER);
82 76
             return ResultView.success();
83 77
         }else
84 78
             return ResultView.error();
@@ -96,7 +90,6 @@ public class HardwareParameterController {
96 90
     public ResultView deleteById(@PathVariable String id) {
97 91
     	boolean b = hdService.removeById(id);
98 92
         if (b) {
99
-            producer.send(id, MessageEnum.DELETE,ServiceEnum.HD_PARAMETER);
100 93
             return ResultView.success();
101 94
         }else
102 95
             return ResultView.error();

+ 3 - 8
src/main/java/com/unissoft/systemManage/controller/NBasicEdgeController.java

@@ -2,8 +2,8 @@ package com.unissoft.systemManage.controller;
2 2
 
3 3
 
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
-import com.unissoft.common.*;
6
-import com.unissoft.mqProducer.Producer;
5
+import com.unissoft.common.PageParam;
6
+import com.unissoft.common.ResultView;
7 7
 import com.unissoft.systemManage.model.LogOperation;
8 8
 import com.unissoft.systemManage.model.NBasicEdge;
9 9
 import com.unissoft.systemManage.model.RoleInfo;
@@ -40,8 +40,6 @@ import javax.servlet.http.HttpServletResponse;
40 40
 @RestController
41 41
 @RequestMapping("/n-basic-edge")
42 42
 public class NBasicEdgeController {
43
-    @Autowired
44
-    private Producer producer;
45 43
 
46 44
     private NBasicEdgeService nBasicEdgeService;
47 45
 
@@ -80,11 +78,9 @@ public class NBasicEdgeController {
80 78
     public ResultView saveRoleInfo(@RequestBody NBasicEdge nBasicEdge) {
81 79
         boolean save = nBasicEdgeService.save(nBasicEdge);
82 80
         if (save) {
83
-            producer.send(nBasicEdge, MessageEnum.SAVE, ServiceEnum.NBASIC_EDGE);
84 81
             return ResultView.success();
85
-        }else {
86
-            return ResultView.error();
87 82
         }
83
+            return ResultView.error();
88 84
     }
89 85
 
90 86
     @ApiOperation(value = "修改扫描规则", notes = "")
@@ -92,7 +88,6 @@ public class NBasicEdgeController {
92 88
     public ResultView updateRoleInfo(@RequestBody NBasicEdge nBasicEdge) {
93 89
         boolean b = nBasicEdgeService.updateById(nBasicEdge);
94 90
         if (b) {
95
-            producer.send(nBasicEdge, MessageEnum.UPDATE, ServiceEnum.NBASIC_EDGE);
96 91
             return ResultView.success();
97 92
         }else {
98 93
             return ResultView.error();

+ 0 - 7
src/main/java/com/unissoft/systemManage/controller/OrgAnnouncementController.java

@@ -3,7 +3,6 @@ package com.unissoft.systemManage.controller;
3 3
 
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.unissoft.common.*;
6
-import com.unissoft.mqProducer.Producer;
7 6
 import com.unissoft.systemManage.model.OrgAnnouncement;
8 7
 import com.unissoft.systemManage.model.UserInfo;
9 8
 import com.unissoft.systemManage.service.OrgAnnouncementService;
@@ -22,8 +21,6 @@ import javax.annotation.Resource;
22 21
 @RestController
23 22
 @RequestMapping("/orgAnnouncement")
24 23
 public class OrgAnnouncementController {
25
-    @Resource
26
-    private Producer producer;
27 24
 
28 25
     private OrgAnnouncementService orgAnnouncementService;
29 26
     @Autowired
@@ -56,8 +53,6 @@ public class OrgAnnouncementController {
56 53
     public ResultView saveUser(@RequestBody OrgAnnouncement announcement) {
57 54
         boolean save = orgAnnouncementService.save(announcement);
58 55
         if (save) {
59
-            //新增公告时同步云端和库端的数据
60
-            producer.send(announcement,MessageEnum.SAVE,ServiceEnum.ORG_ANNOUNCEMENT);
61 56
             return ResultView.success();
62 57
         } else{
63 58
             return ResultView.error();
@@ -68,7 +63,6 @@ public class OrgAnnouncementController {
68 63
     public ResultView updateUser(@RequestBody OrgAnnouncement announcement) {
69 64
         boolean b = orgAnnouncementService.updateById(announcement);
70 65
         if (b) {
71
-            producer.send(announcement,MessageEnum.UPDATE,ServiceEnum.ORG_ANNOUNCEMENT);
72 66
             return ResultView.success();
73 67
         } else{
74 68
             return ResultView.error();
@@ -79,7 +73,6 @@ public class OrgAnnouncementController {
79 73
     @GetMapping("/authority/deleteById/{id}")
80 74
     public ResultView getByIdForUserDelete(@PathVariable String id) {
81 75
         if (orgAnnouncementService.removeById(id)) {
82
-            producer.send(id,MessageEnum.DELETE,ServiceEnum.ORG_ANNOUNCEMENT);
83 76
             return ResultView.success();
84 77
         }
85 78
         return ResultView.error(MyConstant.ID_NULL);

+ 0 - 6
src/main/java/com/unissoft/systemManage/controller/OrgInfoController.java

@@ -4,7 +4,6 @@ package com.unissoft.systemManage.controller;
4 4
 import com.alibaba.fastjson.JSON;
5 5
 import com.unissoft.basic.model.BasicEnum;
6 6
 import com.unissoft.common.*;
7
-import com.unissoft.mqProducer.Producer;
8 7
 import com.unissoft.systemManage.model.OrgInfo;
9 8
 import com.unissoft.systemManage.model.OrgInfoChildren;
10 9
 import com.unissoft.systemManage.service.OrgInfoService;
@@ -27,8 +26,6 @@ import java.util.stream.Collectors;
27 26
 @RestController
28 27
 @RequestMapping("/orgInfo")
29 28
 public class OrgInfoController {
30
-    @Autowired
31
-    private Producer producer;
32 29
 
33 30
     private OrgInfoService orgInfoService;
34 31
 
@@ -55,7 +52,6 @@ public class OrgInfoController {
55 52
         orgInfo.setBuildTime(DateUtils.getDate());
56 53
         boolean save = orgInfoService.save(orgInfo);
57 54
         if (save) {
58
-            producer.send(orgInfo, MessageEnum.SAVE, ServiceEnum.ORG_INFO);
59 55
             return ResultView.success();
60 56
         }else
61 57
             return ResultView.error();
@@ -67,7 +63,6 @@ public class OrgInfoController {
67 63
         orgInfo.setBuildTime(DateUtils.getDate());
68 64
         boolean b = orgInfoService.updateById(orgInfo);
69 65
         if (b) {
70
-            producer.send(orgInfo, MessageEnum.UPDATE, ServiceEnum.ORG_INFO);
71 66
             return ResultView.success();
72 67
         }else
73 68
             return ResultView.error();
@@ -89,7 +84,6 @@ public class OrgInfoController {
89 84
     @GetMapping("/authority/getByIdDelete/{id}")
90 85
     public ResultView getByIdDelete(@PathVariable String id) {
91 86
         if (orgInfoService.removeById(id)) {
92
-            producer.send(id, MessageEnum.DELETE, ServiceEnum.ORG_INFO);
93 87
             return ResultView.success();
94 88
         }
95 89
         return ResultView.error(MyConstant.ID_NULL);

+ 0 - 6
src/main/java/com/unissoft/systemManage/controller/RoleInfoController.java

@@ -3,7 +3,6 @@ package com.unissoft.systemManage.controller;
3 3
 
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.unissoft.common.*;
6
-import com.unissoft.mqProducer.Producer;
7 6
 import com.unissoft.systemManage.model.RoleInfo;
8 7
 import com.unissoft.systemManage.model.UserInfo;
9 8
 import com.unissoft.systemManage.service.RoleInfoService;
@@ -23,8 +22,6 @@ import javax.annotation.Resource;
23 22
 @RestController
24 23
 @RequestMapping("/roleInfo")
25 24
 public class RoleInfoController {
26
-    @Resource
27
-    private Producer producer;
28 25
 
29 26
     private RoleInfoService roleInfoService;
30 27
 
@@ -51,7 +48,6 @@ public class RoleInfoController {
51 48
         roleInfo.setBulidTime(DateUtils.getDate());
52 49
         boolean save = roleInfoService.save(roleInfo);
53 50
         if (save) {
54
-            producer.send(roleInfo, MessageEnum.SAVE, ServiceEnum.ROLE_INFO);
55 51
             return ResultView.success();
56 52
         }else
57 53
             return ResultView.error();
@@ -63,7 +59,6 @@ public class RoleInfoController {
63 59
         roleInfo.setBulidTime(DateUtils.getDate());
64 60
         boolean b = roleInfoService.updateById(roleInfo);
65 61
         if (b) {
66
-            producer.send(roleInfo, MessageEnum.UPDATE, ServiceEnum.ROLE_INFO);
67 62
             return ResultView.success();
68 63
         }else
69 64
             return ResultView.error();
@@ -74,7 +69,6 @@ public class RoleInfoController {
74 69
     public ResultView getByIdDeleteRoleInfo(@PathVariable String id) {
75 70
         boolean  b= roleInfoService.removeById(id);
76 71
         if (b) {
77
-            producer.send(id, MessageEnum.DELETE, ServiceEnum.ROLE_INFO);
78 72
             return ResultView.success();
79 73
         }
80 74
         return ResultView.error(MyConstant.ID_NULL);

+ 0 - 6
src/main/java/com/unissoft/systemManage/controller/StorehouseController.java

@@ -2,7 +2,6 @@ package com.unissoft.systemManage.controller;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.metadata.IPage;
4 4
 import com.unissoft.common.*;
5
-import com.unissoft.mqProducer.Producer;
6 5
 import com.unissoft.systemManage.model.OrgInfo;
7 6
 import com.unissoft.systemManage.service.OrgInfoService;
8 7
 import com.unissoft.systemManage.service.StorehouseClxxService;
@@ -26,8 +25,6 @@ import java.util.Map;
26 25
 @RestController
27 26
 @RequestMapping("/storehouse")
28 27
 public class StorehouseController {
29
-    @Resource
30
-    private Producer producer;
31 28
 
32 29
     private OrgInfoService orgInfoService;
33 30
     private StorehouseClxxService storehouseClxxService;
@@ -67,7 +64,6 @@ public class StorehouseController {
67 64
             e.printStackTrace();
68 65
         }
69 66
         if (b) {
70
-            producer.send(storehouse, MessageEnum.UPDATE, ServiceEnum.STORE_HOUSE);
71 67
             return ResultView.success();
72 68
         } else {
73 69
             return ResultView.error();
@@ -80,7 +76,6 @@ public class StorehouseController {
80 76
     public ResultView deleteStorehouse(@PathVariable Integer id) {
81 77
         boolean flag = storehouseClxxService.deleteStorehouse(id);
82 78
         if (flag) {
83
-            producer.send(id,MessageEnum.DELETE_STORE_HOUSE, ServiceEnum.STORE_HOUSE);
84 79
             return ResultView.success();
85 80
         } else {
86 81
             return ResultView.error(MyConstant.ID_NULL);
@@ -93,7 +88,6 @@ public class StorehouseController {
93 88
     public ResultView deleteStorehouseClxx(@PathVariable String id) {
94 89
         boolean flag = storehouseClxxService.removeById(id);
95 90
         if (flag) {
96
-            producer.send(id,MessageEnum.DELETE, ServiceEnum.STORE_HOUSE);
97 91
             return ResultView.success();
98 92
         } else {
99 93
             return ResultView.error(MyConstant.ID_NULL);

+ 0 - 6
src/main/java/com/unissoft/systemManage/controller/UserInfoController.java

@@ -4,7 +4,6 @@ package com.unissoft.systemManage.controller;
4 4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 5
 import com.baomidou.mybatisplus.core.metadata.IPage;
6 6
 import com.unissoft.common.*;
7
-import com.unissoft.mqProducer.Producer;
8 7
 import com.unissoft.systemManage.model.UserInfo;
9 8
 import com.unissoft.systemManage.service.UserInfoService;
10 9
 import com.unissoft.utils.JWTUtil;
@@ -39,8 +38,6 @@ import java.util.UUID;
39 38
 public class UserInfoController {
40 39
 
41 40
     private UserInfoService userInfoService;
42
-    @Autowired
43
-    private Producer producer;
44 41
 
45 42
     @Autowired
46 43
     public void setUserInfoController(UserInfoService userInfoService) {
@@ -77,7 +74,6 @@ public class UserInfoController {
77 74
         userInfo.setUserId(s);
78 75
         boolean save = userInfoService.save(userInfo);
79 76
         if (save) {
80
-            producer.send(userInfo, MessageEnum.SAVE, ServiceEnum.USER_INFO);
81 77
             return ResultView.success();
82 78
         }else
83 79
             return ResultView.error();
@@ -90,7 +86,6 @@ public class UserInfoController {
90 86
         userInfo.setUserPassword(MD5Util.getMD5(userInfo.getUserPassword()));
91 87
         boolean b = userInfoService.updateById(userInfo);
92 88
         if (b) {
93
-            producer.send(userInfo, MessageEnum.UPDATE, ServiceEnum.USER_INFO);
94 89
             return ResultView.success();
95 90
         }else
96 91
             return ResultView.error();
@@ -100,7 +95,6 @@ public class UserInfoController {
100 95
     @GetMapping("/authority/deleteById/{id}")
101 96
     public ResultView getByIdForUserDelete(@PathVariable String id) {
102 97
         if (userInfoService.removeById(id)) {
103
-            producer.send(id, MessageEnum.DELETE, ServiceEnum.USER_INFO);
104 98
             return ResultView.success();
105 99
         }
106 100
         return ResultView.error(MyConstant.ID_NULL);

+ 0 - 6
src/main/java/com/unissoft/systemManage/service/impl/NBasicEdgeServiceImpl.java

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
10 10
 import com.unissoft.common.MessageEnum;
11 11
 import com.unissoft.common.PageParam;
12 12
 import com.unissoft.common.ServiceEnum;
13
-import com.unissoft.mqProducer.Producer;
14 13
 import com.unissoft.systemManage.mapper.NBasicEdgeMapper;
15 14
 import com.unissoft.systemManage.mapper.PointDataMapper;
16 15
 import com.unissoft.systemManage.model.LogOperation;
@@ -43,8 +42,6 @@ import java.util.List;
43 42
  */
44 43
 @Service
45 44
 public class NBasicEdgeServiceImpl extends ServiceImpl<NBasicEdgeMapper, NBasicEdge> implements NBasicEdgeService  {
46
-	@Resource
47
-	private Producer producer;
48 45
 
49 46
     @Resource
50 47
     private NBasicEdgeMapper nBasicEdgeMapper;
@@ -149,9 +146,6 @@ public class NBasicEdgeServiceImpl extends ServiceImpl<NBasicEdgeMapper, NBasicE
149 146
 
150 147
 
151 148
 		int i = nBasicEdgeMapper.insert(nBasicEdge);
152
-		if (i>=0){
153
-			producer.send(nBasicEdge, MessageEnum.SAVE, ServiceEnum.NBASIC_EDGE);
154
-		}
155 149
 		return i;
156 150
 	}
157 151
 

+ 2 - 8
src/main/resources/bootstrap.yml

@@ -13,8 +13,9 @@ spring:
13 13
     driver-class-name: com.mysql.cj.jdbc.Driver
14 14
     #username: root
15 15
     #password: 123456
16
-    url: jdbc:mysql://101.36.160.140:31004/numberEC?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
16
+#    url: jdbc:mysql://101.36.160.140:31004/numberEC?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
17 17
 #    url: jdbc:mysql://192.168.8.101:3306/numberEC?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
18
+    url: jdbc:mysql://localhost:3306/numberec?characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
18 19
     username: root
19 20
 #    password: 123456
20 21
     password: 123456
@@ -65,11 +66,4 @@ mybatis-plus:
65 66
 # 操作日志版本号,或启动时写入
66 67
 version: 20121021
67 68
 
68
-#rocketmq:
69
-#  name-server: 192.168.8.142:9876 # 访问地址
70
-#  producer:
71
-#    group: Grouplocal # 必须指定group
72
-#    send-message-timeout: 3000 # 消息发送超时时长,默认3s
73
-#    retry-times-when-send-failed: 3 # 同步发送消息失败重试次数,默认2
74
-#    retry-times-when-send-async-failed: 3 # 异步发送消息失败重试次数,默认2
75 69