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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-05-31 09:36:41 +08:00
parent ff93603d5a d298554b3b
commit 8da0bb6b94
46 changed files with 1157 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-center/src/test/java/com/adc/da/ApplicationTests.java
+1
View File
@@ -5,6 +5,7 @@ import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class ApplicationTests {
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+1 -1
View File
@@ -223,7 +223,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
*/
@AutoLog(value = "参数清单-查询所有项目的所有参数清单")
@ApiOperation(value="参数清单-查询所有项目的所有参数清单", notes="参数清单-查询所有项目的所有参数清单")
@GetMapping(value = "/getAllManifest")
@PostMapping(value = "/getAllManifest")
// @RequiresPermissions("params:manifest:copy")
public Result<?> getAllManifest(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+1 -1
View File
@@ -785,7 +785,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
.orderByDesc(ParamsCollectManifestEO::getUpdateTime); // 按修改时间降序
List<ParamsCollectManifestEO> list = list(queryWrapper);
int collectFinishNumber = (int) list.stream().filter(e->CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.getState())).count();
if (collectFinishNumber == list.size()) {
if (collectFinishNumber == list.size() && list.size() > 0) {
map.put("finish", true);
map.put("time", list.get(0).getUpdateTime());
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java
+8 -5
View File
@@ -16,6 +16,7 @@ import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysDepartService;
import com.jero.modules.system.service.ISysDictService;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.system.util.HttpRequestUtil;
import com.jero.modules.system.util.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -63,6 +64,8 @@ public class SSOLoginController {
//密码登录错误的最大限制次数
public static final int RETRY_LOGIN_MAX_COUNT = 5;
@Value("${opensso.authorizeUrl}")
private String authorizeUrl;
@Value("${opensso.accessTokenUrl}")
private String accessTokenUrl;
@Value("${opensso.profileUrl}")
@@ -79,7 +82,7 @@ public class SSOLoginController {
@GetMapping(value = "/ssoAuth")
public void ssoAuth(HttpServletRequest request, HttpServletResponse response){
String callbackUri = "http%3A%2F%2F139.9.235.66%3A8008%2Fjero-boot%2Fopensso%2Fcallback";
String authUrl = "https://signin-test.nio.com/oauth2/authorize" +"?client_id=" + clientId
String authUrl = authorizeUrl +"?client_id=" + clientId
+ "&redirect_uri=" + redirectUri + "&response_type=code";
try {
response.sendRedirect(authUrl);
@@ -103,8 +106,8 @@ public class SSOLoginController {
log.info("access_token_url:" + getAccessTokenUrl);
Map<String, String> headerMapToken = new HashMap<>();
headerMapToken.put("Content-Type", "text/html;charset=utf-8");
// String accessTokenResult = HttpRequestUtil.getResponseOfGET(getAccessTokenUrl, headerMapToken);
String accessTokenResult = "access_token=2.0N6OFCARTH7MRCVPSENQONSA67WGHV4FDR25TSHFCCXI6FA3NRVAA----&expires=602405";
String accessTokenResult = HttpRequestUtil.getResponseOfGET(getAccessTokenUrl, headerMapToken);
// String accessTokenResult = "access_token=2.0N6OFCARTH7MRCVPSENQONSA67WGHV4FDR25TSHFCCXI6FA3NRVAA----&expires=602405";
log.info("获取access_token返回结果：" + accessTokenResult);
// 返回结果：access_token=2.0N6OFCARTH7MRCVPSENQONSA67WGHV4FDR25TSHFCCXI6FA3NRVAA----&expires=602405
if(StringUtils.isEmpty(accessTokenResult) || !accessTokenResult.contains("access_token")){
@@ -120,8 +123,8 @@ public class SSOLoginController {
log.info("profile_url:" + getProfileUrl);
Map<String, String> headerMapProfile = new HashMap<>();
headerMapProfile.put("Content-Type", "application/json; charset=utf-8");
// String profileResult = HttpRequestUtil.getResponseOfGET(getProfileUrl, headerMapProfile);
String profileResult = "{ id: \"chengjun.wang.o\", attributes: [{workNo: \"\"},{account_id: \"\"},{user_name: \"chengjun.wang.o\"},{email: \"chengjun.wang.o@nio.com\"}]}";
String profileResult = HttpRequestUtil.getResponseOfGET(getProfileUrl, headerMapProfile);
// String profileResult = "{ id: \"chengjun.wang.o\", attributes: [{workNo: \"\"},{account_id: \"\"},{user_name: \"chengjun.wang.o\"},{email: \"chengjun.wang.o@nio.com\"}]}";
log.info("获取profile返回结果：" + profileResult);
// 返回结果：{ id: "chengjun.wang.o", attributes: [{workNo: ""},{account_id: ""},{user_name: "chengjun.wang.o"},{email: "chengjun.wang.o@nio.com"}]}
JSONObject userThirdIdJson = JSONObject.parseObject(profileResult);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java
+13
View File
@@ -73,4 +73,17 @@ public class PPEmployee {
private String phone_device_type; // Mobile/Landline
private String formatted_phone_number;
public void setCreation_time(Date creation_time) {
long timeStamp = creation_time.getTime();
long longTimeStamp = new Long(timeStamp * 1000); // 精确到毫秒的时间戳
Date time = new Date(longTimeStamp);
this.creation_time = time;
}
public void setUpdate_time(Date update_time) {
long timeStamp = update_time.getTime();
long longTimeStamp = new Long(timeStamp * 1000); // 精确到毫秒的时间戳
Date time = new Date(longTimeStamp);
this.update_time = time;
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/timer/PPSyncDataTimer.java
+2 -2
View File
@@ -29,7 +29,7 @@ public class PPSyncDataTimer {
@Autowired
private ISyncDataService syncDataService;
// @Scheduled(cron = "0 10 0 * * ?") //每天凌晨0点10分执行
@Scheduled(cron = "0 10 0 * * ?") //每天凌晨0点10分执行
public void syncDepartInfo() {
if (isOpen) {
log.info("<======================================启动同步部门信息======================================>");
@@ -47,7 +47,7 @@ public class PPSyncDataTimer {
}
}
// @Scheduled(cron = "0 10 1 * * ?") //每天凌晨1点10分执行
@Scheduled(cron = "0 10 1 * * ?") //每天凌晨1点10分执行
public void syncUserInfo() {
log.info("<======================================启动同步用户信息=======================================>");
if (isOpen) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+65 -52
View File
@@ -2086,7 +2086,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String hrefTemp = backUrl + "/docManage/library/detail?id=" + idTemp;
String content = sysUser.getUsername() + " add " + serialNumber + ",Please pay attention to check.";
//In the XXXX technical field you subscribed to, the standard "GBXXX" has been updated.
String contentInfo = "In the "+ technologyTerritoryName + "technical field you subscribed to, the standard "+ serialNumber +" has been updated.";
String contentInfo = "In the "+ technologyTerritoryName + " technical field you subscribed to, the standard "+ serialNumber +" has been updated.";
// String contentInfo = sysUser.getUsername() + " add " + serialNumber + ",Please pay attention to check.";
//封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
@@ -2455,11 +2455,66 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
List<String> fileFieldList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
StringBuilder sbTemp = new StringBuilder();
StringBuilder sbContent = new StringBuilder();
StringBuilder sbContentInfo = new StringBuilder();
StringBuilder sbField = new StringBuilder();
StringBuilder sbNew = new StringBuilder();
dataList.get(0).entrySet().forEach(entry -> {
String keyTemp = entry.getKey();
if(fileFieldList.contains(keyTemp)) {
String valueTemp = (String) entry.getValue();
List<OnlCgformField> fields = fieldList.stream().filter(e -> e.getDbFieldName().equals(keyTemp)).collect(Collectors.toList());
List<OSSFile> fileInfosTemp = iOSSFileService.getFileInfos(valueTemp);
//之前的文件
List<String> fileNameList = fileInfosTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList());
String value = (String) map.get(keyTemp);
List<OSSFile> fileInfosTempNew = iOSSFileService.getFileInfos(value);
//现在的文件
List<String> fileNameListNew = fileInfosTempNew.stream().map(OSSFile::getFileName).collect(Collectors.toList());
boolean checkDiffrent = checkDiffrent(fileNameList, fileNameListNew);
if (!checkDiffrent && fileNameListNew.size() != 0) {
//消息
sbField.append(fields.get(0).getDbFieldEnName() + ",");
for (String s : fileNameListNew) {
if (!fileNameList.contains(s)) {
//消息详情
sbNew.append(fields.get(0).getDbFieldEnName() + " " + s + ",");
}
}
if (StringUtils.isNotBlank(sbField)) {
String substring = sbField.substring(0, sbField.length() - 1);
String content = substring;
}
if (StringUtils.isNotBlank(sbNew)) {
String substring = sbNew.substring(0, sbNew.length() - 1);
//Standard GB 7258 Uploaded Supplement File AA.dox, Release File BB.dox
String dbFieldEnName = fields.get(0).getDbFieldEnName();
String contentInfo = dbFieldEnName + " " + fileNameList + ",";
}
}
}
});
//编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件
String href = "<a href='/docManage/library/detail?id=" + id +
"&title=" + title +
"&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " " + titleEn;
String contentFile = "";
String contentInfoFile = "";
if(StringUtils.isNotBlank(sbField)){
String substring = sbField.substring(0, sbField.length() - 1);
contentFile = category + " " + serialNumber + " " + titleEn + " uploaded " + substring;
}
if(StringUtils.isNotBlank(sbNew)){
String substring = sbNew.substring(0, sbNew.length() - 1);
contentInfoFile = category + " " + href + " uploaded " + substring;
}
//编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件
// String href = "<a href='/docManage/library/detail?id=" + id +
// "&title=" + title +
// "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " " + titleEn;
StringBuilder msgContentSb = new StringBuilder();
StringBuilder msgContentInfoSb = new StringBuilder();
@@ -2480,46 +2535,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
fileIdLIstTemp.addAll(Arrays.asList(value.split(",")));
}
}
List<String> fileIdLIst = new ArrayList<>();
for (Map.Entry<String, Object> entry : map.entrySet()) {
String key = entry.getKey();
String value = String.valueOf(entry.getValue());
//文件
if(fileFieldList.contains(key) && !"null".equals(value) && StringUtils.isNotBlank(value)){
fileIdLIst.addAll(Arrays.asList(value.split(",")));
}
}
//之前的文件
List<OSSFile> fileListTemp = new ArrayList<>();
if(fileIdLIstTemp.size() != 0){
fileListTemp = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIstTemp,","));
}
List<String> fileNameListTemp = fileListTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList());
//编辑的文件
List<OSSFile> fileList = new ArrayList<>();
if(fileIdLIst.size() != 0){
fileList = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIst,","));
}
List<String> fileNameList = fileList.stream().map(OSSFile::getFileName).collect(Collectors.toList());
//删除的文件
List<String> deleteFileList = new ArrayList<>();
for (String fileName : fileNameListTemp) {
if(fileNameList.size() != 0 && !fileNameList.contains(fileName)){
deleteFileList.add(fileName);
}
}
//上传的文件
List<String> upFileList = new ArrayList<>();
for (String fileName : fileNameList) {
if(!fileNameListTemp.contains(fileName)){
upFileList.add(fileName);
}
}
int count = 0;
for (Map.Entry<String, Object> entry : map.entrySet()) {
String key = entry.getKey();
String value = String.valueOf(entry.getValue());
@@ -2549,7 +2565,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
//适用车型 car_type
if("shi4_yong4_che1_xing2".equals(key) && !value.equals((String)dataList.get(0).get("shi4_yong4_che1_xing2"))){
if("shi4_yong4_che1_xing2".equals(key) && !value.equals((String)dataList.get(0).get("shi4_yong4_che1_xing2")) && !"null".equals(value)){
count++;
//数据字典转换 dictItemList
List<SysDictItem> stateDictItemList = dictItemList.stream()
@@ -2585,15 +2601,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
}
if(upFileList.size() != 0){
count++;
msgContentSb.append("上传了" + StringUtils.join(upFileList,",") + ",");
msgContentInfoSb.append("上传了" + StringUtils.join(upFileList,",") + ",");
if(StringUtils.isNotBlank(contentFile)){
count ++;
msgContentSb.append(contentFile);
}
if(deleteFileList.size() != 0){
count++;
msgContentSb.append("删除了" + StringUtils.join(deleteFileList,",") + ",");
msgContentInfoSb.append("删除了" + StringUtils.join(deleteFileList,",") + ",");
if(StringUtils.isNotBlank(contentInfoFile)){
msgContentInfoSb.append(contentInfoFile);
}
if(count > 0){
String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1);
@@ -2976,11 +2989,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (StringUtils.isNotBlank(sbStr.toString())) {
//您订阅的XXX已被修改
String content = "In the standard "+serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
String content = "In the "+serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
// String content = sysUser.getUsername() + " update " + serialNumber + ",Please pay attention to check.";
//您订阅的GB 7258-2021 中,由张三将技术领域"车身"改为"车门"
String contentInfo = "In the standard "+serialNumber+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href+ sbStr.toString();
String contentInfo = "In the "+serialNumber+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href+ sbStr.toString();
// String contentInfo = sysUser.getUsername() + " update " + href + sbStr.toString();
//封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java
+3 -3
View File
@@ -174,7 +174,7 @@ public class DummyInventoryInfoEO implements Serializable {
/**设计符合性确认-交付物类型*/
@Excel(name = "设计-交付物类型", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "设计符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template")
// @Dict(dicCode ="deliverable_template")
private java.lang.String designDeliverableType;
@TableField(exist = false)
@@ -204,7 +204,7 @@ public class DummyInventoryInfoEO implements Serializable {
/**prehomo确认-交付物类型*/
@Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "prehomo确认-交付物类型")
@Dict(dicCode ="deliverable_template")
// @Dict(dicCode ="deliverable_template")
private java.lang.String prehomoDeliverableType;
@TableField(exist = false)
private java.lang.String prehomoDeliverableTypeName;
@@ -233,7 +233,7 @@ public class DummyInventoryInfoEO implements Serializable {
/**验证符合性确认-交付物类型*/
@Excel(name = "验证-交付物类型", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "验证符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template")
// @Dict(dicCode ="deliverable_template")
private java.lang.String verifyDeliverableType;
@TableField(exist = false)
private java.lang.String verifyDeliverableTypeName;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java
+10 -10
View File
@@ -70,7 +70,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String serialNumber;
/**标题*/
@Excel(name = "title", width = 15)
@Excel(name = "Title", width = 15)
@ApiModelProperty(value = "标题")
private String title;
@@ -92,7 +92,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String shi4Yong4Fan4Wei2;
/**状态*/
@Excel(name = "state", width = 15,dicCode ="state")
@Excel(name = "State", width = 15,dicCode ="state")
@ApiModelProperty(value = "状态")
@Dict(dicCode ="state")
private String state;
@@ -171,7 +171,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String remark;
/**设计符合性确认-交付物类型*/
@Excel(name = "design-Deliverables", width = 15,dicCode ="deliverable_template")
@Excel(name = "Design-Deliverables", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "设计符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template")
private String designDeliverableType;
@@ -182,17 +182,17 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String designDeliverableTemplate;
@TableField(exist = false)
@Excel(name = "design-Deliverable Template", width = 15)
@Excel(name = "Design-Deliverable Template", width = 15)
private String designDeliverableTemplateName;
/**设计符合性确认-发起人*/
@Excel(name = "design-Initiator", width = 15)
@Excel(name = "Design-Initiator", width = 15)
@ApiModelProperty(value = "设计符合性确认-发起人")
@Dict(dicCode ="fa1_qi3_ren2")
private String designInitiator;
/**设计符合性确认-责任人*/
@Excel(name = "design-Assignee", width = 15)
@Excel(name = "Design-Assignee", width = 15)
@ApiModelProperty(value = "设计符合性确认-责任人")
@Dict(dicCode ="ze2_ren4_ren2")
private String designDuty;
@@ -225,7 +225,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String prehomoDuty;
/**验证符合性确认-交付物类型*/
@Excel(name = "verify-Deliverables", width = 15,dicCode ="deliverable_template")
@Excel(name = "Verify-Deliverables", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "验证符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template")
private String verifyDeliverableType;
@@ -236,17 +236,17 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String verifyDeliverableTemplate;
@TableField(exist = false)
@Excel(name = "verify-Deliverable Template", width = 15)
@Excel(name = "Verify-Deliverable Template", width = 15)
private String verifyDeliverableTemplateName;
/**验证符合性确认-发起人*/
@Excel(name = "verify-Initiator", width = 15)
@Excel(name = "Verify-Initiator", width = 15)
@ApiModelProperty(value = "验证符合性确认-发起人")
@Dict(dicCode ="fa1_qi3_ren2")
private String verifyInitiator;
/**验证符合性确认-责任人*/
@Excel(name = "verify-Assignee", width = 15)
@Excel(name = "Verify-Assignee", width = 15)
@ApiModelProperty(value = "验证符合性确认-责任人")
@Dict(dicCode ="ze2_ren4_ren2")
private String verifyDuty;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java
+1 -1
View File
@@ -17,7 +17,7 @@ public enum DummyInventoryBaseFieldEnum {
APPLICABLE_SUPPLEMENT("适用增补件", "applicable_supplement","Applicable Supplement"),
REMARK("备注", "remark","Comments"),
DELIVERABLE_TEMPLATE("交付物类型", "deliverable_template","Type of deliverables"),
DELIVERABLE_TEMPLATE("交付物类型", "jiao1_fu4_wu4_lei4_xing2","Type of deliverables"),
FA1_QI3_REN2("发起人", "fa1_qi3_ren2","Initiator"),
ZE2_REN2_REN2("责任人", "ze2_ren4_ren2","Assignee"),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+219 -53
View File
@@ -28,6 +28,8 @@ import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
import com.jero.modules.dummy.service.IDummyReadEOService;
import com.jero.modules.dummy.util.ListDiff;
import com.jero.modules.feishu.service.IFeishuService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.system.entity.SysAnnouncement;
import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.entity.SysDictItem;
@@ -85,7 +87,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
private SysDictItemMapper sysDictItemMapper;
@Autowired
private DummyContentChangeEOMapper dummyContentChangeEOMapper;
@Autowired
private IOSSFileService iOSSFileService;
/**
* 保存
*
@@ -426,8 +429,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String addSerialNumber = dummyInventoryInfoEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(","));
iDummyContentChangeEOService.saveBatch(list);
sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
// private void sendMsg(Map<String, String> baseDiff, String idTemp,List<Map<String, String>> infoDiffList,
// String addSerialNumber,String deleteSerialNumber,String state,String cut) {
// private void sendMsg(Map<String, String> baseDiff, String idTemp,List<Map<String, String>> infoDiffList,
// String addSerialNumber,String deleteSerialNumber,String state,String cut) {
}else {
if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
throw new JeroBootException("维护清单为空,发布失败");
@@ -448,7 +451,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
//翻译成中文名
public void disposeData(List<DummyInventoryInfoEO> records) {
Set<String> technologyTerritorySet = new HashSet<>();
for (DummyInventoryInfoEO dummyInventoryInfoEO : records) {
//子标题
if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) {
@@ -467,6 +470,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
dummyInventoryInfoEO.setApplicableSupplement("空");
}
//技术领域
Set<String> technologyTerritorySet = new HashSet<>();
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) {
List<String> list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(","));
technologyTerritorySet.addAll(list);
@@ -587,29 +591,85 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
//交付物类型
List<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue());
//设计符合性确认-交付物类型
Set<String> deliverableTypeSet = new HashSet<>();
List<String> designDeliverableTypeIdList= new ArrayList<>();
List<String> prehomoDeliverableTypeIdList = new ArrayList<>();
List<String> verifyDeliverableTypeIdList = new ArrayList<>();
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) {
String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeName);
}else {
dummyInventoryInfoEO.setDesignDeliverableType("空");
designDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableType().split(","));
deliverableTypeSet.addAll(designDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
prehomoDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableType().split(","));
deliverableTypeSet.addAll(prehomoDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
verifyDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableType().split(","));
deliverableTypeSet.addAll(verifyDeliverableTypeIdList);
}
//树形结构
List<SysCategory> deliverableTypeList = new ArrayList<>();
if (deliverableTypeSet.size() != 0) {
LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysCategory::getId, deliverableTypeSet);
deliverableTypeList = sysCategoryService.list(wrapper);
}
//设计符合性确认-交付物类型
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) {
StringBuilder designBuilder = new StringBuilder();
for(String id : designDeliverableTypeIdList){
List<SysCategory> designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (designList.size() != 0) {
designBuilder.append(designList.get(0).getName() + ",");
}
}
String designName = null;
if (StringUtils.isNotBlank(designBuilder)) {
designName = designBuilder.substring(0, designBuilder.length() - 1);
}
dummyInventoryInfoEO.setDesignDeliverableTypeName(designName);
} else {
dummyInventoryInfoEO.setDesignDeliverableTypeName("空");
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeName);
}else {
dummyInventoryInfoEO.setPrehomoDeliverableType("空");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
StringBuilder prehomoBuilder = new StringBuilder();
for(String id : prehomoDeliverableTypeIdList){
List<SysCategory> prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (prehomoList.size() != 0) {
prehomoBuilder.append(prehomoList.get(0).getName() + ",");
}
}
String prehomoName = null;
if (StringUtils.isNotBlank(prehomoBuilder )) {
prehomoName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1);
}
dummyInventoryInfoEO.setPrehomoDeliverableTypeName(prehomoName);
} else {
dummyInventoryInfoEO.setPrehomoDeliverableTypeName("空");
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeName);
}else {
dummyInventoryInfoEO.setVerifyDeliverableType("空");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
StringBuilder verifyBuilder = new StringBuilder();
for(String id : verifyDeliverableTypeIdList){
List<SysCategory> verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (verifyList.size() != 0) {
verifyBuilder.append(verifyList.get(0).getName() + ",");
}
}
String verifyName = null;
if (StringUtils.isNotBlank(verifyBuilder)) {
verifyName = verifyBuilder.substring(0, verifyBuilder.length() - 1);
}
dummyInventoryInfoEO.setVerifyDeliverableTypeName(verifyName);
} else {
dummyInventoryInfoEO.setVerifyDeliverableTypeName("空");
}
//发起人
List<SysDictItem> fa1_qi3_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.FA1_QI3_REN2.getValue());
//设计符合性确认-发起人
@@ -657,12 +717,63 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}else {
dummyInventoryInfoEO.setVerifyDuty("空");
}
//文件
List<String> deliverableList = new ArrayList<>();
//设计符合性确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableTemplate().split(",")));
}
// Prehomo确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableTemplate().split(",")));
}
// 验证符合性确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableTemplate().split(",")));
}
List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){
fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ","));
}
//交付物类型模板
if(fileInfos.size() != 0){
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){
String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getDesignDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
dummyInventoryInfoEO.setDesignDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){
String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getPrehomoDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
dummyInventoryInfoEO.setPrehomoDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){
String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getVerifyDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
dummyInventoryInfoEO.setVerifyDeliverableTemplateName(fileName);
}
}
}
}
}
private String getFileName(List<OSSFile> fileInfos, String deliverableTemplate){
StringBuilder sb = new StringBuilder();
for (String s : deliverableTemplate.split(",")) {
List<OSSFile> collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList());
sb.append(collect.get(0).getFileName() + ",");
}
String sbStr = "";
if(org.apache.commons.lang3.StringUtils.isNotBlank(sb)){
sbStr = sb.substring(0, sb.length() - 1);
}
return sbStr;
}
//翻译成英文名
public void disposeDataToEn(List<DummyInventoryInfoEO> records) {
Set<String> technologyTerritorySet = new HashSet<>();
for (DummyInventoryInfoEO dummyInventoryInfoEO : records) {
//子标题
if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) {
@@ -681,6 +792,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
dummyInventoryInfoEO.setApplicableSupplement("null");
}
//技术领域
Set<String> technologyTerritorySet = new HashSet<>();
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) {
List<String> list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(","));
technologyTerritorySet.addAll(list);
@@ -799,27 +911,81 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
//交付物类型
List<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue());
//设计符合性确认-交付物类型
Set<String> deliverableTypeSet = new HashSet<>();
List<String> designDeliverableTypeIdList= new ArrayList<>();
List<String> prehomoDeliverableTypeIdList = new ArrayList<>();
List<String> verifyDeliverableTypeIdList = new ArrayList<>();
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) {
String designDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeEnName);
}else {
dummyInventoryInfoEO.setDesignDeliverableType("null");
designDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableType().split(","));
deliverableTypeSet.addAll(designDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
prehomoDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableType().split(","));
deliverableTypeSet.addAll(prehomoDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
verifyDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableType().split(","));
deliverableTypeSet.addAll(verifyDeliverableTypeIdList);
}
//树形结构
List<SysCategory> deliverableTypeList = new ArrayList<>();
if (deliverableTypeSet.size() != 0) {
LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysCategory::getId, deliverableTypeSet);
deliverableTypeList = sysCategoryService.list(wrapper);
}
//设计符合性确认-交付物类型
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) {
StringBuilder designBuilder = new StringBuilder();
for(String id : designDeliverableTypeIdList){
List<SysCategory> designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (designList.size() != 0) {
designBuilder.append(designList.get(0).getEnName() + ",");
}
}
String designEnName = null;
if (StringUtils.isNotBlank(designBuilder)) {
designEnName = designBuilder.substring(0, designBuilder.length() - 1);
}
dummyInventoryInfoEO.setDesignDeliverableTypeName(designEnName);
} else {
dummyInventoryInfoEO.setDesignDeliverableTypeName("null");
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeEnName);
}else {
dummyInventoryInfoEO.setPrehomoDeliverableType("null");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
StringBuilder prehomoBuilder = new StringBuilder();
for(String id : prehomoDeliverableTypeIdList){
List<SysCategory> prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (prehomoList.size() != 0) {
prehomoBuilder.append(prehomoList.get(0).getEnName() + ",");
}
}
String prehomoEnName = null;
if (StringUtils.isNotBlank(prehomoBuilder )) {
prehomoEnName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1);
}
dummyInventoryInfoEO.setPrehomoDeliverableTypeName(prehomoEnName);
} else {
dummyInventoryInfoEO.setPrehomoDeliverableTypeName("null");
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeEnName);
}else {
dummyInventoryInfoEO.setVerifyDeliverableType("null");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
StringBuilder verifyBuilder = new StringBuilder();
for(String id : verifyDeliverableTypeIdList){
List<SysCategory> verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (verifyList.size() != 0) {
verifyBuilder.append(verifyList.get(0).getEnName() + ",");
}
}
String verifyEnName = null;
if (StringUtils.isNotBlank(verifyBuilder)) {
verifyEnName = verifyBuilder.substring(0, verifyBuilder.length() - 1);
}
dummyInventoryInfoEO.setVerifyDeliverableTypeName(verifyEnName);
} else {
dummyInventoryInfoEO.setVerifyDeliverableTypeName("null");
}
//发起人
@@ -956,7 +1122,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
for (Map<String, String> infoDiff : infoDiffList) {
if (infoDiff.size() > 1) {
contentInfo += row + ". The Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n";
contentInfo = setInfoDiffListContent(contentInfo,infoDiffList,contentLog);
contentInfo = setInfoDiffListContent(contentInfo,infoDiffList,contentLog);
}
}
}
@@ -974,10 +1140,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.TITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.TITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
}else{
contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
}
}
@@ -1148,10 +1314,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
//设计符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableType").split(","));
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = "list.get(1)";
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
@@ -1160,8 +1326,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
}
//设计符合性确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(","));
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplateName"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
@@ -1196,8 +1362,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(","));
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
@@ -1208,8 +1374,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
}
//prehomo确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(","));
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
@@ -1244,8 +1410,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(","));
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
@@ -1256,8 +1422,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
}
//验证符合性确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(","));
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplateName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+6 -6
View File
@@ -206,14 +206,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
infoDiffList.add(infoDiff);
List<Map<String,String>> infoDiffListEn = new ArrayList<>();
infoDiffListEn.add(infoDiffEn);
if(infoDiff.size()>1) {
contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null, infoDiffList, contentLog);
enContentLog = dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog, infoDiffListEn, null);
contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null,infoDiffList,contentLog);
enContentLog=dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog,infoDiffListEn,null);
dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue());
dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue());
dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue());
dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue());
}
}
/**
* 通过id删除
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java
+5 -2
View File
@@ -29,7 +29,8 @@ public class ListDiff <T> {
&& !f.getName().equals("implementTime") && !f.getName().equals("xin1Che1Xing2Shi2Shi1Ri4Qi1")
&& !f.getName().equals("implementTime") && !f.getName().equals("inventoryAffirmStatusName")
&& !f.getName().equals("taskAffirmStatusName") && !f.getName().equals("roleCode")
&& !f.getName().equals("roleName")
&& !f.getName().equals("roleName") && !f.getName().equals("verifyDeliverableType")&& !f.getName().equals("designDeliverableType")
&& !f.getName().equals("prehomoDeliverableType")
){
StringBuilder v1String= new StringBuilder(String.valueOf(v1));
@@ -42,7 +43,9 @@ public class ListDiff <T> {
// }
if(f.getName().contains("erritory") || f.getName().contains("emplate")
|| f.getName().equals(("shi4Yong4Fan4Wei2")) || f.getName().equals("region")
|| f.getName().equals("applyScope")){
|| f.getName().equals("applyScope") || f.getName().contains("DeliverableType")
){
result.put(f.getName(), v1String.append("|").append(v2String).toString());
}else {
//
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java
+1 -1
View File
@@ -105,7 +105,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl<HomeFunctionMod
//所有的图表(state=0)
LambdaQueryWrapper<HomeFunctionModuleEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(HomeFunctionModuleEO::getState,"0");
wrapper.in(HomeFunctionModuleEO::getState,"0").isNull(HomeFunctionModuleEO::getCreateBy);
List<HomeFunctionModuleEO> homeFunctionModuleEOList = this.list(wrapper);
//当前用户配置的图表
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java
+38 -8
View File
@@ -6,6 +6,7 @@ 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.constant.enums.CutEnum;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.ocr.entity.OcrRecordEO;
@@ -82,18 +83,42 @@ public class OcrRecordEOController extends JeroController<OcrRecordEO, IOcrRecor
@PostMapping(value = "/syncToDocument")
@RequiresPermissions("ocr:ocrRecord:syncToDocument")
public Result<?> syncToDocument(@RequestBody OcrRecordEO ocrRecordEO) {
String cut = ocrRecordEO.getCut();
if(StringUtils.isBlank(ocrRecordEO.getConnectId())){
return Result.error("同步失败");
if (CutEnum.CN.getValue().equals(cut)) {
return Result.error("同步失败！");
} else {
return Result.error("sync failure!");
}
}
// 文档库删了识别的pdf文件时
LambdaQueryWrapper<OSSFile> pdfFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
pdfFileLambdaQueryWrapper.eq(OSSFile::getConnectId, ocrRecordEO.getConnectId());
List<OSSFile> pdfFiles = ossFileService.list(pdfFileLambdaQueryWrapper);
if (CollectionUtil.isEmpty(pdfFiles)) {
if (CutEnum.CN.getValue().equals(cut)) {
return Result.error("文档库已不存在转换前的pdf文件，同步失败！");
} else {
return Result.error("Document Library no longer existed before the conversion of PDF files, synchronization fails!");
}
}
//查询doc文件的id
LambdaQueryWrapper<OSSFile> ossFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
ossFileLambdaQueryWrapper.eq(OSSFile::getUrl, ocrRecordEO.getDocName());
List<OSSFile> ossFiles = ossFileService.list(ossFileLambdaQueryWrapper);
if (CollectionUtil.isEmpty(ossFiles)) {
return Result.error("没有可同步的文件");
LambdaQueryWrapper<OSSFile> docLambdaQueryWrapper = new LambdaQueryWrapper<>();
docLambdaQueryWrapper.eq(OSSFile::getUrl, ocrRecordEO.getDocName());
List<OSSFile> docFiles = ossFileService.list(docLambdaQueryWrapper);
if (CollectionUtil.isEmpty(docFiles)) {
if (CutEnum.CN.getValue().equals(cut)) {
return Result.error("转换后的word文件不存在，同步失败！");
} else {
return Result.error("Converted Word file does not exist, the synchronization fails!");
}
}
OSSFile ossFile = new OSSFile();
String docFileId = ossFiles.get(0).getId();
String docFileId = docFiles.get(0).getId();
ossFile.setId(docFileId);
ossFile.setConnectId(ocrRecordEO.getConnectId());
ossFileService.updateById(ossFile);
@@ -104,7 +129,12 @@ public class OcrRecordEOController extends JeroController<OcrRecordEO, IOcrRecor
updateOcrRecordEO.setSyncState(FileSyncStateEnum.SYNC_YES.getValue());
ocrRecordService.editById(updateOcrRecordEO);
return Result.OK("同步成功", ossFile);
if (CutEnum.CN.getValue().equals(cut)) {
return Result.OK("同步成功！", ossFile);
} else {
return Result.OK("sync success!", ossFile);
}
}
/**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java
+4
View File
@@ -5,6 +5,7 @@ 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 com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -123,6 +124,7 @@ public class OcrRecordEO implements Serializable {
/**同步状态*/
@Excel(name = "同步状态", width = 15)
// @Dict(dicCode = "sync_state")
@ApiModelProperty(value = "同步状态")
private String syncState;
@@ -140,4 +142,6 @@ public class OcrRecordEO implements Serializable {
private String jsonRealFile;
@TableField(exist = false)
private String fileSource; //文件来源：0-上传 1-导入
@TableField(exist = false)
private String cut;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+6
View File
@@ -54,9 +54,15 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
@Override
public List<NcrTrackVO> getPageInfo(NcrTrackVO ncrTrackVO) {
if(StringUtils.isNotBlank(ncrTrackVO.getSerialNumber())){
if(ncrTrackVO.getSerialNumber().contains("%")){
ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replaceAll("%", "/%"));
}
ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replace("*",""));
}
if(StringUtils.isNotBlank(ncrTrackVO.getTitle())){
if(ncrTrackVO.getTitle().contains("%")){
ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("%","/%"));
}
ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*",""));
}
List<SysUser> sysUserList = sysUserService.list();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+279 -57
View File
@@ -382,9 +382,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> dataList = list(queryWrapper.eq("id", projectLawsInventoryEO.getId()));
List<ProjectLawsInventoryEO> dataListCopy = DeepCopyListUtil.depCopy(dataList);
LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
setDateNull(projectLawsInventoryEO, updateWrapper);
//保存
saveOrUpdate(projectLawsInventoryEO);
this.update(projectLawsInventoryEO,updateWrapper);
// saveOrUpdate(projectLawsInventoryEO);
//翻译-中文
translateData(infoEOList);
@@ -412,6 +414,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
private void setDateNull(ProjectLawsInventoryEO projectLawsInventoryEO, LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper) {
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
updateWrapper.set(ProjectLawsInventoryEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getImplementTime())){
updateWrapper.set(ProjectLawsInventoryEO::getImplementTime,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getDesignDueDate())){
updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getPrehomoDueDate())){
updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getVerifyDueDate())){
updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
}
}
/**
* 更新流程信息
* @param projectLawsInventoryEO
@@ -1558,12 +1578,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
@Override
public void setBatch(ProjectLawsInventoryEO projectLawsInventoryEO) {/////
if(org.apache.commons.lang3.StringUtils.isNotBlank(projectLawsInventoryEO.getIds())){
//根据id查询数据库中完整信息,翻译
List<String> idList = Arrays.asList(projectLawsInventoryEO.getIds().split(","));
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> infoList = list(queryWrapper.in("id", idList));
String projectLibraryId = infoList.get(0).getProjectLibraryId();
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
for (String id : projectLawsInventoryEO.getIds().split(",")) {
ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
@@ -1584,6 +1598,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
projectLawsInventoryEOTemp.setDutyTerritory(projectLawsInventoryEO.getDutyTerritory());
}
//在产车实施日期implementTime
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){
projectLawsInventoryEOTemp.setImplementTime(projectLawsInventoryEO.getImplementTime());
}
//新车型实施日期xin1Che1Xing2Shi2Shi1Ri4Qi1
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
projectLawsInventoryEOTemp.setXin1Che1Xing2Shi2Shi1Ri4Qi1(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
}
//适用地区region
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){
projectLawsInventoryEOTemp.setRegion(projectLawsInventoryEO.getRegion());
}
//设计符合性确认截止时间
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDueDate())){
projectLawsInventoryEOTemp.setDesignDueDate(projectLawsInventoryEO.getDesignDueDate());
@@ -1600,6 +1626,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
this.updateBatchById(projectLawsInventoryEOList);
//根据id查询数据库中完整信息,翻译
List<String> idList = Arrays.asList(projectLawsInventoryEO.getIds().split(","));
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> infoList = list(queryWrapper.in("id", idList));
String projectLibraryId = infoList.get(0).getProjectLibraryId();
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
@@ -1725,9 +1756,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
}
projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
}
this.updateBatchById(projectLawsInventoryEOList);
contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1);
enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 1);
@@ -1830,27 +1859,83 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//交付物类型
List<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue());
//设计符合性确认-交付物类型
//交付物类型
Set<String> deliverableTypeSet = new HashSet<>();
List<String> designDeliverableTypeIdList= new ArrayList<>();
List<String> prehomoDeliverableTypeIdList = new ArrayList<>();
List<String> verifyDeliverableTypeIdList = new ArrayList<>();
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setDesignDeliverableType(designDeliverableTypeName);
}else {
projectLawsInventoryEO.setDesignDeliverableType("空");
designDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getDesignDeliverableType().split(","));
deliverableTypeSet.addAll(designDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
prehomoDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableType().split(","));
deliverableTypeSet.addAll(prehomoDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
verifyDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableType().split(","));
deliverableTypeSet.addAll(verifyDeliverableTypeIdList);
}
//树形结构
List<SysCategory> deliverableTypeList = new ArrayList<>();
if (deliverableTypeSet.size() != 0) {
LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysCategory::getId, deliverableTypeSet);
deliverableTypeList = sysCategoryService.list(wrapper);
}
//设计符合性确认-交付物类型
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
StringBuilder designBuilder = new StringBuilder();
for(String id : designDeliverableTypeIdList){
List<SysCategory> designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (designList.size() != 0) {
designBuilder.append(designList.get(0).getName() + ",");
}
}
String designName = null;
if (StringUtils.isNotBlank(designBuilder)) {
designName = designBuilder.substring(0, designBuilder.length() - 1);
}
projectLawsInventoryEO.setDesignDeliverableTypeName(designName);
} else {
projectLawsInventoryEO.setDesignDeliverableTypeName("空");
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setPrehomoDeliverableType(prehomoDeliverableTypeName);
}else {
projectLawsInventoryEO.setPrehomoDeliverableType("空");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
StringBuilder prehomoBuilder = new StringBuilder();
for(String id : prehomoDeliverableTypeIdList){
List<SysCategory> prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (prehomoList.size() != 0) {
prehomoBuilder.append(prehomoList.get(0).getName() + ",");
}
}
String prehomoName = null;
if (StringUtils.isNotBlank(prehomoBuilder )) {
prehomoName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1);
}
projectLawsInventoryEO.setPrehomoDeliverableTypeName(prehomoName);
} else {
projectLawsInventoryEO.setPrehomoDeliverableTypeName("空");
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setVerifyDeliverableType(verifyDeliverableTypeName);
}else {
projectLawsInventoryEO.setVerifyDeliverableType("空");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
StringBuilder verifyBuilder = new StringBuilder();
for(String id : verifyDeliverableTypeIdList){
List<SysCategory> verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (verifyList.size() != 0) {
verifyBuilder.append(verifyList.get(0).getName() + ",");
}
}
String verifyName = null;
if (StringUtils.isNotBlank(verifyBuilder)) {
verifyName = verifyBuilder.substring(0, verifyBuilder.length() - 1);
}
projectLawsInventoryEO.setVerifyDeliverableTypeName(verifyName);
} else {
projectLawsInventoryEO.setVerifyDeliverableTypeName("空");
}
@@ -1989,6 +2074,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}else {
projectLawsInventoryEO.setVerifyDueDateString("空");
}
//文件
List<String> deliverableList = new ArrayList<>();
//设计符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(",")));
}
// Prehomo确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(",")));
}
// 验证符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(",")));
}
List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){
fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ","));
}
//交付物类型模板
if(fileInfos.size() != 0){
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getDesignDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getPrehomoDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getVerifyDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
}
}
}
}
}
@@ -2089,27 +2216,82 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//交付物类型
List<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue());
//设计符合性确认-交付物类型
//交付物类型
Set<String> deliverableTypeSet = new HashSet<>();
List<String> designDeliverableTypeIdList= new ArrayList<>();
List<String> prehomoDeliverableTypeIdList = new ArrayList<>();
List<String> verifyDeliverableTypeIdList = new ArrayList<>();
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setDesignDeliverableType(designDeliverableTypeName);
}else {
projectLawsInventoryEO.setDesignDeliverableType("null");
designDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getDesignDeliverableType().split(","));
deliverableTypeSet.addAll(designDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
prehomoDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableType().split(","));
deliverableTypeSet.addAll(prehomoDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
verifyDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableType().split(","));
deliverableTypeSet.addAll(verifyDeliverableTypeIdList);
}
//树形结构
List<SysCategory> deliverableTypeList = new ArrayList<>();
if (deliverableTypeSet.size() != 0) {
LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysCategory::getId, deliverableTypeSet);
deliverableTypeList = sysCategoryService.list(wrapper);
}
//设计符合性确认-交付物类型
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
StringBuilder designBuilder = new StringBuilder();
for(String id : designDeliverableTypeIdList){
List<SysCategory> designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (designList.size() != 0) {
designBuilder.append(designList.get(0).getEnName() + ",");
}
}
String designEnName = null;
if (StringUtils.isNotBlank(designBuilder)) {
designEnName = designBuilder.substring(0, designBuilder.length() - 1);
}
projectLawsInventoryEO.setDesignDeliverableTypeName(designEnName);
} else {
projectLawsInventoryEO.setDesignDeliverableTypeName("null");
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setPrehomoDeliverableType(prehomoDeliverableTypeName);
}else {
projectLawsInventoryEO.setPrehomoDeliverableType("null");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
StringBuilder prehomoBuilder = new StringBuilder();
for(String id : prehomoDeliverableTypeIdList){
List<SysCategory> prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (prehomoList.size() != 0) {
prehomoBuilder.append(prehomoList.get(0).getEnName() + ",");
}
}
String prehomoEnName = null;
if (StringUtils.isNotBlank(prehomoBuilder )) {
prehomoEnName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1);
}
projectLawsInventoryEO.setPrehomoDeliverableTypeName(prehomoEnName);
} else {
projectLawsInventoryEO.setPrehomoDeliverableTypeName("null");
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setVerifyDeliverableType(verifyDeliverableTypeName);
}else {
projectLawsInventoryEO.setVerifyDeliverableType("null");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
StringBuilder verifyBuilder = new StringBuilder();
for(String id : verifyDeliverableTypeIdList){
List<SysCategory> verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (verifyList.size() != 0) {
verifyBuilder.append(verifyList.get(0).getEnName() + ",");
}
}
String verifyEnName = null;
if (StringUtils.isNotBlank(verifyBuilder)) {
verifyEnName = verifyBuilder.substring(0, verifyBuilder.length() - 1);
}
projectLawsInventoryEO.setVerifyDeliverableTypeName(verifyEnName);
} else {
projectLawsInventoryEO.setVerifyDeliverableTypeName("null");
}
@@ -2248,6 +2430,47 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}else {
projectLawsInventoryEO.setVerifyDueDateString("null");
}
//文件
List<String> deliverableList = new ArrayList<>();
//设计符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(",")));
}
// Prehomo确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(",")));
}
// 验证符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(",")));
}
List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){
fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ","));
}
//交付物类型模板
if(fileInfos.size() != 0){
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getDesignDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getPrehomoDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getVerifyDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
}
}
}
}
}
@@ -4272,13 +4495,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//设计符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableType").split(","));
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableType").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|"));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
@@ -4332,13 +4555,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(","));
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableType").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|"));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
@@ -4393,13 +4616,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(","));
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableType").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|"));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
@@ -4452,15 +4675,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
}
contentLog = contentLog.substring(0, contentLog.length()-1);
enContentLog =enContentLog.substring(0, enContentLog.length()-1);
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
}
}
contentLog = contentLog.substring(0, contentLog.length()-1);
enContentLog =enContentLog.substring(0, enContentLog.length()-1);
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
}
//表格高度
private static int high = 25;
//表格宽度
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
+3
View File
@@ -108,4 +108,7 @@ public class SarFileSplitInfoEO implements Serializable {
@TableField(exist = false)
private String cut;
@TableField(exist = false)
private String documentId;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+8
View File
@@ -11,6 +11,7 @@ import com.jero.common.exception.JeroBootException;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.document.enums.FieldTypeEnum;
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.ocr.util.LineHumpUtil;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
@@ -57,6 +58,8 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
private FileSpiltService fileSpiltService;
@Autowired
private ISarFileSplitMenuEOService sarFileSplitMenuEOService;
@Autowired
private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
/**
@@ -258,6 +261,11 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
// splitInfoEO.setFileType(enMap.get(splitInfoEO.getFileType()));
splitInfoEO.setSplitResult(enMap.get(splitInfoEO.getSplitResult()));
}
// 处理文档库id字段 根据编号和标题查询
List<Map<String, Object>> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber());
if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) {
splitInfoEO.setDocumentId(bussDocumentLibraryEOList.get(0).get("id").toString());
}
if(StringUtils.isNotEmpty(splitInfoEO.getFileId())) {
splitInfoEO.setFlag("1");
}else{
jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+13 -5
View File
@@ -93,7 +93,7 @@ spring:
mvc:
static-path-pattern: /**
resource:
static-locations: classpath:/static/,classpath:/public/
static-locations: classpath:/static/,classpath:/public/,classpath:/home/
autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource:
@@ -388,7 +388,7 @@ people:
# secret: CDf2D9404C6ac1B0f7c3e3845ae0282a
# appSecret CN PROD版
secret: 7C3F03170E3ea489df04Ce8DEC7Df4f7
cronJobIsOpen: true
cronJobIsOpen: false
## Feishu
Feishu:
# 测试
@@ -404,10 +404,18 @@ local-tool:
uri: http://139.9.235.66:9022
opensso:
# TEST版
accessTokenUrl: https://signin-test.nio.com/oauth2/accessToken
profileUrl: https://signin-test.nio.com/oauth2/profile
# accessTokenUrl: https://signin-test.nio.com/oauth2/accessToken
# profileUrl: https://signin-test.nio.com/oauth2/profile
# clientId: 100679
# clientSecret: CDf2D9404C6ac1B0f7c3e3845ae0282a
# redirectUri: http%3A%2F%2F139.9.235.66%3A8010
# PROD版
authorizeUrl: https://signin.nio.com/oauth2/authorize
accessTokenUrl: https://signin.nio.com/oauth2/accessToken
profileUrl: https://signin.nio.com/oauth2/profile
clientId: 100679
clientSecret: CDf2D9404C6ac1B0f7c3e3845ae0282a
clientSecret: 7C3F03170E3ea489df04Ce8DEC7Df4f7
redirectUri: http%3A%2F%2F139.9.235.66%3A8010
---
jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdcf.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 570 B

jero-boot/jero-boot-single-startup/src/main/resources/static/home/wddb.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1000 B

jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdfy.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdk.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 735 B

jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsb.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsc.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 985 B

jero-boot/jero-boot-single-startup/src/main/resources/static/home/xmk.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 743 B

jero-boot/jero-boot-single-startup/src/main/resources/static/home/xnqd.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

jero-boot/jero-boot-single-startup/src/main/resources/static/home/xxsj.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 747 B

jero-boot/jero-boot-single-startup/src/main/resources/static/home/yjcj.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 965 B

jero-boot/jero-boot-single-startup/src/main/resources/static/home/zswdk.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1001 B

jero-web/src/App.vue
+4 -4
View File
@@ -133,10 +133,10 @@
}
.itemModel-multi {
width: calc(100% - 130px)!important;
display: inline-block!important;
margin-top: 2px!important;
height: 40px!important;
width: calc(100% - 130px) !important;
display: inline-block !important;
margin-top: 2px !important;
height: 40px !important;
}
.itemModel-multi .ant-form-explain, .ant-form-extra {
jero-web/src/common/lang/en-us.js
+2
View File
@@ -708,6 +708,8 @@ module.exports = {
uploadTime: 'Upload time',
enclosure: 'Enclosure',
// 认证
Correspondingstandarddeleted: 'Correspondingstandarddeleted',
changeTheTitle: 'Title already exists, please change the title',
resetPassword: 'reset Password',
departmentAllocation: 'department Allocation',
ListTitle: 'List Title',
jero-web/src/common/lang/zh-cn.js
+2
View File
@@ -718,6 +718,8 @@ module.exports = {
uploadTime: '上传时间',
enclosure: '附件',
// 认证
Correspondingstandarddeleted: '对应标准已删除',
changeTheTitle: '标题已存在，请更换标题',
resetPassword: '重置密码',
departmentAllocation: '部门配置',
ListTitle: '清单标题',
jero-web/src/components/SplitTable/index.vue
+9 -1
View File
@@ -126,7 +126,15 @@
},
methods: {
urlClick(text,record) {
this.$emit('detailClick', record)
if(record.documentId === null) {
this.$message.warning(this.$t('Correspondingstandarddeleted'))
} else {
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: record
})
window.open(newUrl.href, '_blank')
}
},
getTextWith(text, fontStyle) {
var canvas = document.createElement('canvas')
jero-web/src/components/tableCollection/index.vue
+2 -2
View File
@@ -64,7 +64,7 @@
</a-table>
</div>
<!-- 修改工程接口人--->
<a-modal v-model="areaVisible" :title="$t('modifyprojectInterfacePerson')" width='750px' :footer="null">
<a-modal v-model="areaVisible" :title="$t('modifyprojectInterfacePerson')" width='500px' :footer="null">
<a-form-model
class='tag-module'
ref='ruleForm'
@@ -74,7 +74,7 @@
:wrapper-col='wrapperCol'
>
<a-row :gutter='24'>
<a-col :span='12'>
<a-col :span='24'>
<a-form-model-item ref='region' :label="$t('engineeringInterfacePerson')" prop='region'>
<a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')" v-model="Dateline.querySdt">
<a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">
jero-web/src/views/documentManage/library/docDetail/index.vue
+3 -1
View File
@@ -353,7 +353,9 @@
},
methods: {
getInfoById() {
getAction(this.url.getInfo, { id: this.$route.query.id }).then((res) => {
let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
console.log(_id)
getAction(this.url.getInfo, { id: _id }).then((res) => {
if (res.success) {
this.detailList = res.result
} else {
jero-web/src/views/documentManage/tags/dialog/DicList.vue
+1 -1
View File
@@ -418,7 +418,7 @@
}
this.loadData()
}else{
this.$message.warning(this.$t('operationFailed'));
this.$message.warning(res.message);
}
})
}
jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="box-text">
<div class="header-text">
{{$t('engineeringConfirmation')}}
<a-icon :title="$t('pleaseReviewTask')"
<a-icon v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay" :title="$t('pleaseReviewTask')"
type="question-circle"/>
</div>
</div>
jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+3 -2
View File
@@ -1,11 +1,12 @@
<template>
<div class="box">
<div class="box-text">
<div class="header-text" v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh'">
<div class="header-text"
v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh' || $route.query.TaskKey == 'dreDispose'">
{{$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh'
? $t('personLiableConfirm'):$t('fillInProjectDelivery')}}
<a-icon :title="$route.query.TaskKey == 'zrrclrw'?$t('pleaseConfirmationResults'):$t('pleaseReviewTask')"
v-if="$route.query.TaskKey == 'zrrclrw'"
v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'dreDispose'"
type="question-circle"/>
</div>
</div>
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+20 -12
View File
@@ -85,6 +85,16 @@
<a-icon type="bulb"/>
{{$t('CompulsoryWithdrawal')}}
</div>
<!-- 分配填写人-->
<div @click="assignedBy" class="operator-text-title">
<a-icon type="copy"/>
{{$t('Assignedby')}}
</div>
<!-- 引用参数-->
<div @click="referenceparameter" class="operator-text-title">
<a-icon type="plus"/>
{{$t('referenceparameter')}}
</div>
<!-- 截止时间-->
<div @click="TaskCutOffTime" class="operator-text-title">
<a-icon type="bulb"/>
@@ -100,11 +110,6 @@
<a-icon type="plus"/>
{{$t('addTo')}}
</div>
<!-- 分配填写人-->
<div @click="assignedBy" class="operator-text">
<a-icon type="copy"/>
{{$t('Assignedby')}}
</div>
<!-- 提交-->
<div @click="handleSubmit" class="operator-text">
<a-icon type="plus"/>
@@ -115,11 +120,6 @@
<a-icon type="plus"/>
{{$t('sendBack')}}
</div>
<!-- 引用参数-->
<div @click="referenceparameter" class="operator-text">
<a-icon type="plus"/>
{{$t('referenceparameter')}}
</div>
<!-- 批量删除-->
<div @click="handleDelJurisdiction" class="operator-text" v-has="'document:deleteBatch'">
<a-icon type="delete"/>
@@ -136,7 +136,7 @@
<parameter-library-add v-if='areaVisible' :paramsManifest='paramsManifest'/>
</a-modal>
<!-- 冻结配置--->
<a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='750px' :footer="null">
<a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='500px' :footer="null">
<a-form-model
class='tag-module'
ref='ruleForm'
@@ -146,7 +146,7 @@
:wrapper-col='wrapperCol'
>
<a-row :gutter='24'>
<a-col :span='12'>
<a-col :span='24'>
<a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
<a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig">
<a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
@@ -1077,6 +1077,14 @@ export default {
cursor: pointer;
border-radius: 4px;
}
.operator-text-title {
cursor: pointer;
margin-right: 22px;
font-size: 14px;
font-weight: 400;
color: #040B29;
margin-bottom: 22px;
}
</style>
<style>
.box-input .ant-select-selection {
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+29 -9
View File
@@ -1,9 +1,9 @@
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<a-form layout="inline" @keyup.enter.native="searchQuery" >
<a-row :gutter="24" class='add-padding'>
<a-col :md="7" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
@@ -76,8 +76,7 @@
</div>
<!-- 参数模板-->
<a-modal v-model="areaVisible" :title="$t('parameterTemplate')" width='750px' :footer="null">
<parameter-template-add :url='url' ref='templateRef' v-if='areaVisible' @areaVisible='handleCancel' :templateTitle='templatetitle'
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version'
<parameter-template-add :url='url' ref='templateRef' v-if='areaVisible' @areaVisible='handleCancel' :version='version'
:projectId='this.$route.query.id'></parameter-template-add>
</a-modal>
<!-- 配置-->
@@ -92,6 +91,14 @@
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version'
:projectId='this.$route.query.id'></parameter-template-cody>
</a-modal>
<!-- 项目收集参数-->
<a-modal class="show-drawer" :title="titleTag" placement="right" width="700px" @close="drawerVisible = false"
:visible="drawerVisible" :footer="null">
<project-collection-parameters v-if='drawerVisible' @areaVisible='drawerhandleCancel' :templateTitle='templatetitle'
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url'
:projectId='this.$route.query.id'></project-collection-parameters>
</a-modal>
</a-card>
</template>
@@ -99,6 +106,7 @@
import ImportFile from '@/components/ImportFile/index'
import ParameterTemplateAdd from '../dialog/ParameterTemplateAdd'
import ParameterTemplateCody from '../dialog/ParameterTemplateCody'
import ProjectCollectionParameters from '../dialog/ProjectCollectionParameters'
import HistoricalVersion from '../dialog/historicalVersion'
import { getAction, postAction } from '../../../api/manage'
import Configure from '../dialog/configure'
@@ -113,7 +121,8 @@
ParameterTemplateAdd,
Configure,
HistoricalVersion,
ParameterTemplateCody
ParameterTemplateCody,
ProjectCollectionParameters
},
data() {
return {
@@ -190,7 +199,10 @@
itemId: '',
historicalVisible: false,
historicalRow: {}, // 历史版本得数据
areaVisibleCody: false // 复制参数清单得弹框
areaVisibleCody: false, // 复制参数清单得弹框
drawerVisible: false,
drawerVisibleitem: false,
titleTag: ''
}
},
mounted() {
@@ -238,6 +250,10 @@
this.areaVisible = val
this.getlist()
},
// 项目收集参数
drawerhandleCancel(val) {
this.drawerVisible = val
},
searchQuery() {
this.pageNo = 1
this.getlist()
@@ -338,8 +354,8 @@
}
},
handleCody() {
console.log('复制')
// this.areaVisibleCody = true
this.drawerVisible = true
this.titleTag = '项目收集参数'
},
pageOnChange(page, pageSize) {
this.pageNo = page
@@ -357,6 +373,7 @@
pageNo: this.pageNo,
...this.queryParam
}
console.log(query,'projectIdprojectIdbainji ')
getAction(this.url.list, query).then((res) => {
if (res.success) {
if (res.result.current > 1 && res.result.records.length == 0) {
@@ -489,6 +506,9 @@
cursor: pointer;
border-radius: 4px;
}
/deep/.add-padding{
margin-left: -89px!important;
}
</style>
<style>
.box-input .ant-select-selection {
jero-web/src/views/projectManagement/components/addModel.vue
+2
View File
@@ -395,12 +395,14 @@
this.formInline = { ...this.formInline }
},
projectNameChange(value) {
this.formInline.yearNameId = undefined
let content = this.projectNameList.filter(res => {
return res.id == value
})
this.formInline.vehiclePlatform = content[0].vehiclePlatform || ''
this.yearNameDataList = content[0].yearNameDataList || []
this.formInline.digitalPlatform = content[0].digitalPlatform || ''
this.formInline = {...this.formInline}
}
}
}
jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
+47 -43
View File
@@ -11,10 +11,10 @@
>
<a-row :gutter='24'>
<a-col :span='9'>
<a-form-model-item :label="$t('title')" prop='templatetitle'>
<a-form-model-item :label="$t('title')" prop='title'>
<a-input style='width: 420px'
:placeholder="$t('PleaseEnter')+$t('title')"
v-model='formData.templatetitle' />
v-model='formData.title' />
</a-form-model-item>
</a-col>
<a-col :span='9'>
@@ -116,7 +116,7 @@ export default {
form: {},
formData: {},
rules: {
templatetitle: [
title: [
{ required: true, message: this.$t('enterTitle'), trigger: 'blur' }
]
},
@@ -124,28 +124,12 @@ export default {
flag: false, //表单提交标识
spinLoading: false,
confirmLoading: false,
templatetitle: '',
selectedRowKeys: [],
pageNo: 1,
pageSize: 10
}
},
props: {
templateTitle: {
type: String,
default: '',
required: false
},
selectedRowKeyS: {
type: Array,
default: '',
required: false
},
rowId: {
type: String,
default: '',
required: false
},
version: {
type: Number,
default: '',
@@ -201,11 +185,40 @@ export default {
handleCancel() {
this.$emit('areaVisible', false)
},
// onGetCheckboxProps(val,value) {
// let _val = {}
// // 新增时没有
// if(this.formData.id === undefined) {
// props : {}
// } else {
// // 编辑
// props : {
// disabled: val.id === 'ce879dab56a243fd99119553d3899e62'
// }
// }
// console.log(this.formData.id,'this.formData.id')
// console.log(val)
// return(_val
// // {
// // props: {
// //
// // // console.log(value,'value')
// // // // 全部默认禁止选中
// // // // disabled: true,
// // // // 某几项默认禁止选中(R: 当state等于1时)
// // disabled: val.id === 'ce879dab56a243fd99119553d3899e62'
// // // // 某几项默认选中(R: 当state等于1时)
// // // // defaultChecked: record.state == 1,
// // }
// // }
// )
// },
onSelectChange(selectedRowKeys, selectedRowKeysDate) {
this.selectedRowKeysDate = selectedRowKeysDate
this.selectedRowKeys = selectedRowKeys
},
handleTableChange(val) {
console.log(',,,')
},
showModal() {
this.title = this.$t('add')
@@ -213,18 +226,9 @@ export default {
this.form = {}
},
editData(edit) {
let query = {
id: edit.id
}
getAction(this.url.queryById, query).then((res) => {
if (res.success) {
this.formData.templatetitle = res.result.title
this.selectedRowKeys = res.result.paramsTemplateId.split(',')
// this.rowId = res.result.id
// this.version = res.result.paramsTemplatePublishVersion
} else {
}
})
this.formData = {...edit}
this.selectedRowKeys = edit.paramsTemplateId.split(',')
},
//新增
handleSubmit() {
@@ -239,18 +243,21 @@ export default {
this.spinLoading = true
// 新增編輯之前 判断 标题唯一
getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id}
&title=${this.formData.templatetitle}`, {})
&title=${this.formData.title}`, {})
.then(res => {
if (res.success) {
if (res.result) {
let postDate = {
title: this.formData.templatetitle,
paramsTemplateId: this.rowId || this.selectedRowKeysDate[0].id,
paramsTemplatePublishVersion: this.version || this.selectedRowKeysDate[0].version,
title: this.formData.title,
paramsTemplateId: this.paramsTemplateId || this.selectedRowKeys[0],
paramsTemplatePublishVersion: this.version,
projectId: this.projectId
}
if (this.rowId) {
console.log('编辑')
if (this.formData.id) {
//编辑
postDate = {
id : this.formData.id,
...postDate
}
postAction(`params/manifest/edit`, postDate).then(res => {
if (res.success) {
this.newVisible = false
@@ -266,7 +273,6 @@ export default {
this.newVisible = false
})
} else {
console.log('新增')
//新增
postAction(`params/manifest/add`, postDate).then(res => {
if (res.success) {
@@ -284,7 +290,8 @@ export default {
})
}
} else {
this.$message.warning(res.message)
this.$message.warning(this.$t('changeTheTitle'))
this.spinLoading = false
}
}).finally(() => {
this.loading = false
@@ -328,9 +335,6 @@ export default {
// 编辑
},
watch: {
templateTitle(val) {
this.formData.templatetitle = val
},
selectedRowKeyS(val) {
this.selectedRowKeys = val
}
jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
+345
View File
@@ -0,0 +1,345 @@
<template>
<div class='diolag-area'>
<a-spin :spinning='spinLoading'>
<a-form-model
class='tag-module'
ref='ruleForm'
:model='formData'
:rules='rules'
:label-col='labelCol'
:wrapper-col='wrapperCol'
>
<a-row :gutter='24'>
<a-col :span='9'>
<a-form-model-item :label="$t('title')" prop='title'>
<a-input style='width: 420px'
:placeholder="$t('PleaseEnter')+$t('title')"
v-model='formData.title' />
</a-form-model-item>
</a-col>
<a-col :span='9'>
</a-col>
<a-col :span='6'>
</a-col>
</a-row>
<a-row :gutter='24'>
<a-col :span='9'>
<a-form-model-item :label="$t('entryName')" prop='projectName'>
<a-input style='width: 420px'
:placeholder="$t('PleaseEnter')+$t('entryName')"
v-model='formData.projectName' />
</a-form-model-item>
</a-col>
<a-col :span='9'>
</a-col>
<a-col :span='6' style='margin-top: 4px;'>
<a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
<a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
</a-col>
</a-row>
</a-form-model>
</a-spin>
<a-table
class='table-area'
ref='table'
size='middle'
rowKey='id'
:columns='columns'
:dataSource='areaTable'
:pagination='false'
:loading='loading'
:scroll='{x: 600}'
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
@change='handleTableChange'>
</a-table>
<div class="page" style='display: flex;justify-content: flex-end;'>
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="pageSize"
:total="total"
@change="pageOnChange"
@showSizeChange="SizeChange"
/>
</div>
<div class='drawer-bootom-button'>
<a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
<a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
</div>
</div>
</template>
<script>
import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
import axios from 'axios'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
export default {
name: 'diolagArea',
components: {},
data() {
return {
token:Vue.ls.get(ACCESS_TOKEN),
title: this.$t('add'),
total: 0,
selectedRowKeysDate: {},
loading: false,
editId: '',
columns: [
{
title: this.$t('entryName'),
dataIndex: 'projectName',
key: 'showArea',
align: 'center',
ellipsis: true
},
{
title: this.$t('ListTitle'),
align: 'center',
dataIndex: 'title',
ellipsis: true
},
{
title: this.$t('parameterTemplate'),
align: 'center',
dataIndex: 'paramsTemplateName',
ellipsis: true
}
],
newVisible: false,
labelCol: {
xs: { span: 24 },
sm: { span: 7 }
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 14 }
},
form: {},
formData: {},
rules: {
title: [
{ required: true, message: this.$t('enterTitle'), trigger: 'blur' }
]
},
areaTable: [],
flag: false, //表单提交标识
spinLoading: false,
confirmLoading: false,
selectedRowKeys: [],
pageNo: 1,
pageSize: 10
}
},
props: {
version: {
type: Number,
default: '',
required: false
},
projectId: {
type: String,
default: '',
require: true
},
url: {
type: Object,
default: '',
require: true
}
},
mounted() {
this.loadData()
},
methods: {
pageOnChange(page, pageSize) {
this.pageNo = page
this.loadData()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.loadData()
},
loadData() {
let _this = this
let params = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...this.formData
}
this.loading = true
axios({
url: `/jero-boot/params/manifest/getAllManifest`,
method: 'post',
data: params,
transformRequest: [function (data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token':_this.token
}
})
.then( (res) =>{
if (res.data.success) {
console.log(res.data)
this.loading = false
this.areaTable = res.data.result.records || []
this.total = res.data.result.total
}else{
this.loading = false
}
})
.catch( (error) =>{
console.log(error);
});
},
searchQuery() {
this.loadData()
},
searchReset() {
this.formData = {}
this.loadData()
},
handleCancel() {
this.$emit('areaVisible', false)
},
onSelectChange(selectedRowKeys, selectedRowKeysDate) {
this.selectedRowKeysDate = selectedRowKeysDate
this.selectedRowKeys = selectedRowKeys
},
handleTableChange(val) {
console.log(',,,')
},
showModal() {
this.title = this.$t('add')
this.newVisible = true
this.form = {}
},
//新增
handleSubmit() {
if (this.selectedRowKeys.length == 0) {
this.$message.warning(this.$t('pleaseSelectData'))
} else if (this.selectedRowKeys.length > 1) {
this.$message.warning(this.$t('OnlyOneSelected'))
} else {
this.$refs.ruleForm.validate(valid => {
if (valid) {
this.flag = true
this.spinLoading = true
// 新增編輯之前 判断 标题唯一
getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id}
&title=${this.formData.title}`, {})
.then(res => {
if (res.result) {
let postDate = {
title: this.formData.title,
paramsTemplateId: this.paramsTemplateId || this.selectedRowKeys[0],
paramsTemplatePublishVersion: this.version,
projectId: this.projectId
}
if (this.formData.id) {
//编辑
postDate = {
id : this.formData.id,
...postDate
}
postAction(`params/manifest/edit`, postDate).then(res => {
if (res.success) {
this.newVisible = false
this.$emit('areaVisible', false)
this.$message.success(this.$t('OperationSuccessful'))
} else {
this.$message.warning(res.message)
}
}
).finally(() => {
this.flag = false
this.spinLoading = false
this.newVisible = false
})
} else {
//新增
postAction(`params/manifest/add`, postDate).then(res => {
if (res.success) {
this.newVisible = false
this.$emit('areaVisible', false)
this.$message.success(this.$t('OperationSuccessful'))
} else {
this.$message.warning(res.message)
}
}
).finally(() => {
this.flag = false
this.spinLoading = false
this.newVisible = false
})
}
} else {
this.$message.warning(this.$t('changeTheTitle'))
this.spinLoading = false
}
}).finally(() => {
this.loading = false
})
} else {
return false
}
})
}
},
},
watch: {
selectedRowKeyS(val) {
this.selectedRowKeys = val
}
}
}
</script>
<style lang='less' scoped>
@import '~@assets/less/common.less';
.diolag-area {
.table-area {
margin: 20px 0;
.action-edit {
margin-right: 10px;
}
}
.table-del {
color: red;
}
}
.drawer-bootom-button{
display: flex;
justify-content: center;
}
.Required {
color: red;
margin-right: 4px;
}
</style>
<style lang='less'>
.area-module {
.ant-modal-wrap {
.ant-modal {
.ant-modal-content {
.ant-modal-footer {
text-align: center;
}
}
}
}
}
</style>