add

src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryAdd.java

@@ -101,7 +101,7 @@ public class GLPPWXGQueryAdd {
 
         log.info("开始生成网点师傅保险证件信息: \uF0B7{}",sdf.format(new Date()));
 
-        // glppwxgQueryAddService.extractedBx();
+        glppwxgQueryAddService.extractedBx();
 
         log.info("生成网点师傅保险证件信息结束: \uF0B7{}",sdf.format(new Date()));
     }

src/main/java/com/zfire/jiasm/syncdata/service/GLPPWXGQueryAddService.java

@@ -12,6 +12,7 @@ public interface GLPPWXGQueryAddService {
     void extracteWxgQueryAddWXGInfo() throws Exception;
 
     void extractedCert();
+    void extractedBxBak();
     void extractedBx();
 
     void extractedMXFile();

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPWXGQueryAddServiceImpl.java

@@ -21,6 +21,7 @@ import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.test;
 import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
 import com.zfire.jiasm.syncdata.utils.oss.OSSUtil;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
@@ -409,7 +410,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     }
 
     @Override
-    public void extractedBx(){
+    public void extractedBxBak(){
         List<InsureWorkerCommercialFile> iwcfiles = new ArrayList<>();
         List<InsureWorkerCommercialFile> iwcfilesUpList = new ArrayList<>();
         // 提取需要处理的证件照数据
@@ -422,18 +423,46 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         for (InsureWorkerCommercialFile item :iwcfiles){
             try{
                 // 生成图片
-                processBxInfo(item);
+                processBxInfoBak(item);
                 iwcfilesUpList.add(item);
 
-                updateBxInfo(iwcfilesUpList, 100);
+                updateBxInfoBak(iwcfilesUpList, 100);
             } catch (Exception ex) {
                 ex.printStackTrace();
-                updateBxInfo(iwcfilesUpList, 0);
+                updateBxInfoBak(iwcfilesUpList, 0);
                 log.info("生成师傅证件照信息失败worker_cert.id= {}",item.getId());
             }
         }
 
-        updateBxInfo(iwcfilesUpList, 0);
+        updateBxInfoBak(iwcfilesUpList, 0);
+    }
+
+    @Override
+    public void extractedBx(){
+        List<WebsitWorker> websitWorkers = new ArrayList<>();
+        List<WebsitWorker> websitWorkerUpList = new ArrayList<>();
+        // 提取需要处理的证件照数据
+
+        websitWorkers = websitWorkerService.lambdaQuery()
+                .eq(WebsitWorker::getOutZjljProcess,0)
+                .in(WebsitWorker::getWebsitWorkerId,"1696842046686597122","1696842046724345857","1698942353616801794")// 测试用
+                .isNotNull(WebsitWorker::getOutZjlj).list();
+
+        for (WebsitWorker item :websitWorkers){
+            try{
+                // 生成图片
+                processBxInfo(item);
+                websitWorkerUpList.add(item);
+
+                updateBxInfo(websitWorkerUpList, 100);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                updateBxInfo(websitWorkerUpList, 0);
+                log.info("生成师傅证件照信息失败 websit_worker.websit_worker_id= {}",item.getWebsitWorkerId());
+            }
+        }
+
+        updateBxInfo(websitWorkerUpList, 0);
     }
 
     @Override
@@ -470,13 +499,20 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         }
     }
 
