虚拟清单log修改

SynologyDrive/4.数据库变更记录/解鋆宇sql变更记录.sql

@@ -1,9 +1,15 @@
 # 2022-5-24
 #标签内容增加排序字段
 ALTER TABLE `sys_dict`
-ADD COLUMN `order_num` int(11) NOT NULL COMMENT '排序';
+ADD COLUMN `order_num` int(11)  NULL COMMENT '排序';
 
 # 2022-5-25
 #标签内容-属性增加排序字段
 ALTER TABLE `sys_category`
-    ADD COLUMN `sort_order` int(11) NOT NULL COMMENT '排序';
+    ADD COLUMN `sort_order` int(11)  NULL COMMENT '排序';
+#虚拟清单更新log
+ALTER TABLE `dummy_log`
+    ADD COLUMN `is_en_log` int(50)  NULL COMMENT 'log语言类别,cn中文,en英文';
+#法规清单更新log
+ALTER TABLE `project_laws_inventory_log`
+    ADD COLUMN `is_en_log` int(50)  NULL COMMENT 'log语言类别,cn中文,en英文';

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java

@@ -66,7 +66,7 @@ public class SysDictItemController {
 													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
 		Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
 		QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
-		queryWrapper.orderByAsc("sort_order").eq("del_flag",CommonConstant.DEL_FLAG_0);
+		queryWrapper.orderByDesc("sort_order").eq("del_flag",CommonConstant.DEL_FLAG_0);
 		Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
 		IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
 		result.setSuccess(true);

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java

@@ -65,7 +65,7 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
             queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0)
                     .eq("dict_id",sysDictItem.getDictId())
                     .eq("is_tag_dict",sysDictItem.getIsTagDict())
-                    .orderByAsc("sort_order");
+                    .orderByDesc("sort_order");
             queryWrapper.eq("sort_order", inputOrderNum);
             Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper);
             if (orderNumCount > 0) {//有重复展示顺序的,后面的号全+1

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyLogEOController.java

@@ -49,15 +49,16 @@ public class DummyLogEOController extends JeroController<DummyLogEO, IDummyLogEO
 	@AutoLog(value = "虚拟清单log表-分页列表查询")
 	@ApiOperation(value="虚拟清单log表-分页列表查询", notes="虚拟清单log表-分页列表查询")
 	@GetMapping(value = "/page")
-	public Result<?> queryPageList(DummyLogEO dummyLogEO,
+	public Result<?> queryPageList(DummyLogEO dummyLogEO,String cut,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<DummyLogEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyLogEO, req.getParameterMap());
-		queryWrapper.orderByDesc("create_time");
+		queryWrapper.orderByDesc("create_time").eq("is_en_log",cut);
 		Page<DummyLogEO> page = new Page<DummyLogEO>(pageNo, pageSize);
 		IPage<DummyLogEO> pageList = dummyLogEOService.page(page, queryWrapper);
-		return Result.OK(pageList);
+		IPage<DummyLogEO> disposeLogList = dummyLogEOService.disposeLog(pageList,cut);
+		return Result.OK(disposeLogList);
 	}
 
     /**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyLogEO.java

@@ -1,21 +1,18 @@
 package com.jero.modules.dummy.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 
 /**
@@ -71,4 +68,8 @@ public class DummyLogEO implements Serializable {
     @ApiModelProperty(value = "log内容")
     private java.lang.String logContent;
 
+    /**log语言类别,cn中文,en英文*/
+    private java.lang.String isEnLog;
+
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java

@@ -2,48 +2,50 @@ package com.jero.modules.dummy.enums;
 
 
 public enum DummyInventoryBaseFieldEnum {
-    TITLE("标题","title"),
+    TITLE("标题", "title","Title"),
-    SUBTITLE("子标题","subtitle"),
+    SUBTITLE("子标题", "subtitle","Sub-Title"),
-    WVTA_ID("WVTA ID","wvta_id"),
+    WVTA_ID("WVTA ID", "wvta_id","WVTA ID"),
-    SHI4_YONG4_FAN4_WEI2("适用范围","apply_scope"),
+    SHI4_YONG4_FAN4_WEI2("适用范围", "apply_scope","Scope of application"),
-    XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1("新车型实施日期","xin1_che1_xing2_shi2_shi1_ri4_qi1"),
+    XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1("新车型实施日期", "xin1_che1_xing2_shi2_shi1_ri4_qi1","New Type Execute Date"),
-    IMPLEMENT_TIME("在产车实施日期","implement_time"),
+    IMPLEMENT_TIME("在产车实施日期", "implement_time","New Vehicle Execute Date"),
-    ATTESTATION_TYPE("认证类型","attestation_type"),
+    ATTESTATION_TYPE("认证类型", "attestation_type","Certification Type"),
-    TECHNOLOGY_TERRITORY("技术领域","technology_territory"),
+    TECHNOLOGY_TERRITORY("技术领域", "technology_territory","Technical Field"),
-    DUTY_TERRITORY("责任领域","duty_territory"),
+    DUTY_TERRITORY("责任领域", "duty_territory","Responsible Field"),
-    ATTESTATION_RANK("认证级别","attestation_rank"),
+    ATTESTATION_RANK("认证级别", "attestation_rank","Certification Level"),
-    IMPLEMENT_TYPE("实施类别","implement_type"),
+    IMPLEMENT_TYPE("实施类别", "implement_type","Usage"),
-    REGION("适用地区","region"),
+    REGION("适用地区", "region","Area"),
-    APPLICABLE_SUPPLEMENT("适用增补件","applicable_supplement"),
+    APPLICABLE_SUPPLEMENT("适用增补件", "applicable_supplement","Applicable Supplement"),
-    REMARK("备注","remark"),
+    REMARK("备注", "remark","Comments"),
 
-    DELIVERABLE_TEMPLATE("交付物类型","deliverable_template"),
+    DELIVERABLE_TEMPLATE("交付物类型", "deliverable_template","Type of deliverables"),
-    FA1_QI3_REN2("发起人","fa1_qi3_ren2"),
+    FA1_QI3_REN2("发起人", "fa1_qi3_ren2","Initiator"),
-    ZE2_REN2_REN2("责任人","ze2_ren4_ren2"),
+    ZE2_REN2_REN2("责任人", "ze2_ren4_ren2","Assignee"),
 
-    DESIGN_DELIVERABLE_TYPE("设计符合性确认-交付物类型","deliverable_template"),
+    DESIGN_DELIVERABLE_TYPE("设计符合性确认-交付物类型", "deliverable_template","Type of deliverables"),
-    DESIGN_DELIVERABLE_TEMPLATE("设计符合性确认-交付物模板","design_deliverable_template"),
+    DESIGN_DELIVERABLE_TEMPLATE("设计符合性确认-交付物模板", "design_deliverable_template","Deliverable template"),
-    DESIGN_INITIATOR("设计符合性确认-发起人","fa1_qi3_ren2"),
+    DESIGN_INITIATOR("设计符合性确认-发起人", "fa1_qi3_ren2","Initiator"),
-    DESIGN_DUTY("设计符合性确认-责任人","ze2_ren4_ren2"),
+    DESIGN_DUTY("设计符合性确认-责任人", "ze2_ren4_ren2","Assignee"),
 
-    PREHOMO_DELIVERABLE_TYPE("prehomo确认-交付物类型","deliverable_template"),
+    PREHOMO_DELIVERABLE_TYPE("prehomo确认-交付物类型", "deliverable_template","Type of deliverables"),
-    PREHOMO_DELIVERABLE_TEMPLATE("prehomo确认-交付物模板","prehomo_deliverable_template"),
+    PREHOMO_DELIVERABLE_TEMPLATE("prehomo确认-交付物模板", "prehomo_deliverable_template","Deliverable template"),
-    PREHOMO_INITIATOR("prehomo确认-发起人","fa1_qi3_ren2"),
+    PREHOMO_INITIATOR("prehomo确认-发起人", "fa1_qi3_ren2","Initiator"),
-    PREHOMO_DUTY("prehomo确认-责任人","ze2_ren4_ren2"),
+    PREHOMO_DUTY("prehomo确认-责任人", "ze2_ren4_ren2","Assignee"),
 
-    VERIFY_DELIVERABLE_TYPE("验证符合性确认-交付物类型","deliverable_template"),
+    VERIFY_DELIVERABLE_TYPE("验证符合性确认-交付物类型", "deliverable_template","Type of deliverables"),
-    VERIFY_DELIVERABLE_TEMPLATE("验证符合性确认-交付物模板","verify_deliverable_template"),
+    VERIFY_DELIVERABLE_TEMPLATE("验证符合性确认-交付物模板", "verify_deliverable_template","Deliverable template"),
-    VERIFY_INITIATOR("验证符合性确认-发起人","fa1_qi3_ren2"),
+    VERIFY_INITIATOR("验证符合性确认-发起人", "fa1_qi3_ren2","Initiator"),
-    VERIFY_DUTY("验证符合性确认-责任人","ze2_ren4_ren2"),
+    VERIFY_DUTY("验证符合性确认-责任人", "ze2_ren4_ren2","Assignee"),
     ;
 
 
     String name;
     String value;
+    String enName;
 
-    private DummyInventoryBaseFieldEnum(String name, String value) {
+    DummyInventoryBaseFieldEnum(String name, String value, String enName) {
         this.name = name;
         this.value = value;
+        this.enName = enName;
     }
 
     public String getName() {
@@ -61,4 +63,12 @@ public enum DummyInventoryBaseFieldEnum {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyLogEOMapper.xml

@@ -10,5 +10,7 @@
         <result column="sys_org_code" property="sysOrgCode" />
         <result column="dummy_inventory_base_id" property="dummyInventoryBaseId" />
         <result column="log_content" property="logContent" />
+        <result column="is_en_log" property="isEnLog" />
+
     </resultMap>
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyLogEOService.java

@@ -1,5 +1,6 @@
 package com.jero.modules.dummy.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.dummy.entity.DummyLogEO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
@@ -58,4 +59,7 @@ public interface IDummyLogEOService extends IService<DummyLogEO> {
 	 * @return
 	 */
     List<DummyLogEO> queryList();
+
+    //翻译log数据
+	IPage<DummyLogEO> disposeLog(IPage<DummyLogEO> pageList,String cut);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java

@@ -446,7 +446,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
             }
         }
     }
-
+//翻译成中文名
     public void disposeData(List<DummyInventoryInfoEO> records) {
         Set<String> technologyTerritorySet = new HashSet<>();
         for (DummyInventoryInfoEO dummyInventoryInfoEO : records) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java

@@ -149,7 +149,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			String username = sysUser.getUsername();
 			String serialNumber = list.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
 			String contentLog = username+"向清单中添加了标准“"+serialNumber+"”";
-			dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId());
+			String enContentLog = username+" added the standard “"+serialNumber+"” to the list.";
+			dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue());
+			dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue());
 		}
 	}
 
