diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java index 0256bda8..8c87f395 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java @@ -8,6 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; import com.jero.common.api.vo.ResultCommon; import com.jero.modules.laws.common.util.DateUtil; @@ -18,6 +19,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; +import org.apache.shiro.SecurityUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -59,6 +61,8 @@ public class LawsHomeNormalSearchHistoryController extends JeroController page = new Page<>(pageNo, pageSize); // 三月前 String lastDate = DateUtil.getLastDate(new Date(), -3); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + queryWrapper.eq("create_by",sysUser.getUsername()); queryWrapper.ge("create_time",lastDate + " 00:00:00"); queryWrapper.orderByDesc("id"); IPage pageList = lawsHomeNormalSearchHistoryService.page(page,queryWrapper); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java index d3ca8a3a..4b1ce9f4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java @@ -1,18 +1,13 @@ package com.jero.modules.laws.home.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.constant.CommonConstant; -import com.jero.common.exception.JeroBootException; -import com.jero.common.util.MinioUtil; import com.jero.modules.laws.common.util.IntekeyUtils; import com.jero.modules.laws.home.dto.LawsHomeNormalSearchDTO; import com.jero.modules.laws.home.service.ILawsHomeSearchService; import com.jero.modules.laws.home.vo.LawsHomeNormalSearchStatisticsVO; import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; -import com.jero.modules.oss.entity.OSSFile; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -20,9 +15,9 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.InputStream; +import java.io.OutputStream; /** * @author lqt diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchHistory.java b/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchHistory.java index d68b7315..4787a05d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchHistory.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchHistory.java @@ -46,7 +46,7 @@ public class LawsHomeNormalSearchHistory implements Serializable { private String createBy; /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd EEEE") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy年MM月dd日 EEEE") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private Date createTime; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java index 0627c1d1..282d5c5c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -151,9 +151,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { p.setReleaseDate(obj.getReleaseDate()); // 生成正文 StringBuilder content = new StringBuilder(); - // 标准类别 - content.append("标准性质：").append(sysBaseAPI.translateDict("standard_property",obj.getStandardProperty())).append(""); - content.append("标准类别：").append(sysBaseAPI.translateDict("standard_type",obj.getStandardClass())).append(""); + content.append("标准性质：").append(sysBaseAPI.translateDict("standard_property",obj.getStandardProperty())).append(" "); + content.append("标准类别：").append(sysBaseAPI.translateDict("standard_type",obj.getStandardClass())).append(" "); content.append("年代号：").append(obj.getYearNumber()).append(" "); content.append("标准编号：").append(obj.getStandardNumber()).append(" "); content.append("标准名称：").append(obj.getStandardName()).append(" "); @@ -192,8 +191,30 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { LawsOverseasStandard obj = op.get(); p.setTitle(obj.getStandardNumber().replace(searchContent,searchContentSpan) + " " + obj.getStandardName().replace(searchContent,searchContentSpan)); p.setReleaseDate(obj.getReleaseDate()); - // todo 生成正文 - + // 生成正文 + StringBuilder content = new StringBuilder(); + content.append("国家/地区：").append(sysBaseAPI.translateDict("country_or_region",obj.getCountryOrRegion())).append(" "); + content.append("标准类别：").append(sysBaseAPI.translateDict("standard_type_overseas",obj.getStandardClass())).append(" "); + content.append("年代号：").append(obj.getYearNumber()).append(" "); + content.append("标准编号：").append(obj.getStandardNumber()).append(" "); + content.append("标准名称：").append(obj.getStandardName()).append(" "); + content.append("标准英文名称：").append(obj.getStandardEnglishName()).append(" "); + content.append("标准体系：").append(sysBaseAPI.translateDict("standard_system",obj.getStandardSystem())).append(" "); + content.append("发布日期：").append(obj.getReleaseDate()).append(" "); + content.append("实施日期：").append(obj.getImplementationDate()).append(" "); + content.append("在产车实施日期：").append(obj.getOnTheProductionDate()).append(" "); + content.append("新车型实施日期：").append(obj.getNewModelImplementationDate()).append(" "); + content.append("废止日期：").append(obj.getAnnulmentDate()).append(" "); + content.append("标准状态：").append(sysBaseAPI.translateDict("standard_system",obj.getStandardState())).append(" "); + content.append("责任部门：").append(mapSysDepart.get(obj.getResponsibleDepartment())).append(" "); + content.append("责任部门负责人：").append(mapSysUser.get(obj.getResponsibleDepartmentUser())).append(" "); + content.append("零部件名称：").append(obj.getPartName()).append(" "); + content.append("适用车型：").append(sysBaseAPI.translateDict("APPLICATIONS_OVERSEAS",obj.getApplicableVehicle())).append(" "); + content.append("代替标准号：").append(obj.getSubstituteStandardNumber()).append(" "); + content.append("被代替标准号：").append(obj.getReplacedByStandardNumber()).append(" "); + content.append("引用标准：").append(obj.getReferenceStandard()).append(" "); + content.append("被引用标准：").append(obj.getReferencedStandard()).append(" "); + p.setContent(content.toString()); } } break; @@ -204,7 +225,40 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { LawsEnterpriseStandard obj = op.get(); p.setTitle(obj.getStandardNumber().replace(searchContent,searchContentSpan) + " " + obj.getStandardName().replace(searchContent,searchContentSpan)); p.setReleaseDate(obj.getReleaseDate()); - // todo 生成正文 + // 生成正文 + StringBuilder content = new StringBuilder(); + content.append("企标编号：").append(obj.getStandardNumber()).append(" "); + content.append("企标名称：").append(obj.getStandardName()).append(" "); + content.append("企业标准代号：").append(obj.getStandardCode()).append(" "); + content.append("企业名称代号：").append(obj.getNameCode()).append(" "); + content.append("标准类别代号：").append(obj.getCategoryCode()).append(" "); + content.append("标准英文名称：").append(obj.getStandardEnglishName()).append(" "); + content.append("年代号：").append(obj.getYearNumber()).append(" "); + content.append("标准体系：").append(sysBaseAPI.translateDict("standard_system",obj.getStandardSystem())).append(" "); + content.append("标准英文名称：").append(obj.getStandardEnglishName()).append(" "); + content.append("标准等级分类：").append(obj.getGradeClassification()).append(" "); + content.append("授权部门：").append(mapSysDepart.get(obj.getAuthDept())).append(" "); + content.append("发布日期：").append(obj.getReleaseDate()).append(" "); + content.append("实施日期：").append(obj.getImplementationDate()).append(" "); + content.append("编制说明：").append(obj.getCompIllustration()).append(" "); + content.append("是否试行：").append(sysBaseAPI.translateDict("is_trial",obj.getTryFlag())).append(" "); + content.append("试行周期：").append(obj.getTrialPeriod()).append(" "); + content.append("标准状态：").append(sysBaseAPI.translateDict("standard_state",obj.getStandardState())).append(" "); + content.append("主起草人：").append(mapSysUser.get(obj.getMainDraftingUser())).append(" "); + content.append("主起草单位：").append(obj.getMainDraftingUnit()).append(" "); + content.append("主起草部门负责人：").append(obj.getMainDraftingUnitResponsiblePerson()).append(" "); + content.append("配合单位：").append(mapSysDepart.get(obj.getCooperationUnit())).append(" "); + content.append("标准推进人：").append(mapSysUser.get(obj.getStandardPromoter())).append(" "); + content.append("零部件名称：").append(obj.getPartName()).append(" "); + content.append("标准适用范围：").append(obj.getStandardScope()).append(" "); + content.append("代替标准号：").append(obj.getSubstituteStandardNumber()).append(" "); + content.append("被代替标准号：").append(obj.getReplacedByStandardNumber()).append(" "); + content.append("引用标准：").append(obj.getReferenceStandard()).append(" "); + content.append("被引用标准：").append(obj.getReferencedStandard()).append(" "); + content.append("关联文件：").append(obj.getAssociatedFile()).append(" "); + content.append("采标程度：").append(sysBaseAPI.translateDict("degree_bid_acquisition",obj.getAcquisitionDegree())).append(" "); + content.append("采用国际标准号：").append(obj.getInternationalStandardNum()); + p.setContent(content.toString()); } } break; @@ -215,7 +269,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { LawsNewsFeed obj = op.get(); p.setTitle(obj.getDynamicHeading().replace(searchContent,searchContentSpan)); p.setReleaseDate(obj.getReleaseTime()); - // todo 生成正文 + // 生成正文 + p.setContent(obj.getDynamicDetails()); } } break; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsOverseasStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsOverseasStandard.java index cfdee214..086f2215 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsOverseasStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsOverseasStandard.java @@ -121,6 +121,10 @@ public class LawsOverseasStandard implements Serializable { @Excel(name = "责任部门", width = 15) @ApiModelProperty(value = "责任部门") private java.lang.String responsibleDepartment; + /**责任部门负责人*/ + @Excel(name = "责任部门负责人", width = 15) + @ApiModelProperty(value = "责任部门负责人") + private java.lang.String responsibleDepartmentUser; /**零部件名称*/ @Excel(name = "零部件名称", width = 15) @ApiModelProperty(value = "零部件名称")