From 75445cd9e195f371b761c66077e3024b57f0d1b4 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 27 Jul 2021 14:30:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/StandRegionalTimeDto.java | 19 ++++++++++++++++--- .../SarLawsAttrDetailedListServiceImpl.java | 9 ++++----- .../entity/SarStandAttrInfo.java | 8 ++++++++ 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java index 9bdae697..496c8f4d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java @@ -1,7 +1,11 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * //TODO 添加类、接口描述 @@ -13,10 +17,19 @@ import lombok.Data; public class StandRegionalTimeDto { @ApiModelProperty(value = "国家") private String country; + @ApiModelProperty(value = "实施日期") - private String putTime; + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date putTime; + @ApiModelProperty(value = "在产车实施日期") - private String zccssrq; + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date zccssrq; + @ApiModelProperty(value = "新车型实施日期") - private String xcxssrq; + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date xcxssrq; } 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 0a8ac441..70c5fd21 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 @@ -16,6 +16,7 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -268,13 +269,11 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> mapList, List putTime, List xcx, List zcc, StandRegionalTimeDto s) { - putTime.add(s.getPutTime()) ; - xcx.add(s.getXcxssrq()); - zcc.add(s.getZccssrq()); + putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime())); + xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq())); + zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(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/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index 8985ecd5..55893831 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 @@ -5,11 +5,13 @@ import java.time.LocalDateTime; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; /** *

@@ -60,10 +62,14 @@ public class SarStandAttrInfo extends BaseEntity { @ApiModelProperty(value = "新车型实施日期（文本）") @TableField("XCXSSRQ") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String xcxssrq; @ApiModelProperty(value = "在产车实施日期（文本）") @TableField("ZCCSSRQ") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String zccssrq; @ApiModelProperty(value = "标签") @@ -148,6 +154,8 @@ public class SarStandAttrInfo extends BaseEntity { @ApiModelProperty(value = "实施日期(标准文本）") @TableField("SSRQ") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String ssrq; @ApiModelProperty(value = "实施日期(国际）") From 32afc5475f94713dda50c85c4caaeee91f42c328 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 27 Jul 2021 16:18:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A0=87=E5=87=86=E5=90=8E=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E6=AD=A4=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=AD=A4=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 This reverts commit 9cd93436 --- .../com/adc/da/slrs/sarResource/dao/TsResourceDao.java | 3 --- .../com/adc/da/att/controller/AttFileEOController.java | 8 ++------ 2 files changed, 2 insertions(+), 9 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 de959ae0..335a7986 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,7 +3,6 @@ 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; /** @@ -20,6 +19,4 @@ public interface TsResourceDao extends BaseMapper { List selectMenuByRole(TsResource sarMenuEO); - int insertTsRoleResource(HashMap map); - } 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 c5cc4baa..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 @@ -273,19 +273,15 @@ public class AttFileEOController { String waterFilePath = newFilePath + attFileEO.getOldFileName(); // 添加水印 String userMsg = ""; - String date=""; TsUser tsUser = userDao.selectById(userId); if (tsUser != null) { userMsg = tsUser.getUname() + ","; if (StringUtils.isNotEmpty(tsUser.getWorkNum())) { userMsg += tsUser.getWorkNum() + ","; } - }else { - //没有用户信息时 - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 - date = df.format(new Date()); } - + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 + String date = df.format(new Date()); String waterContent = userMsg + date; //2020年9月5日 去掉水印处理 //2021年7月25日要求下载生成水印 From 9f82519e1c325b6dc082b2d3be3823a9e71aa006 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 27 Jul 2021 18:01:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java | 3 +++ .../java/com/adc/da/att/controller/AttFileEOController.java | 6 +++--- 2 files changed, 6 insertions(+), 3 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-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 cc34cb29..f49b116c 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 @@ -280,9 +280,9 @@ public class AttFileEOController { userMsg += tsUser.getWorkNum() + ","; } } - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 - String date = df.format(new Date()); - String waterContent = userMsg + date; +// SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 +// String date = df.format(new Date()); + String waterContent = userMsg ; //2020年9月5日 去掉水印处理 //2021年7月25日要求下载生成水印 WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent); From f0fd398fee929f370424eb516e0ee1deecce8819 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 27 Jul 2021 18:25:36 +0800 Subject: [PATCH 4/4] feat: 1 --- .../controller/SarStandardsInfoController.java | 4 +++- .../service/impl/SarStandardsInfoServiceImpl.java | 1 - 2 files changed, 3 insertions(+), 2 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..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)); } 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 df3ee156..29b00573 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 @@ -202,7 +202,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl