2023 09 08 bug修改

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVisaServiceImpl.java

@@ -39,6 +39,7 @@ import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.FileUtil;
 import org.springblade.evisa.redissionUtil.DistributedRedisLock;
 import org.springblade.evisa.service.EVisaService;
 import org.springblade.evisa.vo.EVisaMakeSealVO;
@@ -135,6 +136,7 @@ public class EVisaServiceImpl implements EVisaService {
                     }
                 }
             }
+
             //没有找到合同章，直接返回
             if (contractPfx == null) {
                 return NOT_PFX_OR_FILE;
@@ -196,11 +198,9 @@ public class EVisaServiceImpl implements EVisaService {
                 //电签失败 ，接口返回认证失败
                 return "认证失败！认证接口调用异常";
             }
-
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -375,9 +375,15 @@ public class EVisaServiceImpl implements EVisaService {
                 Object[] result = this.signPdfByAXQZ(pdfVO, fileByte);
                 if (result != null) {
                     if (result[0] != null) {
-                        MultipartFile newFiles = new MockMultipartFile("file", SnowFlakeUtil.getId() + ".pdf", "text/plain", IOUtils.toByteArray(new ByteArrayInputStream((byte[]) result[0])));
+
+                      //MultipartFile newFiles = new MockMultipartFile("file", SnowFlakeUtil.getId() + ".pdf", "text/plain", IOUtils.toByteArray(new ByteArrayInputStream((byte[]) result[0])));
+
+                        byte[] byteArray = IOUtils.toByteArray(new ByteArrayInputStream((byte[]) result[0]));
+                        String dataUrl = "/www/wwwroot/Users/hongchuangyanfa/Desktop/pdf/"+SnowFlakeUtil.getId() + ".pdf";
+                        File file1 =new File(dataUrl);
+                        FileUtil.copy(byteArray,file1);
                         //重新上传
-                        BladeFile bladeFile = this.newIOSSClient.uploadFileByInputStream(newFiles);
+                        BladeFile bladeFile = this.newIOSSClient.uploadFile(SnowFlakeUtil.getId() + ".pdf",dataUrl);
                         if (bladeFile != null) {
                             resultMessage = SUCCESS + "@@@@" + bladeFile.getLink();
                         } else {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -2121,16 +2121,6 @@ public class ExcelTabController extends BladeController {
         String projectId = tableInfo1.getString("projectId");
         String classify = tableInfo1.getString("classify");
 
-        /*String groupId = tableInfo1.getString("tabGroupId");
-        String pkeyId = tableInfo1.getString("pkeyId");
-        String pkeyIds = pkeyId;
-        String groupIds = groupId;
-        for (int i = 1; i < dataArray.size(); i++) {
-            JSONObject jsonObject = dataArray.getJSONObject(i);
-            pkeyIds += "," + jsonObject.getString("pkeyId");
-            groupIds += "," + jsonObject.getString("tabGroupId");
-        }*/
-
         /*全加载，或者可以优化成依赖加载*/
         List<AppWbsTreeContractVO> tableAll = new ArrayList<>();
         List<TableInfo> tableInfoList = this.excelTabService.getTableInfoList(dataArray);
@@ -2170,13 +2160,13 @@ public class ExcelTabController extends BladeController {
 
         //公式填充
         this.excelTabService.formulaFillData(tableInfoList, Long.parseLong(nodeId), ExecuteType.INSPECTION);
-
         //保存数据到数据库
         R<Object> result = this.excelTabService.saveOrUpdateInfo(tableInfoList);
         if (!result.isSuccess()) {
             return R.fail("以下的表在保存数据时发生了异常【" + result.getMsg() + "】");
         }
 
+
         List<String> errorPKeyIds = new ArrayList<>();
         //单个pdf加载
         if (tableInfoList != null) {
@@ -2205,7 +2195,6 @@ public class ExcelTabController extends BladeController {
 
         //合并pdf加载
         excelTabService.getBussPdfs(nodeId, classify, contractId, projectId);
-
         //更新缓存
         informationQueryClient.delAsyncWbsTree(contractId);
 
@@ -3776,5 +3765,4 @@ public class ExcelTabController extends BladeController {
         return R.fail("操作失败");
     }
 
-
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TabBusstimeInfoController.java

@@ -129,7 +129,7 @@ public class TabBusstimeInfoController extends BladeController {
 		String [] keys = tabBusstimeInfo.getColKey().split(":");
 		tabBusstimeInfo.setColKey(keys[1]);
 		tabBusstimeInfo.setTabEnName(keys[0]);
-		tabBusstimeInfoService.delTabBussTimeByColId(tabBusstimeInfo.getColId()+"");
+		tabBusstimeInfoService.delTabBussTimeByColId(tabBusstimeInfo.getTableId()+"","");
 		return R.status(tabBusstimeInfoService.save(tabBusstimeInfo));
 	}
 
@@ -140,6 +140,6 @@ public class TabBusstimeInfoController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(tabBusstimeInfoService.delTabBussTimeByColId(ids));
+		return R.status(tabBusstimeInfoService.delTabBussTimeByColId(null,ids));
 	}
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TabBusstimeInfoMapper.java

@@ -20,6 +20,8 @@ import org.springblade.manager.entity.TabBusstimeInfo;
 import org.springblade.manager.vo.TabBusstimeInfoVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.data.repository.query.Param;
+
 import java.util.List;
 
 /**
@@ -39,5 +41,5 @@ public interface TabBusstimeInfoMapper extends BaseMapper<TabBusstimeInfo> {
 	 */
 	List<TabBusstimeInfoVO> selectTabBusstimeInfoPage(IPage page, TabBusstimeInfoVO tabBusstimeInfo);
 
-	boolean delTabBussTimeByColId(String colId);
+	boolean delTabBussTimeByColId(@Param("tabId") String tabId,@Param("colId") String colId);
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TabBusstimeInfoMapper.xml

@@ -24,6 +24,12 @@
     </select>
 
     <delete id="delTabBussTimeByColId">
-        delete from m_tab_busstime_info where col_id = #{colId}
+        delete from m_tab_busstime_info where 1=1
+        <if test="tabId != null and colId != ''">
+           and tab_id = #{tabId}
+        </if>
+        <if test="colId != null and colId != ''">
+           and col_id = #{colId}
+        </if>
     </delete>
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/ITabBusstimeInfoService.java

@@ -38,5 +38,5 @@ public interface ITabBusstimeInfoService extends BaseService<TabBusstimeInfo> {
 	 */
 	IPage<TabBusstimeInfoVO> selectTabBusstimeInfoPage(IPage<TabBusstimeInfoVO> page, TabBusstimeInfoVO tabBusstimeInfo);
 
-	boolean delTabBussTimeByColId(String colId);
+	boolean delTabBussTimeByColId(String tabId,String colId);
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -1597,7 +1597,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                         cell.setCellValue(myData);
                                     }
                                     boolean wrap = Optional.ofNullable(cell).map(Cell::getCellStyle).map(CellStyle::getWrapText).orElse(true);
-                                    ;
                                     if (!wrap) {
                                         cell.getCellStyle().setShrinkToFit(true);
                                     }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/TabBusstimeInfoServiceImpl.java

@@ -39,8 +39,8 @@ public class TabBusstimeInfoServiceImpl extends BaseServiceImpl<TabBusstimeInfoM
 	}
 
 	@Override
-	public boolean delTabBussTimeByColId(String colId) {
-		return baseMapper.delTabBussTimeByColId(colId);
+	public boolean delTabBussTimeByColId(String tabId,String colId) {
+		return baseMapper.delTabBussTimeByColId(tabId,colId);
 	}
 
 }