qin 1 år sedan
förälder
incheckning
c9ee7e0003

+ 2 - 4
src/main/java/com/poteviohealth/cgp/statistics/controller/OrderController.java

@@ -42,7 +42,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -327,13 +326,12 @@ public class OrderController extends BaseWebController {
             distinction.setSupplierId(TokenContext.curSupplierId());
             distinction.setStationId(TokenContext.curStationId());
             distinction.setOrderId(priceUploadDto.getOrderId());
-            distinction.setUploadDate(new Date());
             distinction.setUrl(priceUploadDto.getUrl());
-            distinction.setUid(Long.parseUnsignedLong(priceUploadDto.getUid()));
+            distinction.setUid(priceUploadDto.getUid());
             distinctionList.add(distinction);
         }
         if(!distinctionList.isEmpty()){
-            distinctionService.saveBatch(distinctionList);
+            distinctionService.insertBatch(distinctionList);
         }
         //处理照片
         watermarkImgService.updateOrderUrl(list);

+ 5 - 0
src/main/java/com/poteviohealth/cgp/statistics/mapper/DistinctionMapper.java

@@ -7,6 +7,8 @@ import com.poteviohealth.cgp.statistics.model.outdto.DistinctionDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 图片处理
  * @author Qin
@@ -16,4 +18,7 @@ public interface DistinctionMapper extends BaseMapper<Distinction>{
 
     @SqlParser(filter = true)
     DistinctionDTO checkDis(@Param("operatorId")Integer operatorId, @Param("dbName") String dbName, @Param("uid") String uid, @Param("dCount") Integer dCount, @Param("date") String date);
+
+    @SqlParser(filter = true)
+    void insertBatch(@Param("list") List<Distinction> list);
 }

+ 1 - 1
src/main/java/com/poteviohealth/cgp/statistics/model/Distinction.java

@@ -29,7 +29,7 @@ public class Distinction extends BaseEntity {
     @ApiModelProperty(value = "上传时间")
     private Date uploadDate;
     @ApiModelProperty(value = "图片标识")
-    private Long uid;
+    private String uid;
     @ApiModelProperty(value = "图片路径")
     private String url;
 }

+ 1 - 0
src/main/java/com/poteviohealth/cgp/statistics/service/IDistinctionService.java

@@ -14,4 +14,5 @@ import java.util.List;
 public interface IDistinctionService extends IBaseService<Distinction> {
 
     DistinctionDTO checkImg(File file, Long orderId, List<String> uidList);
+    void insertBatch(List<Distinction> list);
 }

+ 5 - 0
src/main/java/com/poteviohealth/cgp/statistics/service/impl/DistinctionServiceImpl.java

@@ -72,6 +72,11 @@ public class DistinctionServiceImpl extends BaseServiceImpl<DistinctionMapper, D
        return dto;
     }
 
+    @Override
+    public void insertBatch(List<Distinction> list) {
+        baseMapper.insertBatch(list);
+    }
+
 
     private String orderCacheVal(String key){
         Integer operatorId = TokenContext.cureOperatorId();

+ 6 - 0
src/main/resources/mapper/statistics/DistinctionMapper.xml

@@ -1,6 +1,12 @@
 <?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.poteviohealth.cgp.statistics.mapper.DistinctionMapper">
+    <insert id="insertBatch">
+        INSERT INTO f_distinction_img (created_date,modified_date,yn,operator_id,supplier_id,station_id,order_id,upload_date,uid,url) VALUES
+        <foreach collection="list" item="d" separator=",">
+            (NOW(),NOW(),0,#{d.operatorId},#{d.supplierId},#{d.stationId},#{d.orderId},NOW(),0b${d.uid},#{d.url})
+        </foreach>
+    </insert>
     <select id="checkDis" resultType="com.poteviohealth.cgp.statistics.model.outdto.DistinctionDTO">
         select order_id as orderId,url as rurl from ${dbName}_face.f_distinction_img
         where yn = 0