增加pagemodel对象
diff --git a/leaveschool/basics-data/src/main/java/com/supwisdom/leaveschool/basicsdata/Repository/DictionaryTypeRepository.java b/leaveschool/basics-data/src/main/java/com/supwisdom/leaveschool/basicsdata/Repository/DictionaryTypeRepository.java
index eb72101..87e9292 100644
--- a/leaveschool/basics-data/src/main/java/com/supwisdom/leaveschool/basicsdata/Repository/DictionaryTypeRepository.java
+++ b/leaveschool/basics-data/src/main/java/com/supwisdom/leaveschool/basicsdata/Repository/DictionaryTypeRepository.java
@@ -1,41 +1,31 @@
-package com.supwisdom.leaveschool.basicsdata.Repository;
+package com.supwisdom.leaveschool.basicsdata.repository;
+import java.util.HashMap;
import java.util.Map;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.ExampleMatcher;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import com.supwisdom.leaveschool.basicsdata.domain.DictionaryType;
-import com.supwisdom.leaveschool.common.repository.BaseJpaRepository;
-import com.supwisdom.leaveschool.common.util.MapBeanUtils;
+import com.supwisdom.leaveschool.common.model.PageModel;
+import com.supwisdom.leaveschool.common.repository.SimpleBaseDao;
@Repository
-public interface DictionaryTypeRepository extends BaseJpaRepository<DictionaryType> {
-
- public default Page<DictionaryType> selectPageListByQuery(int pageIndex, int pageSize, Map<String, Object> mapBean) {
+public class DictionaryTypeRepository extends SimpleBaseDao{
- DictionaryType probe = new DictionaryType();
- ExampleMatcher matcher = ExampleMatcher.matching();
-// probe.setEnabled(true);
-// matcher.withMatcher("enabled", ExampleMatcher.GenericPropertyMatchers.exact());
- if (mapBean != null&&mapBean.keySet().size()>0) {
- probe.setName(MapBeanUtils.getString(mapBean, "name"));
- matcher.withMatcher("name", ExampleMatcher.GenericPropertyMatchers.contains());
- }
-//
-// matcher.withMatcher("code", ExampleMatcher.GenericPropertyMatchers.contains())
-// .withMatcher("name", ExampleMatcher.GenericPropertyMatchers.contains())
-// .withMatcher("enabled", ExampleMatcher.GenericPropertyMatchers.exact());
-
- PageRequest pageRequest = PageRequest.of(pageIndex, pageSize);
- Example<DictionaryType> example = Example.of(probe, matcher);
-
- Page<DictionaryType> page = this.findAll(example, pageRequest);
-
- return page;
- }
+ public PageModel<DictionaryType> getDictionaryTypePage(String name, int pageIndex,
+ int pageSize) {
+ Map<String,Object> params = new HashMap<String,Object>();
+ if(StringUtils.isNotBlank(name)){
+ name = StringUtils.trimToEmpty(name);
+ params.put("or upper(code) like ? ","%"+name.toUpperCase()+"%");
+ params.put("or name like ? ","%"+name+"%");
+ }
+ name="%"+name+"%";
+ String sql = "select * from TB_B_DICTIONARY_TYPE where upper(code) like ?1 or name like ?2";
+ return this.getScrollSqlData(DictionaryType.class, pageIndex, pageSize, sql, name,name);
+ }
+
+
}
diff --git a/leaveschool/basics-data/src/main/java/com/supwisdom/leaveschool/basicsdata/api/Api1DictionaryTypeController.java b/leaveschool/basics-data/src/main/java/com/supwisdom/leaveschool/basicsdata/api/Api1DictionaryTypeController.java
index 155e9a2..e88001b 100644
--- a/leaveschool/basics-data/src/main/java/com/supwisdom/leaveschool/basicsdata/api/Api1DictionaryTypeController.java
+++ b/leaveschool/basics-data/src/main/java/com/supwisdom/leaveschool/basicsdata/api/Api1DictionaryTypeController.java
@@ -1,17 +1,17 @@
package com.supwisdom.leaveschool.basicsdata.api;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
import org.springframework.http.HttpStatus;
import org.springframework.util.MimeTypeUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
-import com.supwisdom.leaveschool.basicsdata.Repository.DictionaryTypeRepository;
import com.supwisdom.leaveschool.basicsdata.domain.DictionaryType;
-import com.supwisdom.leaveschool.common.controller.api.CrudApiController;
+import com.supwisdom.leaveschool.basicsdata.repository.DictionaryTypeRepository;
+import com.supwisdom.leaveschool.common.model.PageModel;
import com.supwisdom.leaveschool.common.model.PagerRequestModel;
import com.supwisdom.leaveschool.common.model.PagerResponseModel;
@@ -23,31 +23,53 @@
@RestController
@RequestMapping("/api/v1/basics-data/dictionary-types")
@Api(value="字典表类型操作",tags={"字典表类型的操作接口"})
-public class Api1DictionaryTypeController extends CrudApiController<DictionaryType, DictionaryTypeRepository> {
+public class Api1DictionaryTypeController {
@Autowired
private DictionaryTypeRepository dictionaryTypeRepository;
- @Override
- protected DictionaryTypeRepository getRepository() {
- return dictionaryTypeRepository;
- }
- @GetMapping(path = "/page/sercher",produces = MimeTypeUtils.APPLICATION_JSON_VALUE)
+ @GetMapping(produces = MimeTypeUtils.APPLICATION_JSON_VALUE)
@ResponseStatus(value = HttpStatus.OK)
- @ApiOperation(value="根据查询条件获取字典表类型列表",notes="注意问题点")
+ @ApiOperation(value="获取字典表类型列表",notes="根据查询条件获取字典表类型列表")
@ApiImplicitParams({
- @ApiImplicitParam(name = "pageIndex", value = "当前第页数，默认0，为第一页", dataType = "int", required = true, defaultValue = "0"),
- @ApiImplicitParam(name = "pageSize", value = "每页条数，默认20", required = true, dataType = "int", paramType = "query", defaultValue = "20"),
- @ApiImplicitParam(name = "name", value = "类型码或名称", required = false, dataType = "string", paramType = "query", defaultValue = "")
+ @ApiImplicitParam(name = "pageIndex", value = "当前第页数，默认0，为第一页", dataType = "integer",defaultValue="0", paramType="query"),
+ @ApiImplicitParam(name = "pageSize", value = "每页条数，默认20", dataType = "integer",defaultValue="20", paramType="query"),
+ @ApiImplicitParam(name = "name", value = "类型码或名称", dataType = "string", defaultValue = "",paramType="query")
})
- public Object list(int pageIndex,int pageSize,String name) {
+ public Object list(@RequestParam(name="pageIndex", defaultValue="1",required=true) Integer pageIndex, @RequestParam(name="pageSize", defaultValue="1",required=true) Integer pageSize,String name) {
PagerRequestModel pagerRequestModel = new PagerRequestModel(pageIndex, pageSize);
pagerRequestModel.getMapBean().put("name", name);
- Page<DictionaryType> page = dictionaryTypeRepository.selectPageListByQuery(pagerRequestModel.getPageIndex(), pagerRequestModel.getPageSize(), pagerRequestModel.getMapBean());
- PagerResponseModel<DictionaryType> pagerResponseModel = PagerResponseModel.of(pagerRequestModel,page);
- return pagerResponseModel;
+ PageModel<DictionaryType> page = dictionaryTypeRepository.getDictionaryTypePage(name,pagerRequestModel.getPageIndex(), pagerRequestModel.getPageSize());
+ return page;
}
+
+
+// @GetMapping(path="/search", produces = MimeTypeUtils.APPLICATION_JSON_VALUE)
+// @ResponseStatus(value = HttpStatus.OK)
+// @ApiOperation(value="获取字典表类型列表",notes="根据查询条件获取字典表类型列表")
+// public Object list2(@RequestParam(defaultValue="0") @ApiParam(name="pageIndex",value="当前第页数，默认0，为第一页",required=true,defaultValue="0",type="integer",format="int32") Integer pageIndex,
+// @RequestParam(defaultValue="20") @ApiParam(name="pageSize",value="每页条数，默认20",required=true,defaultValue="20",type="integer",format="int32") Integer pageSize,
+// @RequestParam(defaultValue="") @ApiParam(name="name",value="类型码或名称",required=false,defaultValue="") String name) {
+// PagerRequestModel pagerRequestModel = new PagerRequestModel(pageIndex, pageSize);
+// pagerRequestModel.getMapBean().put("name", name);
+// Page<DictionaryType> page = dictionaryTypeRepository.selectPageListByQuery(pagerRequestModel.getPageIndex(), pagerRequestModel.getPageSize(), pagerRequestModel.getMapBean());
+// PagerResponseModel<DictionaryType> pagerResponseModel = PagerResponseModel.of(pagerRequestModel,page);
+// return pagerResponseModel;
+// }
+
+// @PostMapping(consumes = MimeTypeUtils.APPLICATION_JSON_VALUE, produces = MimeTypeUtils.APPLICATION_JSON_VALUE)
+// @ResponseStatus(value = HttpStatus.OK)
+// public Object create(String username,@RequestBody DictionaryType dictionaryType) {
+//
+// @SuppressWarnings("unused")
+// DictionaryType ret = dictionaryTypeRepository.insert(dictionaryType);
+//
+// SuccessResponseModel res = new SuccessResponseModel();
+// res.setSuccess("info.create.success");
+//
+// return res;
+// }
}
diff --git a/leaveschool/basics-data/src/main/java/com/supwisdom/leaveschool/basicsdata/repository/DictionaryTypeRepository2.java b/leaveschool/basics-data/src/main/java/com/supwisdom/leaveschool/basicsdata/repository/DictionaryTypeRepository2.java
new file mode 100644
index 0000000..716f109
--- /dev/null
+++ b/leaveschool/basics-data/src/main/java/com/supwisdom/leaveschool/basicsdata/repository/DictionaryTypeRepository2.java
@@ -0,0 +1,46 @@
+package com.supwisdom.leaveschool.basicsdata.repository;
+
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.ExampleMatcher;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Repository;
+
+import com.supwisdom.leaveschool.basicsdata.domain.DictionaryType;
+import com.supwisdom.leaveschool.common.repository.BaseJpaRepository;
+import com.supwisdom.leaveschool.common.util.MapBeanUtils;
+
+@Repository
+public interface DictionaryTypeRepository2 extends BaseJpaRepository<DictionaryType> {
+
+// @Autowired
+// private EntityManager entityManager;
+
+ public default Page<DictionaryType> selectPageListByQuery(int pageIndex, int pageSize, Map<String, Object> mapBean) {
+
+ DictionaryType probe = new DictionaryType();
+ ExampleMatcher matcher = ExampleMatcher.matching();
+
+// probe.setEnabled(true);
+// matcher.withMatcher("enabled", ExampleMatcher.GenericPropertyMatchers.exact());
+ if (mapBean != null&&mapBean.keySet().size()>0) {
+ probe.setName(MapBeanUtils.getString(mapBean, "name"));
+ matcher.withMatcher("name", ExampleMatcher.GenericPropertyMatchers.contains());
+ }
+//
+// matcher.withMatcher("code", ExampleMatcher.GenericPropertyMatchers.contains())
+// .withMatcher("name", ExampleMatcher.GenericPropertyMatchers.contains())
+// .withMatcher("enabled", ExampleMatcher.GenericPropertyMatchers.exact());
+
+ PageRequest pageRequest = PageRequest.of(pageIndex, pageSize);
+ Example<DictionaryType> example = Example.of(probe, matcher);
+ Page<DictionaryType> page = this.findAll(example, pageRequest);
+
+ return page;
+ }
+}
diff --git a/leaveschool/basics-data/src/main/resources/application.yml b/leaveschool/basics-data/src/main/resources/application.yml
index a36a52d..7392853 100644
--- a/leaveschool/basics-data/src/main/resources/application.yml
+++ b/leaveschool/basics-data/src/main/resources/application.yml
@@ -15,7 +15,8 @@
name: sample-user
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://172.50.10.15:3306/leave_school?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+## url: jdbc:mysql://172.50.10.15:3306/leave_school?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://180.166.150.114:9512/leave_school?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull
username: leave_school
password: 111111
jpa: