diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index b298be65c..8e3f8c32f 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -159,3 +159,10 @@ ALTER TABLE `laws_weilai`.`params_report_detail` -- 更新拆分详情列 展示顺序不在列表头展示sql 2022-12-30 已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0 WHERE `id` = '1529373706885799937' + +-- 文档动态 添加中文消息的字段 2023-02-03 未同步生产环境 +ALTER TABLE `laws_weilai`.`home_document_dynamic` +MODIFY COLUMN `msg_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息内容(英文)' AFTER `sys_org_code`, +MODIFY COLUMN `msg_content_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息详情(英文)' AFTER `msg_content`, +ADD COLUMN `msg_content_cn` text NULL COMMENT '消息内容(中文)' AFTER `msg_content_info`, +ADD COLUMN `msg_content_info_cn` text NULL COMMENT '消息内容(中文)' AFTER `msg_content_cn`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index e2864dc65..b0e836ff3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -144,8 +144,8 @@ public class BussDocumentLibraryEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.bussDocumentLibraryEOService.deleteByIds(Arrays.asList(ids.split(","))); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids,String cut) { + this.bussDocumentLibraryEOService.deleteByIds(Arrays.asList(ids.split(",")),cut); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index cc0bffe37..9011efffc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -37,7 +37,7 @@ public interface IBussDocumentLibraryEOService extends IService ids); + void deleteByIds(List ids,String cut); /** * 通过id查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index e8d3f59f2..fab2eabbd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -216,7 +216,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl ids) { + public void deleteByIds(List ids,String cut) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //字段属性 List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); @@ -256,6 +256,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl documentIds = onlCgformSubscribeList.stream().map(OnlCgformSubscribe::getDocumentId).collect(Collectors.toList()); List serialNumberList = new ArrayList<>(); List serialNumberListTemp = new ArrayList<>(); + List serialNumberListTempCn = new ArrayList<>(); StringBuilder sb = new StringBuilder(); StringBuilder sbTemp = new StringBuilder(); for (Map map : mapList) { @@ -270,7 +271,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue())) .collect(Collectors.toList()); if(stateDictItemList.size() != 0){ - category = stateDictItemList.get(0).getEnName(); + if(CutEnum.CN.getValue().equals(cut)){ + category = stateDictItemList.get(0).getItemText(); + }else{ + category = stateDictItemList.get(0).getEnName(); + } + } }else { category = ""; @@ -282,6 +288,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl" + serialNumber + "" + " " + titleEn + ","; sbTemp.append(hrefTemp); serialNumberListTemp.add(category + " " + serialNumber + " " + titleEn); + serialNumberListTempCn.add(category + " " + serialNumber + " " + title); //--------------------------- if (documentIds.size() != 0 && documentIds.contains((String) map.get("id"))) { serialNumberList.add(serialNumber); @@ -299,9 +306,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1) { msgEndStr = " have been deleted from the document library."; } - String msgContent = "The standard " + StringUtils.join(serialNumberListTemp,",") + msgEndStr; + String msgContent = "The " + StringUtils.join(serialNumberListTemp,",") + msgEndStr; + String msgContentCn = "文档库中删除了" + StringUtils.join(serialNumberListTempCn,","); homeDocumentDynamicEO.setMsgContent(msgContent); homeDocumentDynamicEO.setMsgContentInfo(msgContent); + homeDocumentDynamicEO.setMsgContentCn(msgContentCn); + homeDocumentDynamicEO.setMsgContentInfoCn(msgContentCn); homeDocumentDynamicEOService.save(homeDocumentDynamicEO); } @@ -2145,6 +2155,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl dictItemList = sysDictItemServiceImpl.selectItemsAll(); if(StringUtils.isNotBlank(category)){ @@ -2154,6 +2165,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl" + serialNumber + "" + " "+ titleEn + " "; + String hrefCn = categoryCn + " " + "" + serialNumber + "" + " "+ title; //文档动态, 文档库中新增了标准XXXX homeDocumentDynamicEOService //The standard GB 7258-2017 Technical specifications has been added to the document library. + String msgContentCn = "文档库中新增了"+categoryCn+" "+serialNumber+" "+title; + String msgContentInfoCn = "文档中库新增了"+hrefCn; HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO(); - homeDocumentDynamicEO.setMsgContent("The standard " + category + " " + serialNumber + " " + titleEn + " has been added to the document library."); - homeDocumentDynamicEO.setMsgContentInfo("The standard " + href + " has been added to the document library."); + homeDocumentDynamicEO.setMsgContent("The " + category + " " + serialNumber + " " + titleEn + " has been added to the document library."); + homeDocumentDynamicEO.setMsgContentInfo("The " + href + " has been added to the document library."); + homeDocumentDynamicEO.setMsgContentCn(msgContentCn); + homeDocumentDynamicEO.setMsgContentInfoCn(msgContentInfoCn); homeDocumentDynamicEOService.save(homeDocumentDynamicEO); @@ -2664,6 +2683,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl dictItemList, String category, String titleEn) { + String categoryCn = ""; if(StringUtils.isNotBlank(category)){ String finalCategory = category; List stateDictItemList = dictItemList.stream() @@ -2671,6 +2691,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl { String keyTemp = entry.getKey(); if(fileFieldList.contains(keyTemp)) { @@ -2701,11 +2724,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl" + serialNumber + "" + " " + titleEn; + String hrefCn = "" + serialNumber + "" + " " + title; String contentFile = ""; String contentInfoFile = ""; + String contentFileCn = ""; + String contentInfoFileCn = ""; if(StringUtils.isNotBlank(sbField)){ // String substring = sbField.substring(0, sbField.length() - 1); contentFile = category + " " + serialNumber + " " + titleEn + " uploaded " + sbField; + contentFileCn = categoryCn + " " + serialNumber + " " + title + " 中上传了 " + sbFieldCn; } if(StringUtils.isNotBlank(sbNew)){ // String substring = sbNew.substring(0, sbNew.length() - 1); contentInfoFile = category + " " + href + " uploaded " + sbNew; + contentInfoFileCn = categoryCn + " " + hrefCn + " 中上传了" + sbNewCn; } //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件 @@ -2733,12 +2765,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileIdLIstTemp = new ArrayList<>(); @@ -2764,11 +2802,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl stateDictItemList = dictItemList.stream() .filter(e -> "state".equals(e.getDictCode()) && finalValue.equals(e.getItemValue())) .collect(Collectors.toList()); if(stateDictItemList.size() != 0){ value = stateDictItemList.get(0).getEnName(); + valueCn = stateDictItemList.get(0).getItemText(); } // if(StringUtils.isBlank(value)){ @@ -2781,6 +2821,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0){ String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1) + "."; String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1) + "."; + String msgContentCn = msgContentSbCn.substring(0, msgContentSbCn.length() - 1) + "."; + String msgContentInfoCn = msgContentInfoSbCn.substring(0, msgContentInfoSbCn.length() - 1) + "."; HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO(); homeDocumentDynamicEO.setMsgContent(msgContent); homeDocumentDynamicEO.setMsgContentInfo(msgContentInfo); + homeDocumentDynamicEO.setMsgContentCn(msgContentCn); + homeDocumentDynamicEO.setMsgContentInfoCn(msgContentInfoCn); homeDocumentDynamicEOService.save(homeDocumentDynamicEO); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java index 5b7e571b5..f26c1811f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java @@ -1,25 +1,37 @@ package com.jero.modules.home.controller; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.home.entity.HomeDocumentDynamicEO; -import com.jero.modules.home.service.IHomeDocumentDynamicEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.home.entity.HomeDocumentDynamicEO; +import com.jero.modules.home.service.IHomeDocumentDynamicEOService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +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 org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** @@ -51,11 +63,22 @@ public class HomeDocumentDynamicEOController extends JeroController queryPageList(HomeDocumentDynamicEO homeDocumentDynamicEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + HttpServletRequest req, + String cut) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(homeDocumentDynamicEO, req.getParameterMap()); queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = homeDocumentDynamicEOService.page(page, queryWrapper); + if(CutEnum.CN.getValue().equals(cut) && ObjectUtils.isNotEmpty(pageList.getRecords())){ + for (HomeDocumentDynamicEO record : pageList.getRecords()) { + if(StringUtils.isNotBlank(record.getMsgContentCn())){ + record.setMsgContent(record.getMsgContentCn()); + } + if(StringUtils.isNotBlank(record.getMsgContentInfoCn())){ + record.setMsgContentInfo(record.getMsgContentInfoCn()); + } + } + } return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/entity/HomeDocumentDynamicEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/entity/HomeDocumentDynamicEO.java index 9ce5da311..7c007093c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/entity/HomeDocumentDynamicEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/entity/HomeDocumentDynamicEO.java @@ -71,4 +71,10 @@ public class HomeDocumentDynamicEO implements Serializable { @ApiModelProperty(value = "消息内容详情") private java.lang.String msgContentInfo; + //消息中文 + private String msgContentCn; + + //消息详情中文 + private String msgContentInfoCn; + }