@@ -168,6 +170,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String username = sysUser.getUsername();
 		String contentLog = username+"编辑了清单中的“" + dummyInventoryInfoEO.getSerialNumber() + "”标准:";
+		String enContentLog = username+" edited the “" + dummyInventoryInfoEO.getSerialNumber() + "” standard in the list:";
+
+
 		List<DummyInventoryInfoEO> infoEOList = new ArrayList<>();
 		infoEOList.add(dummyInventoryInfoEO);
 		//查询数据库里原来的数据
@@ -185,9 +190,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		List<Map<String,String>> infoDiffList = new ArrayList<>();
 		infoDiffList.add(infoDiff);
 		contentLog = dummyInventoryBaseEOService.setContentInfo(null,null,infoDiffList,null,null,contentLog);
-
+		enContentLog=contentLog.replace("由"," changed from ")
-		dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId());
+				.replace("改为"," to ");
-
+		dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue());
+		dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue());
 	}
 
 	/**
@@ -235,7 +241,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		String projectId = dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId();
 		String serialNumber = dummyInventoryInfoEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
 		String contentLog = username+"删除了清单中的“"+serialNumber+"”标准";
-		dummyLogEOService.updateLog(contentLog, projectId);
+		String enContentLog = username+" deleted the “"+serialNumber+"” standard from the list";
+		dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue());
+		dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue());
 	}
 
 	/**
@@ -288,7 +296,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			String projectId = dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId();
 			String serialNumber = dummyInventoryInfoEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
 			String contentLog = username+"复制了“"+serialNumber+"”";
-			dummyLogEOService.updateLog(contentLog, projectId);
+			String enContentLog =  username+" copied “"+serialNumber+"”";
+			dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue());
+			dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue());
 		}
 	}
 
@@ -300,17 +310,69 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	@Override
 	public void setBatch(DummyInventoryInfoEO dummyInventoryInfoEO) {
 		if(StringUtils.isNotBlank(dummyInventoryInfoEO.getIds())){
-			//更新log
-			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-			String username = sysUser.getUsername();
-			String contentLog = username+"批量设置了“";
-			StringBuilder contentLogBuilder = new StringBuilder(contentLog);
-
 			//根据id查询数据库中完整信息,翻译
 			List<String> idList = Arrays.asList(dummyInventoryInfoEO.getIds().split(","));
 			QueryWrapper<DummyInventoryInfoEO> queryWrapper = new QueryWrapper<>();
 			List<DummyInventoryInfoEO> infoList = list(queryWrapper.in("id", idList));
 			String projectId = infoList.get(0).getDummyInventoryBaseId();
+
+			List<DummyInventoryInfoEO> dummyInventoryInfoEOList = new ArrayList<>();
+			for (String id : dummyInventoryInfoEO.getIds().split(",")) {
+				DummyInventoryInfoEO dummyInventoryInfoEOTemp = new DummyInventoryInfoEO();
+				dummyInventoryInfoEOTemp.setId(id);
+				//实施类别 implementType
+				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())){
+					dummyInventoryInfoEOTemp.setImplementType(dummyInventoryInfoEO.getImplementType());
+				}
+				//认证类型  attestationType
+				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())){
+					dummyInventoryInfoEOTemp.setAttestationType(dummyInventoryInfoEO.getAttestationType());
+				}
+				//认证级别  attestationRank
+				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())){
+					dummyInventoryInfoEOTemp.setAttestationRank(dummyInventoryInfoEO.getAttestationRank());
+				}
+				//责任领域  dutyTerritory
+				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())){
+					dummyInventoryInfoEOTemp.setDutyTerritory(dummyInventoryInfoEO.getDutyTerritory());
+				}
+				//适用范围  shi4Yong4Fan4Wei2
+				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())){
+					dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2());
+				}
+				//技术领域  technologyTerritory
+				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){
+					dummyInventoryInfoEOTemp.setTechnologyTerritory(dummyInventoryInfoEO.getTechnologyTerritory());
+				}
+				//适用地区  region
+				if(StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())){
+					dummyInventoryInfoEOTemp.setRegion(dummyInventoryInfoEO.getRegion());
+				}
+				//新车实施日期
+				if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
+					dummyInventoryInfoEOTemp.setXin1Che1Xing2Shi2Shi1Ri4Qi1(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
+				}
+				//在产车实施日期
+				if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getImplementTime())){
+					dummyInventoryInfoEOTemp.setImplementTime(dummyInventoryInfoEO.getImplementTime());
+				}
+				dummyInventoryInfoEOList.add(dummyInventoryInfoEOTemp);
+			}
+			this.updateBatchById(dummyInventoryInfoEOList);
+
+		//更新log
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String username = sysUser.getUsername();
+		String contentLog = username+"批量设置了“";
+		StringBuilder contentLogBuilder = new StringBuilder(contentLog);
+		String enContentLog = username+" batch set “";
+		StringBuilder enContentLogBuilder = new StringBuilder(enContentLog);
+
+		//根据id查询数据库中完整信息,翻译
+//		List<String> idList = Arrays.asList(dummyInventoryInfoEO.getIds().split(","));
+//		QueryWrapper<DummyInventoryInfoEO> queryWrapper = new QueryWrapper<>();
+//		List<DummyInventoryInfoEO> infoList = list(queryWrapper.in("id", idList));
+//		String projectId = infoList.get(0).getDummyInventoryBaseId();
 		dummyInventoryBaseEOService.disposeData(infoList);
 
 		//翻译传入的数据
@@ -319,117 +381,122 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 		dummyInventoryBaseEOService.disposeData(inputList);
 		DummyInventoryInfoEO inputInfoEO = inputList.get(0);
 
-			List<DummyInventoryInfoEO> dummyInventoryInfoEOList = new ArrayList<>();
+		for (String id : idList) {
-			for (String id : dummyInventoryInfoEO.getIds().split(",")) {
 			DummyInventoryInfoEO info = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0);
 			contentLogBuilder.append(info.getSerialNumber() + ":");
+			enContentLogBuilder.append(info.getSerialNumber() + ":");
 			DummyInventoryInfoEO dummyInventoryInfoEOTemp = new DummyInventoryInfoEO();
 			dummyInventoryInfoEOTemp.setId(id);
 			//实施类别 implementType
 			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())) {
-					dummyInventoryInfoEOTemp.setImplementType(dummyInventoryInfoEO.getImplementType());
 				if (StringUtils.isBlank(info.getImplementType())){
 					info.setImplementType("空");
 				}
 				if (!info.getImplementType().equals(inputInfoEO.getImplementType())) {
 					setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName(), info.getImplementType(), inputInfoEO.getImplementType());
+					setUpdateEnContentLog(enContentLogBuilder,DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName(), info.getImplementType(), inputInfoEO.getImplementType());
 				}
-
 			}
 			//认证类型  attestationType
 			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())) {
-					dummyInventoryInfoEOTemp.setAttestationType(dummyInventoryInfoEO.getAttestationType());
 				if (StringUtils.isBlank(info.getAttestationType())){
 					info.setAttestationType("空");
 				}
 				if (!info.getAttestationType().equals(inputInfoEO.getAttestationType())) {
 					setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName(), info.getAttestationType(), inputInfoEO.getAttestationType());
+					setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName(), info.getAttestationType(), inputInfoEO.getAttestationType());
 				}
 			}
 			//认证级别  attestationRank
 			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) {
-					dummyInventoryInfoEOTemp.setAttestationRank(dummyInventoryInfoEO.getAttestationRank());
 				if (StringUtils.isBlank(info.getAttestationRank())){
 					info.setAttestationRank("空");
 				}
 				if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank())){
 					setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName(), info.getAttestationRank(), inputInfoEO.getAttestationRank());
+					setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName(), info.getAttestationRank(), inputInfoEO.getAttestationRank());
 				}
 			}
 			//责任领域  dutyTerritory
 			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())) {
-					dummyInventoryInfoEOTemp.setDutyTerritory(dummyInventoryInfoEO.getDutyTerritory());
 				if (StringUtils.isBlank(info.getDutyTerritory())){
 					info.setDutyTerritory("空");
 				}
 				if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory())){
 					setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory());
+					setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory());
 				}
 			}
 			//适用范围  shi4Yong4Fan4Wei2
 			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())){
-					dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2());
 				if (StringUtils.isBlank(info.getShi4Yong4Fan4Wei2())){
 					info.setShi4Yong4Fan4Wei2("空");
 				}
 				if (!info.getShi4Yong4Fan4Wei2().equals(inputInfoEO.getShi4Yong4Fan4Wei2())) {
 					setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName(),info.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2());
+					setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName(),info.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2());
 				}
 			}
 			//技术领域  technologyTerritory
 			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){
-					dummyInventoryInfoEOTemp.setTechnologyTerritory(dummyInventoryInfoEO.getTechnologyTerritory());
 				if (StringUtils.isBlank(info.getTechnologyTerritoryName())){
 					info.setTechnologyTerritoryName("空");
 				}
 				if (!info.getTechnologyTerritoryName().equals(inputInfoEO.getTechnologyTerritoryName())) {
 					setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName(),info.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName());
+					setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName(),info.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName());
 				}
 			}
 			//适用地区  region
 			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())){
-					dummyInventoryInfoEOTemp.setRegion(dummyInventoryInfoEO.getRegion());
 				if (StringUtils.isBlank(info.getRegion())){
 					info.setRegion("空");
 				}
 				if (!info.getRegion().equals(inputInfoEO.getRegion())) {
 					setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion());
+					setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getEnName(),info.getRegion(),inputInfoEO.getRegion());
 				}
 			}
 			//新车实施日期
 			if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
-					dummyInventoryInfoEOTemp.setXin1Che1Xing2Shi2Shi1Ri4Qi1(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
 				if (info.getXin1Che1Xing2Shi2Shi1Ri4Qi1() == null){
 					setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(),"空",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
+					setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(),"null",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
 				}else {
 					if (!info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().equals(inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())) {
 						setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
+						setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
 					}
 				}
 			}
 			//在产车实施日期
 			if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getImplementTime())){
-					dummyInventoryInfoEOTemp.setImplementTime(dummyInventoryInfoEO.getImplementTime());
 				if (info.getImplementTime() == null){
 					setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName(),"空",inputInfoEO.getImplementTimeString());
+					setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName(),"null",inputInfoEO.getImplementTimeString());
 				}else {
 					if (!info.getImplementTimeString().equals(inputInfoEO.getImplementTimeString())) {
 						setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString());
+						setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString());
 					}
 				}
 			}
-				dummyInventoryInfoEOList.add(dummyInventoryInfoEOTemp);
 		}
-			this.updateBatchById(dummyInventoryInfoEOList);
 
 		contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1);
 		contentLog += "”";
-			dummyLogEOService.updateLog(contentLog, projectId);
+		enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 1).replace("空","null");
+		enContentLog += "”";
+		dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue());
+		dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue());
 		}
 	}
 	public StringBuilder setUpdateContentLog(StringBuilder contentLogBuilder,String fieldName,String oldValue,String newValue){
 		return contentLogBuilder.append("\'"+ fieldName + "\'由" + oldValue + "改为了" + newValue).append(",");
 	}
+	public StringBuilder setUpdateEnContentLog(StringBuilder contentLogBuilder,String fieldName,String oldValue,String newValue){
+		return contentLogBuilder.append("\'"+ fieldName + "\' changed from " + oldValue + " to " + newValue).append(",");
+	}
 	/**
 	 * 模板下载
 	 * @param dummyInventoryInfoEO
@@ -1195,7 +1262,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 				String username = sysUser.getUsername();
 				String contentLog = username+"向清单中导入了“"+serialNumber+"”标准";
-				dummyLogEOService.updateLog(contentLog, dataList.get(0).getDummyInventoryBaseId());
+				String enContentLog = username+" imported “"+serialNumber+"” standard into the list.";
+				dummyLogEOService.updateLog(contentLog, dataList.get(0).getDummyInventoryBaseId(),CutEnum.CN.getValue());
+				dummyLogEOService.updateLog(enContentLog, dataList.get(0).getDummyInventoryBaseId(),CutEnum.EN.getValue());
 			}
 		}
 	}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyLogEOServiceImpl.java

@@ -1,6 +1,8 @@
 package com.jero.modules.dummy.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.dummy.entity.DummyLogEO;
 import com.jero.modules.dummy.mapper.DummyLogEOMapper;
@@ -24,13 +26,14 @@ public class DummyLogEOServiceImpl extends ServiceImpl<DummyLogEOMapper, DummyLo
 	 * 设置更新log
 	 *
 	 */
