增加粮情层行转换配置

CZT

2023-09-04 fae4bd828a6b81b95f53e285fcb4749fbd80c7bf

增加粮情层行转换配置

 igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java

@@ -84,7 +84,7 @@

        //重新排序
        Collator sortChina = Collator.getInstance(Locale.CHINA);
        Collections.sort(list, (a, b) -> sortChina.compare(a.getId(), b.getId()));
        Collections.sort(list, (a, b) -> sortChina.compare(a.getName(), b.getName()));
        return list;
    }


 igds-core/src/main/java/com/ld/igds/constant/Constant.java

@@ -196,6 +196,13 @@
    public static final String GRAIN_START_POINT_TOP = "top";    //顶部
    public static final String GRAIN_START_POINT_BELOW = "below";  //底部

    /**
     * è¡Œå±‚转换(默认不转换)
     */
    public static final String GRAIN_CONVERT_DEFAULT = "default";    //默认
    public static final String GRAIN_CONVERT_CLOCKWISE = "clockwise";    //顺时针
    public static final String GRAIN_CONVERT_ANTICLOCKWISE = "anticlockwise";  //逆时针


    //筒仓锥形-无验证
    public static final String CABLE_CONE_0 = "0";

 igds-core/src/main/java/com/ld/igds/grain/GrainUtil.java

@@ -293,4 +293,57 @@
        return list;
    }

    /**
     * å±‚行转换--顺时针
     *
     * @param temps
     * @param cable
     * @return
     */
    public List<Double> convertRight(List<Double> temps, String cable) {
        String[] attCable = cable.split("-");
        int cableZ = Integer.valueOf(attCable[0]);
        int cableY = Integer.valueOf(attCable[1]);
        int cableX = Integer.valueOf(attCable[2]);
        List<Double> list = new ArrayList<>();

        int index;
        for (int x = 1; x <= cableX; x++) {
            for(int z = cableZ; z >= 1; z--){
                for (int y = 1; y <= cableY; y++) {
                    index = z*y*x -1;
                    list.add(temps.get(index));
                }
            }
        }

        return list;
    }

    /**
     * å±‚行转换--逆时针
     *
     * @param temps
     * @param cable
     * @return
     */
    public List<Double> convertLeft(List<Double> temps, String cable) {
        String[] attCable = cable.split("-");
        int cableZ = Integer.valueOf(attCable[0]);
        int cableY = Integer.valueOf(attCable[1]);
        int cableX = Integer.valueOf(attCable[2]);
        List<Double> list = new ArrayList<>();

        int index;
        for (int x = 1; x <= cableX; x++) {
            for (int z = 1; z <= cableZ; z++) {
                for (int y = cableY; y >= cableY; y--) {
                    index = z*y*x -1;
                    list.add(temps.get(index));
                }
            }
        }

        return list;
    }
}

 igds-core/src/main/java/com/ld/igds/models/DepotConf.java

@@ -84,17 +84,21 @@
    private int cableEnd;

    @Column(name = "START_ORIENTATION_", length = 20)
    @PropertyDef(label = "电缆开始方位", description = "默认右边(右边、右上、左边、左上)")
    @PropertyDef(label = "电缆起始方位", description = "默认右边(右边、右上、左边、左上)")
    private String startOrientation = Constant.GRAIN_START_ORIENTATION_RIGHT;

    @Column(name = "START_DIRECTION_", length = 20)
    @PropertyDef(label = "电缆开始方向", description = "默认纵向(纵向、横向)")
    @PropertyDef(label = "电缆起始方向", description = "默认纵向(纵向、横向)")
    private String startDirection = Constant.GRAIN_START_DIRECTION_PORTRAIT;

    @Column(name = "START_POINT_", length = 20)
    @PropertyDef(label = "电缆开始点位", description = "默认顶部(顶部、底部)")
    @PropertyDef(label = "电缆起始点位", description = "默认顶部(顶部、底部)")
    private String startPoint = Constant.GRAIN_START_POINT_TOP;

    @Column(name = "START_CONVERT_", length = 20)
    @PropertyDef(label = "层行转换", description = "默认不转换(默认、顺时针、逆时针)")
    private String startConvert = Constant.GRAIN_CONVERT_DEFAULT;

    @Column(name = "TEMP_MAX_")
    @PropertyDef(label = "温度上限")
    private Double tempMax;

 igds-core/src/main/java/com/ld/igds/models/MQuality.java

@@ -120,11 +120,11 @@

    @PropertyDef(label = "样品数量", required = true)
    @Column(name = "ypsl", precision = 20, scale = 6)
    private double ypsl;
    private Double ypsl;

    @PropertyDef(label = "代表数量")
    @Column(name = "dbsl", precision = 20, scale = 6)
    private double dbsl;
    private Double dbsl;

    @PropertyDef(label = "样品等级")
    @Column(name = "ypdj", length = 2)

 igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml

@@ -212,21 +212,24 @@
                <Property name="property">startOrientation</Property>
                <Property name="name">startOrientation</Property>
                <Property name="editable">false</Property>
                <Property name="trigger">autoMappingDropDown1</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="property">startDirection</Property>
                <Property name="name">startDirection</Property>
                <Property name="editable">false</Property>
                <Property name="trigger">autoMappingDropDown1</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="property">startPoint</Property>
                <Property name="name">startPoint</Property>
                <Property name="editable">false</Property>
                <Property name="trigger">autoMappingDropDown1</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                  <Property name="property">startConvert</Property>
                  <Property name="name">startConvert</Property>
                  <Property name="editable">false</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>

 igds-core/src/main/java/com/ld/igds/view/DepotPR.java

@@ -187,6 +187,22 @@
    }

    /**
     * å±‚行转换
     * ${dorado.getDataProvider("depotPR#triggerStartConvert").getResult()}
     *
     * @return
     */
    @DataProvider
    public List<DicTrigger> triggerStartConvert() {
        List<DicTrigger> list = new ArrayList<DicTrigger>();
        list.add(new DicTrigger(Constant.GRAIN_CONVERT_DEFAULT, "默认"));
        list.add(new DicTrigger(Constant.GRAIN_CONVERT_CLOCKWISE, "顺时针"));
        list.add(new DicTrigger(Constant.GRAIN_CONVERT_ANTICLOCKWISE, "逆时针"));

        return list;
    }

    /**
     * ç­’仓锥形
     * ${dorado.getDataProvider("depotPR#triggerCableCone").getResult()}
     *

 igds-core/src/main/java/models/igds.model.xml

@@ -922,6 +922,14 @@
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStartPoint&quot;).getResult()}</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="startConvert">
      <Property name="label">层行转换</Property>
      <Property name="mapping">
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStartConvert&quot;).getResult()}</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="depotName">
      <Property></Property>
    </PropertyDef>

 igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/ServerRunner.java

@@ -37,9 +37,9 @@
        //风正致远默认部署服务当前应用使用9000端口
        if (configData.getActive().indexOf("pro") >= 0) {
            //FZZY平台
            ZldzServerEngine.start(9201);
//            ZldzServerEngine.start(9201);
            //其他平台
//            ZldzServerEngine.start(ZldzServerEngine.PORT);
            ZldzServerEngine.start(9000);
            return;
        }


 igds-protocol-zldz/src/main/java/com/ld/igds/protocol/zldz/analysis/AnalysisGrain.java

@@ -508,6 +508,17 @@
            temps = grainUtil.reversalUpAndDown(temps, depotConf.getCableRule());
        }

        //若配置层行转换，则将粮情数据进行层行转换
        if (StringUtils.isNotEmpty(depotConf.getStartConvert())) {
            temps = convertGrainPoint(temps, depotConf);
            String[] cableRule = depotConf.getCableRule().split("-");
            //转换层行列配置
            if(Constant.GRAIN_CONVERT_CLOCKWISE.equals(depotConf.getStartConvert())
                    || Constant.GRAIN_CONVERT_ANTICLOCKWISE.equals(depotConf.getStartConvert())){
                depotConf.setCableRule(Integer.valueOf(cableRule[1]) + "-" + Integer.valueOf(cableRule[0]) + "-" + Integer.valueOf(cableRule[2]));
            }
        }

        String[] attCable = depotConf.getCableRule().split("-");
        int cableZ = Integer.valueOf(attCable[0]);
        int cableY = Integer.valueOf(attCable[1]);
@@ -671,6 +682,24 @@
                sysConf, notifyWeb, exeRequest);
    }

    private List<Double> convertGrainPoint(List<Double> temps, DepotConf conf) {
        if (Constant.GRAIN_CONVERT_DEFAULT.equals(conf.getStartConvert())) {
            //若层行转换为默认，则直接返回
            return temps;
        }

        //顺时针转换
        if(Constant.GRAIN_CONVERT_CLOCKWISE.equals(conf.getStartConvert())){
            return grainUtil.convertRight(temps, conf.getCableRule());
        }
        //逆时针转换
        if(Constant.GRAIN_CONVERT_ANTICLOCKWISE.equals(conf.getStartConvert())){
            return grainUtil.convertLeft(temps, conf.getCableRule());
        }

        return temps;
    }

    private List<Double> reversalGrainPoint(List<Double> temps, DepotConf conf) {
        if (StringUtils.isEmpty(conf.getStartOrientation())) {
            //若起始方位为空，则默认起始方位和方向，直接返回
@@ -730,90 +759,5 @@
        }

        return temps;
    }

    /**
     * åè½¬åˆ— çŽ°å®žä¸­ä»Žå·¦è¾¹å¼€å§‹ï¼Œå¼ºè¡Œå°†å³è¾¹è§£æžä¸ºç¬¬ä¸€åˆ—
     *
     * @return
     */
    private List<Double> reversalCable(List<Double> temps, String cable) {
        String[] attCable = cable.split("-");
        int cableZ = Integer.valueOf(attCable[0]);
        int cableY = Integer.valueOf(attCable[1]);
        int cableX = Integer.valueOf(attCable[2]);
        List<Double> t = new ArrayList<>();
        for (int i = 1; i <= temps.size(); i++) {
            t.add(temps.get((cableX - 1) * cableY * cableZ + ((i - 1) % (cableY * cableZ))));
            if (i % (cableY * cableZ) == 0) {
                cableX = cableX - 1;
            }
        }
        return t;
    }

    /**
     * ç”µç¼†ä»Žä¸‹é¢å¼€å§‹æ—¶ï¼Œå°†ç²®æƒ…电缆上下翻转
     *
     * @param pointsData ç²®æƒ…数据
     * @param cable      å±‚行列配置，如：4-7-11
     * @return
     */
    private String reversalUpAndDown(String pointsData, String cable) {
        String str = "";
        if (StringUtils.isEmpty(cable)) {
            str = pointsData;
        }
        String[] attCable = cable.split("-");
        int cableZ = Integer.valueOf(attCable[0]); //层

        String[] points = pointsData.split(",");
        for (int i = 0; i <= points.length - cableZ; i += cableZ) {
            for (int j = cableZ - 1; j >= 0; j--) {
                str += points[i + j];
                str += ",";
            }
        }
        return str;
    }

    /**
     * åè½¬åˆ—号验证
     * 2022å¹´5月30日 12:11:18
     * vince
     *
     * @param args
     */
    public static void main(String[] args) {
        List<Double> temps = new ArrayList<>();
        int cableZ = 3;
        int cableY = 4;
        int cableX = 6;
        for (int i = 1; i < (cableX * cableY * cableZ + 1); i++) {
            temps.add(i + 0.0);
        }

        List<Double> t = new ArrayList<>();
        for (int i = 1; i <= temps.size(); i++) {
            t.add(temps.get((cableX - 1) * cableY * cableZ + ((i - 1) % (cableY * cableZ))));
            if (i % (cableY * cableZ) == 0) {
                cableX = cableX - 1;
            }
        }
        for (Double x : t) {
            System.out.print(x);
            System.out.print(",");
        }


        System.out.println("--------------------------");
        int i = 15;
        int layMax = 10;

        System.out.println(i % layMax);


        System.out.println(i / layMax);

    }
}

 igds-web/pom.xml

@@ -202,10 +202,9 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        -->
        </dependency>-->

        <!--  ç§æœ‰åè®®-贝博粮情-->
        <!--  ç§æœ‰åè®®-贝博粮情
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-beibo</artifactId>
@@ -220,9 +219,9 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->

        <!--  ç§æœ‰åè®®-邦海智能-->
        <!--  ç§æœ‰åè®®-邦海智能
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-bhzn</artifactId>
@@ -237,7 +236,9 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->

        <!--  ç§æœ‰åè®®-正来电子 -->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-zldz</artifactId>
@@ -253,6 +254,7 @@
                </exclusion>
            </exclusions>
        </dependency>

        <!--  æµ·åº·è½¦ç‰Œè¯†åˆ«-SDK -->
        <dependency>
            <groupId>com.ld.igds</groupId>
@@ -320,54 +322,54 @@
            </plugin>

            <!-- YUI Compressor Maven压缩插件 å¼€å‘包不实用-->
<!--            <plugin>-->
<!--                <groupId>net.alchim31.maven</groupId>-->
<!--                <artifactId>yuicompressor-maven-plugin</artifactId>-->
<!--                <version>1.5.1</version>-->
<!--                <executions>-->
<!--                    <execution>-->
<!--                        <goals>-->
<!--                            <goal>compress</goal>-->
<!--                        </goals>-->
<!--                    </execution>-->
<!--                </executions>-->
<!--                <configuration>-->
<!--                    <encoding>UTF-8</encoding>-->
<!--                    &lt;!&ndash;不显示js可能的错误 &ndash;&gt;-->
<!--                    <jswarn>false</jswarn>-->
<!--                    &lt;!&ndash;是否混淆 &ndash;&gt;-->
<!--                    <nomunge>true</nomunge>-->
<!--                    &lt;!&ndash;若存在已压缩的文件，会先对比源文件是否有改动 æœ‰æ”¹åŠ¨ä¾¿åŽ‹ç¼©ï¼Œæ— æ”¹åŠ¨å°±ä¸åŽ‹ç¼© &ndash;&gt;-->
<!--                    <force>false</force>-->
<!--                    &lt;!&ndash;在指定的列号后插入新行 &ndash;&gt;-->
<!--                    <linebreakpos>-1</linebreakpos>-->
<!--                    &lt;!&ndash;压缩之前先执行聚合文件操作 &ndash;&gt;-->
<!--                    <preProcessAggregates>true</preProcessAggregates>-->
<!--                    &lt;!&ndash;压缩后保存文件后缀 æ— åŽç¼€ &ndash;&gt;-->
<!--                    <nosuffix>true</nosuffix>-->
<!--                    &lt;!&ndash;源目录，即需压缩的根目录 &ndash;&gt;-->
<!--                    <sourceDirectory>src/main/resources</sourceDirectory>-->
<!--                    &lt;!&ndash;输出目录，即压缩后的目录 &ndash;&gt;-->
<!--                    <outputDirectory>target/classes</outputDirectory>-->
<!--                    <force>true</force>-->
<!--                    &lt;!&ndash;压缩js和css文件 &ndash;&gt;-->
<!--                    <includes>-->
<!--                        <include>**/*.js</include>-->
<!--                        <include>**/*.css</include>-->
<!--                    </includes>-->
<!--                    &lt;!&ndash; ä»¥ä¸‹ç›®å½•å’Œæ–‡ä»¶ä¸ä¼šè¢«åŽ‹ç¼© &ndash;&gt;-->
<!--                    <excludes>-->
<!--                        <exclude>**/*.min.js</exclude>-->
<!--                        <exclude>**/*.min.css</exclude>-->
<!--                        <exclude>**/d7/**</exclude>-->
<!--                        <exclude>**/dorado-home/**</exclude>-->
<!--                        <exclude>**/bdf2/**</exclude>-->
<!--                        <exclude>**/css/**</exclude>-->
<!--                        <exclude>**/js/**</exclude>-->
<!--                        <exclude>**/plugins/**</exclude>-->
<!--                    </excludes>-->
<!--                </configuration>-->
<!--            </plugin>-->
            <plugin>
                <groupId>net.alchim31.maven</groupId>
                <artifactId>yuicompressor-maven-plugin</artifactId>
                <version>1.5.1</version>
                <executions>
                    <execution>
                        <goals>
                            <goal>compress</goal>
                        </goals>
                    </execution>
                </executions>
                <configuration>
                    <encoding>UTF-8</encoding>
                    <!--不显示js可能的错误 -->
                    <jswarn>false</jswarn>
                    <!--是否混淆 -->
                    <nomunge>true</nomunge>
                    <!--若存在已压缩的文件，会先对比源文件是否有改动 æœ‰æ”¹åŠ¨ä¾¿åŽ‹ç¼©ï¼Œæ— æ”¹åŠ¨å°±ä¸åŽ‹ç¼© -->
                    <force>false</force>
                    <!--在指定的列号后插入新行 -->
                    <linebreakpos>-1</linebreakpos>
                    <!--压缩之前先执行聚合文件操作 -->
                    <preProcessAggregates>true</preProcessAggregates>
                    <!--压缩后保存文件后缀 æ— åŽç¼€ -->
                    <nosuffix>true</nosuffix>
                    <!--源目录，即需压缩的根目录 -->
                    <sourceDirectory>src/main/resources</sourceDirectory>
                    <!--输出目录，即压缩后的目录 -->
                    <outputDirectory>target/classes</outputDirectory>
                    <force>true</force>
                    <!--压缩js和css文件 -->
                    <includes>
                        <include>**/*.js</include>
                        <include>**/*.css</include>
                    </includes>
                    <!-- ä»¥ä¸‹ç›®å½•å’Œæ–‡ä»¶ä¸ä¼šè¢«åŽ‹ç¼© -->
                    <excludes>
                        <exclude>**/*.min.js</exclude>
                        <exclude>**/*.min.css</exclude>
                        <exclude>**/d7/**</exclude>
                        <exclude>**/dorado-home/**</exclude>
                        <exclude>**/bdf2/**</exclude>
                        <exclude>**/css/**</exclude>
                        <exclude>**/js/**</exclude>
                        <exclude>**/plugins/**</exclude>
                    </excludes>
                </configuration>
            </plugin>

        </plugins>


 igds-web/src/main/resources/application-pro5303.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,81 @@
##########################  ä¸Šæµ·å˜‰å®š   ##########################
server:
  port: 8088
  context-path: /
  connection-timeout: 5000
  tomcat:
    uri-encoding: UTF-8

##########################  datasourcec   ##########################
spring:
  datasource:
    db-base:
      name: db-base
      type: com.alibaba.druid.pool.DruidDataSource
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
#      url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      driver-class-name: com.mysql.jdbc.Driver
      username: igds
      password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
      public-key:
      config-decrypt: true
      initial-size:  5
      min-idle:  5
      max-active:  50
      max-wait: 60000
      time-between-eviction-runs-millis: 60000
      min-evictable-idle-time-millis: 300000
      validation-query: select 1 from dual
      test-whileIdle: true
      test-on-borrow: false
      test-on-return: false
      pool-prepared-statements: true
      max-pool-prepared-statement-per-connection-size: 20
      filters: stat
      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
      use-global-data-source-stat: true
      removeAbandoned: true
      removeAbandonedTimeout: 90
      logAbandoned: true
      poolPreparedStatements: true
      maxPoolPreparedStatementPerConnectionSize: 20
    db-sqlite:
      name: db-sqlite
      url: jdbc:sqlite:D:/app/igds/db/iot_cfg.db
      driver-class-name: org.sqlite.JDBC
      type: com.alibaba.druid.pool.DruidDataSource
      username:
      password:

  # Redis相关配置
  redis:
    database: 0
    host: 127.0.0.1
    port: 6379
    password: Abc123..
    # è¿žæŽ¥æ± æœ€å¤§è¿žæŽ¥æ•°ï¼ˆä½¿ç”¨è´Ÿå€¼è¡¨ç¤ºæ²¡æœ‰é™åˆ¶ï¼‰
    pool:
      max-active: 200
      max-wait: -1
      max-idle: 10
      min-idle: 0
      timeout: 6000

license:
  subject: ld_license
  publicAlias: publicCert
  storePass: PUBLICFZZYXXJSGFYXGS888888
  licensePath: D:/IGDS/license/license.lic
  publicKeysStorePath: D:/IGDS/license/publicCerts.keystore

##########################  IGDS   ##########################
## ç³»ç»ŸæŽ¥å£è·¯ç”±é…ç½® æ³¨æ„æ•°å­—如果以0开头的话，后台会出现转义，请添加""
igds:
  default:
    companyId: 5303
    sys-name: æ™ºæ…§ç²®åº“管理系统
    logo: logo-default.png
    logo-title: logo-title-default.png
    support: æ™ºæ…§ç²®æƒ…粮情云管理平台
    grian-add-point: N
  file-path: D:/IGDS/FILE/

 igds-web/src/main/resources/application.yml

@@ -1,7 +1,7 @@
##########################  Server   ########################## ä¸¹æ£±åŸŽå…³çœç²®é£Ÿå‚¨å¤‡åº“
spring:
  profiles:
    active: dev
    active: pro
  application:
    name: igds
  main:

 igds-web/src/main/resources/static/img/aerial-5317_001.png

 igds-web/src/main/resources/static/img/aerial-5317_001_1.png