WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature_dev_20221125_YW' into fix_2nd_period

Browse Source 
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
This commit is contained in:
高嵩
2022-12-28 09:58:11 +08:00
parent 4633d465f3 83b805edaa
commit f4d1b8676a
11 changed files with 930 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+16
View File
@@ -126,3 +126,19 @@ ADD COLUMN `brand` varchar(255) NULL COMMENT '品牌' AFTER `prc_num`;
-- 法规意见收集表添加字段
ALTER TABLE `laws_opinion_gather`
ADD COLUMN `brand` varchar(255) NULL COMMENT '品牌' AFTER `evaluator_ids`;
-- 参数收集清单-操作记录(历史日志) 2022-12-26 未同步生产环境
CREATE TABLE `laws_weilai`.`params_collect_manifest_log` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
`update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
`sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门',
`log_cn_content` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '中文内容',
`log_en_content` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '英文内容',
`remarks` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
`params_manifest_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数清单id',
`params_collect_manifest_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数收集清单id',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '参数收集清单-操作记录(历史日志)' ROW_FORMAT = Dynamic;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestLogEOController.java
+175
View File
@@ -0,0 +1,175 @@
package com.jero.modules.cert.collect.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestLogEO;
import com.jero.modules.cert.collect.service.IParamsCollectManifestLogEOService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/**
* @Description: 参数收集清单-操作记录(历史日志)
* @Author: jero-boot
* @Date: 2022-12-26
* @Version: V1.0
*/
@Api(tags="参数收集清单-操作记录(历史日志)")
@RestController
@RequestMapping("/paramsCollectManifestLog/paramsCollectManifestLogEO")
@Slf4j
public class ParamsCollectManifestLogEOController extends JeroController<ParamsCollectManifestLogEO, IParamsCollectManifestLogEOService> {
@Autowired
private IParamsCollectManifestLogEOService paramsCollectManifestLogEOService;
/**
* 分页列表查询
*
* @param paramsCollectManifestLogEO
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "参数收集清单-操作记录(历史日志)-分页列表查询")
@ApiOperation(value="参数收集清单-操作记录(历史日志)-分页列表查询", notes="参数收集清单-操作记录(历史日志)-分页列表查询")
@GetMapping(value = "/page")
public Result<?> queryPageList(ParamsCollectManifestLogEO paramsCollectManifestLogEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="cut", defaultValue="cn") String cut,
HttpServletRequest req) {
QueryWrapper<ParamsCollectManifestLogEO> queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectManifestLogEO, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
Page<ParamsCollectManifestLogEO> page = new Page<ParamsCollectManifestLogEO>(pageNo, pageSize);
IPage<ParamsCollectManifestLogEO> pageList = paramsCollectManifestLogEOService.page(page, queryWrapper);
List<ParamsCollectManifestLogEO> records = pageList.getRecords();
this.paramsCollectManifestLogEOService.disposeData(cut,records);
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "参数收集清单-操作记录(历史日志)-列表查询")
@ApiOperation(value="参数收集清单-操作记录(历史日志)-列表查询", notes="参数收集清单-操作记录(历史日志)-列表查询")
@GetMapping(value = "/list")
public Result<List<ParamsCollectManifestLogEO>> queryList() {
List<ParamsCollectManifestLogEO> list = paramsCollectManifestLogEOService.queryList();
return Result.OK(list);
}
/**
* 添加
*
* @param paramsCollectManifestLogEO
* @return
*/
@AutoLog(value = "参数收集清单-操作记录(历史日志)-添加")
@ApiOperation(value="参数收集清单-操作记录(历史日志)-添加", notes="参数收集清单-操作记录(历史日志)-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ParamsCollectManifestLogEO paramsCollectManifestLogEO) {
paramsCollectManifestLogEOService.add(paramsCollectManifestLogEO);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param paramsCollectManifestLogEO
* @return
*/
@AutoLog(value = "参数收集清单-操作记录(历史日志)-编辑")
@ApiOperation(value="参数收集清单-操作记录(历史日志)-编辑", notes="参数收集清单-操作记录(历史日志)-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ParamsCollectManifestLogEO paramsCollectManifestLogEO) {
paramsCollectManifestLogEOService.editById(paramsCollectManifestLogEO);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "参数收集清单-操作记录(历史日志)-通过id删除")
@ApiOperation(value="参数收集清单-操作记录(历史日志)-通过id删除", notes="参数收集清单-操作记录(历史日志)-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
paramsCollectManifestLogEOService.deleteById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "参数收集清单-操作记录(历史日志)-批量删除")
@ApiOperation(value="参数收集清单-操作记录(历史日志)-批量删除", notes="参数收集清单-操作记录(历史日志)-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.paramsCollectManifestLogEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "参数收集清单-操作记录(历史日志)-通过id查询")
@ApiOperation(value="参数收集清单-操作记录(历史日志)-通过id查询", notes="参数收集清单-操作记录(历史日志)-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
ParamsCollectManifestLogEO paramsCollectManifestLogEO = paramsCollectManifestLogEOService.queryById(id);
if(paramsCollectManifestLogEO==null) {
return Result.error("未找到对应数据");
}
return Result.OK(paramsCollectManifestLogEO);
}
/**
* 导出excel
*
* @param request
* @param paramsCollectManifestLogEO
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ParamsCollectManifestLogEO paramsCollectManifestLogEO) {
return super.exportXls(request, paramsCollectManifestLogEO, ParamsCollectManifestLogEO.class, "参数收集清单-操作记录(历史日志)");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ParamsCollectManifestLogEO.class);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestLogEO.java
+90
View File
@@ -0,0 +1,90 @@
package com.jero.modules.cert.collect.entity;
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 org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* @Description: 参数收集清单-操作记录(历史日志)
* @Author: jero-boot
* @Date: 2022-12-26
* @Version: V1.0
*/
@Data
@TableName("params_collect_manifest_log")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_collect_manifest_log对象", description="参数收集清单-操作记录(历史日志)")
public class ParamsCollectManifestLogEO implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**中文内容*/
@Excel(name = "中文内容", width = 15)
@ApiModelProperty(value = "中文内容")
private String logCnContent;
/**英文内容*/
@Excel(name = "英文内容", width = 15)
@ApiModelProperty(value = "英文内容")
private String logEnContent;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String remarks;
/**参数清单id*/
@Excel(name = "参数清单id", width = 15)
@ApiModelProperty(value = "参数清单id")
private String paramsManifestId;
/**参数收集清单id*/
@Excel(name = "参数收集清单id", width = 15)
@ApiModelProperty(value = "参数收集清单id")
private String paramsCollectManifestId;
@TableField(exist = false)
private String logContent;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestLogEOMapper.java
+14
View File
@@ -0,0 +1,14 @@
package com.jero.modules.cert.collect.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestLogEO;
/**
* @Description: 参数收集清单-操作记录(历史日志)
* @Author: jero-boot
* @Date: 2022-12-26
* @Version: V1.0
*/
public interface ParamsCollectManifestLogEOMapper extends BaseMapper<ParamsCollectManifestLogEO> {
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestLogEOMapper.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.paramsCollectManifestLog.mapper.ParamsCollectManifestLogEOMapper">
<resultMap id="ParamsCollectManifestLogEOResultMap" type="com.jero.modules.cert.collect.entity.ParamsCollectManifestLogEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="log_cn_content" property="logCnContent" />
<result column="log_en_content" property="logEnContent" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="params_collect_manifest_id" property="paramsCollectManifestId" />
</resultMap>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestLogEOService.java
+69
View File
@@ -0,0 +1,69 @@
package com.jero.modules.cert.collect.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestLogEO;
import java.util.List;
/**
* @Description: 参数收集清单-操作记录(历史日志)
* @Author: jero-boot
* @Date: 2022-12-26
* @Version: V1.0
*/
public interface IParamsCollectManifestLogEOService extends IService<ParamsCollectManifestLogEO> {
/**
* 保存
*
* @param paramsCollectManifestLogEO
* @return
*/
void add(ParamsCollectManifestLogEO paramsCollectManifestLogEO);
/**
* 更新
*
* @param paramsCollectManifestLogEO
* @return
*/
void editById(ParamsCollectManifestLogEO paramsCollectManifestLogEO);
/**
* 通过id删除
*
* @param id
* @return
*/
void deleteById(String id);
/**
* 批量删除
*
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
ParamsCollectManifestLogEO queryById(String id);
/**
* 列表查询
*
* @return
*/
List<ParamsCollectManifestLogEO> queryList();
/**
* 处理数据
* @param cut
* @param datas
*/
void disposeData(String cut, List<ParamsCollectManifestLogEO> datas);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+322 -6
View File
@@ -22,10 +22,7 @@ import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServi
import com.jero.modules.cert.collect.entity.*;
import com.jero.modules.cert.collect.enums.*;
import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
import com.jero.modules.cert.collect.service.IParamsConfigEOService;
import com.jero.modules.cert.collect.service.IParamsManifestEOService;
import com.jero.modules.cert.collect.service.*;
import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
import com.jero.modules.cert.collect.vo.ParamsManifestVO;
@@ -63,6 +60,7 @@ import com.jero.modules.system.service.ISysAnnouncementService;
import com.jero.modules.system.service.ISysDictItemService;
import com.jero.modules.system.service.ISysUserRoleService;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
import org.apache.commons.collections4.CollectionUtils;
import com.jero.modules.system.service.*;
import org.apache.commons.io.FileUtils;
@@ -154,6 +152,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Autowired
private IProjectLibraryBaseService projectLibraryBaseService;
@Autowired
private IParamsCollectManifestLogEOService paramsCollectManifestLogEOService;
@Autowired
private SysDictItemServiceImpl sysDictItemServiceImpl;
@Autowired
private WebSocketServer webSocketServer; // 同步上报库时变更清单状态时使用
@Autowired
private IProjectUserPermissionService projectUserPermissionService;
@@ -1168,6 +1170,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
list.add(map);
}
Map<String, Object> operatorMap = new HashMap<>();
if(CutEnum.CN.getValue().equals(cut)){
operatorMap.put("db_field_txt","操作");
}else{
operatorMap.put("db_field_txt","Operator");
}
operatorMap.put("click6", true);
list.add(operatorMap);
list.addAll(indexOfDescription+1, listConfig);
return list;
}
@@ -1177,10 +1188,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<ParamsConfigDataEO> newConfigDataEOList = new ArrayList<>();
List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
List<ParamsCollectManifestLogEO> paramsCollectManifestLogEOList = new ArrayList<>();
// 处理数据
for (Map<String, Object> map : configDataList) {
String paramsCollectManifestId = (String) map.get("id");
ParamsCollectManifestEO paramsCollectManifestEO = this.paramsCollectManifestEOMapper.selectById(paramsCollectManifestId);
// 修改参数项状态
ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
@@ -1188,6 +1202,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
updateCollectManifestEO.setState(CollectManifestStateEnum.SUBMIT.getValue());
updateCollectManifestEOList.add(updateCollectManifestEO);
StringBuilder logCnContentSb = new StringBuilder();
logCnContentSb.append("填写人").append("\"").append(currentUser.getUsername()).append("\"").append("提交");
StringBuilder logEnContentSb = new StringBuilder();
logEnContentSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submits ");
// 添加配置数据
for (Map.Entry<String, Object> entry : map.entrySet()) {
ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
@@ -1209,17 +1228,39 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
ParamsConfigEO paramsConfigEO = this.paramsConfigEOService.queryById(paramsConfigEOId);
if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
boolean appendFlag = false; // 拼接标识
for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
String dataValue = (String) paramsConfigDataVO.get("dataValue");
// 只要其中有一个值就可以进行拼接
if(StringUtils.isNotEmpty(dataValue)){
appendFlag = true;
break;
}
}
if(appendFlag){
logCnContentSb.append(paramsConfigEO.getConfigName()).append("为");
logEnContentSb.append(" configuration ").append(paramsConfigEO.getConfigName()).append(" as ");
}
for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
String type = (String) paramsConfigDataVO.get("type");
String dataValue = (String) paramsConfigDataVO.get("dataValue");
if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) {
paramsConfigDataEO.setTextData(dataValue);
if (StringUtils.isNotEmpty(dataValue)) {
logCnContentSb.append("\"").append(dataValue).append("\"");
logEnContentSb.append("\"").append(dataValue).append("\"");
}
} else if (type.equals(ConfigDataTypeEnum.PULL.getValue())
|| type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) {
paramsConfigDataEO.setPullData(dataValue);
if (StringUtils.isNotEmpty(dataValue)) {
logCnContentSb.append("\"").append(dataValue).append("\"");
logEnContentSb.append("\"").append(dataValue).append("\"");
}
} else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) {
if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件
@@ -1253,15 +1294,37 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
paramsConfigDataEO.setFileConnectId(dataValue);
List<OSSFile> fileInfos = ossFileService.getFileInfos(dataValue);
String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
if (StringUtils.isNotEmpty(fileNames)) {
logCnContentSb.append("\"").append(fileNames).append("\"");
logEnContentSb.append("\"").append(fileNames).append("\"");
}
}
}
if(appendFlag){
logCnContentSb.append("，");
logEnContentSb.append(" and ");
}
}
newConfigDataEOList.add(paramsConfigDataEO);
}
ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO();
paramsCollectManifestLogEO.setLogCnContent(logCnContentSb.toString().substring(0,logCnContentSb.toString().length()-1));
paramsCollectManifestLogEO.setLogEnContent(logEnContentSb.toString().substring(0,logEnContentSb.toString().length()-5));
paramsCollectManifestLogEO.setParamsManifestId(paramsCollectManifestEO.getParamsManifestId());
paramsCollectManifestLogEO.setParamsCollectManifestId(paramsCollectManifestEO.getId());
paramsCollectManifestLogEOList.add(paramsCollectManifestLogEO);
}
// 批量更新
paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList);
if(CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)){
this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList);
}
return updateBatchById(updateCollectManifestEOList);
}
@@ -1661,10 +1724,16 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())) {
throw new JeroBootException("参数不能为空！");
}
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
// 配置
List<ParamsConfigEO> paramsConfigEOList = this.paramsConfigEOService.queryList(paramsManifestId);
List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
List<ParamsCollectManifestLogEO> paramsCollectManifestLogEOList = new ArrayList<>();
for (int i=0; i<paramsCollectManifestIdStr.length; i++) {
ParamsCollectManifestEO paramsCollectManifestEO = getById(paramsCollectManifestIdStr[i]);
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
@@ -1678,10 +1747,82 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
updateEO.setState(String.valueOf(Integer.parseInt(paramsCollectManifestEO.getState()) + 1)); // 设置对应状态
}
updateEOList.add(updateEO);
StringBuilder logCnContentSb = new StringBuilder();
StringBuilder logEnContentSb = new StringBuilder();
String currentPersonRole = paramsCollectManifestVO.getCurrentPersonRole();
if(StringUtils.equals(currentPersonRole,CollectManifestUserTypeEnum.HOMO.getValue()) || StringUtils.equals(currentPersonRole,CollectManifestUserTypeEnum.SDT.getValue())){
if(StringUtils.equals(currentPersonRole,CollectManifestUserTypeEnum.HOMO.getValue())){
logCnContentSb.append("认证工程师").append("\"").append(currentUser.getUsername()).append("\"").append("将");
logEnContentSb.append("The Homo Engineer ").append("\"").append(currentUser.getUsername()).append("\"").append(" returns the ");
}else if(StringUtils.equals(currentPersonRole,CollectManifestUserTypeEnum.SDT.getValue())){
logCnContentSb.append("工程接口人").append("\"").append(currentUser.getUsername()).append("\"").append("将");
logEnContentSb.append("Eng. Interface ").append("\"").append(currentUser.getUsername()).append("\"").append(" will return the ");
}
// 添加配置数据
int paramsConfigLenth = 1;
for (ParamsConfigEO configEO : paramsConfigEOList) {
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), paramsCollectManifestEO.getId());
if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
logCnContentSb.append(configEO.getConfigName());
logCnContentSb.append(" 的");
if(StringUtils.isNotEmpty(configDataEO.getPullData())){
logCnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
logEnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
}
if(StringUtils.isNotEmpty(configDataEO.getTextData())){
logCnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
logEnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
}
if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
List<OSSFile> fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId());
String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
if (StringUtils.isNotEmpty(fileNames)) {
logCnContentSb.append("\"" +fileNames+ "\"");
logEnContentSb.append("\"" +fileNames+ "\"");
}
}
logEnContentSb.append(" of configuration " +configEO.getConfigName()+ "");
// 如果配置有两条或两条以上，并且不是最后一次循环
if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){
logCnContentSb.append("，");
logEnContentSb.append(" and ");
}
}
paramsConfigLenth ++;
}
if(StringUtils.equals(currentPersonRole,CollectManifestUserTypeEnum.HOMO.getValue())){
logCnContentSb.append("退回给填写人").append("\"").append(paramsCollectManifestEO.getDre()).append("\"");
logEnContentSb.append(" to the person ").append("\"").append(paramsCollectManifestEO.getDre()).append("\".");
}else if(StringUtils.equals(currentPersonRole,CollectManifestUserTypeEnum.SDT.getValue())){
logCnContentSb.append("退回给认证工程师");
logEnContentSb.append(" to the Homo Engineer.");
}
} else if(StringUtils.equals(currentPersonRole,CollectManifestUserTypeEnum.DRE.getValue())){
logCnContentSb.append("填写人").append("\"").append(currentUser.getUsername()).append("\"").append("退回给工程接口人").append("\"").append(paramsCollectManifestEO.getSdt()).append("\"");
logEnContentSb.append("DRE ").append("\"").append(currentUser.getUsername()).append("\"").append(" return to project Eng. Interface ").append("\"").append(paramsCollectManifestEO.getSdt()).append("\"");
}
ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO();
paramsCollectManifestLogEO.setLogCnContent(logCnContentSb.toString());
paramsCollectManifestLogEO.setLogEnContent(logEnContentSb.toString());
paramsCollectManifestLogEO.setParamsManifestId(paramsManifestId);
paramsCollectManifestLogEO.setParamsCollectManifestId(paramsCollectManifestEO.getId());
paramsCollectManifestLogEOList.add(paramsCollectManifestLogEO);
}
boolean update = updateBatchById(updateEOList);
if(CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)){
this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList);
}
if (update) {
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
//飞书
for (ParamsCollectManifestEO paramsCollectManifestEO : updateEOList) {
paramsCollectManifestEO = getById(paramsCollectManifestEO.getId());
@@ -1788,6 +1929,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
List<ParamsCollectManifestLogEO> paramsCollectManifestLogEOList = new ArrayList<>();
List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
for (int i=0; i<paramsCollectManifestIdStr.length; i++) {
@@ -1808,6 +1951,16 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
updateEO.setId(paramsCollectManifestIdStr[i]);
updateEOList.add(updateEO);
ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO();
paramsCollectManifestLogEO.setLogCnContent("工程接口人\"" +currentUser.getUsername()+ "\"将参数数据强制撤回");
paramsCollectManifestLogEO.setLogEnContent("The Eng. Interface \""+ currentUser.getUsername() +"\" will forcibly withdraw the parameter data");
paramsCollectManifestLogEO.setParamsManifestId(paramsCollectManifestEO.getParamsManifestId());
paramsCollectManifestLogEO.setParamsCollectManifestId(paramsCollectManifestEO.getId());
paramsCollectManifestLogEOList.add(paramsCollectManifestLogEO);
}
if(CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)){
this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList);
}
return updateBatchById(updateEOList);
}
@@ -1912,12 +2065,28 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<ParamsCollectManifestEO> paramsCollectManifestEOList = list(queryWrapper);
Date deadline = paramsCollectManifestEOList.get(0).getDeadline();
int i = 0;
List<ParamsCollectManifestLogEO> paramsCollectManifestLogEOList = new ArrayList<>();
for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
if (i < 3) {
connectBuilder.append(paramsCollectManifestEO.getNioNumber()).append("-").append(paramsCollectManifestEO.getParamsName()).append(",");
}
i++;
String logCnContent = "工程接口人\"" +currentUser.getUsername()+ "\"将参数填写人由\"空\"修改为\"" + dre + "\"";
String logEnContent = "Eng. Interface \"" +currentUser.getUsername()+ "\" Change the parameter person from \"null\" to \"" +dre+ "\".";
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) {
logCnContent = "工程接口人\"" +currentUser.getUsername()+ "\"将参数填写人由\""+ paramsCollectManifestEO.getDre() +"\"修改为\"" + dre + "\"";
logEnContent = "Eng. Interface \"" +currentUser.getUsername()+ "\" Change the parameter person from \""+ paramsCollectManifestEO.getDre() +"\" to \"" + dre + "\".";
}
ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO();
paramsCollectManifestLogEO.setLogCnContent(logCnContent);
paramsCollectManifestLogEO.setLogEnContent(logEnContent);
paramsCollectManifestLogEO.setParamsManifestId(paramsManifestId);
paramsCollectManifestLogEO.setParamsCollectManifestId(paramsCollectManifestEO.getId());
paramsCollectManifestLogEOList.add(paramsCollectManifestLogEO);
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
updateEO.setId(paramsCollectManifestEO.getId());
updateEO.setDre(dre); // 设置填写人
@@ -1927,6 +2096,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
delDrePermission.add(PermissionDescriptionEnum.PARAMS_COLLECT_MANIFEST.getValue() + paramsCollectManifestEO.getId());
}
boolean isSuccess = updateBatchById(updateEOList);
if(CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)){
this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList);
}
if (isSuccess) {
//设置权限 先删后加
Date now = new Date();
@@ -2040,6 +2214,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<Map<String, String>> msgMapList = new ArrayList<>();
List<String> updateEOIdList = new ArrayList<>();
List<String> delSdtPermission = new ArrayList<>();
List<ParamsCollectManifestLogEO> paramsCollectManifestLogEOList = new ArrayList<>();
List<ParamsCollectManifestEO> paramsCollectManifestEOList = listByIds(Arrays.asList(paramsCollectManifestIdStr));
paramsCollectManifestEOList = paramsCollectManifestEOList.stream().sorted(Comparator.comparing(ParamsCollectManifestBaseEO::getNioNumber)).collect(Collectors.toList()); // 按NIO编号升序
for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
@@ -2061,6 +2237,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
updateEOIdList.add(paramsCollectManifestEO.getId());
delSdtPermission.add(PermissionDescriptionEnum.PARAMS_COLLECT_MANIFEST.getValue() + paramsCollectManifestEO.getId());
ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO();
paramsCollectManifestLogEO.setLogCnContent("认证工程师\""+currentUser.getUsername()+"\"开始了下发收集，工程接口人为\""+paramsCollectManifestEO.getSdt()+"\"");
paramsCollectManifestLogEO.setLogEnContent("The Homo Engineer \""+currentUser.getUsername()+"\" starts to deliver the collection, and the Eng. Interface is \""+paramsCollectManifestEO.getSdt()+"\".");
paramsCollectManifestLogEO.setParamsManifestId(paramsManifestId);
paramsCollectManifestLogEO.setParamsCollectManifestId(paramsCollectManifestEO.getId());
paramsCollectManifestLogEOList.add(paramsCollectManifestLogEO);
} else {
Map<String, String> msgMap = new HashMap<>();
msgMap.put("nioNumber", paramsCollectManifestEO.getNioNumber());
@@ -2169,6 +2352,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
log.error("飞书消息推送失败");
}
}
if(CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)){
this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList);
}
}
return getMsgOfIssueCollection(msgMapList, cut, "1");
@@ -2197,6 +2384,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<Map<String, String>> msgMapList = new ArrayList<>();
List<String> updateEOIdList = new ArrayList<>();
List<String> delSdtPermission = new ArrayList<>();
List<ParamsCollectManifestLogEO> paramsCollectManifestLogEOList = new ArrayList<>();
LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, paramsManifestId)
.notIn(ParamsCollectManifestEO::getControlType, ControlTypeEnum.Title.getValue())
@@ -2221,6 +2410,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
updateEOIdList.add(paramsCollectManifestEO.getId());
delSdtPermission.add(PermissionDescriptionEnum.PARAMS_COLLECT_MANIFEST.getValue() + paramsCollectManifestEO.getId());
ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO();
paramsCollectManifestLogEO.setLogCnContent("认证工程师\""+currentUser.getUsername()+"\"开始了下发收集，工程接口人为\""+paramsCollectManifestEO.getSdt()+"\"");
paramsCollectManifestLogEO.setLogEnContent("The Homo Engineer \""+currentUser.getUsername()+"\" starts to deliver the collection, and the Eng. Interface is \""+paramsCollectManifestEO.getSdt()+"\".");
paramsCollectManifestLogEO.setParamsManifestId(paramsManifestId);
paramsCollectManifestLogEO.setParamsCollectManifestId(paramsCollectManifestEO.getId());
paramsCollectManifestLogEOList.add(paramsCollectManifestLogEO);
} else {
Map<String, String> msgMap = new HashMap<>();
msgMap.put("nioNumber", paramsCollectManifestEO.getNioNumber());
@@ -2331,6 +2527,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
log.error("飞书消息推送失败");
}
}
if(CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)){
this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList);
}
}
return getMsgOfIssueCollection(msgMapList, cut, "1");
@@ -2539,6 +2739,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
if (StringUtils.isEmpty(paramsCollectManifestVO.getIds()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
throw new JeroBootException("参数不能为空！");
}
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
@@ -2583,6 +2784,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.selectBatchIds(paramsCollectManifestIdList);
List<ParamsReportDetailEO> addReportDetailEOList = new ArrayList<>();
List<ParamsReportConfigDataEO> addReportConfigDataEOList = new ArrayList<>(); // 需要添加的配置数据
List<ParamsCollectManifestLogEO> paramsCollectManifestLogEOList = new ArrayList<>();
Date syncTime = new Date();
for (ParamsCollectManifestEO collectManifestEO : paramsCollectManifestEOList) {
ParamsReportDetailEO addReportDetailEO = new ParamsReportDetailEO();
@@ -2593,7 +2795,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
addReportDetailEO.setSyncTime(syncTime);
addReportDetailEOList.add(addReportDetailEO);
StringBuilder logCnContentSb = new StringBuilder();
logCnContentSb.append("认证工程师").append("\"").append(currentUser.getUsername()).append("\"").append("将");
StringBuilder logEnContentSb = new StringBuilder();
logEnContentSb.append("The Homo Engineer ").append("\"").append(currentUser.getUsername()).append("\"").append(" will synchronize the");
// 添加配置数据
int paramsConfigLenth = 1;
for (ParamsConfigEO configEO : paramsConfigEOList) {
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
@@ -2604,7 +2812,48 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
addReportConfigDataEO.setParamsCollectManifestId(reportDetailId);
addReportConfigDataEOList.add(addReportConfigDataEO);
if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
logCnContentSb.append(configEO.getConfigName());
logCnContentSb.append(" 的");
if(StringUtils.isNotEmpty(configDataEO.getPullData())){
logCnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
logEnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
}
if(StringUtils.isNotEmpty(configDataEO.getTextData())){
logCnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
logEnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
}
if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
List<OSSFile> fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId());
String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
if (StringUtils.isNotEmpty(fileNames)) {
logCnContentSb.append("\"" +fileNames+ "\"");
logEnContentSb.append("\"" +fileNames+ "\"");
}
}
logEnContentSb.append("of configuration " +configEO.getConfigName()+ "");
// 如果配置有两条或两条以上，并且不是最后一次循环
if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){
logCnContentSb.append("，");
logEnContentSb.append(" and ");
}
}
paramsConfigLenth ++;
}
logCnContentSb.append(" 同步至上报库");
logEnContentSb.append(" to the report database");
ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO();
paramsCollectManifestLogEO.setLogCnContent(logCnContentSb.toString());
paramsCollectManifestLogEO.setLogEnContent(logEnContentSb.toString());
paramsCollectManifestLogEO.setParamsManifestId(paramsManifestId);
paramsCollectManifestLogEO.setParamsCollectManifestId(collectManifestEO.getId());
paramsCollectManifestLogEOList.add(paramsCollectManifestLogEO);
}
List<String> nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
@@ -2686,6 +2935,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
boolean isSuccess = updateBatchById(updateEOList);
if(CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)){
this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList);
}
// 判断清单是否已完成，修改清单状态
Map<String, Object> map = isCollectFinished(paramsManifestId);
Boolean finish = (Boolean) map.get("finish");
@@ -2701,7 +2954,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
webSocketServer.sendMessage();
}
}
return isSuccess;
}
@@ -3334,6 +3586,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
String projectId = paramsCollectManifestVO.getProjectId();
String cut = paramsCollectManifestVO.getCut();
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 查询参数清单
ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
@@ -3342,6 +3595,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
queryWrapper.in(ParamsCollectManifestEO::getId, paramsCollectManifestIdList);
List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.selectList(queryWrapper);
// 查询所有的责任领域
List<SysDictItem> dutyTerritoryList = this.sysDictItemServiceImpl.selectItemsByDictCode("duty_territory");
List<ParamsCollectManifestLogEO> paramsCollectManifestLogEOList = new ArrayList<>();
List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
List<Map<String, String>> msgMapList = new ArrayList<>();
paramsCollectManifestEOList.forEach(paramsCollectManifestEO -> {
@@ -3372,6 +3629,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
updateEOList.add(updateEO);
String oldDutyTerritoryNameCn = this.getDutyTerritoryNameByCode(dutyTerritoryList,paramsCollectManifestEO.getDutyTerritory(),CutEnum.CN.getValue());
String newDutyTerritoryNameCn = this.getDutyTerritoryNameByCode(dutyTerritoryList,dutyTerritory,CutEnum.CN.getValue());
String oldDutyTerritoryNameEn = this.getDutyTerritoryNameByCode(dutyTerritoryList,paramsCollectManifestEO.getDutyTerritory(),CutEnum.EN.getValue());
String newDutyTerritoryNameEn = this.getDutyTerritoryNameByCode(dutyTerritoryList,dutyTerritory,CutEnum.EN.getValue());
ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO();
paramsCollectManifestLogEO.setLogCnContent("认证工程师\""+currentUser.getUsername()+"\"将参数责任领域信息由\""+oldDutyTerritoryNameCn+"\"修改为\""+newDutyTerritoryNameCn+"\"");
paramsCollectManifestLogEO.setLogEnContent("The Homo Engineer \""+currentUser.getUsername()+"\" changed the parameter responsibility field information from \""+oldDutyTerritoryNameEn+"\" to " + "\""+newDutyTerritoryNameEn+"\"");
paramsCollectManifestLogEO.setParamsManifestId(paramsManifestId);
paramsCollectManifestLogEO.setParamsCollectManifestId(paramsCollectManifestEO.getId());
paramsCollectManifestLogEOList.add(paramsCollectManifestLogEO);
} else {
Map<String, String> msgMap = new HashMap<>();
msgMap.put("nioNumber", paramsCollectManifestEO.getNioNumber());
@@ -3384,10 +3653,45 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
// 修改责任领域及工程接口人
updateBatchById(updateEOList);
if(CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)){
this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList);
}
// 返回不符合参数项的提示信息
return getMsgOfIssueCollection(msgMapList, cut, "2");
}
/**
* 根据责任领域code，获取责任领域名称，包含中英文切换。
* @param dutyTerritoryList
* @param dutyTerritoryCode
* @param cut
* @return
*/
public String getDutyTerritoryNameByCode(List<SysDictItem> dutyTerritoryList,String dutyTerritoryCode,String cut){
String result = null;
if (CollectionUtils.isNotEmpty(dutyTerritoryList) && StringUtils.isNotEmpty(dutyTerritoryCode)) {
if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
result = dutyTerritoryList.stream().filter(dutyTerritory -> {
boolean flag = false;
if(StringUtils.equals(dutyTerritory.getItemValue(),dutyTerritoryCode)){
flag = true;
}
return flag;
}).map(SysDictItem::getItemText).collect(Collectors.joining(","));
} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
result = dutyTerritoryList.stream().filter(dutyTerritory -> {
boolean flag = false;
if(StringUtils.equals(dutyTerritory.getItemValue(),dutyTerritoryCode)){
flag = true;
}
return flag;
}).map(SysDictItem::getEnName).collect(Collectors.joining(","));
}
}
return result;
}
private String[] getWorkbookTitleForExport(ParamsCollectManifestVO paramsCollectManifestVO) {
String cut = paramsCollectManifestVO.getCut();
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
@@ -5259,6 +5563,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
QueryWrapper<ParamsConfigDataEO> configDataQueryWrap = new QueryWrapper<>();
configDataQueryWrap.lambda().in(ParamsConfigDataEO::getParamsCollectManifestId,paramsCollectManifestIdArr);
List<ParamsConfigDataEO> paramsConfigDataList = this.paramsConfigDataEOService.list(configDataQueryWrap);
List<ParamsCollectManifestLogEO> paramsCollectManifestLogEOList = new ArrayList<>();
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
for (int i=0; i<paramsCollectManifestIdArr.length; i++) {
String paramsCollectManifestId = paramsCollectManifestIdArr[i];
@@ -5299,6 +5605,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
}
ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO();
paramsCollectManifestLogEO.setLogCnContent("认证工程师\""+currentUser.getUsername()+"\"将参数数据强制撤回");
paramsCollectManifestLogEO.setLogEnContent("The Homo Engineer \""+currentUser.getUsername()+"\" will forcibly withdraw the parameter data");
paramsCollectManifestLogEO.setParamsManifestId(collectManifestEO.getParamsManifestId());
paramsCollectManifestLogEO.setParamsCollectManifestId(collectManifestEO.getId());
paramsCollectManifestLogEOList.add(paramsCollectManifestLogEO);
LambdaUpdateWrapper<ParamsCollectManifestEO> updateWrap = new LambdaUpdateWrapper<>();
updateWrap.set(ParamsCollectManifestEO::getSdt,null);
updateWrap.set(ParamsCollectManifestEO::getDre,null);
@@ -5313,6 +5626,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
throw new JeroBootException("强制撤回，更新参数收集清单失败!");
}
}
if(CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)){
this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList);
}
return Result.OK("强制撤回成功！");
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestLogEOServiceImpl.java
+108
View File
@@ -0,0 +1,108 @@
package com.jero.modules.cert.collect.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.CutEnum;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestLogEO;
import com.jero.modules.cert.collect.mapper.ParamsCollectManifestLogEOMapper;
import com.jero.modules.cert.collect.service.IParamsCollectManifestLogEOService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* @Description: 参数收集清单-操作记录(历史日志)
* @Author: jero-boot
* @Date: 2022-12-26
* @Version: V1.0
*/
@Service
public class ParamsCollectManifestLogEOServiceImpl extends ServiceImpl<ParamsCollectManifestLogEOMapper, ParamsCollectManifestLogEO> implements IParamsCollectManifestLogEOService {
/**
* 保存
*
* @param paramsCollectManifestLogEO
* @return
*/
@Override
public void add(ParamsCollectManifestLogEO paramsCollectManifestLogEO) {
Date now = new Date();
paramsCollectManifestLogEO.setCreateTime(now);
paramsCollectManifestLogEO.setUpdateTime(now);
save(paramsCollectManifestLogEO);
}
/**
* 更新
*
* @param paramsCollectManifestLogEO
* @return
*/
@Override
public void editById(ParamsCollectManifestLogEO paramsCollectManifestLogEO) {
Date now = new Date();
paramsCollectManifestLogEO.setUpdateTime(now);
saveOrUpdate(paramsCollectManifestLogEO);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public ParamsCollectManifestLogEO queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<ParamsCollectManifestLogEO> queryList() {
return list();
}
@Override
public void disposeData(String cut, List<ParamsCollectManifestLogEO> datas) {
if(CollectionUtils.isNotEmpty(datas)){
for (ParamsCollectManifestLogEO data : datas) {
String logContent = "";
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
logContent = data.getLogCnContent();
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
logContent = data.getLogEnContent();
}
data.setLogContent(logContent);
}
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
+2
View File
@@ -92,5 +92,7 @@ public class ParamsCollectManifestVO {
@ApiModelProperty(value = "")
private String allNumber;
// 退回操作人角色
private String currentPersonRole;
}
jero-web/src/components/tableCollection/index.vue
+114 -2
View File
@@ -33,7 +33,10 @@
<a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
</span>
<!-- 历史记录-->
<template slot="Operation" slot-scope="text, record">
<a-button class="action-dict" @click="UpdateLog(record)">{{$t('historicalrecord')}}</a-button>
</template>
<span slot="paramsNameDescription" slot-scope="text,record" :title="text">
{{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}
</span>
@@ -166,6 +169,51 @@
</div>
</div>
</a-modal>
<!-- 历史记录-->
<a-modal
:title="$t('historicalrecord')"
:width="900"
:visible="visible"
:confirm-loading="confirmLoading"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
>
<a-table
class="table"
:columns="columnshistory"
:pagination="false"
:scroll="{y: 400}"
:data-source="dataSourcehistory"
:loading="loading"
>
<span slot="content" slot-scope="text,record">
<a-tooltip placement="topLeft">
<template slot="title">
<span v-html="text"></span>
</template>
<span v-html="text"></span>
</a-tooltip>
</span>
<span slot="detailText" slot-scope="text,record">
<span class="text" :title="text">
{{text && text.length > 10?text.slice(0,9)+'...':text}}
</span>
</span>
</a-table>
<div class="page" v-if="dataSourcehistory.length > 0">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="pageSizehistory"
:total="total"
:current="pageNohistory"
@change="onChangehistory"
@showSizeChange="SizeChangehistory"
/>
</div>
</a-modal>
<!-- 配置信息--->
<a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null">
<div class="content-text">
@@ -311,6 +359,8 @@
dataSource: [],
pageNo: 1,
pageSize: 100,
pageNohistory: 1,
pageSizehistory: 10,
pageSizeOptions: ['100', '200'],
total: 0,
searchParmes: {},
@@ -354,7 +404,25 @@
getquerySdtId: '', // 当前工程接口人的id
areaVisibleView: false, // 查看配置得弹框
seeVisibleView: false,
configDetail: {} // 查看配置得详细信息
visible: false,
configDetail: {}, // 查看配置得详细信息
dataSourcehistory:[],
columnshistory: [
{
title: this.$t('OperationDetails'),
dataIndex: 'logContent',
align: 'center',
ellipsis: true,
scopedSlots: { customRender: 'content' }
},
{
title: this.$t('OperationTime'),
dataIndex: 'createTime',
align: 'center',
ellipsis: true,
width: 180
}
]
}
},
mounted() {
@@ -599,6 +667,45 @@
}
})
},
UpdateLog(val) {
this.visible = true
this.paramsReportDetailId = val.id
this.bussLogList(val)
},
onChangehistory(page, pageSize) {
console.log(1)
this.pageNohistory = page
this.bussLogList()
},
SizeChangehistory(page, pageSize) {
this.pageNo = 1
this.pageSizehistory = pageSize
this.bussLogList()
},
bussLogList(val) {
let query = {
pageNo: this.pageNohistory,
pageSize: this.pageSizehistory,
paramsManifestId: this.$route.query.id,
paramsCollectManifestId: this.paramsReportDetailId
}
this.loading = true
getAction('paramsCollectManifestLog/paramsCollectManifestLogEO/page', query).then((res) => {
if (res.success) {
this.dataSourcehistory = res.result.records
this.total = res.result.total
this.loading = false
} else {
this.loading = false
}
})
},
handleOk() {
this.visible = false
},
handleCancel() {
this.visible = false
},
getAndUserId(result) {
let query = {
paramsManifestId: this.$route.query.id,
@@ -699,6 +806,11 @@
customRender: 'paramsNameDescription'
}
}
if (res.click6) {
this.columns[index].scopedSlots = {
customRender: 'Operation'
}
}
if (res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+4 -1
View File
@@ -1654,7 +1654,10 @@
_array.push(item.id)
})
let _this = this
let param = { ids: _array.join(',') }
let param = { ids: _array.join(','),
currentPersonRole: this.currentPersonRole,
paramsManifestId: this.$route.query.id
}
this.textLoading = true
axios({
url: '/jero-boot/params/collectManifest/back',