fix:修改数据

zkqy-admin/src/main/java/com/zkqy/ZkqyServletInitializer.java

@@ -15,4 +15,13 @@ public class ZkqyServletInitializer extends SpringBootServletInitializer
     {
         return application.sources(ZkqyApplication.class);
     }
+
+    public static void main(String[] args) {
+        int a=10;
+        int b=10;
+        method(a,b);
+        System.out.println( a+"--"+b);
+    }
+    public  static void method(int a,int b){
+    }
 }

zkqy-admin/src/main/java/com/zkqy/web/controller/homepagestatistics/StatisticsController.java

@@ -4,8 +4,10 @@ import com.zkqy.common.config.datasource.constant.DataSourceType;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.utils.SecurityUtils;
 import com.zkqy.system.entity.DragForm;
+import com.zkqy.system.entity.DragFormGroup;
 import com.zkqy.system.entity.DragTable;
 import com.zkqy.system.entity.DragTableGroup;
+import com.zkqy.system.service.impl.DragFormGroupServiceImpl;
 import com.zkqy.system.service.impl.DragFormServiceImpl;
 import com.zkqy.system.service.impl.DragTableGroupServiceImpl;
 import com.zkqy.system.service.impl.DragTableServiceImpl;
@@ -35,6 +37,10 @@ public class StatisticsController {
     @Autowired
     DragTableGroupServiceImpl dragTableGroupService;
 
+
+    @Autowired
+    DragFormGroupServiceImpl dragFormGroupService;
+
     /**
      * 表单表格统计
      * DataModelingStatistics
@@ -52,6 +58,10 @@ public class StatisticsController {
         DragTableGroup dragTableGroup =new DragTableGroup();
         int dragTableGroupsCount = dragTableGroupService.selectDragTableGroupListCount(dragTableGroup);
 
+        //表单组
+        DragFormGroup dragFromGroup =new DragFormGroup();
+        int dragFromGroupCount = dragFormGroupService.selectDragFormGroupList(dragFromGroup).size();
+
         List<Map> list=new ArrayList<>();
         HashMap dragFormsMap=new HashMap();
         dragFormsMap.put("name","表单");
@@ -68,6 +78,14 @@ public class StatisticsController {
         dragTableGroupsSMap.put("value",dragTableGroupsCount);
         list.add(dragTableGroupsSMap);
 
+        HashMap dragFromGroupMap=new HashMap();
+        dragFromGroupMap.put("name","表单组");
+        dragFromGroupMap.put("value",dragFromGroupCount);
+        list.add(dragFromGroupMap);
+        String aa="11";
+        StringBuffer a=new StringBuffer();
+        a.append("1111").append("111111");
+
         return AjaxResult.success(list);
     }
 

zkqy-admin/src/main/java/com/zkqy/web/controller/mobilepage/MobilePageDataController.java

@@ -1,6 +1,7 @@
 package com.zkqy.web.controller.mobilepage;
 
 import java.util.List;
+import java.util.concurrent.locks.Lock;
 import javax.servlet.http.HttpServletResponse;
 
 import com.zkqy.system.entity.MobilePageData;
@@ -41,7 +42,7 @@ public class MobilePageDataController extends BaseController {
     /**
      * 查询移动端数据列表
      */
-    @PreAuthorize("@ss.hasPermi('system:data:list')")
+//    @PreAuthorize("@ss.hasPermi('system:data:list')")
     @GetMapping("/list")
     @ApiOperation(value = "查询移动端数据列表")
     public TableDataInfo list(MobilePageData mobilePageData) {
@@ -53,7 +54,7 @@ public class MobilePageDataController extends BaseController {
     /**
      * 导出移动端数据列表
      */
-    @PreAuthorize("@ss.hasPermi('system:data:export')")
+//    @PreAuthorize("@ss.hasPermi('system:data:export')")
     @Log(title = "移动端数据", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation(value = "导出移动端数据列表")
@@ -66,7 +67,7 @@ public class MobilePageDataController extends BaseController {
     /**
      * 获取移动端数据详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:data:query')")
+//    @PreAuthorize("@ss.hasPermi('system:data:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "获取移动端数据详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -76,7 +77,7 @@ public class MobilePageDataController extends BaseController {
     /**
      * 新增移动端数据
      */
-    @PreAuthorize("@ss.hasPermi('system:data:add')")
+//    @PreAuthorize("@ss.hasPermi('system:data:add')")
     @Log(title = "移动端数据", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增移动端数据")
@@ -87,7 +88,7 @@ public class MobilePageDataController extends BaseController {
     /**
      * 修改移动端数据
      */
-    @PreAuthorize("@ss.hasPermi('system:data:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:data:edit')")
     @Log(title = "移动端数据", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改移动端数据")
@@ -95,14 +96,23 @@ public class MobilePageDataController extends BaseController {
         return toAjax(mobilePageDataService.updateMobilePageData(mobilePageData));
     }
 
+    //@PreAuthorize("@ss.hasPermi('system:data:edit')")
+    @Log(title = "移动端数据", businessType = BusinessType.UPDATE)
+    @PutMapping("/list/updateIsIndex")
+    @ApiOperation(value = "修改移动端数据")
+    public AjaxResult updateIsIndex(@RequestBody MobilePageData mobilePageData) {
+        return toAjax(mobilePageDataService.updateIsIndex(mobilePageData));
+    }
+
     /**
      * 删除移动端数据
      */
-    @PreAuthorize("@ss.hasPermi('system:data:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:data:remove')")
     @Log(title = "移动端数据", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation(value = "删除移动端数据")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(mobilePageDataService.deleteMobilePageDataByIds(ids));
     }
+
 }

zkqy-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ zkqy:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/zkqy/uploadPath，Linux配置 /home/zkqy/uploadPath）
-  profile: C:/log
+  profile: D:/zkqy/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

zkqy-system/src/main/java/com/zkqy/system/entity/MobilePageData.java

@@ -1,5 +1,6 @@
 package com.zkqy.system.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zkqy.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -24,56 +25,105 @@ public class MobilePageData extends BaseEntity
 
     /** 模版json */
     @Excel(name = "模版json")
-    private String templateJson;
+    private String pageJson;
 
-    /** 组件数据 */
-    @Excel(name = "组件数据")
-    private String component;
+    @Excel(name = "是否是首页")
+    private String isIndex;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
+    @Excel(name = "表单对应数据库字段")
+    private String  fromMapDb;
+
+    @Excel(name = "下拉框对应的数据表")
+    private String  selectQualifiedField;
+
+    @Excel(name = "下拉框数据(1、默认数据 2、动态数据)")
+    private  String selectMapValueList;
+
+    @Excel(name = "是否存在list数据")
+    private String  isExistsList;
+
+    public String getIsExistsList() {
+        return isExistsList;
+    }
+
+    @JsonProperty(required = false)
+    public MobilePageTableList mobilePageTableList;
+
+    public MobilePageTableList getMobilePageTableList() {
+        return mobilePageTableList;
+    }
+
+    public void setMobilePageTableList(MobilePageTableList mobilePageTableList) {
+        this.mobilePageTableList = mobilePageTableList;
+    }
+
+    public void setIsExistsList(String isExistsList) {
+        this.isExistsList = isExistsList;
+    }
+
+    public String getFromMapDb() {
+        return fromMapDb;
+    }
+
+    public void setFromMapDb(String fromMapDb) {
+        this.fromMapDb = fromMapDb;
+    }
+
+    public String getSelectQualifiedField() {
+        return selectQualifiedField;
+    }
+
+    public void setSelectQualifiedField(String selectQualifiedField) {
+        this.selectQualifiedField = selectQualifiedField;
+    }
+
+    public String getSelectMapValueList() {
+        return selectMapValueList;
+    }
+
+    public void setSelectMapValueList(String selectMapValueList) {
+        this.selectMapValueList = selectMapValueList;
+    }
+
+    public String getIsIndex() {
+        return isIndex;
     }
 
-    public Long getId() 
-    {
+    public void setIsIndex(String isIndex) {
+        this.isIndex = isIndex;
+    }
+
+    public Long getId() {
         return id;
     }
-    public void setName(String name) 
-    {
-        this.name = name;
+
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public String getName() 
-    {
+    public String getName() {
         return name;
     }
-    public void setTemplateJson(String templateJson) 
-    {
-        this.templateJson = templateJson;
-    }
 
-    public String getTemplateJson() 
-    {
-        return templateJson;
+    public void setName(String name) {
+        this.name = name;
     }
-    public void setComponent(String component) 
-    {
-        this.component = component;
+
+    public String getPageJson() {
+        return pageJson;
     }
 
-    public String getComponent() 
-    {
-        return component;
+    public void setPageJson(String pageJson) {
+        this.pageJson = pageJson;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("templateJson", getTemplateJson())
-            .append("component", getComponent())
-            .toString();
+        return "MobilePageData{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", pageJson='" + pageJson + '\'' +
+                ", isIndex='" + isIndex + '\'' +
+                '}';
     }
 }

zkqy-system/src/main/java/com/zkqy/system/entity/MobilePageTableList.java

@@ -0,0 +1,214 @@
+package com.zkqy.system.entity;
+
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 页面列表对象 mobile_page_table_list
+ * 
+ * @author zkqy
+ * @date 2024-05-21
+ */
+public class MobilePageTableList extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键自增 */
+    private Long id;
+
+    /** 页面id */
+    @Excel(name = "页面id")
+    private Long pageId;
+
+    /** 中文表名称 */
+    @Excel(name = "中文表名称")
+    private String tableNameDes;
+
+    /** 0:单表，1:多表 */
+    @Excel(name = "0:单表，1:多表")
+    private String isSingleTable;
+
+    /** 表名称集合 */
+    @Excel(name = "表名称集合")
+    private String tableNames;
+
+    /** 列表展示字段信息及属性 */
+    @Excel(name = "列表展示字段信息及属性")
+    private String tableColumnName;
+
+    /** 展示描述 */
+    @Excel(name = "展示描述")
+    private String tableColumnDesc;
+
+    /** 表的连接关系 */
+    @Excel(name = "表的连接关系")
+    private String tableJoin;
+
+    /** 表的查询条件 */
+    @Excel(name = "表的查询条件")
+    private String tableQueryConditions;
+
+    /** 时间范围查询 */
+    @Excel(name = "时间范围查询")
+    private String timeRangeFilters;
+
+    /** 数据排序查询 */
+    @Excel(name = "数据排序查询")
+    private String tablelistSort;
+
+    /** 列表映射数据 */
+    @Excel(name = "列表映射数据")
+    private String listMapValue;
+
+    /** 拓展字段 */
+    @Excel(name = "拓展字段")
+    private String extensions;
+
+
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setPageId(Long pageId) 
+    {
+        this.pageId = pageId;
+    }
+
+    public Long getPageId() 
+    {
+        return pageId;
+    }
+    public void setTableNameDes(String tableNameDes) 
+    {
+        this.tableNameDes = tableNameDes;
+    }
+
+    public String getTableNameDes() 
+    {
+        return tableNameDes;
+    }
+    public void setIsSingleTable(String isSingleTable) 
+    {
+        this.isSingleTable = isSingleTable;
+    }
+
+    public String getIsSingleTable() 
+    {
+        return isSingleTable;
+    }
+    public void setTableNames(String tableNames) 
+    {
+        this.tableNames = tableNames;
+    }
+
+    public String getTableNames() 
+    {
+        return tableNames;
+    }
+    public void setTableColumnName(String tableColumnName) 
+    {
+        this.tableColumnName = tableColumnName;
+    }
+
+    public String getTableColumnName() 
+    {
+        return tableColumnName;
+    }
+    public void setTableColumnDesc(String tableColumnDesc) 
+    {
+        this.tableColumnDesc = tableColumnDesc;
+    }
+
+    public String getTableColumnDesc() 
+    {
+        return tableColumnDesc;
+    }
+    public void setTableJoin(String tableJoin) 
+    {
+        this.tableJoin = tableJoin;
+    }
+
+    public String getTableJoin() 
+    {
+        return tableJoin;
+    }
+    public void setTableQueryConditions(String tableQueryConditions) 
+    {
+        this.tableQueryConditions = tableQueryConditions;
+    }
+
+    public String getTableQueryConditions() 
+    {
+        return tableQueryConditions;
+    }
+    public void setTimeRangeFilters(String timeRangeFilters) 
+    {
+        this.timeRangeFilters = timeRangeFilters;
+    }
+
+    public String getTimeRangeFilters() 
+    {
+        return timeRangeFilters;
+    }
+    public void setTablelistSort(String tablelistSort) 
+    {
+        this.tablelistSort = tablelistSort;
+    }
+
+    public String getTablelistSort() 
+    {
+        return tablelistSort;
+    }
+    public void setListMapValue(String listMapValue) 
+    {
+        this.listMapValue = listMapValue;
+    }
+
+    public String getListMapValue() 
+    {
+        return listMapValue;
+    }
+    public void setExtensions(String extensions) 
+    {
+        this.extensions = extensions;
+    }
+
+    public String getExtensions() 
+    {
+        return extensions;
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("pageId", getPageId())
+            .append("tableNameDes", getTableNameDes())
+            .append("isSingleTable", getIsSingleTable())
+            .append("tableNames", getTableNames())
+            .append("tableColumnName", getTableColumnName())
+            .append("tableColumnDesc", getTableColumnDesc())
+            .append("tableJoin", getTableJoin())
+            .append("tableQueryConditions", getTableQueryConditions())
+            .append("timeRangeFilters", getTimeRangeFilters())
+            .append("tablelistSort", getTablelistSort())
+            .append("listMapValue", getListMapValue())
+            .append("extensions", getExtensions())
+            .append("createTime", getCreateTime())
+            .append("createById", getCreateById())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("updateById", getUpdateById())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

zkqy-system/src/main/java/com/zkqy/system/entity/vo/MobilePageDataVo.java

@@ -0,0 +1,17 @@
+package com.zkqy.system.entity.vo;
+
+
+import com.zkqy.system.entity.MobilePageData;
+
+public class MobilePageDataVo extends MobilePageData {
+
+    private  String  listMapValue;
+
+    public String getListMapValue() {
+        return listMapValue;
+    }
+
+    public void setListMapValue(String listMapValue) {
+        this.listMapValue = listMapValue;
+    }
+}

zkqy-system/src/main/java/com/zkqy/system/mapper/MobilePageDataMapper.java

@@ -59,4 +59,11 @@ public interface MobilePageDataMapper
      * @return 结果
      */
     public int deleteMobilePageDataByIds(Long[] ids);
+
+    /**
+     * 先把等于true改为flase
+     * @param mobilePageData
+     * @return
+     */
+    int updateIsIndexFalse(MobilePageData mobilePageData);
 }

zkqy-system/src/main/java/com/zkqy/system/mapper/MobilePageTableListMapper.java

@@ -0,0 +1,81 @@
+package com.zkqy.system.mapper;
+
+
+import com.zkqy.system.entity.MobilePageTableList;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 页面列表Mapper接口
+ * 
+ * @author zkqy
+ * @date 2024-05-21
+ */
+@Mapper
+public interface MobilePageTableListMapper 
+{
+    /**
+     * 查询页面列表
+     * 
+     * @param id 页面列表主键
+     * @return 页面列表
+     */
+    public MobilePageTableList selectMobilePageTableListById(Long id);
+
+    /**
+     * 通过pageId查询列表信息
+     * @param id
+     * @return
+     */
+    public MobilePageTableList selectMobilePageTableListByPageId(Long id);
+
+    /**
+     * 查询页面列表列表
+     * 
+     * @param mobilePageTableList 页面列表
+     * @return 页面列表集合
+     */
+    public List<MobilePageTableList> selectMobilePageTableListList(MobilePageTableList mobilePageTableList);
+
+    /**
+     * 新增页面列表
+     * 
+     * @param mobilePageTableList 页面列表
+     * @return 结果
+     */
+    public int insertMobilePageTableList(MobilePageTableList mobilePageTableList);
+
+    /**
+     * 修改页面列表
+     * 
+     * @param mobilePageTableList 页面列表
+     * @return 结果
+     */
+    public int updateMobilePageTableList(MobilePageTableList mobilePageTableList);
+
+    /**
+     * 删除页面列表
+     * 
+     * @param id 页面列表主键
+     * @return 结果
+     */
+    public int deleteMobilePageTableListById(Long id);
+
+
+    /**
+     * 删除页面列表
+     *
+     * @param id 页面列表主键
+     * @return 结果
+     */
+    public int deleteMobilePageTableListByPageId(Long id);
+
+    /**
+     * 批量删除页面列表
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMobilePageTableListByIds(Long[] ids);
+}

zkqy-system/src/main/java/com/zkqy/system/service/IMobilePageDataService.java

@@ -60,4 +60,12 @@ public interface IMobilePageDataService
      * @return 结果
      */
     public int deleteMobilePageDataById(Long id);
+
+    /**
+     * 设置为首页
+     * @param mobilePageData
+     * @return
+     */
+    int updateIsIndex(MobilePageData mobilePageData);
+
 }

zkqy-system/src/main/java/com/zkqy/system/service/IMobilePageTableListService.java

@@ -0,0 +1,64 @@
+package com.zkqy.system.service;
+
+
+
+import com.zkqy.system.entity.MobilePageTableList;
+
+import java.util.List;
+
+/**
+ * 页面列表Service接口
+ * 
+ * @author zkqy
+ * @date 2024-05-21
+ */
+public interface IMobilePageTableListService 
+{
+    /**
+     * 查询页面列表
+     * 
+     * @param id 页面列表主键
+     * @return 页面列表
+     */
+    public MobilePageTableList selectMobilePageTableListById(Long id);
+
+    /**
+     * 查询页面列表列表
+     * 
+     * @param mobilePageTableList 页面列表
+     * @return 页面列表集合
+     */
+    public List<MobilePageTableList> selectMobilePageTableListList(MobilePageTableList mobilePageTableList);
+
+    /**
+     * 新增页面列表
+     * 
+     * @param mobilePageTableList 页面列表
+     * @return 结果
+     */
+    public int insertMobilePageTableList(MobilePageTableList mobilePageTableList);
+
+    /**
+     * 修改页面列表
+     * 
+     * @param mobilePageTableList 页面列表
+     * @return 结果
+     */
+    public int updateMobilePageTableList(MobilePageTableList mobilePageTableList);
+
+    /**
+     * 批量删除页面列表
+     * 
+     * @param ids 需要删除的页面列表主键集合
+     * @return 结果
+     */
+    public int deleteMobilePageTableListByIds(Long[] ids);
+
+    /**
+     * 删除页面列表信息
+     * 
+     * @param id 页面列表主键
+     * @return 结果
+     */
+    public int deleteMobilePageTableListById(Long id);
+}

zkqy-system/src/main/java/com/zkqy/system/service/impl/MobilePageDataServiceImpl.java

@@ -2,11 +2,15 @@ package com.zkqy.system.service.impl;
 
 import java.util.List;
 
+import com.zkqy.common.utils.StringUtils;
 import com.zkqy.system.entity.MobilePageData;
+import com.zkqy.system.entity.MobilePageTableList;
+import com.zkqy.system.mapper.MobilePageTableListMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zkqy.system.mapper.MobilePageDataMapper;
 import com.zkqy.system.service.IMobilePageDataService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 移动端数据Service业务层处理
@@ -20,6 +24,8 @@ public class MobilePageDataServiceImpl implements IMobilePageDataService
     @Autowired
     private MobilePageDataMapper mobilePageDataMapper;
 
+    @Autowired
+    private MobilePageTableListMapper mobilePageTableListMapper;
     /**
      * 查询移动端数据
      * 
@@ -29,7 +35,12 @@ public class MobilePageDataServiceImpl implements IMobilePageDataService
     @Override
     public MobilePageData selectMobilePageDataById(Long id)
     {
-        return mobilePageDataMapper.selectMobilePageDataById(id);
+        MobilePageData mobilePageData = mobilePageDataMapper.selectMobilePageDataById(id);
+        if(mobilePageData.getIsExistsList().equals("true")){
+            MobilePageTableList mobilePageTableList = mobilePageTableListMapper.selectMobilePageTableListByPageId(mobilePageData.getId());
+            mobilePageData.setMobilePageTableList(mobilePageTableList);
+        }
+        return mobilePageData;
     }
 
     /**
@@ -51,9 +62,18 @@ public class MobilePageDataServiceImpl implements IMobilePageDataService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertMobilePageData(MobilePageData mobilePageData)
     {
-        return mobilePageDataMapper.insertMobilePageData(mobilePageData);
+        mobilePageData.setIsIndex("false");
+        String isExistsList = mobilePageData.getIsExistsList();
+        int i = mobilePageDataMapper.insertMobilePageData(mobilePageData);
+        if(StringUtils.isNotNull(isExistsList)&&isExistsList.equals("true")){ //如果存在list集合页面就新增list表格数据
+            mobilePageData.getMobilePageTableList().setPageId(mobilePageData.getId());
+            mobilePageTableListMapper.insertMobilePageTableList(mobilePageData.getMobilePageTableList());
+        }
+        //测试这里有问题嘛?
+        return 1;
     }
 
     /**
@@ -63,8 +83,12 @@ public class MobilePageDataServiceImpl implements IMobilePageDataService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateMobilePageData(MobilePageData mobilePageData)
     {
+        if (mobilePageData.getIsExistsList().equals("true")) {
+            mobilePageTableListMapper.updateMobilePageTableList(mobilePageData.getMobilePageTableList());
+        }
         return mobilePageDataMapper.updateMobilePageData(mobilePageData);
     }
 
@@ -87,8 +111,25 @@ public class MobilePageDataServiceImpl implements IMobilePageDataService
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteMobilePageDataById(Long id)
     {
+        MobilePageData mobilePageData = mobilePageDataMapper.selectMobilePageDataById(id);
+        if(mobilePageData.getIsExistsList().equals("true")){
+            int i = mobilePageTableListMapper.deleteMobilePageTableListByPageId(id);
+        }
         return mobilePageDataMapper.deleteMobilePageDataById(id);
     }
+
+
+    @Override
+    @Transactional
+    public int updateIsIndex(MobilePageData mobilePageData) {
+        //先把等于true的改为false
+        int i = mobilePageDataMapper.updateIsIndexFalse(mobilePageData);
+        //当前的在改为true
+        mobilePageData.setIsIndex("true");
+        int i1 = mobilePageDataMapper.updateMobilePageData(mobilePageData);
+        return i1;
+    }
 }

zkqy-system/src/main/java/com/zkqy/system/service/impl/MobilePageTableListServiceImpl.java

@@ -0,0 +1,98 @@
+package com.zkqy.system.service.impl;
+
+
+import com.zkqy.common.utils.DateUtils;
+import com.zkqy.system.entity.MobilePageTableList;
+import com.zkqy.system.mapper.MobilePageTableListMapper;
+import com.zkqy.system.service.IMobilePageTableListService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 页面列表Service业务层处理
+ * 
+ * @author zkqy
+ * @date 2024-05-21
+ */
+@Service
+public class MobilePageTableListServiceImpl implements IMobilePageTableListService
+{
+    @Autowired
+    private MobilePageTableListMapper mobilePageTableListMapper;
+
+    /**
+     * 查询页面列表
+     * 
+     * @param id 页面列表主键
+     * @return 页面列表
+     */
+    @Override
+    public MobilePageTableList selectMobilePageTableListById(Long id)
+    {
+        return mobilePageTableListMapper.selectMobilePageTableListById(id);
+    }
+
+    /**
+     * 查询页面列表列表
+     * 
+     * @param mobilePageTableList 页面列表
+     * @return 页面列表
+     */
+    @Override
+    public List<MobilePageTableList> selectMobilePageTableListList(MobilePageTableList mobilePageTableList)
+    {
+        return mobilePageTableListMapper.selectMobilePageTableListList(mobilePageTableList);
+    }
+
+    /**
+     * 新增页面列表
+     * 
+     * @param mobilePageTableList 页面列表
+     * @return 结果
+     */
+    @Override
+    public int insertMobilePageTableList(MobilePageTableList mobilePageTableList)
+    {
+        mobilePageTableList.setCreateTime(DateUtils.getNowDate());
+        return mobilePageTableListMapper.insertMobilePageTableList(mobilePageTableList);
+    }
+
+    /**
+     * 修改页面列表
+     * 
+     * @param mobilePageTableList 页面列表
+     * @return 结果
+     */
+    @Override
+    public int updateMobilePageTableList(MobilePageTableList mobilePageTableList)
+    {
+        mobilePageTableList.setUpdateTime(DateUtils.getNowDate());
+        return mobilePageTableListMapper.updateMobilePageTableList(mobilePageTableList);
+    }
+
+    /**
+     * 批量删除页面列表
+     * 
+     * @param ids 需要删除的页面列表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMobilePageTableListByIds(Long[] ids)
+    {
+        return mobilePageTableListMapper.deleteMobilePageTableListByIds(ids);
+    }
+
+    /**
+     * 删除页面列表信息
+     * 
+     * @param id 页面列表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMobilePageTableListById(Long id)
+    {
+        return mobilePageTableListMapper.deleteMobilePageTableListById(id);
+    }
+}

zkqy-system/src/main/resources/mapper/dragmapper/DragFormMapper.xml

@@ -211,7 +211,7 @@
     </select>
 
     <select id="selectDragFormListCount" resultType="java.lang.Integer">
-        select count(f_id) from {DBNAME}.drag_form
+        select count(f_id) from {DBNAME}.drag_form where del_flag = 0
     </select>
 
 

zkqy-system/src/main/resources/mapper/dragmapper/DragTableMapper.xml

@@ -224,8 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item}
         </foreach>
     </select>
-
     <select id="selectDragTableListCount" resultType="java.lang.Integer">
-        SELECT count(t_id) FROM {DBNAME}.drag_table
+        SELECT count(t_id) FROM {DBNAME}.drag_table where del_flag = '0'
     </select>
 </mapper>

zkqy-system/src/main/resources/mapper/mobile/MobilePageDataMapper.xml

@@ -7,20 +7,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.zkqy.system.entity.MobilePageData" id="MobilePageDataResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
-        <result property="templateJson"    column="templateJson"    />
-        <result property="component"    column="component"    />
+        <result property="pageJson"    column="pageJson"    />
+        <result property="isIndex"    column="isIndex"    />
+        <result property="fromMapDb"    column="from_map_db"    />
+        <result property="selectQualifiedField"    column="select_qualified_field"    />
+        <result property="selectMapValueList"    column="select_map_value_list"    />
+        <result property="isExistsList"    column="is_exists_list"    />
     </resultMap>
 
     <sql id="selectMobilePageDataVo">
-        select id, name, templateJson, component from mobile_page_data
+        select id, name, pageJson,isIndex,from_map_db,select_qualified_field,select_map_value_list,is_exists_list from {DBNAME}.mobile_page_data
     </sql>
 
     <select id="selectMobilePageDataList" parameterType="com.zkqy.system.entity.MobilePageData" resultMap="MobilePageDataResult">
         <include refid="selectMobilePageDataVo"/>
         <where>  
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="templateJson != null  and templateJson != ''"> and templateJson = #{templateJson}</if>
-            <if test="component != null  and component != ''"> and component = #{component}</if>
+            <if test="pageJson != null  and pageJson != ''"> and pageJson = #{pageJson}</if>
+            <if test="isIndex != null  and isIndex != ''"> and isIndex = #{isIndex}</if>
         </where>
     </select>
     
@@ -30,35 +34,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertMobilePageData" parameterType="com.zkqy.system.entity.MobilePageData" useGeneratedKeys="true" keyProperty="id">
-        insert into mobile_page_data
+        insert into {DBNAME}.mobile_page_data
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null">name,</if>
-            <if test="templateJson != null">templateJson,</if>
-            <if test="component != null">component,</if>
+            <if test="name != null">`name`,</if>
+            <if test="pageJson != null">pageJson,</if>
+            <if test="isIndex !=null">isIndex,</if>
+            <if test="fromMapDb!=null and fromMapDb!=''">from_map_db,</if>
+            <if test="selectQualifiedField!=null and selectQualifiedField!=''">select_qualified_field,</if>
+            <if test="selectMapValueList!=null and selectMapValueList!='' ">select_map_value_list</if>
+            <if test="isExistsList!=null and isExistsList!='' ">is_exists_list</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
-            <if test="templateJson != null">#{templateJson},</if>
-            <if test="component != null">#{component},</if>
+            <if test="pageJson != null">#{pageJson},</if>
+            <if test="isIndex!=null">#{isIndex},</if>
+            <if test="fromMapDb!=null">#{fromMapDb},</if>
+            <if test="selectQualifiedField!=null">#{selectQualifiedField},</if>
+            <if test="selectMapValueList!=null">#{selectMapValueList}</if>
+            <if test="isExistsList!=null and isExistsList!='' ">#{isExistsList}</if>
          </trim>
     </insert>
 
     <update id="updateMobilePageData" parameterType="com.zkqy.system.entity.MobilePageData">
-        update mobile_page_data
+        update {DBNAME}.mobile_page_data
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
-            <if test="templateJson != null">templateJson = #{templateJson},</if>
-            <if test="component != null">component = #{component},</if>
+            <if test="pageJson != null">pageJson = #{pageJson},</if>
+            <if test="isIndex !=null">isIndex =#{isIndex},</if>
+            <if test="fromMapDb!=null">from_map_db=#{fromMapDb},</if>
+            <if test="selectQualifiedField!=null">select_qualified_field=#{selectQualifiedField},</if>
+            <if test="selectMapValueList!=null">select_map_value_list=#{selectMapValueList}</if>
+            <if test="isExistsList!=null and isExistsList!='' ">is_exists_list=#{isExistsList}</if>
         </trim>
         where id = #{id}
     </update>
 
+    <update id="updateIsIndexFalse">
+        update {DBNAME}.mobile_page_data
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="isIndex !=null">isIndex ='false'</if>
+        </trim>
+        where isIndex = 'true'
+    </update>
+
     <delete id="deleteMobilePageDataById" parameterType="Long">
-        delete from mobile_page_data where id = #{id}
+        delete from {DBNAME}.mobile_page_data where id = #{id}
     </delete>
 
     <delete id="deleteMobilePageDataByIds" parameterType="String">
-        delete from mobile_page_data where id in 
+        delete from {DBNAME}.mobile_page_data where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

zkqy-system/src/main/resources/mapper/mobile/MobilePageTableListMapper.xml

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zkqy.system.mapper.MobilePageTableListMapper">
+    
+    <resultMap type="com.zkqy.system.entity.MobilePageTableList" id="MobilePageTableListResult">
+        <result property="id"    column="id"    />
+        <result property="pageId"    column="page_id"    />
+        <result property="tableNameDes"    column="table_name_des"    />
+        <result property="isSingleTable"    column="isSingleTable"    />
+        <result property="tableNames"    column="table_names"    />
+        <result property="tableColumnName"    column="table_column_name"    />
+        <result property="tableColumnDesc"    column="table_column_desc"    />
+        <result property="tableJoin"    column="table_join"    />
+        <result property="tableQueryConditions"    column="table_query_conditions"    />
+        <result property="timeRangeFilters"    column="timeRangeFilters"    />
+        <result property="tablelistSort"    column="tablelistSort"    />
+        <result property="listMapValue"    column="list_map_value"    />
+        <result property="extensions"    column="extensions"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createById"    column="create_by_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateById"    column="update_by_id"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectMobilePageTableListVo">
+        select id, page_id, table_name_des, isSingleTable, table_names, table_column_name, table_column_desc, table_join, table_query_conditions, timeRangeFilters, tablelistSort, list_map_value, extensions, create_time, create_by_id, create_by, update_by, update_by_id, update_time from {DBNAME}.mobile_page_table_list
+    </sql>
+
+    <select id="selectMobilePageTableListList" parameterType="com.zkqy.system.entity.MobilePageTableList" resultMap="MobilePageTableListResult">
+        <include refid="selectMobilePageTableListVo"/>
+        <where>  
+            <if test="pageId != null "> and page_id = #{pageId}</if>
+            <if test="tableNameDes != null  and tableNameDes != ''"> and table_name_des = #{tableNameDes}</if>
+            <if test="isSingleTable != null  and isSingleTable != ''"> and isSingleTable = #{isSingleTable}</if>
+            <if test="tableNames != null  and tableNames != ''"> and table_names = #{tableNames}</if>
+            <if test="tableColumnName != null  and tableColumnName != ''"> and table_column_name like concat('%', #{tableColumnName}, '%')</if>
+            <if test="tableColumnDesc != null  and tableColumnDesc != ''"> and table_column_desc = #{tableColumnDesc}</if>
+            <if test="tableJoin != null  and tableJoin != ''"> and table_join = #{tableJoin}</if>
+            <if test="tableQueryConditions != null  and tableQueryConditions != ''"> and table_query_conditions = #{tableQueryConditions}</if>
+            <if test="timeRangeFilters != null  and timeRangeFilters != ''"> and timeRangeFilters = #{timeRangeFilters}</if>
+            <if test="tablelistSort != null  and tablelistSort != ''"> and tablelistSort = #{tablelistSort}</if>
+            <if test="listMapValue != null  and listMapValue != ''"> and list_map_value = #{listMapValue}</if>
+            <if test="extensions != null  and extensions != ''"> and extensions = #{extensions}</if>
+            <if test="createById != null "> and create_by_id = #{createById}</if>
+            <if test="updateById != null "> and update_by_id = #{updateById}</if>
+        </where>
+    </select>
+    
+    <select id="selectMobilePageTableListById" parameterType="Long" resultMap="MobilePageTableListResult">
+        <include refid="selectMobilePageTableListVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectMobilePageTableListByPageId" parameterType="Long" resultMap="MobilePageTableListResult">
+        <include refid="selectMobilePageTableListVo"/>
+        where page_id = #{pageId}
+    </select>
+        
+    <insert id="insertMobilePageTableList" parameterType="com.zkqy.system.entity.MobilePageTableList">
+        insert into {DBNAME}.mobile_page_table_list
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="pageId != null">page_id,</if>
+            <if test="tableNameDes != null">table_name_des,</if>
+            <if test="isSingleTable != null">isSingleTable,</if>
+            <if test="tableNames != null">table_names,</if>
+            <if test="tableColumnName != null">table_column_name,</if>
+            <if test="tableColumnDesc != null">table_column_desc,</if>
+            <if test="tableJoin != null">table_join,</if>
+            <if test="tableQueryConditions != null">table_query_conditions,</if>
+            <if test="timeRangeFilters != null">timeRangeFilters,</if>
+            <if test="tablelistSort != null">tablelistSort,</if>
+            <if test="listMapValue != null">list_map_value,</if>
+            <if test="extensions != null">extensions,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createById != null">create_by_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateById != null">update_by_id,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="pageId != null">#{pageId},</if>
+            <if test="tableNameDes != null">#{tableNameDes},</if>
+            <if test="isSingleTable != null">#{isSingleTable},</if>
+            <if test="tableNames != null">#{tableNames},</if>
+            <if test="tableColumnName != null">#{tableColumnName},</if>
+            <if test="tableColumnDesc != null">#{tableColumnDesc},</if>
+            <if test="tableJoin != null">#{tableJoin},</if>
+            <if test="tableQueryConditions != null">#{tableQueryConditions},</if>
+            <if test="timeRangeFilters != null">#{timeRangeFilters},</if>
+            <if test="tablelistSort != null">#{tablelistSort},</if>
+            <if test="listMapValue != null">#{listMapValue},</if>
+            <if test="extensions != null">#{extensions},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createById != null">#{createById},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateById != null">#{updateById},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateMobilePageTableList" parameterType="com.zkqy.system.entity.MobilePageTableList">
+        update {DBNAME}.mobile_page_table_list
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="pageId != null">page_id = #{pageId},</if>
+            <if test="tableNameDes != null">table_name_des = #{tableNameDes},</if>
+            <if test="isSingleTable != null">isSingleTable = #{isSingleTable},</if>
+            <if test="tableNames != null">table_names = #{tableNames},</if>
+            <if test="tableColumnName != null">table_column_name = #{tableColumnName},</if>
+            <if test="tableColumnDesc != null">table_column_desc = #{tableColumnDesc},</if>
+            <if test="tableJoin != null">table_join = #{tableJoin},</if>
+            <if test="tableQueryConditions != null">table_query_conditions = #{tableQueryConditions},</if>
+            <if test="timeRangeFilters != null">timeRangeFilters = #{timeRangeFilters},</if>
+            <if test="tablelistSort != null">tablelistSort = #{tablelistSort},</if>
+            <if test="listMapValue != null">list_map_value = #{listMapValue},</if>
+            <if test="extensions != null">extensions = #{extensions},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createById != null">create_by_id = #{createById},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateById != null">update_by_id = #{updateById},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteMobilePageTableListById" parameterType="Long">
+        delete from {DBNAME}.mobile_page_table_list where id = #{id}
+    </delete>
+
+    <delete id="deleteMobilePageTableListByIds" parameterType="String">
+        delete from {DBNAME}.mobile_page_table_list where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteMobilePageTableListByPageId">
+        delete from {DBNAME}.mobile_page_table_list where page_id = #{id}
+    </delete>
+</mapper>