whycxzp
2022-09-16 87b0629d1c5e059ed572133553eeb71725135ee0
添加前端的更新时间字段
3个文件已修改
18 ■■■■ 已修改文件
src/main/java/com/whyc/controller/SoftwareController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/Software.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/SoftwareService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/SoftwareController.java
@@ -42,9 +42,9 @@
    @ApiOperation("软件上传")
    @PostMapping("upload")
    public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String softwareStr) throws IOException {
    public Response upload(@RequestParam MultipartFile file1,@RequestParam MultipartFile file2,@RequestParam String fontUpdateTime,@RequestParam String softwareStr) throws IOException {
        List<Software> softwareList = ActionUtil.getGson().fromJson(softwareStr,new TypeToken<List<Software>>(){}.getType());
        return service.upload(file1,file2,softwareList);
        return service.upload(file1,file2,fontUpdateTime,softwareList);
    }
    @ApiOperation("更新软件版本对应的适用机型")
src/main/java/com/whyc/pojo/Software.java
@@ -41,6 +41,9 @@
    @ApiModelProperty("发布说明")
    private String releaseNotes;
    @ApiModelProperty("页面上的更新时间字段")
    private String fontUpdateTime;
    private Date createTime;
    @ApiModelProperty("锁定状态")
@@ -176,4 +179,12 @@
    public void setLocalReason(String localReason) {
        this.localReason = localReason;
    }
    public String getFontUpdateTime() {
        return fontUpdateTime;
    }
    public void setFontUpdateTime(String fontUpdateTime) {
        this.fontUpdateTime = fontUpdateTime;
    }
}
src/main/java/com/whyc/service/SoftwareService.java
@@ -162,7 +162,7 @@
        logService.recordOperationLog(docUser.getId(),docUser.getName(), UserOperation.TYPE_DOWNLOAD.getType(),new Date(),terminalIp,opreationMsg,operationDetail);
    }
    public Response upload(MultipartFile file1, MultipartFile file2, List<Software> softwareList) throws IOException {
    public Response upload(MultipartFile file1, MultipartFile file2, String fontUpdateTime, List<Software> softwareList) throws IOException {
        String file1Name = file1.getOriginalFilename();
        String file2Name = file2.getOriginalFilename();
        Software software = softwareList.get(0);
@@ -190,6 +190,7 @@
        file2.transferTo(new File(softwareDir+File.separator+file2Name));
        //设置路径
        for (Software software1:softwareList){
            software1.setFontUpdateTime(fontUpdateTime);
            software1.setFileUrl(softwareHttpUrl+File.separator+file1Name);
            software1.setExcelUrl(softwareHttpUrl+File.separator+file2Name);
            software1.setCreateTime(date);