13

zhang

1 天以前 82de5a307466894bbb0258f8a63a26a7bb96d80d

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

@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.StkPlcm;
import com.zy.asrs.service.StkPlcmService;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.StkPlcm;
import com.zy.asrs.service.StkPlcmService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -33,22 +33,24 @@

    @RequestMapping(value = "/stkPlcm/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
        excludeTrash(param);
        EntityWrapper<StkPlcm> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(stkPlcmService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
            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]));
@@ -67,12 +69,12 @@

    @RequestMapping(value = "/stkPlcm/delete/auth")
    @ManagerAuth(memo = "堆垛机异常日志删除")
    public R delete(@RequestParam String param){
    public R delete(@RequestParam String param) {
        List<StkPlcm> list = JSONArray.parseArray(param, StkPlcm.class);
        if (Cools.isEmpty(list)){
        if (Cools.isEmpty(list)) {
            return R.error();
        }
        for (StkPlcm entity : list){
        for (StkPlcm entity : list) {
            stkPlcmService.delete(new EntityWrapper<>(entity));
        }
        return R.ok();
@@ -80,7 +82,7 @@

    @RequestMapping(value = "/stkPlcm/export/auth")
    @ManagerAuth(memo = "堆垛机异常日志导出")
    public R export(@RequestBody JSONObject param){
    public R export(@RequestBody JSONObject param) {
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<StkPlcm> wrapper = new EntityWrapper<>();
        Map<String, Object> map = excludeTrash(param.getJSONObject("stkPlcm"));
@@ -93,7 +95,7 @@
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<StkPlcm> wrapper = new EntityWrapper<StkPlcm>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != stkPlcmService.selectOne(wrapper)){
        if (null != stkPlcmService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(StkPlcm.class, String.valueOf(param.get("key"))));
        }
        return R.ok();