1

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

@@ -0,0 +1,54 @@
+package com.fdkankan.manage.entity;
+
+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 2025-04-07
+ */
+@Getter
+@Setter
+@TableName("t_authorize_camera_detail_order")
+public class AuthorizeCameraDetailOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("authorize_camera_id")
+    private Integer authorizeCameraId;
+
+    @TableField("sn_code")
+    private String snCode;
+
+    @TableField("camera_id")
+    private Integer cameraId;
+
+    @TableField("camera_type")
+    private Integer cameraType;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

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

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"manage", getTables(new String[]{
-                "t_authorize_rtk"
+                "t_authorize_camera_detail_order"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/manage/mapper/IAuthorizeCameraDetailOrderMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.AuthorizeCameraDetailOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-04-07
+ */
+@Mapper
+public interface IAuthorizeCameraDetailOrderMapper extends BaseMapper<AuthorizeCameraDetailOrder> {
+
+}

src/main/java/com/fdkankan/manage/service/IAuthorizeCameraDetailOrderService.java

@@ -0,0 +1,22 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.AuthorizeCameraDetail;
+import com.fdkankan.manage.entity.AuthorizeCameraDetailOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-04-07
+ */
+public interface IAuthorizeCameraDetailOrderService extends IService<AuthorizeCameraDetailOrder> {
+
+    HashMap<Integer, List<AuthorizeCameraDetailOrder>> getByCameraIds(Set<Integer> ids);
+}

src/main/java/com/fdkankan/manage/service/IAuthorizeCameraDetailService.java

@@ -22,4 +22,6 @@ public interface IAuthorizeCameraDetailService extends IService<AuthorizeCameraD
     void updateSnCode(Integer id, Long cameraId,Integer cameraType,String snCode);
 
     HashMap<Integer, List<AuthorizeCameraDetail>> getByCameraIds(Set<Integer> ids);
+
+    HashMap<Integer, String> getSnCodeByCamaerIds(Set<Integer> ids,String listType);
 }

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

@@ -0,0 +1,51 @@
+package com.fdkankan.manage.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.manage.entity.AuthorizeCameraDetail;
+import com.fdkankan.manage.entity.AuthorizeCameraDetailOrder;
+import com.fdkankan.manage.mapper.IAuthorizeCameraDetailOrderMapper;
+import com.fdkankan.manage.service.IAuthorizeCameraDetailOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-04-07
+ */
+@Service
+public class AuthorizeCameraDetailOrderServiceImpl extends ServiceImpl<IAuthorizeCameraDetailOrderMapper, AuthorizeCameraDetailOrder> implements IAuthorizeCameraDetailOrderService {
+
+    @Override
+    public HashMap<Integer, List<AuthorizeCameraDetailOrder>> getByCameraIds(Set<Integer> ids) {
+        HashMap<Integer, List<AuthorizeCameraDetailOrder>> map = new HashMap<>();
+        if(ids  == null ||ids.isEmpty()){
+            return map;
+        }
+
+        LambdaQueryWrapper<AuthorizeCameraDetailOrder> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(AuthorizeCameraDetailOrder::getAuthorizeCameraId,ids);
+        List<AuthorizeCameraDetailOrder> list = this.list(wrapper);
+
+        for (AuthorizeCameraDetailOrder authorizeCameraDetail : list) {
+            List<AuthorizeCameraDetailOrder> authorizeCameraDetails = map.get(authorizeCameraDetail.getAuthorizeCameraId());
+            if(authorizeCameraDetails == null){
+                authorizeCameraDetails = new ArrayList<>();
+                authorizeCameraDetails.add(authorizeCameraDetail);
+                map.put(authorizeCameraDetail.getAuthorizeCameraId(),authorizeCameraDetails);
+            }else {
+                authorizeCameraDetails.add(authorizeCameraDetail);
+            }
+
+        }
+        return map;
+    }
+}

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

@@ -3,9 +3,14 @@ package com.fdkankan.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.manage.entity.AuthorizeCameraDetail;
+import com.fdkankan.manage.entity.AuthorizeCameraDetailOrder;
 import com.fdkankan.manage.mapper.IAuthorizeCameraDetailMapper;
+import com.fdkankan.manage.service.IAuthorizeCameraDetailOrderService;
 import com.fdkankan.manage.service.IAuthorizeCameraDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.vo.response.AuthorizeCameraDetailVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -24,6 +29,8 @@ import java.util.Set;
 @Service
 public class AuthorizeCameraDetailServiceImpl extends ServiceImpl<IAuthorizeCameraDetailMapper, AuthorizeCameraDetail> implements IAuthorizeCameraDetailService {
 
+    @Autowired
+    IAuthorizeCameraDetailOrderService authorizeCameraDetailOrderService;
     @Override
     public List<AuthorizeCameraDetail> getByCameraId(Integer id) {
         LambdaQueryWrapper<AuthorizeCameraDetail> wrapper = new LambdaQueryWrapper<>();
@@ -65,4 +72,36 @@ public class AuthorizeCameraDetailServiceImpl extends ServiceImpl<IAuthorizeCame
         }
         return map;
     }
+
+    @Override
+    public HashMap<Integer, String> getSnCodeByCamaerIds(Set<Integer> ids,String listType) {
+        HashMap<Integer, String> map = new HashMap<>();
+        if(StringUtils.isNotBlank(listType) && "order".equals(listType)){
+            HashMap<Integer, List<AuthorizeCameraDetailOrder>> orderMap = authorizeCameraDetailOrderService.getByCameraIds(ids);
+            for (Integer key : orderMap.keySet()) {
+                String snCodes  = "";
+                List<AuthorizeCameraDetailOrder> details = orderMap.get(key);
+                if(details != null){
+                    for (AuthorizeCameraDetailOrder detail : details) {
+                        snCodes += detail.getSnCode()+ "\n";
+                    }
+                }
+                map.put(key,snCodes);
+            }
+        }else {
+            HashMap<Integer, List<AuthorizeCameraDetail>> detailMap =this.getByCameraIds(ids);
+
+            for (Integer key : detailMap.keySet()) {
+                String snCodes  = "";
+                List<AuthorizeCameraDetail> details = detailMap.get(key);
+                if(details != null){
+                    for (AuthorizeCameraDetail detail : details) {
+                        snCodes += detail.getSnCode()+ "\n";
+                    }
+                }
+                map.put(key,snCodes);
+            }
+        }
+        return map;
+    }
 }

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

