用户信息

src/main/java/com/aoyang/tms/common/ErrCodeEnum.java

@@ -342,6 +342,8 @@ public enum ErrCodeEnum {
      */
     CASHBACK_TRANSFER_ACCOUNT_ERROR_2(2306, "本地资金账户返现失败，请联系运营处理"),
 
+    USERSERVER_ERROR(3301, "进入USER熔断"), USER_ADD_ERROR(2323, "新增司机失败"), DRIVER_MODIFY_FAIL(2323, "修改司机信息失败"),
+
     /**
      * 直销模式的卡车不能在经销模式加气站加气
      */

src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -32,6 +32,10 @@ public class WorkerInfo {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long driverIdOne;
 
+    @ApiModelProperty(value = "司机1电话")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long driverPhoneOne;
+
     @ApiModelProperty(value = "司机1姓名")
     private String driverNameOne;
 
@@ -39,12 +43,19 @@ public class WorkerInfo {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long driverIdTwo;
 
+    @ApiModelProperty(value = "司机2电话")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long driverPhoneTwo;
+
     @ApiModelProperty(value = "司机2姓名")
     private String driverNameTwo;
 
     @ApiModelProperty(value = "押运员姓名")
     private String escortName;
 
+    @ApiModelProperty(value = "押运员电话")
+    private Long escortPhone;
+
     @ApiModelProperty(value = "车牌号")
     private String carNumber;
 

src/main/java/com/aoyang/tms/entity/IdParam.java

@@ -0,0 +1,30 @@
+package com.aoyang.tms.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhuangxl
+ * @description 通用id查询参数
+ * @since 2021-03-24 9:43
+ */
+@Data
+@ApiModel(value = "通用id参数", description = "通用id参数")
+public class IdParam {
+
+    @ApiModelProperty(value = "通用id参数")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public IdParam setId(Long id) {
+        this.id = id;
+        return this;
+    }
+
+}

src/main/java/com/aoyang/tms/entity/User.java

@@ -0,0 +1,137 @@
+package com.aoyang.tms.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author panenming
+ * @since 2020-02-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "User对象", description = "")
+public class User implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "组织id（user.org.org_id）")
+    @TableField("org_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long orgId;
+
+    @ApiModelProperty(value = "用户id（调用API生成）")
+    @TableId(value = "user_id", type = IdType.INPUT)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long userId;
+
+    @ApiModelProperty(value = "登录用户")
+    @TableField("user_code")
+    private String userCode;
+
+    @ApiModelProperty(value = "用户名")
+    @TableField("user_name")
+    private String userName;
+
+    @ApiModelProperty(value = "密码")
+    @TableField("password")
+    private String password;
+
+    @ApiModelProperty(value = "手机号")
+    @TableField("mobile")
+    private String mobile;
+
+    @ApiModelProperty(value = "身份证编号")
+    @TableField("id_card_no")
+    private String idCardNo;
+
+    @ApiModelProperty(value = "微信绑定信息（openid）")
+    @TableField("open_id")
+    private String openId;
+
+    @ApiModelProperty(value = "状态（0：启用 1：停用）")
+    @TableField("status")
+    private Integer status;
+
+    @ApiModelProperty(value = "用户类型（0 平台用户 1加气企业用户 2物流公司 用户 3卡车经销商用户 4司机 5收银员")
+    @TableField("user_type")
+    private Integer userType;
+
+    @ApiModelProperty(value = "1-平台管理员 2-平台运营人员  3 物流公司管理者 4 司机  5 加气站企业管理者 6 收银员")
+    @TableField("base_role")
+    private String baseRole;
+
+    @ApiModelProperty(value = "创建人id")
+    @TableField("creater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long creater;
+
+    @ApiModelProperty(value = "创建日期时间")
+    @TableField("create_date")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "修改人id")
+    @TableField("updater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改日期时间")
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
+    @ApiModelProperty(value = "组织name（user.org.org_name）")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "创建人Name")
+    @TableField("creater_name")
+    private String createrName;
+
+    @ApiModelProperty(value = "修改人Name")
+    @TableField("updater_name")
+    private String updaterName;
+
+    @ApiModelProperty(value = "绑定标识 0未绑定 1已绑定")
+    @TableField(exist = false)
+    private int flag;
+
+    @ApiModelProperty(value = "车牌号")
+    private String carNumber;
+
+    @ApiModelProperty(value = "卡车id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "关键字")
+    private String keyWord;
+
+    @ApiModelProperty(value = "最后登陆时间")
+    private String lastLoginDate;
+
+    public User() {
+        super();
+    }
+
+    public User(Long userId) {
+        this.userId = userId;
+    }
+
+    public User(String mobile) {
+        this.mobile = mobile;
+    }
+
+}

src/main/java/com/aoyang/tms/feign/UserFeignClient.java

@@ -0,0 +1,27 @@
+package com.aoyang.tms.feign;
+
+import com.aoyang.common.result.Result;
+import com.aoyang.tms.entity.User;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author: guoyong
+ */
+
+@FeignClient(name = "user")
+public interface UserFeignClient {
+
+    @PostMapping(value = "/user/user/add")
+    Result<User> add(@RequestHeader("userId") String userId, @RequestBody User user);
+
+    @PostMapping(value = "/user/user/edit")
+    Result<Boolean> update(@RequestHeader("userId") String userId, @RequestBody User user);
+
+    @PostMapping(value = "/user/user/delete")
+    Result<Boolean> delete(@RequestParam("userId") Long userId);
+
+    @PostMapping("/user/user/find_by_id")
+    Result<User> find(@RequestBody User user);
+
+}

src/main/java/com/aoyang/tms/feign/fallback/UserFeignFallBack.java

@@ -0,0 +1,52 @@
+package com.aoyang.tms.feign.fallback;
+
+import com.aoyang.common.result.Result;
+import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.entity.User;
+import com.aoyang.tms.feign.UserFeignClient;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author liujiren
+ */
+@Component
+@Slf4j
+public class UserFeignFallBack implements FallbackFactory<UserFeignClient> {
+
+    @Override
+    public UserFeignClient create(Throwable cause) {
+        String msg = cause == null ? "" : cause.getMessage();
+        if (!StringUtils.isEmpty(msg)) {
+            log.error("AccountFeign error : {}", msg);
+        }
+        return new UserFeignClient() {
+
+            @Override
+            public Result<User> add(String userId, User user) {
+                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage(), null);
+            }
+
+            @Override
+            public Result<Boolean> update(String userId, User user) {
+                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage(), null);
+            }
+
+            @Override
+            public Result<Boolean> delete(Long userId) {
+                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage(), false);
+            }
+
+            @Override
+            public Result<User> find(User user) {
+                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
+            }
+
+        };
+
+    }
+
+
+}

