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

bug修复

Browse Source
This commit is contained in:
guo 2024-01-16 14:13:15 +08:00
parent e45f861a27
commit 606c048d49
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/modules/pitchmixstation/entity/PitchMixStationDev.java
View File

@ -81,11 +81,12 @@ public class PitchMixStationDev implements Serializable {
@ApiModelProperty(value = "拌合站位置") @ApiModelProperty(value = "拌合站位置")
private java.lang.String mixingStationLocation; private java.lang.String mixingStationLocation;
/** /**
* 负责人 * 负责人id
*/ */
@Excel(name = "负责人", width = 15) @ApiModelProperty(value = "负责人id")
@ApiModelProperty(value = "负责人") private java.lang.Long dutyUserId;
private java.lang.String personInCharge; @ApiModelProperty(value = "负责人名称")
private java.lang.String dutyUserName;
/** /**
* 负责人电话 * 负责人电话
*/ */

6
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java
View File

@ -302,10 +302,14 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl<ProjectUfaceConfi
devIdBuilder.append(dev.getDeviceId()); devIdBuilder.append(dev.getDeviceId());
} }
} }
sendDev(projectUfaceConfig, workerInfo, devBuilder.toString(), devIdBuilder.toString()); String devSn = devBuilder.toString();
String devId = devIdBuilder.toString();
log.info("devSn:{},devId:{}", devSn, devId);
sendDev(projectUfaceConfig, workerInfo, devSn, devId);
} }
public void sendDev(ProjectUfaceConfig tempProjectUfaceConfig, WorkerInfo workerInfo, String devSn, String devId) { public void sendDev(ProjectUfaceConfig tempProjectUfaceConfig, WorkerInfo workerInfo, String devSn, String devId) {
log.info("supplierType:{}", tempProjectUfaceConfig.getSupplierType());
//1杭州宇泛智能科技,2用jdpush推送,3.mqtt,4.芊熠智能,5佳信捷,6佳信捷新设备 //1杭州宇泛智能科技,2用jdpush推送,3.mqtt,4.芊熠智能,5佳信捷,6佳信捷新设备
if (tempProjectUfaceConfig.getSupplierType() == 1) { if (tempProjectUfaceConfig.getSupplierType() == 1) {
String image = ""; String image = "";