Commit 2b8dded2 authored by rjb's avatar rjb

修订

parent b3c47c16
...@@ -18,6 +18,11 @@ ...@@ -18,6 +18,11 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency> </dependency>
...@@ -31,6 +36,47 @@ ...@@ -31,6 +36,47 @@
<version>1.4.5.RELEASE</version> <version>1.4.5.RELEASE</version>
</dependency> </dependency>
<!-- easy-poi -->
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-web</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>2.0.5</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.7</version>
</dependency>
<!-- JSON -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.67_noneautotype2</version>
</dependency>
<dependency> <dependency>
<groupId>org.typroject</groupId> <groupId>org.typroject</groupId>
<artifactId>tyboot-core-foundation</artifactId> <artifactId>tyboot-core-foundation</artifactId>
...@@ -171,7 +217,6 @@ ...@@ -171,7 +217,6 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>${springboot.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
...@@ -185,13 +230,12 @@ ...@@ -185,13 +230,12 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>7</source> <source>8</source>
<target>7</target> <target>8</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
...@@ -37,13 +37,17 @@ public class TplCateResource { ...@@ -37,13 +37,17 @@ public class TplCateResource {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增") @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<TplCateModel> save(@RequestBody TplCateModel model) public ResponseModel<TplCateModel> save(@RequestBody TplCateModel model){
{
model.setIcon(""); model.setIcon("");
model.setIsDelete(false); model.setIsDelete(false);
model.setSequenceNbr(null);
model= tplCateService.createWithModel(model); model= tplCateService.createWithModel(model);
return ResponseHelper.buildResponse(model); return ResponseHelper.buildResponse(model);
} }
/** /**
* 根据sequenceNbr更新 * 根据sequenceNbr更新
* @param sequenceNbr 主键 * @param sequenceNbr 主键
...@@ -109,6 +113,7 @@ public class TplCateResource { ...@@ -109,6 +113,7 @@ public class TplCateResource {
@GetMapping(value = "/tree") @GetMapping(value = "/tree")
@ApiOperation(httpMethod = "GET",value = "树形查询", notes = "树形查询") @ApiOperation(httpMethod = "GET",value = "树形查询", notes = "树形查询")
public ResponseModel<List<TplTreeModel>> selectForTree(){ public ResponseModel<List<TplTreeModel>> selectForTree(){
return ResponseHelper.buildResponse(designerService.getList()); return ResponseHelper.buildResponse(designerService.getList());
} }
......
...@@ -2,9 +2,12 @@ package com.yeejoin.amos.api.tool.controller; ...@@ -2,9 +2,12 @@ package com.yeejoin.amos.api.tool.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.api.tool.face.model.TplListModel; import com.yeejoin.amos.api.tool.face.model.TplListModel;
import com.yeejoin.amos.api.tool.face.model.TplVoModel;
import com.yeejoin.amos.api.tool.face.service.TplListService; import com.yeejoin.amos.api.tool.face.service.TplListService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.beanutils.ConvertUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
...@@ -29,74 +32,165 @@ public class TplListResource { ...@@ -29,74 +32,165 @@ public class TplListResource {
/** /**
* 新增 * 新增
*
* @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增") @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<TplListModel> save(@RequestBody TplListModel model) public ResponseModel<TplListModel> save(@RequestBody TplVoModel tplVoModel) throws Exception {
{ tplVoModel.setIsDel(false);
model.setDisplayName(""); tplVoModel.setDisplayName(tplVoModel.getComName());
model.setIsDelete(false); TplListModel tplListModel = new TplListModel();
model= tplListService.createWithModel(model); BeanUtils.copyProperties(tplVoModel, tplListModel, "thumbs", "sketches");
return ResponseHelper.buildResponse(model); if (tplVoModel.getThumbs().size() != 0)
tplListModel.setThumb(tplVoModel.getThumbs().get(0).getUrl());
if (tplVoModel.getSketches().size() != 0)
tplListModel.setSketch(tplVoModel.getSketches().get(0).getUrl());
tplListModel = tplListService.createWithModel(tplListModel);
return ResponseHelper.buildResponse(tplListModel);
} }
/** /**
* 根据sequenceNbr更新 * 根据sequenceNbr更新
*
* @param sequenceNbr 主键 * @param sequenceNbr 主键
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PutMapping(value = "/{sequenceNbr}") @PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<TplListModel> updateBySequenceNbrTplList(@RequestBody TplListModel model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<TplListModel> updateBySequenceNbrTplList(@RequestBody TplVoModel tplVoModel, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr); tplVoModel.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(tplListService.updateWithModel(model)); tplVoModel.setDisplayName(tplVoModel.getComName());
TplListModel tplListModel = new TplListModel();
BeanUtils.copyProperties(tplVoModel, tplListModel, "thumbs", "sketches");
if (tplVoModel.getThumbs().size() != 0)
tplListModel.setThumb(tplVoModel.getThumbs().get(0).getUrl());
if (tplVoModel.getSketches().size() != 0)
tplListModel.setSketch(tplVoModel.getSketches().get(0).getUrl());
return ResponseHelper.buildResponse(tplListService.updateWithModel(tplListModel));
} }
/** /**
* 根据sequenceNbr删除 * 根据sequenceNbr删除
*
* @param sequenceNbr 主键 * @param sequenceNbr 主键
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@DeleteMapping(value = "/{sequenceNbr}") @DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除") @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){ public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(tplListService.removeById(sequenceNbr)); return ResponseHelper.buildResponse(tplListService.removeById(sequenceNbr));
} }
/** /**
* 根据sequenceNbr批量删除
*
* @param sequenceNbr 主键
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@DeleteMapping(value = "/s/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "批量删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean[]> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") String sequenceNbr) {
String Nbr[] = sequenceNbr.split(",");
Long[] seq = (Long[])ConvertUtils.convert(Nbr, Long.class);
Boolean Nbr2[] = new Boolean[Nbr.length];
for (int i = 0;i < Nbr.length;i++){
Nbr2[i] = tplListService.removeById(seq[i]);
}
return ResponseHelper.buildResponse(Nbr2);
}
/**
* 根据sequenceNbr查询 * 根据sequenceNbr查询
* @param sequenceNbr 主键 *
* @param sequenceNbr 主键
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<TplListModel> seleteOne(@PathVariable Long sequenceNbr) public ResponseModel<TplListModel> selectOne(@PathVariable Long sequenceNbr) {
{
return ResponseHelper.buildResponse(tplListService.queryBySeq(sequenceNbr)); return ResponseHelper.buildResponse(tplListService.queryBySeq(sequenceNbr));
} }
/** /**
* 列表分页查询 * 列表分页查询
*@param current 当前页 *
*@param current 每页大小 * @param current 当前页
* @param size 每页大小
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/page") @GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询") @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<Page<TplListModel>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size, @RequestParam(value = "categorySeq") Long categorySeq) public ResponseModel<Page<TplListModel>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size, @RequestParam(value = "categorySeq") Long categorySeq, @RequestParam(value = "displayName", required = false) String displayName) {
{ Page<TplListModel> page = new Page<>();
Page<TplListModel> page=new Page<TplListModel>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(tplListService.queryForTplListPage(page, categorySeq)); return ResponseHelper.buildResponse(tplListService.queryForTplListPage(page, categorySeq, displayName));
} }
/** /**
*列表全部数据查询 * 列表全部数据查询
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public ResponseModel<List<TplListModel>> selectForList() public ResponseModel<List<TplListModel>> selectForList() {
{
return ResponseHelper.buildResponse(tplListService.queryForTplListList()); return ResponseHelper.buildResponse(tplListService.queryForTplListList());
} }
}
// /**
// *excel导入
// *@return
// */
// @CrossOrigin
// @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
// @ApiOperation(httpMethod = "POST",value = "导入", notes = "导入")
// @PostMapping(value = "/import")
// public ResponseModel<List<FileImportModel>> importTpl(@RequestParam("file") MultipartFile multipartFile) throws Exception {
// ImportParams params = new ImportParams();
//// params.setHeadRows(0);
// params.setTitleRows(0);
// List<FileImportModel> fileImportModels =
// ExcelImportUtil.importExcel(multipartFile.getInputStream(), FileImportModel.class, params);
// for(FileImportModel fileImportModel:fileImportModels){
// if(fileImportModel.getSequenceNbr() == null)
// break;
// TplListModel tplListModel = new TplListModel();
// BeanUtils.copyProperties(fileImportModel,tplListModel);
// tplListModel = tplListService.createWithModel(tplListModel);
// }
// System.out.println(fileImportModels);
// return ResponseHelper.buildResponse(fileImportModels);
// }
// /**
// * 导入
// */
// @CrossOrigin
// @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
// @ApiOperation(httpMethod = "POST",value = "导入", notes = "导入")
// @PostMapping(value = "/import")
// public static JSONArray getJSONArray(String url) {
// // input存放json内容
// String input = null;
//
// // 读取json文件
// File myFile = new File(url);
// try {
// input = FileUtils.readFileToString(myFile, "UTF-8");
// } catch (IOException e) {
// e.printStackTrace();
// }
//
// // 将数组json转换为JSON数组对象
// JSONArray jsonArray = JSON.parseArray(input);
//
// return jsonArray;
// }
}
\ No newline at end of file
//package com.yeejoin.amos.api.tool.face.model;
//
//import cn.afterturn.easypoi.excel.annotation.Excel;
//import lombok.Data;
//
//import java.util.Date;
//
//@Data
//public class FileImportModel {
//
// @Excel(name = "SEQUENCE_NBR")
// private Long sequenceNbr;
//
// @Excel(name = "DISPLAY_NAME")
// private String displayName;
//
// @Excel(name = "COMPONENT_KEY")
// private String comKey;
//
// @Excel(name = "COMPONENT_NAME")
// private String comName;
//
// @Excel(name = "CONTENT")
// private String content;
//
// @Excel(name = "CATEGORY_SEQ")
// private Long cateSeq;
//
// @Excel(name = "THUMB")
// private String thumb;
//
// @Excel(name = "SKETCH")
// private String sketch;
//
// @Excel(name = "IS_DELETE")
// private Boolean isDel;
//
// @Excel(name = "OPEN_STATUS")
// private Boolean openStatus;
//
// @Excel(name = "REC_DATE",format = "yyyy-MM-dd HH:mm:ss")
// private Date recDate;
//
// @Excel(name = "REC_USER_ID")
// private String recUserId;
//
// private String fileName;
//
//}
package com.yeejoin.amos.api.tool.face.model;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
public class PicModel {
private String name;
private String uid;
private String url;
private String status;
}
...@@ -3,50 +3,30 @@ package com.yeejoin.amos.api.tool.face.model; ...@@ -3,50 +3,30 @@ package com.yeejoin.amos.api.tool.face.model;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.typroject.tyboot.core.rdbms.model.BaseModel; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @author r
*/
@Data @Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="TplListModel", description="")
public class TplListModel extends TplVoModel {
@ApiModel(value = "TplListModel", description = "")
public class TplListModel extends BaseModel {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "模板名称")
private String componentName;
@ApiModelProperty(value = "模板状态")
private Boolean openStatus;
@ApiModelProperty(value = "模板_名称")
private String displayName;
@ApiModelProperty(value = "效果图")
private String sketch;
@ApiModelProperty(value = "缩略图") @ApiModelProperty(value = "缩略图")
private String thumb; private String thumb;
@ApiModelProperty(value = "模板标识") @ApiModelProperty(value = "效果图")
private String componentKey; private String sketch;
// @ApiModelProperty(value = "模板内容")
// private String content;
@ApiModelProperty(value = "分类ID")
private String categorySeq;
@ApiModelProperty(value = "是否删除") public void setThumb(String thumb) {
private Boolean isDelete; this.thumb = thumb ;
}
@ApiModelProperty(value = "ID") public void setSketch(String sketch) {
private String recUserId; this.sketch = sketch;
}
@ApiModelProperty(value = "日期")
private Date recDate;
} }
package com.yeejoin.amos.api.tool.face.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.typroject.tyboot.core.rdbms.model.BaseModel;
import java.util.ArrayList;
import java.util.List;
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="TplVoModel", description="")
@JsonIgnoreProperties({"hibernateLazyInitializer","handler"})
public class TplVoModel extends BaseModel {
@ApiModelProperty(value = "展示名称")
public String displayName;
@ApiModelProperty(value = "模板标识")
public String comKey;
@ApiModelProperty(value = "模板名称")
public String comName;
@ApiModelProperty(value = "模板内容")
public String content;
@ApiModelProperty(value = "分类ID")
public Long cateSeq;
@ApiModelProperty(value = "模板状态")
public Boolean openStatus;
@ApiModelProperty(value = "缩略图")
private List<PicModel> thumbs = new ArrayList<>();
@ApiModelProperty(value = "效果图")
private List<PicModel> sketches = new ArrayList<>();
@ApiModelProperty(value = "是否删除")
public Boolean isDel;
public void setIsDel(Boolean isDel) {
this.isDel = isDel;
}
public String getComName() {
return comName;
}
public void setDisplayName(String displayName) {
this.displayName = displayName;
}
}
...@@ -18,6 +18,11 @@ public class TplCate extends BaseEntity { ...@@ -18,6 +18,11 @@ public class TplCate extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
*设计器名称
*/
@TableField(exist = false)
private String designerName;
/**
*所属模板分类 *所属模板分类
*/ */
@TableField("CATEGORY_NAME") @TableField("CATEGORY_NAME")
...@@ -41,11 +46,7 @@ public class TplCate extends BaseEntity { ...@@ -41,11 +46,7 @@ public class TplCate extends BaseEntity {
@TableField("IS_DELETE") @TableField("IS_DELETE")
private Boolean isDelete; private Boolean isDelete;
/**
*设计器名称
*/
@TableField(exist = false)
private String designerName;
/** /**
*图标 *图标
......
package com.yeejoin.amos.api.tool.face.orm.entity; package com.yeejoin.amos.api.tool.face.orm.entity;
import com.baomidou.mybatisplus.annotation.SqlCondition;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
...@@ -7,40 +8,48 @@ import lombok.EqualsAndHashCode; ...@@ -7,40 +8,48 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity; import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
/**
* @author r
*/
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("studio_template") @TableName("studio_template")
public class TplList extends BaseEntity { public class TplList extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
*展示名称
*/
@TableField(value = "DISPLAY_NAME",condition = SqlCondition.LIKE)
private String displayName;
/**
*模板标识
*/
@TableField("COMPONENT_KEY")
private String comKey;
/** /**
*模板名称 *模板名称
*/ */
@TableField("COMPONENT_NAME") @TableField("COMPONENT_NAME")
private String componentName; private String comName;
/** /**
*模板名称 *模板内容
*/ */
@TableField("DISPLAY_NAME") @TableField("CONTENT")
private String displayName; private String content;
/** /**
*模板状态 *分类ID
*/ */
@TableField("OPEN_STATUS") @TableField("CATEGORY_SEQ")
private Boolean openStatus; private Long cateSeq;
/** /**
*效果图 *模板状态
*/ */
@TableField("SKETCH") @TableField("OPEN_STATUS")
private String sketch; private Boolean openStatus;
/** /**
*缩略图 *缩略图
...@@ -49,28 +58,14 @@ public class TplList extends BaseEntity { ...@@ -49,28 +58,14 @@ public class TplList extends BaseEntity {
private String thumb; private String thumb;
/** /**
*模板标识 *状态图
*/
@TableField("COMPONENT_KEY")
private String componentKey;
/**
*分类ID
*/ */
@TableField("CATEGORY_SEQ") @TableField("SKETCH")
private String categorySeq; private String sketch;
// /**
// *模板内容
// */
// @TableField("CONTENT")
// private String content;
/** /**
*是否删除 *是否删除
*/ */
@TableField("IS_DELETE") @TableField("IS_DELETE")
private Boolean isDelete; private Boolean isDel;
} }
...@@ -7,6 +7,8 @@ import com.yeejoin.amos.api.tool.face.orm.entity.TplList; ...@@ -7,6 +7,8 @@ import com.yeejoin.amos.api.tool.face.orm.entity.TplList;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.util.List; import java.util.List;
/** /**
* 服务实现类 * 服务实现类
...@@ -18,8 +20,8 @@ public class TplListService extends BaseService<TplListModel, TplList, TplListMa ...@@ -18,8 +20,8 @@ public class TplListService extends BaseService<TplListModel, TplList, TplListMa
/** /**
* 分页查询 * 分页查询
*/ */
public Page<TplListModel> queryForTplListPage(Page<TplListModel> page,Long categorySeq) { public Page<TplListModel> queryForTplListPage(Page<TplListModel> page, Long categorySeq, String displayName) {
return this.queryForPage(page, null, false,categorySeq); return this.queryForPage(page, null, false,categorySeq,displayName);
} }
/** /**
...@@ -28,10 +30,10 @@ public class TplListService extends BaseService<TplListModel, TplList, TplListMa ...@@ -28,10 +30,10 @@ public class TplListService extends BaseService<TplListModel, TplList, TplListMa
public List<TplListModel> queryForTplListList() { public List<TplListModel> queryForTplListList() {
return this.queryForList("" , false); return this.queryForList("" , false);
} }
//
// public String querycategorySeqBySeq(long sequenceNbr){ private String readLocalJSONFile(String path) throws FileNotFoundException {
// FileReader fileReader = new FileReader("static/test.json");
// TplListModel model = this.queryModelByParams(sequenceNbr); return fileReader.toString();
// return model.getCategorySeq(); }
// }
} }
<?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.yeejoin.amos.api.tool.face.orm.dao.AmosDemoMapper">
</mapper>
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