Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2025-03-11 ccfd4adf5fbc53ca8026234ed7631c2b3961abd6

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 server/meeting/meeting_admin/src/main/resources/application.yml

@@ -27,7 +27,7 @@
  mapper-locations: classpath*:/mappers/**/*.xml
  configuration:
    map-underscore-to-camel-case: true
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    log-impl: com.doumee.config.mybatis.DmStdOutImpl


# ç¼“存内容设置

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

@@ -31,7 +31,7 @@
  mapper-locations: classpath*:/mappers/**/*.xml
  configuration:
    map-underscore-to-camel-case: true
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    log-impl: com.doumee.config.mybatis.DmStdOutImpl

# ç¼“存内容设置
cache:

 server/system_service/src/main/java/com/doumee/config/mybatis/DmStdOutImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
package com.doumee.config.mybatis;

import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.logging.stdout.StdOutImpl;

@Slf4j
public class DmStdOutImpl extends StdOutImpl {

    public DmStdOutImpl(String clazz) {
        super(clazz);
    }

    public boolean isDebugEnabled() {
        return true;
    }

    public boolean isTraceEnabled() {
        return true;
    }

    public void error(String s, Throwable e) {
        log.error(s);
        System.err.println(s);
        e.printStackTrace(System.err);
    }

    public void error(String s) {
        log.error(s);
        System.err.println(s);
    }

    public void debug(String s) {
        log.info(s);
        System.out.println(s);
    }

    public void trace(String s) {
        log.trace(s);
        System.out.println(s);
    }

    public void warn(String s) {
        log.warn(s);
        System.out.println(s);
    }
}

 server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java

@@ -357,8 +357,28 @@
        TmsCircleStatusListRequest p1 = new TmsCircleStatusListRequest();
        p1.setContractNumber(param.getContractNumber());
        result.setCicleStatusList(getCicleStatusList(p1));
        result.setStartTransportDate(getStartTransportDateByList(result.getCicleStatusList()));
        return result;
    }

    private String getStartTransportDateByList(List<TmsCircleStatusResultListResponse> cicleStatusList) {
        if(cicleStatusList!=null){
            for(TmsCircleStatusResultListResponse m :cicleStatusList){
                if(Constants.equalsInteger(m.getKey(),TMSContants.TopStatusLevel.clysz.getKey())){
                    if(m.getSecondList()!=null){
                        for(TmsCircleStatusListResponse c :m.getSecondList()){
                            if(Constants.equalsInteger(c.getOrderStatus(),TMSContants.ChildStatusLevel.clqdapp.getOrderStatus())){
                                 return  c.getRecordDate();
                            }
                        }
                    }
                }
            }
        }

        return null;
    }

    /**
     * å…¨å›½åˆ°è´§åœ°åˆ†å¸ƒæŸ¥è¯¢æŸ¥è¯¢
     * @param param å‚æ•°

 server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsOrderInfoResponse.java

@@ -26,6 +26,8 @@
    private String   orderStatus    ; //当前运输单状态
    @ApiModelProperty(value = "制单时间" )
    private String   ncCreateDate; //    åˆ¶å•æ—¶é—´
    @ApiModelProperty(value = "起运时间" )
    private String   startTransportDate; //    èµ·è¿æ—¶é—´
    @ApiModelProperty(value = "运输如期" )
    private String   transportDate; //
    @ApiModelProperty(value = "运输单号" )

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

@@ -29,7 +29,7 @@
  mapper-locations: classpath*:/mappers/**/*.xml
  configuration:
    map-underscore-to-camel-case: true
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    log-impl: com.doumee.config.mybatis.DmStdOutImpl

# ç¼“存内容设置
cache:

 server/visits/admin_timer/src/main/resources/application.yml

@@ -25,7 +25,7 @@
  mapper-locations: classpath*:/mappers/**/*.xml
  configuration:
    map-underscore-to-camel-case: true
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    log-impl: com.doumee.config.mybatis.DmStdOutImpl

# ç¼“存内容设置
cache:

 server/visits/dmvisit_admin/src/main/resources/application.yml

@@ -28,7 +28,7 @@
  mapper-locations: classpath*:/mappers/**/*.xml
  configuration:
    map-underscore-to-camel-case: true
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    log-impl: com.doumee.config.mybatis.DmStdOutImpl

# ç¼“存内容设置
cache:
@@ -54,7 +54,7 @@
# dao层的日志设置为debug，方便查看sql
logging:
  level:
    com.doumee.dao: debug
    com.doumee.dao: info




 server/visits/dmvisit_admin/src/main/resources/logback-spring.xml

@@ -8,7 +8,6 @@
    <property name="log.path" value="/usr/local/jars/logs/visitsAdmin"></property>
    <property name="log.fileSize" value="100MB"></property>
    <property name="log.historyDays" value="7"></property>

    <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>ERROR</level>
@@ -22,6 +21,18 @@
        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
            <!--路径-->
            <fileNamePattern>${log.path}/info.%d.%i.log</fileNamePattern>
            <maxFileSize>${log.fileSize}</maxFileSize>
            <maxHistory>${log.historyDays}</maxHistory>
            <totalSizeCap>1GB</totalSizeCap>
        </rollingPolicy>
    </appender>
    <appender name="fileSqlLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <encoder>
            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
        </encoder>
        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
            <!--路径-->
            <fileNamePattern>${log.path}/sql.%d.%i.log</fileNamePattern>
            <maxFileSize>${log.fileSize}</maxFileSize>
            <maxHistory>${log.historyDays}</maxHistory>
            <totalSizeCap>1GB</totalSizeCap>
@@ -53,6 +64,14 @@
        <!-- æ·»åŠ é™„加的appender,最多只能添加一个 -->
        <appender-ref ref ="fileInfoLog"/>
    </appender>
    <!-- MyBatis SQL日志配置 -->
    <logger name="com.doumee.dao" level="DEBUG" additivity="false">
        <appender-ref ref="fileSqlLog" />
    </logger>
    <!-- å¦‚果你使用MyBatis-Plus，也可以添加以下配置 -->
    <logger name="com.baomidou.mybatisplus" level="DEBUG"  additivity="false" >
        <appender-ref ref="fileSqlLog" />
    </logger>
    <root level="info">
        <appender-ref ref="consoleLog"/>
        <appender-ref ref="fileInfoLog"/>

 server/visits/dmvisit_screen/src/main/resources/application.yml

@@ -30,7 +30,7 @@
  mapper-locations: classpath*:/mappers/**/*.xml
  configuration:
    map-underscore-to-camel-case: true
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    log-impl: com.doumee.config.mybatis.DmStdOutImpl


# ç¼“存内容设置

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java

@@ -410,6 +410,7 @@

    @Override
    public List<HiddenDanger> findList(HiddenDanger hiddenDanger) {
        hiddenDanger.setIsdeleted(Constants.ZERO);
        QueryWrapper<HiddenDanger> wrapper = new QueryWrapper<>(hiddenDanger);
        return hiddenDangerMapper.selectList(wrapper);
    }
@@ -491,6 +492,7 @@

    @Override
    public long count(HiddenDanger hiddenDanger) {
        hiddenDanger.setIsdeleted(Constants.ZERO);
        QueryWrapper<HiddenDanger> wrapper = new QueryWrapper<>(hiddenDanger);
        return hiddenDangerMapper.selectCount(wrapper);
    }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -1961,7 +1961,7 @@
                .selectAs(Position::getName,Member::getPositionName)
                .leftJoin(Position.class,Position::getId,Member::getPositionId)
                .eq(StringUtils.isNotBlank(checkVisitedDTO.getMobile()),Member::getPhone,checkVisitedDTO.getMobile())
                .eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
                .like(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
                .eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Member::getStatus,Constants.ZERO)
                .eq(Member::getWorkStatus,Constants.ZERO)

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java

@@ -132,6 +132,7 @@
                        .select(PlatformJob::getTotalNum)
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                        .eq(PlatformJob::getOrigin,Constants.ONE)
                        .in(PlatformJob::getType,new Integer[]{0,2,4})
                        .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
                                , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
                                , Constants.PlatformJobStatus.LEAVED.getKey())
