Commit 102c3e5d authored by chenzai's avatar chenzai

换数据库

parent 31ec1ff0
......@@ -104,7 +104,7 @@ public class TemplateResource {
* @param displayName 模板名称
* @return Page<TemplateModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<Page<TemplateModel>> queryForPage(
......
......@@ -8,6 +8,7 @@ import com.yeejoin.amos.api.tool.face.orm.entity.TemplateCategory;
import com.yeejoin.amos.feign.privilege.Privilege;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
......@@ -72,11 +73,12 @@ public class TemplateCategoryService extends BaseService<TemplateCategoryModel,
* 修改后
*/
jdbcTemplate=new JdbcTemplate(dataSource);
List<TemplateCategoryModel> templateCategoryModels = jdbcTemplate.queryForList("select * from studio_template_category", TemplateCategoryModel.class);
// List<TemplateCategoryModel> templateCategoryModels = this.queryForTplCateList();
List<TemplateCategoryModel> templateCategoryModels = jdbcTemplate.query("select * from studio_template_category", new Object[]{}, new BeanPropertyRowMapper<TemplateCategoryModel>(TemplateCategoryModel.class));
// List<TemplateCategoryModel> templateCategoryModels = this.queryForTplCateList();
List<TemplateCategoryTreeModel> nodes = this.tplCateToNode(templateCategoryModels);
List<VisualDesignerModel> visualDesignerLists = jdbcTemplate.queryForList("select * from studio_visual_designer", VisualDesignerModel.class);
List<VisualDesignerModel> visualDesignerLists = jdbcTemplate.query("select * from studio_visual_designer",new Object[]{},new BeanPropertyRowMapper<VisualDesignerModel>(VisualDesignerModel.class));
// List<VisualDesignerModel> visualDesignerLists = visualDesignerService.queryForVisualDesignerList();
nodes.addAll(visualDesignerService.VisualDesignerToNode(visualDesignerLists));
return getChildren(nodes, "", 0L);
......
......@@ -3,10 +3,7 @@ package com.yeejoin.amos.api.tool.face.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.api.tool.face.model.PictureModel;
import com.yeejoin.amos.api.tool.face.model.TemplateCategoryTreeModel;
import com.yeejoin.amos.api.tool.face.model.TemplateModel;
import com.yeejoin.amos.api.tool.face.model.TemplateVoModel;
import com.yeejoin.amos.api.tool.face.model.*;
import com.yeejoin.amos.api.tool.face.orm.dao.TemplateMapper;
import com.yeejoin.amos.api.tool.face.orm.entity.Template;
import com.yeejoin.amos.api.tool.utils.ConvertUtil;
......@@ -51,10 +48,8 @@ public class TemplateService extends BaseService<TemplateModel, Template, Templa
for (TemplateCategoryTreeModel visualDesigner : modelList) {
if (Objects.equals(categorySeq, visualDesigner.getSequenceNbr())) {
for (TemplateCategoryTreeModel category : visualDesigner.getChildren()) {
//studio_template
Long para[]=new Long[]{category.getSequenceNbr()};
List<TemplateModel> templateModels = jdbcTemplate.queryForList("select * from studio_template", para, TemplateModel.class);
List<TemplateModel> templateModels = jdbcTemplate.query("select * from studio_template",
new Long[]{category.getSequenceNbr()},new BeanPropertyRowMapper<TemplateModel>(TemplateModel.class));
// List<TemplateModel> templateModels = this.queryForTplListByCategorySeq(category.getSequenceNbr());
records.addAll(templateModels);
}
......@@ -72,7 +67,7 @@ public class TemplateService extends BaseService<TemplateModel, Template, Templa
String countSql = "SELECT COUNT(*) FROM studio_template WHERE category_seq = ? AND display_name = ?";
Long total = jdbcTemplate.queryForObject(countSql, Long.class, categorySeq, displayName);
// 查询分页数据
List<TemplateModel> data = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TemplateModel.class), params);
List<TemplateModel> data = jdbcTemplate.query(sql,params,new BeanPropertyRowMapper<>(TemplateModel.class));
// 构建Page对象
Page<TemplateModel> pageResult = new Page<>();
pageResult.setCurrent(pageSize);
......
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