From aeb34d7c9db7870527d50e6ac6f6d91cf2c1d4f7 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 18 May 2023 15:37:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/FeignClient/workFlowFeignClient.java | 5 +- .../workFlowFeignClientImpl.java | 9 +- .../controller/WorkFlowController.java | 111 +++++++- .../controller/OnlineFileLogController.java | 16 ++ .../OnlineFileLog/dao/OnlineFileLogDao.java | 7 + .../OnlineFileLog/entity/OnlineFileLog.java | 74 +++++ .../service/OnlineFileLogService.java | 7 + .../impl/OnlineFileLogServiceImpl.java | 12 + .../impl/SarBussionessStandServiceImpl.java | 41 +++ .../controller/EarlyWarningEOController.java | 268 +++++++++--------- ...ndardComplianceAssessResultController.java | 10 - .../impl/SarStandardsInfoServiceImpl.java | 41 +++ ...arInterpretationNationalStandardMapper.xml | 4 +- .../src/main/resources/mysql/foton.sql | 17 ++ 14 files changed, 464 insertions(+), 158 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/dao/OnlineFileLogDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/entity/OnlineFileLog.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/OnlineFileLogService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/impl/OnlineFileLogServiceImpl.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 73d35ca2..156970c4 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -4,6 +4,7 @@ import com.adc.da.common.*; import com.adc.da.common.Category; import com.adc.da.common.Page; import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; import com.adc.da.workFlow.entity.BusProcessModelHis; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; import java.util.Set; @@ -487,7 +486,7 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectAskId",method = RequestMethod.GET) String selectAskId(@RequestParam("taskId") String taskId); @RequestMapping(value = "/bat-wkflow/busProcessModel/selectOnlineFile",method = RequestMethod.POST) - List selectOnlineFile(@RequestParam("taskId") String taskId); + OnlineFileLog selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId); @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectWenDan",method = RequestMethod.GET) Map selectWenDan(@RequestParam("taskId")String taskId); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 1472afb6..2814d8a7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.common.*; import com.adc.da.common.Page; +import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; @@ -15,12 +16,8 @@ import com.adc.da.workFlow.entity.ProcessRollBackEO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -436,8 +433,8 @@ public class workFlowFeignClientImpl { return workFlowFeignClient.selectAskId(taskId); } - public List selectOnlineFile(@RequestParam("taskId") String taskId) { - return workFlowFeignClient.selectOnlineFile(taskId); + public OnlineFileLog selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId) { + return workFlowFeignClient.selectOnlineFile(onlineFileId); } public Map selectWenDan(@RequestParam("taskId") String taskId) { diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index eadaa447..9198b1bc 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -6,9 +6,10 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.hutool.core.lang.UUID; import com.adc.da.FeignClientImpl.workFlowFeignClientImpl; import com.adc.da.Timer.ProcessTimer; +import com.adc.da.att.dao.AttFileEODao; import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.impl.AttFileEOServiceImpl; -import com.adc.da.base.page.Pager; +import com.adc.da.att.vo.AttFileVo; import com.adc.da.base.web.BaseController; import com.adc.da.common.*; import com.adc.da.exception.AdcDaBaseException; @@ -17,6 +18,8 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.common.Page; import com.adc.da.login.util.JwtUtils; +import com.adc.da.slrs.OnlineFileLog.dao.OnlineFileLogDao; +import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog; import com.adc.da.slrs.StandardQA.service.Impl.SarAgenldAcceptButtonServiceImpl; import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; @@ -122,6 +125,15 @@ public class WorkFlowController extends BaseController { @Autowired private ISarBussionessStandStateService bussionessStandStateService; + @Autowired + private OnlineFileLogDao onlineFileLogDao; + + @Autowired + private AttFileEODao attFileEODao; + + @Value("${elasticsearch.img}") + private String pathHttp; + // @Autowired // private ExportExcelMapper exportExcelMapper; @@ -1029,8 +1041,101 @@ public class WorkFlowController extends BaseController { @ApiOperation(value = "查找在线编辑文件") @GetMapping("/selectOnlineFile") - public List selectOnlineFile(@RequestParam("taskId") String taskId) { - return workFlowFeignClient.selectOnlineFile(taskId); + public ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId) { + String path = standEditFilePath+"/hisFile/"; + File file = null; + FileOutputStream fileOutputStream = null; + BufferedOutputStream bufferedOutputStream = null; + //下载位置 + OnlineFileLog onlineFileLog = workFlowFeignClient.selectOnlineFile(onlineFileId); + long time = new Date().getTime(); + if(onlineFileLog == null){ + return Result.error(); + } + try { + file = new File(path+onlineFileLog.getOLdFileName()); + boolean directory = file.isDirectory(); + //目录是否存在 + if(!directory){ + file.mkdirs(); + } + //file = new File(path+"/",onlineFileLog.getOLdFileName()+time+"."+onlineFileLog.getFileSuffix()); + file = new File(path+"/"+onlineFileLog.getOLdFileName(),time+"."+onlineFileLog.getFileSuffix()); + fileOutputStream = new FileOutputStream(file); + bufferedOutputStream = new BufferedOutputStream(fileOutputStream); + fileOutputStream.write(onlineFileLog.getBytes()); + fileOutputStream.close(); + //把文件下载到本地 然后获得文件的名称 通过文件名称 调用 filesave接口 获取id 进行日志存入 + } catch (Exception e) { + e.printStackTrace(); + }finally { + try { + if(bufferedOutputStream!=null){ + bufferedOutputStream.close(); + } + if(fileOutputStream!=null){ + fileOutputStream.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + //把文件放置到本地 + AttFileVo attFileVo = attFileEOService.saveFileInfo(file); + //储存文件 一个文件夹 储存十个 + if(attFileVo!=null) { + // 更新文件名称 用于显示 + AttFileEO attFileEO = new AttFileEO(); + attFileEO.setId(attFileVo.getId()); + attFileEO.setOldFileName(onlineFileLog.getOLdFileName()+"."+onlineFileLog.getFileSuffix()); + attFileEODao.updateFileInfoById(attFileEO); + onlineFileLog.setAttFileId(attFileVo.getId()); + onlineFileLog.setUpdateTime(new Date()); + onlineFileLog.setCreateTime(new Date()); + onlineFileLog.setFileName(String.valueOf(time)); + onlineFileLog.setValidFlag("0"); + onlineFileLogDao.insert(onlineFileLog); + //存储完成以后 去查询是否是最近的是个文件 如果是 则 如果不是则 + File deleteFile = new File(path + onlineFileLog.getOLdFileName()); + File[] files = deleteFile.listFiles(); + // 如果大于十个 删除最早的版本 + int count = 0; + for (File fileData: files){ + if(fileData.isFile()){ + count = count+1; + } + } + if(count>10){ + QueryWrapper onlineFileLogQueryWrapperHis = new QueryWrapper<>(); + onlineFileLogQueryWrapperHis.eq("HIS_ID",onlineFileId); + onlineFileLogQueryWrapperHis.eq("VALID_FLAG","0"); + onlineFileLogQueryWrapperHis.orderByAsc("CREATE_TIME"); + List onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogQueryWrapperHis); + //建立删除 + File deleteFileInfo = new File(path + onlineFileLog.getOLdFileName()+"/",onlineFileLogs.get(0).getFileName()+"."+onlineFileLogs.get(0).getFileSuffix()); + if(deleteFileInfo.delete()){ + QueryWrapper onlineFileLogQueryWrapper = new QueryWrapper<>(); + onlineFileLogQueryWrapper.eq("FILE_NAME",onlineFileLogs.get(0).getFileName()); + OnlineFileLog onlineFileLogIsNot = onlineFileLogDao.selectOne(onlineFileLogQueryWrapper); + if(onlineFileLogIsNot!=null){ + //删除此处有关的数据 + AttFileEO fileInfo = attFileEOService.getFileInfo(onlineFileLogIsNot.getAttFileId()); + if(fileInfo!=null){ + File fileAtt = new File(standEditFilePath+fileInfo.getFilePath()+fileInfo.getFileName()); + if(fileAtt.delete()){ + attFileEOService.deleteById(onlineFileLogIsNot.getAttFileId()); + onlineFileLogDao.deleteById(onlineFileLogs.get(0).getId()); + } + } + } + logger.info("删除成功"+onlineFileLogs.get(0).getId()); + }else { + logger.info("删除失败"+onlineFileLogs.get(0).getId()); + } + } + + } + return Result.success(attFileVo.getId()); } @ApiOperation(value = "查询问题和回答") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java new file mode 100644 index 00000000..2ab92a0d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/controller/OnlineFileLogController.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.OnlineFileLog.controller; + +import com.adc.da.slrs.OnlineFileLog.service.OnlineFileLogService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/${restPath}/lawss/OnlineFileLog") +@Api(description = "|OnlineFileLog|") +public class OnlineFileLogController { + + @Autowired + private OnlineFileLogService onlineFileLogService; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/dao/OnlineFileLogDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/dao/OnlineFileLogDao.java new file mode 100644 index 00000000..82a07b57 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/dao/OnlineFileLogDao.java @@ -0,0 +1,7 @@ +package com.adc.da.slrs.OnlineFileLog.dao; + +import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +public interface OnlineFileLogDao extends BaseMapper { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/entity/OnlineFileLog.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/entity/OnlineFileLog.java new file mode 100644 index 00000000..ee0ee521 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/entity/OnlineFileLog.java @@ -0,0 +1,74 @@ +package com.adc.da.slrs.OnlineFileLog.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +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 java.util.Date; + +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("online_file_log") +@ApiModel(value="OnlineFileLog对象", description="") +@Data +public class OnlineFileLog extends BaseEntity { + + @ApiModelProperty(value = "主键") + @TableId(value = "ID", type = IdType.UUID) + private String id; + + @TableField("HIS_ID") + @ApiModelProperty(value = "在线编辑工作流的id") + private String hisId; + + @TableField("ATT_FILE_ID") + @ApiModelProperty(value = "新文件存储的id") + private String attFileId; + + @TableField("FILE_NAME") + @ApiModelProperty(value = "新名称") + private String fileName; + + @TableField("OLD_FILE_NAME") + @ApiModelProperty(value = "老名称") + private String oLdFileName; + + @TableField("FILE_SUFFIX") + @ApiModelProperty(value = "后缀") + private String fileSuffix; + + @TableField("FILE_PATH") + @ApiModelProperty(value = "路径") + private String filePath; + + @TableField("COUNT") + @ApiModelProperty(value = "计数") + private Integer count; + + @TableField("CREATE_TIME") + @ApiModelProperty(value = "创建时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @TableField("UPDATE_TIME") + @ApiModelProperty(value = "修改时间") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private String validFlag; + + //跨服io流转换 + @TableField(exist = false) + private byte[] bytes; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/OnlineFileLogService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/OnlineFileLogService.java new file mode 100644 index 00000000..44787a12 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/OnlineFileLogService.java @@ -0,0 +1,7 @@ +package com.adc.da.slrs.OnlineFileLog.service; + +import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface OnlineFileLogService extends IService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/impl/OnlineFileLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/impl/OnlineFileLogServiceImpl.java new file mode 100644 index 00000000..3e4f66e7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/OnlineFileLog/service/impl/OnlineFileLogServiceImpl.java @@ -0,0 +1,12 @@ +package com.adc.da.slrs.OnlineFileLog.service.impl; + +import com.adc.da.slrs.OnlineFileLog.dao.OnlineFileLogDao; +import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog; +import com.adc.da.slrs.OnlineFileLog.service.OnlineFileLogService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class OnlineFileLogServiceImpl extends ServiceImpl implements OnlineFileLogService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index c9c2c199..7d1f37b5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -20,6 +20,8 @@ import com.adc.da.search.entity.StandLawsEO; import com.adc.da.search.service.StandLawsSearchService; import com.adc.da.slrs.NewsFeed.entity.NewsFeed; import com.adc.da.slrs.NewsFeed.service.INewsFeedService; +import com.adc.da.slrs.OnlineFileLog.dao.OnlineFileLogDao; +import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog; import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao; import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanLogDao; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; @@ -282,6 +284,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 0 && InitStandAttrUtil.fileFieldListBuss.contains(name)) { value = entry.getValue().toString(); if (StringUtils.isNotBlank(value)) { + String onFileId = ""; + String fileId = ""; + String[] split = value.split(","); + for (String id : split) { + if (id.contains("ATT_FILE")) { + if (org.apache.commons.lang3.StringUtils.isNotBlank(fileId)) { + fileId = fileId + "," + id; + } else { + fileId = id; + } + } else { + if (org.apache.commons.lang3.StringUtils.isNotBlank(onFileId)) { + onFileId = onFileId + "," + id; + } else { + onFileId = id; + } + } + } + String officeFileIds = ""; + if(org.apache.commons.lang3.StringUtils.isNotBlank(onFileId)){ + String[] splitOn = onFileId.split(","); + for (String idOn: splitOn){ + QueryWrapper onlineFileLogQueryWrapper = new QueryWrapper<>(); + onlineFileLogQueryWrapper.eq("HIS_ID",idOn); + onlineFileLogQueryWrapper.orderByDesc("CREATE_TIME"); + List onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogQueryWrapper); + if(!onlineFileLogs.isEmpty()){ + if(org.apache.commons.lang3.StringUtils.isNotBlank(officeFileIds)){ + officeFileIds = officeFileIds+","+onlineFileLogs.get(0).getAttFileId(); + }else { + officeFileIds = onlineFileLogs.get(0).getAttFileId(); + } + } + } + } + value = fileId+","+officeFileIds; List fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value); entry.setValue(fileObj); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index 410ef91f..687c925f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -6,10 +6,8 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarStandIssueControlProduct.entity.SarStandIssueControlProduct; import com.adc.da.slrs.sarStandIssueControlProduct.entity.StandIssueControlProductExcelVO; -import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; -import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.adc.da.slrs.sarStandWarning.service.Impl.EarlyWarningEOServiceImpl; import com.alibaba.excel.EasyExcel; @@ -31,144 +29,144 @@ import java.util.*; @RestController @RequestMapping("/${restPath}/sys/EarlyWarning") @Api(tags = "sarStandWarning") -public class EarlyWarningEOController extends BaseController { +public class EarlyWarningEOController { @Resource private EarlyWarningEOServiceImpl earlyWarningEOService; -/** -* - * @param newStandPage - * @param newStandPageSize - * @param oldStandPage - * @param oldStandPageSize - * @param newItemsPage - * @param newItemsPageSize - * @param oldItemsPage - * @param oldItemsPageSize -* @return -* @author zj -* date 2021-06-15 -**/ - @GetMapping("/${restPath}/StandWarning") - @ApiOperation("标准预警查询") - public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize, - @RequestParam(defaultValue = "1", value = "oldStandPage")int oldStandPage, @RequestParam(defaultValue = "10", value = "oldStandPageSize") int oldStandPageSize, - @RequestParam(defaultValue = "1", value = "newItemsPage")int newItemsPage, @RequestParam(defaultValue = "10", value = "newItemsPageSize") int newItemsPageSize, - @RequestParam(defaultValue = "1", value = "oldItemsPage")int oldItemsPage, @RequestParam(defaultValue = "10", value = "oldItemsPageSize") int oldItemsPageSize,EarlyWarningEO earlyWarningEO) { - IPage list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,earlyWarningEO);//新车标准预警 - IPage list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,earlyWarningEO);//在产车标准预警 - IPage list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,earlyWarningEO);//新车条款预警 - IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警 - return getResponseMessage(list1, list2, list3, list4); - } - - @GetMapping("/getStandWarning") - @ApiOperation("标准预警查询") - public ResponseMessage> getStandWaring(StandWarningEO queryPageEO){ - IPage standWarning = earlyWarningEOService.getStandWarning(queryPageEO); - standWarning.getRecords().forEach(item->{ - - Optional.ofNullable(item.getSSRQ()) - .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); - Optional.ofNullable(item.getXCXSSRQ()) - .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); - Optional.ofNullable(item.getZCCSSRQ()) - .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); - - }); - return Result.success(standWarning); - } - - - - private ResponseMessage getResponseMessage(IPage list1, IPage list2, IPage list3, IPage list4) { - List> listMap = new ArrayList>(); - Map map = new HashMap(); - map.put("newStand", list1); - map.put("oldStand", list2); - map.put("newItems", list3); - map.put("oldItems", list4); - listMap .add(map); - return Result.success("200",listMap); - } - /** - * - * @param id - * @return - * @author zj - * date 2021-06-15 - **/ - @GetMapping("/ChangePermissions") - @ApiOperation("取消预警") - public ResponseMessage ChangePermissions(String id) { - String power = earlyWarningEOService.ChangePermissions(id); - return Result.success("200",power); - } - /** - * - * @param newPolicyPage - * @param newPolicyPageSize - * @param oldPolicyPage - * @param oldPolicyPageSize - * @return - * @author zj - * date 2021-06-15 - **/ - @GetMapping("/PolicyWarning") - @ApiOperation("政策预警查询") - public ResponseMessage newPolicyPageInfo(@RequestParam(defaultValue = "1", value = "newPolicyPage")int newPolicyPage, @RequestParam(defaultValue = "10", value = "newPolicyPageSize") int newPolicyPageSize, - @RequestParam(defaultValue = "1", value = "oldPolicyPage")int oldPolicyPage, @RequestParam(defaultValue = "10", value = "oldPolicyPageSize") int oldPolicyPageSize) { - IPage list1 = earlyWarningEOService.newPolicyQuery(newPolicyPage,newPolicyPageSize); - IPage list2 = earlyWarningEOService.oldPolicyQuery(oldPolicyPage,oldPolicyPageSize); - List> listMap = new ArrayList>(); - Map map = new HashMap(); - map.put("newPolicy", list1); - map.put("oldPolicy", list2); - System.out.println(map); - listMap .add(map); - System.out.println(listMap); - return Result.success("200",listMap); - } +// /** +// * +// * @param newStandPage +// * @param newStandPageSize +// * @param oldStandPage +// * @param oldStandPageSize +// * @param newItemsPage +// * @param newItemsPageSize +// * @param oldItemsPage +// * @param oldItemsPageSize +// * @return +// * @author zj +// * date 2021-06-15 +// **/ +// @GetMapping("/${restPath}/StandWarning") +// @ApiOperation("标准预警查询") +// public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize, +// @RequestParam(defaultValue = "1", value = "oldStandPage")int oldStandPage, @RequestParam(defaultValue = "10", value = "oldStandPageSize") int oldStandPageSize, +// @RequestParam(defaultValue = "1", value = "newItemsPage")int newItemsPage, @RequestParam(defaultValue = "10", value = "newItemsPageSize") int newItemsPageSize, +// @RequestParam(defaultValue = "1", value = "oldItemsPage")int oldItemsPage, @RequestParam(defaultValue = "10", value = "oldItemsPageSize") int oldItemsPageSize,EarlyWarningEO earlyWarningEO) { +// IPage list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,earlyWarningEO);//新车标准预警 +// IPage list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,earlyWarningEO);//在产车标准预警 +// IPage list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,earlyWarningEO);//新车条款预警 +// IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警 +// return getResponseMessage(list1, list2, list3, list4); +// } +// +// @GetMapping("/getStandWarning") +// @ApiOperation("标准预警查询") +// public ResponseMessage> getStandWaring(StandWarningEO queryPageEO){ +// IPage standWarning = earlyWarningEOService.getStandWarning(queryPageEO); +// standWarning.getRecords().forEach(item->{ +// +// Optional.ofNullable(item.getSSRQ()) +// .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); +// Optional.ofNullable(item.getXCXSSRQ()) +// .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); +// Optional.ofNullable(item.getZCCSSRQ()) +// .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); +// +// }); +// return Result.success(standWarning); +// } +// +// +// +// private ResponseMessage getResponseMessage(IPage list1, IPage list2, IPage list3, IPage list4) { +// List> listMap = new ArrayList>(); +// Map map = new HashMap(); +// map.put("newStand", list1); +// map.put("oldStand", list2); +// map.put("newItems", list3); +// map.put("oldItems", list4); +// listMap .add(map); +// return Result.success("200",listMap); +// } +// /** +// * +// * @param id +// * @return +// * @author zj +// * date 2021-06-15 +// **/ +// @GetMapping("/ChangePermissions") +// @ApiOperation("取消预警") +// public ResponseMessage ChangePermissions(String id) { +// String power = earlyWarningEOService.ChangePermissions(id); +// return Result.success("200",power); +// } +// /** +// * +// * @param newPolicyPage +// * @param newPolicyPageSize +// * @param oldPolicyPage +// * @param oldPolicyPageSize +// * @return +// * @author zj +// * date 2021-06-15 +// **/ +// @GetMapping("/PolicyWarning") +// @ApiOperation("政策预警查询") +// public ResponseMessage newPolicyPageInfo(@RequestParam(defaultValue = "1", value = "newPolicyPage")int newPolicyPage, @RequestParam(defaultValue = "10", value = "newPolicyPageSize") int newPolicyPageSize, +// @RequestParam(defaultValue = "1", value = "oldPolicyPage")int oldPolicyPage, @RequestParam(defaultValue = "10", value = "oldPolicyPageSize") int oldPolicyPageSize) { +// IPage list1 = earlyWarningEOService.newPolicyQuery(newPolicyPage,newPolicyPageSize); +// IPage list2 = earlyWarningEOService.oldPolicyQuery(oldPolicyPage,oldPolicyPageSize); +// List> listMap = new ArrayList>(); +// Map map = new HashMap(); +// map.put("newPolicy", list1); +// map.put("oldPolicy", list2); +// System.out.println(map); +// listMap .add(map); +// System.out.println(listMap); +// return Result.success("200",listMap); +// } - @GetMapping("/exportWarning") - @ApiOperation("导出预警") - public void exportStandardsInfoExcel(WarningExcelVO excelVO, HttpServletResponse response) throws Exception { - - - // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman - try { - response.setContentType("application/vnd.ms-excel"); - response.setCharacterEncoding("utf-8"); - // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 - if(excelVO.getExportName()==null){ - excelVO.setExportName("标准预警"); - } - String fileName = URLEncoder.encode(excelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20"); - response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - -// List exportExcel = earlyWarningEOService.getExportExcel(excelVO); - List exportExcel = earlyWarningEOService.getExportExcel(excelVO); - for (WarningExportVO warningExportVO : exportExcel){ - String condition = warningExportVO.getTermsConditions(); - if (condition != null && condition.length() > 32001){ - condition = condition.substring(0,32000); - warningExportVO.setTermsConditions(condition); - } - } - - // 这里需要设置不关闭流 - EasyExcel.write(response.getOutputStream(), WarningExportVO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") - .doWrite(exportExcel); - } catch (Exception e) { - System.out.println(e); - // 重置response - response.reset(); - response.setContentType("application/json"); - response.setCharacterEncoding("utf-8"); - response.getWriter().println(JSON.toJSONString(Result.error())); - } - } +// @GetMapping("/exportWarning") +// @ApiOperation("导出预警") +// public void exportStandardsInfoExcel(WarningExcelVO excelVO, HttpServletResponse response) throws Exception { +// +// +// // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman +// try { +// response.setContentType("application/vnd.ms-excel"); +// response.setCharacterEncoding("utf-8"); +// // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 +// if(excelVO.getExportName()==null){ +// excelVO.setExportName("标准预警"); +// } +// String fileName = URLEncoder.encode(excelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20"); +// response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); +// +//// List exportExcel = earlyWarningEOService.getExportExcel(excelVO); +// List exportExcel = earlyWarningEOService.getExportExcel(excelVO); +// for (WarningExportVO warningExportVO : exportExcel){ +// String condition = warningExportVO.getTermsConditions(); +// if (condition != null && condition.length() > 32001){ +// condition = condition.substring(0,32000); +// warningExportVO.setTermsConditions(condition); +// } +// } +// +// // 这里需要设置不关闭流 +// EasyExcel.write(response.getOutputStream(), WarningExportVO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") +// .doWrite(exportExcel); +// } catch (Exception e) { +// System.out.println(e); +// // 重置response +// response.reset(); +// response.setContentType("application/json"); +// response.setCharacterEncoding("utf-8"); +// response.getWriter().println(JSON.toJSONString(Result.error())); +// } +// } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 12602b7b..f3d36dd8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -292,11 +292,6 @@ public class SarStandardComplianceAssessResultController { iPage.setTotal(datasCount); iPage.setRecords(standards); while (iPage.getRecords().remove(null)) ; - if(StringUtils.isNotBlank(eo.getOrder())){ - if(eo.getOrder().equals("desc")){ - iPage.getRecords().sort((m1,m2)-> m2.getSpecificItem().compareTo(m1.getSpecificItem())); - } - } return Result.success(iPage); } else { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); @@ -312,11 +307,6 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); while (page.getRecords().remove(null)) ; - if(StringUtils.isNotBlank(eo.getOrder())){ - if(eo.getOrder().equals("desc")){ - iPage.getRecords().sort((m1,m2)-> m2.getSpecificItem().compareTo(m1.getSpecificItem())); - } - } return Result.success(page); } } 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 88613a8e..ebdcde31 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 @@ -6,6 +6,8 @@ import com.adc.da.person.entity.StandInfo; import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.slrs.NewsFeed.entity.NewsFeed; import com.adc.da.slrs.NewsFeed.service.INewsFeedService; +import com.adc.da.slrs.OnlineFileLog.dao.OnlineFileLogDao; +import com.adc.da.slrs.OnlineFileLog.entity.OnlineFileLog; import com.adc.da.slrs.regulations.dao.StandDataDao; import com.adc.da.slrs.regulations.entity.SearchStandContext; import com.adc.da.slrs.regulations.entity.StandData; @@ -263,6 +265,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 0 && InitStandAttrUtil.fileFieldList.contains(name)) { value = entry.getValue().toString(); if (StringUtils.isNotBlank(value)) { + String onFileId = ""; + String fileId = ""; + String[] split = value.split(","); + for (String id : split) { + if (id.contains("ATT_FILE")) { + if (StringUtils.isNotBlank(fileId)) { + fileId = fileId + "," + id; + } else { + fileId = id; + } + } else { + if (StringUtils.isNotBlank(onFileId)) { + onFileId = onFileId + "," + id; + } else { + onFileId = id; + } + } + } + String officeFileIds = ""; + if(StringUtils.isNotBlank(onFileId)){ + String[] splitOn = onFileId.split(","); + for (String idOn: splitOn){ + QueryWrapper onlineFileLogQueryWrapper = new QueryWrapper<>(); + onlineFileLogQueryWrapper.eq("HIS_ID",idOn); + onlineFileLogQueryWrapper.orderByDesc("CREATE_TIME"); + List onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogQueryWrapper); + if(!onlineFileLogs.isEmpty()){ + if(StringUtils.isNotBlank(officeFileIds)){ + officeFileIds = officeFileIds+","+onlineFileLogs.get(0).getAttFileId(); + }else { + officeFileIds = onlineFileLogs.get(0).getAttFileId(); + } + } + } + } + value = fileId+","+officeFileIds; List fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value); entry.setValue(fileObj); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml index 130001ef..00c9bd46 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml @@ -79,8 +79,10 @@ AND sins.prc_num like concat(concat('%',#{prcNum}),'%') - ORDER BY sins.specific_item + + ORDER BY sins.specific_item ${order} + ) c ORDER BY CONVERT(SUBSTRING(c.specific_item,1,(SELECT LOCATE('.',CONCAT(c.specific_item,'.')))),SIGNED) LIMIT ${(current-1)*size},${size} diff --git a/adc-da-slrs/src/main/resources/mysql/foton.sql b/adc-da-slrs/src/main/resources/mysql/foton.sql index aaebf4ca..12d58ca2 100644 --- a/adc-da-slrs/src/main/resources/mysql/foton.sql +++ b/adc-da-slrs/src/main/resources/mysql/foton.sql @@ -1,4 +1,21 @@ -- 福田数据库 表字段 记录 字典 等信息记录 + +--2023-05-18 主服务 创建表 在线编辑日志表 +CREATE TABLE `online_file_log` ( + `ID` varchar(36) NOT NULL COMMENT 'ID', + `HIS_ID` varchar(50) DEFAULT NULL COMMENT '在线编辑工作流的id', + `ATT_FILE_ID` varchar(50) DEFAULT NULL COMMENT '新文件存储的id', + `FILE_NAME` varchar(255) DEFAULT NULL COMMENT '新名称', + `OLD_FILE_NAME` varchar(255) DEFAULT NULL COMMENT '老名称', + `FILE_SUFFIX` varchar(255) DEFAULT NULL COMMENT '文件后缀', + `FILE_PATH` varchar(255) DEFAULT NULL COMMENT '路径', + `COUNT` bigint(5) DEFAULT NULL COMMENT '计数', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '修改时间', + `VALID_FLAG` varchar(255) DEFAULT NULL COMMENT '是否有效', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + -- 2023-04-14 16:27 生产环境未同步 -- 更改 sar_stand_item_val 表PROOERTY_VAL 类型 varchar 为 text From c3df9d03459e3c74721a5bdfb8454975ea7ba159 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 18 May 2023 15:40:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 268 +++++++++--------- 1 file changed, 135 insertions(+), 133 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index 687c925f..1670b215 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -6,8 +6,10 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarStandIssueControlProduct.entity.SarStandIssueControlProduct; import com.adc.da.slrs.sarStandIssueControlProduct.entity.StandIssueControlProductExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.adc.da.slrs.sarStandWarning.service.Impl.EarlyWarningEOServiceImpl; import com.alibaba.excel.EasyExcel; @@ -29,144 +31,144 @@ import java.util.*; @RestController @RequestMapping("/${restPath}/sys/EarlyWarning") @Api(tags = "sarStandWarning") -public class EarlyWarningEOController { +public class EarlyWarningEOController extends BaseController { @Resource private EarlyWarningEOServiceImpl earlyWarningEOService; -// /** -// * -// * @param newStandPage -// * @param newStandPageSize -// * @param oldStandPage -// * @param oldStandPageSize -// * @param newItemsPage -// * @param newItemsPageSize -// * @param oldItemsPage -// * @param oldItemsPageSize -// * @return -// * @author zj -// * date 2021-06-15 -// **/ -// @GetMapping("/${restPath}/StandWarning") -// @ApiOperation("标准预警查询") -// public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize, -// @RequestParam(defaultValue = "1", value = "oldStandPage")int oldStandPage, @RequestParam(defaultValue = "10", value = "oldStandPageSize") int oldStandPageSize, -// @RequestParam(defaultValue = "1", value = "newItemsPage")int newItemsPage, @RequestParam(defaultValue = "10", value = "newItemsPageSize") int newItemsPageSize, -// @RequestParam(defaultValue = "1", value = "oldItemsPage")int oldItemsPage, @RequestParam(defaultValue = "10", value = "oldItemsPageSize") int oldItemsPageSize,EarlyWarningEO earlyWarningEO) { -// IPage list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,earlyWarningEO);//新车标准预警 -// IPage list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,earlyWarningEO);//在产车标准预警 -// IPage list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,earlyWarningEO);//新车条款预警 -// IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警 -// return getResponseMessage(list1, list2, list3, list4); -// } -// -// @GetMapping("/getStandWarning") -// @ApiOperation("标准预警查询") -// public ResponseMessage> getStandWaring(StandWarningEO queryPageEO){ -// IPage standWarning = earlyWarningEOService.getStandWarning(queryPageEO); -// standWarning.getRecords().forEach(item->{ -// -// Optional.ofNullable(item.getSSRQ()) -// .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); -// Optional.ofNullable(item.getXCXSSRQ()) -// .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); -// Optional.ofNullable(item.getZCCSSRQ()) -// .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); -// -// }); -// return Result.success(standWarning); -// } -// -// -// -// private ResponseMessage getResponseMessage(IPage list1, IPage list2, IPage list3, IPage list4) { -// List> listMap = new ArrayList>(); -// Map map = new HashMap(); -// map.put("newStand", list1); -// map.put("oldStand", list2); -// map.put("newItems", list3); -// map.put("oldItems", list4); -// listMap .add(map); -// return Result.success("200",listMap); -// } -// /** -// * -// * @param id -// * @return -// * @author zj -// * date 2021-06-15 -// **/ -// @GetMapping("/ChangePermissions") -// @ApiOperation("取消预警") -// public ResponseMessage ChangePermissions(String id) { -// String power = earlyWarningEOService.ChangePermissions(id); -// return Result.success("200",power); -// } -// /** -// * -// * @param newPolicyPage -// * @param newPolicyPageSize -// * @param oldPolicyPage -// * @param oldPolicyPageSize -// * @return -// * @author zj -// * date 2021-06-15 -// **/ -// @GetMapping("/PolicyWarning") -// @ApiOperation("政策预警查询") -// public ResponseMessage newPolicyPageInfo(@RequestParam(defaultValue = "1", value = "newPolicyPage")int newPolicyPage, @RequestParam(defaultValue = "10", value = "newPolicyPageSize") int newPolicyPageSize, -// @RequestParam(defaultValue = "1", value = "oldPolicyPage")int oldPolicyPage, @RequestParam(defaultValue = "10", value = "oldPolicyPageSize") int oldPolicyPageSize) { -// IPage list1 = earlyWarningEOService.newPolicyQuery(newPolicyPage,newPolicyPageSize); -// IPage list2 = earlyWarningEOService.oldPolicyQuery(oldPolicyPage,oldPolicyPageSize); -// List> listMap = new ArrayList>(); -// Map map = new HashMap(); -// map.put("newPolicy", list1); -// map.put("oldPolicy", list2); -// System.out.println(map); -// listMap .add(map); -// System.out.println(listMap); -// return Result.success("200",listMap); -// } + /** + * + * @param newStandPage + * @param newStandPageSize + * @param oldStandPage + * @param oldStandPageSize + * @param newItemsPage + * @param newItemsPageSize + * @param oldItemsPage + * @param oldItemsPageSize + * @return + * @author zj + * date 2021-06-15 + **/ + @GetMapping("/${restPath}/StandWarning") + @ApiOperation("标准预警查询") + public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize, + @RequestParam(defaultValue = "1", value = "oldStandPage")int oldStandPage, @RequestParam(defaultValue = "10", value = "oldStandPageSize") int oldStandPageSize, + @RequestParam(defaultValue = "1", value = "newItemsPage")int newItemsPage, @RequestParam(defaultValue = "10", value = "newItemsPageSize") int newItemsPageSize, + @RequestParam(defaultValue = "1", value = "oldItemsPage")int oldItemsPage, @RequestParam(defaultValue = "10", value = "oldItemsPageSize") int oldItemsPageSize,EarlyWarningEO earlyWarningEO) { + IPage list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,earlyWarningEO);//新车标准预警 + IPage list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,earlyWarningEO);//在产车标准预警 + IPage list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,earlyWarningEO);//新车条款预警 + IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警 + return getResponseMessage(list1, list2, list3, list4); + } + + @GetMapping("/getStandWarning") + @ApiOperation("标准预警查询") + public ResponseMessage> getStandWaring(StandWarningEO queryPageEO){ + IPage standWarning = earlyWarningEOService.getStandWarning(queryPageEO); + standWarning.getRecords().forEach(item->{ + + Optional.ofNullable(item.getSSRQ()) + .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getXCXSSRQ()) + .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getZCCSSRQ()) + .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + + }); + return Result.success(standWarning); + } + + + + private ResponseMessage getResponseMessage(IPage list1, IPage list2, IPage list3, IPage list4) { + List> listMap = new ArrayList>(); + Map map = new HashMap(); + map.put("newStand", list1); + map.put("oldStand", list2); + map.put("newItems", list3); + map.put("oldItems", list4); + listMap .add(map); + return Result.success("200",listMap); + } + /** + * + * @param id + * @return + * @author zj + * date 2021-06-15 + **/ + @GetMapping("/ChangePermissions") + @ApiOperation("取消预警") + public ResponseMessage ChangePermissions(String id) { + String power = earlyWarningEOService.ChangePermissions(id); + return Result.success("200",power); + } + /** + * + * @param newPolicyPage + * @param newPolicyPageSize + * @param oldPolicyPage + * @param oldPolicyPageSize + * @return + * @author zj + * date 2021-06-15 + **/ + @GetMapping("/PolicyWarning") + @ApiOperation("政策预警查询") + public ResponseMessage newPolicyPageInfo(@RequestParam(defaultValue = "1", value = "newPolicyPage")int newPolicyPage, @RequestParam(defaultValue = "10", value = "newPolicyPageSize") int newPolicyPageSize, + @RequestParam(defaultValue = "1", value = "oldPolicyPage")int oldPolicyPage, @RequestParam(defaultValue = "10", value = "oldPolicyPageSize") int oldPolicyPageSize) { + IPage list1 = earlyWarningEOService.newPolicyQuery(newPolicyPage,newPolicyPageSize); + IPage list2 = earlyWarningEOService.oldPolicyQuery(oldPolicyPage,oldPolicyPageSize); + List> listMap = new ArrayList>(); + Map map = new HashMap(); + map.put("newPolicy", list1); + map.put("oldPolicy", list2); + System.out.println(map); + listMap .add(map); + System.out.println(listMap); + return Result.success("200",listMap); + } -// @GetMapping("/exportWarning") -// @ApiOperation("导出预警") -// public void exportStandardsInfoExcel(WarningExcelVO excelVO, HttpServletResponse response) throws Exception { -// -// -// // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman -// try { -// response.setContentType("application/vnd.ms-excel"); -// response.setCharacterEncoding("utf-8"); -// // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 -// if(excelVO.getExportName()==null){ -// excelVO.setExportName("标准预警"); -// } -// String fileName = URLEncoder.encode(excelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20"); -// response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); -// -//// List exportExcel = earlyWarningEOService.getExportExcel(excelVO); -// List exportExcel = earlyWarningEOService.getExportExcel(excelVO); -// for (WarningExportVO warningExportVO : exportExcel){ -// String condition = warningExportVO.getTermsConditions(); -// if (condition != null && condition.length() > 32001){ -// condition = condition.substring(0,32000); -// warningExportVO.setTermsConditions(condition); -// } -// } -// -// // 这里需要设置不关闭流 -// EasyExcel.write(response.getOutputStream(), WarningExportVO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") -// .doWrite(exportExcel); -// } catch (Exception e) { -// System.out.println(e); -// // 重置response -// response.reset(); -// response.setContentType("application/json"); -// response.setCharacterEncoding("utf-8"); -// response.getWriter().println(JSON.toJSONString(Result.error())); -// } -// } + @GetMapping("/exportWarning") + @ApiOperation("导出预警") + public void exportStandardsInfoExcel(WarningExcelVO excelVO, HttpServletResponse response) throws Exception { + + + // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman + try { + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 + if(excelVO.getExportName()==null){ + excelVO.setExportName("标准预警"); + } + String fileName = URLEncoder.encode(excelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + +// List exportExcel = earlyWarningEOService.getExportExcel(excelVO); + List exportExcel = earlyWarningEOService.getExportExcel(excelVO); + for (WarningExportVO warningExportVO : exportExcel){ + String condition = warningExportVO.getTermsConditions(); + if (condition != null && condition.length() > 32001){ + condition = condition.substring(0,32000); + warningExportVO.setTermsConditions(condition); + } + } + + // 这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), WarningExportVO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(exportExcel); + } catch (Exception e) { + System.out.println(e); + // 重置response + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().println(JSON.toJSONString(Result.error())); + } + } } From 4aee2eb33ef49f7ed750b0708a8ee956e4946803 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 18 May 2023 16:30:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?es=E4=BC=98=E5=8C=96=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=83=BD=E6=BA=90=E7=B1=BB=E5=9E=8B=E5=92=8C=E9=80=82=E7=94=A8?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SearchCenterServiceImpl.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) 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 6a4af3f0..4820eaf7 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 @@ -126,8 +126,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.matchPhraseQuery("content", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("CYSDShow", "*"+searchInfoEO.getSelectValue()+"*")) @@ -169,8 +169,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) - .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); if (isRqFormat(searchInfoEO.getSelectValue())) { Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); @@ -261,8 +261,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) @@ -281,8 +281,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; default: break; } @@ -433,8 +433,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) @@ -460,8 +460,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); if (isRqFormat(searchInfoEO.getSelectValue())) { Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); @@ -1650,8 +1650,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("nameTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1002f)) .should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1000f)) .should(QueryBuilders.wildcardQuery("titleBig.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)) - .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); // queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), // "sortTitle","numberTitle","yearOrder","nameTitle","title" // ).field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f); From 3bd5858f507d15a998377ccdd02e775063a401ca Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 18 May 2023 17:19:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=20es=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.properties | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 7ea71fac..b84220b4 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -290,18 +290,22 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg,rar,zip # ============================================================================= +#elasticsearch.clustername=elasticsearch +# +#elasticsearch.ip=127.0.0.1 +# +#elasticsearch.port=9306 +# +#elasticsearch.poolSize=5 +# +#elas.flag=true elasticsearch.clustername=elasticsearch - -elasticsearch.ip=127.0.0.1 - -elasticsearch.port=9306 - +elasticsearch.ip=10.100.5.122 +elasticsearch.port=9300 elasticsearch.poolSize=5 - elas.flag=true - # 拆分的图片调用 （修改ip时此处也应该被修改） elasticsearch.img=http://localhost:9090 From 14dbf79dc42a4d10112f9d73b863e854e368d834 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 18 May 2023 18:27:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?es=E4=BC=98=E5=8C=96=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=83=BD=E6=BA=90=E7=B1=BB=E5=9E=8B=E5=92=8C=E9=80=82=E7=94=A8?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SearchCenterServiceImpl.java | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) 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 4820eaf7..4c9a2c9f 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 @@ -126,8 +126,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.matchPhraseQuery("content", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("CYSDShow", "*"+searchInfoEO.getSelectValue()+"*")) @@ -169,8 +169,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) - .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); if (isRqFormat(searchInfoEO.getSelectValue())) { Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); @@ -227,6 +227,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { String sortField1 = ""; String sortField2 = ""; String sortField3 = ""; + String sortField4 = ""; + String sortField5 = ""; if("laws".equals(searchInfoEO.getSelectIndex())){ sortField1 = "lawsNumber"; sortField2 = "lawsYear"; @@ -235,6 +237,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { sortField1 = "standNumber"; sortField2 = "standYear"; sortField3 = "standSort.keyword"; +// sortField4 = "NYLXCLASS.keyword"; +// sortField5 = "CLLX.keyword"; } searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) @@ -244,6 +248,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .addSort(sortField1, SortOrder.ASC) .addSort(sortField2, SortOrder.DESC) .addSort(sortField3, SortOrder.ASC) +// .addSort(sortField4, SortOrder.ASC) +// .addSort(sortField5, SortOrder.ASC) .addSort("issue_time_data", SortOrder.DESC) .setSize(searchInfoEO.getPageSize()); @@ -261,8 +267,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) @@ -281,8 +287,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; default: break; } @@ -385,6 +391,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { String sortField1 = ""; String sortField2 = ""; String sortField3 = ""; + String sortField4 = ""; + String sortField5 = ""; if("laws".equals(searchInfoEO.getSelectIndex())){ sortField1 = "lawsNumber"; sortField2 = "lawsYear"; @@ -393,6 +401,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { sortField1 = "standNumber"; sortField2 = "standYear"; sortField3 = "standSort.keyword"; +// sortField4 = "NYLXCLASS.keyword"; +// sortField5 = "CLLX.keyword"; } searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) @@ -402,6 +412,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .addSort(sortField1, SortOrder.ASC) .addSort(sortField2, SortOrder.DESC) .addSort(sortField3, SortOrder.ASC) +// .addSort(sortField4, SortOrder.ASC) +// .addSort(sortField5, SortOrder.ASC) .addSort("issue_time_data", SortOrder.DESC) .setSize(searchInfoEO.getPageSize()); @@ -433,8 +445,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) @@ -460,8 +472,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("NYLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.wildcardQuery("CLLXName.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); + .should(QueryBuilders.wildcardQuery("NYLXCLASS.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) + .should(QueryBuilders.wildcardQuery("CLLX.keyword",searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)); if (isRqFormat(searchInfoEO.getSelectValue())) { Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();