后端修改

src/main/java/com/jisco/dynamicweight/dynamicbasematerial/controller/DynamicBaseMaterialController.java

@@ -72,7 +72,7 @@ public class DynamicBaseMaterialController extends BaseRESTfulController {
     @PostMapping(value = "/")
     public RESTfulResult add(@RequestBody DynamicBaseMaterial model){
         Assert.isTrue(StringUtils.isNotBlank(model.getMaterialName()), "请输入数采物料名称!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialCode()), "请输皮卡物料编码!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialCode()), "请输皮卡物料编码!");
         Assert.isTrue(StringUtils.isNotBlank(model.getPikaMaterialName()), "请输入皮卡系统物料名称!");
 //        Assert.isTrue(StringUtils.isNotBlank(model.getValidFlag()), "有效标识不能为空!");
 //        Assert.isTrue(Objects.nonNull(model.getIsReturnedDust()), "请选择是否返粉!");
@@ -102,7 +102,7 @@ public class DynamicBaseMaterialController extends BaseRESTfulController {
     @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
     public RESTfulResult update(@PathVariable String id, @RequestBody DynamicBaseMaterial model){
         Assert.isTrue(StringUtils.isNotBlank(model.getMaterialName()), "请输入数采物料名称!");
-        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialCode()), "请输皮卡物料编码!");
+//        Assert.isTrue(StringUtils.isNotBlank(model.getMaterialCode()), "请输皮卡物料编码!");
         Assert.isTrue(StringUtils.isNotBlank(model.getPikaMaterialName()), "请输入皮卡系统物料名称!");
 //        Assert.isTrue(StringUtils.isNotBlank(model.getValidFlag()), "有效标识不能为空!");
 //        Assert.isTrue(Objects.nonNull(model.getIsReturnedDust()), "请选择是否返粉!");

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/controller/DynamicWorkAuditdataController.java

@@ -73,7 +73,7 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
         PageList<DynamicWorkAuditdata> list = dynamicWorkAuditdataService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
-    
+
     @ApiOperation(value="创建", notes="根据DynamicWorkAuditdata对象创建")
     @ApiImplicitParam(name = "dynamicWorkAuditdata", value = "详细实体dynamicWorkAuditdata", required = true, dataType = "DynamicWorkAuditdata")
     //@RequiresPermissions("dynamicworkauditdata:create")
@@ -131,7 +131,7 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
             throw new RuntimeException("日期格式不正确(yyyy-MM-dd)");
         }
         dynamicWorkAuditdataService.audit(date, list);
-        return success("操作成功");
+        return success(null,"操作成功");
     }
 
     /**
@@ -163,7 +163,7 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
     @PostMapping(value = "/cancelAudit")
     public RESTfulResult cancelAudit(@RequestBody List<DynamicWorkAuditdata> list){
         dynamicWorkAuditdataService.cancelAudit(list);
-        return success("审核数据撤销成功!");
+        return success(null,"审核数据撤销成功!");
     }
 
     @ApiOperation(value = "导出上传数据到Excel", notes = "导出上传数据到Excel")
@@ -184,8 +184,13 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
     @ApiOperation(value = "撤销上传的数据", notes = "撤销上传的数据")
     @PostMapping(value = "/cancelUpload")
     public RESTfulResult cancelUpload(@RequestBody List<DynamicWorkAuditdata> list){
-        dynamicWorkAuditdataService.cancelUpload(list);
-        return success("上传数据撤销成功!");
+        try {
+            dynamicWorkAuditdataService.cancelUpload(list);
+            return success(null, "撤销上传数据成功!");
+        } catch (Exception exception) {
+            System.err.println(exception.getMessage());
+            return failed(exception.getMessage(), "部分或全部数据撤销上传失败，请确认！");
+        }
     }
 
     @ApiOperation(value = "数据上传", notes = "数据上传")
@@ -195,8 +200,8 @@ public class DynamicWorkAuditdataController extends BaseRESTfulController {
             dynamicWorkAuditdataService.upload(list);
             return success("数据上传成功!");
         }catch (Exception exception){
-            System.err.println(new String(exception.getMessage().getBytes("UTF8"), "GBK"));
-            return failed(exception.getMessage());
+            System.err.println(exception.getMessage());
+            return failed(exception.getMessage(),"部分或全部数据上传失败，请确认！");
         }
     }
 }

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/model/DynamicWorkAuditdata.java

@@ -21,6 +21,18 @@ public class DynamicWorkAuditdata implements IBasePO<String> {
     @ApiModelProperty(value="物料名称",required=false)
     private String materialName;
 
+    /**
+     * 发货库房(SENDER_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="发货库房",required=false)
+    private String senderName;
+
+    /**
+     * 收货库房(RECIEVER_NAME,VARCHAR,60)
+     */
+    @ApiModelProperty(value="收货库房",required=false)
+    private String recieverName;
+
     /**
      * 物料编码(MATERIAL_CODE,VARCHAR,20)
      */
@@ -39,24 +51,12 @@ public class DynamicWorkAuditdata implements IBasePO<String> {
     @ApiModelProperty(value="站点编码",required=false)
     private String stationCode;
 
-    /**
-     * 收货库房(RECIEVER_NAME,VARCHAR,60)
-     */
-    @ApiModelProperty(value="收货库房",required=false)
-    private String recieverName;
-
     /**
      * 收货库房编码(RECIEVER_CODE,VARCHAR,60)
      */
     @ApiModelProperty(value="收货库房编码",required=false)
     private String recieverCode;
 
-    /**
-     * 发货库房(SENDER_NAME,VARCHAR,60)
-     */
-    @ApiModelProperty(value="发货库房",required=false)
-    private String senderName;
-
     /**
      * 发货库房编码(SENDER_CODE,VARCHAR,60)
      */

src/main/java/com/jisco/dynamicweight/dynamicworkauditdata/service/impl/DynamicWorkAuditdataServiceImpl.java

@@ -15,15 +15,15 @@ import com.steerinfo.framework.utils.misc.SnowflakeIdWorker;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * DynamicWorkAuditdata服务实现：
@@ -58,6 +58,12 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
         return dynamicWorkAuditdataMapper;
     }
 
+    @Autowired
+    private PlatformTransactionManager platformTransactionManager;
+
+    @Autowired
+    private TransactionDefinition transactionDefinition;
+
     @Transactional
     @Override
     public void audit(String date, List<AuditDataVO> list) {
@@ -132,32 +138,54 @@ public class DynamicWorkAuditdataServiceImpl extends BaseServiceImpl<DynamicWork
         }
     }
 
-    @Transactional
+//    @Transactional
     @Override
     public void cancelUpload(List<DynamicWorkAuditdata> list) {
         Assert.isTrue(!CollectionUtils.isEmpty(list), "请选择需要撤销上传的数据!");
-        List<String> ids = new ArrayList<>();
+//        List<String> ids = new ArrayList<>();
         for (DynamicWorkAuditdata auditdata : list) {
-            Assert.isTrue(auditdata.getUploaded().equals("1"), "数据未上传，不能撤销上传:" + auditdata);
-            ids.add(auditdata.getPikaDataId());
-            auditdata.setUploaded("0");
-            auditdata.setPikaDataId("");
+            TransactionStatus transactionStatus = platformTransactionManager.getTransaction(transactionDefinition);
+            try {
+                DynamicWorkAuditdata auditdataDb = this.getById(auditdata.getAuditdataNo());
+                Assert.isTrue(auditdataDb.getUploaded().equals("1"), "数据未上传，不能撤销上传:" + auditdataDb);
+//            ids.add(auditdataDb.getPikaDataId());
+                auditdataDb.setUploaded("0");
+//            auditdata.setPikaDataId("");
+                this.batchUpdate(Arrays.asList(auditdataDb));
+                centernetService.cancelUpload(Arrays.asList(auditdataDb.getPikaDataId()));
+                platformTransactionManager.commit(transactionStatus);
+            } catch (Exception e) {
+                platformTransactionManager.rollback(transactionStatus);
+                throw e;
+            }
         }
-        centernetService.cancelUpload(ids);
-        this.batchUpdate(list);
+//        this.batchUpdate(list);
+//        centernetService.cancelUpload(ids);
     }
 
