Bladeren bron

查询仓房信息修改;

zlq 1 jaar geleden
bovenliggende
commit
4af0069b1a

+ 2 - 0
src/main/java/com/unissoft/interaction/controller/DataController.java

@@ -13,6 +13,7 @@ import java.util.List;
13
 
13
 
14
 import javax.annotation.Resource;
14
 import javax.annotation.Resource;
15
 
15
 
16
+import com.unissoft.utils.TeDataUtils;
16
 import org.slf4j.Logger;
17
 import org.slf4j.Logger;
17
 import org.slf4j.LoggerFactory;
18
 import org.slf4j.LoggerFactory;
18
 import org.springframework.beans.factory.annotation.Autowired;
19
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +53,7 @@ public class DataController {
52
     @PostMapping("/equipmentTestingEnd")
53
     @PostMapping("/equipmentTestingEnd")
53
     public String equipmentTesting(@RequestBody TeData teData) {
54
     public String equipmentTesting(@RequestBody TeData teData) {
54
         logger.info("接收到硬件的数据为{}", teData);
55
         logger.info("接收到硬件的数据为{}", teData);
56
+    //    TeDataUtils.teData(teData.getRotationxy());
55
         teData.setEtime(new Date());
57
         teData.setEtime(new Date());
56
         //根据唯一的taskId(仓房id+自然增长id)获取仓房id
58
         //根据唯一的taskId(仓房id+自然增长id)获取仓房id
57
         String houseId = teData.getTaskID().split(",")[0];	
59
         String houseId = teData.getTaskID().split(",")[0];	

+ 2 - 2
src/main/java/com/unissoft/systemManage/controller/StorehouseController.java

@@ -47,8 +47,8 @@ public class StorehouseController {
47
     @SystemLog(operModul = "仓房信息", operType = "仓房信息编辑", operDesc = "初始化页面数据")
47
     @SystemLog(operModul = "仓房信息", operType = "仓房信息编辑", operDesc = "初始化页面数据")
48
     @ApiOperation(value = "仓房信息编辑")
48
     @ApiOperation(value = "仓房信息编辑")
49
     @GetMapping("/getStorehouseById")
49
     @GetMapping("/getStorehouseById")
50
-    public ResultView getStorehouseById(@RequestParam int id) {
51
-        Map<String, Object> map = storehouseClxxService.getStorehouseById(id);
50
+    public ResultView getStorehouseById(@RequestParam String id) {
51
+        Map<String, Object> map = storehouseClxxService.getStorehouseById(Long.valueOf(id));
52
         return ResultView.success(map);
52
         return ResultView.success(map);
53
     }
53
     }
54
 
54
 

+ 1 - 1
src/main/java/com/unissoft/systemManage/service/StorehouseClxxService.java

@@ -27,5 +27,5 @@ public interface StorehouseClxxService extends IService<StorehouseClxx> {
27
      * @param id 仓房ID
27
      * @param id 仓房ID
28
      * @return
28
      * @return
29
      */
29
      */
30
-    Map<String,Object> getStorehouseById(int id);
30
+    Map<String,Object> getStorehouseById(Long id);
31
 }
31
 }

+ 1 - 1
src/main/java/com/unissoft/systemManage/service/impl/StorehouseClxxServiceImpl.java

@@ -46,7 +46,7 @@ public class StorehouseClxxServiceImpl extends ServiceImpl<StorehouseClxxMapper,
46
     }
46
     }
47
 
47
 
48
     @Override
48
     @Override
49
-    public Map<String, Object> getStorehouseById(int id) {
49
+    public Map<String, Object> getStorehouseById(Long id) {
50
 
50
 
51
         Map<String, Object> map = new HashMap<>();
51
         Map<String, Object> map = new HashMap<>();
52
 
52