提交忽略文件

doum

2026-01-29 88f72df1efba56e731aac80de4d9f3b879cc85cf

提交忽略文件

 admin/src/assets/style/style.scss

@@ -56,3 +56,18 @@
    }
  }
}

.red{
  color: red;
}
.grey{
  color: grey;
}
.green{
  color: green;
}
.blue{
  color: #216EEE;
}.orange{
   color: orange;
 }

 admin/src/components/business/OperaMemberImportWindow.vue

@@ -71,6 +71,7 @@
        })
        .catch(err => {
          this.fileName = ''
          this.$message.error(err)
        })
        .finally(() => {
          this.$refs.fileExcel.value = null

 admin/src/views/business/importRecord.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,134 @@
<template>
  <TableLayout :permissions="['business:importrecord:query']">
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="操作人" prop="name">
        <el-input v-model="searchForm.updateUserName" placeholder="请输入操作人姓名" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="业务类型" prop="type">
        <el-select v-model="searchForm.type"    placeholder="请选择业务类型" clearable   @change="search" >
          <el-option :key="0" :value="0" label="老师导入"></el-option>
          <el-option :key="1" :value="1" label="案例导入"></el-option>
        </el-select>
      </el-form-item>
      <div class="date-style" style="display: inline">
        <el-form-item label="导入时间" prop="starttime" >
          <el-date-picker
              style="width: 160px"
              clearable
              @change="search"
              v-model="searchForm.starttime"
              type="datetime"
              value-format="yyyy-MM-dd HH:mm:ss"
              format="yyyy-MM-dd HH:mm:ss"
              range-separator="至"
              placeholder="开始时间"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="-" label-width="10px" prop="endtime" >
          <el-date-picker
              style="width: 160px"
              clearable
              v-model="searchForm.endtime"
              type="datetime"
              @change="search"
              value-format="yyyy-MM-dd HH:mm:ss"
              format="yyyy-MM-dd HH:mm:ss"
              range-separator="至"
              placeholder="截止时间"
          ></el-date-picker>
        </el-form-item>
      </div>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
        <el-table-column prop="title" label="内容" min-width="200px" show-overflow-tooltip></el-table-column>
        <el-table-column label="业务类型">
          <template slot-scope="{row}">
            <span v-if="row.type ==0 " >老师导入</span>
            <span v-if="row.type == 1"  >案例导入</span>
          </template>
        </el-table-column>
        <el-table-column label="状态">
          <template slot-scope="{row}">
            <span v-if="row.status ==0 " class="blue">未处理</span>
            <span v-if="row.status == 1" class="red">处理中</span>
            <span v-if="row.status == 2" class="grey">已处理</span>
          </template>
        </el-table-column>
        <el-table-column prop="totalNum" label="总记录数" min-width="100px"></el-table-column>
        <el-table-column prop="doneNum" label="成功录入数量" min-width="100px"></el-table-column>
        <el-table-column prop="errorNum" label="录入失败数量" min-width="100px"></el-table-column>
        <el-table-column prop="updateUserName" label="操作人" min-width="100px"></el-table-column>
        <el-table-column prop="updateTime" label="最近操作时间" min-width="150px"></el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      </pagination>
    </template>
    <!-- æ–°å»º/修改 -->
    <OperaCategoryWindow ref="operaCategoryWindow" @success="handlePageChange"/>
  </TableLayout>
</template>

<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaCategoryWindow from '@/components/business/OperaCategoryWindow'
export default {
  name: 'Category',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaCategoryWindow },
  data () {
    return {
      // æœç´¢
      searchForm: {
        updateUserName: '',
        starttime: null,
        endtime: null,
        type: ''
      }
    }
  },
  created () {
    this.config({
      module: '分类信息表',
      api: '/business/importRecord',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.search()
  },
  methods: {
    changeStatus (e, row) {
      this.working = true
      this.api.updateStatus({ id: row.id, status: e })
        .then(res => {
          this.$tip.apiSuccess(res || '操作成功')
          this.search()
        })
        .catch(e => {
          this.$tip.apiFailed(e)
        })
        .finally(() => {
          this.working = false
        })
    }
  }
}
</script>

 admin/src/views/business/member.vue

@@ -110,8 +110,8 @@
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column  prop="imgurl" label="图片" min-width="100px">
          <template slot-scope="{row}">
            <el-image v-if="row.imgurlfull" style="width: 50px; height: 50px; margin-right: 10px" :src="row.imgurlfull"
                      :preview-src-list="[row.imgurlfull]">
            <el-image v-if="row.fullImgurl" style="width: 50px; height: 50px; margin-right: 10px" :src="row.fullImgurl"
                      :preview-src-list="[row.fullImgurl]">
            </el-image>
          </template>
        </el-table-column>
@@ -123,7 +123,7 @@
            <span v-if="row.sex ==1">女</span>
          </template>
        </el-table-column>
        <el-table-column prop="position" label="岗位" min-width="120px"></el-table-column>
        <el-table-column prop="positon" label="岗位" min-width="120px"></el-table-column>
        <el-table-column prop="levelName" label="等级" min-width="100px"></el-table-column>
        <el-table-column prop="jobYear" label="从业年份" min-width="100px"></el-table-column>
        <el-table-column prop="serveNum" label="服务商场" min-width="100px">

 server/services/src/main/java/com/doumee/core/annotation/excel/ExcelImporter.java

@@ -10,10 +10,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.web.multipart.MultipartFile;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.*;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.*;
@@ -147,12 +144,13 @@
    }
    public ExcelImporter(String fileName, InputStream in, int headerNum, int sheetIndex,CellType cellType)
        throws InvalidFormatException, IOException {
        ByteArrayOutputStream buffer = toByteArray(in);
        if (StringUtils.isBlank(fileName)){
            throw new RuntimeException("导入文档为空!");
        }else if(fileName.toLowerCase().endsWith("xls")){
            this.wb = new HSSFWorkbook(in);
            this.wb = new HSSFWorkbook(new ByteArrayInputStream(buffer.toByteArray()));
        }else if(fileName.toLowerCase().endsWith("xlsx")){
            this.wb = new XSSFWorkbook(in);
            this.wb = new XSSFWorkbook(new ByteArrayInputStream(buffer.toByteArray()));
        }else{
            throw new RuntimeException("文档格式不正确!");
        }
@@ -162,10 +160,27 @@
        this.sheet = this.wb.getSheetAt(sheetIndex);
        this.headerNum = headerNum;
        this.changeType = cellType;
        this.pictureList = ExcelPictureUtil.getExcelPictures(in);
        this.pictureList = ExcelPictureUtil.getExcelPictures(new ByteArrayInputStream(buffer.toByteArray()));
        log.debug("Initialize success.");
    }

    public static ByteArrayOutputStream toByteArray(InputStream inputStream) {
        try {
            // ç¼“存文件流
            ByteArrayOutputStream buffer = new ByteArrayOutputStream();
            byte[] data = new byte[1024];
            int nRead;
            while ((nRead = inputStream.read(data, 0, data.length))!= -1) {
                buffer.write(data, 0, nRead);
            }
            buffer.flush();

           return  buffer;
        } catch (IOException e) {
            e.printStackTrace();
        }
        return null;
    }


    /**
@@ -357,6 +372,7 @@
                                    "fieldtype."+valType.getSimpleName()+"Type")).getMethod("getValue", String.class).invoke(null, val.toString());
                            }
                        }

                    } catch (Exception ex) {
                        log.info("Get cell value ["+i+","+column+"] error: " + ex.toString());
                        val = null;

 server/services/src/main/java/com/doumee/core/annotation/excel/ExcelPictureUtil.java

@@ -33,7 +33,7 @@

    public static Map<String, XSSFPictureData> getExcelPictures(InputStream is) {
        try {
            byte[] fileData =  getFileStream(is);
            byte[] fileData = toByteArray(is);
            Map<String, XSSFPictureData> pictures = getPictures(fileData);
            pictures.forEach((id, xssfPictureData) -> {
                System.out.println("id：" + id);
@@ -46,6 +46,15 @@
        }

    }
    public static byte[] toByteArray(InputStream input) throws IOException {
        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
        int bytesRead;
        byte[] buffer = new byte[1024]; // å¯ä»¥æ ¹æ®éœ€è¦è°ƒæ•´ç¼“冲区大小
        while ((bytesRead = input.read(buffer)) != -1) {
            byteArrayOutputStream.write(buffer, 0, bytesRead);
        }
        return byteArrayOutputStream.toByteArray();
    }

    /**
     * èŽ·å–浮动图片，以 map å½¢å¼è¿”回，键为行列格式 x-y。

 server/services/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -438,7 +438,7 @@
     * @return String
     * @throws Exception
     */
    public static String getNowShortDate() throws Exception {
    public static String getNowShortDate() {
        String nowDate = "";
        try {
            java.sql.Date date = null;
@@ -446,7 +446,7 @@
            nowDate = sdfShort.format(date);
            return nowDate;
        } catch (Exception e) {
            throw e;
            return  null;
        }
    }


 server/services/src/main/java/com/doumee/core/utils/tyyun/TyyZosUtil.java

@@ -163,7 +163,6 @@
    }
    public boolean uploadInputstreamObject(InputStream inputStream, String bucketName, String key )     {
        try {

            if (inputStream != null) {
                ObjectMetadata metadata = new ObjectMetadata();
                metadata.setContentLength(inputStream.available());
@@ -181,5 +180,23 @@
        return false;

    }
    public boolean uploadInputstreamObjectNoShutdown(InputStream inputStream, String bucketName, String key )     {
        try {
            if (inputStream != null) {
                ObjectMetadata metadata = new ObjectMetadata();
                metadata.setContentLength(inputStream.available());

                PutObjectRequest request = new PutObjectRequest(bucketName, key, inputStream,metadata);
                request.setCannedAcl(CannedAccessControlList.PublicRead);
                PutObjectResult result = client.putObject(request);
                return true;
            }
        }catch (Exception e){
            log.error("对象存储==================== æ–‡ä»¶ä¸Šä¼ å¤±è´¥"+e.getMessage());
        }finally {
        }
        return false;

    }

}

 server/services/src/main/java/com/doumee/dao/business/dto/MemberImport.java

@@ -1,8 +1,12 @@
package com.doumee.dao.business.dto;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.constants.Constants;
import com.doumee.dao.business.model.Category;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * å‘˜å·¥ä¿¡æ¯å¯¼å…¥è¡¨
@@ -39,4 +43,6 @@
    @ExcelColumn(name="老师简介", value = "fee",index = 13)
    private String info;



}

 server/services/src/main/java/com/doumee/dao/business/model/ImportRecord.java

@@ -83,11 +83,19 @@
    @ExcelColumn(name="导入失败记录数",index=18 ,width=10)
    private Integer errorNum;
    @TableField(exist = false)
    private List<CasesImport> caseList;
    private List<Cases> caseList;
    @TableField(exist = false)
    private List<MemberImport> memberList;
    private List<Member> memberList;
    @TableField(exist = false)
    private  List<PictureData> pictureDataList;


    @ApiModelProperty(value = "最后操作人员；", example = "1")
    @TableField(exist = false)
    private String updateUserName;
    @ApiModelProperty(value = "结束时间；", example = "1")
    @TableField(exist = false)
    private Date starttime;
    @ApiModelProperty(value = "结束时间；", example = "1")
    @TableField(exist = false)
    private Date endtime;
}

 server/services/src/main/java/com/doumee/dao/business/model/Member.java

@@ -148,10 +148,17 @@
    @ApiModelProperty("擅长领域")
    @TableField(exist = false)
    private List<Category> fieldList;
    @ApiModelProperty("战区集合")
    @TableField(exist = false)
    private List<Category> zqList;
    @ApiModelProperty("商业化类型")
    @TableField(exist = false)
    private List<Category> typeList;

    @ApiModelProperty("案例信息")
    @TableField(exist = false)
    private List<Cases> casesList;


    @TableField(exist = false)
    private byte[] imgurlData;
}

 server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
