优化代码

java110

2021-12-07 c7ecaaac5d72e269c4eba57540eb9860f1f184e9

优化代码

 service-api/src/main/java/com/java110/api/smo/file/impl/UploadVedioSMOImpl.java

@@ -4,9 +4,13 @@
import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.config.properties.code.Java110Properties;
import com.java110.core.client.FtpUploadTemplate;
import com.java110.core.client.OssUploadTemplate;
import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.api.smo.file.IUploadVedioSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.util.OSSUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -31,6 +35,9 @@
    @Autowired
    private FtpUploadTemplate ftpUploadTemplate;

    @Autowired
    private OssUploadTemplate ossUploadTemplate;

    @Override
    public ResponseEntity<Object> upload(IPageData pd, MultipartFile uploadFile) throws IOException {

@@ -39,9 +46,21 @@
            throw new IllegalArgumentException("上传文件超过1024兆");
        }

        String fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
                java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
                java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
//        String fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
//                java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
//                java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
//
        String fileName = "";
        String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
        if (StringUtil.isEmpty(ossSwitch) || !OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
            fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
                    java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
                    java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
        } else {
            fileName = ossUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
                    java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
                    java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
        }
        JSONObject outParam = new JSONObject();
        outParam.put("fileName", uploadFile.getOriginalFilename());
        outParam.put("realFileName", fileName);

 service-community/src/main/java/com/java110/community/cmd/community/SaveCommunityCmd.java

@@ -79,8 +79,8 @@
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
        communityBMOImpl.addCommunity(reqJson, cmdDataFlowContext);
        communityBMOImpl.addCommunityMembers(reqJson, cmdDataFlowContext);
        //产生物业费配置信息
        communityBMOImpl.addFeeConfigProperty(reqJson, cmdDataFlowContext);
        //产生物业费配置信息 不要产生默认费
        //communityBMOImpl.addFeeConfigProperty(reqJson, cmdDataFlowContext);
        communityBMOImpl.addFeeConfigRepair(reqJson, cmdDataFlowContext); // 报修费用
        communityBMOImpl.addFeeConfigParkingSpaceTemp(reqJson, cmdDataFlowContext);//地下出租