Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 634fe741 由 sunke
选项

分页及返回值修改

1 个父辈 452922e6
内嵌 并排
正在显示 26 个修改的文件 包含 170 行增加 和 162 行删除
src/main/java/com/neotel/smfcore/common/base/BaseMapper.java
package com.neotel.smfcore.common.base; package com.neotel.smfcore.common.base;
import com.neotel.smfcore.common.bean.PageData;
import java.util.List; import java.util.List;
public interface BaseMapper<D, E> { public interface BaseMapper<D, E> {
...@@ -30,4 +32,9 @@ public interface BaseMapper<D, E> { ...@@ -30,4 +32,9 @@ public interface BaseMapper<D, E> {
* @return / * @return /
*/ */
List <D> toDto(List<E> entityList); List <D> toDto(List<E> entityList);
/**
* Entity分页集合转DTO分页集合
*/
PageData<D> toDto(PageData<E> entityPage);
} }
src/main/java/com/neotel/smfcore/common/base/IBaseManager.java
package com.neotel.smfcore.common.base; package com.neotel.smfcore.common.base;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
...@@ -18,7 +19,7 @@ public interface IBaseManager<T> { ...@@ -18,7 +19,7 @@ public interface IBaseManager<T> {
void delete(T object) throws ValidateException; void delete(T object) throws ValidateException;
List<T> findByPage(Query query, Pageable pageable); PageData<T> findByPage(Query query, Pageable pageable);
List<T> findByQuery(Query query); List<T> findByQuery(Query query);
} }
src/main/java/com/neotel/smfcore/common/bean/PageData.java 0 → 100644
package com.neotel.smfcore.common.bean;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* Created by sunke on 2021/7/22.
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class PageData<T> {
/**
* 当前页结果
*/
@ApiModelProperty("当前页结果列表")
private List<T> content;
/**
* 查询结果总数量
*/
@ApiModelProperty("查询结果总数量")
private int totalElements;
}
src/main/java/com/neotel/smfcore/common/bean/ResultBean.java
package com.neotel.smfcore.common.bean; package com.neotel.smfcore.common.bean;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
...@@ -8,7 +10,7 @@ import org.apache.logging.log4j.Logger; ...@@ -8,7 +10,7 @@ import org.apache.logging.log4j.Logger;
* Created by sunke on 2019/12/12. * Created by sunke on 2019/12/12.
*/ */
@Slf4j @Slf4j
public class ResultBean { public class ResultBean<T> {
public static ResultBean newErrorResult(int code, String msg){ public static ResultBean newErrorResult(int code, String msg){
return newErrorResult(code, msg, true); return newErrorResult(code, msg, true);
...@@ -36,22 +38,18 @@ public class ResultBean { ...@@ -36,22 +38,18 @@ public class ResultBean {
return newOkResult("ok", data); return newOkResult("ok", data);
} }
/** @ApiModelProperty("结果码,0为正常,其他值表示异常")
* 结果码,0为正常,其他值表示异常
*/
private int code; private int code;
/**
* 提示信息 @ApiModelProperty("提示信息")
*/
private String msg; private String msg;
/**
* 数据结果 private T data;
*/
private Object data;
/** /**
* 是否是OK的结果 * 是否是OK的结果
*/ */
@JsonIgnore
public boolean isOkResult(){ public boolean isOkResult(){
return code == 0; return code == 0;
} }
...@@ -64,11 +62,11 @@ public class ResultBean { ...@@ -64,11 +62,11 @@ public class ResultBean {
this.code = code; this.code = code;
} }
public Object getData() { public T getData() {
return data; return data;
} }
public void setData(Object data) { public void setData(T data) {
this.data = data; this.data = data;
} }
......
src/main/java/com/neotel/smfcore/common/utils/PageUtil.java deleted 100644 → 0
/*
* Copyright 2019-2020 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.neotel.smfcore.common.utils;
import org.springframework.data.domain.Page;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* 分页工具
* @author Zheng Jie
* @date 2018-12-10
*/
public class PageUtil extends cn.hutool.core.util.PageUtil {
/**
* List 分页
*/
public static List toPage(int page, int size , List list) {
int fromIndex = page * size;
int toIndex = page * size + size;
if(fromIndex > list.size()){
return new ArrayList();
} else if(toIndex >= list.size()) {
return list.subList(fromIndex,list.size());
} else {
return list.subList(fromIndex,toIndex);
}
}
/**
* Page 数据处理，预防redis反序列化报错
*/
public static Map<String,Object> toPage(Page page) {
Map<String,Object> map = new LinkedHashMap<>(2);
map.put("content",page.getContent());
map.put("totalElements",page.getTotalElements());
return map;
}
/**
* 自定义分页
*/
public static Map<String,Object> toPage(Object object, Object totalElements) {
Map<String,Object> map = new LinkedHashMap<>(2);
map.put("content",object);
map.put("totalElements",totalElements);
return map;
}
}
src/main/java/com/neotel/smfcore/core/barcode/service/manager/impl/BarcodeManagerImpl.java
package com.neotel.smfcore.core.barcode.service.manager.impl; package com.neotel.smfcore.core.barcode.service.manager.impl;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.core.barcode.service.dao.IBarcodeDao; import com.neotel.smfcore.core.barcode.service.dao.IBarcodeDao;
import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager; import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
...@@ -34,7 +35,7 @@ public class BarcodeManagerImpl implements IBarcodeManager { ...@@ -34,7 +35,7 @@ public class BarcodeManagerImpl implements IBarcodeManager {
} }
@Override @Override
public List<Barcode> findByPage(Query query, Pageable pageable) { public PageData<Barcode> findByPage(Query query, Pageable pageable) {
return null; return null;
} }
......
src/main/java/com/neotel/smfcore/core/barcode/service/manager/impl/ComponentManagerImpl.java
package com.neotel.smfcore.core.barcode.service.manager.impl; package com.neotel.smfcore.core.barcode.service.manager.impl;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.core.barcode.service.dao.IComponentDao; import com.neotel.smfcore.core.barcode.service.dao.IComponentDao;
import com.neotel.smfcore.core.barcode.service.manager.IComponentManager; import com.neotel.smfcore.core.barcode.service.manager.IComponentManager;
...@@ -34,8 +35,10 @@ public class ComponentManagerImpl implements IComponentManager { ...@@ -34,8 +35,10 @@ public class ComponentManagerImpl implements IComponentManager {
} }
@Override @Override
public List<Component> findByPage(Query query, Pageable pageable) { public PageData<Component> findByPage(Query query, Pageable pageable) {
return componentDao.findByQuery(query,pageable); int totalCount = componentDao.countByQuery(query);
List<Component> list = componentDao.findByQuery(query, pageable);
return new PageData<Component>(list,totalCount);
} }
@Override @Override
......
src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java
...@@ -3,6 +3,7 @@ package com.neotel.smfcore.core.order.rest; ...@@ -3,6 +3,7 @@ package com.neotel.smfcore.core.order.rest;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.neotel.smfcore.common.annotation.QueryCondition; import com.neotel.smfcore.common.annotation.QueryCondition;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.bean.ResultBean; import com.neotel.smfcore.common.bean.ResultBean;
import com.neotel.smfcore.common.exception.BadRequestException; import com.neotel.smfcore.common.exception.BadRequestException;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
...@@ -11,6 +12,7 @@ import com.neotel.smfcore.common.utils.PageUtil; ...@@ -11,6 +12,7 @@ import com.neotel.smfcore.common.utils.PageUtil;
import com.neotel.smfcore.common.utils.QueryHelp; import com.neotel.smfcore.common.utils.QueryHelp;
import com.neotel.smfcore.common.utils.SecurityUtils; import com.neotel.smfcore.common.utils.SecurityUtils;
import com.neotel.smfcore.core.order.LiteOrderCache; import com.neotel.smfcore.core.order.LiteOrderCache;
import com.neotel.smfcore.core.order.rest.bean.dto.OrderDto;
import com.neotel.smfcore.core.order.rest.bean.mapstruct.OrderMapper; import com.neotel.smfcore.core.order.rest.bean.mapstruct.OrderMapper;
import com.neotel.smfcore.core.order.rest.bean.query.OrderQueryCondition; import com.neotel.smfcore.core.order.rest.bean.query.OrderQueryCondition;
import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager; import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager;
...@@ -77,16 +79,16 @@ public class OrderController { ...@@ -77,16 +79,16 @@ public class OrderController {
@ApiOperation("工单出库") @ApiOperation("工单出库")
@PostMapping(value = "/out") @PostMapping(value = "/out")
@PreAuthorize("@el.check('order:out')") @PreAuthorize("@el.check('order:out')")
public ResponseEntity<Object> delete(@RequestBody String orderNo) { public ResultBean delete(@RequestBody String orderNo) {
LiteOrder liteOrder = liteOrderManager.findByOrderNo(orderNo); LiteOrder liteOrder = liteOrderManager.findByOrderNo(orderNo);
ResultBean resultBean = liteOrderCache.checkOutOrder(liteOrder); ResultBean resultBean = liteOrderCache.checkOutOrder(liteOrder);
return new ResponseEntity<>(resultBean,HttpStatus.OK); return resultBean;
} }
@ApiOperation("查询工单") @ApiOperation("查询工单")
@GetMapping @GetMapping
@PreAuthorize("@el.check('order:list')") @PreAuthorize("@el.check('order:list')")
public ResponseEntity<Object> query(OrderQueryCondition criteria, Pageable pageable){ public PageData<OrderDto> query(OrderQueryCondition criteria, Pageable pageable){
User user = userManager.findByUserName(SecurityUtils.getCurrentUsername()); User user = userManager.findByUserName(SecurityUtils.getCurrentUsername());
if(user != null){ if(user != null){
//数据权限 //数据权限
...@@ -101,12 +103,12 @@ public class OrderController { ...@@ -101,12 +103,12 @@ public class OrderController {
} }
//都没有权限,返回空 //都没有权限,返回空
if(ObjectUtils.isEmpty(groupNames)){ if(ObjectUtils.isEmpty(groupNames)){
return new ResponseEntity<>(PageUtil.toPage(null,0), HttpStatus.OK); return new PageData<>(Lists.newArrayList(),0);
} }
criteria.setSourceList(groupNames); criteria.setSourceList(groupNames);
} }
} }
List<LiteOrder> orderList = liteOrderManager.findByPage(QueryHelp.getQuery(criteria), pageable); PageData<LiteOrder> orderList = liteOrderManager.findByPage(QueryHelp.getQuery(criteria), pageable);
return new ResponseEntity<>(PageUtil.toPage(orderMapper.toDto(orderList),0), HttpStatus.OK); return orderMapper.toDto(orderList);
} }
} }
src/main/java/com/neotel/smfcore/core/order/service/manager/impl/LiteOrderItemManagerImpl.java
package com.neotel.smfcore.core.order.service.manager.impl; package com.neotel.smfcore.core.order.service.manager.impl;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.core.order.service.dao.ILiteOrderDao; import com.neotel.smfcore.core.order.service.dao.ILiteOrderDao;
import com.neotel.smfcore.core.order.service.dao.ILiteOrderItemDao; import com.neotel.smfcore.core.order.service.dao.ILiteOrderItemDao;
...@@ -41,8 +42,10 @@ public class LiteOrderItemManagerImpl implements ILiteOrderItemManager { ...@@ -41,8 +42,10 @@ public class LiteOrderItemManagerImpl implements ILiteOrderItemManager {
} }
@Override @Override
public List<LiteOrderItem> findByPage(Query query, Pageable pageable) { public PageData<LiteOrderItem> findByPage(Query query, Pageable pageable) {
return liteOrderItemDao.findByQuery(query,pageable); int totalCount = liteOrderItemDao.countByQuery(query);
List<LiteOrderItem> list = liteOrderItemDao.findByQuery(query, pageable);
return new PageData<LiteOrderItem>(list,totalCount);
} }
@Override @Override
......
src/main/java/com/neotel/smfcore/core/order/service/manager/impl/LiteOrderManagerImpl.java
package com.neotel.smfcore.core.order.service.manager.impl; package com.neotel.smfcore.core.order.service.manager.impl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.core.barcode.service.dao.IBarcodeDao; import com.neotel.smfcore.core.barcode.service.dao.IBarcodeDao;
import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager; import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
...@@ -61,8 +62,10 @@ public class LiteOrderManagerImpl implements ILiteOrderManager { ...@@ -61,8 +62,10 @@ public class LiteOrderManagerImpl implements ILiteOrderManager {
} }
@Override @Override
public List<LiteOrder> findByPage(Query query, Pageable pageable) { public PageData<LiteOrder> findByPage(Query query, Pageable pageable) {
return liteOrderDao.findByQuery(query,pageable); int totalCount = liteOrderDao.countByQuery(query);
List<LiteOrder> list = liteOrderDao.findByQuery(query, pageable);
return new PageData<LiteOrder>(list,totalCount);
} }
@Override @Override
......
src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StorageManagerImpl.java
package com.neotel.smfcore.core.storage.service.manager.impl; package com.neotel.smfcore.core.storage.service.manager.impl;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.core.storage.service.dao.IStorageDao; import com.neotel.smfcore.core.storage.service.dao.IStorageDao;
import com.neotel.smfcore.core.storage.service.manager.IStorageManager; import com.neotel.smfcore.core.storage.service.manager.IStorageManager;
...@@ -33,8 +34,10 @@ public class StorageManagerImpl implements IStorageManager { ...@@ -33,8 +34,10 @@ public class StorageManagerImpl implements IStorageManager {
} }
@Override @Override
public List<Storage> findByPage(Query query, Pageable pageable) { public PageData<Storage> findByPage(Query query, Pageable pageable) {
return storageDao.findByQuery(query,pageable); int totalCount = storageDao.countByQuery(query);
List<Storage> list = storageDao.findByQuery(query, pageable);
return new PageData<Storage>(list,totalCount);
} }
@Override @Override
......
src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java
...@@ -2,6 +2,7 @@ package com.neotel.smfcore.core.storage.service.manager.impl; ...@@ -2,6 +2,7 @@ package com.neotel.smfcore.core.storage.service.manager.impl;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.core.barcode.bean.PlateSizeBean; import com.neotel.smfcore.core.barcode.bean.PlateSizeBean;
import com.neotel.smfcore.core.storage.bean.InventoryItem; import com.neotel.smfcore.core.storage.bean.InventoryItem;
...@@ -233,8 +234,10 @@ public class StoragePosManagerImpl implements IStoragePosManager { ...@@ -233,8 +234,10 @@ public class StoragePosManagerImpl implements IStoragePosManager {
} }
@Override @Override
public List<StoragePos> findByPage(Query query, Pageable pageable) { public PageData<StoragePos> findByPage(Query query, Pageable pageable) {
return storagePosDao.findByQuery(query,pageable); int totalCount = storagePosDao.countByQuery(query);
List<StoragePos> list = storagePosDao.findByQuery(query, pageable);
return new PageData<StoragePos>(list,totalCount);
} }
@Override @Override
......
src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
package com.neotel.smfcore.core.system.rest; package com.neotel.smfcore.core.system.rest;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.bean.ResultBean;
import com.neotel.smfcore.common.utils.PageUtil; import com.neotel.smfcore.common.utils.PageUtil;
import com.neotel.smfcore.common.utils.QueryHelp; import com.neotel.smfcore.common.utils.QueryHelp;
import com.neotel.smfcore.core.device.util.DataCache; import com.neotel.smfcore.core.device.util.DataCache;
...@@ -57,15 +59,15 @@ public class TaskController { ...@@ -57,15 +59,15 @@ public class TaskController {
@ApiOperation("查询出入库日志") @ApiOperation("查询出入库日志")
@GetMapping("/history") @GetMapping("/history")
@PreAuthorize("@el.check('task:list')") @PreAuthorize("@el.check('task:list')")
public ResponseEntity<Object> query(TaskQueryCondition criteria, Pageable pageable){ public PageData<TaskDto> query(TaskQueryCondition criteria, Pageable pageable){
List<DataLog> taskList = dataLogManager.findByPage(QueryHelp.getQuery(criteria), pageable); PageData<DataLog> taskList = dataLogManager.findByPage(QueryHelp.getQuery(criteria), pageable);
return new ResponseEntity<>(PageUtil.toPage(taskMapper.toDto(taskList),0), HttpStatus.OK); return taskMapper.toDto(taskList);
} }
@ApiOperation("获取队列中的任务") @ApiOperation("获取队列中的任务")
@GetMapping @GetMapping
@PreAuthorize("@el.check('task:inQueue','task:list')") @PreAuthorize("@el.check('task:inQueue','task:list')")
public ResponseEntity<Object> query(String groupId, String[] cids){ public List<TaskDto> query(String groupId, String[] cids){
List<DataLog> resultTasks = Lists.newArrayList(); List<DataLog> resultTasks = Lists.newArrayList();
List<DataLog> allTasks = taskService.getAllTasks(); List<DataLog> allTasks = taskService.getAllTasks();
List<String> cidList = Lists.newArrayList(); List<String> cidList = Lists.newArrayList();
...@@ -98,7 +100,7 @@ public class TaskController { ...@@ -98,7 +100,7 @@ public class TaskController {
// testTask.setStatus("FINISHED"); // testTask.setStatus("FINISHED");
// resultTasks.add(testTask); // resultTasks.add(testTask);
List<TaskDto> resultDtos = taskMapper.toDto(resultTasks); List<TaskDto> resultDtos = taskMapper.toDto(resultTasks);
return new ResponseEntity<>(resultDtos, HttpStatus.OK); return resultDtos;
} }
@ApiOperation("取消任务") @ApiOperation("取消任务")
......
src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/TaskDto.java
package com.neotel.smfcore.core.system.rest.bean.dto; package com.neotel.smfcore.core.system.rest.bean.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -13,37 +14,37 @@ public class TaskDto implements Serializable { ...@@ -13,37 +14,37 @@ public class TaskDto implements Serializable {
/** /**
* 是否是单盘出库（联电指出库项目,默认为false即默认批量出库） * 是否是单盘出库（联电指出库项目,默认为false即默认批量出库）
*/ */
private boolean singleOut = false; private boolean singleOut = false;
/**
* 所属料仓 @ApiModelProperty("所属料仓")
*/
private String storageName; private String storageName;
/**
* 料仓 cid @ApiModelProperty(value="料仓 cid")
*/
private String cid; private String cid;
/** @ApiModelProperty("料仓 ID")
* 料仓 ID
*/
private String storageId; private String storageId;
/** /**
* 仓位 ID * 仓位 ID
*/ */
@ApiModelProperty("料仓 ID")
private String posId; private String posId;
/** /**
* 仓位名称 * 仓位名称
*/ */
@ApiModelProperty("仓位名称")
private String posName; private String posName;
//二维码(Reel ID) @ApiModelProperty("二维码(Reel ID)")
private String barcode; private String barcode;
/** /**
* 物料编号 * 物料编号
*/ */
@ApiModelProperty("物料编号")
private String partNumber; private String partNumber;
/** /**
......
src/main/java/com/neotel/smfcore/core/system/service/manager/impl/DataLogManagerImpl.java
package com.neotel.smfcore.core.system.service.manager.impl; package com.neotel.smfcore.core.system.service.manager.impl;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.core.system.service.dao.IDataLogDao; import com.neotel.smfcore.core.system.service.dao.IDataLogDao;
import com.neotel.smfcore.core.system.service.manager.IDataLogManager; import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
...@@ -33,8 +34,10 @@ public class DataLogManagerImpl implements IDataLogManager { ...@@ -33,8 +34,10 @@ public class DataLogManagerImpl implements IDataLogManager {
} }
@Override @Override
public List<DataLog> findByPage(Query query, Pageable pageable) { public PageData<DataLog> findByPage(Query query, Pageable pageable) {
return dataLogDao.findByQuery(query, pageable); int totalCount = dataLogDao.countByQuery(query);
List<DataLog> list = dataLogDao.findByQuery(query, pageable);
return new PageData<DataLog>(list,totalCount);
} }
@Override @Override
......
src/main/java/com/neotel/smfcore/core/system/service/manager/impl/HumitureManagerImpl.java
package com.neotel.smfcore.core.system.service.manager.impl; package com.neotel.smfcore.core.system.service.manager.impl;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.core.system.service.manager.IHumitureManager; import com.neotel.smfcore.core.system.service.manager.IHumitureManager;
import com.neotel.smfcore.core.system.service.po.Humiture; import com.neotel.smfcore.core.system.service.po.Humiture;
...@@ -27,7 +28,7 @@ public class HumitureManagerImpl implements IHumitureManager { ...@@ -27,7 +28,7 @@ public class HumitureManagerImpl implements IHumitureManager {
} }
@Override @Override
public List<Humiture> findByPage(Query query, Pageable pageable) { public PageData<Humiture> findByPage(Query query, Pageable pageable) {
return null; return null;
} }
......
src/main/java/com/neotel/smfcore/hella/rest/HellaSensorShelfController.java
...@@ -15,10 +15,11 @@ import io.swagger.annotations.Api; ...@@ -15,10 +15,11 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
...@@ -30,6 +31,7 @@ import java.util.*; ...@@ -30,6 +31,7 @@ import java.util.*;
*/ */
@Api(tags = "海拉感应料架") @Api(tags = "海拉感应料架")
@RequestMapping("/api/sensorShelf") @RequestMapping("/api/sensorShelf")
@RestController
@Slf4j @Slf4j
public class HellaSensorShelfController { public class HellaSensorShelfController {
...@@ -52,19 +54,20 @@ public class HellaSensorShelfController { ...@@ -52,19 +54,20 @@ public class HellaSensorShelfController {
* 扫码 * 扫码
*/ */
@ApiOperation("扫码入库") @ApiOperation("扫码入库")
@RequestMapping("/codeIn") @PostMapping("/codeIn")
@ResponseBody @PreAuthorize("@el.check('sensorShelf:putIn')")
public ResultBean codeIn(HttpServletRequest request, HttpSession httpSession){ public ResponseEntity<ResultBean> codeIn(String code, String group){
String codeStr = request.getParameter("code");
String groupStr = request.getParameter("group");
String loginUser = SecurityUtils.getLoginUsername(); String loginUser = SecurityUtils.getLoginUsername();
Collection<DataLog> queueTasks = taskService.getQueueTasks(); Collection<DataLog> queueTasks = taskService.getQueueTasks();
ResultBean resultBean = null;
for (DataLog queueTask : queueTasks) { for (DataLog queueTask : queueTasks) {
if(queueTask.isPutInTask() && queueTask.getSourceName().equals(groupStr)){ if(queueTask.isPutInTask() && queueTask.getSourceName().equals(group)){
return ResultBean.newErrorResult(-1, "the task of ["+queueTask.getBarcode()+"] is unfinished."); resultBean = ResultBean.newErrorResult(-1, "the task of ["+queueTask.getBarcode()+"] is unfinished.");
return new ResponseEntity<ResultBean>(resultBean,HttpStatus.OK);
} }
} }
return hellaServiceHandler.checkMaterial(loginUser,groupStr,codeStr); resultBean = hellaServiceHandler.checkMaterial(loginUser, group, code);
return new ResponseEntity<ResultBean>(resultBean,HttpStatus.OK);
} }
......
src/main/java/com/neotel/smfcore/security/rest/GroupController.java
package com.neotel.smfcore.security.rest; package com.neotel.smfcore.security.rest;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.BadRequestException; import com.neotel.smfcore.common.exception.BadRequestException;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.PageUtil; import com.neotel.smfcore.common.utils.PageUtil;
import com.neotel.smfcore.common.utils.QueryHelp; import com.neotel.smfcore.common.utils.QueryHelp;
import com.neotel.smfcore.core.storage.service.manager.IStorageManager; import com.neotel.smfcore.core.storage.service.manager.IStorageManager;
import com.neotel.smfcore.core.storage.service.po.Storage; import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.security.rest.bean.dto.GroupDto;
import com.neotel.smfcore.security.rest.bean.dto.MenuDto; import com.neotel.smfcore.security.rest.bean.dto.MenuDto;
import com.neotel.smfcore.security.rest.bean.mapstruct.GroupMapper; import com.neotel.smfcore.security.rest.bean.mapstruct.GroupMapper;
import com.neotel.smfcore.security.rest.bean.query.GroupQueryCriteria; import com.neotel.smfcore.security.rest.bean.query.GroupQueryCriteria;
...@@ -65,11 +67,10 @@ public class GroupController { ...@@ -65,11 +67,10 @@ public class GroupController {
@GetMapping @GetMapping
@ApiOperation("查询组列表") @ApiOperation("查询组列表")
// @PreAuthorize("@el.check('groups:list')") // @PreAuthorize("@el.check('groups:list')")
public ResponseEntity<Object> query(GroupQueryCriteria criteria, Pageable pageable) throws Exception { public PageData<GroupDto> query(GroupQueryCriteria criteria, Pageable pageable) throws Exception {
Query query = QueryHelp.getQuery(criteria); Query query = QueryHelp.getQuery(criteria);
List<Group> groups = groupManager.findByPage(query, pageable); PageData<Group> groups = groupManager.findByPage(query, pageable);
Map<String, Object> data = PageUtil.toPage(groupMapper.toDto(groups), groups.size()); return groupMapper.toDto(groups);
return new ResponseEntity<>(data, HttpStatus.OK);
} }
@ApiOperation("返回全部的分组") @ApiOperation("返回全部的分组")
......
src/main/java/com/neotel/smfcore/security/rest/MenuController.java
...@@ -17,10 +17,10 @@ package com.neotel.smfcore.security.rest; ...@@ -17,10 +17,10 @@ package com.neotel.smfcore.security.rest;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.neotel.smfcore.common.annotation.QueryCondition; import com.neotel.smfcore.common.annotation.QueryCondition;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.BadRequestException; import com.neotel.smfcore.common.exception.BadRequestException;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.Constants; import com.neotel.smfcore.common.utils.Constants;
import com.neotel.smfcore.common.utils.PageUtil;
import com.neotel.smfcore.common.utils.QueryHelp; import com.neotel.smfcore.common.utils.QueryHelp;
import com.neotel.smfcore.common.utils.SecurityUtils; import com.neotel.smfcore.common.utils.SecurityUtils;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.security.annotation.AnonymousAccess;
...@@ -117,11 +117,11 @@ public class MenuController { ...@@ -117,11 +117,11 @@ public class MenuController {
@GetMapping @GetMapping
@ApiOperation("查询菜单") @ApiOperation("查询菜单")
@PreAuthorize("@el.check('menu:list')") @PreAuthorize("@el.check('menu:list')")
public ResponseEntity<Object> query(MenuQueryCondition criteria) throws Exception { public PageData<MenuDto> query(MenuQueryCondition criteria) throws Exception {
Query query = QueryHelp.getQuery(criteria); Query query = QueryHelp.getQuery(criteria);
query.addCriteria(Criteria.where("type").ne(2)); query.addCriteria(Criteria.where("type").ne(2));
List<MenuDto> menuDtoList = menuMapper.toDto(menuManager.findByQuery(query)); List<MenuDto> menuDtoList = menuMapper.toDto(menuManager.findByQuery(query));
return new ResponseEntity<>(PageUtil.toPage(menuDtoList, menuDtoList.size()), HttpStatus.OK); return new PageData(menuDtoList, menuDtoList.size());
} }
@ApiOperation("查询菜单:根据ID获取同级与上级数据") @ApiOperation("查询菜单:根据ID获取同级与上级数据")
......
src/main/java/com/neotel/smfcore/security/rest/RoleController.java
package com.neotel.smfcore.security.rest; package com.neotel.smfcore.security.rest;
import cn.hutool.core.lang.Dict; import cn.hutool.core.lang.Dict;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.BadRequestException; import com.neotel.smfcore.common.exception.BadRequestException;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.PageUtil; import com.neotel.smfcore.common.utils.PageUtil;
...@@ -49,9 +50,9 @@ public class RoleController { ...@@ -49,9 +50,9 @@ public class RoleController {
@ApiOperation("获取单个role") @ApiOperation("获取单个role")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
@PreAuthorize("@el.check('roles:list')") @PreAuthorize("@el.check('roles:list')")
public ResponseEntity<Object> query(@PathVariable String id){ public RoleDto query(@PathVariable String id){
RoleDto dto=roleMapper.toDto(roleManager.get(id)); RoleDto dto=roleMapper.toDto(roleManager.get(id));
return new ResponseEntity<>(dto, HttpStatus.OK); return dto;
} }
@ApiOperation("导出角色数据") @ApiOperation("导出角色数据")
...@@ -66,22 +67,20 @@ public class RoleController { ...@@ -66,22 +67,20 @@ public class RoleController {
@ApiOperation("返回全部的角色") @ApiOperation("返回全部的角色")
@GetMapping(value = "/all") @GetMapping(value = "/all")
@PreAuthorize("@el.check('roles:list','user:add','user:edit')") @PreAuthorize("@el.check('roles:list','user:add','user:edit')")
public ResponseEntity<Object> query(){ public List<RoleDto> query(){
Query query=new Query(); Query query=new Query();
// query.with(Sort.by(Sort.Direction.ASC,"levle")); // query.with(Sort.by(Sort.Direction.ASC,"levle"));
return new ResponseEntity<>(roleMapper.toDto(roleManager.findByQuery(query)) ,HttpStatus.OK); return roleMapper.toDto(roleManager.findByQuery(query));
} }
@ApiOperation("查询角色") @ApiOperation("查询角色")
@GetMapping @GetMapping
@PreAuthorize("@el.check('roles:list')") @PreAuthorize("@el.check('roles:list')")
public ResponseEntity<Object> query(RoleQueryCriteria criteria, Pageable pageable){ public PageData<RoleDto> query(RoleQueryCriteria criteria, Pageable pageable){
Query query= QueryHelp.getQuery(criteria); Query query= QueryHelp.getQuery(criteria);
// query.with(Sort.by(Sort.Direction.ASC,"id")); PageData<Role> rolePageData=roleManager.findByPage(query,pageable);
List<Role> roles=roleManager.findByPage(query,pageable); PageData<RoleDto> dtoPageData=roleMapper.toDto(rolePageData);
List<RoleDto> dtos=roleMapper.toDto(roles); return dtoPageData;
Map<String ,Object> data= PageUtil.toPage(dtos,dtos.size());
return new ResponseEntity<>(data,HttpStatus.OK);
} }
......
src/main/java/com/neotel/smfcore/security/rest/UserController.java
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package com.neotel.smfcore.security.rest; package com.neotel.smfcore.security.rest;
import com.neotel.smfcore.common.annotation.QueryCondition; import com.neotel.smfcore.common.annotation.QueryCondition;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.BadRequestException; import com.neotel.smfcore.common.exception.BadRequestException;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.*; import com.neotel.smfcore.common.utils.*;
...@@ -78,12 +79,11 @@ public class UserController { ...@@ -78,12 +79,11 @@ public class UserController {
@GetMapping @GetMapping
@PreAuthorize("@el.check('user:list')") @PreAuthorize("@el.check('user:list')")
// public ResponseEntity<Object> query(UserQueryCriteria criteria, Pageable pageable){ // public ResponseEntity<Object> query(UserQueryCriteria criteria, Pageable pageable){
public ResponseEntity<Object> query(UserQueryCriteria criteria, Pageable pageable) { public PageData<UserDto> query(UserQueryCriteria criteria, Pageable pageable) {
Query query = QueryHelp.getQuery(criteria); Query query = QueryHelp.getQuery(criteria);
List<User> users = userManager.findByPage(query, pageable); PageData<User> userPageData = userManager.findByPage(query, pageable);
List<UserDto> dtos = userManager.listToDto(users); List<UserDto> dtos = userManager.listToDto(userPageData.getContent());
Map<String, Object> data = PageUtil.toPage(dtos, dtos.size()); return new PageData<>(dtos,userPageData.getTotalElements());
return new ResponseEntity<>(data, HttpStatus.OK);
} }
@ApiOperation("新增用户") @ApiOperation("新增用户")
......
src/main/java/com/neotel/smfcore/security/service/OnlineUserService.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.neotel.smfcore.security.service; package com.neotel.smfcore.security.service;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.security.bean.SecurityProperties; import com.neotel.smfcore.security.bean.SecurityProperties;
import com.neotel.smfcore.security.rest.bean.dto.JwtUserDto; import com.neotel.smfcore.security.rest.bean.dto.JwtUserDto;
import com.neotel.smfcore.security.rest.bean.dto.OnlineUserDto; import com.neotel.smfcore.security.rest.bean.dto.OnlineUserDto;
...@@ -55,12 +56,9 @@ public class OnlineUserService { ...@@ -55,12 +56,9 @@ public class OnlineUserService {
* @param pageable / * @param pageable /
* @return / * @return /
*/ */
public Map<String,Object> getAll(String filter, Pageable pageable){ public PageData<OnlineUserDto> getAll(String filter, Pageable pageable){
List<OnlineUserDto> onlineUserDtos = getAll(filter); List<OnlineUserDto> onlineUserDtos = getAll(filter);
return PageUtil.toPage( return new PageData(onlineUserDtos,onlineUserDtos.size());
PageUtil.toPage(pageable.getPageNumber(),pageable.getPageSize(), onlineUserDtos),
onlineUserDtos.size()
);
} }
/** /**
......
src/main/java/com/neotel/smfcore/security/service/manager/impl/GroupManagerImpl.java
package com.neotel.smfcore.security.service.manager.impl; package com.neotel.smfcore.security.service.manager.impl;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.BadRequestException; import com.neotel.smfcore.common.exception.BadRequestException;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.FileUtil; import com.neotel.smfcore.common.utils.FileUtil;
...@@ -7,6 +8,7 @@ import com.neotel.smfcore.security.service.dao.IGroupDao; ...@@ -7,6 +8,7 @@ import com.neotel.smfcore.security.service.dao.IGroupDao;
import com.neotel.smfcore.security.service.manager.IGroupManager; import com.neotel.smfcore.security.service.manager.IGroupManager;
import com.neotel.smfcore.security.service.po.Group; import com.neotel.smfcore.security.service.po.Group;
import com.neotel.smfcore.security.service.po.Menu; import com.neotel.smfcore.security.service.po.Menu;
import com.neotel.smfcore.security.service.po.Role;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
...@@ -78,8 +80,10 @@ public class GroupManagerImpl implements IGroupManager { ...@@ -78,8 +80,10 @@ public class GroupManagerImpl implements IGroupManager {
} }
@Override @Override
public List<Group> findByPage(Query query, Pageable pageable) { public PageData<Group> findByPage(Query query, Pageable pageable) {
return groupDao.findByQuery(query,pageable); int totalCount = groupDao.countByQuery(query);
List<Group> list = groupDao.findByQuery(query, pageable);
return new PageData<Group>(list,totalCount);
} }
@Override @Override
......
src/main/java/com/neotel/smfcore/security/service/manager/impl/MenuManagerImpl.java
...@@ -2,6 +2,7 @@ package com.neotel.smfcore.security.service.manager.impl; ...@@ -2,6 +2,7 @@ package com.neotel.smfcore.security.service.manager.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.BadRequestException; import com.neotel.smfcore.common.exception.BadRequestException;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.FileUtil; import com.neotel.smfcore.common.utils.FileUtil;
...@@ -54,8 +55,10 @@ public class MenuManagerImpl implements IMenuManager { ...@@ -54,8 +55,10 @@ public class MenuManagerImpl implements IMenuManager {
} }
@Override @Override
public List<Menu> findByPage(Query query, Pageable pageable) { public PageData<Menu> findByPage(Query query, Pageable pageable) {
return menuDao.findByQuery(query, pageable); int totalCount = menuDao.countByQuery(query);
List<Menu> list = menuDao.findByQuery(query, pageable);
return new PageData<Menu>(list,totalCount);
} }
@Override @Override
......
src/main/java/com/neotel/smfcore/security/service/manager/impl/RoleManagerImpl.java
package com.neotel.smfcore.security.service.manager.impl; package com.neotel.smfcore.security.service.manager.impl;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.BadRequestException; import com.neotel.smfcore.common.exception.BadRequestException;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.Constants; import com.neotel.smfcore.common.utils.Constants;
...@@ -51,8 +52,10 @@ public class RoleManagerImpl implements IRoleManager { ...@@ -51,8 +52,10 @@ public class RoleManagerImpl implements IRoleManager {
} }
@Override @Override
public List<Role> findByPage(Query query, Pageable pageable) { public PageData<Role> findByPage(Query query, Pageable pageable) {
return roleDao.findByQuery(query, pageable); int totalCount = roleDao.countByQuery(query);
List<Role> list = roleDao.findByQuery(query, pageable);
return new PageData<Role>(list,totalCount);
} }
@Override @Override
......
src/main/java/com/neotel/smfcore/security/service/manager/impl/UserManagerImpl.java
package com.neotel.smfcore.security.service.manager.impl; package com.neotel.smfcore.security.service.manager.impl;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.exception.BadRequestException; import com.neotel.smfcore.common.exception.BadRequestException;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.Constants; import com.neotel.smfcore.common.utils.Constants;
import com.neotel.smfcore.common.utils.FileUtil; import com.neotel.smfcore.common.utils.FileUtil;
import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.security.rest.bean.dto.RoleSmallDto; import com.neotel.smfcore.security.rest.bean.dto.RoleSmallDto;
import com.neotel.smfcore.security.rest.bean.dto.UserDto; import com.neotel.smfcore.security.rest.bean.dto.UserDto;
import com.neotel.smfcore.security.rest.bean.mapstruct.RoleMapper; import com.neotel.smfcore.security.rest.bean.mapstruct.RoleMapper;
...@@ -120,8 +122,10 @@ public class UserManagerImpl implements IUserManager { ...@@ -120,8 +122,10 @@ public class UserManagerImpl implements IUserManager {
} }
@Override @Override
public List<User> findByPage(Query query, Pageable pageable) { public PageData<User> findByPage(Query query, Pageable pageable) {
return userDao.findByQuery(query, pageable); int totalCount = userDao.countByQuery(query);
List<User> list = userDao.findByQuery(query, pageable);
return new PageData<User>(list,totalCount);
} }
@Override @Override
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!