@@ -8,21 +9,33 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.tyyun.TyyZosUtil;
import com.doumee.dao.business.CasesMapper;
import com.doumee.dao.business.CategoryMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.dto.CasesImport;
import com.doumee.dao.business.dto.MemberImport;
import com.doumee.dao.business.model.Cases;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.ImportRecord;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ImportRecordMapper;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ImportRecordService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.sun.xml.internal.messaging.saaj.util.ByteInputStream;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.xssf.usermodel.XSSFPictureData;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.A;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;
@@ -32,9 +45,9 @@
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.io.ByteArrayInputStream;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.TimeUnit;

/**
@@ -43,12 +56,21 @@
 * @date 2026-01-27 16:02:37
 */
@Service
@Slf4j
public class ImportRecordServiceImpl implements ImportRecordService {

    @Autowired
    private ImportRecordMapper importRecordMapper;
    @Autowired
    private CategoryMapper categoryMapper;
    @Autowired
    private MemberMapper memberMapper;
    @Autowired
    private CasesMapper casesMapper;
    @Resource
    private RedisTemplate<String, Object> redisTemplate;
    @Resource
    private SystemDictDataBiz systemDictDataBiz;

    @Override
    public Integer create(ImportRecord importRecord) {
@@ -120,45 +142,29 @@
    @Override
    public PageData<ImportRecord> findPage(PageWrap<ImportRecord> pageWrap) {
        IPage<ImportRecord> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<ImportRecord> queryWrapper = new QueryWrapper<>();
        MPJLambdaWrapper<ImportRecord> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
               queryWrapper.lambda().eq(pageWrap.getModel().getId() != null,ImportRecord::getId, pageWrap.getModel().getId());
               queryWrapper.lambda().eq(pageWrap.getModel().getDeleted() != null,ImportRecord::getDeleted, pageWrap.getModel().getDeleted());
               queryWrapper.lambda().eq(pageWrap.getModel().getCreateUser() != null,ImportRecord::getCreateUser, pageWrap.getModel().getCreateUser());
             if (pageWrap.getModel().getId() != null) {
                  queryWrapper.lambda().ge(ImportRecord::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
                  queryWrapper.lambda().le(ImportRecord::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
             }
               queryWrapper.lambda().eq(pageWrap.getModel().getUpdateUser() != null,ImportRecord::getUpdateUser, pageWrap.getModel().getUpdateUser());
             if (pageWrap.getModel().getId() != null) {
                  queryWrapper.lambda().ge(ImportRecord::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
                  queryWrapper.lambda().le(ImportRecord::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
             }
               queryWrapper.lambda().eq(pageWrap.getModel().getRemark() != null,ImportRecord::getRemark, pageWrap.getModel().getRemark());
               queryWrapper.lambda().eq(pageWrap.getModel().getStatus() != null,ImportRecord::getStatus, pageWrap.getModel().getStatus());
               queryWrapper.lambda().eq(pageWrap.getModel().getTitle() != null,ImportRecord::getTitle, pageWrap.getModel().getTitle());
               queryWrapper.lambda().eq(pageWrap.getModel().getTotalNum() != null,ImportRecord::getTotalNum, pageWrap.getModel().getTotalNum());
               queryWrapper.lambda().eq(pageWrap.getModel().getDetail() != null,ImportRecord::getDetail, pageWrap.getModel().getDetail());
               queryWrapper.lambda().eq(pageWrap.getModel().getImgurl() != null,ImportRecord::getImgurl, pageWrap.getModel().getImgurl());
             if (pageWrap.getModel().getId() != null) {
                  queryWrapper.lambda().ge(ImportRecord::getStartDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
                  queryWrapper.lambda().le(ImportRecord::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getStartDate()));
             }
             if (pageWrap.getModel().getId() != null) {
                  queryWrapper.lambda().ge(ImportRecord::getEndDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()));
                  queryWrapper.lambda().le(ImportRecord::getEndDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
             }
               queryWrapper.lambda().eq(pageWrap.getModel().getSortnum() != null,ImportRecord::getSortnum, pageWrap.getModel().getSortnum());
               queryWrapper.lambda().eq(pageWrap.getModel().getType() != null,ImportRecord::getType, pageWrap.getModel().getType());
               queryWrapper.lambda().eq(pageWrap.getModel().getDoneNum() != null,ImportRecord::getDoneNum, pageWrap.getModel().getDoneNum());
               queryWrapper.lambda().eq(pageWrap.getModel().getErrorNum() != null,ImportRecord::getErrorNum, pageWrap.getModel().getErrorNum());
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.selectAll(ImportRecord.class )
        .selectAs(SystemUser::getRealname,ImportRecord::getUpdateUserName)
                .leftJoin(SystemUser.class,SystemUser::getId,ImportRecord::getUpdateUser);
       queryWrapper.eq(pageWrap.getModel().getId() != null,ImportRecord::getId, pageWrap.getModel().getId());
       queryWrapper.eq(pageWrap.getModel().getDeleted() != null,ImportRecord::getDeleted, pageWrap.getModel().getDeleted());
       queryWrapper.eq(pageWrap.getModel().getCreateUser() != null,ImportRecord::getCreateUser, pageWrap.getModel().getCreateUser());
       queryWrapper.eq(pageWrap.getModel().getUpdateUser() != null,ImportRecord::getUpdateUser, pageWrap.getModel().getUpdateUser());
       queryWrapper.eq(pageWrap.getModel().getRemark() != null,ImportRecord::getRemark, pageWrap.getModel().getRemark());
       queryWrapper.eq(pageWrap.getModel().getStatus() != null,ImportRecord::getStatus, pageWrap.getModel().getStatus());
       queryWrapper.eq(pageWrap.getModel().getTitle() != null,ImportRecord::getTitle, pageWrap.getModel().getTitle());
       queryWrapper.eq(pageWrap.getModel().getTotalNum() != null,ImportRecord::getTotalNum, pageWrap.getModel().getTotalNum());
       queryWrapper.eq(pageWrap.getModel().getDetail() != null,ImportRecord::getDetail, pageWrap.getModel().getDetail());
       queryWrapper.eq(pageWrap.getModel().getImgurl() != null,ImportRecord::getImgurl, pageWrap.getModel().getImgurl());
       queryWrapper.eq(pageWrap.getModel().getSortnum() != null,ImportRecord::getSortnum, pageWrap.getModel().getSortnum());
       queryWrapper.eq(pageWrap.getModel().getType() != null,ImportRecord::getType, pageWrap.getModel().getType());
       queryWrapper.eq(pageWrap.getModel().getDoneNum() != null,ImportRecord::getDoneNum, pageWrap.getModel().getDoneNum());
       queryWrapper.eq(pageWrap.getModel().getErrorNum() != null,ImportRecord::getErrorNum, pageWrap.getModel().getErrorNum());
       queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getUpdateUserName()),SystemUser::getRealname, pageWrap.getModel().getUpdateUserName());
       queryWrapper.ge(pageWrap.getModel().getEndtime() != null,ImportRecord::getCreateTime, pageWrap.getModel().getEndtime());
       queryWrapper.ne(pageWrap.getModel().getStarttime() != null,ImportRecord::getCreateTime, pageWrap.getModel().getStarttime());
       queryWrapper.orderByDesc(ImportRecord::getId);
        return PageData.from(importRecordMapper.selectPage(page, queryWrapper));
    }

@@ -175,6 +181,13 @@
        }
        redisTemplate.opsForValue().set(Constants.RedisKeys.IMPORTING_RECORD,true,30, TimeUnit.MINUTES);
        try {
            List<Category> categoryList = null;
            if(type == 0){
              categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda().eq(Category::getDeleted,Constants.ZERO));
                if(categoryList == null || categoryList.size()==0){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起， è¯»å–老师基数数据配置出错，请先配置基础数据信息！");
                }
            }
            ImportRecord model = new ImportRecord();
            LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
            model.setDeleted(Constants.ZERO);
@@ -184,30 +197,199 @@
            model.setUpdateTime(model.getCreateTime());
            model.setUpdateUser(loginUserInfo.getId());
            model.setType(type);
            model.setTitle((type==1?"案例信息批量导入":"老师信息批量导入")+ DateUtil.getPlusTime2(model.getCreateTime()));
            model.setTitle((type==1?"案例信息批量导入":"老师信息批量导入,")+"文件："+file.getOriginalFilename());
            model.setTotalNum(0);
            ExcelImporter ie= new ExcelImporter(file,0,0, CellType.STRING); // ç¡®ä¿å•å…ƒæ ¼ç±»åž‹ä¸ºå­—符串);
            Map<String, XSSFPictureData> pics = ie.getExcelPictures();
            if(type == 1) {
              model.setCaseList(ie.getDataList(CasesImport.class,null));
              if(model.getCaseList() ==null || model.getCaseList().size()==0){
              List<CasesImport> importList =  (ie.getDataList(CasesImport.class,null));
              if(importList==null || importList.size()==0){
                  throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"导入文件案例信息内容为空！");
              }
              model.setTotalNum(model.getCaseList().size());
            }else{
              model.setMemberList(ie.getDataList(MemberImport.class,null));
              if(model.getMemberList() ==null || model.getMemberList().size()==0){
                  throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"导入文件老师信息内容为空！");
              }
               List<MemberImport> importList = (ie.getDataList(MemberImport.class,null));
               model.setMemberList(isvalidImpartMemberParam(loginUserInfo,categoryList,pics,importList));
              model.setTotalNum(model.getMemberList().size());
            }
//            model.setPictureDataList(ie);
            importRecordMapper.insert(model);
            return model;
        }catch (BusinessException e){
            redisTemplate.delete(Constants.RedisKeys.IMPORTING_RECORD);
            throw  e;
        }catch (Exception e){
            redisTemplate.delete(Constants.RedisKeys.IMPORTING_RECORD);
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"文件信息读取失败，请检查文件内容后重试！");
        }finally {
            redisTemplate.delete(Constants.RedisKeys.IMPORTING_RECORD);
//            redisTemplate.delete(Constants.RedisKeys.IMPORTING_RECORD);
        }
    }
    private  List<Member> isvalidImpartMemberParam(LoginUserInfo user, List<Category> categoryList ,Map<String, XSSFPictureData> pics, List<MemberImport> memberList) {
        if(memberList ==null || memberList.size()==0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未读取到有效数据");
        }
        if(pics ==null || pics.size()==0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未读取到任何职业照图片数据");
        }
        List<Member> insertMember = new ArrayList<>();
        List<Member> allList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
                .eq(Member::getDeleted,Constants.ZERO));
        if(categoryList == null || categoryList.size()==0){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起， è¯»å–老师基数数据配置出错，请先配置基础数据信息！");
        }
        Date date = new Date();
        int index = 1;
         for(MemberImport param :memberList){
             index ++;
             if(StringUtils.isBlank(param.getImgurl())
             ||StringUtils.isBlank(param.getFee())
             ||StringUtils.isBlank(param.getName())
             ||StringUtils.isBlank(param.getInfo())
             ||StringUtils.isBlank(param.getJobYear())
             ||StringUtils.isBlank(param.getPosition())
             ||StringUtils.isBlank(param.getFieldNames())
             ||StringUtils.isBlank(param.getSex())
             ||StringUtils.isBlank(param.getCode())
             ||StringUtils.isBlank(param.getZqNames())
             ||StringUtils.isBlank(param.getLevelName())
             ||StringUtils.isBlank(param.getServeNum())
             ||StringUtils.isBlank(param.getTypeNames())){
                 continue;
             }
             Member member = new Member();
             if(StringUtils.isBlank(param.getCode())){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， å·¥å·ä¿¡æ¯ä¸èƒ½ä¸ºç©º");
             }
             for(Member m : allList){
                 if(StringUtils.equals(param.getCode(),m.getCode())){
                     throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， å·¥å·ã€"+param.getCode()+"】信息已存在，请确认不要重复录入");
                 }
             }
             for(Member m : insertMember){
                 if(StringUtils.equals(param.getCode(),m.getCode())){
                     throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， å·¥å·ã€"+param.getCode()+"】在文档中重复出现");
                 }
             }
             if(StringUtils.isBlank(param.getName())){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， å§“名信息不能为空");
             }
             if(StringUtils.isBlank(param.getLevelName())){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， ç­‰çº§ä¿¡æ¯ä¸èƒ½ä¸ºç©º");
             }
             if(StringUtils.isBlank(param.getJobYear())){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， ä»Žä¸šå¹´ä»½ä¿¡æ¯ä¸èƒ½ä¸ºç©º");
             }
             Integer year ;
             try {
                 year = Integer.parseInt(param.getJobYear());
             }catch (Exception e){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， ä»Žä¸šå¹´ä»½ä¿¡æ¯ä¸æ­£ç¡®");
             }
             if(StringUtils.isBlank(param.getZqNames())){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， æœåŠ¡æˆ˜åŒºä¿¡æ¯ä¸èƒ½ä¸ºç©º");
             }
             if(StringUtils.isBlank(param.getTypeNames())){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， å•†ä¸šåŒ–类型信息不能为空");
             }
             if(StringUtils.isBlank(param.getFee())){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， è´¹ç”¨æ ‡å‡†ä¿¡æ¯ä¸èƒ½ä¸ºç©º");
             }
             if(pics!=null && StringUtils.isNotBlank(param.getImgurl())){
                log.info("===================="+param.getImgurl());
                int start = param.getImgurl().indexOf("(\"")+2;
                int end = param.getImgurl().indexOf("\",");
                if(start>=0&& end>=1 && end>start){
                    String picId = param.getImgurl().substring(start,end);
                    log.info("====================PICID:"+param.getImgurl());
                    XSSFPictureData data = pics.get(picId);
                    if(data!= null && data.getData() != null){
                        member.setImgurlData(data.getData());
                    }
                }
            }
             if(member.getImgurlData() ==null || member.getImgurlData().length==0){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行【"+param.getName()+"】数据， æœªè¯»å–到任何职业照图片数据");
             }
             //类型:0=战区;1=商业化;2=擅长领域;3=讲师等级;"
             List<Category> list0 =  isValidCategoryParam(param.getZqNames(),Constants.ZERO,categoryList,index );//战区
             List<Category> list1 =  isValidCategoryParam(param.getTypeNames(),Constants.ONE,categoryList,index);//商业化
             List<Category> list2 =  isValidCategoryParam(param.getFieldNames(),Constants.TWO,categoryList,index);//擅长领域
             Category levelCate =  getCategoryModelByName(param.getLevelName(),Constants.THREE,categoryList);//讲师等级
             if(levelCate == null){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据， ç­‰çº§ä¿¡æ¯ã€"+param.getLevelName()+"】尚未配置");
             }
             member.setCreateTime(date);
             member.setUpdateTime(date);
             member.setCreateUser(user.getId());
             member.setUpdateUser(user.getId());
             member.setAddType(Constants.ONE);
             member.setStatus(Constants.ZERO);
             member.setName(param.getName());
             member.setContent(param.getInfo());
             member.setJobYear(year);
             member.setCode(param.getCode());
             member.setPositon(param.getPosition());
             try {
                 member.setServeNum(Integer.parseInt(param.getServeNum()));
             }catch (Exception e){
             }
             try {
                 member.setFee(new BigDecimal(param.getFee()));
             }catch (Exception e){
             }
             member.setSex(StringUtils.equals(param.getSex(),"男")?Constants.ZERO:(StringUtils.equals(param.getSex(),"女")?Constants.ZERO:null));
             member.setZhanquIds(getIdStrListByList(list0));
             member.setBustypeIds(getIdStrListByList(list1));
             member.setFieldIds(getIdStrListByList(list2));
             member.setLevelId(levelCate.getId());
             insertMember.add(member);
         }
        if(insertMember ==null || insertMember.size()==0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，未读取到有效数据");
        }
         return insertMember;

    }

    private String getIdStrListByList(List<Category> categoryList) {
         String[] idList = new String[categoryList.size()];
        for (int i = 0; i <categoryList.size(); i++) {
            idList[i]="["+categoryList.get(i).getId()+"]";
        }
        return String.join(",",idList);
    }

    private List<Category> isValidCategoryParam(String zqNames, int type, List<Category> categoryList,int index) {
        if(StringUtils.isBlank(zqNames)){
            return null;
        }
        //获客类｜市场类｜培训类
        List<Category> list = new ArrayList<>();
        String names[] = zqNames.split("/");
        String title = type==0?"服务战区":( type==1?"商业化类型":"擅长领域");
        for(String str : names){
            if(StringUtils.isBlank(str)){
                continue;
            }
            Category cate = getCategoryModelByName(str,type,categoryList);
            if(cate == null){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据，"+title+"中【"+str+"】尚未配置");
            }
            list.add(cate);
        }
        if(list == null || list.size() ==0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+index+"行数据，"+title+"未查询到有效配置");
        }
        return list;
    }
    private Category getCategoryModelByName(String levelName, int type, List<Category> categoryList) {
        for(Category c : categoryList){
            if(Constants.equalsInteger(c.getType(),type)
                    && StringUtils.equals(levelName.trim(),StringUtils.defaultString(c.getName(),"").trim())){
                return c;
            }
        }
        return null;
    }

    /**
@@ -238,7 +420,7 @@
        int success=0;
        String msg ="";
        try {
            for(CasesImport param:importRecord.getCaseList()){
            for(Cases param:importRecord.getCaseList()){

            }
        }catch (Exception e){
@@ -256,17 +438,42 @@
    private int dealUserImportBiz(ImportRecord importRecord) {
        int success=0;
        String msg = "";
        String nowDate =DateUtil.getNowShortDate();
        try {
            for(MemberImport param:importRecord.getMemberList()){

            String bucket =systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.BUCKETNAME).getCode();
            String folder =systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.MEMBER_FILES).getCode();
            TyyZosUtil obs = new TyyZosUtil(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.ENDPOINT).getCode(),
                    systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.ACCESS_ID).getCode(),
                    systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.ACCESS_KEY).getCode());
            for(Member param: importRecord.getMemberList()){
                success +=  dealMemberInsert(obs,param,folder,nowDate,bucket);
            }
            obs.shutDown();
        }catch (Exception e){

            log.error("处理人员信息发生异常{}",e.getMessage());
        }
        importRecord.setDoneNum(success);
        importRecord.setErrorNum(importRecord.getTotalNum() - success);
        importRecord.setDetail(msg);
        redisTemplate.delete(Constants.RedisKeys.IMPORTING_RECORD);
        return success;
    }


    private int dealMemberInsert( TyyZosUtil obs,Member param,String folder,String nowDate,String bucketName) {
        int success =0;
        try {
            String fileName = UUID.randomUUID() + ".png";
            String tempFileName = nowDate + "/" + fileName;
            String key = folder + tempFileName;// æ–‡ä»¶å
           if (obs.uploadInputstreamObjectNoShutdown(new ByteArrayInputStream(param.getImgurlData() ) ,bucketName,  key)) {
               param.setImgurl(tempFileName);//证件照地址
               log.error("处理人员信息证件照成功=================={}",key );
               success= memberMapper.insert(param);
           }
        }catch (Exception e){
            log.error("处理人员信息{}==发生异常{}",param.getName(),e.getMessage());
        }
        return success;
    }
}

 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -27,6 +27,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -118,10 +119,8 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        Member model = pageWrap.getModel();
        queryWrapper.selectAll(Member.class)
                .select(" c1.NAME ", Member::getPromotionName)
                .select(" c2.NAME ", Member::getLevelName)
                .leftJoin(" category c1 on t.POSITON = c1.id ")
                .leftJoin(" category c2 on t.LEVEL_ID = c2.id ")
                .selectAs(Category::getName, Member::getLevelName)
                .leftJoin(Category.class,Category::getId,Member::getLevelId)
                .apply(Objects.nonNull(model.getBustypeIds())," find_in_set( '["+model.getBustypeIds()+"]', t.BUSTYPE_IDS ) ")
                .like(StringUtils.isNotBlank(model.getName()),Member::getName, model.getName())
                .eq(Objects.nonNull(model.getStatus()),Member::getStatus, model.getStatus())
@@ -153,15 +152,16 @@
        if(CollectionUtils.isNotEmpty(memberIPage.getRecords())){
            List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
                    .eq(Category::getDeleted, Constants.ZERO)
                    .eq(Category::getType,Constants.TWO)
//                    .eq(Category::getType,Constants.TWO)
                    .orderByAsc(Category::getSortnum)
            );
            String path = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
                    systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.CATEGORY_FILES).getCode();
                    systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER_FILES).getCode();
            String roleConfig = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.ROLE_CONFIG).getCode();
            for (Member member:memberIPage.getRecords()) {
                if(CollectionUtils.isNotEmpty(categoryList)){
                    dealMemberField(member,categoryList);
                    dealMemberCategoryList(member,categoryList);
                }
                member.setFullImgurl(StringUtils.isNotBlank(member.getImgurl())?(path + member.getImgurl()):"");
                if(StringUtils.isBlank(roleConfig)||StringUtils.isBlank(model.getQueryUserRole())
@@ -176,6 +176,27 @@
        return PageData.from(memberIPage);
    }

    private void dealMemberCategoryList(Member member, List<Category> categoryList) {
        member.setFieldList(new ArrayList<>());
        member.setTypeList(new ArrayList<>());
        member.setZqList(new ArrayList<>());
        for(Category c:categoryList){
//            0=战区;1=商业化;2=擅长领域;
            if(Constants.equalsInteger(c.getType(),Constants.ZERO)&& StringUtils.contains(member.getZhanquIds(),"["+c.getId()+"]")){
                //战区
                member.getZqList().add(c);
            }
            if(Constants.equalsInteger(c.getType(),Constants.ONE)&& StringUtils.contains(member.getBustypeIds(),"["+c.getId()+"]")){
                //商业化
                member.getTypeList().add(c);
            }
            if(Constants.equalsInteger(c.getType(),Constants.TWO) && StringUtils.contains(member.getFieldIds(),"["+c.getId()+"]")){
                //擅长领域
                member.getFieldList().add(c);
            }
        }
    }


    @Override
    public Member findDetailById(Integer id,String queryUserRole) {