1.押运定位

tangzy

2021-11-25 8d091e5cab64e52e5c846a6a43830f62fae29fa0

1.押运定位

 src/main/java/org/springblade/modules/auth/utils/TokenUtil.java

@@ -94,6 +94,11 @@
        param.put(TokenConstant.NICK_NAME, user.getRealName());
        param.put(TokenConstant.ROLE_NAME, Func.join(userInfo.getRoles()));
        param.put(TokenConstant.DETAIL, userInfo.getDetail());
        param.put("jurisdiction", user.getJurisdiction());
        param.put("cardid", user.getCardid());
        param.put("Id", user.getId());
        param.put("rname", userInfo.getRoles());
        param.put("list", user);

        //拼装accessToken
        try {
@@ -103,6 +108,11 @@
                .set(TokenConstant.USER_ID, Func.toStr(user.getId()))
                .set(TokenConstant.DEPT_ID, user.getDeptId())
                .set(TokenConstant.POST_ID, user.getPostId())
                .set("jurisdiction", user.getJurisdiction())
                .set("cardid", user.getCardid())
                .set("Id", user.getId())
                .set("rname", userInfo.getRoles())
                .set("list", user)
                .set(TokenConstant.ROLE_ID, user.getRoleId())
                .set(TokenConstant.OAUTH_ID, userInfo.getOauthId())
                .set(TokenConstant.ACCOUNT, user.getAccount())

 src/main/java/org/springblade/modules/equipage/controller/CarController.java

@@ -136,7 +136,7 @@
        params.put("beginTime", beginTime);
        params.put("endTime", endTime);
        params.put("rectify", rectify);
        params.put("callbackUrl", "http://s16s652780.51mypc.cn/car/SaveUrl");
        params.put("callbackUrl", "http://s16s652780.51mypc.cn/api/car/SaveUrl");
        params.put("callbackId", "1");
        params.put("appId", "PO00000761");
        params.put("timestamp", System.currentTimeMillis());
@@ -209,13 +209,14 @@
        csvurl = null;
        List<String> allString = new ArrayList<>();
        DowloadZipUtil dowloadZipUtil = new DowloadZipUtil();
        File file = dowloadZipUtil.downloadFile(fileUrl, "E:\\nginx-1.18.0\\dist");
        File file = dowloadZipUtil.downloadFile(fileUrl, "E:\\nginx-1.18.0\\dist\\car");
        //文件名
        String name = file.getName();
        String substring = name.substring(0, name.length() - 4);
        System.out.println(substring);
        //解压数据
        FileZip fileZip = new FileZip();
        fileZip.ZipUncompress("E:\\nginx-1.18.0\\dist" + substring + ".zip", "E:\\nginx-1.18.0\\dist");
        fileZip.ZipUncompress("E:\\nginx-1.18.0\\dist\\car\\" + substring + ".zip", "E:\\nginx-1.18.0\\dist\\car");
        csvurl = substring + ".csv";
    }
    /**

 src/main/java/org/springblade/modules/record/entity/Record.java

@@ -167,10 +167,26 @@
    private String xopinion;
    //市意见
    private String sopinion;
    @ApiModelProperty(value = "提交时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @ApiModelProperty(value = "审批时间")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date overtime;


    @ApiModelProperty(value = "派出所审批时间")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date permitime;
    private Date ptime;

    @ApiModelProperty(value = "县审批时间")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date stime;

    @ApiModelProperty(value = "市审批时间")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date xtime;


}

 src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml

@@ -37,6 +37,10 @@
        <result column="popinion" property="popinion"/>
        <result column="xopinion" property="xopinion"/>
        <result column="sopinion" property="sopinion"/>
        <result column="overtime" property="overtime"/>
        <result column="ptime" property="ptime"/>
        <result column="stime" property="stime"/>
        <result column="xtime" property="xtime"/>
    </resultMap>