admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

三江-合作单位接口修改

Browse Source
This commit is contained in:
Administrator 2023-04-19 11:58:42 +08:00
parent 2eca209d10
commit db160b5ad7
17 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/device/water/controller/CallBackController.java
View File

@ -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) {

2
src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevCurrentDataServiceImpl.java
View File

@ -114,4 +114,4 @@ public class FrontierProtectionDevCurrentDataServiceImpl extends ServiceImpl<Fro
}
return currentDataList;
}
}
}

2
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContract.java
View File

@ -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")

4
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContractArrivalAcceptance.java
View File

@ -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="到货数量")

4
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialContractPaymentRecord.java
View File

@ -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="申请付款金额")

2
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDevice.java
View File

@ -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="设备名称")

4
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDeviceMaintenanceRecord.java
View File

@ -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="维保单位")

4
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialDeviceMandatoryInspectionRecord.java
View File

@ -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="强制检验单位")

2
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialInOutWarehouse.java
View File

@ -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="编号")

4
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPointCheckIntoWarehouseDetail.java
View File

@ -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="品名")

2
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPurchaseDemandPlanning.java
View File

@ -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="物料名称")

2
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialSupplierEvaluationRecord.java
View File

@ -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="供应商名称")

2
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTender.java
View File

@ -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="招标名称")

4
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTenderBid.java
View File

@ -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="物品名称")

4
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialTenderRecord.java
View File

@ -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="投标单位")

2
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialVendor.java
View File

@ -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="助查码")

10
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
View File

@ -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();
}