1

src/main/java/com/fdkankan/agent/response/CameraDetailVo.java

@@ -21,6 +21,6 @@ public class CameraDetailVo {
     private String incrementTypeName;
 
     private Integer incrementStatus;
-
+    private Integer validTimeType;
 
 }

src/main/java/com/fdkankan/agent/response/CameraIncrementVo.java

@@ -10,4 +10,5 @@ public class CameraIncrementVo extends CameraIncrementLog {
     private String operationUserName;
     private Integer incrementTypeId;
     private String incrementTypeName;
+    private Integer validTimeType;
 }

src/main/java/com/fdkankan/agent/service/impl/CameraIncrementLogServiceImpl.java

@@ -37,15 +37,6 @@ public class CameraIncrementLogServiceImpl extends ServiceImpl<ICameraIncrementL
     @Override
     public Object pageList(CameraIncrementParam param) {
         Page<CameraIncrementVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
-        Set<Integer> typeIds = page.getRecords().stream().map(CameraIncrementVo::getIncrementTypeId).collect(Collectors.toSet());
-        HashMap<Integer, IncrementType> mapByIds = incrementTypeService.getMapByIds(typeIds);
-        for (CameraIncrementVo record : page.getRecords()) {
-            IncrementType incrementType = mapByIds.get(record.getIncrementTypeId());
-            if(record.getIncrementTypeId() != null && incrementType !=null){
-                String incrementName = IncrementUtil.getStrIncrementName(incrementType.getValidTimeType(),incrementType.getName());
-                record.setIncrementTypeName(incrementName);
-            }
-        }
         return PageInfo.PageInfo(page);
     }
 }

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

@@ -38,16 +38,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     public Object pageList(CameraParam param) {
         Page<CameraDetailVo> voPage = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
 
-        Set<Integer> incrementTypeIds = voPage.getRecords().stream().map(CameraDetailVo::getIncrementTypeId).collect(Collectors.toSet());
-        HashMap<Integer, IncrementType> incrementTypeHashMap = incrementTypeService.getMapByIds(incrementTypeIds);
-
-        for (CameraDetailVo record : voPage.getRecords()) {
-            if(record.getIncrementTypeId() != null){
-                IncrementType incrementType = incrementTypeHashMap.get(record.getIncrementTypeId());
-                String strIncrementName = IncrementUtil.getStrIncrementName(incrementType.getValidTimeType(), incrementType.getName());
-                record.setIncrementTypeName(strIncrementName);
-            }
-        }
         return PageInfo.PageInfo(voPage);
     }
 

src/main/resources/mapper/agent/CameraIncrementLogMapper.xml

@@ -3,11 +3,13 @@
 <mapper namespace="com.fdkankan.agent.mapper.ICameraIncrementLogMapper">
 
     <select id="pageList" resultType="com.fdkankan.agent.response.CameraIncrementVo">
-        select  cil.*,c.sn_code,u.user_name as operationUserName,ui.increment_type_id from t_camera_increment_log cil
+        select  cil.*,c.sn_code,u.user_name as operationUserName,ui.increment_type_id ,uit.valid_time_type
+        from t_camera_increment_log cil
             left join t_camera c on cil.camera_id = c.id
             left join t_user_increment ui on cil.increment_id = ui.id
             left join t_user u on cil.operation_user = u.id
-            where cil.rec_status = 'A'
+            left join t_increment_type uit on ui.increment_type_id = uit.id
+        where cil.rec_status = 'A'
             <if test="param.snCode != null and param.snCode !=''">
                 and c.sn_code like concat ('%',#{param.snCode},'%')
             </if>

src/main/resources/mapper/agent/CameraMapper.xml

@@ -4,11 +4,12 @@
 
     <select id="pageList" resultType="com.fdkankan.agent.response.CameraDetailVo">
         select c.id ,c.sn_code,c.activated_time ,d.create_time as outTime ,d.type,d.own as outType  ,u.user_name, c.wifi_name,
-        d.order_sn,ui.increment_type_id,ui.is_expired as incrementStatus
+        d.order_sn,ui.increment_type_id,ui.is_expired as incrementStatus ,uit.valid_time_type
         from t_camera c
         left join t_camera_detail d on c.id = d.camera_id
         left join t_user u on d.user_id = u.id
         left join t_user_increment ui on d.camera_id = ui.camera_id
+        left join t_increment_type uit on ui.increment_type_id = uit.id
         where c.rec_status = 'A' and d.agent_id = #{param.agentId}
         <if test="param.userId !=null ">
             and d.user_id = #{param.userId}