#

lty

4 天以前 dea586adf232c722e8d2dfa833c3d7711a1019df

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

@@ -10,16 +10,14 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.TrayCode;
import com.zy.asrs.service.TrayCodeService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

@RestController
public class TrayCodeController extends BaseController {
@@ -44,17 +42,21 @@
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        else {
//            wrapper.orderBy("id", false);
        }
        return R.ok(trayCodeService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper 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);
            }
        }
    }
@@ -63,17 +65,17 @@
    @ManagerAuth
    public R add(TrayCode trayCode) {
        trayCodeService.insert(trayCode);
        return R.ok();
        return R.ok("response.save_success");
    }

   @RequestMapping(value = "/trayCode/update/auth")
   @ManagerAuth
    @ManagerAuth
    public R update(TrayCode trayCode){
        if (Cools.isEmpty(trayCode) || null==trayCode.getId()){
            return R.error();
            return R.error("response.param_error");
        }
        trayCodeService.updateById(trayCode);
        return R.ok();
        return R.ok("response.update_success");
    }

    @RequestMapping(value = "/trayCode/delete/auth")
@@ -81,12 +83,12 @@
    public R delete(@RequestParam String param){
        List<TrayCode> list = JSONArray.parseArray(param, TrayCode.class);
        if (Cools.isEmpty(list)){
            return R.error();
            return R.error("response.param_error");
        }
        for (TrayCode entity : list){
            trayCodeService.delete(new EntityWrapper<>(entity));
        }
        return R.ok();
        return R.ok("response.delete_success");
    }

    @RequestMapping(value = "/trayCode/export/auth")
@@ -121,7 +123,61 @@
    public R query(@RequestBody JSONObject param) {
        Wrapper<TrayCode> wrapper = new EntityWrapper<TrayCode>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != trayCodeService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(TrayCode.class, String.valueOf(param.get("key"))));
            R r = R.parse(BaseRes.REPEAT);
            r.put("data", getComment(TrayCode.class, String.valueOf(param.get("key"))));
            return r;
        }
        return R.ok("response.operation_success");
    }

    @RequestMapping(value = "/trayCode/latest")
    @ManagerAuth
    public R trayCodeLatest() {
        List<TrayCode> latest = trayCodeService.selectList(new EntityWrapper<TrayCode>().orderBy("id", false));
        R r = R.ok();
        r.put("data", latest.isEmpty()?"10000001": Integer.parseInt(latest.get(0).getTrayNo())+1);
        return r;
    }

    @RequestMapping(value = "/trayCode/print/preview")
    @ManagerAuth
    public R printPreview(@RequestParam String startNo,
                          @RequestParam Integer count,
                          @RequestParam Integer type) {
        if (count <= 0) {
            return R.error("response.quantity_must_be_greater_than_zero");
        }
        List<Map<String, Object>> res = new ArrayList<>();
        for (int i = 0; i<count; i++) {
            res.add(Cools.add("item", String.valueOf(Integer.parseInt(startNo)+i)));
        }
        R r = R.ok();
        r.put("data",res);
        return r;
    }

    @RequestMapping(value = "/trayCode/print/auth")
    @ManagerAuth(memo = "response.tray_code_print")
    public R print(@RequestParam String startNo,
                  @RequestParam Integer count,
                  @RequestParam Integer type){
        if (count <= 0) {
            return R.error("response.quantity_must_be_greater_than_zero");
        }
        for (int i = 0; i<count; i++) {
            TrayCode trayCode = new TrayCode(
                    String.valueOf(Integer.parseInt(startNo)+i),    // 序列号[非空]
                    i==0?"Y":"N",    // 起始
                    i==count-1?"Y":"N",    // 终止
                    null,    // 备注
                    new Date(),    // 修改时间
                    getUserId(),    // 修改人员
                    new Date(),    // 添加时间
                    getUserId()    // 添加人员
            );
            if (!trayCodeService.insert(trayCode)) {
                throw new CoolException("response.save_serial_number_failed");
            }
        }
        return R.ok();
    }