From a5286c3686ab75d600f546f79725ad3a8013c1d3 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 25 Jul 2021 16:46:36 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9C=A8=E5=9B=BD=E5=A4=96=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E9=87=8C=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandAttrDetailsController.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java index fa5cf2f1..5a6cb02a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -59,8 +60,22 @@ public class SarStandAttrDetailsController extends BaseController getInlandStandList = InitStandAttrUtil.standInlandAttrFieldList; resultMap.put(SarTypeEnum.INLAND_STAND.getValue(),getInlandStandList); + + List getForeignStandList = InitStandAttrUtil.standForeignAttrFieldList; + //新增字段 + Iterator iterator = getInlandStandList.iterator(); + while (iterator.hasNext()){ + SarStandAttrDetails next = iterator.next(); + + if (next.getAttrName().matches("能源类型|适用产品线|适用认证|责任工程师|关联文件")){ + getForeignStandList.add(next); + } + + } resultMap.put(SarTypeEnum.FOREIGN_STAND.getValue(),getForeignStandList); + + // 政策属性字段 List getInlandLawsList = InitStandAttrUtil.lawsInlandAttrFieldList; resultMap.put(SarTypeEnum.INLAND_LAWS.getValue(),getInlandLawsList); From 3154533fb81cb884cb632f3d9216144b45c0b55b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 25 Jul 2021 16:51:59 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E5=90=8E=E9=87=8D=E6=96=B0=E7=BC=96=E8=BE=91=E6=95=B0?= =?UTF-8?q?=E6=8D=AE,=E6=94=B6=E8=97=8F=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91,=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E6=97=B6(=E9=80=BB=E8=BE=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4),=E5=86=8D=E6=AC=A1=E6=94=B6=E8=97=8F=E6=AD=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE,=E7=94=B1=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E6=9D=A1=E6=96=B0=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=94=B9=E4=B8=BA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=8E=9F=E6=9D=A5=E6=95=B0=E6=8D=AE=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 1 - .../controller/PersonCollectEOController.java | 22 ++++++++++++++----- .../adc/da/person/dao/PersonCollectEODao.java | 2 ++ .../service/IPersonCollectEOService.java | 2 ++ .../impl/PersonCollectEOServiceImpl.java | 5 +++++ .../mapper/person/PersonCollectEOMapper.xml | 8 +++++++ 6 files changed, 34 insertions(+), 6 deletions(-) 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 c35efe84..bc066c06 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 @@ -151,7 +151,6 @@ public class SarStandardsInfoController extends BaseController page.setAdvanceSearchStr(null); } } - page.setUserId(LoginUserUtil.getUserId()); List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); return Result.success(getPageInfo(page.getPager(), rows)); } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java index 600d4d9b..448d57a9 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java @@ -8,6 +8,7 @@ import com.adc.da.person.page.PersonCollectEOPage; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -78,12 +79,20 @@ public class PersonCollectEOController extends BaseController { @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) // @RequiresPermissions("person:personCollect:create") public ResponseMessage create(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { - // String userId = LoginUserUtil.getUserId(); - tsPersonCollect.setId(UUIDUtils.randomUUID20()); - tsPersonCollect.setValidFlag(0); - tsPersonCollect.setCreationTime(new Date()); + tsPersonCollect.setModifyTime(new Date()); + tsPersonCollect.setValidFlag(0); + + //如果这个用户已经收藏过这个标准,则更新个人收藏表 + int line=personCollectEOService.updateByUserIdAndCollectResId(tsPersonCollect); + if (personCollectEOService.updateByUserIdAndCollectResId(tsPersonCollect)>0) { + return Result.success("0","收藏成功,请到'我的收藏'中查看相关信息。", tsPersonCollect); + } + + //用户没有收藏过时,在表中添加 + tsPersonCollect.setId(UUIDUtils.randomUUID20()); + tsPersonCollect.setCreationTime(new Date()); personCollectEOService.save(tsPersonCollect); @@ -93,10 +102,13 @@ public class PersonCollectEOController extends BaseController { @ApiOperation(value = "|PersonCollectEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE,value = "/updatePersonCollect") // @RequiresPermissions("person:personCollect:update") public ResponseMessage update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { tsPersonCollect.setModifyTime(new Date()); + +// tsPersonCollect.setValidFlag(0); + personCollectEOService.updateById(tsPersonCollect); return Result.success(tsPersonCollect); } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java index 59ddd12e..3ad4b283 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java @@ -18,6 +18,8 @@ import java.util.List; */ public interface PersonCollectEODao extends BaseMapper { + public int updateByUserIdAndCollectResId(TsPersonCollect tsPersonCollect); + public List queryByList(BasePage page); public int queryByCount(BasePage var1); diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java index b21e938f..2faae02d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java @@ -10,6 +10,8 @@ import java.util.List; public interface IPersonCollectEOService extends IService { + public int updateByUserIdAndCollectResId(TsPersonCollect tsPersonCollect); + public List queryByPage(PersonCollectEOPage page); public List queryByList(PersonCollectEOPage page); diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java index fc781203..8515f61a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java @@ -36,12 +36,17 @@ public class PersonCollectEOServiceImpl extends ServiceImpl queryByPage(PersonCollectEOPage page) { diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml index 230c587c..95090684 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml @@ -397,4 +397,12 @@ from ts_pserson_collect where collect_type=#{c} + + + + UPDATE ts_person_collect + SET modify_time=#{modifyTime},Valid_flag=#{validFlag} + WHERE user_id = #{userId} + AND collect_res_id = #{collectResId} + From f609e3ceceda060e1c88f49c0aa9f0c0b1630488 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 25 Jul 2021 18:22:41 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=B0=B4=E5=8D=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-base/pom.xml | 6 ++++ .../java/com/adc/da/util/WaterMarkUtil.java | 13 +++++-- adc-da-sys/pom.xml | 22 ++++++++++++ .../att/controller/AttFileEOController.java | 34 +++++++++++-------- .../main/java/com/adc/da/att/dao/UserDao.java | 8 +++++ .../java/com/adc/da/att/entity/TsUser.java | 24 +++++++++++++ 6 files changed, 90 insertions(+), 17 deletions(-) create mode 100644 adc-da-sys/src/main/java/com/adc/da/att/dao/UserDao.java create mode 100644 adc-da-sys/src/main/java/com/adc/da/att/entity/TsUser.java diff --git a/adc-da-base/pom.xml b/adc-da-base/pom.xml index cbf24270..538935fe 100644 --- a/adc-da-base/pom.xml +++ b/adc-da-base/pom.xml @@ -37,6 +37,12 @@ UserAgentUtils 1.21 + + com.itextpdf + itextpdf + 5.5.13 + compile + diff --git a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java index 304e9f35..d33481f1 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java +++ b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java @@ -1,5 +1,13 @@ package com.adc.da.util; +import com.itextpdf.text.BaseColor; +import com.itextpdf.text.Element; +import com.itextpdf.text.Rectangle; +import com.itextpdf.text.pdf.*; + +import java.io.FileOutputStream; +import java.lang.reflect.Field; + /** * @Description:水印 * @Author: super_liu @@ -15,7 +23,7 @@ public class WaterMarkUtil { */ public static boolean waterMark(String inputFile, String outputFile, String waterMarkName) { -/* try { + try { PdfReader reader = new PdfReader(inputFile); Field f = PdfReader.class.getDeclaredField("encrypted"); f.setAccessible(true); @@ -65,8 +73,7 @@ public class WaterMarkUtil { } catch (Exception e) { e.printStackTrace(); return false; - }*/ -return false; + } } } diff --git a/adc-da-sys/pom.xml b/adc-da-sys/pom.xml index 67891c56..94a80bcc 100644 --- a/adc-da-sys/pom.xml +++ b/adc-da-sys/pom.xml @@ -77,6 +77,28 @@ dom4j 2.0.1 + + + + com.lowagie + itext + 2.1.7 + + + com.lowagie + itextasian + 2.1.7 + + + com.itextpdf + itextpdf + 5.5.9 + + + com.itextpdf + itext-asian + 5.2.0 + diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index 456e39c7..4df99038 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -1,13 +1,17 @@ package com.adc.da.att.controller; +import com.adc.da.att.dao.UserDao; import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.entity.TsUser; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.att.vo.AttFileVo; import com.adc.da.file.store.IFileStore; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.sys.entity.UserEO; import com.adc.da.util.MD5Util; import com.adc.da.util.UUIDUtils; +import com.adc.da.util.WaterMarkUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -46,6 +50,9 @@ public class AttFileEOController { @Autowired private IFileStore iFileStore; + @Autowired + private UserDao userDao; + @Value("${file.path}") private String filePath;//文件存储路径 @@ -249,7 +256,7 @@ public class AttFileEOController { @ApiOperation(value = "|File|下载文件加水印") @GetMapping("/downloadFileForSarWaterMark") // @RequiresPermissions("sys:file:downloadFileForSar") - public void downloadFileForSarWaterMark(String fileId, HttpServletResponse response, HttpServletRequest request) throws Exception { + public void downloadFileForSarWaterMark(String userId,String fileId, HttpServletResponse response, HttpServletRequest request) throws Exception { AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); InputStream is = null; OutputStream os = null; @@ -265,24 +272,23 @@ public class AttFileEOController { } String waterFilePath = newFilePath + attFileEO.getOldFileName(); // 添加水印 - String waterContent = ""; -// String userId = LoginUserUtil.getUserId(); -// String userMsg = ""; -// UserEO userEO = userEOService.selectByPrimaryKey(userId); -// if (userEO != null) { -// userMsg = userEO.getUname() + ","; -// if (StringUtils.isNotEmpty(userEO.getWorkNum())) { -// userMsg += userEO.getWorkNum() + ","; -// } -// } + String userMsg = ""; + TsUser tsUser = userDao.selectById(userId); + if (tsUser != null) { + userMsg = tsUser.getUname() + ","; + if (StringUtils.isNotEmpty(tsUser.getWorkNum())) { + userMsg += tsUser.getWorkNum() + ","; + } + } SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 String date = df.format(new Date()); -// waterContent = userMsg + date; + String waterContent = userMsg + date; //2020年9月5日 去掉水印处理 -// WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent); + //2021年7月25日要求下载生成水印 + WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent); response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); response.setContentType("application/octet-stream"); - File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName()); + File file = new File(waterFilePath); is = new FileInputStream(file); os = response.getOutputStream(); IOUtils.copy(is, os); diff --git a/adc-da-sys/src/main/java/com/adc/da/att/dao/UserDao.java b/adc-da-sys/src/main/java/com/adc/da/att/dao/UserDao.java new file mode 100644 index 00000000..b7f6d6df --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/dao/UserDao.java @@ -0,0 +1,8 @@ +package com.adc.da.att.dao; + +import com.adc.da.att.entity.TsUser; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +public interface UserDao extends BaseMapper { + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/entity/TsUser.java b/adc-da-sys/src/main/java/com/adc/da/att/entity/TsUser.java new file mode 100644 index 00000000..c088351b --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/entity/TsUser.java @@ -0,0 +1,24 @@ +package com.adc.da.att.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TsUser extends BaseEntity implements Serializable { + @TableId + private String usid; + @TableField + private String uname; + @TableField + private String workNum; + + +} From 2a41643617cb7812839967ca48aceac6de726afe Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 26 Jul 2021 10:10:14 +0800 Subject: [PATCH 04/27] =?UTF-8?q?=E5=8F=AA=E5=9C=A8pdf=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=B0=B4=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/att/controller/AttFileEOController.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index 4df99038..cc34cb29 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -288,7 +288,19 @@ public class AttFileEOController { WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent); response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); response.setContentType("application/octet-stream"); - File file = new File(waterFilePath); + + String downloadFilePath=""; + String fileName=attFileEO.getFileName(); + String suffix=fileName.substring(fileName.lastIndexOf(".")+1); + //只能在pdf中添加水印, + //非pdf文件直接下载原文件 + if (suffix.equals("pdf")){ + downloadFilePath=waterFilePath; + }else { + downloadFilePath=oldFilePath; + } + + File file = new File(downloadFilePath); is = new FileInputStream(file); os = response.getOutputStream(); IOUtils.copy(is, os); From 5a8cad6e09d37c306ee86a9da554e420019bf944 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 26 Jul 2021 18:30:54 +0800 Subject: [PATCH 05/27] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarResource/service/impl/TsResourceServiceImpl.java | 1 + .../controller/SarStandardsInfoController.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index 3713fbf3..c930c319 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -145,6 +145,7 @@ public class TsResourceServiceImpl extends ServiceImpl TsResources=dao.selectList(tsResourceQueryWrapper); for(TsResource TsResource:TsResources){ TsResource.setChildren(recursionGetChildren((TsResource))); 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 c35efe84..8cbf6ece 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 @@ -151,7 +151,9 @@ public class SarStandardsInfoController extends BaseController page.setAdvanceSearchStr(null); } } - page.setUserId(LoginUserUtil.getUserId()); + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); return Result.success(getPageInfo(page.getPager(), rows)); } From 9cd93436c4096b5443cb3f651fbed40552ae0f55 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 26 Jul 2021 20:07:38 +0800 Subject: [PATCH 06/27] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=B5=B7?= =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=A0=87=E5=87=86=E5=90=8E=EF=BC=8C=E5=9C=A8=E6=AD=A4?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E6=AD=A4?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarResource/dao/TsResourceDao.java | 3 +++ .../service/impl/TsResourceServiceImpl.java | 8 ++++++++ .../SarStandAttrDetailsController.java | 18 +++++++++--------- .../mapper/sarResource/TsResourceMapper.xml | 8 ++++++++ .../da/att/controller/AttFileEOController.java | 8 ++++++-- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java index 335a7986..de959ae0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarResource.dao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; import java.util.List; /** @@ -19,4 +20,6 @@ public interface TsResourceDao extends BaseMapper { List selectMenuByRole(TsResource sarMenuEO); + int insertTsRoleResource(HashMap map); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index 3713fbf3..263a68e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -7,6 +7,7 @@ import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.sarResource.dao.TsResourceDao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.util.UUIDUtils; import com.adc.da.utils.treetool.Tree; import com.adc.da.utils.treetool.TreeNode; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -17,6 +18,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; /** @@ -166,6 +168,12 @@ public class TsResourceServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("resourceId",TsResource.getId()); + map.put("roleId",1); + dao.insertTsRoleResource(map); + return Result.success(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java index 5a6cb02a..2275753d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java @@ -64,15 +64,15 @@ public class SarStandAttrDetailsController extends BaseController getForeignStandList = InitStandAttrUtil.standForeignAttrFieldList; //新增字段 - Iterator iterator = getInlandStandList.iterator(); - while (iterator.hasNext()){ - SarStandAttrDetails next = iterator.next(); - - if (next.getAttrName().matches("能源类型|适用产品线|适用认证|责任工程师|关联文件")){ - getForeignStandList.add(next); - } - - } +// Iterator iterator = getInlandStandList.iterator(); +// while (iterator.hasNext()){ +// SarStandAttrDetails next = iterator.next(); +// +// if (next.getAttrName().matches("能源类型|适用产品线|适用认证|责任工程师|关联文件")){ +// getForeignStandList.add(next); +// } +// +// } resultMap.put(SarTypeEnum.FOREIGN_STAND.getValue(),getForeignStandList); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml index a09cbd84..09f9859f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml @@ -15,6 +15,8 @@ + + parent_id, menu_name, sor_divide, id, modify_time, creation_time, valid_flag, display_seq, parent_ids, remarks @@ -69,6 +71,12 @@ + + + INSERT INTO ts_role_resource + VALUES(#{roleId},#{resourceId} ) + + com.adc @@ -91,12 +91,12 @@ org.elasticsearch.client transport - 6.3.2 + 7.6.2 org.elasticsearch elasticsearch - 6.3.2 + 7.6.2 diff --git a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java index d60a2cee..fb4b5ca4 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java +++ b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java @@ -4,21 +4,21 @@ import com.adc.da.base.web.BaseController; import com.adc.da.excel.poi.excel.ExcelExportUtil; import com.adc.da.excel.poi.excel.entity.ExportParams; import com.adc.da.excel.poi.excel.entity.enums.ExcelType; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.person.service.IPersonCollectEOService; -import com.adc.da.search.dto.*; +import com.adc.da.search.dto.SearchBussExportDto; +import com.adc.da.search.dto.SearchLawsExportDto; +import com.adc.da.search.dto.SearchMsgExportDto; +import com.adc.da.search.dto.SearchStandExportDto; import com.adc.da.search.entity.CommonSearchInfoEO; import com.adc.da.search.entity.SarAdvanceSearchVO; import com.adc.da.search.entity.SeniorSearchInfoEO; import com.adc.da.search.service.ElasticsearchService; import com.adc.da.search.service.SearchCenterService; -import com.adc.da.exception.AdcDaBaseException; -import com.adc.da.http.ResponseMessage; -import com.adc.da.http.Result; -import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu; -import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; import com.adc.da.util.IOUtils; - import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -26,14 +26,25 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.elasticsearch.client.transport.TransportClient; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.regex.Pattern; + import static com.adc.da.sys.common.ReadExcelName.encodeFileName; @RestController @@ -52,14 +63,14 @@ public class SearchCenterController extends BaseController> @Autowired private ElasticsearchService elasticsearchService; - @Autowired + /*@Autowired private ITsDicTypeService iTsDictypeService; @ApiOperation("获取筛选条件") @PostMapping("/getMenu") public ResponseMessage> getSearchMenu(){ return Result.success(iTsDictypeService.getSearchMenu()); - } + }*/ /** * diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java index 251abac1..3af95a89 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java @@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; -import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest; import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse; import org.elasticsearch.action.bulk.BulkRequestBuilder; @@ -19,6 +18,7 @@ import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; +import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.client.transport.TransportClient; @@ -26,15 +26,13 @@ import org.elasticsearch.common.text.Text; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.DeleteByQueryAction; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.BucketOrder; import org.elasticsearch.search.aggregations.bucket.range.Range; import org.elasticsearch.search.aggregations.bucket.terms.StringTerms; -import org.elasticsearch.search.aggregations.metrics.avg.Avg; -import org.elasticsearch.search.aggregations.metrics.max.Max; +import org.elasticsearch.search.aggregations.metrics.Avg; +import org.elasticsearch.search.aggregations.metrics.Max; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.search.sort.SortOrder; import org.slf4j.Logger; @@ -43,7 +41,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; @Component public class ElasticsearchServiceImpl implements ElasticsearchService { @@ -89,7 +91,8 @@ public class ElasticsearchServiceImpl implements ElasticsearchService { if (!isIndexExist(index)) { logger.info("Index is not exits!"); } - DeleteIndexResponse dResponse = client.admin().indices().prepareDelete(index).get(); + AcknowledgedResponse dResponse = client.admin().indices().prepareDelete(index).get(); + if (dResponse.isAcknowledged()) { logger.info("delete index " + index + " successfully!"); } else { @@ -184,13 +187,14 @@ public class ElasticsearchServiceImpl implements ElasticsearchService { */ @Override public long deleteAllDataOfIndex(String index) { - BulkByScrollResponse response = DeleteByQueryAction.INSTANCE.newRequestBuilder(client) + /*BulkByScrollResponse response = DeleteByQueryAction.INSTANCE.newRequestBuilder(client) .filter(QueryBuilders.matchAllQuery()) .source(index) .get(); //一共删除掉多少条 long deleted = response.getDeleted(); - return deleted; + return deleted;*/ + return 0; } /** @@ -390,7 +394,7 @@ public class ElasticsearchServiceImpl implements ElasticsearchService { SearchResponse searchResponse = searchRequestBuilder.execute().actionGet(); - long totalHits = searchResponse.getHits().totalHits; + long totalHits = searchResponse.getHits().getTotalHits().value; long length = searchResponse.getHits().getHits().length; logger.info("共查询到[{}]条数据,处理数据条数[{}]", totalHits, length); @@ -488,7 +492,7 @@ public class ElasticsearchServiceImpl implements ElasticsearchService { // 执行搜索,返回搜索响应信息 SearchResponse searchResponse = searchRequestBuilder.execute().actionGet(); - long totalHits = searchResponse.getHits().totalHits; + long totalHits = searchResponse.getHits().getTotalHits().value; long length = searchResponse.getHits().getHits().length; logger.debug("共查询到[{}]条数据,处理数据条数[{}]", totalHits, length); diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 6a2fd4a1..30b27b89 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -807,7 +807,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { // 获取查询到的结果 SearchResponse response = searchRequestBuilder.get(); result = SearchResponseToList(response); - searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits()); + searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits().value); Map aggmap = response.getAggregations().asMap(); if (!result.isEmpty()) { for (int i = 0; i < seniortype.length; i++) { @@ -1158,7 +1158,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { // } result.add(sourceAsMap); } - searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits()); + searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits().value); return result; } @@ -1243,7 +1243,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { } result.add(sourceAsMap); } - searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits()); + searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits().value); return result; } diff --git a/adc-da-slrs/pom.xml b/adc-da-slrs/pom.xml index 62b2d5da..cb647b83 100644 --- a/adc-da-slrs/pom.xml +++ b/adc-da-slrs/pom.xml @@ -35,6 +35,12 @@ 3.1.0 compile + + com.adc + adc-da-search + 1.0.0 + compile + 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 f61bd816..62c545e5 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 @@ -191,5 +191,409 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private String standSystemName; + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getStandType() { + return standType; + } + + public void setStandType(String standType) { + this.standType = standType; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getStandSort() { + return standSort; + } + + public void setStandSort(String standSort) { + this.standSort = standSort; + } + + public String getStandNumber() { + return standNumber; + } + + public void setStandNumber(String standNumber) { + this.standNumber = standNumber; + } + + public String getStandYear() { + return standYear; + } + + public void setStandYear(String standYear) { + this.standYear = standYear; + } + + public String getStandName() { + return standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String getStandEnName() { + return standEnName; + } + + public void setStandEnName(String standEnName) { + this.standEnName = standEnName; + } + + public String getStandState() { + return standState; + } + + public void setStandState(String standState) { + this.standState = standState; + } + + public String getStandNature() { + return standNature; + } + + public void setStandNature(String standNature) { + this.standNature = standNature; + } + + public String getIssueTime() { + return issueTime; + } + + public void setIssueTime(String issueTime) { + this.issueTime = issueTime; + } + + public Date getPutTime() { + return putTime; + } + + public void setPutTime(Date putTime) { + this.putTime = putTime; + } + + public String getSynopsis() { + return synopsis; + } + + public void setSynopsis(String synopsis) { + this.synopsis = synopsis; + } + + public String getReplaceStandNum() { + return replaceStandNum; + } + + public void setReplaceStandNum(String replaceStandNum) { + this.replaceStandNum = replaceStandNum; + } + + public String getReplacedStandNum() { + return replacedStandNum; + } + + public void setReplacedStandNum(String replacedStandNum) { + this.replacedStandNum = replacedStandNum; + } + + public String getCreationUser() { + return creationUser; + } + + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + public String getValidFlag() { + return validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public Date getCreationTime() { + return creationTime; + } + + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public String getIsRelateAccess() { + return isRelateAccess; + } + + public void setIsRelateAccess(String isRelateAccess) { + this.isRelateAccess = isRelateAccess; + } + + public String getCiteStand() { + return citeStand; + } + + public void setCiteStand(String citeStand) { + this.citeStand = citeStand; + } + + public String getCitedStand() { + return citedStand; + } + + public void setCitedStand(String citedStand) { + this.citedStand = citedStand; + } + + public String getTextStatus() { + return textStatus; + } + + public void setTextStatus(String textStatus) { + this.textStatus = textStatus; + } + + public String getStandSystem() { + return standSystem; + } + + public void setStandSystem(String standSystem) { + this.standSystem = standSystem; + } + + public String getCollectId() { + return collectId; + } + + public void setCollectId(String collectId) { + this.collectId = collectId; + } + + public String getCountryShow() { + return countryShow; + } + + public void setCountryShow(String countryShow) { + this.countryShow = countryShow; + } + + public String getStandSortShow() { + return standSortShow; + } + + public void setStandSortShow(String standSortShow) { + this.standSortShow = standSortShow; + } + + public String getStandStateShow() { + return standStateShow; + } + + public void setStandStateShow(String standStateShow) { + this.standStateShow = standStateShow; + } + + public String getStandNatureShow() { + return standNatureShow; + } + + public void setStandNatureShow(String standNatureShow) { + this.standNatureShow = standNatureShow; + } + + public String getSychronId() { + return sychronId; + } + + public void setSychronId(String sychronId) { + this.sychronId = sychronId; + } + + public List getDicTypeList() { + return dicTypeList; + } + + public void setDicTypeList(List dicTypeList) { + this.dicTypeList = dicTypeList; + } + + public List getAttrInfoList() { + return attrInfoList; + } + + public void setAttrInfoList(List attrInfoList) { + this.attrInfoList = attrInfoList; + } + + public Map getAttrInfoMap() { + return attrInfoMap; + } + + public void setAttrInfoMap(Map attrInfoMap) { + this.attrInfoMap = attrInfoMap; + } + + public Map getAttrInfoCaseMap() { + return attrInfoCaseMap; + } + + public void setAttrInfoCaseMap(Map attrInfoCaseMap) { + this.attrInfoCaseMap = attrInfoCaseMap; + } + + public String getSarStandAttrEOStr() { + return sarStandAttrEOStr; + } + + public void setSarStandAttrEOStr(String sarStandAttrEOStr) { + this.sarStandAttrEOStr = sarStandAttrEOStr; + } + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public int getUpReplaceNumFlag() { + return upReplaceNumFlag; + } + + public void setUpReplaceNumFlag(int upReplaceNumFlag) { + this.upReplaceNumFlag = upReplaceNumFlag; + } + + public int getUpNumFlag() { + return upNumFlag; + } + + public void setUpNumFlag(int upNumFlag) { + this.upNumFlag = upNumFlag; + } + + public String getFileIds() { + return fileIds; + } + + public void setFileIds(String fileIds) { + this.fileIds = fileIds; + } + + public Date getNewCarPutTime() { + return newCarPutTime; + } + + public void setNewCarPutTime(Date newCarPutTime) { + this.newCarPutTime = newCarPutTime; + } + + public List getItemsList() { + return itemsList; + } + + public void setItemsList(List itemsList) { + this.itemsList = itemsList; + } + + public String getRelateStand() { + return relateStand; + } + + public void setRelateStand(String relateStand) { + this.relateStand = relateStand; + } + + public String getAccessCountry() { + return accessCountry; + } + + public void setAccessCountry(String accessCountry) { + this.accessCountry = accessCountry; + } + + public String getProcessNum() { + return processNum; + } + + public void setProcessNum(String processNum) { + this.processNum = processNum; + } + + public String getMenuType() { + return menuType; + } + + public void setMenuType(String menuType) { + this.menuType = menuType; + } + + public String getAllPutTime() { + return allPutTime; + } + + public void setAllPutTime(String allPutTime) { + this.allPutTime = allPutTime; + } + + public String getJspg() { + return jspg; + } + + public void setJspg(String jspg) { + this.jspg = jspg; + } + + public String getCHJL() { + return CHJL; + } + + public void setCHJL(String CHJL) { + this.CHJL = CHJL; + } + + public String getPutTime2() { + return putTime2; + } + + public void setPutTime2(String putTime2) { + this.putTime2 = putTime2; + } + + public String getStandSystemName() { + return standSystemName; + } + + public void setStandSystemName(String standSystemName) { + this.standSystemName = standSystemName; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 0af77f7f..e567da74 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.adc.da.person.dao.PersonCollectEODao; import com.adc.da.person.dao.PersonShareEODao; import com.adc.da.person.entity.PersonMsgEO; import com.adc.da.person.service.IPersonCollectEOService; +import com.adc.da.search.service.StandLawsSearchService; import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo; import com.adc.da.slrs.sarLawsInfo.page.SarLawsInfoEOPage; import com.adc.da.slrs.sarLawsInfo.page.SarLawsItemsEOPage; @@ -60,6 +61,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.util.PDFTextStripper; +import org.apache.pdfbox.util.PDFTextStripperByArea; +import org.apache.poi.hwpf.extractor.WordExtractor; +import org.apache.poi.openxml4j.opc.OPCPackage; +import org.apache.poi.xwpf.extractor.XWPFWordExtractor; +import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -70,6 +78,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.io.File; +import java.io.FileInputStream; import java.sql.Clob; import java.text.SimpleDateFormat; import java.util.*; @@ -175,6 +184,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl attrInfoMap) { - + Set keys = attrInfoMap.keySet(); + for (String key:keys) { + String value = String.valueOf(attrInfoMap.get(key)); + if (com.adc.da.util.utils.StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key)){ + value = value.replace(" , ",","); + value = value.replace(","," , "); + attrInfoMap.put(key,value); + } + } + // 根据文件attid 读取文件内容 + if (org.apache.commons.lang.StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) { + String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , "); + StringBuilder content = new StringBuilder(""); + for (int i = 0; i < attidlist.length; i++) { + if(org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i]) ){ + AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]); + //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + String readFilePath = "E:\\上汽企标流程总览.pdf"; + try { + // 判断文件是docx还是PDF + if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) { + if(attFileEO.getFileSuffix().equals("doc")){ + FileInputStream fis = new FileInputStream(readFilePath); + WordExtractor wordExtractor = new WordExtractor(fis); + String txt = wordExtractor.getText(); + content.append(txt); + }else { + OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath); + XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage); + String txt = extractor.getText(); + content.append(txt); + } + } else { + PDDocument document = PDDocument.load(new File(readFilePath)); + document.getClass(); + if (!document.isEncrypted()) { + PDFTextStripperByArea stripper = new PDFTextStripperByArea(); + stripper.setSortByPosition(true); + PDFTextStripper tStripper = new PDFTextStripper(); + String pdfFileInText = tStripper.getText(document); + // String[] lines = pdfFileInText.split("\\r?\\n"); + content.append(pdfFileInText); + } + } + } catch (Exception e) { + logger.error("搜索中心新增数据读取文档内容时失败"); + logger.error(e.getMessage(),e); + } + attrInfoMap.put("content",content.toString()); + } + } + } + else{ + attrInfoMap.put("content",""); + } + standLawsSearchService.addStandLawsSearchForMap(attrInfoMap); } @Override public void updateIntoIndexForMap(Map attrInfoMap) { - + Set keys = attrInfoMap.keySet(); + for (String key:keys) { + String value = String.valueOf(attrInfoMap.get(key)); + if (com.adc.da.util.utils.StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key) && !"content".equals(key)){ + value = value.replace(" , ",","); + value = value.replace(","," , "); + attrInfoMap.put(key,value); + } + } + // 根据文件attid 读取文件内容 + if (org.apache.commons.lang.StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) { + String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , "); + StringBuilder content = new StringBuilder(""); + for (int i = 0; i < attidlist.length; i++) { + if(org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i])){ + AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]); + //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + try { + // 判断文件是docx还是PDF + /*if (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc")) { + if(attFileEO.getFileSuffix().equals("doc")){ + FileInputStream fis = new FileInputStream(readFilePath); + WordExtractor wordExtractor = new WordExtractor(fis); + String txt = wordExtractor.getText(); + content.append(txt); + }else { + OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath); + XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage); + String txt = extractor.getText(); + content.append(txt); + } + } else if (attFileEO.getFileSuffix().equals("pdf")){ + PDDocument document = PDDocument.load(new File(readFilePath)); + document.getClass(); + if (!document.isEncrypted()) { + PDFTextStripperByArea stripper = new PDFTextStripperByArea(); + stripper.setSortByPosition(true); + PDFTextStripper tStripper = new PDFTextStripper(); + String pdfFileInText = tStripper.getText(document); + // String[] lines = pdfFileInText.split("\\r?\\n"); + content.append(pdfFileInText); + } + }*/ + String readFilePath = "E:\\上汽企标流程总览.pdf"; + FileInputStream fis = new FileInputStream(readFilePath); + WordExtractor wordExtractor = new WordExtractor(fis); + String txt = wordExtractor.getText(); + content.append(txt); + } catch (Exception e) { + logger.error("搜索中心修改数据读取文档内容时失败"); + logger.error(e.getMessage(),e); + } + attrInfoMap.put("content",content.toString()); + } + } + } + else{ + attrInfoMap.put("content",""); + } + standLawsSearchService.updateStandLawsSearchForMap(attrInfoMap); } // // @Override diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java new file mode 100644 index 00000000..1377523d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java @@ -0,0 +1,27 @@ +package com.adc.da.slrs.search; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu; +import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/${restPath}/search") +public class SearchController { + + @Autowired + private ITsDicTypeService iTsDictypeService; + + @ApiOperation("获取筛选条件") + @PostMapping("/getMenu") + public ResponseMessage> getSearchMenu(){ + return Result.success(iTsDictypeService.getSearchMenu()); + } +} From 0b069efd95e2dbe6b08203c2daf10094fe262e3b Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 28 Jul 2021 16:14:52 +0800 Subject: [PATCH 22/27] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=20=E5=A4=9A=E6=96=87=E6=A1=A3=20=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=20=E5=8F=8A=20=E5=88=A0=E9=99=A4=20=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandAttrInfo/entity/SarStandAttrInfo.java | 12 ------------ .../service/impl/SarStandardsInfoServiceImpl.java | 9 +++++++-- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index 55893831..ab0dacf0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java @@ -158,18 +158,6 @@ public class SarStandAttrInfo extends BaseEntity { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String ssrq; - @ApiModelProperty(value = "实施日期(国际）") - @TableField("SSRQGJ") - private String ssrqgj; - - @ApiModelProperty(value = "新车型实施日期(国家）") - @TableField("XCXSSRQGJ") - private String xcxssrqgj; - - @ApiModelProperty(value = "在产车实施日期(国家）") - @TableField("ZCCSSRQGJ") - private String zccssrqgj; - @ApiModelProperty(value = "修改单") @TableField("XGD") private String xgd; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 29b00573..247f3cc1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -608,8 +608,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl multiTimeMap) throws Exception { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (multiTimeMap != null && multiTimeMap.size() > 0) { From 474fe6fd4591cb12f8e357a3ccc24bf6e6a54f37 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 28 Jul 2021 16:18:17 +0800 Subject: [PATCH 23/27] =?UTF-8?q?feat:=20=20=20=20=20exist=3Dfalse=20?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandAttrInfo/entity/SarStandAttrInfo.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index ab0dacf0..4458e331 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java @@ -158,6 +158,18 @@ public class SarStandAttrInfo extends BaseEntity { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String ssrq; + @ApiModelProperty(value = "实施日期(国际）") + @TableField(exist=false) + private String ssrqgj; + + @ApiModelProperty(value = "新车型实施日期(国家）") + @TableField(exist=false) + private String xcxssrqgj; + + @ApiModelProperty(value = "在产车实施日期(国家）") + @TableField(exist=false) + private String zccssrqgj; + @ApiModelProperty(value = "修改单") @TableField("XGD") private String xgd; From a5d0229b5bd6cc3261ea28f7491247c6312b8e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Wed, 28 Jul 2021 09:17:14 +0000 Subject: [PATCH 24/27] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index e3445661..eab65a1e 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -17,7 +17,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ #============================================== # 邮箱配置1 From de1fe704a85d3078a9b2e437f452824f80107c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Wed, 28 Jul 2021 14:25:50 +0000 Subject: [PATCH 25/27] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index eab65a1e..e3445661 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -17,7 +17,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ #============================================== # 邮箱配置1 From af1c3227f68f55a8919da95c886ed23058efed47 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 29 Jul 2021 10:13:27 +0800 Subject: [PATCH 26/27] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java index 238eca43..d92d3c62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -36,7 +36,7 @@ public class StandAttrInfoDto { //标准实施日期 @ExcelProperty("标准实施日期") private String SSRQ; - //新车型实施日期 + //新车型实施日期 数据库中字段实际没有GJ 如需要修改 可修改此处 @ExcelProperty("新车型实施日期") private String XCXSSRQGJ; //在产车实施日期 From 60dbb8faeb403209424f37969ec56463fb240347 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 29 Jul 2021 14:02:40 +0800 Subject: [PATCH 27/27] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E6=96=B0=20bu?= =?UTF-8?q?g=E4=BF=AE=E5=A4=8D=20=E5=92=8C=20=E8=A7=92=E8=89=B2=E7=AE=A1?= =?UTF-8?q?=E7=90=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarRole/controller/TsRoleController.java | 17 +++++++++++++---- .../mybatis/mapper/sys/DicTypeEOMapper.xml | 5 +++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index 3f33c2cd..eba62f9b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarRole.controller; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.login.util.UserUtils; @@ -9,6 +10,7 @@ import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO; import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.sys.entity.UserEO; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Delete; import org.springframework.beans.factory.annotation.Autowired; @@ -53,10 +55,17 @@ public class TsRoleController extends BaseController { @ApiOperation("新增角色") @PostMapping public ResponseMessage addRole(@Validated(TsRole.insert.class) @RequestBody TsRole tsRole){ - //设置操作人 - UserEO userEO=UserUtils.getUser(); - tsRole.setOperator(userEO.getUname()); - return tsRoleService.addRole(tsRole); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("NAME",tsRole.getName()); + int count = tsRoleService.count(queryWrapper); + if (count>0){ + throw new AdcDaBaseException("角色名称已存在，请更换角色名称。"); + }else { + //设置操作人 + UserEO userEO = UserUtils.getUser(); + tsRole.setOperator(userEO.getUname()); + return tsRoleService.addRole(tsRole); + } } @ApiOperation("编辑角色") diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index 86f5a6f0..cd17691a 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -461,8 +461,9 @@ AND SAR_LAWS_ITEM_VAL.VALID_FLAG =0 union select count(*) from SAR_BUSSIONESS_STAND - where (SAR_BUSSIONESS_STAND.STAND_GENERA = #{dicTypeCode} or - SAR_BUSSIONESS_STAND.STAND_SUBCLASS = #{dicTypeCode} or + where ( + + SAR_BUSSIONESS_STAND.STAND_STATUS = #{dicTypeCode} or SAR_BUSSIONESS_STAND.STAND_SORT = #{dicTypeCode}) and SAR_BUSSIONESS_STAND.VALID_FLAG =0