ef03624437f84fb51048074c18429e7db6b3bdec..9e128aead999663184ec016087882e9c5d37590e
2023-09-19 jiangping
Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect in...
9e128a 对比 | 目录
2023-09-19 jiangping
sessionkey更换
0b368d 对比 | 目录
已修改2个文件
28 ■■■■ 文件已修改
platform/src/views/business/baseData.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platform/src/views/business/baseData.vue
@@ -69,32 +69,12 @@
        <el-table-column prop="price" label="价格(元)" min-width="100px"></el-table-column>
        <el-table-column prop="saleprice" label="采购价格(元)" min-width="100px"></el-table-column>
        <el-table-column prop="haveStock" label="库存情况" min-width="100px"></el-table-column>
        <el-table-column prop="bgImg" label="大图1" min-width="80px">
        <el-table-column prop="bgImgs" label="大图" min-width="80px">
          <template slot-scope="{row}">
            <div style="display: flex; align-items: center;">
              <div style="width: 70px; height: 70px; flex-shrink: 0;">
                <el-image v-if="row.bgImg" style="width: 70px; height: 70px" :src="row.bgImg"
                          :preview-src-list="[row.bgImg]" fit="cover"></el-image>
              </div>
            </div>
          </template>
        </el-table-column>
        <el-table-column prop="bgImg2" label="大图2" min-width="80px">
          <template slot-scope="{row}">
            <div style="display: flex; align-items: center;">
              <div style="width: 70px; height: 70px; flex-shrink: 0;">
                <el-image v-if="row.bgImg2" style="width: 70px; height: 70px" :src="row.bgImg2"
                          :preview-src-list="[row.bgImg2]" fit="cover"></el-image>
              </div>
            </div>
          </template>
        </el-table-column>
        <el-table-column prop="bgImg3" label="大图3" min-width="80px">
          <template slot-scope="{row}">
            <div style="display: flex; align-items: center;">
              <div style="width: 70px; height: 70px; flex-shrink: 0;">
                <el-image v-if="row.bgImg3" style="width: 70px; height: 70px" :src="row.bgImg3"
                          :preview-src-list="[row.bgImg3]" fit="cover"></el-image>
                <el-image v-if="row.bgImgs" style="width: 70px; height: 70px" :src="row.bgImgs"
                          :preview-src-list="row.bgImgs" fit="cover"></el-image>
              </div>
            </div>
          </template>
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -20,6 +20,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -313,6 +314,7 @@
    public static   boolean IS_RUNNING = false;
    @Override
    @Transactional
    @Async
    public   void dealBaseData() {
        if(IS_RUNNING){
            return;