@@ -801,11 +802,13 @@
                        .selectAll(PlatformJob.class)
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                        .eq(PlatformJob::getCarCodeFront,param.getCarCode())
                        .in(PlatformJob::getStatus,
                        .notIn(PlatformJob::getStatus,
                                Constants.PlatformJobStatus.DONE.getKey(),
                                Constants.PlatformJobStatus.LEAVED.getKey(),
                                Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),
                                Constants.PlatformJobStatus.CALLED.getKey())
                                Constants.PlatformJobStatus.CANCEL.getKey()
                        )
                        .orderByAsc(PlatformJob::getId)
                        .last("limit 1"));

        dealJobDetailAndContractBiz(job,data);
@@ -951,6 +954,7 @@
                        .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
                        .select(PlatformJob::getStatus,PlatformJob::getStatus)
                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                        .in(PlatformJob::getType,Constants.ONE,Constants.THREE)
                        .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),
                                Constants.PlatformJobStatus.LEAVED.getKey(),
                                Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
@@ -1971,7 +1975,7 @@
        List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
                .selectAll( PlatformJob.class)
//                .select("(select sum(ifnull(a.io_qty,0)) from platform_wms_detail a where a.isdeleted=0 and a.job_id =t.id )", create_date)
                .apply("to_days(t.create_date) = to_days(now())")
                .apply("to_days(t.done_date) = to_days(now())")
                .eq(Platform::getIsdeleted, Constants.ZERO)
                .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
                        , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
@@ -2191,15 +2195,22 @@
        //已作业数
        data.setWorkedNum(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
                .eq(PlatformJob::getIsdeleted,Constants.ZERO)
                .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey());})
                .and(w->{w.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()
                .and(w-> w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
                        .or().in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()
                                ,Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
                                ,Constants.PlatformJobStatus.LEAVED.getKey())
                        .apply("to_days(done_date) = to_days(now())");})
                .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey())
                        .apply("to_days(error_date) = to_days(now())");})
                .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey())
                        .apply("to_days(trans_platform_date) = to_days(now())");})
                                ,Constants.PlatformJobStatus.LEAVED.getKey()).apply("to_days(done_date) = to_days(now())")
                        .or().eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey()).apply("to_days(done_date) = to_days(now())")
                        .or().eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey()).apply("to_days(trans_platform_date) = to_days(now())")
                )
//                .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey());})
//                .and(w->{w.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()
//                                ,Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
//                                ,Constants.PlatformJobStatus.LEAVED.getKey())
//                        .apply("to_days(done_date) = to_days(now())");})
//                .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey())
//                        .apply("to_days(error_date) = to_days(now())");})
//                .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey())
//                        .apply("to_days(trans_platform_date) = to_days(now())");})
        ).intValue());

        data.setVideoPluginUrl(getVideoUrl());

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java

@@ -73,6 +73,8 @@
    private RetentionMapper retentionMapper;
    @Autowired
    private WxNoticeConfigMapper wxNoticeConfigMapper;
    @Autowired
    private PlatformLogMapper platformLogMapper;
    /**
     * å…¥åº“通知任务业务处理
     * @param job å‚æ•°
@@ -429,6 +431,22 @@
            job.setCompanyNamePath(driver.getCompanyNamePath());
        }
        platformJobMapper.insert(job);
        if(car !=null){
            //存储操作日志
            PlatformLog platformLog = new PlatformLog();
            platformLog.setIsdeleted(Constants.ZERO);
            platformLog.setCreateDate(new Date());
            platformLog.setJobId(job.getId());
            platformLog.setObjType(Constants.PlatformJobLogType.SIGN.getKey());
            platformLog.setContent("自动签到");
            platformLog.setParam4(job.getCarCodeFront());
            platformLog.setAfterContent(JSONObject.toJSONString(job));
            platformLog.setObjId(job.getId().toString());
            platformLog.setParam3("0");
            platformLogMapper.insert(platformLog);
        }


    }

    private PlatformJob dealJobBizOutbound(WmsOutboundNoticeRequest param) {

 server/visits/dmvisit_service/src/main/resources/application-pro.yml

@@ -52,3 +52,5 @@
    appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ

des_pwd: 123456SDFKDJF



 server/visits/openapi/src/main/resources/application.yml

@@ -29,7 +29,7 @@
  mapper-locations: classpath*:/mappers/**/*.xml
  configuration:
    map-underscore-to-camel-case: true
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    log-impl: com.doumee.config.mybatis.DmStdOutImpl


# ç¼“存内容设置