From 3a952eea82b63e0f27d15c5d2482f08757c997ef Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 09:45:36 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E7=AC=A6=E5=90=88-?= =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88-=E4=B8=8D=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91=20=E4=BB=A5=E5=8F=8A=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=8B=E6=9C=AA=E7=BB=B4=E6=8A=A4=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandProjectLibraryServiceImpl.java | 11 +++++++++-- .../sarStandardsInfo/entity/SarStandardsInfo.java | 4 ++++ .../SarStandProjectLibraryMapper.xml | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 7ac6049d..210feb35 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -379,7 +379,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl wrapper1 = new QueryWrapper<>(); wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE","(select count(*) from sar_stand_unqualified" + - " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ", + " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ","(select count(*) from sar_stand_unqualified" + + " where STAND_ID = r.stand_id and CLOSE_STATE = '2' ) as counts ", "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME ) from sar_stand_unqualified where " + " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes "); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'"); @@ -408,7 +409,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl0L) { + p.setUnCount(s.getUnCount()); + }else if (s.getUnCount() == 0L && s.getCounts()==0L){ + p.setUnCount(2L); + }else { + p.setUnCount(1L); + } p.setEndTimes(s.getEndTimes()); for (SarStandAttrInfo a:list2){ if(s.getId().equals(a.getStandId())){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 35ed503f..142e98a1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -146,6 +146,10 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private Long unCount; + @ApiModelProperty(value = "为符合数量") + @TableField(exist = false) + private Long counts; + @ApiModelProperty(value = "整改完成时间") @TableField(exist = false) private String endTimes; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 2a39e883..d385bc1a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -120,10 +120,10 @@ ON team.project_code = library.project_number WHERE - library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) - library.id IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) 1=1 From 5df6ea6c7311eb2757ab62e9d3edc410702b2c71 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 09:47:48 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index d385bc1a..49f537ee 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -61,10 +61,10 @@ WHERE - library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) - library.id IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) 1=1 @@ -185,10 +185,10 @@ ON team.project_code = library.project_number WHERE - library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) - library.id IN ( SELECT project_id FROM sar_stand_project_relation ) + library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) 1=1 From 3e877d48fe59d3b71a6cee847bc20233f4c0dd1b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 6 Dec 2021 14:06:20 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=97=B6=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 15 +++++++++++---- .../controller/SarStandardsInfoController.java | 16 ++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index fa91fe23..575f096e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -24,10 +24,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @RestController @RequestMapping("/${restPath}/sys/EarlyWarning") @@ -66,6 +63,16 @@ public class EarlyWarningEOController extends BaseController { @ApiOperation("标准预警查询") public ResponseMessage> getStandWaring(StandWarningEO queryPageEO){ IPage standWarning = earlyWarningEOService.getStandWarning(queryPageEO); + standWarning.getRecords().forEach(item->{ + + Optional.ofNullable(item.getSSRQ()) + .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getXCXSSRQ()) + .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getZCCSSRQ()) + .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + + }); return Result.success(standWarning); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index d6e5d118..17084c8b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -46,6 +46,7 @@ import java.net.URLEncoder; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** *

