属性对比

jiangping

2023-09-21 df698fb979db6f1d571f548f40744a19e8c21ac2

属性对比

 server/company/src/main/resources/application.yml

@@ -11,7 +11,7 @@
#  application:
#    name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson:

 server/platform/src/main/resources/application.yml

@@ -11,7 +11,7 @@
#  application:
#  name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson:

 server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java

@@ -31,7 +31,7 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
//    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
@@ -40,7 +40,7 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
//    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")

 server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -292,10 +292,10 @@
                    .selectAs(SystemUser::getUsername,Company::getManagerUserName);
        queryWrapper.select(
                "(select su1.USERNAME from system_user su1 where  su1.id = t.MANAGER_ID) as managerUserName," +
                "(select su2.REALNAME from system_user su2 where  su2.id = t.SALESMAN_ID) as salesmanRealName," +
                "(select count(su3.id) from system_user su3 where  su3.COMPANY_ID = t.ID and su3.TYPE = 2) as anchorUserNum," +
                "(select count(su4.id) from system_user su4 where  su4.COMPANY_ID = t.ID and su4.TYPE = 1) as empUserNum," +
                "(select count(g.id) from goods g   where  g.COMPANY_ID = t.ID )goodsNum");
                "(select su2.REALNAME from system_user su2 where  su2.isdeleted=0 and  su2.id = t.SALESMAN_ID) as salesmanRealName," +
                "(select count(su3.id) from system_user su3 where su3.isdeleted=0 and su3.COMPANY_ID = t.ID and su3.TYPE = 2) as anchorUserNum," +
                "(select count(su4.id) from system_user su4 where su4.isdeleted=0 and su4.COMPANY_ID = t.ID and su4.TYPE = 1) as empUserNum," +
                "(select count(g.id) from goods g   where g.isdeleted=0 and  g.COMPANY_ID = t.ID )goodsNum");
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName())
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getManagerUserName()),SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
                    .eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,pageWrap.getModel().getStatus())

 server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java

@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@@ -58,10 +59,21 @@
            log.info("开始上传附件信息=================end========无待处理数据===========");
            return 0;
        }
        List<String > keyList = new ArrayList<>();
        for(FileRecord model:allLis){
                keyList.add(model.getKeyval());
        }
        try {
            ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
            obs.deleteObjects(ossModel.getBucket(),keyList);
        }catch (Exception e){
        }

        Date date = new Date();
        for(FileRecord model:allLis){
            try {
                ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
                obs.deleteObjects(ossModel.getBucket(),keyList);
                obs.uploadOnlineObject(model.getUrl(),ossModel.getBucket(), model.getKeyval(),null);
                model.setStatus(Constants.ONE);
                model.setContent("上传成功");
@@ -72,6 +84,7 @@
            model.setEditDate(date);
            fileRecordMapper.updateById(model);
        }

        return  0;
    }


 server/zhubo/src/main/resources/application.yml

@@ -11,7 +11,7 @@
#  application:
#    name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson: