违章记录

wang-hao-jie

2021-11-03 01dd8732d223391cc2d6eda0941cc6497010e0fc

违章记录

 xboot-admin/pom.xml

@@ -40,11 +40,6 @@
        </dependency>
        <dependency>
            <groupId>cn.exrick</groupId>
            <artifactId>xboot-social</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>cn.exrick</groupId>
            <artifactId>xboot-your</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>

 xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java

@@ -95,9 +95,6 @@
    @ApiModelProperty(value = "所属部门名称")
    private String departmentTitle;

    @ApiModelProperty(value = "指纹登陆密码")
    private String key;

    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "生日")
@@ -117,4 +114,5 @@
    @TableField(exist = false)
    @ApiModelProperty(value = "导入数据时使用")
    private Integer defaultRole;

}

 xboot-modules/pom.xml

@@ -13,7 +13,6 @@
    <packaging>pom</packaging>
    <modules>
        <module>xboot-base</module>
        <module>xboot-social</module>
        <module>xboot-generator</module>
        <module>xboot-file</module>
        <module>xboot-quartz</module>

 xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java

@@ -315,7 +315,7 @@

        // 校验是否已存在
        checkUserInfo(u.getUsername(), u.getMobile(), u.getEmail());
        u.setKey(u.getPassword());
        u.setDescription(u.getPassword());
        String encryptPass = new BCryptPasswordEncoder().encode(u.getPassword());
        u.setPassword(encryptPass);
        if (StrUtil.isNotBlank(u.getDepartmentId())) {

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java

File was deleted

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaSectionController.java

File was deleted

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java

@@ -1,9 +1,15 @@
package cn.exrick.xboot.your.controller;

import cn.exrick.xboot.core.common.constant.SettingConstant;
import cn.exrick.xboot.core.common.utils.CommonUtil;
import cn.exrick.xboot.core.common.utils.PageUtil;
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.core.entity.Setting;
import cn.exrick.xboot.core.entity.User;
import cn.exrick.xboot.core.service.SettingService;
import cn.exrick.xboot.core.service.UserService;
import cn.exrick.xboot.your.entity.Fingerprint;
import cn.exrick.xboot.your.service.IFingerprintService;
import cn.hutool.core.util.StrUtil;
@@ -15,7 +21,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import java.io.InputStream;
import java.util.List;

/**
@@ -31,6 +40,9 @@
    @Autowired
    private IFingerprintService iFingerprintService;

    @Autowired
    private UserService userService;

    @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
    @ApiOperation(value = "通过id获取")
    public Result<Fingerprint> get(@PathVariable String id) {
@@ -42,9 +54,19 @@
    @RequestMapping(value = "/getAll", method = RequestMethod.GET)
    @ApiOperation(value = "获取全部数据")
    public Result<List<Fingerprint>> getAll() {

        List<Fingerprint> list = iFingerprintService.list();
        QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
        wrapper.isNotNull("user_id");
        List<Fingerprint> list = iFingerprintService.list(wrapper);
        return new ResultUtil<List<Fingerprint>>().setData(list);
    }

    @RequestMapping(value = "/getCount", method = RequestMethod.GET)
    @ApiOperation(value = "获取用户指纹数")
    public Result<Integer> getCount() {
        QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
        wrapper.isNotNull("user_id");
        int a = iFingerprintService.count(wrapper);
        return new ResultUtil<Integer>().setData(a);
    }

    @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@@ -58,7 +80,11 @@
    @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
    @ApiOperation(value = "编辑或更新数据")
    public Result<Fingerprint> saveOrUpdate(Fingerprint fingerprint) {

        if(StrUtil.isNotEmpty(fingerprint.getUserId())){
            User user = userService.get(fingerprint.getUserId());
            fingerprint.setUsername(user.getUsername());
            fingerprint.setPassword(user.getDescription());
        }
        if (iFingerprintService.saveOrUpdate(fingerprint)) {
            return new ResultUtil<Fingerprint>().setData(fingerprint);
        }

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java

@@ -50,6 +50,45 @@
    private String trajectory;

    @ApiModelProperty(value = "行驶里程")
    private int mileage;
    private Integer mileage=0;

    @ApiModelProperty(value = "订单核对 0：未核对 1：已核对")
    private Integer OrderStatus=0;

    @ApiModelProperty(value = "三证 0:正常 1：异常")
    private Integer sanZheng=0;

    @ApiModelProperty(value = "三量 0:正常 1：异常")
    private Integer sanLiang=0;

    @ApiModelProperty(value = "四灯 0:正常 1：异常")
    private Integer siDeng=0;

    @ApiModelProperty(value = "喇叭 0:正常 1：异常")
    private Integer laBa=0;

    @ApiModelProperty(value = "后视镜 0:正常 1：异常")
    private Integer houShiJing=0;

    @ApiModelProperty(value = "雨刷器 0:正常 1：异常")
    private Integer yuShuaQi=0;

    @ApiModelProperty(value = "轮胎 0:正常 1：异常")
    private Integer lunTai=0;

    @ApiModelProperty(value = "仪表 0:正常 1：异常")
    private Integer yiBiao=0;

    @ApiModelProperty(value = "制动 0:正常 1：异常")
    private Integer zhiDong=0;

    @ApiModelProperty(value = "安全设施 0:正常 1：异常")
    private Integer anQuan=0;

    @ApiModelProperty(value = "其它 0:正常 1：异常")
    private Integer qiTa=0;

    @ApiModelProperty(value = "处理意见")
    private String content;

}

 xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Fingerprint.java

@@ -35,12 +35,16 @@
    @ApiModelProperty(value = "商户接收人id")
    private String customerReceiveId;

    @Column(length = 1000)
    @ApiModelProperty(value = "指纹")
    private String content;
    @ApiModelProperty(value = "指纹编号")
    private Integer code;

    @ApiModelProperty(value = "指头1-10")
    private Integer num;
    @ApiModelProperty(value = "指纹文件")
    private String fileId;

    @ApiModelProperty(value = "登录名")
    private String username;

    @ApiModelProperty(value = "密码")
    private String password;

}