#

yxFwq

2025-07-26 e9d5cf17813a52fe58a5924999655d01532a6b2b

 src/main/java/com/zy/system/controller/OperateLogController.java

@@ -3,20 +3,20 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.system.entity.OperateLog;
import com.zy.system.service.OperateLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.controller.AbstractBaseController;
import com.zy.common.web.BaseController;
import com.zy.system.entity.OperateLog;
import com.zy.system.service.OperateLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.*;

@RestController
public class OperateLogController extends AbstractBaseController {
public class OperateLogController extends BaseController {

    @Autowired
    private OperateLogService operateLogService;
@@ -41,20 +41,21 @@
        return R.ok(operateLogService.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.like(entry.getKey(), String.valueOf(entry.getValue()));
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/operateLog/edit/auth")
    @ManagerAuth
    @ManagerAuth(memo = "修改库位")
    public R edit(OperateLog operateLog) {
        if (Cools.isEmpty(operateLog)){
            return R.error();
@@ -68,14 +69,14 @@
    }

    @RequestMapping(value = "/operateLog/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "手动添加改库位")
    public R add(OperateLog operateLog) {
        operateLogService.insert(operateLog);
        return R.ok();
    }

   @RequestMapping(value = "/operateLog/update/auth")
    @ManagerAuth
    @ManagerAuth(memo = "手动修改库位")
    public R update(OperateLog operateLog){
        if (Cools.isEmpty(operateLog) || null==operateLog.getId()){
            return R.error();
@@ -85,7 +86,7 @@
    }

    @RequestMapping(value = "/operateLog/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "手动删除库位")
    public R delete(Integer[] ids){
        if (Cools.isEmpty(ids)){
            return R.error();