From db160b5ad757900d4e4b923b4a1d993738738681 Mon Sep 17 00:00:00 2001
From: Administrator <1923636941@qq.com>
Date: Wed, 19 Apr 2023 11:58:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=B1=9F-=E5=90=88=E4=BD=9C=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/water/controller/CallBackController.java    |  4 +++-
 .../FrontierProtectionDevCurrentDataServiceImpl.java   |  2 +-
 .../xmgl/modules/gt/entity/GtMaterialContract.java     |  2 +-
 .../gt/entity/GtMaterialContractArrivalAcceptance.java |  4 ++--
 .../gt/entity/GtMaterialContractPaymentRecord.java     |  4 ++--
 .../zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java  |  2 +-
 .../gt/entity/GtMaterialDeviceMaintenanceRecord.java   |  4 ++--
 .../GtMaterialDeviceMandatoryInspectionRecord.java     |  4 ++--
 .../modules/gt/entity/GtMaterialInOutWarehouse.java    |  2 +-
 .../GtMaterialPointCheckIntoWarehouseDetail.java       |  4 ++--
 .../gt/entity/GtMaterialPurchaseDemandPlanning.java    |  2 +-
 .../gt/entity/GtMaterialSupplierEvaluationRecord.java  |  2 +-
 .../zhgd/xmgl/modules/gt/entity/GtMaterialTender.java  |  2 +-
 .../xmgl/modules/gt/entity/GtMaterialTenderBid.java    |  4 ++--
 .../xmgl/modules/gt/entity/GtMaterialTenderRecord.java |  4 ++--
 .../zhgd/xmgl/modules/gt/entity/GtMaterialVendor.java  |  2 +-
 .../worker/service/impl/EnterpriseInfoServiceImpl.java | 10 +++++++++-
 17 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/device/water/controller/CallBackController.java b/src/main/java/com/zhgd/xmgl/device/water/controller/CallBackController.java
index f2e7234ff..b2ed4e4c2 100644
--- a/src/main/java/com/zhgd/xmgl/device/water/controller/CallBackController.java
+++ b/src/main/java/com/zhgd/xmgl/device/water/controller/CallBackController.java
@@ -3,6 +3,7 @@ package com.zhgd.xmgl.device.water.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.xmgl.async.AsyncDoubleCarbon;
 import com.zhgd.xmgl.device.water.util.MeterUtils;
 import com.zhgd.xmgl.device.water.util.ParserDataUtils;