@@ -110,9 +111,24 @@ public class SarStandardsInfoController extends BaseController page.setUserId(LoginUserUtil.getUserId()); } List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); + +// 去掉日期时分秒 + rows.forEach(item->{ + + Optional.ofNullable(item.getSSRQ()) + .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getXCXSSRQ()) + .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getZCCSSRQ()) + .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + + }); + return Result.success(getPageInfo(page.getPager(), rows)); } + + private void nowOrderFunc(SarStandardsInfoEOPage page) { switch (page.getNowOrderBy()) { case 1: From 6b3d87c8904a006615fcab0f6d3287c942260fd8 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 14:51:25 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=8A=A0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandUnqualifiedMapper.xml | 73 +++++++++++++++++-- 1 file changed, 67 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index a0970a42..20c72636 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -31,7 +31,7 @@ - SELECT sar_stand_unqualified.*, sar_standards_info.STAND_TYPE as standType from @@ -49,14 +49,45 @@ and RESPONSIBLE_UNIT = #{sar.responsibleUnit} - and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%') - or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%') + and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') + or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')) order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc limit #{start},#{end} - + SELECT + c.* + FROM + ( + SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM ( + SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* FROM + sar_stand_unqualified,(SELECT @i:=0)j + WHERE + close_state = 1 + + and STAND_ID = #{standId} + + + and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%') + + + and RESPONSIBLE_UNIT = #{sar.responsibleUnit} + + + and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') + or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')) + + order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc + limit #{start},#{end} + )b + left join sar_standards_info on b.STAND_ID = sar_standards_info.id + )c + ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows + + + + + From 58cbe73a0925eb3945cc99f3c36c888b99abfb85 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 15:39:10 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5-----?= =?UTF-8?q?=E9=83=A8=E9=97=A8id=20=E5=92=8C=20=E9=83=A8=E9=97=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java | 5 ++++- .../src/main/resources/mybatis/mapper/sys/UserEOMapper.xml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java index 4923f79b..e77056ef 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java @@ -2,6 +2,7 @@ package com.adc.da.sys.entity; import com.adc.da.base.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.io.Serializable; import java.util.ArrayList; @@ -14,6 +15,7 @@ import java.util.List; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class UserEO extends BaseEntity implements Serializable { private static final long serialVersionUID = 3658632939727891047L; @@ -51,7 +53,8 @@ public class UserEO extends BaseEntity implements Serializable { private Integer unlockFlag; private String userInfoId; private String orgType; - + private String institutionName; + private String institutionId; private String ssoId; private String token; /** diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index 2ffc9c1b..0b4986d5 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -28,6 +28,8 @@ + + @@ -78,6 +80,7 @@ usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type + ,INSTITUTION_NAME,INSTITUTION_ID From 82aa2a113980a5f1840626cec4543b9cbeacc07f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 6 Dec 2021 17:05:37 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=20=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E7=BA=A7=E9=83=A8=E9=97=A8=20id=E5=92=8C=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/sys/entity/UserEO.java | 5 +++++ .../resources/mybatis/mapper/sys/UserEOMapper.xml | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java index e77056ef..e05e2dd8 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java @@ -34,6 +34,11 @@ public class UserEO extends BaseEntity implements Serializable { private String password; private String account; private String usid; + private String sex; + private String phone; + private String upDeptName; + private String upDeptId; + // 扩展字段 private String userType; private String orgId; diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index 0b4986d5..c0bb3b8a 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -30,6 +30,8 @@ + + @@ -80,7 +82,7 @@ usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type - ,INSTITUTION_NAME,INSTITUTION_ID + ,INSTITUTION_NAME,INSTITUTION_ID,SEX,PHONE @@ -751,9 +753,11 @@ - SELECT - `user`.UNAME AS userName, - evaluation_index, - eva.user_id, - avg(eva.score * iex.weight) AS score - FROM - quality_evaluation AS eva - LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID - LEFT JOIN evaluation_index AS iex ON eva.evaluation_index = iex.id - GROUP BY - userName, - evaluation_index, - eva.user_id, - score + SELECT + `user`.UNAME AS userName, + eva.user_id, + avg(eva.score * iex.weight) AS score, + iex.index_type as valueType + FROM + quality_evaluation AS eva + LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID + LEFT JOIN evaluation_index AS iex ON eva.evaluation_index = iex.id + GROUP BY + userName, + eva.user_id, + index_type + ${ew.customSqlSegment} From a2d002d65970c61b1a749ada1fee62b30b083cfc Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Mon, 6 Dec 2021 18:06:28 +0800 Subject: [PATCH 8/8] =?UTF-8?q?ocr=E5=9B=9E=E5=88=B0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=96=9C=E6=9D=A0=E8=BD=AC=E6=8D=A2=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E9=80=A0=E6=88=90=E8=B7=AF=E5=BE=84=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java index c79bdc83..90dad375 100644 --- a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java @@ -161,7 +161,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { String saveWordFileName=null; logger.info("将文件保存至本地"); if(wordFile!=null && !wordFile.isEmpty()){ - saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename(); + saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename().replace("/","_"); saveWordFilePath=ocrFilePath+saveWordFileName; logger.info(saveWordFilePath); //生成保存文件 @@ -175,12 +175,12 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { String saveJsonFilePath=null; String saveJsonFileName=null; if(jsonFile!=null && !jsonFile.isEmpty()){ - saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename(); + saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename().replace("/","_"); saveJsonFilePath=ocrFilePath+saveJsonFileName; logger.info(saveJsonFilePath); File saveJsonFile = new File(saveJsonFilePath); System.out.println(saveJsonFile); - wordFile.transferTo(saveJsonFile); + jsonFile.transferTo(saveJsonFile); // FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath)); // savePic(jsonFile.getInputStream(),saveJsonFilePath); logger.info("Json存储完成");