App端查询品牌列表和菜单更新

src/main/java/com/om/controller/user/APPBrandController.java

@@ -5,10 +5,7 @@ import com.om.entity.vo.BrandVO;
 import com.om.service.IBrandService;
 import com.om.utils.Result;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -22,7 +19,7 @@ public class APPBrandController {
     private IBrandService brandService;
 
 
-    @GetMapping("getList")
+    @PostMapping("getList")
     public Result<List<BrandVO>> getAPPList(@RequestBody AppBaseDTO dto){
        return brandService.getAPPList(dto);
     }

src/main/java/com/om/controller/user/APPDiagMenuController.java

@@ -1,15 +1,14 @@
 package com.om.controller.user;
 
+import com.om.entity.dto.AppmenuUpdateDTO;
 import com.om.entity.vo.AppMenuVO;
 import com.om.entity.vo.BrandVO;
 import com.om.service.IBrandService;
+import com.om.service.IDiagnosticMenuService;
 import com.om.utils.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -20,12 +19,12 @@ import java.util.List;
 public class APPDiagMenuController {
 
     @Resource
-    private IBrandService brandService;
+    private IDiagnosticMenuService menuService;
 
 
     @PostMapping("update")
     @ApiOperation("菜单更新")
-    public Result<AppMenuVO> menuUpdate(){
-        return null;
+    public Result<AppMenuVO> menuUpdate(@RequestBody AppmenuUpdateDTO dto){
+        return menuService.menuUpdate(dto);
     }
 }

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

@@ -0,0 +1,15 @@
+package com.om.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+public class AppmenuUpdateDTO extends AppBaseDTO {
+
+    @ApiModelProperty(value = "菜单版本号")
+    private String version;
+}

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

@@ -1,9 +1,11 @@
 package com.om.service;
 
+import com.om.entity.dto.AppmenuUpdateDTO;
 import com.om.entity.dto.DiaMenuQueryPageDTO;
 import com.om.entity.dto.DiagnosticMenuDTO;
 import com.om.entity.po.DiagnosticMenu;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.om.entity.vo.AppMenuVO;
 import com.om.entity.vo.DiaMenuQueryPageVO;
 import com.om.entity.vo.DiaMenuUploadVO;
 import com.om.utils.Result;
@@ -28,4 +30,6 @@ public interface IDiagnosticMenuService extends IService<DiagnosticMenu> {
     Result updateStatus(Integer id, Integer status);
 
     Result<DiaMenuQueryPageVO> getPageList(DiaMenuQueryPageDTO dto);
+
+    Result<AppMenuVO> menuUpdate(AppmenuUpdateDTO dto);
 }

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

@@ -0,0 +1,16 @@
+package com.om.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.om.entity.po.AppsClients;
+import com.om.entity.po.DiagClients;
+import com.om.mapper.AppsClientsMapper;
+import com.om.mapper.DiagClientsMapper;
+import com.om.service.IAppsClientsService;
+import com.om.service.IDiagClientsService;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class DiagClientsServiceImpl extends ServiceImpl<DiagClientsMapper, DiagClients> implements IDiagClientsService {
+
+}

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

@@ -1,13 +1,17 @@
 package com.om.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.om.entity.dto.AppmenuUpdateDTO;
 import com.om.entity.dto.DiaMenuQueryPageDTO;
 import com.om.entity.dto.DiagnosticMenuDTO;
+import com.om.entity.dto.GuidDTO;
 import com.om.entity.po.Client;
 import com.om.entity.po.DiagnosticMenu;
 import com.om.entity.po.DiagnosticMenuVO;
 import com.om.entity.po.Distributor;
+import com.om.entity.vo.AppMenuVO;
 import com.om.entity.vo.DiaMenuQueryPageVO;
 import com.om.entity.vo.DiaMenuUploadVO;
 import com.om.entity.vo.DistributorQueryPageVO;
@@ -18,6 +22,7 @@ import com.om.service.IDiagnosticMenuService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.om.utils.FileSizeConverter;
 import com.om.utils.HuaweiObsUtil;
+import com.om.utils.JwtUtils;
 import com.om.utils.Result;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
@@ -52,6 +57,9 @@ public class DiagnosticMenuServiceImpl extends ServiceImpl<DiagnosticMenuMapper,
     @Resource
     private IClientService clientService;
 
+    @Resource
+    private JwtUtils jwtUtils;
+
     @Override
     public Result createDiaMenu(DiagnosticMenuDTO dto) {
         if (BeanUtil.isEmpty(dto)) {
@@ -166,5 +174,38 @@ public class DiagnosticMenuServiceImpl extends ServiceImpl<DiagnosticMenuMapper,
         return Result.ok(vo);
     }
 
+    @Override
+    public Result<AppMenuVO> menuUpdate(AppmenuUpdateDTO dto) {
+        if (BeanUtil.isEmpty(dto)){
+            throw new BadReqException("数据为空！");
+        }
+        String version = dto.getVersion();
+
+        String guid = dto.getGuid();
+        GuidDTO guidDTO = jwtUtils.getGuidDTOFromToken(guid);
+        String clientNum = guidDTO.getClientNum();
+
+        //根据客户端编号查询id
+        Client client = clientService.lambdaQuery()
+                .eq(Client::getNumber, clientNum)
+                .one();
+        if (BeanUtil.isEmpty(client)){
+            throw new BadReqException("该客户端不存在");
+        }
+        QueryWrapper<DiagnosticMenu> wrapper = new QueryWrapper<>();
+        wrapper.apply("CONCAT(',', client_ids, ',') LIKE {0}", "%,1,%");
+
+        DiagnosticMenu diagnosticMenu = this.getOne(wrapper);
+        if (BeanUtil.isEmpty(diagnosticMenu)){
+            throw new BadReqException("该菜单不存在");
+        }
+        AppMenuVO vo = new AppMenuVO();
+        BeanUtil.copyProperties(diagnosticMenu,vo);
+        vo.setUrl(diagnosticMenu.getSavePath());
+        vo.setVersion(diagnosticMenu.getVersionNum());
+
+        return Result.ok(vo);
+    }
+
 
 }