-    @Transactional
+//    @Transactional
     @Override
     public void upload(List<DynamicWorkAuditdata> list) {
         Assert.isTrue(!CollectionUtils.isEmpty(list), "请选择需要上传的数据!");
+//        List<DynamicWorkAuditdata> listDB = new ArrayList<>();
         for (DynamicWorkAuditdata auditdata : list) {
-            Assert.isTrue(auditdata.getUploaded().equals("0"), "数据已上传，不能重复上传:" + auditdata);
-            auditdata.setUploaded("1");
-//            auditdata.setPikaDataId("DTC" + auditdata.getId());
-            auditdata.setPikaDataId("DTC" + snowflakeIdWorker.nextId());
+            TransactionStatus transactionStatus = platformTransactionManager.getTransaction(transactionDefinition);
+            try {
+                DynamicWorkAuditdata auditdataDb = this.getById(auditdata.getAuditdataNo());
+                Assert.isTrue(auditdataDb.getUploaded().equals("0"), "数据已上传，不能重复上传:" + auditdata);
+                auditdataDb.setUploaded("1");
+                auditdataDb.setPikaDataId("DTC" + snowflakeIdWorker.nextId());
+//            listDB.add(auditdataDb);
+                this.batchUpdate(Arrays.asList(auditdataDb));
+                centernetService.upload(Arrays.asList(auditdataDb));
+                platformTransactionManager.commit(transactionStatus);
+            } catch (Exception e) {
+                platformTransactionManager.rollback(transactionStatus);
+                throw e;
+            }
         }
-        centernetService.upload(list);
-        this.batchUpdate(list);
+//        this.batchUpdate(listDB);
+//        centernetService.upload(listDB);
+//        int a = 1/0;
     }
 }

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/mapper/DynamicWorkUpdataMapper.xml

@@ -858,6 +858,7 @@
         <result column="B16" jdbcType="NUMERIC" property="bl16"/>
         <result column="B24" jdbcType="NUMERIC" property="bl24"/>
         <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag"/>
+        <result column="AUDITING_FLAG" jdbcType="VARCHAR" property="auditingFlag"/>
     </resultMap>
     <!--    查询待审核数据-->
     <select id="getAuditData" resultMap="getAuditDataMap">
@@ -874,7 +875,8 @@
                b.B8,
                c.B16,
                d.B24,
-               a.VALID_FLAG
+               a.VALID_FLAG,
+               a.AUDITING_FLAG
         from (
                  SELECT STATION_CODE,
                         STATION_NAME,
@@ -886,12 +888,13 @@
                         SENDER_CODE,
                         SENDER_NAME,
                         SENDER_TYPE,
-                        VALID_FLAG
+                        VALID_FLAG,
+                        AUDITING_FLAG
                  FROM DYNAMIC_WORK_UPDATA
                  WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl8start}
                    AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl24end}
 --                    AND VALID_FLAG = '1'
-                   AND AUDITING_FLAG = '0'
+--                    AND AUDITING_FLAG = '0'
                    AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                    AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
                  GROUP BY STATION_CODE,
@@ -904,7 +907,8 @@
                           SENDER_CODE,
                           SENDER_NAME,
                           SENDER_TYPE,
-                          VALID_FLAG
+                          VALID_FLAG,
+                          AUDITING_FLAG
              ) a
                  LEFT JOIN
              (SELECT STATION_NAME,
@@ -912,12 +916,13 @@
                      RECIEVER_NAME,
                      SENDER_NAME,
                      sum(WEIGHT) B8,
-                     VALID_FLAG
+                     VALID_FLAG,
+                     AUDITING_FLAG
               FROM DYNAMIC_WORK_UPDATA
               WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl8start}
                 AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl8end}
 --                 AND VALID_FLAG = '1'
-                AND AUDITING_FLAG = '0'
+--                 AND AUDITING_FLAG = '0'
                 AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                 AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
               GROUP BY STATION_CODE,
@@ -930,25 +935,28 @@
                        SENDER_CODE,
                        SENDER_NAME,
                        SENDER_TYPE,