-	public void updateLog(String contentLog,String baseId) {
+	public void updateLog(String contentLog,String baseId,String isEnLog) {
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		if (StringUtils.isNotBlank(contentLog)) {
 			DummyLogEO dummyLogEO = new DummyLogEO();
 			dummyLogEO.setDummyInventoryBaseId(baseId);
 			dummyLogEO.setLogContent(contentLog);
 			dummyLogEO.setCreateBy(sysUser.getUsername());
+			dummyLogEO.setIsEnLog(isEnLog);
 			add(dummyLogEO);
 		}
 	}
@@ -104,4 +107,110 @@ public class DummyLogEOServiceImpl extends ServiceImpl<DummyLogEOMapper, DummyLo
 	public List<DummyLogEO> queryList() {
 		return list();
 	}
+
+	//翻译log数据
+	@Override
+	public IPage<DummyLogEO> disposeLog(IPage<DummyLogEO> pageList,String cut) {
+		for(DummyLogEO dummyLogEO : pageList.getRecords()){
+			if(CutEnum.EN.getValue().equals(cut)){
+				//添加
+				//String contentLog = username+"向清单中添加了标准“"+serialNumber+"”";
+				if(dummyLogEO.getLogContent().contains("向清单中添加了标准")){
+					String replaceLog = dummyLogEO.getLogContent().replace("向清单中添加了标准"," added the standard ")
+							.replace("”","” to the list.");
+					dummyLogEO.setLogContent(replaceLog);
+					System.out.println(dummyLogEO);
+				}
+				//编辑
+				//String contentLog = username+"编辑了清单中的“" + dummyInventoryInfoEO.getSerialNumber() + "”标准:";
+				else if(dummyLogEO.getLogContent().contains("编辑了清单中的")){
+					String replaceLog = dummyLogEO.getLogContent().replace("编辑了清单中的"," edited the ")
+							.replace("”标准","” standard in the list");
+//					replaceLog = transData(replaceLog);
+					dummyLogEO.setLogContent(replaceLog);
+					System.out.println(dummyLogEO);
+				}
+				//删除
+				//String contentLog = username+"删除了清单中的“"+serialNumber+"”标准";
+				/*else if(dummyLogEO.getLogContent().contains("删除了清单中的")){
+					String replaceLog = dummyLogEO.getLogContent().replace("删除了清单中的"," deleted the ")
+							.replace("”标准","” standard from the list");
+					dummyLogEO.setLogContent(replaceLog);
+					System.out.println(dummyLogEO);
+				}*/
+				//导入
+				//String contentLog = username+"向清单中导入了“"+serialNumber+"”标准";
+				/*else if(dummyLogEO.getLogContent().contains("向清单中导入了")){
+					String replaceLog = dummyLogEO.getLogContent().replace("向清单中添加了标准"," imported ")
+							.replace("”","” standard into the list.");
+					dummyLogEO.setLogContent(replaceLog);
+					System.out.println(dummyLogEO);
+				}*/
+				/*//复制
+				//String contentLog = username+"复制了“"+serialNumber+"”";
+				else if(dummyLogEO.getLogContent().contains("复制了")){
+					String replaceLog = dummyLogEO.getLogContent().replace("复制了"," copied ")
+							.replace("”","” to the list.");
+					dummyLogEO.setLogContent(replaceLog);
+					System.out.println(dummyLogEO);
+				}*/
+			/*	//批量设置
+				//XXX批量设置了“标准号1:'字段名'由XXX改为了XXX ,标准号2:"字段名'由XXX改为了xXX”。
+				//XXX batch set "standard number 1:' field name' changed from XXX to XXX, standard number 2:' field name' changed from XXX to XXX".
+				else if(dummyLogEO.getLogContent().contains("批量设置了")){
+					String replaceLog = dummyLogEO.getLogContent().replace("批量设置了"," batch set ");
+							////////
+					dummyLogEO.setLogContent(replaceLog);
+					System.out.println(dummyLogEO);
+				}*/
+			}
+		}
+		return pageList;
+	}
+/*
+
+	public String transData(String replaceLog){
+		replaceLog = replaceLog.replace("空","null").replace("由"," changed from ")
+				.replace("改为"," to ");
+		//实施类别 implementType
+		if(replaceLog.contains("实施类别")) {
+			replaceLog = replaceLog.replace(DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName(),DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName());
+		}
+		//认证类型  attestationType
+		if(replaceLog.contains("")) {//DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName()
+
+		}
+		//认证级别  attestationRank
+		if(replaceLog.contains("")) {//DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName()
+
+		}
+		//责任领域  dutyTerritory
+		if(replaceLog.contains("")) {//DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName()
+
+		}
+		//适用范围  shi4Yong4Fan4Wei2
+		if(replaceLog.contains("")){//DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName()
+
+		}
+		//技术领域  technologyTerritory
+		if(replaceLog.contains("")){//DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName()
+
+		}
+		//适用地区  region
+		if(replaceLog.contains("适用地区")){//DummyInventoryBaseFieldEnum.REGION.getName()
+			replaceLog = replaceLog.replace(DummyInventoryBaseFieldEnum.REGION.getName(),DummyInventoryBaseFieldEnum.REGION.getEnName());
+
+		}
+		//新车实施日期
+		if(replaceLog.contains("")){//DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName()
+
+		}
+		//在产车实施日期
+		if(replaceLog.contains("")){//DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName()
+
+		}
+		return replaceLog;
+	}
+*/
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryLogEO.java

@@ -68,4 +68,6 @@ public class ProjectLawsInventoryLogEO implements Serializable {
     @ApiModelProperty(value = "log内容")
     private String logContent;
 
+    /**log语言类别,cn中文,en英文*/
+    private java.lang.String isEnLog;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryLogEOMapper.xml

@@ -10,5 +10,6 @@
         <result column="sys_org_code" property="sysOrgCode" />
         <result column="project_library_id" property="projectLibraryId" />
         <result column="log_content" property="logContent" />
+        <result column="is_en_log" property="isEnLog" />
     </resultMap>
 </mapper>