提交车辆轨回放查询接口

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/RemoteUserService.java

@@ -302,4 +302,5 @@ public interface RemoteUserService {
 
     List<Long> findEntListByUserId(Long userId);
 
+    void saveUser(KwsUserReqDto kwsUser);
 }

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/req/KwsUserReqDto.java

@@ -0,0 +1,66 @@
+package com.sckw.system.api.model.dto.req;
+
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户
+ * @author zk
+ * @date 2023-05-31
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KwsUserReqDto extends BaseModel {
+
+    /**
+     * 系统类型(1运营端、2企业开户)
+     */
+    private Integer systemType;
+    private Long entId;
+    /**
+     * 账号
+     */
+    private String account;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 用户名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 头像
+     */
+    private String photo;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 推送设备id
+     */
+    private String clientId;
+
+    /**
+     * 是否是企业管理（1是 0否）
+     */
+    private Integer isMain;
+
+    /**
+     * 盐
+     */
+    private String salt;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -38,6 +38,7 @@ import com.sckw.redis.constant.RedisConstant;
 import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.RemoteUserService;
+import com.sckw.system.api.model.dto.req.KwsUserReqDto;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
@@ -465,10 +466,38 @@ public class KwfDriverService {
 
         /**车队班组绑定**/
         driverFleetEdit(driver.getId(), params.getFleetId());
-
+        //同步信息到员工列表
+        userEdit(params);
         return HttpResult.ok(result.getMsg(), driver);
     }
 
+    private void userEdit(KwfDriverDto params) {
+        KwsUserReqDto kwsUserReqDto = new KwsUserReqDto();
+        //密码为空时，以登录名作为密码
+        String salt = PasswordUtils.generateSalt();
+        kwsUserReqDto.setSystemType(LoginUserHolder.getSystemType());
+        kwsUserReqDto.setEntId(LoginUserHolder.getEntId());
+        kwsUserReqDto.setAccount(params.getPhone());
+        String password  =  PasswordUtils.entryptPassword(params.getPhone() + PasswordUtils.md5(params.getPhone()), salt);
+        kwsUserReqDto.setPassword(password);
+        kwsUserReqDto.setName(params.getName());
+        kwsUserReqDto.setPhone(params.getPhone());
+        kwsUserReqDto.setPhoto("");
+        kwsUserReqDto.setEmail("");
+        kwsUserReqDto.setClientId("");
+        kwsUserReqDto.setIsMain(0);
+        kwsUserReqDto.setSalt(salt);
+        kwsUserReqDto.setRemark("司机管理");
+        kwsUserReqDto.setStatus(0);
+        kwsUserReqDto.setCreateBy(LoginUserHolder.getUserId());
+        Date date = new Date();
+        kwsUserReqDto.setCreateTime(date);
+        kwsUserReqDto.setUpdateBy(LoginUserHolder.getUserId());
+        kwsUserReqDto.setUpdateTime(date);
+        kwsUserReqDto.setDelFlag(0);
+        remoteUserService.saveUser(kwsUserReqDto);
+    }
+
     /**
      * @param params 参数
      * @desc 修改司机

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteUserServiceImpl.java

@@ -1,9 +1,11 @@
 package com.sckw.system.dubbo;
 
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.SystemException;
+import com.sckw.core.model.base.BaseModel;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
@@ -468,6 +470,22 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         return enterpriseIds;
     }
 
+    @Override
+    public void saveUser(KwsUserReqDto kwsUserReqDto) {
+        KwsUser kwsUser = new KwsUser();
+        BeanUtils.copyProperties(kwsUserReqDto, kwsUser);
+        KwsUser kwsUser1 = userDao.selectOne(Wrappers.<KwsUser>lambdaQuery()
+                .eq(KwsUser::getPhone, kwsUser.getPhone())
+                .eq(BaseModel::getDelFlag, 0)
+                .last("limit 1"));
+        if (Objects.isNull(kwsUser1)){
+            userDao.insert(kwsUser);
+        }else {
+            kwsUser.setId(kwsUser1.getId());
+            userDao.updateById(kwsUser);
+        }
+    }
+
     /**
      * 根据用户名查用户信息
      *

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/ComeIntoHandler.java

@@ -97,10 +97,12 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         node1.setRemark("车辆[" + waybillOrder.getTruckNo() + "]已到达装货点");
         waybillOrderNodeRepository.save(node1);
         log.info("记录【已装货】节点轨迹成功，节点ID：{}", node1.getId());
-
+        // 间隔5秒钟，防止时间相同
+        Date fiveSecondsLater = new Date(System.currentTimeMillis() + 5000);
         // 第二条：称重信息
         KwtWaybillOrderNode node2 = getWaybillOrderNode(param, waybillOrder);
         node2.setRemark("[" + param.getWeighbridgeName() + "]称重[" + param.getTareAmount() + "吨]");
+        node2.setCreateTime(fiveSecondsLater);
         waybillOrderNodeRepository.save(node2);
         log.info("记录【称重】节点轨迹成功，节点ID：{}", node2.getId());
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -124,7 +124,8 @@ public class WaybillOrderService {
             CarWaybillV1Enum.PENDING_VEHICLE.getCode(),
             CarWaybillV1Enum.REFUSE_TRAFFIC.getCode(),
             CarWaybillV1Enum.EXIT_COMPLETED.getCode(),
-            CarWaybillV1Enum.WAIT_LOADING.getCode());
+            CarWaybillV1Enum.WAIT_LOADING.getCode(),
+            CarWaybillV1Enum.WEIGHT_TRAFFIC.getCode());
 
     // 定义审核的状态集合
     private static final List<Integer> REVIEW = Arrays.asList(