@@ -26,8 +26,10 @@ import com.fdkankan.reg.dto.CamRegDto;
 import com.fdkankan.reg.dto.CamRegSDto;
 import com.fdkankan.reg.dto.MachineRegDto;
 import jdk.internal.dynalink.linker.LinkerServices;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -51,6 +53,8 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
     @Autowired
     IAuthorizeCameraDetailService authorizeCameraDetailService;
     @Autowired
+    IAuthorizeCameraDetailOrderService authorizeCameraDetailOrderService;
+    @Autowired
     IAuthorizeCameraLogService authorizeCameraLogService;
     @Autowired
     ISysUserService sysUserService;
@@ -71,19 +75,13 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
         Set<Long> sysIds = page.getRecords().stream().map(AuthorizeCamera::getSysUserId).collect(Collectors.toSet());
         Set<Integer> Ids = page.getRecords().stream().map(AuthorizeCamera::getId).collect(Collectors.toSet());
         HashMap<Long, SysUser> userMap = sysUserService.getByIds(sysIds);
-        HashMap<Integer, List<AuthorizeCameraDetail>> detailMap =authorizeCameraDetailService.getByCameraIds(Ids);
+
+        HashMap<Integer, String> snCodeMaps =authorizeCameraDetailService.getSnCodeByCamaerIds(Ids,param.getListType());
         for (AuthorizeCamera record : page.getRecords()) {
             if(userMap.get(record.getSysUserId())!=null){
                 record.setSysUserName(userMap.get(record.getSysUserId()).getNickName());
             }
-            String snCodes  = "";
-            List<AuthorizeCameraDetail> details = detailMap.get(record.getId());
-            if(details != null){
-                for (AuthorizeCameraDetail detail : details) {
-                    snCodes += detail.getSnCode()+ "\n";
-                }
-            }
-            record.setSnCodes(snCodes);
+            record.setSnCodes(snCodeMaps.get(record.getId()));
         }
         return page;
     }
@@ -160,6 +158,10 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
         for (AuthorizeCameraDetail detail : detailHashMap.values()) {
             detail.setAuthorizeCameraId(param.getId());
             authorizeCameraDetailService.save(detail);
+            AuthorizeCameraDetailOrder order = new AuthorizeCameraDetailOrder();
+            BeanUtils.copyProperties(detail,order);
+            order.setId(null);
+            authorizeCameraDetailOrderService.save(order);
         }
         return param;
     }

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

@@ -0,0 +1,41 @@
+package com.fdkankan.manage.vo.response;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2025-04-07
+ */
+@Getter
+@Setter
+public class AuthorizeCameraDetailVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private Integer authorizeCameraId;
+
+    private String snCode;
+
+    private Integer cameraId;
+
+    private Integer cameraType;
+
+    private String recStatus;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+
+}

src/main/resources/mapper/manage/AuthorizeCameraDetailOrderMapper.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.manage.mapper.IAuthorizeCameraDetailOrderMapper">
+
+</mapper>