Commit 68c31921 authored by 赵啸非's avatar 赵啸非

修改数据库字段映射关键字转义问题

parent 8b143fc3
...@@ -259,6 +259,7 @@ export default { ...@@ -259,6 +259,7 @@ export default {
const appId = this.$route.query["query.appId"]; const appId = this.$route.query["query.appId"];
console.log("appId", appId); console.log("appId", appId);
this.appId = appId; this.appId = appId;
this.upload.url = this.upload.url+ this.appId
//this.query={ appId: appId } //this.query={ appId: appId }
// this.config.addQuery = { appId: appId }; // this.config.addQuery = { appId: appId };
}, },
...@@ -332,7 +333,7 @@ export default { ...@@ -332,7 +333,7 @@ export default {
this.loading = true; this.loading = true;
if (this.genCodeDialog.tableName) { if (this.genCodeDialog.tableName) {
this.$download( this.$download(
"/gentable/genCode", "/gentable/genCode",
{ {
...@@ -470,12 +471,13 @@ export default { ...@@ -470,12 +471,13 @@ export default {
_this.toDel(tableIds, true); _this.toDel(tableIds, true);
}) })
.then(() => { .then(() => {
this.getList(); _this.getData();
}); });
}, },
handleImportExcel() { handleImportExcel() {
this.upload.title = "导入"; this.upload.title = "导入";
this.upload.url += this.appId; console.log("appId:",this.appId)
//this.upload.url = this.upload.url+ this.appId;
this.upload.open = true; this.upload.open = true;
}, },
// 文件上传中处理 // 文件上传中处理
...@@ -492,7 +494,6 @@ export default { ...@@ -492,7 +494,6 @@ export default {
}, },
// 提交上传文件 // 提交上传文件
submitFileForm() { submitFileForm() {
console.log(1111);
this.$refs.upload.submit(); this.$refs.upload.submit();
}, },
}, },
...@@ -508,10 +509,11 @@ export default { ...@@ -508,10 +509,11 @@ export default {
{ name: "应用信息", path: "/app/list" }, { name: "应用信息", path: "/app/list" },
{ name: "生成列表" }, { name: "生成列表" },
], ],
appId: null,
all:"1", all:"1",
model:"0", appId: null,
// 用户导入参数 // 用户导入参数
model:"0",
upload: { upload: {
// 是否显示弹出层(用户导入) // 是否显示弹出层(用户导入)
open: false, open: false,
...@@ -555,11 +557,9 @@ export default { ...@@ -555,11 +557,9 @@ export default {
activeName: "vo.java", activeName: "vo.java",
}, },
docForm: {}, docForm: {},
appId: null,
config: { config: {
search: [], search: [],
columns: [ columns: [
{ type: "selection", width: 60 }, { type: "selection", width: 60 },
......
...@@ -69,7 +69,7 @@ EXTRA_JVM_ARGUMENTS="" ...@@ -69,7 +69,7 @@ EXTRA_JVM_ARGUMENTS=""
cd "$BASEDIR/boot"; cd "$BASEDIR/boot";
writelog "starting application $PROJECT_NAME......" writelog "starting application $PROJECT_NAME......"
nohup "$JAVACMD" $JAVA_OPTS \ setid "$JAVACMD" $JAVA_OPTS \
$EXTRA_JVM_ARGUMENTS \ $EXTRA_JVM_ARGUMENTS \
-Dapp.name="$PROJECT_NAME" \ -Dapp.name="$PROJECT_NAME" \
-Dapp.port="$PORT" \ -Dapp.port="$PORT" \
......
...@@ -25,6 +25,8 @@ public class GentableColumnEntityExt extends BaseEntityLong { ...@@ -25,6 +25,8 @@ public class GentableColumnEntityExt extends BaseEntityLong {
private List<Map<String, String>> dict; private List<Map<String, String>> dict;
private List<Long> idList;
public static String subComment(String comment) { public static String subComment(String comment) {
......
...@@ -32,6 +32,8 @@ public class GentableEntityExt extends BaseEntityLong { ...@@ -32,6 +32,8 @@ public class GentableEntityExt extends BaseEntityLong {
private String path; private String path;
private List<Long> idList;
/** /**
* 表列信息 * 表列信息
*/ */
......
...@@ -2,6 +2,7 @@ package com.mortals.xhx.base.system.gentable.service; ...@@ -2,6 +2,7 @@ package com.mortals.xhx.base.system.gentable.service;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.base.system.gentable.dao.GentableColumnDao;
import com.mortals.xhx.base.system.gentable.model.GentableColumnEntity; import com.mortals.xhx.base.system.gentable.model.GentableColumnEntity;
import java.util.List; import java.util.List;
...@@ -16,6 +17,8 @@ import java.util.List; ...@@ -16,6 +17,8 @@ import java.util.List;
public interface GentableColumnService extends ICRUDService<GentableColumnEntity,Long> { public interface GentableColumnService extends ICRUDService<GentableColumnEntity,Long> {
GentableColumnDao getDao();
/** /**
* 根据表名称查询列信息 * 根据表名称查询列信息
* *
......
...@@ -696,13 +696,16 @@ public class GentableServiceImpl extends AbstractCRUDServiceImpl<GentableDao, Ge ...@@ -696,13 +696,16 @@ public class GentableServiceImpl extends AbstractCRUDServiceImpl<GentableDao, Ge
@Override @Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException { protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
Long[] colIds = gentableColumnService.find(new GentableColumnQuery().tableIdList(Arrays.asList(ids))).stream().map(GentableColumnEntity::getId).toArray(Long[]::new); super.removeAfter(ids, context, result);
gentableColumnService.remove(colIds, context);
GentableColumnQuery condition = new GentableColumnQuery();
condition.setTableIdList(Arrays.asList(ids));
gentableColumnService.getDao().delete(condition);
// Long[] colIds = gentableColumnService.find(new GentableColumnQuery().tableIdList(Arrays.asList(ids))).stream().map(GentableColumnEntity::getId).toArray(Long[]::new);
// gentableColumnService.remove(colIds, context);
super.removeAfter(ids, context, result);
} }
private String genFreePath(String temp) { private String genFreePath(String temp) {
......
...@@ -497,7 +497,7 @@ ...@@ -497,7 +497,7 @@
</delete> </delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_gentable_column as a delete from mortals_xhx_gentable_column as a
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment