From 53dbe1b2140aa03458a5eac46c21c2e0047dab45 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 19 四月 2023 00:42:31 +0800
Subject: [PATCH] 优化根据楼栋查询单元bug
---
service-community/src/main/java/com/java110/community/cmd/activities/UpdateActivitiesCmd.java | 41 ++++++-----------------------------------
1 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/activities/UpdateActivitiesCmd.java b/service-community/src/main/java/com/java110/community/cmd/activities/UpdateActivitiesCmd.java
index e4a3a1d..2669153 100644
--- a/service-community/src/main/java/com/java110/community/cmd/activities/UpdateActivitiesCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/activities/UpdateActivitiesCmd.java
@@ -22,15 +22,11 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.file.FileDto;
import com.java110.dto.file.FileRelDto;
-import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
-import com.java110.intf.community.IActivitiesInnerServiceSMO;
import com.java110.intf.community.IActivitiesV1InnerServiceSMO;
import com.java110.po.activities.ActivitiesPo;
import com.java110.po.file.FileRelPo;
-import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -41,7 +37,6 @@
import org.slf4j.LoggerFactory;
import java.util.List;
-
/**
* 绫昏〃杩帮細鏇存柊
@@ -56,17 +51,13 @@
@Java110Cmd(serviceCode = "activities.updateActivities")
public class UpdateActivitiesCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(UpdateActivitiesCmd.class);
-
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+ private static Logger logger = LoggerFactory.getLogger(UpdateActivitiesCmd.class);
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
@Autowired
private IActivitiesV1InnerServiceSMO activitiesV1InnerServiceSMOImpl;
- @Autowired
- private IActivitiesInnerServiceSMO activitiesInnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -78,65 +69,45 @@
Assert.hasKeyAndValue(reqJson, "context", "蹇呭～锛岃濉啓娲诲姩鍐呭");
Assert.hasKeyAndValue(reqJson, "startTime", "蹇呭～锛岃閫夋嫨寮�濮嬫椂闂�");
Assert.hasKeyAndValue(reqJson, "endTime", "蹇呭～锛岃閫夋嫨缁撴潫鏃堕棿");
-
}
-
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-
if (reqJson.containsKey("headerImg") && !StringUtils.isEmpty(reqJson.getString("headerImg"))) {
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(reqJson.getString("headerImg"));
- fileDto.setSuffix("jpeg");
- fileDto.setCommunityId(reqJson.getString("communityId"));
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
-
- reqJson.put("headerImg", fileDto.getFileId());
- reqJson.put("fileSaveName", fileName);
-
FileRelDto fileRelDto = new FileRelDto();
fileRelDto.setRelTypeCd("70000");
fileRelDto.setObjId(reqJson.getString("activitiesId"));
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-
if (fileRelDtos == null || fileRelDtos.size() == 0) {
FileRelPo fileRelPo = new FileRelPo();
fileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
fileRelPo.setFileRealName(reqJson.getString("headerImg"));
- fileRelPo.setFileSaveName(reqJson.getString("fileSaveName"));
+ fileRelPo.setFileSaveName(reqJson.getString("headerImg"));
fileRelPo.setObjId(reqJson.getString("activitiesId"));
fileRelPo.setSaveWay("table");
fileRelPo.setRelTypeCd("70000");
int flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
- if(flag < 1){
+ if (flag < 1) {
throw new CmdException("淇濆瓨骞垮憡澶辫触");
}
} else {
FileRelPo fileRelPo = new FileRelPo();
fileRelPo.setFileRelId(fileRelDtos.get(0).getFileRelId());
fileRelPo.setFileRealName(reqJson.getString("headerImg"));
- fileRelPo.setFileSaveName(reqJson.getString("fileSaveName"));
+ fileRelPo.setFileSaveName(reqJson.getString("headerImg"));
fileRelPo.setObjId(reqJson.getString("activitiesId"));
int flag = fileRelInnerServiceSMOImpl.updateFileRel(fileRelPo);
- if(flag < 1){
+ if (flag < 1) {
throw new CmdException("淇濆瓨骞垮憡澶辫触");
}
}
-
}
-
ActivitiesPo activitiesPo = BeanConvertUtil.covertBean(reqJson, ActivitiesPo.class);
int flag = activitiesV1InnerServiceSMOImpl.updateActivities(activitiesPo);
-
if (flag < 1) {
throw new CmdException("鏇存柊鏁版嵁澶辫触");
}
-
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0