应用软件管理更新，3.12

src/main/java/com/om/controller/admin/DiagnosisVersionInfoController.java

@@ -1,6 +1,7 @@
 package com.om.controller.admin;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import com.om.entity.dto.UpStatusDto;
 import com.om.entity.vo.DiagnosisVersionVO;
 import com.om.entity.vo.DignosisPageVO;
@@ -8,7 +9,8 @@ import com.om.service.IDiagnosisVersionInfoService;
 import com.om.utils.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import org.springframework.web.bind.annotation.RequestBody;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -22,8 +24,9 @@ import javax.annotation.Resource;
  * @since 2024-03-06
  */
 @RestController
+@Slf4j
 @Api(tags = "诊断程序相关接口")
-@RequestMapping("/diagnosis-version-info")
+@RequestMapping("web/diagnosis-version-info")
 public class DiagnosisVersionInfoController {
 
     @Resource
@@ -32,6 +35,7 @@ public class DiagnosisVersionInfoController {
     @PostMapping("/add")
     @ApiOperation("新增诊断程序")
     public Result add(@RequestBody DiagnosisVersionVO diagnosisVersionVO){
+        log.info("===={}========", diagnosisVersionVO);
 
         return dvIoService.add(diagnosisVersionVO);
     }
@@ -63,11 +67,12 @@ public class DiagnosisVersionInfoController {
 
         return dvIoService.getDesc(diagnosisVersionVO);
     }
-    @PostMapping("/getPageList")
+    @GetMapping("/getPageList")
     @ApiOperation("分页查询诊断程序")
-    public Result getPageList(@RequestBody DignosisPageVO dignosisPageVO){
+    public Result getPageList(@RequestParam Integer pageIndex,
+                              @RequestParam Integer pageSize){
 
-        return dvIoService.getPageList(dignosisPageVO);
+        return dvIoService.getPageList(pageIndex,pageSize);
     }
 
     @GetMapping("/release/{id}")

src/main/java/com/om/controller/admin/MenuController.java

@@ -7,6 +7,7 @@ import com.om.service.IMenuService;
 import com.om.utils.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,6 +25,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/menu")
 @Api(tags = "系统菜单模块")
+@Slf4j
 public class MenuController {
 
     @Autowired
@@ -33,6 +35,7 @@ public class MenuController {
     @ApiOperation("新增或修改接口")
     @PostMapping("/save")
     public Result save(@RequestBody Menu menu) {
+        log.info("====={}====",menu);
         menuService.saveOrUpdate(menu);
         return Result.succ(null);
     }

src/main/java/com/om/entity/dto/DiagnosisVErsionInfoDTO.java

@@ -1,5 +1,6 @@
 package com.om.entity.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,15 +11,19 @@ import java.time.LocalDateTime;
 @Data
 @NoArgsConstructor
 public class DiagnosisVErsionInfoDTO implements Serializable {
+
     @ApiModelProperty(value = "诊断程序版本名称")
     private String diagnosisName;
+
     @ApiModelProperty(value = "版本号")
     private String versionNum;
+
     @ApiModelProperty(value = "测试版本操作人")
     private String username;
 
     @ApiModelProperty(value = "密码代码")
     private String cipherCode;
+
     @ApiModelProperty(value = "品牌名称")
     private String brandCode;
 
@@ -26,9 +31,12 @@ public class DiagnosisVErsionInfoDTO implements Serializable {
     private String clientName;
 
     @ApiModelProperty(value = "发布时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime releaseTime;
+
     @ApiModelProperty(value = "文件大小")
     private Double fileSize;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

src/main/java/com/om/entity/po/DiagnosisVersionInfo.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -47,6 +49,7 @@ public class DiagnosisVersionInfo implements Serializable {
     private String clientPath;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "描述")
@@ -83,12 +86,14 @@ public class DiagnosisVersionInfo implements Serializable {
     private String releaseName;
 
     @ApiModelProperty(value = "发布时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime releaseTime;
 
     @ApiModelProperty(value = "诊断程序下载链接")
     private String savePath;
 
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime updateTime;
 
     @ApiModelProperty(value = "版本号")

src/main/java/com/om/entity/vo/DiagnosisVersionVO.java

@@ -4,18 +4,22 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.web.multipart.MultipartFile;
+
+import java.io.Serializable;
+
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-public class DiagnosisVersionVO {
+@AllArgsConstructor
+public class DiagnosisVersionVO implements Serializable {
+    private static final long serialVersionUID = 1L;
     private Integer id;
-    private Integer mark;
+    private String mark;
     private String diagnosisName;
     private String brandCode;
     private String[] clientNums;
     private String[] language;
     private String[] descriptionList;
-    private String file;
+    private String fileUrl;
     private String diagnosisFileSize;
 
 }

src/main/java/com/om/entity/vo/DignosisPageVO.java

@@ -3,11 +3,13 @@ package com.om.entity.vo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @NoArgsConstructor
 @Data
-public class DignosisPageVO {
+public class DignosisPageVO implements Serializable {
+
     private Integer pageIndex;
     private Integer pageSize;
     private String query;

src/main/java/com/om/service/IDiagnosisVersionInfoService.java

@@ -27,7 +27,9 @@ public interface IDiagnosisVersionInfoService extends IService<DiagnosisVersionI
 
     Result getDesc(DiagnosisVersionVO diagnosisVersionVO);
 
-    Result getPageList(DignosisPageVO dignosisPageVO);
+    Result getPageList(Integer pageIndex,
+                       Integer pageSize
+                    );
 
     Result release(Integer id);
 

src/main/java/com/om/service/impl/DiagnosisVersionInfoServiceImpl.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.om.utils.Result;
 import com.om.utils.UserContext;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +31,7 @@ import java.util.List;
  * @since 2024-03-06
  */
 @Service
+@Slf4j
 public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersionInfoMapper, DiagnosisVersionInfo> implements IDiagnosisVersionInfoService {
 
     @Resource
@@ -47,23 +49,29 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
         info.setBrandCode(diagnosisVersionVO.getBrandCode());
 
         //获取user用户。保存当前操作人
-        Integer userId = UserContext.getUserId();
+//        Integer userId = UserContext.getUserId();
         //用户信息
-        User user = userService.getById(userId);
-        info.setUsername(user.getUsername());
-        info.setAdminId(userId);
+//        User user = userService.getById(userId);
+//
+//        log.info("========当前用户名{}==={}======",user,userId);
+//        info.setUsername(user.getUsername());
+//        info.setAdminId(userId);
         //版本号
         info.setVersionNum("1.0");
         //状态码
         info.setStatus(0);
         //文件地址
-        info.setFile(diagnosisVersionVO.getFile());
+        if (diagnosisVersionVO.getFileUrl() == null){
+            diagnosisVersionVO.setFileUrl("null");
+        }
+        info.setFile(diagnosisVersionVO.getFileUrl());
         //文件大小
         info.setDiagnosisFileSize(diagnosisVersionVO.getDiagnosisFileSize());
         //品牌代码
         info.setBrandCode(diagnosisVersionVO.getBrandCode());
         //诊断程序名称
         info.setDiagnosisName(diagnosisVersionVO.getDiagnosisName());
+        log.info("========{}========",diagnosisVersionVO);
         //客户端编号
         String s = "";
         for (int i = 0; i < diagnosisVersionVO.getClientNums().length; i++) {
@@ -74,11 +82,12 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
         //保存
         this.save(info);
         LambdaQueryWrapper<DiagnosisVersionInfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(DiagnosisVersionInfo::getFile,diagnosisVersionVO.getFile());
+        queryWrapper.eq(DiagnosisVersionInfo::getFile,diagnosisVersionVO.getFileUrl());
         queryWrapper.eq(DiagnosisVersionInfo::getDiagnosisName,diagnosisVersionVO.getDiagnosisName());
         queryWrapper.eq(DiagnosisVersionInfo::getBrandCode,diagnosisVersionVO.getBrandCode());
         //保存后获取
         DiagnosisVersionInfo versionInfo = getOne(queryWrapper);
+        log.info("==========={}=========",versionInfo);
 
         for (int i = 0; i < diagnosisVersionVO.getDescriptionList().length; i++) {
             DiagnosisVersionDescribe describe = new DiagnosisVersionDescribe();
@@ -87,6 +96,7 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
             describe.setLanguage(diagnosisVersionVO.getLanguage().toString());
             describeService.save(describe);
         }
+        log.info("============================");
 
         return Result.ok();
     }
@@ -147,11 +157,13 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
 
 
     @Override
-    public Result getPageList(DignosisPageVO dignosisPageVO) {
+    public Result getPageList(Integer pageIndex,
+                              Integer pageSize) {
+        log.info("---------{}",pageIndex);
+        log.info("---------{}",pageSize);
 
         Page<DiagnosisVersionInfo> page = this.lambdaQuery()
-                .like(StringUtils.isNotBlank(dignosisPageVO.getQuery()),DiagnosisVersionInfo::getUsername,dignosisPageVO.getQuery())
-                .page(new Page<>(dignosisPageVO.getPageIndex(),dignosisPageVO.getPageSize()));
+                .page(new Page<>(pageIndex,pageSize));
         return Result.ok(page);
     }