去除定时服务重复修改管理、避免用户请求出现数据过期

aidex-system/src/main/java/com/aidex/common/plush/mapper/SysShipExtendMapper.xml

@@ -158,7 +158,7 @@
 
     <update id="updateByShip">
         UPDATE sys_ship_extend SET
-       mac_id = #{macId},
+       mac_id = #{macId}
        WHERE id = #{macId}
     </update>
 

aidex-system/src/main/java/com/aidex/system/mapper/SysShipMapper.xml

@@ -198,12 +198,14 @@
             update_ip = #{updateIp},
             version = version + 1
         WHERE id = #{id} and version = #{version}
+
     </update>
 
+
+<!--  由于定时请求频繁修改数据Version  手动修改无法做到避免重复修改 固注释  version = version + 1-->
     <update id="updateStatus">
         UPDATE sys_ship SET
-            status = #{status},
-            version = version + 1
+            status = #{status}
         WHERE id = #{id}
     </update>
 
@@ -213,10 +215,10 @@
         WHERE id = #{id}
     </update>
 
+    <!--  由于定时请求频繁修改数据Version  手动修改无法做到避免重复修改 固注释  version = version + 1-->
     <update id="updateStatusByMacId">
         UPDATE sys_ship SET
-            status = #{status},
-            version = version + 1
+            status = #{status}
         WHERE ship_num = #{macId}
     </update>
 

aidex-system/src/main/java/com/aidex/system/service/impl/SysShipServiceImpl.java

@@ -90,12 +90,14 @@ public class SysShipServiceImpl extends BaseServiceImpl<SysShipMapper, SysShip>
         BeanUtils.copyProperties(sysShip,shipVo);
         SysShip ship = new SysShip();
         BeanUtils.copyProperties(sysShip,ship);
+        if(StringUtils.isEmpty(ship.getRemark()))
+            ship.setRemark("");
         if(super.save(ship)) {
             SysShipExtend shipExtend = new SysShipExtend();
             shipExtend.setShipId(sysShip.getId());
             shipExtend.setId(sysShip.getId());
             shipExtend.setMacId(sysShip.getShipNum());
-            shipExtend.setDir((!StringUtils.isEmpty(shipVo.getTravel()) || shipVo.getTravel().equals("1"))?"100":"270");
+            shipExtend.setDir((StringUtils.isEmpty(shipVo.getTravel()) || shipVo.getTravel().equals("1"))?"100":"270");
             shipExtend.setIsStop(1L);
             shipExtend.setLat(!StringUtils.isEmpty(sysShip.getLat())?sysShip.getLat():"36.077395");
             shipExtend.setLon(!StringUtils.isEmpty(sysShip.getLng())?sysShip.getLng():"103.863987");