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/22] =?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/22] =?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/22] =?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/22] =?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 ad2b29f072c630f1c20b10a2f3c99d2a420855f5 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Mon, 26 Jul 2021 17:57:44 +0800 Subject: [PATCH 05/22] =?UTF-8?q?update=EF=BC=9A=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarLawsAttrDetailedListController.java | 5 +- .../entity/LawsDto.java | 2 + .../ISarLawsAttrDetailedListService.java | 2 +- .../SarLawsAttrDetailedListServiceImpl.java | 65 ++++++++++++++----- .../SarLawsDetailedListController.java | 1 - .../impl/SarLawsDetailedListServiceImpl.java | 19 ++++-- .../SarLawsAttrDetailedListMapper.xml | 11 +++- 7 files changed, 73 insertions(+), 32 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 75296465..c14be448 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -52,9 +52,6 @@ public class SarLawsAttrDetailedListController extends BaseController> map = iSarLawsAttrDetailedList.selectTimes(id); + Map> map = iSarLawsAttrDetailedList.selectTimes(id); return Result.success("200",map); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 381b50cb..391554f7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -45,6 +45,8 @@ public class LawsDto { private String standYear; @ExcelProperty(value = "标准类别", index = 6) private String standSortShow; + @ExcelProperty(value = "标准类别", index = 6) + private String issueTime; @ColumnWidth(16) @ExcelProperty(value = "标准实施日期", index = 7) @ApiModelProperty(value = "标准实施日期") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java index fa891d9a..0474c233 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java @@ -23,5 +23,5 @@ public interface ISarLawsAttrDetailedListService extends IService timeDtos); void exportExcel(HttpServletResponse response, StandExcelVo standExcelVo); int setTimes(SarLawsAttrDetailedList sarLawsAttrDetailedList); - Map> selectTimes(String id); + Map> selectTimes(String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index f6589b4e..0a8ac441 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service.impl; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; +import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; @@ -15,10 +16,7 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -225,25 +223,58 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> selectTimes(String id) { + public Map> selectTimes(String id) { List standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id); - Map> mapList = new HashMap>(); - for (StandRegionalTimeDto s:standRegionalTimeDto){ - List list; - if (mapList.containsKey(s.getCountry())){ - list = mapList.get(s.getCountry()); + Map map = iDicTypeEOService.getDicTypeListCode(); + List> arr = (List>) map.get("COUNTRY"); + for (StandRegionalTimeDto list1 : standRegionalTimeDto) { + if (StringUtils.isNotBlank(list1.getCountry()) && list1.getCountry().contains(",")) { + String[] split = list1.getCountry().split(","); + StringBuilder builder = new StringBuilder(); + for (String s : split) { + for (Map map1 : arr) { + if (map1.get("value").equals(s)) { + s = map1.get("label"); + builder.append(s + ","); + break; + } + } + } + String completedString = builder.delete(builder.length() - 1, builder.length()).toString(); + list1.setCountry(completedString); }else { - list = new ArrayList<>(); + for (Map map1:arr) { + if (map1.get("value").equals(list1.getCountry())){ + list1.setCountry(map1.get("label")); + break; + } + } } - StandTimeDto standTimeDto = new StandTimeDto(); - standTimeDto.setPutTime(s.getPutTime()); - standTimeDto.setXcxssrq(s.getXcxssrq()); - standTimeDto.setZccssrq(s.getZccssrq()); - list.add(standTimeDto); - mapList.put(s.getCountry(),list); + } + LinkedHashMap> mapList = new LinkedHashMap>(); + List putTime = new ArrayList<>(); + List xcx = new ArrayList<>(); + List zcc= new ArrayList<>(); + for (StandRegionalTimeDto s:standRegionalTimeDto){ + if (mapList.containsKey("实施日期("+s.getCountry()+")")||mapList.containsKey("新车型实施日期("+s.getCountry()+")")||mapList.containsKey("在产车实施日期("+s.getCountry()+")")){ + putTime = mapList.get("实施日期("+s.getCountry()+")"); + xcx = mapList.get("新车型实施日期("+s.getCountry()+")"); + zcc = mapList.get("在产车实施日期("+s.getCountry()+")"); + + } + dateTime(mapList, putTime, xcx, zcc, s); } return mapList; } + private void dateTime(LinkedHashMap> mapList, List putTime, List xcx, List zcc, StandRegionalTimeDto s) { + putTime.add(s.getPutTime()) ; + xcx.add(s.getXcxssrq()); + zcc.add(s.getZccssrq()); + mapList.put("实施日期("+s.getCountry()+")",putTime); + mapList.put("新车型实施日期("+s.getCountry()+")",xcx); + mapList.put("在产车实施日期("+s.getCountry()+")",zcc); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index 0cc027c2..ce42e9cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -149,7 +149,6 @@ public class SarLawsDetailedListController extends BaseController timeDto = new ArrayList<>(); - if (detailedUpDto.getInforlist().indexOf(",") >= 0) { + if ("1".equals(detailedUpDto.getSortKey()) && detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); String[] putTime = detailedUpDto.getInforlist1().split(","); String[] zcc = detailedUpDto.getInforlist2().split(","); @@ -302,13 +305,17 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN, - b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow ,a.STAND_YEAR as standYear + b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow ,a.STAND_YEAR as standYear,ISSUE_TIME as issueTime FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null) (a.STAND_NUMBER LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') - or a.STAND_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%')) + or a.STAND_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') + or a.STAND_YEAR LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') + or dicstandSort.DIC_TYPE_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') + ) and @@ -94,9 +97,11 @@ WHERE b.sort_key = 1 AND a.stand_id = #{standId} + AND (a.putTime is not NULL + AND a.xcxssrq is not NULL + AND a.zccssrq is not NULL) - INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,putTime,xcxssrq,zccssrq) VALUES 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 06/22] =?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 07/22] =?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} ) + +