src/main/java/com/aoyang/tms/service/CommonService.java

@@ -3,6 +3,7 @@ package com.aoyang.tms.service;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.vo.LocationVO;
 import com.aoyang.tms.controller.vo.WorkerInfo;
+import com.aoyang.tms.entity.User;
 
 import java.time.LocalDateTime;
 
@@ -15,12 +16,12 @@ import java.time.LocalDateTime;
 public interface CommonService {
 
     /**
+     * @return
      * @Author guoyong
      * @Description 获取运力详情
-     * @Date  2022/4/21
+     * @Date 2022/4/21
      * @Param
-     * @return
-    **/
+     **/
     WorkerInfo findTruckInfo(Long truckId);
 
     /**
@@ -39,6 +40,42 @@ public interface CommonService {
      */
     Boolean updateTruckTmsStatus(Long truckId, Integer tmsStatus);
 
+    /**
+     * @return
+     * @Author guoyong
+     * @Description 查找用户信息
+     * @Date 2022/4/22
+     * @Param
+     **/
+    User findUser(Long userId);
+
+    /**
+     * @return
+     * @Author guoyong
+     * @Description 添加押运员，需要创建用户信息，用于登录
+     * @Date 2022/4/22
+     * @Param
+     **/
+    User addUser(User user);
+
+    /**
+     * @return
+     * @Author guoyong
+     * @Description 修改押运员对应的用户信息
+     * @Date 2022/4/22
+     * @Param
+     **/
+    Boolean updateUser(User user);
+
+    /**
+     * @return
+     * @Author guoyong
+     * @Description 删除押运员，需要删除用户信息
+     * @Date 2022/4/22
+     * @Param
+     **/
+    Boolean deleteUser(Long userId);
+
 
     /**
      * 判断操作是否成功，如获取、保存、更新等操作

src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -4,11 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.vo.LocationVO;
 import com.aoyang.tms.controller.vo.WorkerInfo;
-import com.aoyang.tms.entity.Truck;
-import com.aoyang.tms.entity.TruckDriver;
-import com.aoyang.tms.entity.TruckEscort;
-import com.aoyang.tms.entity.TruckSimCard;
+import com.aoyang.tms.entity.*;
 import com.aoyang.tms.feign.StrategyFeignClient;
+import com.aoyang.tms.feign.UserFeignClient;
 import com.aoyang.tms.feign.result.TmsMongoDoc;
 import com.aoyang.tms.service.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -37,6 +35,10 @@ public class CommonServiceImpl implements CommonService {
     private StrategyFeignClient strategyFeignClient;
 
     @Resource
+    private UserFeignClient userFeignClient;
+
+
+    @Resource
     private MongoTemplate mongoTemplate;
 
     @Resource
@@ -126,6 +128,44 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
+    public User findUser(Long userId) {
+        User user = new User();
+        user.setUserId(userId);
+        Result<User> result = userFeignClient.find(user);
+        if (verifyResult(result)) {
+            return result.getData();
+        }
+        return null;
+    }
+
+    @Override
+    public User addUser(User user) {
+        Result<User> result = userFeignClient.add(user.getCreater() + "", user);
+        if (verifyResult(result)) {
+            return result.getData();
+        }
+        return null;
+    }
+
+    @Override
+    public Boolean updateUser(User user) {
+        Result<Boolean> result = userFeignClient.update(user.getCreater() + "", user);
+        if (verifyResult(result)) {
+            return result.getData();
+        }
+        return null;
+    }
+
+    @Override
+    public Boolean deleteUser(Long userId) {
+        Result<Boolean> result = userFeignClient.delete(userId);
+        if (verifyResult(result)) {
+            return result.getData();
+        }
+        return null;
+    }
+
+    @Override
     public boolean verifyResult(Result result) {
         return false;
     }