@@ -107,7 +108,7 @@ public class CallBackController {
 
 
     @PostMapping("/xmgl/callback/waterMeterInfo/v2")
-    public void uploadMeterInfoV2(@RequestBody String bodyStr) {
+    public Result uploadMeterInfoV2(@RequestBody String bodyStr) {
         log.info("=====bodyStr:" + bodyStr);
         logger.info("水表回调接收数据=====bodyStr :" + bodyStr);
         JSONObject jsonObject = JSONObject.parseObject(bodyStr);
@@ -156,6 +157,7 @@ public class CallBackController {
         } else if ("commandResponse".equals(jsonObject.getString("messageType"))) {
 
         }
+        return Result.ok();
     }
 
     public static void main(String[] args) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevCurrentDataServiceImpl.java
index bf44e39c1..0b8e7ee23 100644
--- a/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevCurrentDataServiceImpl.java
@@ -114,4 +114,4 @@ public class FrontierProtectionDevCurrentDataServiceImpl extends ServiceImpl<Fro
         }
         return currentDataList;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContract.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContract.java
index 3ceffaee9..c20100fac 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContract.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContract.java
@@ -26,7 +26,7 @@ public class GtMaterialContract implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**签订日期*/
 	@Excel(name = "签订日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContractArrivalAcceptance.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContractArrivalAcceptance.java
index 9672019d4..afd49b4ed 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContractArrivalAcceptance.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContractArrivalAcceptance.java
@@ -26,11 +26,11 @@ public class GtMaterialContractArrivalAcceptance implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**合同id*/
 	@Excel(name = "合同id", width = 15)
    @ApiModelProperty(value="合同id")
-	private java.lang.Integer gtMaterialContractId  ;
+	private java.lang.Long gtMaterialContractId  ;
 	/**到货数量*/
 	@Excel(name = "到货数量", width = 15)
    @ApiModelProperty(value="到货数量")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContractPaymentRecord.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContractPaymentRecord.java
index f2f3000ec..1943234ad 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContractPaymentRecord.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContractPaymentRecord.java
@@ -26,11 +26,11 @@ public class GtMaterialContractPaymentRecord implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**合同id*/
 	@Excel(name = "合同id", width = 15)
    @ApiModelProperty(value="合同id")
-	private java.lang.Integer gtMaterialContractId  ;
+	private java.lang.Long gtMaterialContractId  ;
 	/**申请付款金额*/
 	@Excel(name = "申请付款金额", width = 15)
    @ApiModelProperty(value="申请付款金额")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java
index bb5928fd9..e22cc2fdd 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java
@@ -26,7 +26,7 @@ public class GtMaterialDevice implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**设备名称*/
 	@Excel(name = "设备名称", width = 15)
    @ApiModelProperty(value="设备名称")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDeviceMaintenanceRecord.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDeviceMaintenanceRecord.java
index ae55484eb..8307c5ba9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDeviceMaintenanceRecord.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDeviceMaintenanceRecord.java
@@ -26,11 +26,11 @@ public class GtMaterialDeviceMaintenanceRecord implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**设备id*/
 	@Excel(name = "设备id", width = 15)
    @ApiModelProperty(value="设备id")
-	private java.lang.Integer gtMaterialDeviceId  ;
+	private java.lang.Long gtMaterialDeviceId  ;
 	/**维保单位*/
 	@Excel(name = "维保单位", width = 15)
    @ApiModelProperty(value="维保单位")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDeviceMandatoryInspectionRecord.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDeviceMandatoryInspectionRecord.java
index 4e9b0d1ca..6c286ea71 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDeviceMandatoryInspectionRecord.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDeviceMandatoryInspectionRecord.java
@@ -26,11 +26,11 @@ public class GtMaterialDeviceMandatoryInspectionRecord implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**设备id*/
 	@Excel(name = "设备id", width = 15)
    @ApiModelProperty(value="设备id")
-	private java.lang.Integer gtMaterialDeviceId  ;
+	private java.lang.Long gtMaterialDeviceId  ;
 	/**强制检验单位*/
 	@Excel(name = "强制检验单位", width = 15)
    @ApiModelProperty(value="强制检验单位")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialInOutWarehouse.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialInOutWarehouse.java
index 3c7baa252..6f4000089 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialInOutWarehouse.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialInOutWarehouse.java
@@ -26,7 +26,7 @@ public class GtMaterialInOutWarehouse implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**编号*/
 	@Excel(name = "编号", width = 15)
    @ApiModelProperty(value="编号")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPointCheckIntoWarehouseDetail.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPointCheckIntoWarehouseDetail.java
index 5569160bb..40d4bf3c1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPointCheckIntoWarehouseDetail.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPointCheckIntoWarehouseDetail.java
@@ -26,11 +26,11 @@ public class GtMaterialPointCheckIntoWarehouseDetail implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**出入库id*/
 	@Excel(name = "出入库id", width = 15)
    @ApiModelProperty(value="出入库id")
-	private java.lang.Integer gtMaterialInOutWarehouseId  ;
+	private java.lang.Long gtMaterialInOutWarehouseId  ;
 	/**品名*/
 	@Excel(name = "品名", width = 15)
    @ApiModelProperty(value="品名")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPurchaseDemandPlanning.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPurchaseDemandPlanning.java
index 424956161..e9f0e9030 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPurchaseDemandPlanning.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPurchaseDemandPlanning.java
@@ -26,7 +26,7 @@ public class GtMaterialPurchaseDemandPlanning implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**物料名称*/
 	@Excel(name = "物料名称", width = 15)
    @ApiModelProperty(value="物料名称")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialSupplierEvaluationRecord.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialSupplierEvaluationRecord.java
index c08c5dc14..2c010da5d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialSupplierEvaluationRecord.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialSupplierEvaluationRecord.java
@@ -26,7 +26,7 @@ public class GtMaterialSupplierEvaluationRecord implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**供应商名称*/
 	@Excel(name = "供应商名称", width = 15)
    @ApiModelProperty(value="供应商名称")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTender.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTender.java
index 2deb9915a..e401b79f1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTender.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTender.java
@@ -26,7 +26,7 @@ public class GtMaterialTender implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**招标名称*/
 	@Excel(name = "招标名称", width = 15)
    @ApiModelProperty(value="招标名称")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTenderBid.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTenderBid.java
index 0e2007cc1..dafb47a95 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTenderBid.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTenderBid.java
@@ -26,11 +26,11 @@ public class GtMaterialTenderBid implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**招标id*/
 	@Excel(name = "招标id", width = 15)
    @ApiModelProperty(value="招标id")
-	private java.lang.Integer gtMaterialTenderId  ;
+	private java.lang.Long gtMaterialTenderId  ;
 	/**物品名称*/
 	@Excel(name = "物品名称", width = 15)
    @ApiModelProperty(value="物品名称")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTenderRecord.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTenderRecord.java
index 7fdffa3eb..9fe4a64d7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTenderRecord.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTenderRecord.java
@@ -26,11 +26,11 @@ public class GtMaterialTenderRecord implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**招标id*/
 	@Excel(name = "招标id", width = 15)
    @ApiModelProperty(value="招标id")
-	private java.lang.Integer gtMaterialTenderId  ;
+	private java.lang.Long gtMaterialTenderId  ;
 	/**投标单位*/
 	@Excel(name = "投标单位", width = 15)
    @ApiModelProperty(value="投标单位")
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialVendor.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialVendor.java
index cd5525a06..defd8b366 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialVendor.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialVendor.java
@@ -26,7 +26,7 @@ public class GtMaterialVendor implements Serializable {
 	/**主键id*/
 	   @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="主键id")
-	private java.lang.Integer id  ;
+	private java.lang.Long id  ;
 	/**助查码*/
 	@Excel(name = "助查码", width = 15)
    @ApiModelProperty(value="助查码")
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
index f20b22110..b6f5ce08d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
@@ -235,7 +235,15 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
             return Result.error("projectNumber=" + e.getProjectNumber() + "的项目不存在");
         }
         EnterpriseInfo ei = getEnterpriseInfo(e,projectSn);
-        updateEnterpriseInfo(ei);
+        QueryWrapper<ProjectEnterprise> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.lambda().eq(ProjectEnterprise::getEnterpriseId, ei.getId())
+                .eq(ProjectEnterprise::getProjectSn, projectSn);
+        ProjectEnterprise projectEnterprise = projectEnterpriseMapper.selectOne(queryWrapper1);
+        if (projectEnterprise == null) {
+            saveEnterpriseInfo(ei);
+        } else {
+            updateEnterpriseInfo(ei);
+        }
         return Result.ok();
     }