houzhongjian
2025-01-13 0a1d3e24b3d0095432b2ca9176906bdf3839c462
1、增加ImageDao.xml文件
2、增加JmDragExternalServiceImpl.java文件
已添加2个文件
151 ■■■■■ 文件已修改
iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/video/ImageDao.xml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-report/iailab-module-report-biz/src/main/java/com/iailab/module/report/framework/jmreport/core/service/JmDragExternalServiceImpl.java 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/video/ImageDao.xml
对比新文件
@@ -0,0 +1,28 @@
<?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.iailab.module.data.video.dao.ImageDao">
    <select id="getPageList" resultType="com.iailab.module.data.video.dto.ImageDTO">
      select
      t1.*,
      t2.brand,
      t2.code,
      t2.device
      from t_video_image t1
      left join t_video_camera t2 on t2.id = t1.camera_id
    <where>
        <if test="params.brand != null and params.brand != ''">
            and t2.brand = #{params.brand}
        </if>
        <if test="params.code != null and params.code != ''">
            and t2.code like concat('%', #{params.code}, '%')
        </if>
        <if test="params.device != null and params.device != ''">
            and t2.device like concat('%', #{params.device}, '%')
        </if>
    </where>
        order by t1.create_date desc
    </select>
</mapper>
iailab-module-report/iailab-module-report-biz/src/main/java/com/iailab/module/report/framework/jmreport/core/service/JmDragExternalServiceImpl.java
对比新文件
@@ -0,0 +1,123 @@
package com.iailab.module.report.framework.jmreport.core.service;
import com.alibaba.fastjson.JSONObject;
import com.iailab.module.system.api.dict.DictDataApi;
import com.iailab.module.system.api.dict.dto.DictDataRespDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.jeecg.modules.drag.service.IOnlDragExternalService;
import org.jeecg.modules.drag.vo.DragDictModel;
import org.jeecg.modules.drag.vo.DragLogDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * @Description: 字典处理
 * @Author: lsq
 * @Date:2023-01-09
 * @Version:V1.0
 */
@Slf4j
@Service("onlDragExternalServiceImpl")
public class JmDragExternalServiceImpl implements IOnlDragExternalService {
    private static Logger logger = LoggerFactory.getLogger(JmDragExternalServiceImpl.class);
    @Lazy
    @Resource
    private DictDataApi dictDataApi;
    /**
     *  根据多个字典code查询多个字典项
     * @param codeList
     * @return key = dictCode ; value=对应的字典项
     */
    @Override
    public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList, List<JSONObject> tableDictList) {
        Map<String, List<DragDictModel>> manyDragDictItems  = new HashMap<>();
        if(!CollectionUtils.isEmpty(codeList)){
            Map<String, List<DictDataRespDTO>> dictItemsMap = new HashMap<>();
//            Map<String, List<DictDataRespDTO>> dictItemsMap = dictDataApi.getManyDictItems(codeList);
            dictItemsMap.forEach((k,v)->{
                List<DragDictModel> dictItems  = new ArrayList<>();
                v.forEach(dictItem->{
                    DragDictModel dictModel = new DragDictModel();
                    BeanUtils.copyProperties(dictItem,dictModel);
                    dictItems.add(dictModel);
                });
                manyDragDictItems.put(k,dictItems);
            });
        }
        if(!CollectionUtils.isEmpty(tableDictList)){
            tableDictList.forEach(item->{
                List<DragDictModel> dictItems  = new ArrayList<>();
                JSONObject object = JSONObject.parseObject(item.toString());
                String dictField = object.getString("dictField");
                String dictTable = object.getString("dictTable");
                String dictText = object.getString("dictText");
                String fieldName = object.getString("fieldName");
                List<DictDataRespDTO> dictItemsList = new ArrayList<>();
//                List<DictDataRespDTO> dictItemsList = dictDataApi.queryTableDictItemsByCode(dictTable,dictText,dictField);
                dictItemsList.forEach(dictItem->{
                    DragDictModel dictModel = new DragDictModel();
                    BeanUtils.copyProperties(dictItem,dictModel);
                    dictItems.add(dictModel);
                });
                manyDragDictItems.put(fieldName,dictItems);
            });
        }
        return manyDragDictItems;
    }
    /**
     *
     * @param dictCode
     * @return
     */
    @Override
    public List<DragDictModel> getDictItems(String dictCode) {
        List<DragDictModel> dictItems  = new ArrayList<>();
        if(ObjectUtils.isNotEmpty(dictCode)){
            List<DictDataRespDTO> dictItemsList = dictDataApi.getDictDataList(dictCode).getData();
            dictItemsList.forEach(dictItem->{
                DragDictModel dictModel = new DragDictModel();
                BeanUtils.copyProperties(dictItem,dictModel);
                dictItems.add(dictModel);
            });
        }
        return dictItems;
    }
    /**
     * 添加日志
     * @param dragLogDTO
     */
    @Override
    public void addLog(DragLogDTO dragLogDTO) {
        if(ObjectUtils.isNotEmpty(dragLogDTO)){
            logger.info(dragLogDTO.toString());
        }
    }
    /**
     * 保存日志
     * @param logMsg
     * @param logType
     * @param operateType
     */
    @Override
    public void addLog(String logMsg, int logType, int operateType) {
        logger.info(logMsg,logType,operateType);
    }
}