上一版本: cb33d686 | 补丁 | 提交 | 忽略空白
CZT
2023-12-15 f31db99e67cc3e4a4092b4957af1076b634e6b48 
修复粮情数据转换
已修改5个文件
65 ■■■■■ 文件已修改
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-dev.yml 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-pro.yml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1302.java


@@ -161,7 +161,7 @@


        for (int i = 1; i <= l; i++) {


            for (int j = 1; j <= h; j++) {


                for (int z = 1; z <= c; z++) {


                    result += ("|" + points[(i * j - 1) * c + z - 1] + "," + z + "," + j + "," + i);


                    result += ("|" + points[((i-1)*h+j-1)*c + z -1] + "," + z + "," + j + "," + i);


                }


            }


        }




 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java


@@ -155,12 +155,19 @@




    }




    public static void main(String[] args) {


        String point = "31.8,20.0,15.1,18.6,28.2,14.3,11.3,16.1,28.1,15.6,13.3,18.4,28.8,16.6,10.2,14.4,27.8,14.3,10.8,16.0,27.5,14.5,11.7,17.1,26.5,13.6,10.1,15.0,29.7,17.4,13.8,17.8,29.7,18.6,15.0,18.6,26.4,13.5,9.2,13.1,27.6,11.8,8.9,13.5,28.1,12.0,8.6,12.8,27.8,11.6,7.6,12.4,26.1,10.8,7.5,12.6,27.8,10.3,7.1,12.0,26.1,11.3,8.5,12.7,28.6,16.9,12.9,17.7,29.1,12.3,8.8,12.1,27.4,11.9,8.6,12.8,29.0,11.5,7.6,11.1,26.9,10.2,8.0,12.7,27.0,9.6,7.7,13.5,26.7,9.5,7.1,12.3,26.3,10.7,8.4,13.4,27.6,15.9,11.5,15.8,28.7,12.6,8.7,12.2,28.1,12.2,8.8,12.5,30.3,11.9,8.0,12.0,27.9,11.1,7.8,11.5,26.3,10.1,7.8,12.0,27.2,10.5,6.9,11.1,27.1,11.6,9.5,13.6,27.4,14.8,10.7,16.6,27.7,12.4,9.1,13.0,27.7,13.2,9.0,12.8,27.5,12.1,8.1,12.6,26.6,11.8,7.3,12.3,26.8,10.5,8.0,13.3,26.3,11.0,7.6,12.5,26.1,10.6,8.5,13.5,29.8,21.3,15.5,17.8,28.3,18.2,11.6,12.8,29.4,17.4,13.0,16.1,28.4,22.3,14.6,15.4,28.7,17.5,11.8,15.2,26.5,14.6,10.9,14.8,27.8,15.3,10.3,14.8,27.6,16.7,13.6,17.4";


        String cable = "4-6-8";


        String tempPointList1 = getTempPointList1(point, cable);


        System.out.println(tempPointList1);


    }




    /**


     * 获取平方仓的温度值集合，格式：温度值,层数,行数,列数|温度值,层数,行数,列数|温度值,层数,行数,列数


     *


     * @return


     */


    private String getTempPointList1(String point, String cable) {


    private static String getTempPointList1(String point, String cable) {


        String[] cab = cable.split("-");


        int c = Integer.valueOf(cab[0]);


        int h = Integer.valueOf(cab[1]);


@@ -174,7 +181,7 @@


        for (int i = 1; i <= l; i++) {


            for (int j = 1; j <= h; j++) {


                for (int z = 1; z <= c; z++) {


                    result += ("|" + points[(i * j - 1) * c + z - 1] + "," + z + "," + j + "," + i);


                    result += ("|" + points[((i-1)*h+j-1)*c + z -1] + "," + z + "," + j + "," + i);


                }


            }


        }




 src/main/resources/application-dev.yml


@@ -6,22 +6,22 @@


    #主数据源


    primary:


#      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_5306?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_5306?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_5317_002?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳分库-濠江区租赁库


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-港口新仓


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_2?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-关埠老仓


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_3?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-直属仓库


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-西胪-新仓粮库


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳-西胪-东凤粮库


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_5?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-金灶一所粮库


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_6?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-金灶二所粮库


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_7?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-粮油转运站


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_8?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-河溪粮所


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_9?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-海门粮所


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?useUnicode=true&useSSL=false&characterEncoding=utf-8  #潮阳-和平粮所


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_001?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-港口新仓-------全部完成


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_002?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-关埠老仓-------全部完成


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_005?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳分库-濠江区租赁库


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_101?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-直属仓库-------全部完成


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_201?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-西胪-新仓粮库--缺少粮食购销和管理


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_202?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-西胪-东凤粮库--全部完成


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_301?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-金灶一所粮库


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_401?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-金灶二所粮库---全部完成


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_501?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-粮油转运站


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_601?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-河溪粮所


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_701?useUnicode=true&useSSL=false&characterEncoding=utf-8   #潮阳-海门粮所


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_801?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     #广东台山


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8     #广东韶关


#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5322?useUnicode=true&useSSL=false&characterEncoding=utf-8     #广东徐闻


@@ -34,8 +34,8 @@


    #次数据源


    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_4.0_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8  #上海嘉定


      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8  #宁夏石嘴山


      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8  #上海嘉定


#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5306?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


@@ -66,7 +66,7 @@


          dialect: org.hibernate.dialect.MySQL5InnoDBDialect


  # Redis相关配置


  redis:


    database: 9


    database: 15


    host: 127.0.0.1


    port: 6379


    password: Abc123..




 src/main/resources/application-pro.yml


@@ -1,4 +1,4 @@


##########################  宁夏石嘴山红果子粮库   ##########################


##########################  上海嘉定   ##########################


server:


  port: 8090


  jetty:


@@ -9,16 +9,16 @@


  datasource:


    #主数据源


    primary:


      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8


      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false


      driver-class-name: com.mysql.jdbc.Driver


      username: root


      password: Abc123..


      password: root


    #次数据源


    secondary:


      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8


      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false


      driver-class-name: com.mysql.jdbc.Driver


      username: root


      password: Abc123..


      password: root


  jpa:


    #主jpa配置


    primary:


@@ -51,11 +51,11 @@


      timeout: 6000


igds:


  default:


    companyId: 5306


    companyId: 5303


  file-path: D:/IGDS-API/FILE/


  img-path: D:/IGDS/FILE/


  # 省平台RSA密钥对信息


  #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB


  # 区级平台RSA密钥对信息


  #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMsCJyl6EkjUEfB9Otl0bNmFD0Gr3g/v8DYnoq66EIviDNKT+bo5Aj6BRFngns1aCy1uyWgC5/+PIQ3sxs25nWXxFBYXy7cTiGwCCPfnmmI3rkXRGqRo6uh9K3BsucSE0kyhB8Eq76bQ6BPa5XpMyyq8V2oN2i0LLYpDhV97j3BwIDAQAB


  #私钥：MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIywInKXoSSNQR8H062XRs2YUPQaveD+/wNieirroQi+IM0pP5ujkCPoFEWeCezVoLLW7JaALn/48hDezGzbmdZfEUFhfLtxOIbAII9+eaYjeuRdEapGjq6H0rcGy5xITSTKEHwSrvptDoE9rlekzLKrxXag3aLQstikOFX3uPcHAgMBAAECgYAOZvWPz4/ygvdYqt9zlNntsBsRci9f+hq3CPzCqg55K6WF+yQE1dCqrFZu7gfME+54gGIF4idgeGanbXd16WEtFslEJlFKGk3cF62gaX5Y/nZ4zS65CLTjQ650j6SJ7OC2QYjIejTWhJD0k1tSazXdzV70nP+X3DbGyyO3Rm+juQJBANMCi+9RnzcGvltN/AdWD0DgshRBNrqrHtDkmzRFSkFwIqVSL5J7qRvntjhSstQIBB5KCosCmwRYKxGWQ9Ou420CQQCqrz2byBz3w2pkEfPY3rv7T4zE/2CHC74XtW9sEUTieYaxqIKlnwJacactzx4ZOAg21dGCoqOG9Y9RIpH2mMfDAkEAlAucXIt61qOfmPXtFsSVrSI5LybWHEAFPfC2yAS5ZZIkbLNt9ytV6eM3oOq81zDMmue93+wzEOg/R3aTHgj9PQJALNGxUsu8V473y+ku596s6/PamgwZE70QoHcjF/R86x9QMCx4ifb0Dj3T0WKWm7ar6YJB7pS4bgLjLEHwpBlAMwJAUUG2NhfGXFxfyFOC+5BzFTEr7EdSeHPXJl7dIWmRHncHsv8Nl2yvWsIOfDOYKS3ynptMgeSZaJPnXhvFdX0TnQ==


  #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB


  #私钥：MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=




 src/main/resources/application.yml


@@ -1,7 +1,7 @@


##########################  Server   ##########################


spring:


  profiles:


    active: dev


    active: pro


  application:


    name: igds-api


  main: