update

io.sc.engine.st.frontend/src/views/FactorManager.vue

@@ -1,194 +0,0 @@
-<template>
-  <q-splitter :model-value="60" class="w-full" style="height: 100%">
-    <template #before>
-      <div class="pr-1" style="height: 100%">
-        <w-grid
-          ref="factorTypeGridRef"
-          :title="$t('engine.st.factorType.grid.title')"
-          :checkbox-selection="true"
-          :data-url="Environment.apiContextPath('/api/st/factorType')"
-          :pageable="false"
-          :sort-by="['code']"
-          :query-form-cols-num="4"
-          :query-form-fields="[
-            {
-              name: 'periodType',
-              label: $t('period'),
-              type: 'select',
-              options: Options.enum(Enums.PeriodType),
-              queryOperator: 'equals',
-            },
-            { name: 'code', label: $t('code'), type: 'text' },
-            { name: 'name', label: $t('name'), type: 'text' },
-          ]"
-          :toolbar-actions="['query', 'separator', 'refresh', 'separator', 'add', 'clone', 'edit', 'remove', 'separator', 'view', 'separator', 'export']"
-          :columns="[
-            { width: 150, name: 'name', label: $t('name') },
-            { width: 100, name: 'code', label: $t('code') },
-            { width: 60, name: 'periodType', label: $t('engine.st.economicIndicator.grid.entity.periodType'), format: Formater.enum(Enums.PeriodType) },
-            { width: 100, name: 'description', label: $t('description') },
-            { width: 80, name: 'valueType', label: $t('valueType'), format: Formater.enum(Enums.ValueType) },
-          ]"
-          :editor="{
-            dialog: {
-              width: '600px',
-            },
-            form: {
-              colsNum: 1,
-              fields: [
-                {
-                  name: 'periodType',
-                  label: $t('period'),
-                  required: true,
-                  type: 'select',
-                  options: Options.enum(Enums.PeriodType),
-                },
-                { name: 'code', label: $t('code'), type: 'text', required: true },
-                { name: 'name', label: $t('name'), type: 'text', required: true },
-                { name: 'valueType', label: $t('valueType'), required: true, type: 'select', options: Options.enum(Enums.ValueType) },
-                { name: 'description', label: $t('description'), type: 'text' },
-              ],
-            },
-          }"
-          :viewer="{
-            panel: {
-              columnNum: 1,
-              fields: [
-                { name: 'id', label: $t('id') },
-                { name: 'periodType', label: $t('period') },
-                { name: 'code', label: $t('code') },
-                { name: 'name', label: $t('name') },
-                { name: 'description', label: $t('description') },
-                { name: 'valueType', label: $t('valueType') },
-                { name: 'dataComeFrom', label: $t('dataComeFrom') },
-                { name: 'creator', label: $t('creator') },
-                { name: 'createDate', label: $t('createDate') },
-                { name: 'lastModifier', label: $t('lastModifier') },
-                { name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.none() },
-                { name: 'corporationCode', label: $t('corporationCode') },
-              ],
-            },
-          }"
-          @row-click="
-            (evt, row, index) => {
-              currentSelectedFactorType = row;
-              factorGridRef?.refresh();
-            }
-          "
-          @before-request-data="
-            () => {
-              currentSelectedFactorType = { id: '' };
-              factorGridRef?.refresh();
-            }
-          "
-        ></w-grid>
-      </div>
-    </template>
-    <template #after>
-      <q-splitter :model-value="70" horizontal class="w-full" style="height: 100%">
-        <template #before>
-          <div class="pl-1" style="height: 100%">
-            <w-grid
-              ref="factorGridRef"
-              title="engine.st.factor.grid.title"
-              :checkbox-selection="true"
-              :fetch-data-url="Environment.apiContextPath('/api/st/factor?factorType=' + currentSelectedFactorType.id)"
-              :data-url="Environment.apiContextPath('/api/st/factor')"
-              :pageable="false"
-              :sort-by="['year', 'quarter', 'month', 'day']"
-              :query-form-cols-num="4"
-              :query-form-fields="[]"
-              :toolbar-actions="['refresh', 'separator', 'add', 'clone', 'edit', 'remove', 'separator', 'view', 'separator', 'export']"
-              :columns="getFactorColumns"
-              :editor="{
-                dialog: {
-                  width: '600px',
-                },
-                form: {
-                  colsNum: 1,
-                  fields: [
-                    {
-                      name: 'periodType',
-                      label: $t('period'),
-                      required: true,
-                      type: 'select',
-                      options: Options.enum(Enums.PeriodType),
-                    },
-                    { name: 'code', label: $t('code'), type: 'text', required: true },
-                    { name: 'name', label: $t('name'), type: 'text', required: true },
-                    { name: 'valueType', label: $t('valueType'), required: true, type: 'select', options: Options.enum(Enums.ValueType) },
-                    { name: 'description', label: $t('description'), type: 'text' },
-                  ],
-                },
-              }"
-              :viewer="{
-                panel: {
-                  columnNum: 1,
-                  fields: [
-                    { name: 'id', label: $t('id') },
-                    { name: 'periodType', label: $t('period') },
-                    { name: 'code', label: $t('code') },
-                    { name: 'name', label: $t('name') },
-                    { name: 'description', label: $t('description') },
-                    { name: 'valueType', label: $t('valueType') },
-                    { name: 'dataComeFrom', label: $t('dataComeFrom') },
-                    { name: 'creator', label: $t('creator') },
-                    { name: 'createDate', label: $t('createDate') },
-                    { name: 'lastModifier', label: $t('lastModifier') },
-                    { name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.none() },
-                    { name: 'corporationCode', label: $t('corporationCode') },
-                  ],
-                },
-              }"
-            ></w-grid>
-          </div>
-        </template>
-        <template #after>
-          <div class="pl-1" style="height: 100%"></div>
-        </template>
-      </q-splitter>
-    </template>
-  </q-splitter>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { Environment, EnumTools, Formater, Options } from 'platform-core';
-import { computed } from 'vue';
-
-const { t } = useI18n();
-const factorTypeGridRef = ref();
-const factorGridRef = ref();
-const currentSelectedFactorType = ref({});
-const Enums = await EnumTools.fetch(['io.sc.engine.st.enums.PeriodType', 'io.sc.engine.st.enums.ValueType']);
-
-const getFactorColumns = computed(() => {
-  let result = [{ width: '100%', name: 'value', label: t('value') }];
-  if (currentSelectedFactorType.value.periodType === 'YEAR') {
-    result = [
-      { width: 60, name: 'year', label: t('year') },
-      { width: '100%', name: 'value', label: t('value') },
-    ];
-  } else if (currentSelectedFactorType.value.periodType === 'QUARTER') {
-    result = [
-      { width: 60, name: 'year', label: t('year') },
-      { width: 60, name: 'quarter', label: t('quarter') },
-      { width: '100%', name: 'value', label: t('value') },
-    ];
-  } else if (currentSelectedFactorType.value.periodType === 'MONTH') {
-    result = [
-      { width: 60, name: 'year', label: t('year') },
-      { width: 60, name: 'month', label: t('month') },
-      { width: '100%', name: 'value', label: t('value') },
-    ];
-  } else if (currentSelectedFactorType.value.periodType === 'DAY') {
-    result = [
-      { width: 60, name: 'year', label: t('year') },
-      { width: 60, name: 'month', label: t('month') },
-      { width: 60, name: 'day', label: t('day') },
-      { width: '100%', name: 'value', label: t('value') },
-    ];
-  }
-  return result;
-});
-</script>

io.sc.engine.st.frontend/src/views/factor/Factor.vue

@@ -1,119 +0,0 @@
-<template>
-  <div style="height: 100%">
-    <w-grid
-      ref="gridRef"
-      :title="$t('engine.st.factorType.grid.title')"
-      :checkbox-selection="true"
-      :data-url="Environment.apiContextPath('/api/st/factorType')"
-      :pageable="false"
-      :sort-by="['year', 'month', 'quarter']"
-      :query-form-cols-num="4"
-      :query-form-fields="[
-        {
-          name: 'periodType',
-          label: $t('period'),
-          type: 'select',
-          options: Options.enum(StatisticalPeriodTypeEnums),
-          queryOperator: 'equals',
-        },
-      ]"
-      :toolbar-actions="['query', 'separator', 'refresh', 'separator', 'add', 'clone', 'edit', 'remove', 'separator', 'view', 'separator', 'export']"
-      :columns="[
-        { name: 'periodType', label: $t('engine.st.economicIndicator.grid.entity.periodType'), format: Formater.enum(StatisticalPeriodTypeEnums) },
-
-        { name: 'code', label: $t('code') },
-        { name: 'name', label: $t('name') },
-        { name: 'description', label: $t('description') },
-        { name: 'valueType', label: $t('valueType') },
-        { name: 'lastModifier', label: $t('lastModifier') },
-        { name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
-      ]"
-      :editor="{
-        dialog: {
-          width: '600px',
-        },
-        form: {
-          colsNum: 1,
-          fields: [
-            {
-              name: 'periodType',
-              label: $t('engine.st.economicIndicator.grid.entity.periodType'),
-              type: 'select',
-              options: Options.enum(StatisticalPeriodTypeEnums),
-            },
-            {
-              name: 'year',
-              label: $t('year'),
-              type: 'select',
-              options: yearOptionsRef,
-              showIf: (arg) => {
-                return arg.form.getFieldValue('periodType') === 'YEAR';
-              },
-            },
-            {
-              name: 'month',
-              label: $t('month'),
-              type: 'select',
-              options: monthOptionsRef,
-              showIf: (arg) => {
-                return arg.form.getFieldValue('periodType') === 'MONTH';
-              },
-            },
-            {
-              name: 'quarter',
-              label: $t('quarter'),
-              type: 'select',
-              options: quarterOptionsRef,
-              showIf: (arg) => {
-                return arg.form.getFieldValue('periodType') === 'QUARTER';
-              },
-            },
-            { name: 'gdp', label: $t('engine.st.economicIndicator.grid.entity.GDP'), type: 'number' },
-            { name: 'm2', label: $t('engine.st.economicIndicator.grid.entity.M2'), type: 'number' },
-            { name: 'cpi', label: $t('engine.st.economicIndicator.grid.entity.CPI'), type: 'number', precision: 6 },
-            { name: 'hpi', label: $t('engine.st.economicIndicator.grid.entity.HPI'), type: 'number', precision: 6 },
-            { name: 'pmi', label: $t('engine.st.economicIndicator.grid.entity.PMI'), type: 'number', precision: 6 },
-            { name: 'blr', label: $t('engine.st.economicIndicator.grid.entity.BLR'), type: 'number', precision: 6 },
-          ],
-        },
-      }"
-      :viewer="{
-        panel: {
-          columnNum: 1,
-          fields: [
-            { name: 'id', label: $t('id') },
-            { name: 'periodType', label: $t('engine.st.economicIndicator.grid.entity.periodType') },
-            { name: 'year', label: $t('year') },
-            { name: 'month', label: $t('month') },
-            { name: 'gdp', label: $t('engine.st.economicIndicator.grid.entity.GDP') },
-            { name: 'm2', label: $t('engine.st.economicIndicator.grid.entity.M2') },
-            { name: 'cpi', label: $t('engine.st.economicIndicator.grid.entity.CPI') },
-            { name: 'hpi', label: $t('engine.st.economicIndicator.grid.entity.HPI') },
-            { name: 'pmi', label: $t('engine.st.economicIndicator.grid.entity.PMI') },
-            { name: 'blr', label: $t('engine.st.economicIndicator.grid.entity.BLR') },
-            { name: 'dataComeFrom', label: $t('dataComeFrom') },
-            { name: 'creator', label: $t('creator') },
-            { name: 'createDate', label: $t('createDate') },
-            { name: 'lastModifier', label: $t('lastModifier') },
-            { name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.none() },
-            { name: 'corporationCode', label: $t('corporationCode') },
-          ],
-        },
-      }"
-    ></w-grid>
-  </div>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue';
-import { Environment, EnumTools, Formater, Options, Tools } from 'platform-core';
-
-const gridRef = ref();
-const years = [];
-for (let i = 0; i < 30; i++) {
-  years.push(new Date().getFullYear() - i);
-}
-const yearOptionsRef = ref(years);
-const monthOptionsRef = ref([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
-const quarterOptionsRef = ref([1, 2, 3, 4]);
-const StatisticalPeriodTypeEnums = await EnumTools.fetch('io.sc.engine.st.enums.StatisticalPeriodType');
-</script>

io.sc.engine.st/src/main/java/io/sc/engine/st/controller/DepFactorDefineWebController.java

@@ -0,0 +1,23 @@
+package io.sc.engine.st.controller;
+
+import io.sc.engine.st.jpa.entity.DepFactorDefineEntity;
+import io.sc.engine.st.jpa.repository.DepFactorDefineRepository;
+import io.sc.engine.st.service.DepFactorDefineService;
+import io.sc.engine.st.vo.DepFactorDefineVo;
+import io.sc.platform.mvc.controller.support.RestCrudController;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController("io.sc.engine.st.controller.DepFactorDefineWebController")
+@RequestMapping("/api/st/depFactorDefine")
+public class DepFactorDefineWebController extends RestCrudController<DepFactorDefineVo, DepFactorDefineEntity,String, DepFactorDefineRepository, DepFactorDefineService> {
+
+    @GetMapping("findAllWithoutById")
+    public List<DepFactorDefineVo> findAllWithoutById(@RequestParam(name="defineId",required = false)String defineId) throws Exception {
+        return service.findAllWithoutById(defineId);
+    }
+}

io.sc.engine.st/src/main/java/io/sc/engine/st/controller/EconomicIndicatorWebController.java

@@ -1,15 +0,0 @@
-package io.sc.engine.st.controller;
-
-import io.sc.engine.st.jpa.entity.EconomicIndicatorEntity;
-import io.sc.engine.st.jpa.repository.EconomicIndicatorRepository;
-import io.sc.engine.st.service.EconomicIndicatorService;
-import io.sc.engine.st.vo.EconomicIndicatorVo;
-import io.sc.platform.mvc.controller.support.RestCrudController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController("io.sc.engine.st.controller.EconomicIndicatorWebController")
-@RequestMapping("/api/st/economicIndicator")
-public class EconomicIndicatorWebController extends RestCrudController<EconomicIndicatorVo, EconomicIndicatorEntity,String, EconomicIndicatorRepository, EconomicIndicatorService> {
-
-}

io.sc.engine.st/src/main/java/io/sc/engine/st/enums/FactorDefineCategory.java

@@ -0,0 +1,9 @@
+package io.sc.engine.st.enums;
+
+/**
+ * 变量定义分类
+ */
+public enum FactorDefineCategory {
+    GROUP,         //组
+    FACTOR_DEFINE;  //变量定义
+}

io.sc.engine.st/src/main/java/io/sc/engine/st/enums/FactorDefineType.java

@@ -0,0 +1,12 @@
+package io.sc.engine.st.enums;
+
+/**
+ * 变量定义类型
+ */
+public enum FactorDefineType {
+    FOLDER,                 //文件夹
+    ORIGINAL,               //原始变量
+    EXTEND_ARITHMETIC,      //扩展变量(算数)
+    EXTEND_DELAY,           //扩展变量(滞后)
+    EXTEND_DIFFERENTIAL;    //扩展变量(差分)
+}

io.sc.engine.st/src/main/java/io/sc/engine/st/exception/FactorDefinePeroidNotSameException.java

@@ -0,0 +1,4 @@
+package io.sc.engine.st.exception;
+
+public class FactorDefinePeroidNotSameException extends RuntimeException {
+}

io.sc.engine.st/src/main/java/io/sc/engine/st/jpa/entity/FactorTypeEntity.java

@@ -1,110 +0,0 @@
-package io.sc.engine.st.jpa.entity;
-
-import io.sc.engine.st.enums.PeriodType;
-import io.sc.engine.st.enums.ValueType;
-import io.sc.engine.st.vo.FactorTypeVo;
-import io.sc.platform.orm.entity.CorporationAuditorEntity;
-import org.hibernate.annotations.GenericGenerator;
-
-import javax.persistence.*;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-@Entity(name="io.sc.engine.st.jpa.entity.FactorTypeEntity")
-@Table(name="ST_FACTOR_TYPE")
-public class FactorTypeEntity extends CorporationAuditorEntity<FactorTypeVo> {
-    @Id
-    @GeneratedValue(generator = "system-uuid")
-    @GenericGenerator(name = "system-uuid", strategy = "uuid2")
-    @Column(name="ID_", length=36)
-    @Size(max=36)
-    protected String id;
-
-    @Column(name="CODE_", length=255)
-    @NotBlank
-    @Size(max=255)
-    protected String code;
-
-    @Column(name="NAME_", length=255)
-    @NotBlank
-    @Size(max=255)
-    protected String name;
-
-    @Column(name="DESCRIPTION_", length=255)
-    @Size(max=255)
-    protected String description;
-
-    @Column(name="PERIOD_TYPE_", length=20)
-    @Enumerated(EnumType.STRING)
-    protected PeriodType periodType;
-
-    @Column(name="VALUE_TYPE_", length=20)
-    @Enumerated(EnumType.STRING)
-    protected ValueType valueType;
-
-    @Override
-    public FactorTypeVo toVo() {
-        FactorTypeVo vo =new FactorTypeVo();
-        super.toVo(vo);
-        vo.setId(this.getId());
-        vo.setCode(this.getCode());
-        vo.setName(this.getName());
-        vo.setDescription(this.getDescription());
-        vo.setPeriodType(this.getPeriodType());
-        vo.setValueType(this.getValueType());
-        return vo;
-    }
-
-    public FactorTypeEntity(){}
-    public FactorTypeEntity(String id){
-        this.id =id;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public PeriodType getPeriodType() {
-        return periodType;
-    }
-
-    public void setPeriodType(PeriodType periodType) {
-        this.periodType = periodType;
-    }
-
-    public ValueType getValueType() {
-        return valueType;
-    }
-
-    public void setValueType(ValueType valueType) {
-        this.valueType = valueType;
-    }
-}

io.sc.engine.st/src/main/java/io/sc/engine/st/jpa/entity/sub/DepOriginalFactorDefineEntity.java

@@ -0,0 +1,24 @@
+package io.sc.engine.st.jpa.entity.sub;
+
+import io.sc.engine.st.jpa.entity.DepFactorDefineEntity;
+import io.sc.engine.st.vo.DepFactorDefineVo;
+import io.sc.engine.st.vo.sub.DepOriginalFactorDefineVo;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+
+@Entity
+@DiscriminatorValue("ORIGINAL")
+public class DepOriginalFactorDefineEntity extends DepFactorDefineEntity {
+    @Override
+    public DepFactorDefineVo toVo() {
+        DepOriginalFactorDefineVo vo =new DepOriginalFactorDefineVo();
+        super.toVo(vo);
+        return vo;
+    }
+
+    public DepOriginalFactorDefineEntity(){}
+    public DepOriginalFactorDefineEntity(String id){
+        this.id =id;
+    }
+}

io.sc.engine.st/src/main/java/io/sc/engine/st/jpa/repository/EconomicIndicatorRepository.java

@@ -1,10 +0,0 @@
-package io.sc.engine.st.jpa.repository;
-
-import io.sc.engine.st.jpa.entity.EconomicIndicatorEntity;
-import io.sc.platform.orm.repository.DaoRepository;
-import org.springframework.stereotype.Service;
-
-@Service("io.sc.engine.st.jpa.repository.EconomicIndicatorRepository")
-public interface EconomicIndicatorRepository extends DaoRepository<EconomicIndicatorEntity,String>{
-
-}

io.sc.engine.st/src/main/java/io/sc/engine/st/jpa/repository/FactorRepository.java

@@ -1,10 +0,0 @@
-package io.sc.engine.st.jpa.repository;
-
-import io.sc.engine.st.jpa.entity.FactorEntity;
-import io.sc.platform.orm.repository.DaoRepository;
-import org.springframework.stereotype.Service;
-
-@Service("io.sc.engine.st.jpa.repository.FactorRepository")
-public interface FactorRepository extends DaoRepository<FactorEntity,String>{
-
-}

io.sc.engine.st/src/main/java/io/sc/engine/st/service/FactorService.java

@@ -1,8 +0,0 @@
-package io.sc.engine.st.service;
-
-import io.sc.engine.st.jpa.entity.FactorEntity;
-import io.sc.engine.st.jpa.repository.FactorRepository;
-import io.sc.platform.orm.service.DaoService;
-
-public interface FactorService extends DaoService<FactorEntity, String, FactorRepository>{
-}

io.sc.engine.st/src/main/java/io/sc/engine/st/service/impl/EconomicIndicatorServiceImpl.java

@@ -1,14 +0,0 @@
-package io.sc.engine.st.service.impl;
-
-import io.sc.engine.st.jpa.entity.EconomicIndicatorEntity;
-import io.sc.engine.st.jpa.repository.EconomicIndicatorRepository;
-import io.sc.engine.st.service.EconomicIndicatorService;
-import io.sc.platform.orm.service.impl.DaoServiceImpl;
-import io.sc.platform.orm.service.support.QueryParameter;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-@Service("io.sc.engine.st.service.impl.EconomicIndicatorServiceImpl")
-public class EconomicIndicatorServiceImpl extends DaoServiceImpl<EconomicIndicatorEntity, String, EconomicIndicatorRepository> implements EconomicIndicatorService {
-
-}

io.sc.engine.st/src/main/java/io/sc/engine/st/service/impl/FactorServiceImpl.java

@@ -1,12 +0,0 @@
-package io.sc.engine.st.service.impl;
-
-import io.sc.engine.st.jpa.entity.FactorEntity;
-import io.sc.engine.st.jpa.repository.FactorRepository;
-import io.sc.engine.st.service.FactorService;
-import io.sc.platform.orm.service.impl.DaoServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("io.sc.engine.st.service.impl.FactorServiceImpl")
-public class FactorServiceImpl extends DaoServiceImpl<FactorEntity, String, FactorRepository> implements FactorService {
-
-}

io.sc.engine.st/src/main/java/io/sc/engine/st/vo/DepFactorVo.java

@@ -0,0 +1,65 @@
+package io.sc.engine.st.vo;
+
+import io.sc.engine.st.support.PeriodWrapper;
+import io.sc.platform.orm.api.vo.CorporationAuditorVo;
+
+public class DepFactorVo extends CorporationAuditorVo {
+    protected String id;
+    protected Integer year;
+    protected Integer quarter;
+    protected Integer month;
+    protected String value;
+    protected String define;
+
+    public PeriodWrapper calUniqueKey(){
+        return new PeriodWrapper(year,quarter,month);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public Integer getQuarter() {
+        return quarter;
+    }
+
+    public void setQuarter(Integer quarter) {
+        this.quarter = quarter;
+    }
+
+    public Integer getMonth() {
+        return month;
+    }
+
+    public void setMonth(Integer month) {
+        this.month = month;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getDefine() {
+        return define;
+    }
+
+    public void setDefine(String define) {
+        this.define = define;
+    }
+}

io.sc.engine.st/src/main/java/io/sc/engine/st/vo/EconomicIndicatorVo.java

@@ -1,106 +0,0 @@
-package io.sc.engine.st.vo;
-
-import io.sc.engine.st.enums.StatisticalPeriodType;
-import io.sc.platform.orm.api.vo.CorporationAuditorVo;
-
-public class EconomicIndicatorVo extends CorporationAuditorVo {
-    protected String id;
-    protected StatisticalPeriodType periodType;
-    protected Integer year;
-    protected Integer month;
-    protected Integer quarter;
-    protected Double gdp;
-    protected Double m2;
-    protected Double cpi;
-    protected Double hpi;
-    protected Double pmi;
-    protected Double blr;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public StatisticalPeriodType getPeriodType() {
-        return periodType;
-    }
-
-    public void setPeriodType(StatisticalPeriodType periodType) {
-        this.periodType = periodType;
-    }
-
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer year) {
-        this.year = year;
-    }
-
-    public Integer getMonth() {
-        return month;
-    }
-
-    public void setMonth(Integer month) {
-        this.month = month;
-    }
-
-    public Integer getQuarter() {
-        return quarter;
-    }
-
-    public void setQuarter(Integer quarter) {
-        this.quarter = quarter;
-    }
-
-    public Double getGdp() {
-        return gdp;
-    }
-
-    public void setGdp(Double gdp) {
-        this.gdp = gdp;
-    }
-
-    public Double getM2() {
-        return m2;
-    }
-
-    public void setM2(Double m2) {
-        this.m2 = m2;
-    }
-
-    public Double getCpi() {
-        return cpi;
-    }
-
-    public void setCpi(Double cpi) {
-        this.cpi = cpi;
-    }
-
-    public Double getHpi() {
-        return hpi;
-    }
-
-    public void setHpi(Double hpi) {
-        this.hpi = hpi;
-    }
-
-    public Double getPmi() {
-        return pmi;
-    }
-
-    public void setPmi(Double pmi) {
-        this.pmi = pmi;
-    }
-
-    public Double getBlr() {
-        return blr;
-    }
-
-    public void setBlr(Double blr) {
-        this.blr = blr;
-    }
-}

io.sc.engine.st/src/main/resources/io/sc/engine/st/i18n/enums.properties

@@ -1,8 +1,26 @@
-io.sc.engine.st.enums.PeriodType.YEAR=Year
-io.sc.engine.st.enums.PeriodType.QUARTER=Quarter
-io.sc.engine.st.enums.PeriodType.MONTH=Month
-io.sc.engine.st.enums.PeriodType.DAY=Day
+io.sc.engine.st.enums.FactorAlgorithm.ARITHMETIC=Arithmetic
+io.sc.engine.st.enums.FactorAlgorithm.DELAY=Delay
+io.sc.engine.st.enums.FactorAlgorithm.DIFFERENTIAL=Differential
 
-io.sc.engine.st.enums.ValueType.NUMBER=Number
+io.sc.engine.st.enums.FactorDefineCategory.GROUP=Group
+io.sc.engine.st.enums.FactorDefineCategory.FACTOR_DEFINE=Factor Define
+
+
+io.sc.engine.st.enums.FactorDefineType.FOLDER=Folder
+io.sc.engine.st.enums.FactorDefineType.ORIGINAL=Original
+io.sc.engine.st.enums.FactorDefineType.EXTEND_ARITHMETIC=Extend(Arithmetic)
+io.sc.engine.st.enums.FactorDefineType.EXTEND_DELAY=Extend(Delay)
+io.sc.engine.st.enums.FactorDefineType.EXTEND_DIFFERENTIAL=Extend(Differential)
+
+io.sc.engine.st.enums.ModelAlgorithm.LINEAR_REGRESSION=Linear Regression
+io.sc.engine.st.enums.ModelAlgorithm.VAR=Vector Auto Regression
+
+io.sc.engine.st.enums.Period.YEAR=Year
+io.sc.engine.st.enums.Period.QUARTER=Quarter
+io.sc.engine.st.enums.Period.MONTH=Month
+io.sc.engine.st.enums.Period.DAY=Day
+
+io.sc.engine.st.enums.ValueType.NUMERIC=Numeric
 io.sc.engine.st.enums.ValueType.STRING=String
-io.sc.engine.st.enums.ValueType.DATE=Date
+io.sc.engine.st.enums.ValueType.DATE=Date
+

io.sc.engine.st/src/main/resources/io/sc/engine/st/i18n/enums_tw_CN.properties

@@ -1,8 +1,24 @@
-io.sc.engine.st.enums.PeriodType.YEAR=\u5E74
-io.sc.engine.st.enums.PeriodType.QUARTER=\u5B63
-io.sc.engine.st.enums.PeriodType.MONTH=\u6708
-io.sc.engine.st.enums.PeriodType.DAY=\u65E5
+io.sc.engine.st.enums.FactorAlgorithm.ARITHMETIC=\u7B97\u8853\u904B\u7B97
+io.sc.engine.st.enums.FactorAlgorithm.DELAY=\u6EEF\u5F8C
+io.sc.engine.st.enums.FactorAlgorithm.DIFFERENTIAL=\u5DEE\u5206
 
-io.sc.engine.st.enums.ValueType.NUMBER=\u6578\u5B57
+io.sc.engine.st.enums.FactorDefineCategory.GROUP=\u7D44
+io.sc.engine.st.enums.FactorDefineCategory.FACTOR_DEFINE=\u8B8A\u91CF\u5B9A\u7FA9
+
+io.sc.engine.st.enums.FactorDefineType.FOLDER=\u6587\u4EF6\u593E
+io.sc.engine.st.enums.FactorDefineType.ORIGINAL=\u539F\u59CB\u8B8A\u91CF
+io.sc.engine.st.enums.FactorDefineType.EXTEND_ARITHMETIC=\u64F4\u5C55\u8B8A\u91CF(\u7B97\u8853)
+io.sc.engine.st.enums.FactorDefineType.EXTEND_DELAY=\u64F4\u5C55\u8B8A\u91CF(\u6EEF\u5F8C)
+io.sc.engine.st.enums.FactorDefineType.EXTEND_DIFFERENTIAL=\u64F4\u5C55\u8B8A\u91CF(\u5DEE\u5206)
+
+io.sc.engine.st.enums.ModelAlgorithm.LINEAR_REGRESSION=\u7DDA\u6027\u56DE\u6B78
+io.sc.engine.st.enums.ModelAlgorithm.VAR=\u5411\u91CF\u81EA\u56DE\u6B78
+
+io.sc.engine.st.enums.Period.YEAR=\u5E74
+io.sc.engine.st.enums.Period.QUARTER=\u5B63
+io.sc.engine.st.enums.Period.MONTH=\u6708
+io.sc.engine.st.enums.Period.DAY=\u65E5
+
+io.sc.engine.st.enums.ValueType.NUMERIC=\u6578\u5B57
 io.sc.engine.st.enums.ValueType.STRING=\u5B57\u7B26\u4E32
-io.sc.engine.st.enums.ValueType.DATE=\u65E5\u671F
+io.sc.engine.st.enums.ValueType.DATE=\u65E5\u671F

io.sc.engine.st/src/main/resources/io/sc/engine/st/i18n/enums_zh_CN.properties

@@ -1,8 +1,24 @@
-io.sc.engine.st.enums.PeriodType.YEAR=\u5E74
-io.sc.engine.st.enums.PeriodType.QUARTER=\u5B63
-io.sc.engine.st.enums.PeriodType.MONTH=\u6708
-io.sc.engine.st.enums.PeriodType.DAY=\u65E5
+io.sc.engine.st.enums.FactorAlgorithm.ARITHMETIC=\u7B97\u672F\u8FD0\u7B97
+io.sc.engine.st.enums.FactorAlgorithm.DELAY=\u6EDE\u540E
+io.sc.engine.st.enums.FactorAlgorithm.DIFFERENTIAL=\u5DEE\u5206
 
-io.sc.engine.st.enums.ValueType.NUMBER=\u6570\u5B57
+io.sc.engine.st.enums.FactorDefineCategory.GROUP=\u7EC4
+io.sc.engine.st.enums.FactorDefineCategory.FACTOR_DEFINE=\u53D8\u91CF\u5B9A\u4E49
+
+io.sc.engine.st.enums.FactorDefineType.FOLDER=\u6587\u4EF6\u5939
+io.sc.engine.st.enums.FactorDefineType.ORIGINAL=\u539F\u59CB\u53D8\u91CF
+io.sc.engine.st.enums.FactorDefineType.EXTEND_ARITHMETIC=\u6269\u5C55\u53D8\u91CF(\u7B97\u672F)
+io.sc.engine.st.enums.FactorDefineType.EXTEND_DELAY=\u6269\u5C55\u53D8\u91CF(\u6EDE\u540E)
+io.sc.engine.st.enums.FactorDefineType.EXTEND_DIFFERENTIAL=\u6269\u5C55\u53D8\u91CF(\u5DEE\u5206)
+
+io.sc.engine.st.enums.ModelAlgorithm.LINEAR_REGRESSION=\u7EBF\u6027\u56DE\u5F52
+io.sc.engine.st.enums.ModelAlgorithm.VAR=\u5411\u91CF\u81EA\u56DE\u5F52
+
+io.sc.engine.st.enums.Period.YEAR=\u5E74
+io.sc.engine.st.enums.Period.QUARTER=\u5B63
+io.sc.engine.st.enums.Period.MONTH=\u6708
+io.sc.engine.st.enums.Period.DAY=\u65E5
+
+io.sc.engine.st.enums.ValueType.NUMERIC=\u6570\u5B57
 io.sc.engine.st.enums.ValueType.STRING=\u5B57\u7B26\u4E32
-io.sc.engine.st.enums.ValueType.DATE=\u65E5\u671F
+io.sc.engine.st.enums.ValueType.DATE=\u65E5\u671F

io.sc.engine.st/src/main/resources/io/sc/engine/st/i18n/exception.properties

@@ -0,0 +1 @@
+io.sc.engine.st.exception.ModelEntityNotTargetTypeException=Model's test target are NOT exists!

io.sc.engine.st/src/main/resources/io/sc/engine/st/i18n/exception_tw_CN.properties

@@ -0,0 +1 @@
+io.sc.engine.st.exception.ModelEntityNotTargetTypeException=\u6A21\u578B\u672A\u8A2D\u7F6E\u6E2C\u8A66\u76EE\u6A19!

io.sc.engine.st/src/main/resources/io/sc/engine/st/i18n/exception_zh_CN.properties

@@ -0,0 +1 @@
+io.sc.engine.st.exception.ModelEntityNotTargetTypeException=\u6A21\u578B\u672A\u8BBE\u7F6E\u6D4B\u8BD5\u76EE\u6807!