diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java index db8e1cad..0e1800d5 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssDeviceController.java @@ -530,6 +530,9 @@ public class GnssDeviceController extends BasicController{ } } + + + /** * 设备现场安装 * diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/RtkTransactionController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/RtkTransactionController.java index 104be2ed..d6efe7d4 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/RtkTransactionController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/RtkTransactionController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.imdroid.secapi.dto.RtkTransaction; import com.imdroid.secapi.dto.RtkTransactionMapper; +import com.imdroid.secapi.dto.GnssDevice; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpSession; +import java.time.LocalDateTime; @Controller public class RtkTransactionController extends BasicController { @@ -46,13 +48,25 @@ public class RtkTransactionController extends BasicController { @RequestMapping("/rtk/transaction/check") @ResponseBody - public String check(Integer id, Boolean apply){ + public String check(HttpSession session, Integer id, Boolean apply){ RtkTransaction t = mapper.selectById(id); if(t==null) return com.imdroid.beidou.common.HttpResult.failed(); t.setChecked((short)1); mapper.updateById(t); if(Boolean.TRUE.equals(apply)){ - try{ gnssDeviceMapper.updateEcefByDeviceId(t.getDevice_id(), t.getEcef_x(), t.getEcef_y(), t.getEcef_z()); }catch(Exception ignored){} + try{ + GnssDevice exist = gnssDeviceMapper.queryByDeviceId(t.getDevice_id()); + if(exist != null){ + GnssDevice upd = new GnssDevice(); + upd.setId(exist.getId()); + upd.setEcefx(t.getEcef_x()); + upd.setEcefy(t.getEcef_y()); + upd.setEcefz(t.getEcef_z()); + upd.setUpdatetime(LocalDateTime.now()); + upd.setUpdateuser(getLoginUser(session)); + gnssDeviceMapper.updateById(upd); + } + }catch(Exception ignored){} } return com.imdroid.beidou.common.HttpResult.ok(); } diff --git a/sec-beidou/src/main/resources/templates/page/rtk_transactions.html b/sec-beidou/src/main/resources/templates/page/rtk_transactions.html index fabc1f4d..e055e179 100644 --- a/sec-beidou/src/main/resources/templates/page/rtk_transactions.html +++ b/sec-beidou/src/main/resources/templates/page/rtk_transactions.html @@ -37,6 +37,10 @@ +