czt
2023-06-05 a137500cf7a3f558fef9aafc9f608c06fbbc7dff
优化嘉定纪委接口
已修改6个文件
37 ■■■■■ 文件已修改
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-dev.yml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -119,8 +119,8 @@
                apiData.setXxdz(sysData.getUserAddress());
                //运输工具,默认汽车,TODO>> 待调整为根据数据库获取
                apiData.setYsgj("1");
                //运输工具,若为空,则默认给1-汽车
                apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
                //车船号
                apiData.setCch(sysData.getPlateNum());
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -115,8 +115,8 @@
            }
            //运输工具,默认汽车
            apiData.setYsgj("1");
            //运输工具,若为空,则默认给1-汽车
            apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
            //车船号
            apiData.setCch(sysData.getPlateNum());
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
@@ -71,8 +71,6 @@
            Api1208 apiData;
            Api1105 api1105;
          //  List<GbArea> gbAreaList;
            List<Api1208> api1208List;
            for (Fz35Depot fz35Depot : list) {
                //获取货位信息
@@ -143,13 +141,10 @@
                apiData.setBizId(fz35Depot.getId());
                apiData.setKqdm(kqdm);
                apiData.setSyncTime(new Date());
                api1208List = api1208Rep.getDataById(api1105.getHwdm());
                if(null == api1208List || api1208List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    apiData.setCzbz(api1208List.get(0).getCzbz());
                }
                apiData.setId(api1105.getHwdm());
                //库存每次新增
                apiData.setCzbz(Constant.CZBZ_I);
                apiData.setId(ContextUtil.getCurTimeMillis());
                //保存数据
                api1208Rep.save(apiData);
            }
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -17,6 +17,7 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -479,6 +480,7 @@
        shjdjwApi1205.setDksj(api1205.getDjsj());
        shjdjwApi1205.setLksj(api1205.getCmsj());
        shjdjwApi1205.setLhnd(DateFormatUtils.format(api1205.getCmsj(), "yyyy"));
        shjdjwApi1205.setPch("0");
        return shjdjwApi1205;
    }
src/main/resources/application-dev.yml
@@ -5,13 +5,21 @@
  datasource:
    #主数据源
    primary:
      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
      username: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
    #次数据源
    secondary:
      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
      username: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
src/main/resources/application.yml
@@ -1,7 +1,7 @@
##########################  Server   ##########################
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: igds-api
  main: