扫码存样5

cement-business/src/main/java/cn/wise/sc/cement/business/controller/SampleController.java

@@ -112,15 +112,18 @@ public class SampleController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation(value = "APP样品扫码存样", notes = "sampleId,cabinetId")
+	@ApiOperation(value = "APP样品扫码存样")
 	@GetMapping("/sampleScan")
-	public BaseResponse sampleScan(String param) {
+	public BaseResponse sampleScan(String sampleId, String cabinetId) {
 		try {
-			System.out.println("*********psram******"+param);
-			String[] params = param.split(",");
+			System.out.println("*********sampleId******"+sampleId);
+			System.out.println("*********cabinetId******"+cabinetId);
+//			String[] params = param.split(",");
 			SampleScanQuery query = new SampleScanQuery();
-			query.setSampleId(Integer.valueOf(params[0]));
-			query.setCabinetId(Integer.valueOf(params[1]));
+			query.setSampleId(Integer.valueOf(sampleId));
+			query.setCabinetId(Integer.valueOf(cabinetId));
+//			query.setSampleId(Integer.valueOf(params[0]));
+//			query.setCabinetId(Integer.valueOf(params[1]));
 			return sampleService.sampleScan(query);
 		} catch (Exception e) {
 			log.debug("APP样品扫码存样{}", e);
@@ -128,25 +131,33 @@ public class SampleController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation("绑定样品信息")
-	@PutMapping("/bind/savePosition")
-	public BaseResponse<String> bindSavePosition(@RequestBody SampleManageQuery query) {
 
+	@ApiOperation(value = "APP样品扫码样获取品信息")
+	@GetMapping("/sampleScanInfo")
+	public BaseResponse sampleScanInfo(String param) {
 		try {
-			return sampleService.bindSavePosition(query);
+			System.out.println("*********psram******"+param);
+			String[] params = param.split(",");
+			SampleScanQuery query = new SampleScanQuery();
+			query.setSampleId(Integer.valueOf(params[0]));
+			query.setCabinetId(Integer.valueOf(params[1]));
+			return sampleService.sampleScan(query);
 		} catch (Exception e) {
-			log.debug("样品登记{}", e);
+			log.debug("APP样品扫码样获取品信息{}", e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation("样品复查")
+
+	@ApiOperation("样品复查取消复查")
 	@PutMapping("/review")
 	public BaseResponse<Boolean> ampleReview(Integer id) {
 		return sampleService.ampleReview(id);
 	}
 
-	@ApiOperation("获取存储位置二维码")
+
+	//todo 暂时不用？
+	/*@ApiOperation("获取存储位置二维码")
 	@PostMapping("/saverq/init")
 	public BaseResponse<List<String>> getSaveRQ(@RequestBody List<String> savePositions) throws IOException {
 
@@ -165,7 +176,7 @@ public class SampleController {
 		}
 		stream.close();
 		return BaseResponse.okData(rts);
-	}
+	}*/
 
 	@ApiOperation("获取样品二维码")
 	@PostMapping("/samplerq/init")

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleManageQuery.java

@@ -23,8 +23,11 @@ public class SampleManageQuery {
 	@ApiModelProperty("处理提醒时间")
 	private LocalDate handleDate;
 
-	@ApiModelProperty("小样位置 扫码获取的文件柜信息")
-	private String littlePosition;
+	@ApiModelProperty("存储柜表id")
+	private Integer cabinetId;
+
+	/*@ApiModelProperty("小样位置 扫码获取的文件柜信息")
+	private String littlePosition;*/
 
 	@ApiModelProperty("原样位置 样品的原始位置信息")
 	private String originalPosition;

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleService.java

@@ -34,20 +34,7 @@ public interface ISampleService extends IService<Sample> {
 	void export(String sampleName, String cementCode,
 	            String fileName, HttpServletResponse response);
 
-	/**
-	 * 绑定位置信息
-	 *
-	 * @param query 小样绑定位置信息
-	 * @return 成功与否
-	 */
-	BaseResponse<String> bindSavePosition(SampleManageQuery query);
 
-	/**
-	 * 样品复查
-	 *
-	 * @param id 样品id
-	 * @return 复查成功与否
-	 */
 	BaseResponse<Boolean> ampleReview(Integer id);
 
 	/**

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SampleServiceImpl.java

@@ -108,10 +108,18 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         if (sample == null) {
             return BaseResponse.errorMsg("信息错误");
         }
+
+        if (query.getCabinetId() != null) {
+            Cabinet cabinet = cabinetMapper.selectById(query.getCabinetId());
+            if (cabinet == null) {
+                return BaseResponse.errorMsg("存储柜信息错误");
+            }
+            sample.setCabinetId(cabinet.getId())
+                    .setLittlePosition(cabinet.getName());
+        }
         sample.setOperatorId(userService.getLoginUser().getId())
                 .setRegisterTime(LocalDateTime.now())
                 .setHandleDate(query.getHandleDate())
-                .setLittlePosition(query.getLittlePosition())
                 .setOriginalPosition(query.getOriginalPosition())
                 .setRemark(query.getRemark());
         sampleMapper.updateById(sample);
@@ -138,7 +146,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         }
         Cabinet cabinet = cabinetMapper.selectById(query.getCabinetId());
         if (cabinet == null) {
-            return BaseResponse.errorMsg("文件柜信息错误");
+            return BaseResponse.errorMsg("存储柜信息错误");
         }
         sample.setCabinetId(cabinet.getId())
                 .setRegisterTime(LocalDateTime.now())
@@ -217,38 +225,22 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         }
     }
 
-    @Override
-    public BaseResponse<String> bindSavePosition(SampleManageQuery query) {
-
-        if (query.getId() == null) {
-            return BaseResponse.errorMsg("");
-        }
-
-        Sample sample = this.getById(query.getId());
-        sample.setStatus(1);
-        sample.setDestructionTime(LocalDateTime.now());
-        sample.setHandleDate(LocalDate.now());
-
-        sample.setLittlePosition(query.getLittlePosition());
-        sample.setOriginalPosition(query.getOriginalPosition());
-
-        boolean b = this.updateById(sample);
-        if (b) {
-            return BaseResponse.okData("更新成功!");
-        } else {
-            return BaseResponse.errorMsg("更新失败,可以重新尝试!");
-        }
-    }
-
+    /**
+     * 复查取消复查
+     * @param id 样品id
+     * @return
+     */
     @Override
     public BaseResponse<Boolean> ampleReview(Integer id) {
-
         if (id == null) {
             log.debug("样品复查失败!没有指定样品id!");
             return BaseResponse.errorMsg("请指定样品id");
         }
         Sample sample = this.getById(id);
-        sample.setStatus(3);
+        if(sample.getStatus() != 1 && sample.getStatus() != 3 ){
+            return BaseResponse.errorMsg("当前状态不允许复查");
+        }
+        sample.setStatus(sample.getStatus() ==1?3:1);
         boolean b = this.updateById(sample);
         if (b) {
             return BaseResponse.okData(true);