1.3.1迭代开发

config.json

@@ -13,12 +13,14 @@
     "watermark": {
         "fontFile": "font/simsun.ttf",
         "fontSize": 30,
-        "color": "#ff0000"
+        "color": "#ff0000",
+        "nextColor": "#0000ff",
+        "otherColor": "#008000"
     },
     "logger": {
         "level": "info"
     },
-    "imagemagickDev": "/usr/local/bin/",
+    "imagemagickDev": "C:\\ImageMagick-7.1.0-Q16\\",
     "openDevTools": false,
     "servers": [
         {

src/api/api.ts

@@ -36,6 +36,27 @@ export function getStudents(
   return httpApp.post("/api/exam/students", new URLSearchParams(form));
 }
 
+export function getStudentsWithSlice(
+  examId: number,
+  pageNumber: number,
+  pageSize: number,
+  params: any
+) {
+  const form = {
+    examId: examId,
+    pageNumber: pageNumber,
+    pageSize: pageSize,
+  };
+  if (params != undefined) {
+    for (const key in params) {
+      if (params[key] && params[key] != "") {
+        form[key] = params[key];
+      }
+    }
+  }
+  return httpApp.post("/api/exam/students/slice", new URLSearchParams(form));
+}
+
 export function countStudents(examId: number, params) {
   params = params || {};
   params.examId = examId;

src/features/Image/Image.vue

@@ -65,6 +65,27 @@
         </td>
       </tr>
       <template v-if="type === '1'">
+        <tr id="number-of-files">
+          <th>文件分批存放：</th>
+          <td>
+            <div class="input-radio">
+              <a-radio-group name="radioGroup" v-model:value="fileNumberSplit">
+                <a-radio :value="true">是</a-radio>
+                <a-radio :value="false">否</a-radio>
+              </a-radio-group>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="fileNumberSplit">
+          <th></th>
+          <td style="padding-top: 0">
+            <div class="number-limit">
+              每个子文件夹存放&nbsp;
+              <a-input-number v-model:value="fileNumberLimits" :min="1" />
+              &nbsp;张图片
+            </div>
+          </td>
+        </tr>
         <tr id="watermark-select">
           <th>添加分数水印：</th>
           <td>
@@ -188,6 +209,8 @@ let template = ref("");
 let dir = ref("");
 let append = ref(false);
 let failover = ref(true);
+let fileNumberSplit = ref(false);
+let fileNumberLimits = ref(null);
 let watermark = ref(true);
 let trackMode = ref("");
 let examNumber = ref("");
@@ -202,6 +225,8 @@ if (config) {
   dir.value = config.dir;
   append.value = config.append;
   failover.value = config.failover;
+  fileNumberSplit.value = config.fileNumberSplit;
+  fileNumberLimits.value = config.fileNumberLimits;
   watermark.value = config.watermark;
   trackMode.value = config.trackMode;
   examNumber.value = config.examNumber || "";
@@ -248,6 +273,10 @@ const start = (e: MouseEvent) => {
     message.info("请填写图片转存规则");
     return false;
   }
+  if (fileNumberSplit.value && !fileNumberLimits.value) {
+    message.info("请填写每个文件夹存放的图片数量");
+    return false;
+  }
   if (type.value === "1") {
     if (!x.value) {
       message.info("请填写水印起始位置（横向）");
@@ -269,6 +298,8 @@ const start = (e: MouseEvent) => {
     dir: dir.value.trim(),
     append: append.value,
     failover: failover.value,
+    fileNumberSplit: fileNumberSplit.value,
+    fileNumberLimits: fileNumberLimits.value,
     watermark: watermark.value,
     trackMode: trackMode.value,
     examNumber: examNumber.value.trim(),
@@ -385,4 +416,8 @@ const mouseUpHandler = () => {
 .water-mark {
   position: absolute;
 }
+.number-limit {
+  display: flex;
+  align-items: center;
+}
 </style>

src/features/ImageDownload/ImageDownload.vue

@@ -20,9 +20,10 @@ import { onMounted, onUnmounted, ref } from "vue";
 import { Modal } from "ant-design-vue";
 import { useRouter } from "vue-router";
 const router = useRouter();
-import { getStudents, countStudents, getPackages } from "@/api/api";
+import { countStudents, getPackages, getStudentsWithSlice } from "@/api/api";
 import { httpApp } from "@/plugins/axiosApp";
 import mustache from "mustache";
+const path = require("path");
 
 async function getImageDim(
   blob: Blob
@@ -79,6 +80,7 @@ let errorCount = ref(0);
 let students = [];
 
 const config = store.pageInputs["/image-download"];
+console.log("config::", config);
 onMounted(async () => {
   const storePassedToNodeJs = JSON.parse(JSON.stringify(store));
   try {
@@ -95,19 +97,19 @@ onMounted(async () => {
       });
       totalCount.value = res.data;
       let totalImageDownloadTime = 0;
-
+      let curFileIndex = 0;
       for (
         let pageNumber = 0;
         pageNumber * 10 < totalCount.value;
         pageNumber++
       ) {
-        const resStudents = await getStudents(
+        const resStudents = await getStudentsWithSlice(
           store.env.examId,
           pageNumber + 1,
           10,
           {
             upload: true,
-            withSheetUrl: true,
+            withSliceUrl: true,
             withScoreDetail: config.watermark,
             withMarkTrack: config.watermark,
             withGroupScoreTrack: config.watermark && config.trackMode === "1",
@@ -118,16 +120,16 @@ onMounted(async () => {
         students = resStudents.data;
 
         const urls = students.reduce(
-          (accumulator, stu) => accumulator.concat(stu.sheetUrls),
+          (accumulator, stu) => accumulator.concat(stu.sliceUrls),
           []
         );
         cacheImages(urls);
 
         for (const student of students) {
-          for (const sheetUrl of student.sheetUrls) {
+          for (const sheetUrl of student.sliceUrls) {
             if (stopSignal) return;
             try {
-              const index = student.sheetUrls.indexOf(sheetUrl);
+              const index = student.sliceUrls.indexOf(sheetUrl);
               student.index = index + 1;
               student.examId = store.env.examId;
               // const filePath = window.electron.join(
@@ -145,7 +147,7 @@ onMounted(async () => {
                 // console.log(urls);
                 continue;
               }
-
+              // console.log("filePath3:", filePath);
               console.debug("start ", sheetUrl);
               const imageDownloadStartTime = Date.now();
               const imageRes = await httpApp.get(sheetUrl, {
@@ -162,7 +164,20 @@ onMounted(async () => {
               // console.log(imageRes.data);
               // console.log(await imageRes.data.arrayBuffer());
               // console.log(new Uint8Array(await imageRes.data.arrayBuffer()));
-
+              console.log("curFileIndex:", curFileIndex);
+              let folderName = "";
+              if (config.fileNumberSplit) {
+                folderName = `/${
+                  Math.floor(curFileIndex / config.fileNumberLimits) *
+                    config.fileNumberLimits +
+                  1
+                }~${
+                  Math.floor(curFileIndex / config.fileNumberLimits) *
+                    config.fileNumberLimits +
+                  config.fileNumberLimits
+                }`;
+                console.log("folderName:", folderName);
+              }
               await window.electron.addWatermark(
                 storePassedToNodeJs,
                 arrayBuffer,
@@ -173,8 +188,10 @@ onMounted(async () => {
                 index + 1,
                 config.trackMode,
                 config.x,
-                config.y
+                config.y,
+                folderName
               );
+              curFileIndex++;
             } catch (error) {
               errorCount.value += 1;
               if (config.failover) {

src/lib/watermark.ts

@@ -17,8 +17,15 @@ export async function addWatermark(
   index: number,
   trackMode: string,
   x = 0.01,
-  y = 0.03
+  y = 0.03,
+  folderName = ""
 ): Promise<boolean> {
+  if (folderName) {
+    const lastIndex: number = filePath[1].lastIndexOf("/");
+    const preStr: any = filePath[1].slice(0, lastIndex);
+    const nextStr: any = filePath[1].slice(lastIndex);
+    filePath[1] = preStr + folderName + nextStr;
+  }
   const file = path.join(...filePath);
   if (
     index !== 1 &&
@@ -50,6 +57,8 @@ export async function addWatermark(
   }
   const fontFile = store.config.watermark.fontFile;
   const color = store.config.watermark.color;
+  const nextColor = store.config.watermark.nextColor;
+  const otherColor = store.config.watermark.otherColor;
   const image = Buffer.from(imageData);
   // const size = sizeOf(image);
   // console.log(size);
@@ -238,12 +247,38 @@ export async function addWatermark(
   if (student.tags != undefined && student.tags[index] != undefined) {
     const fontSize = 60;
     const height = fontSize + 10;
-    imgData.font(fontFile, fontSize).fill(color);
+    // imgData.font(fontFile, fontSize).fill(color);
     const tags = student.tags[index];
+
+    let userIds: any = tags.map((item: any) => item.userId || 0);
+    userIds = Array.from(new Set(userIds));
+    userIds.sort();
+    const colorMap: any = {
+      "0": color,
+    };
+    let startIndex = 1;
+    if (!userIds.includes(0)) {
+      startIndex = 0;
+    }
+
+    for (let i = 0; i < userIds.length; i++) {
+      const uId: string | number = userIds[i];
+      if (i == startIndex) {
+        colorMap[uId + ""] = color;
+      } else if (i == startIndex + 1) {
+        colorMap[uId + ""] = nextColor;
+      } else if (i > startIndex + 1) {
+        colorMap[uId + ""] = otherColor;
+      }
+    }
+
     for (let i = 0; i < tags.length; i++) {
       const tag = tags[i];
       if (tag.content != undefined) {
         let top = tag.top;
+        imgData
+          .font(fontFile, fontSize)
+          .fill(colorMap[tag.userId + ""] || color);
         for (let j = 0; j < tag.content.length; j++) {
           imgData.drawText(tag.left, top, tag.content[j]);
           top += height;
@@ -272,7 +307,7 @@ export async function saveImage(
   filePath: string[]
 ): Promise<boolean> {
   const file = path.join(...filePath);
-
+  console.log("saveImage file:", file);
   if (store.pageInputs["/image-download"].append && fs.existsSync(file)) {
     console.log(file + " already exists");
     return true;

src/types/index.ts

@@ -39,6 +39,8 @@ export interface Store {
       dir: string;
       append: boolean;
       failover: boolean;
+      fileNumberSplit: boolean;
+      fileNumberLimits: any;
       watermark: boolean;
       trackMode: string;
       examNumber?: string;
@@ -75,6 +77,8 @@ export interface Watermark {
   fontFile: string;
   fontSize: number;
   color: string;
+  nextColor: string;
+  otherColor: string;
 }
 
 export interface Student {