云端与库端数据同步；

src/main/java/com/unissoft/common/LogAspect.java

@@ -101,11 +101,11 @@ public class LogAspect {
 //                System.out.println("login--->" + JSON.toJSONString(userInfo));
                 operlog.setUserId(userInfo.getUserId()); // 请求用户ID
                 operlog.setUserName(userInfo.getUserName()); // 请求用户名称
-                operlog.setOrgId(Integer.parseInt(userInfo.getOrgId())); // 请求用户组织机构编码
+                operlog.setOrgId(Long.parseLong(userInfo.getOrgId())); // 请求用户组织机构编码
             } else {
                 operlog.setUserId("admin"); // 请求用户ID
                 operlog.setUserName("admin"); // 请求用户名称
-                operlog.setOrgId(3); // 请求用户组织机构编码
+                operlog.setOrgId(3L); // 请求用户组织机构编码
             }
             operlog.setOperIp(IPUtils.getRemoteIP(request)); // 请求IP
             operlog.setOperUri(request.getRequestURI()); // 请求URI

src/main/java/com/unissoft/common/MessageEnum.java

@@ -14,8 +14,15 @@ import java.util.Map;
  * @Version 1.0
  */
 public enum MessageEnum {
-    SAVE,UPDATE,DELETE;
+    SAVE("通用添加"),
+    UPDATE("通用修改"),
+    DELETE("通用修改"),
 
-    private Map Param;
+    DELETE_STORE_HOUSE("删除仓房信息同时删除储粮信息");
 
+    private String explain;
+
+    MessageEnum(String explain) {
+        this.explain = explain;
+    }
 }

src/main/java/com/unissoft/common/ServiceEnum.java

