#时间范围搜索

luxiaotao1123

2020-06-23 03a6121db86c488fcf27f12ca523c5906ca87df4

 src/main/java/com/zy/asrs/controller/StkPlcmController.java

@@ -45,27 +45,28 @@
        return R.ok(stkPlcmService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().endsWith(">")) {
                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/stkPlcm/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "堆垛机异常日志添加")
    public R add(StkPlcm stkPlcm) {
        stkPlcmService.insert(stkPlcm);
        return R.ok();
    }

    @RequestMapping(value = "/stkPlcm/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "堆垛机异常日志删除")
    public R delete(@RequestParam String param){
        List<StkPlcm> list = JSONArray.parseArray(param, StkPlcm.class);
        if (Cools.isEmpty(list)){
@@ -78,7 +79,7 @@
    }

    @RequestMapping(value = "/stkPlcm/export/auth")
    @ManagerAuth
    @ManagerAuth(memo = "堆垛机异常日志导出")
    public R export(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<StkPlcm> wrapper = new EntityWrapper<>();