bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
This commit is contained in:
nmy 2023-12-06 10:37:19 +08:00
parent 858633b10d 26b12c8012
commit f580741d41
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
View File

@ -2,9 +2,9 @@ package com.bonus.zlpt.equip.mapper;
import java.util.List; import java.util.List;
import com.bonus.zlpt.equip.api.domain.DevInfo; import com.bonus.zlpt.common.core.domain.equip.DevInfo;
import com.bonus.zlpt.equip.api.domain.dto.InforMationDto; import com.bonus.zlpt.common.core.domain.equip.dto.InforMationDto;
import com.bonus.zlpt.equip.api.domain.vo.DevInfoVo; import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo;
import com.bonus.zlpt.common.core.domain.system.SysFile; import com.bonus.zlpt.common.core.domain.system.SysFile;
/** /**
@ -75,7 +75,10 @@ public interface DevInfoMapper
*/ */
public int deleteDevInfoByMaIds(Long[] maIds); public int deleteDevInfoByMaIds(Long[] maIds);
/**
* 添加经纬度信息
* @param inforMationDto
* @return
*/
int insertLon(InforMationDto inforMationDto); int insertLon(InforMationDto inforMationDto);
} }

4
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java
View File

@ -74,7 +74,9 @@ public class OrderDetailsController extends BaseController
{ {
OrderDetailsVo orderDetails = orderDetailsService.selectOrderDetailsById(id); OrderDetailsVo orderDetails = orderDetailsService.selectOrderDetailsById(id);
Map map1 = (Map) equipClient.getInfo(orderDetails.getMaId()); Map map1 = (Map) equipClient.getInfo(orderDetails.getMaId());
if (map1 != null) {
Map map2 = (Map) map1.get(DATA_TAG); Map map2 = (Map) map1.get(DATA_TAG);
if (map2 != null) {
String typeName = (String) map2.get("typeName"); String typeName = (String) map2.get("typeName");
String groupName = (String) map2.get("groupName"); String groupName = (String) map2.get("groupName");
String modelName = (String) map2.get("modelName"); String modelName = (String) map2.get("modelName");
@ -82,6 +84,8 @@ public class OrderDetailsController extends BaseController
orderDetails.setTypeName(typeName); orderDetails.setTypeName(typeName);
orderDetails.setGroupName(groupName); orderDetails.setGroupName(groupName);
orderDetails.setDeviceName(modelName + deviceName); orderDetails.setDeviceName(modelName + deviceName);
}
}
return success(orderDetails); return success(orderDetails);
} }