-    private void updateBxInfo(List<InsureWorkerCommercialFile> iwcfilesUpList, int i) {
+    private void updateBxInfoBak(List<InsureWorkerCommercialFile> iwcfilesUpList, int i) {
         if (iwcfilesUpList.size() > i) {
             insureWorkerCommercialFileService.updateBatchById(iwcfilesUpList);
             iwcfilesUpList.clear();
         }
     }
 
+    private void updateBxInfo(List<WebsitWorker> websitWorkerUpList, int i) {
+        if (websitWorkerUpList.size() > i) {
+            websitWorkerService.updateBatchById(websitWorkerUpList);
+            websitWorkerUpList.clear();
+        }
+    }
+
     private void updateMXFile(List<OrderDetailFile> iwcfilesUpList, int i) {
         if (iwcfilesUpList.size() > i) {
             orderDetailFileService.updateBatchById(iwcfilesUpList);
@@ -1079,7 +1115,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         }
     }
 
-    private void processBxInfo(InsureWorkerCommercialFile iwcfile) throws IOException {
+    private void processBxInfoBak(InsureWorkerCommercialFile iwcfile) throws IOException {
         if (StringUtils.isNotEmpty(iwcfile.getOutZjlj()) && StringUtils.isEmpty(iwcfile.getFileUrl())){
             String id = putCert(iwcfile.getOutZjlj());
             if (StringUtils.isNotEmpty(id)){
@@ -1094,6 +1130,51 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         }
     }
 
+    private void processBxInfo(WebsitWorker websitWorker) throws IOException {
+        if (StringUtils.isNotEmpty(websitWorker.getOutZjlj())){
+            // 多个附件处理
+            if (websitWorker.getOutZjlj().contains(",")){
+                Boolean flag = Boolean.TRUE;
+                int num=0;
+                String insureFiles = "";
+                String outInsureCert = "";
+
+                List<String> result = Arrays.asList(websitWorker.getOutZjlj().split(","));
+
+                // 上传图片
+                for (String p:result){
+                    String id = putCert(p);
+                    if (StringUtils.isNotEmpty(id)){
+                        if (num>0){
+                            insureFiles=id;
+                            outInsureCert=p;
+                        } else {
+                            insureFiles=insureFiles+","+id;
+                            outInsureCert=outInsureCert+","+p;
+                        }
+                        websitWorker.setInsureFiles(insureFiles);
+                        websitWorker.setOutInsureCert(outInsureCert);
+                        new File(id).delete();
+                    } else {
+                        flag = Boolean.FALSE;
+                    }
+                    num = num +1 ;
+                }
+                if (flag){
+                    websitWorker.setOutZjljProcess(1);
+                }
+            } else {
+                String id = putCert(websitWorker.getOutZjlj());
+                if (StringUtils.isNotEmpty(id)){
+                    websitWorker.setInsureFiles(id);
+                    websitWorker.setOutInsureCert(websitWorker.getOutZjlj());
+                    websitWorker.setOutZjljProcess(1);
+                    new File(id).delete();
+                }
+            }
+        }
+    }
+
     private void processMXFileInfo(OrderDetailFile iwcfile) throws IOException {
         if (StringUtils.isNotEmpty(iwcfile.getOutPicture())){
             String id = putCert(iwcfile.getOutPicture());

src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceDataUploadServiceImpl.java

@@ -301,6 +301,13 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
             OrderPar orderPar = new OrderPar();
             orderPar.setId(ojtutl.getId());
             ItfTblAzAssignXzydUpload rec = orderInformationNewMapper.getOrderInformation(orderPar);
+            if (rec.getYdren().length()>20){
+                rec.setYdren(rec.getYdren().substring(0,20));
+            }
+            if (rec.getYdrmc().length()>120){
+                rec.setYdrmc(rec.getYdrmc().substring(0,120));
+            }
+
             OrderBase orderBase = orderBaseService.lambdaQuery()
                     .eq(OrderBase::getId,rec.getWorkerOrderNo())
                     .last("limit 1")

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceUploadListServiceImpl.java

@@ -188,6 +188,13 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
         WebsitFWS websitFWS = new WebsitFWS();
         orderPar.setId(itemTableNameId);
         ItfTblAssignXzydUpload rec = orderInformationNewMapper.getOrderInformationrepair(orderPar);
+        if (rec.getYdren().length()>20){
+            rec.setYdren(rec.getYdren().substring(0,20));
+        }
+        if (rec.getYdrmc().length()>120){
+            rec.setYdrmc(rec.getYdrmc().substring(0,120));
+        }
+
         OrderBase orderBase = orderBaseService.lambdaQuery()
                 .eq(OrderBase::getId,rec.getWorkerOrderNo())
                 .last("limit 1")
@@ -209,7 +216,8 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
         orderInformationNewMapper.upYdid(orderPar);
     }
 
-    private String getYdId(Token token, String itemOrderNo, String itemTableNameId, String srcTabName, OrderBase orderBase, OrderInformation oi) throws Exception {
+    private String getYdId(Token token, String itemOrderNo, String itemTableNameId, String srcTabName,
+                           OrderBase orderBase, OrderInformation oi) throws Exception {
         String newDykh;
         if (oi.getXzid()>0){
             // 表中获取

src/main/resources/mapper/OrderInformationNewMapper.xml

@@ -18,7 +18,7 @@
                xzid,create_by,create_time as created_date,update_by as last_modified_by,
                update_time as last_modified_date,create_by as czren,create_time as czsj,
                websit_id as wdno,read_status as cshu,remark as xzyq,ask_category_id as xzyqlb,
-               read_status as ydbz,read_time as ydsj,read_name as ydren,read_name as ydrmc,
+               read_status as ydbz,read_time as ydsj,ifnull(read_name,'') as ydren,read_name as ydrmc,
                '' as ydwd,'' as ydwdmc
         from order_information
         where id = #{request.id}