-                       VALID_FLAG
+                       VALID_FLAG,
+                       AUDITING_FLAG
              ) b
              on a.STATION_NAME = b.STATION_NAME
                  and a.MATERIAL_NAME = b.MATERIAL_NAME
                  and a.RECIEVER_NAME = b.RECIEVER_NAME
                  and a.SENDER_NAME = b.SENDER_NAME
                  and a.VALID_FLAG = b.VALID_FLAG
+                 and a.AUDITING_FLAG = b.AUDITING_FLAG
                  LEFT JOIN
              (SELECT STATION_NAME,
                      MATERIAL_NAME,
                      RECIEVER_NAME,
                      SENDER_NAME,
                      sum(WEIGHT) B16,
-                     VALID_FLAG
+                     VALID_FLAG,
+                     AUDITING_FLAG
               FROM DYNAMIC_WORK_UPDATA
               WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl16start}
                 AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl16end}
 --                 AND VALID_FLAG = '1'
-                AND AUDITING_FLAG = '0'
+--                 AND AUDITING_FLAG = '0'
                 AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                 AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
               GROUP BY STATION_CODE,
@@ -961,25 +969,28 @@
                        SENDER_CODE,
                        SENDER_NAME,
                        SENDER_TYPE,
-                       VALID_FLAG
+                       VALID_FLAG,
+                       AUDITING_FLAG
              ) c
              on a.STATION_NAME = c.STATION_NAME
                  and a.MATERIAL_NAME = c.MATERIAL_NAME
                  and a.RECIEVER_NAME = c.RECIEVER_NAME
                  and a.SENDER_NAME = c.SENDER_NAME
                  and a.VALID_FLAG = c.VALID_FLAG
+                 and a.AUDITING_FLAG = c.AUDITING_FLAG
                  LEFT JOIN
              (SELECT STATION_NAME,
                      MATERIAL_NAME,
                      RECIEVER_NAME,
                      SENDER_NAME,
                      sum(WEIGHT) B24,
-                     VALID_FLAG
+                     VALID_FLAG,
+                     AUDITING_FLAG
               FROM DYNAMIC_WORK_UPDATA
               WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl24start}
                 AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl24end}
 --                 AND VALID_FLAG = '1'
-                AND AUDITING_FLAG = '0'
+--                 AND AUDITING_FLAG = '0'
                 AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                 AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
               GROUP BY STATION_CODE,
@@ -992,13 +1003,15 @@
                        SENDER_CODE,
                        SENDER_NAME,
                        SENDER_TYPE,
-                       VALID_FLAG
+                       VALID_FLAG,
+                       AUDITING_FLAG
              ) d
              on a.STATION_NAME = d.STATION_NAME
                  and a.MATERIAL_NAME = d.MATERIAL_NAME
                  and a.RECIEVER_NAME = d.RECIEVER_NAME
                  and a.SENDER_NAME = d.SENDER_NAME
                  and a.VALID_FLAG = d.VALID_FLAG
+                 and a.AUDITING_FLAG = c.AUDITING_FLAG
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into DYNAMIC_WORK_UPDATA

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/vo/AuditDataVO.java

