bug 36058

src/main/java/com/fdkankan/openApi/controller/www/CameraDetailController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.openApi.controller.www;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 相机子表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-19
+ */
+@RestController
+@RequestMapping("/openApi/cameraDetail")
+public class CameraDetailController {
+
+}
+

src/main/java/com/fdkankan/openApi/entity/www/CameraDetail.java

@@ -0,0 +1,165 @@
+package com.fdkankan.openApi.entity.www;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 相机子表
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-19
+ */
+@Getter
+@Setter
+@TableName("t_camera_detail")
+public class CameraDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 余额
+     */
+    @TableField("balance")
+    private String balance;
+
+    /**
+     * 用户表t_user的id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 0表示客户，1表示员工，2表示赠送，3表示其他，4经销商销售
+     */
+    @TableField("own")
+    private Integer own;
+
+    /**
+     * 订单号
+     */
+    @TableField("order_sn")
+    private String orderSn;
+
+    /**
+     * 0表示本国，1表示国外
+     */
+    @TableField("country")
+    private Integer country;
+
+    /**
+     * 经销商
+     */
+    @TableField("agency")
+    private String agency;
+
+    /**
+     * 相机类型，0表示双目，1四维看看pro，2 四维看看lite，9 双目转台，10 激光转台
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 总容量
+     */
+    @TableField("total_space")
+    private Long totalSpace;
+
+    /**
+     * 已使用容量
+     */
+    @TableField("used_space")
+    private Long usedSpace;
+
+    /**
+     * 相机主表t_camera的id
+     */
+    @TableField("camera_id")
+    private Long cameraId;
+
+    /**
+     * 商品表t_goods的id
+     */
+    @TableField("goods_id")
+    private Long goodsId;
+
+    /**
+     * 企业表t_company的id
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 代理商架构管理t_agent_framework的id
+     */
+    @TableField("agent_framework_id")
+    private Long agentFrameworkId;
+
+    /**
+     * 相机协作用户id
+     */
+    @TableField("cooperation_user")
+    private Long cooperationUser;
+
+    /**
+     * 设备地址（追溯管理后台）
+     */
+    @TableField("address")
+    private String address;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic(value = "A")
+    private String recStatus;
+
+    @TableField("user_camera_version")
+    private String userCameraVersion;
+
+    @TableField("app_version")
+    private String appVersion;
+
+    @TableField("last_request_time")
+    private Date lastRequestTime;
+
+    @TableField("out_time")
+    private Date outTime;
+
+    /**
+     * 代理商id
+     */
+    @TableField("agent_id")
+    private Integer agentId;
+
+    /**
+     * 购买时间
+     */
+    @TableField("buy_date")
+    private Date buyDate;
+
+
+}

src/main/java/com/fdkankan/openApi/generate/AutoGenerate.java

@@ -21,7 +21,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"openApi", getTables(new String[]{
-                "t_user",
+                "t_camera_detail",
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -63,13 +63,13 @@ public class AutoGenerate {
                 .packageConfig(builder -> {
                     builder.parent("com.fdkankan")
                             .moduleName(moduleName)
-                            .entity("entity")
-                            .service("service")
-                            .serviceImpl("service.impl")
-                            .controller("controller")
-                            .mapper("mapper")
+                            .entity("entity.www")
+                            .service("service.www")
+                            .serviceImpl("service.www.impl")
+                            .controller("controller.www")
+                            .mapper("mapper.www")
                             .xml("test.mapper")
-                            .pathInfo(Collections.singletonMap(OutputFile.mapperXml,path+"\\src\\main\\resources\\mapper\\"+moduleName));
+                            .pathInfo(Collections.singletonMap(OutputFile.mapperXml,path+"\\src\\main\\resources\\mapper\\"+moduleName + "\\www"));
                 })
                 .strategyConfig(builder -> {
                     builder.addInclude(tables)

src/main/java/com/fdkankan/openApi/mapper/www/ICameraDetailMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.openApi.mapper.www;
+
+import com.fdkankan.openApi.entity.www.CameraDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 相机子表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-19
+ */
+@Mapper
+public interface ICameraDetailMapper extends BaseMapper<CameraDetail> {
+
+}

src/main/java/com/fdkankan/openApi/service/www/ICameraDetailService.java

@@ -0,0 +1,21 @@
+package com.fdkankan.openApi.service.www;
+
+import com.fdkankan.openApi.entity.www.CameraDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ * 相机子表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-19
+ */
+public interface ICameraDetailService extends IService<CameraDetail> {
+
+    List<CameraDetail> listByCameraIds(Set<Long> cameraIds);
+
+}

src/main/java/com/fdkankan/openApi/service/www/impl/CameraDetailServiceImpl.java

@@ -0,0 +1,30 @@
+package com.fdkankan.openApi.service.www.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.openApi.entity.www.CameraDetail;
+import com.fdkankan.openApi.mapper.www.ICameraDetailMapper;
+import com.fdkankan.openApi.service.www.ICameraDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ * 相机子表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-19
+ */
+@DS("www")
+@Service
+public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, CameraDetail> implements ICameraDetailService {
+
+    @Override
+    public List<CameraDetail> listByCameraIds(Set<Long> cameraIds) {
+        return this.list(new LambdaQueryWrapper<CameraDetail>().in(CameraDetail::getCameraId, cameraIds));
+    }
+}

src/main/java/com/fdkankan/openApi/service/www/impl/ScenePlusServiceImpl.java

@@ -78,6 +78,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     private ICameraService cameraService;
 
     @Autowired
+    private ICameraDetailService cameraDetailService;
+
+    @Autowired
     private FYunFileConfig fYunFileConfig;
 
     @Autowired
@@ -336,10 +339,19 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
             }
         });
         Map<Long, String> cameraMap = new HashMap<>();
+        Map<Long, String> cameraTypeMap = new HashMap<>();
         if(CollUtil.isNotEmpty(cameraIds)){
             cameraMap = cameraService
                     .list(new LambdaQueryWrapper<Camera>().in(Camera::getId, cameraIds))
                     .stream().collect(Collectors.toMap(Camera::getId, Camera::getSnCode));
+            List<CameraDetail> cameraDetails = cameraDetailService.listByCameraIds(cameraIds);
+            if(CollUtil.isNotEmpty(cameraDetails)){
+                cameraDetails.stream().forEach(detail->{
+                    int cameraType = detail.getType();
+                    CameraTypeEnum cameraTypeEnum = CameraTypeEnum.get(cameraType);
+                    cameraTypeMap.put(detail.getCameraId(), cameraTypeEnum.getCameraName());
+                });
+            }
         }
 
         List<ScenePlusExt> scenePlusExtList = scenePlusExtService.list(new LambdaQueryWrapper<ScenePlusExt>().in(ScenePlusExt::getPlusId, plusIdList));
@@ -365,7 +377,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 vo.setShootCount(plusExt.getShootCount());
             }
             vo.setSnCode(finalCameraMap.get(scenePlus.getCameraId()));
-            vo.setCameraType("kankan");
+            vo.setCameraType(cameraTypeMap.get(scenePlus.getCameraId()));
             if (scenePlus.getSceneSource() == 4) {
                 SceneEntity scene = megaSceneMap.get(scenePlus.getNum());
                 if (Objects.nonNull(scene) && StrUtil.isNotEmpty(scene.getTitle())) {

src/main/resources/mapper/www/CameraDetailMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.openApi.mapper.www.ICameraDetailMapper">
+
+</mapper>