待测试

src/main/java/cn/fastfun/controller/api/ApiAppDeviceLogController.java

@@ -76,6 +76,7 @@ public class ApiAppDeviceLogController {
                 device.setImei(ObjectUtil.obj2String(p.get("imei")));
                 appDeviceService.addImeiTitle(device);
 
+
                 p.put("type_title", device.getTypeTitle());
                 p.put("pack_title", device.getPackTitle());
                 p.put("deliver_time", DateUtils.toString(ObjectUtil.obj2Date(p.get("deliver_time")), DateUtils.YMD));
@@ -86,8 +87,47 @@ public class ApiAppDeviceLogController {
         }
         return page;
     }
-
-    @ApiOperation(value = "入库设备 搜索 & 重置")
+//    @ApiOperation(value = "批次入库 --> 入库 搜索 & 重置")
+//    @RequestMapping(value = "instorage/batch/inStorageQuery", method = RequestMethod.POST)
+//    public ApiPageDTO inStorageBatchQuery(@RequestBody DeviceBatchQueryParam param) {
+//
+//        StringBuffer sql = new StringBuffer();
+//        sql.append("select t1.batch_num,t1.sn,t1.imei,t1.deliver_time,count(0) as total,count(if(status = 1,true,null)) as in_storage,count(if(status = 2,true,null)) as transfer,");
+//        sql.append("count(if(status = 3,true,null)) as out_storage,count(if(status = 4,true,null)) as handle,");
+//        sql.append("t1.add_time,t1.received_place from app_device t1");
+//
+//        if (!StringUtils.isEmpty(param.getBatchNum())) {
+//            sql.append(" where t1.batch_num like '%").append(param.getBatchNum()).append("%'");
+//        }
+//        sql.append(" group by t1.batch_num");
+//        if (!StringUtils.isEmpty(param.getOrderBy())) {
+//            sql.append(param.getOrderBy());
+//        }
+//        log.info("SQL: {}", sql.toString());
+//
+//
+//        ApiPageDTO page = appDeviceService.getListBySQL(sql.toString(), new HashMap<>(), param);
+//        if (null != page.getData()) {
+//            // 组装数据
+//            List<Map<String, Object>> list = (List<Map<String, Object>>) page.getData();
+//            for (Map<String, Object> p : list) {
+//                AppDevice device = new AppDevice();
+//                device.setImei(ObjectUtil.obj2String(p.get("imei")));
+//                appDeviceService.addImeiTitle(device);
+//
+//
+//                p.put("type_title", device.getTypeTitle());
+//                p.put("pack_title", device.getPackTitle());
+//                p.put("deliver_time", DateUtils.toString(ObjectUtil.obj2Date(p.get("deliver_time")), DateUtils.YMD));
+//                p.put("add_time", DateUtils.toString(ObjectUtil.obj2Date(p.get("add_time")), DateUtils.YMDHMS));
+//                p.put("operator", "admin");
+//            }
+//            page.setData(list);
+//        }
+//        return page;
+//    }
+
+    @ApiOperation(value = "设备入库 搜索 & 重置")
     @RequestMapping(value = "instorage/pageQuery", method = RequestMethod.POST)
     public ApiPageDTO inStoragePageQuery(@RequestBody LibraryInQueryParam param) {
 
@@ -118,8 +158,9 @@ public class ApiAppDeviceLogController {
                 pTemp.put("type_title", device.getTypeTitle());
                 pTemp.put("pack_title", device.getPackTitle());
                 pTemp.put("batch_num", appDevice.getBatchNum());
-                pTemp.put("status", device.getStatus());
+                pTemp.put("status", appDevice.getStatus());
                 pTemp.put("received_place", appDevice.getReceivedPlace());
+                pTemp.put("deliver_time", DateUtils.toString(ObjectUtil.obj2Date(appDevice.getDeliverTime()), DateUtils.YMD));
                 pTemp.put("operator", "admin");
                 listRes.add(pTemp);
             }
@@ -179,7 +220,7 @@ public class ApiAppDeviceLogController {
 
     @ApiOperation(value = "新增调拨 --> 选择设备 查询 & 重置")
     @RequestMapping(value = "transfer/bySn/pageQuery", method = RequestMethod.POST)
-    public ApiPageDTO transferBySnpageQuery(@RequestBody TransferBySnQueryParam param) {
+    public ApiPageDTO transferBySnPageQuery(@RequestBody TransferBySnQueryParam param) {
 
         QueryParam query = new QueryParam();
         if (!StringUtils.isEmpty(param)) {
@@ -198,8 +239,7 @@ public class ApiAppDeviceLogController {
 
     @ApiOperation(value = "新增调拨 --> 选择批次 查询 & 重置")
     @RequestMapping(value = "transfer/byBatch/pageQuery", method = RequestMethod.POST)
-    public ApiPageDTO transferByBatchpageQuery(@RequestBody DeviceBatchQueryParam param) {
-        //@ToDo: 添加各种状态
+    public ApiPageDTO transferByBatchPageQuery(@RequestBody DeviceBatchQueryParam param) {
         StringBuffer sql = new StringBuffer();
         sql.append("select t1.batch_num,t1.sn,t1.deliver_time,count(0) as total,count(if(status = 1,true,null)) as in_storage,count(if(status = 2,true,null)) as transfer,");
         sql.append("count(if(status = 3,true,null)) as out_storage,count(if(status = 4,true,null)) as handle,");
@@ -236,7 +276,7 @@ public class ApiAppDeviceLogController {
     }
 
     @ApiOperation(value = "调回平台 搜索 & 重置")
-    @RequestMapping(value = "transfer/bySn/pageQuery", method = RequestMethod.POST)
+    @RequestMapping(value = "transferBack/pageQuery", method = RequestMethod.POST)
     public ApiPageDTO transferBackPageQuery(@RequestBody TransferBySnQueryParam param) {
 
         QueryParam query = new QueryParam();
@@ -257,7 +297,7 @@ public class ApiAppDeviceLogController {
     }
 
     @ApiOperation(value = "设备出库 搜索 & 重置")
-    @RequestMapping(value = "batchNum/pageQuery", method = RequestMethod.POST)
+    @RequestMapping(value = "outstorage/pageQuery", method = RequestMethod.POST)
     public ApiPageDTO outPageQuery(@RequestBody OutQueryParam param) {
         StringBuffer sql = new StringBuffer("select t.batch_num,t.add_time,count(0) as total,t.out_type,t.receiver_name,t.receiver_phone,t.remarks,t.out_custom_id,t.operator,t.update_time from app_device_log t where t.type = 3");
 
@@ -306,14 +346,14 @@ public class ApiAppDeviceLogController {
         return new ApiPageDTO(null, deviceLogPage);
     }
 
-    @ApiOperation(value = "处置")
+    @ApiOperation(value = "新增处置")
     @RequestMapping(value = "handle", method = RequestMethod.POST)
     public ApiDTO handle(@RequestBody @ApiParam(name = "出库参数", value = "传入json格式", required = true) HandelFormParam param) {
         deviceLogService.handle(param);
         return ApiDTO.ok();
     }
 
-    @ApiOperation(value = "处置搜索列表")
+    @ApiOperation(value = "处置 搜索 & 重置")
     @RequestMapping(value = "handle/pageQuery", method = RequestMethod.POST)
     public ApiPageDTO deviceLogPageQuery(@RequestBody HandelQueryParam param) {
         param.addParam(QueryParamExp.eq("type", 3));

src/main/java/cn/fastfun/controller/param/TransferBySnQueryParam.java

@@ -1,5 +1,6 @@
 package cn.fastfun.controller.param;
 
+import com.bridge.dto.QueryParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -8,7 +9,7 @@ import java.util.List;
 
 @Setter
 @Getter
-public class TransferBySnQueryParam {
+public class TransferBySnQueryParam extends QueryParam {
     
     @ApiModelProperty(value = "设备编号", name = "sn")
     private String sn;