@@ -5,26 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 
 public class AuditDataVO {
-    @ApiModelProperty(value="物料编码",required=false)
-    private String materialCode;
     @ApiModelProperty(value="物料名称",required=false)
     private String materialName;
-    @ApiModelProperty(value="站点编码",required=false)
-    private String stationCode;
     @ApiModelProperty(value="站点名称",required=false)
     private String stationName;
-    @ApiModelProperty(value="收货库房编码",required=false)
-    private String recieverCode;
-    @ApiModelProperty(value="收货库房",required=false)
-    private String recieverName;
-    @ApiModelProperty(value="收货点类型",required=false)
-    private String recieverType;
-    @ApiModelProperty(value="发货库房编码",required=false)
-    private String senderCode;
     @ApiModelProperty(value="发货库房",required=false)
     private String senderName;
-    @ApiModelProperty(value="发货点类型",required=false)
-    private String senderType;
+    @ApiModelProperty(value="收货库房",required=false)
+    private String recieverName;
     @ApiModelProperty(value="8:00",required=false)
     private BigDecimal bl8;
     @ApiModelProperty(value="16:00",required=false)
@@ -33,9 +21,32 @@ public class AuditDataVO {
     private BigDecimal bl24;
     @ApiModelProperty(value="日累计量",required=false)
     private BigDecimal rzl;
+    @ApiModelProperty(value="物料编码",required=false)
+    private String materialCode;
+    @ApiModelProperty(value="站点编码",required=false)
+    private String stationCode;
+    @ApiModelProperty(value="收货库房编码",required=false)
+    private String recieverCode;
+    @ApiModelProperty(value="收货点类型",required=false)
+    private String recieverType;
+    @ApiModelProperty(value="发货库房编码",required=false)
+    private String senderCode;
+    @ApiModelProperty(value="发货点类型",required=false)
+    private String senderType;
     @ApiModelProperty(value="状态",required=false)
     private String validFlag;
 
+    public String getAuditingFlag() {
+        return auditingFlag;
+    }
+
+    public void setAuditingFlag(String auditingFlag) {
+        this.auditingFlag = auditingFlag;
+    }
+
+    @ApiModelProperty(value="审核标志",required=false)
+    private String auditingFlag;
+
     public String getMaterialCode() {
         return materialCode;
     }
@@ -159,21 +170,22 @@ public class AuditDataVO {
     @Override
     public String toString() {
         return "AuditDataVO{" +
-                "materialCode='" + materialCode + '\'' +
-                ", materialName='" + materialName + '\'' +
-                ", stationCode='" + stationCode + '\'' +
+                "materialName='" + materialName + '\'' +
                 ", stationName='" + stationName + '\'' +
-                ", recieverCode='" + recieverCode + '\'' +
-                ", recieverName='" + recieverName + '\'' +
-                ", recieverType='" + recieverType + '\'' +
-                ", senderCode='" + senderCode + '\'' +
                 ", senderName='" + senderName + '\'' +
-                ", senderType='" + senderType + '\'' +
+                ", recieverName='" + recieverName + '\'' +
                 ", bl8=" + bl8 +
                 ", bl16=" + bl16 +
                 ", bl24=" + bl24 +
                 ", rzl=" + rzl +
+                ", materialCode='" + materialCode + '\'' +
+                ", stationCode='" + stationCode + '\'' +
+                ", recieverCode='" + recieverCode + '\'' +
+                ", recieverType='" + recieverType + '\'' +
+                ", senderCode='" + senderCode + '\'' +
+                ", senderType='" + senderType + '\'' +
                 ", validFlag='" + validFlag + '\'' +
+                ", auditingFlag='" + auditingFlag + '\'' +
                 '}';
     }
 }

src/main/java/com/jisco/dynamicweight/pika/mapper/CenternetMapper.java

@@ -1,6 +1,8 @@
 package com.jisco.dynamicweight.pika.mapper;
 
 import com.jisco.dynamicweight.pika.model.Centernet;
+import com.steerinfo.framework.datasource.DataSourceKey;
+import com.steerinfo.framework.datasource.TargetDataSource;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -9,5 +11,7 @@ import java.util.List;
 
 @Mapper
 public interface CenternetMapper extends IBaseMapper<Centernet, String> {
-    void cancelUpload(@Param("centernets") List<Centernet> centernets);
+    int cancelUpload(@Param("centernets") List<Centernet> centernets);
+
+    Centernet myGetById(String identity);
 }

src/main/java/com/jisco/dynamicweight/pika/mapper/CenternetMapper.xml

@@ -1478,6 +1478,8 @@
         <include refid="select"/>
         <include refid="whereLike"/>
     </select>
+<!--    <insert id="batchInsert" parameterType="java.util.List">-->
+<!--        insert into jgshared."CenterNet"@PIKATEST-->
     <insert id="batchInsert" parameterType="java.util.List">
         insert into jgshared."CenterNet"@PIKATEST
         ("Identity",
@@ -2414,6 +2416,8 @@
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <!--        撤销上传-->
+<!--    <delete id="cancelUpload" parameterType="java.util.List">-->
+<!--        update jgshared."CenterNet"@PIKATEST-->
     <delete id="cancelUpload" parameterType="java.util.List">
         update jgshared."CenterNet"@PIKATEST
         set "DeletedTag" = 'Y'
@@ -2422,4 +2426,8 @@
             #{item.identity,jdbcType=VARCHAR}
         </foreach>
     </delete>
+    <select id="myGetById" parameterType="java.lang.String" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where "Identity" = #{identity,jdbcType=VARCHAR}
+    </select>
 </mapper>

src/main/java/com/jisco/dynamicweight/pika/service/ICenternetService.java

@@ -24,4 +24,6 @@ public interface ICenternetService extends IBaseService<Centernet, String>{
     void upload(List<DynamicWorkAuditdata> list);
 
     void cancelUpload(List<String> list);
+
+    Centernet myGetById(String identity);
 }

src/main/java/com/jisco/dynamicweight/pika/service/impl/CenternetServiceImpl.java

@@ -1,9 +1,12 @@
 package com.jisco.dynamicweight.pika.service.impl;
 
+import cn.hutool.core.lang.Assert;
 import com.jisco.dynamicweight.dynamicworkauditdata.model.DynamicWorkAuditdata;
 import com.jisco.dynamicweight.pika.mapper.CenternetMapper;
 import com.jisco.dynamicweight.pika.model.Centernet;
 import com.jisco.dynamicweight.pika.service.ICenternetService;
+import com.steerinfo.framework.datasource.DataSourceKey;
+import com.steerinfo.framework.datasource.TargetDataSource;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +45,7 @@ public class CenternetServiceImpl extends BaseServiceImpl<Centernet, String> imp
     }
 
     @Override
+//    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE2)
     public void upload(List<DynamicWorkAuditdata> list) {
         List<Centernet> centernets = new ArrayList<>();
         list.forEach(item -> {
@@ -139,18 +143,28 @@ public class CenternetServiceImpl extends BaseServiceImpl<Centernet, String> imp
             centernet.setChangedate(new Date());
             centernets.add(centernet);
         });
-        this.batchAdd(centernets);
+        int i = centernetMapper.batchInsert(centernets);
+        Assert.isTrue(i == centernets.size(), "上传皮卡失败");
     }
 
     @Override
+//    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE2)
     public void cancelUpload(List<String> list) {
         List<Centernet> centernets = new ArrayList<>();
         for (String pikaDataId : list) {
             Centernet centernet = this.getById(pikaDataId);
+            Assert.notNull(centernet, "数据不存在：" + pikaDataId);
             centernet.setDeletedtag("Y");
             centernets.add(centernet);
         }
-        centernetMapper.cancelUpload(centernets);
+        int i = centernetMapper.cancelUpload(centernets);
+        Assert.isTrue(i == centernets.size(), "撤销上传皮卡失败");
 //        centernetMapper.batchDelete(list);
     }
+
+    @Override
+//    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE2)
+    public Centernet myGetById(String identity) {
+        return centernetMapper.myGetById(identity);
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/service/impl/MeterWorkCarnoIdentifyServiceImpl.java

@@ -75,7 +75,7 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                 long countBallIdentify = 0L;
                 //枪机车号识别数
                 long countGunIdentify = 0L;
-                //枪机球机识别差数
+                //枪机球机识别差异数
                 long countBallDifferGun = 0L;
                 //Rfid车号识别数
                 long countRfidIdentify = 0L;
@@ -107,8 +107,13 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
                             && model.getCarNoType().equals("1")
                             && StringUtils.isNotEmpty(model.getVideoCarNo2())).count();
-                    //枪机球机识别差数
-                    countBallDifferGun = abs(countBallIdentify - countGunIdentify);
+                    //枪机球机识别差异数
+                    countBallDifferGun = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                            && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                            && model.getCarNoType().equals("1")
+                            && StringUtils.isNotEmpty(model.getVideoCarNo1())
+                            && StringUtils.isNotEmpty(model.getVideoCarNo2())
+                            && !model.getVideoCarNo1().equals(model.getVideoCarNo2())).count();
                     //Rfid车号识别数
                     countRfidIdentify = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())