1

src/main/java/com/fdkankan/manage/controller/CameraTypeController.java

@@ -1,6 +1,11 @@
 package com.fdkankan.manage.controller;
 
 
+import com.fdkankan.manage.common.ResultData;
+import com.fdkankan.manage.service.ICameraTypeService;
+import com.fdkankan.manage.service.ICameraWifiPrefixService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -14,8 +19,16 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-04-11
  */
 @RestController
-@RequestMapping("/manage/cameraType")
+@RequestMapping("/service/manage/cameraType")
 public class CameraTypeController {
 
+    @Autowired
+    ICameraTypeService cameraTypeService;
+
+    @GetMapping("/allList")
+    public ResultData allList(){
+
+        return ResultData.ok(cameraTypeService.list());
+    }
 }
 

src/main/java/com/fdkankan/manage/entity/CameraType.java

@@ -56,6 +56,9 @@ public class CameraType implements Serializable {
     @TableField("remark")
     private String remark;
 
+    @TableField("name")
+    private String name;
+
     @TableField("create_time")
     private Date createTime;
 

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -106,6 +106,14 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     @Override
     public PageInfo pageList(CameraParam param) {
         Page<CameraDetailVo> voPage = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        List<CameraType> list = cameraTypeService.list();
+        HashMap<String,CameraType> typeHashMap = new HashMap<>();
+        for (CameraType cameraType : list) {
+            typeHashMap.put(cameraType.getCameraType().toString(),cameraType);
+        }
+        for (CameraDetailVo record : voPage.getRecords()) {
+            record.setTypeStr(typeHashMap.get(record.getType()).getName());
+        }
         return PageInfo.PageInfo(voPage);
     }
 

src/main/java/com/fdkankan/manage/vo/response/CameraDetailVo.java

@@ -17,6 +17,7 @@ public class CameraDetailVo {
 
     private String wifiName;            //wifi名称
     private String type;                //相机类型，0表示双目，1四维看看pro，2 四维看看lite，9 双目转台，10 激光转台
+    private String typeStr;                //相机类型，0表示双目，1四维看看pro，2 四维看看lite，9 双目转台，10 激光转台
     private String outType;             //出库类型
     private String companyName;         //客户名称
     private String userName;            //绑定账号