@@ -17,8 +17,9 @@ public enum ServiceEnum {
     NBASIC_EDGE(3),
     ROLE_INFO(4),
     ORG_INFO(5),
-    STOREHOUSE_CLXX(6),
-    USER_INFO(7);
+    ORG_ANNOUNCEMENT(6),
+    USER_INFO(7),
+    STORE_HOUSE(8);
 
 
 

src/main/java/com/unissoft/interaction/service/impl/TeDataServiceImpl.java

@@ -2,6 +2,8 @@ package com.unissoft.interaction.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.unissoft.common.MessageEnum;
+import com.unissoft.common.ServiceEnum;
 import com.unissoft.interaction.algorithm.CylinderAlg;
 import com.unissoft.interaction.entity.DensityData;
 import com.unissoft.interaction.entity.ReMsg;
@@ -12,6 +14,7 @@ import com.unissoft.interaction.mapper.ReMsgMapper;
 import com.unissoft.interaction.mapper.STaskMapper;
 import com.unissoft.interaction.mapper.TeDataMapper;
 import com.unissoft.interaction.service.TeDataService;
+import com.unissoft.mqProducer.Producer;
 import com.unissoft.parameter.mapper.HardwareParameterMapper;
 import com.unissoft.parameter.model.HardwareParameter;
 import com.unissoft.systemManage.mapper.NBasicEdgeMapper;
@@ -76,7 +79,8 @@ public class TeDataServiceImpl implements TeDataService {
     private OrgInfoMapper orgInfoMapper;
     @Resource
     private DensityDataMapper densityDataMapper;
-    
+    @Resource
+    private Producer producer;
 
     /**
      * todo-----------暂时不用
@@ -390,8 +394,10 @@ public class TeDataServiceImpl implements TeDataService {
 		}else if (v - lkVolume <0){//入库
 			nBasicEdge.setHStatus("2");
 		}
-		 nBasicEdgeMapper.insert(nBasicEdge);
-		
+        int insert = nBasicEdgeMapper.insert(nBasicEdge);
+        if (insert>0){
+            producer.send(nBasicEdge, MessageEnum.SAVE, ServiceEnum.NBASIC_EDGE);
+        }
     }
 
     

src/main/java/com/unissoft/mqConsumer/Consumer.java

@@ -10,12 +10,11 @@ import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 
 /**
  * ClassName: HardwareParameterConsumer
  * Package: com.unissoft.mqConsumer
- * Description: 硬件参数 消息消费者
+ * Description: 消费者
  *
  * @Author zlq
  * @Create 2023/3/3 10:42
@@ -28,13 +27,11 @@ public class Consumer {
     private ServiceManager serviceManager;
 
 
-    private final String topic = "TOPIC_LOCAL";
     //库端TOPIK，云端使用
     private final String topicLocal="TOPIC_LOCAL";
     //云端topic,库端使用
     private final String topicCloud="TOPIC_CLOUD";
 
-    private final String consumerGroup = "consumerGroup";
 
     @Component
     @RocketMQMessageListener(topic = topicLocal,consumerGroup = "local")
@@ -73,8 +70,16 @@ public class Consumer {
                 case "ORG_INFO":
                     serviceManager.OrgInfoManager(payload,type);
                     break;
+                case "ORG_ANNOUNCEMENT":
+                    //公告管理
+                    serviceManager.OrgAnnouncementManager(payload,type);
+                    break;
+                case "STORE_HOUSE":
+                    //仓房明细
+                    serviceManager.StorehouseClxxManager(payload,type);
+                    break;
                 default:
-                    log.info("没有可用的业务类型！！");
+                    log.info("没有可用的业务类型！！{}",message);
             }
         }
     }

src/main/java/com/unissoft/mqConsumer/Manager/ServiceManager.java

@@ -181,7 +181,64 @@ public class ServiceManager {
                 break;
             case "DELETE":
                 boolean b2 = orgInfoService.removeById(payload);
-                log.info("删除组织机构id{},是否成功：{}",payload,b2);
+                log.info("删除组织机构{},是否成功：{}",payload,b2);
+                break;
+        }
+    }
+
+    @Resource
+    private OrgAnnouncementService orgAnnouncementService;
+    /**
+     * 公告管理
+     * @param payload
+     * @param type
+     */
+    public void OrgAnnouncementManager(String payload,String type){
+        //对不同的业务操作进行处理：SAVE,UPDATE,DELETE;
+        switch (type){
+            case "SAVE":
+                OrgAnnouncement orgAnnouncement = JSON.parseObject(payload, OrgAnnouncement.class);
+                boolean save = orgAnnouncementService.save(orgAnnouncement);
+                log.info("新增公告{},是否成功：{}",payload,save);
+                break;
+            case "UPDATE":
+                OrgAnnouncement orgAnnouncement1 = JSON.parseObject(payload, OrgAnnouncement.class);
+                boolean b = orgAnnouncementService.updateById(orgAnnouncement1);
+                log.info("修改公告{},是否成功：{}",payload,b);
+                break;
+            case "DELETE":
+                boolean b2 = orgAnnouncementService.removeById(payload);
+                log.info("删除公告{},是否成功：{}",payload,b2);
+                break;
+        }
+    }
+
+    @Resource
+    private StorehouseClxxService storehouseClxxService;
+    /**
+     * 仓房明细
+     * @param payload
+     * @param type
+     */
+    public void StorehouseClxxManager(String payload,String type){
+        //对不同的业务操作进行处理：SAVE,UPDATE,DELETE;
+        switch (type){
+            case "DELETE_STORE_HOUSE":
+                boolean b1 = storehouseClxxService.deleteStorehouse(Integer.parseInt(payload));
+                log.info("删除仓房信息{},是否成功：{}",payload,b1);
+                break;
+            case "UPDATE":
+                boolean  b = false;
+                try {
+                  b = orgInfoService.updateStorehouse(payload);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                log.info("修改仓房明细{},是否成功：{}",payload,b);
+                break;
+            case "DELETE":
+                boolean b2 = storehouseClxxService.removeById(payload);
+                log.info("删除仓房明细中的一条{},是否成功：{}",payload,b2);
                 break;
         }
     }

src/main/java/com/unissoft/parameter/model/HardwareParameter.java

@@ -33,7 +33,7 @@ public class HardwareParameter implements Serializable {
 
     @ApiModelProperty(value = "仓房id")
     @TableField("house_id")
-    private Integer houseId;
+    private Long houseId;
 
     @ApiModelProperty(value = "设备名称")
     @TableField("device_name")
@@ -63,11 +63,11 @@ public class HardwareParameter implements Serializable {
 		this.id = id;
 	}
 
-	public Integer getHouseId() {
+	public Long getHouseId() {
 		return houseId;
 	}
 
-	public void setHouseId(Integer houseId) {
+	public void setHouseId(Long houseId) {
 		this.houseId = houseId;
 	}
 

src/main/java/com/unissoft/systemManage/controller/OrgAnnouncementController.java

@@ -3,6 +3,7 @@ package com.unissoft.systemManage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.unissoft.common.*;
+import com.unissoft.mqProducer.Producer;
 import com.unissoft.systemManage.model.OrgAnnouncement;
 import com.unissoft.systemManage.model.UserInfo;
 import com.unissoft.systemManage.service.OrgAnnouncementService;
@@ -11,6 +12,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+
 /**
  * 公告管理
  * @author mengy
@@ -19,6 +22,8 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/orgAnnouncement")
 public class OrgAnnouncementController {
+    @Resource
+    private Producer producer;
 
     private OrgAnnouncementService orgAnnouncementService;
     @Autowired
@@ -51,6 +56,8 @@ public class OrgAnnouncementController {
     public ResultView saveUser(@RequestBody OrgAnnouncement announcement) {
         boolean save = orgAnnouncementService.save(announcement);
         if (save) {
+            //新增公告时同步云端和库端的数据
+            producer.send(announcement,MessageEnum.SAVE,ServiceEnum.ORG_ANNOUNCEMENT);
             return ResultView.success();
         } else{
             return ResultView.error();
@@ -61,6 +68,7 @@ public class OrgAnnouncementController {
     public ResultView updateUser(@RequestBody OrgAnnouncement announcement) {
         boolean b = orgAnnouncementService.updateById(announcement);
         if (b) {
+            producer.send(announcement,MessageEnum.UPDATE,ServiceEnum.ORG_ANNOUNCEMENT);
             return ResultView.success();
         } else{
             return ResultView.error();
@@ -71,6 +79,7 @@ public class OrgAnnouncementController {
     @GetMapping("/authority/deleteById/{id}")
     public ResultView getByIdForUserDelete(@PathVariable String id) {
         if (orgAnnouncementService.removeById(id)) {
+            producer.send(id,MessageEnum.DELETE,ServiceEnum.ORG_ANNOUNCEMENT);
             return ResultView.success();
         }
         return ResultView.error(MyConstant.ID_NULL);

src/main/java/com/unissoft/systemManage/controller/StorehouseController.java

@@ -1,10 +1,8 @@
 package com.unissoft.systemManage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.unissoft.common.MyConstant;
-import com.unissoft.common.PageParam;
-import com.unissoft.common.ResultView;
-import com.unissoft.common.SystemLog;
+import com.unissoft.common.*;
+import com.unissoft.mqProducer.Producer;
 import com.unissoft.systemManage.model.OrgInfo;
 import com.unissoft.systemManage.service.OrgInfoService;
 import com.unissoft.systemManage.service.StorehouseClxxService;
@@ -13,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -27,6 +26,8 @@ import java.util.Map;
 @RestController
 @RequestMapping("/storehouse")
 public class StorehouseController {
+    @Resource
+    private Producer producer;
 
     private OrgInfoService orgInfoService;
     private StorehouseClxxService storehouseClxxService;
@@ -66,6 +67,7 @@ public class StorehouseController {
             e.printStackTrace();
         }
         if (b) {
+            producer.send(storehouse, MessageEnum.UPDATE, ServiceEnum.STORE_HOUSE);
             return ResultView.success();
         } else {
             return ResultView.error();
@@ -78,6 +80,7 @@ public class StorehouseController {
     public ResultView deleteStorehouse(@PathVariable Integer id) {
         boolean flag = storehouseClxxService.deleteStorehouse(id);
         if (flag) {
+            producer.send(id,MessageEnum.DELETE_STORE_HOUSE, ServiceEnum.STORE_HOUSE);
             return ResultView.success();
         } else {
             return ResultView.error(MyConstant.ID_NULL);
@@ -90,6 +93,7 @@ public class StorehouseController {
     public ResultView deleteStorehouseClxx(@PathVariable String id) {
         boolean flag = storehouseClxxService.removeById(id);
         if (flag) {
+            producer.send(id,MessageEnum.DELETE, ServiceEnum.STORE_HOUSE);
             return ResultView.success();
         } else {
             return ResultView.error(MyConstant.ID_NULL);

src/main/java/com/unissoft/systemManage/model/LogOperation.java

@@ -40,7 +40,7 @@ public class LogOperation implements Serializable {
 
     @ApiModelProperty(value = "组织机构编码")
     @TableField("org_id")
-    private Integer orgId;
+    private Long orgId;
 
     @ApiModelProperty(value = "操作时间")
     @TableField("oper_time")

src/main/java/com/unissoft/systemManage/model/NBasicEdge.java

@@ -28,8 +28,8 @@ public class NBasicEdge implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
     
     @ApiModelProperty(value = "直属库")
     @TableField("zsk")

src/main/java/com/unissoft/systemManage/model/OrgAnnouncement.java

@@ -28,8 +28,8 @@ public class OrgAnnouncement implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "公告管理")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
 
     @ApiModelProperty(value = "公告标题")
     @TableField("title")

src/main/java/com/unissoft/systemManage/model/StorehouseClxx.java

@@ -40,7 +40,7 @@ public class StorehouseClxx implements Serializable {
 
     @ApiModelProperty(value = "组织机构ID")
     @TableField("org_id")
-    private Integer orgId;
+    private Long orgId;
 
     @ApiModelProperty(value = "品种")
     @TableField("pz")

src/main/java/com/unissoft/systemManage/service/impl/LogOperationServiceImpl.java

@@ -42,7 +42,7 @@ public class LogOperationServiceImpl extends ServiceImpl<LogOperationMapper, Log
         if (!StringUtils.isEmpty(condition)) {
             LogOperation operation = JSON.parseObject(condition, LogOperation.class);
             // 获取查询条件
-            Integer orgId = operation.getOrgId();
+            Long orgId = operation.getOrgId();
             String userId = operation.getUserId();
             if (!StringUtils.isEmpty(orgId)) {
                 queryWrapper.eq("org_id", orgId);

src/main/java/com/unissoft/systemManage/service/impl/OrgInfoServiceImpl.java

@@ -164,7 +164,10 @@ public class OrgInfoServiceImpl extends ServiceImpl<OrgInfoMapper, OrgInfo> impl
         bke.setInputTime(new Date());
         bke.setPz(orgInfo.getPz());
         bke.setDj(orgInfo.getDj());
-        bke.setCrlsrl(new BigDecimal(orgInfo.getCnlsrz()));
+        if (!StringUtils.isEmpty(orgInfo.getCnlsrz())) {
+            bke.setCrlsrl(new BigDecimal(orgInfo.getCnlsrz()));
+        }
+
         
         if(null !=orgInfo.getId()){
         	  b = orgInfoMapper.updateById(orgInfo);