外部接口
This commit is contained in:
jiang
parent
763141e7e5
commit
8f85d4df1e
|
|
@ -677,8 +677,8 @@ public class DevInfoServiceImpl implements DevInfoService {
|
|||
public int insertInfoMotionDto(InfoMotionDto infoMotionDto) {
|
||||
DevInfo devInfo = new DevInfo();
|
||||
BeanUtils.copyProperties(infoMotionDto, devInfo);
|
||||
devInfoMapper.insertDevInfo(devInfo);
|
||||
return devInfoMapper.insertLon(infoMotionDto);
|
||||
return devInfoMapper.insertDevInfo(devInfo);
|
||||
//return devInfoMapper.insertLon(infoMotionDto);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,10 +3,7 @@ package com.bonus.material.externalInterface.controller;
|
|||
import com.bonus.common.core.web.controller.BaseController;
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.material.externalInterface.service.EquipmentExternalService;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
|
@ -15,6 +12,7 @@ import java.util.Map;
|
|||
/**
|
||||
* 装备管理
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("equipmentExternal")
|
||||
public class EquipmentExternalController extends BaseController {
|
||||
@Resource
|
||||
|
|
|
|||
|
|
@ -3,15 +3,16 @@ package com.bonus.material.externalInterface.controller;
|
|||
import com.bonus.common.core.web.controller.BaseController;
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.material.externalInterface.service.LargeScreenExternalService;
|
||||
import org.aspectj.weaver.loadtime.Aj;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* 装备共享一张图
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("largeScreenExternal")
|
||||
public class LargeScreenExternalController extends BaseController {
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ public interface LargeScreenExternalMapper {
|
|||
* @param accountId id
|
||||
* @return 设备数据
|
||||
*/
|
||||
@MapKey("name")
|
||||
@MapKey("")
|
||||
Map<String, Object> deviceStatusStatistics(String accountId);
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -170,4 +170,7 @@ public class OrderInfoDto {
|
|||
@ApiModelProperty(value = "出库时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private String preOutboundTime;
|
||||
|
||||
|
||||
private String maId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -378,17 +378,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</insert>
|
||||
|
||||
<insert id="insertLon">
|
||||
insert into gps_real_info
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="dto.gpsCode != null and dto.gpsCode != ''">gps_code,</if>
|
||||
<if test="dto.lon != null and dto.lon !=''">lon,</if>
|
||||
<if test="dto.lat != null and dto.lat != ''">lat,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="dto.gpsCode != null and dto.gpsCode != ''">#{dto.gpsCode},</if>
|
||||
<if test="dto.lon != null and dto.lon !=''">#{dto.lon},</if>
|
||||
<if test="dto.lat != null and dto.lat != ''">#{dto.lat},</if>
|
||||
</trim>
|
||||
<if test="dto != null">
|
||||
insert into gps_real_info
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="dto.gpsCode != null and dto.gpsCode != ''">gps_code,</if>
|
||||
<if test="dto.lon != null and dto.lon !=''">lon,</if>
|
||||
<if test="dto.lat != null and dto.lat != ''">lat,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="dto.gpsCode != null and dto.gpsCode != ''">#{dto.gpsCode},</if>
|
||||
<if test="dto.lon != null and dto.lon !=''">#{dto.lon},</if>
|
||||
<if test="dto.lat != null and dto.lat != ''">#{dto.lat},</if>
|
||||
</trim>
|
||||
</if>
|
||||
|
||||
</insert>
|
||||
|
||||
<update id="updateDevInfo" parameterType="com.bonus.material.device.domain.DevInfo">
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@
|
|||
|
||||
<!-- 统计各种状态下的装备数量，用于大屏展示 -->
|
||||
<select id="deviceStatusStatistics" resultType="java.util.Map">
|
||||
|
||||
SELECT COUNT(*) AS totalCount
|
||||
FROM ma_dev_info
|
||||
</select>
|
||||
<!-- 图表展示当前账号下装备的分级统计，可切换分布查看I、II、III类下的分级统计 -->
|
||||
<select id="deviceLevelStatistics" resultType="java.util.Map">
|
||||
|
|
@ -18,6 +19,6 @@
|
|||
</select>
|
||||
<!-- 图标展示当前账号下各工程在用的装备总数、自有装备数、市场化装备数 -->
|
||||
<select id="projectEquipmentStatistics" resultType="java.util.Map">
|
||||
|
||||
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -171,6 +171,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="code != null and code != ''">
|
||||
AND moi.code = #{code}
|
||||
</if>
|
||||
<if test="maId != null and maId != ''">
|
||||
AND moi.maId = #{maId}
|
||||
</if>
|
||||
<if test="startTime != null and endTime != null ">
|
||||
AND ((hh.rent_begin_time BETWEEN #{startTime} AND #{endTime})
|
||||
OR (hh.rent_end_time BETWEEN #{startTime} AND #{endTime})
|
||||
|
|
|
|||
Loading…
Reference in New Issue