优化代码

java110-core/src/main/java/com/java110/core/smo/impl/PhotoSMOImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.smo.IPhotoSMO;
 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.po.file.FileRelPo;
@@ -13,6 +14,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class PhotoSMOImpl implements IPhotoSMO {
 
@@ -66,14 +69,27 @@ public class PhotoSMOImpl implements IPhotoSMO {
 
         }
         JSONObject businessUnit = new JSONObject();
-        businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
         businessUnit.put("relTypeCd", "11000");
         businessUnit.put("saveWay", "table");
         businessUnit.put("objId", objId);
         businessUnit.put("fileRealName", reqJson.getString("photo"));
         businessUnit.put("fileSaveName", reqJson.getString("photo"));
+
+        FileRelDto fileRelDto = new FileRelDto();
+        fileRelDto.setObjId(objId);
+        List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+
+        if(fileRelDtos == null || fileRelDtos.size()< 1){
+            businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
+            FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
+            return fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+        }
+
         FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
-        return fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+        fileRelPo.setFileRelId(fileRelDtos.get(0).getFileRelId());
+        return fileRelInnerServiceSMOImpl.updateFileRel(fileRelPo);
+
+
     }
 
 }

service-common/src/main/java/com/java110/common/cmd/machine/UpdateAccessControlWhiteCmd.java

@@ -21,6 +21,7 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.smo.IPhotoSMO;
 import com.java110.intf.common.IAccessControlWhiteV1InnerServiceSMO;
 import com.java110.po.accessControlWhite.AccessControlWhitePo;
 import com.java110.utils.exception.CmdException;
@@ -51,6 +52,9 @@ public class UpdateAccessControlWhiteCmd extends Cmd {
     @Autowired
     private IAccessControlWhiteV1InnerServiceSMO accessControlWhiteV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IPhotoSMO photoSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "acwId", "acwId不能为空");
@@ -69,6 +73,8 @@ public class UpdateAccessControlWhiteCmd extends Cmd {
             throw new CmdException("更新数据失败");
         }
 
+        photoSMOImpl.savePhoto(reqJson, accessControlWhitePo.getAcwId(), reqJson.getString("communityId"));
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }