自助检索修改

src/main/java/com/bowintek/practice/PracticeApplication.java

@@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication

src/main/java/com/bowintek/practice/services/impl/GenSqlStringServiceImpl.java

@@ -122,14 +122,14 @@ public class GenSqlStringServiceImpl implements GenSqlStringService {
             SqlColumnModel cm = aliasMap.get(dim.getTempFeildId());
 
             colString += MessageFormat.format("{0} {1} AS {2}\n\t",
-                    getCommaString(fieldIndex), cm.getDisplayColumn(), getFieldName(fieldIndex));
+                    getCommaString(fieldIndex), cm.getDisplayColumn(), getFieldName(dim.getDisOrder()));
             groupString += MessageFormat.format("{0} {1}\n\t",getCommaString(fieldIndex), cm.getDisplayColumn());
             cm.setMeasureColumn(cm.getDisplayColumn());
 
             //生成字段-名称对照表
             result.excelNameList.add(ExceNameModel.GenModel(
                     getFieldName(dim.getFieldName(), dim.getDisplayName()),
-                    getFieldName(fieldIndex)));
+                    getFieldName(dim.getDisOrder())));
             fieldIndex++;
         }
 
@@ -141,13 +141,13 @@ public class GenSqlStringServiceImpl implements GenSqlStringService {
             colString += MessageFormat.format("{0} {1} AS {2}\n\t",
                     getCommaString(fieldIndex),
                     getMeasurString(msr.getOperation(), cm.getDisplayColumn()),
-                    getFieldName(fieldIndex));
+                    getFieldName(msr.getDisOrder()));
             cm.setMeasureColumn(getMeasurString(msr.getOperation(), cm.getDisplayColumn()));
 
             //生成字段-名称对照表
             result.excelNameList.add(ExceNameModel.GenModel(
                     getFieldName(msr.getFieldName(), msr.getDisplayName()),
-                    getFieldName(fieldIndex)));
+                    getFieldName(msr.getDisOrder())));
             fieldIndex++;
         }
 
@@ -177,11 +177,17 @@ public class GenSqlStringServiceImpl implements GenSqlStringService {
                 data.pagination.rows, (data.pagination.page-1) * data.pagination.rows);
 
 
-        String mainSqlString = MessageFormat.format("SELECT {0} \nFROM {1} AS T {2} \nWHERE 1=1 {3} \nGROUP BY {4} \n{5} \n{6}",
+        //如有聚合则进行分组
+        if(data.measures.size()>0){
+            groupString = MessageFormat.format("\nGROUP BY {0}",groupString);
+        }else{
+            groupString="";
+        }
+        String mainSqlString = MessageFormat.format("SELECT {0} \nFROM {1} AS T {2} \nWHERE 1=1 {3} {4} \n{5} \n{6}",
                 colString, data.sub.getTabCode(), leftTableString, whereString, groupString, orderByString, limitString);
         result.setMainSqlString(mainSqlString);
 
-        String countSqlString = MessageFormat.format("SELECT COUNT(*) CNT FROM (SELECT {0} \nFROM {1} AS T {2} \nWHERE 1=1 {3} \nGROUP BY {4})",
+        String countSqlString = MessageFormat.format("SELECT COUNT(*) CNT FROM (SELECT {0} \nFROM {1} AS T {2} \nWHERE 1=1 {3} {4})",
                 colString, data.sub.getTabCode(), leftTableString, whereString, groupString);
         result.setCountSqlStrimg(countSqlString);
 

src/main/java/com/bowintek/practice/services/impl/TempServiceImpl.java

@@ -24,6 +24,7 @@ import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import java.io.FileOutputStream;

src/main/resources/META-INF/MANIFEST.MF

@@ -1,38 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: com.bowintek.practice.PracticeApplication
-Class-Path: poi-ooxml-4.0.0.jar aspectjrt-1.9.7.jar spring-boot-starter-
- json-2.7.2.jar druid-1.2.11.jar xmlbeans-3.0.1.jar spring-beans-5.3.22.
- jar spring-web-5.3.22.jar lettuce-core-6.1.9.RELEASE.jar spring-data-ke
- yvalue-2.7.2.jar jackson-datatype-jsr310-2.13.3.jar jackson-datatype-jd
- k8-2.13.3.jar spring-data-commons-2.7.2.jar log4j-to-slf4j-2.17.2.jar t
- omcat-embed-core-9.0.65.jar poi-scratchpad-4.0.0.jar spring-boot-2.7.2.
- jar reactor-core-3.4.21.jar commons-compress-1.18.jar spring-boot-start
- er-tomcat-2.7.2.jar commons-collections-3.2.2.jar jackson-annotations-2
- .13.3.jar mybatis-spring-2.0.7.jar spring-context-5.3.22.jar pagehelper
- -spring-boot-autoconfigure-1.4.3.jar httpcore-4.4.15.jar netty-handler-
- 4.1.79.Final.jar spring-jcl-5.3.22.jar netty-transport-native-unix-comm
- on-4.1.79.Final.jar commons-logging-1.2.jar spring-boot-starter-2.7.2.j
- ar spring-boot-starter-logging-2.7.2.jar commons-net-3.6.jar mybatis-sp
- ring-boot-autoconfigure-2.2.2.jar httpclient-4.5.9.jar slf4j-api-1.7.36
- .jar commons-codec-1.15.jar lombok-1.18.20.jar tomcat-embed-el-9.0.65.j
- ar pagehelper-5.3.1.jar mybatis-3.5.9.jar logback-core-1.2.11.jar sprin
- g-webmvc-5.3.22.jar tomcat-embed-websocket-9.0.65.jar mybatis-spring-bo
- ot-starter-2.2.2.jar spring-data-redis-2.7.2.jar logback-classic-1.2.11
- .jar commons-lang3-3.5.jar fastjson-1.2.47.jar spring-boot-starter-web-
- 2.7.2.jar json-20190722.jar spring-boot-starter-jdbc-2.7.2.jar spring-j
- dbc-5.3.22.jar reactive-streams-1.0.4.jar HikariCP-4.0.3.jar netty-tran
- sport-4.1.79.Final.jar jul-to-slf4j-1.7.36.jar netty-resolver-4.1.79.Fi
- nal.jar netty-common-4.1.79.Final.jar aspose-words-15.8.0-jdk16.jar jak
- arta.annotation-api-1.3.5.jar commons-collections4-4.2.jar netty-buffer
- -4.1.79.Final.jar java-jwt-3.9.0.jar jackson-core-2.13.3.jar pagehelper
- -spring-boot-starter-1.4.3.jar poi-4.0.0.jar checker-qual-3.5.0.jar spr
- ing-boot-autoconfigure-2.7.2.jar spring-expression-5.3.22.jar jackson-d
- atabind-2.13.3.jar jsqlparser-4.2.jar spring-core-5.3.22.jar spring-boo
- t-starter-data-redis-2.7.2.jar postgresql-42.3.6.jar commons-pool2-2.11
- .1.jar spring-boot-devtools-2.7.2.jar spring-aop-5.3.22.jar spring-oxm-
- 5.3.22.jar poi-ooxml-schemas-4.0.0.jar commons-beanutils-1.9.4.jar spri
- ng-tx-5.3.22.jar curvesapi-1.04.jar druid-spring-boot-starter-1.2.11.ja
- r snakeyaml-1.30.jar netty-codec-4.1.79.Final.jar log4j-api-2.17.2.jar 
- aspectjweaver-1.9.7.jar mysql-connector-java-8.0.29.jar jackson-module-
- parameter-names-2.13.3.jar spring-context-support-5.3.22.jar
 

target/classes/META-INF/MANIFEST.MF

@@ -1,38 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: com.bowintek.practice.PracticeApplication
-Class-Path: poi-ooxml-4.0.0.jar aspectjrt-1.9.7.jar spring-boot-starter-
- json-2.7.2.jar druid-1.2.11.jar xmlbeans-3.0.1.jar spring-beans-5.3.22.
- jar spring-web-5.3.22.jar lettuce-core-6.1.9.RELEASE.jar spring-data-ke
- yvalue-2.7.2.jar jackson-datatype-jsr310-2.13.3.jar jackson-datatype-jd
- k8-2.13.3.jar spring-data-commons-2.7.2.jar log4j-to-slf4j-2.17.2.jar t
- omcat-embed-core-9.0.65.jar poi-scratchpad-4.0.0.jar spring-boot-2.7.2.
- jar reactor-core-3.4.21.jar commons-compress-1.18.jar spring-boot-start
- er-tomcat-2.7.2.jar commons-collections-3.2.2.jar jackson-annotations-2
- .13.3.jar mybatis-spring-2.0.7.jar spring-context-5.3.22.jar pagehelper
- -spring-boot-autoconfigure-1.4.3.jar httpcore-4.4.15.jar netty-handler-
- 4.1.79.Final.jar spring-jcl-5.3.22.jar netty-transport-native-unix-comm
- on-4.1.79.Final.jar commons-logging-1.2.jar spring-boot-starter-2.7.2.j
- ar spring-boot-starter-logging-2.7.2.jar commons-net-3.6.jar mybatis-sp
- ring-boot-autoconfigure-2.2.2.jar httpclient-4.5.9.jar slf4j-api-1.7.36
- .jar commons-codec-1.15.jar lombok-1.18.20.jar tomcat-embed-el-9.0.65.j
- ar pagehelper-5.3.1.jar mybatis-3.5.9.jar logback-core-1.2.11.jar sprin
- g-webmvc-5.3.22.jar tomcat-embed-websocket-9.0.65.jar mybatis-spring-bo
- ot-starter-2.2.2.jar spring-data-redis-2.7.2.jar logback-classic-1.2.11
- .jar commons-lang3-3.5.jar fastjson-1.2.47.jar spring-boot-starter-web-
- 2.7.2.jar json-20190722.jar spring-boot-starter-jdbc-2.7.2.jar spring-j
- dbc-5.3.22.jar reactive-streams-1.0.4.jar HikariCP-4.0.3.jar netty-tran
- sport-4.1.79.Final.jar jul-to-slf4j-1.7.36.jar netty-resolver-4.1.79.Fi
- nal.jar netty-common-4.1.79.Final.jar aspose-words-15.8.0-jdk16.jar jak
- arta.annotation-api-1.3.5.jar commons-collections4-4.2.jar netty-buffer
- -4.1.79.Final.jar java-jwt-3.9.0.jar jackson-core-2.13.3.jar pagehelper
- -spring-boot-starter-1.4.3.jar poi-4.0.0.jar checker-qual-3.5.0.jar spr
- ing-boot-autoconfigure-2.7.2.jar spring-expression-5.3.22.jar jackson-d
- atabind-2.13.3.jar jsqlparser-4.2.jar spring-core-5.3.22.jar spring-boo
- t-starter-data-redis-2.7.2.jar postgresql-42.3.6.jar commons-pool2-2.11
- .1.jar spring-boot-devtools-2.7.2.jar spring-aop-5.3.22.jar spring-oxm-
- 5.3.22.jar poi-ooxml-schemas-4.0.0.jar commons-beanutils-1.9.4.jar spri
- ng-tx-5.3.22.jar curvesapi-1.04.jar druid-spring-boot-starter-1.2.11.ja
- r snakeyaml-1.30.jar netty-codec-4.1.79.Final.jar log4j-api-2.17.2.jar 
- aspectjweaver-1.9.7.jar mysql-connector-java-8.0.29.jar jackson-module-
- parameter-names-2.13.3.jar spring-context-support-5.3.22.jar
 

vue/public/appconfig.json

@@ -1,4 +1,4 @@
 {
-  "isDev": true,
+  "isDev": false,
   "SSOLoginUrl": "http://www.baidu.com"
 }

vue/src/api/oauth/index.ts

@@ -13,12 +13,12 @@ export function getOAuthUrl(type: string) {
     );
 }
 
-export function oauthLogin(type: string, ticket: string,tm:string) {
+export function oauthLogin(type: string, token: string,tm:string) {
     return request<API.LoginResult>(
         {
             url: 'oauth/oauthLogin',
             method: 'get',
-            params:{appType:'web',type:type,ticket:ticket,tm:tm},
+            params:{appType:'web',type:type,token:token,tm:tm},
         },
         {
             isNew: true,

vue/src/components/basic/query/display-table.vue

@@ -71,7 +71,7 @@ export default defineComponent({
         let it = cols[i];
         rtns.push({
           title: it.displayName ? it.displayName : it.fieldName,
-          dataIndex: "RENAME" + i,
+          dataIndex: "RENAME" + it.disOrder,
           key: it.tempFeildId,
           sorter: true,
           width: 120,

vue/src/components/basic/query/select-column.vue

@@ -27,7 +27,7 @@
                   <DownOutlined/>
                 </a>
                 <template #overlay>
-                  <a-menu @click="(e)=>{it.operation=e.key;changeColumn();}">
+                  <a-menu @click="onChangeOperation($event,it)">
                     <a-menu-item v-for="menu in OperationList" :key="menu.value">{{ menu.label }}</a-menu-item>
                   </a-menu>
                 </template>
@@ -49,7 +49,7 @@
 import {defineComponent, ref, reactive, watch, toRefs} from "vue";
 import {get} from "@/api/common";
 import {OperationList} from '@/enums/dictions';
-import { v4 as uuidv4 } from 'uuid';
+import {v4 as uuidv4} from 'uuid';
 
 export default defineComponent({
   name: 'SelectColumn',
@@ -63,12 +63,11 @@ export default defineComponent({
   ],
   setup(props, {emit}) {
     console.log(props, emit);
-
     const showColumns = ref(true);
     const state = reactive({
       indeterminate: true,
       checkAll: false,
-      checkedList: ['Apple', 'Orange'],
+      checkedList:[''],
     });
     const fieldList = ref<any[]>([]);
 
@@ -125,9 +124,17 @@ export default defineComponent({
         }
       })
     }
+    const onChangeOperation = (e, it) => {
+      it.operation = e.key;
+      if (state.checkedList.findIndex(ck => ck == it.fieldId) < 0) {
+        state.checkedList.push(it.fieldId);
+      } else {
+        changeColumn();
+      }
+    }
     const onCheckAllChange = (e) => {
       let ckList = fieldList.value.map(it => it.fieldId);
-      let fixedList= fieldList.value.filter(x => x.isFixed == 1).map(x => x.fieldId);
+      let fixedList = fieldList.value.filter(x => x.isFixed == 1).map(x => x.fieldId);
       Object.assign(state, {
         checkedList: e.target.checked ? ckList : fixedList,
         indeterminate: false,
@@ -144,8 +151,9 @@ export default defineComponent({
     const changeColumn = () => {
       let selectList = Object.assign(fieldList.value.filter(x => state.checkedList.findIndex(ck => ck == x.fieldId) > -1));
       selectList.forEach(it => it.tempFeildId = uuidv4());
-      let basesList = selectList.filter(x => x.settingTypeId == 1);
-      let measuresList = selectList.filter(x => x.settingTypeId == 2);
+      //度量如未选择聚合函数，则为维度
+      let basesList = selectList.filter(x => x.settingTypeId == 1 || x.operation == undefined);
+      let measuresList = selectList.filter(x => x.settingTypeId == 2 && x.operation != undefined);
       emit('checked', basesList, measuresList);
     }
     const getFunctionName = (operation: string) => {
@@ -154,7 +162,7 @@ export default defineComponent({
     }
     return {
       ...toRefs(state),
-      fieldList, OperationList,
+      fieldList, OperationList, onChangeOperation,
       onCheckAllChange, getFunctionName, changeColumn,
       showColumns
     }

vue/src/components/basic/query/select-field.vue

@@ -15,7 +15,7 @@
     />
     <a-divider orientation="left">筛选条件</a-divider>
     <div class="field-content">
-      <template v-for="it in search()"  :key="it.field">
+      <template v-for="it in search()" :key="it.field">
         <div class="field-item"
              @click="it.checked=!it.checked" v-show="it.isFixed!=1"
              :style="{ borderColor: it.checked?'#50a14f':'#eef0f4'}">
@@ -56,7 +56,6 @@ export default defineComponent({
       })
 
       fieldList.value = result;
-      setFexidField();
       changeList();
     }
     watch(
@@ -72,16 +71,20 @@ export default defineComponent({
       () => props.options.tagList,
       () => changeList, {deep: true}
     );
-    const setFexidField = () => {
-      fieldList.value.filter(x => x.isFixed == 1).forEach(x => x.checked = true);
-      let selectList = Object.assign(fieldList.value.filter(x => x.checked));
-      emit('ok', selectList);
-    }
     //已选择字段变化时
     const changeList = () => {
       fieldList.value.map(it => {
-        it.checked = props.options.tagList.filter(tag => tag.fieldId == it.fieldId).length > 0 || it.isFixed == 1;
+        let select = props.options.tagList.find(tag => tag.fieldId == it.fieldId);
+        it.checked = select != undefined || it.isFixed == 1;
+        if (select != undefined) {
+          it.value1 = select.value1;
+          it.value2 = select.value2;
+          it.operation = select.operation;
+        }
       })
+      fieldList.value.filter(x => x.isFixed == 1).forEach(x => x.checked = true);
+      let selectList = Object.assign(fieldList.value.filter(x => x.checked));
+      emit('ok', selectList);
     }
     const search = () => {
       if (searchKey.value == undefined) {

vue/src/store/modules/user.ts

@@ -99,10 +99,10 @@ export const useUserStore = defineStore({
       }
     },
     /** 单点登录 */
-    async oauthLogin(type: string, ticket: string,tm:string) {
+    async oauthLogin(type: string, token: string,tm:string) {
       try {
 
-        const data = await oauthLogin(type, ticket,tm);
+        const data = await oauthLogin(type, token,tm);
         if (data != null && data.token != null) {
           this.setToken(data.token);
           this.setDataRangeList(data.dataRangeList);

vue/src/views/query/index.vue

@@ -126,7 +126,7 @@
     </div>
     <ExportData ref="exportData"></ExportData>
     <SelectField @ok="selectOk" :tagId="formState.temp.tagId" :subId="formState.temp.subId"
-                 v-model:options="selectOptions"></SelectField>
+                 :options="selectOptions"></SelectField>
 
     <a-modal v-model:visible="modal.open" title="生成Sql语句成功，调试窗口" width="60%">
       <a-textarea v-model:value="modal.sqlString" placeholder="Basic usage" :rows="20"/>
@@ -336,6 +336,7 @@ export default defineComponent({
 
       selectColumnOptions.value.basesList = rtn.bases;
       selectColumnOptions.value.measuresList = rtn.measures;
+      selectOptions.value.tagList=rtn.wheres;
 
       subjectTrees.value.expandedKeys = [];
       subjectTrees.value.expandedKeys.push(rtn.temp.tagId);