Commit 5c4150ae authored by tangwei's avatar tangwei

增加危化品树

parent 96c46209
......@@ -167,6 +167,33 @@ public class DataDictionaryController extends BaseController {
return ResponseHelper.buildResponse(menus);
}
}
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/gwmcDataDictionary/FireChemical/{type}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
public ResponseModel<Object> gwmcDataDictionaryFireChemical( @PathVariable String type) throws Exception{
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", type);
queryWrapper.orderByAsc("sort_num");
if(redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE+type)){
Object obj= redisUtils.get(RedisKey.DATA_DICTIONARY_CODE+type);
return ResponseHelper.buildResponse(obj);
}else{
Collection<DataDictionary> list=iDataDictionaryService.list(queryWrapper);
List<Menu> menus =TreeParser.getTree(null, list, DataDictionary.class.getName(),"getCode",0, "getName", "getParent");
redisUtils.set(RedisKey.DATA_DICTIONARY_CODE+type, JSON.toJSON(menus),time);
Menu Me= new Menu(1L, "危险品库", null, false, menus);
return ResponseHelper.buildResponse(Me);
}
}
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/form/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据表态类型多个code查询表单数据项", notes = "根据表态类型多个code查询表单数据项")
......
......@@ -88,13 +88,13 @@ public class FireChemicalController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "危化品分页查询", notes = "危化品分页查询")
public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size ,String casNo, String formula, String name)
public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size ,String casNo, String formula, String name,String type)
{
Page<FireChemicalDto> page=new Page<FireChemicalDto>();
page.setCurrent(current);
page.setSize(size);
boolean isDelete=false;
return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalPage(page, casNo, formula, name,isDelete));
return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalPage(page, casNo, formula, name,type,isDelete));
}
/**
*列表全部数据查询
......
......@@ -27,8 +27,8 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe
/**
* 分页查询
*/
public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page, @Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name, boolean isDelete) {
return this.queryForPage(page, "", false,casNo, formula, name, isDelete);
public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page, @Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name, String type,boolean isDelete) {
return this.queryForPage(page, "", false,casNo, formula, name, type, isDelete);
}
/**
......
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