laoyao %!s(int64=2) %!d(string=hai) anos
pai
achega
9be1f0462b

+ 33 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -53,7 +53,11 @@ import org.apache.commons.lang.time.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;
@@ -138,6 +142,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     private WorkpieceService workpieceService;
     @Autowired
     private BBomMapper bBomMapper;
+    @Autowired
+    private RestTemplate restTemplate;
 
 
     @Override
@@ -1109,6 +1115,33 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     public R updateTaskStatus(Map<String, Object> map){
         TTask tTask = baseMapper.selectById(Long.valueOf(map.get("id").toString()));
         String type = map.get("updateType").toString();
+
+
+        HttpHeaders headers = new HttpHeaders();
+        JSONObject jObject = new JSONObject();
+        //jsonObject.put("businessType", taskNode.getAutoNodeCode());
+        String taskNodeId = map.get("taskNodeId").toString();
+        jObject.put("taskId", map.get("id").toString());
+        jObject.put("taskNodeId", taskNodeId);
+        jObject.put("url", "192.168.170.130");
+        jObject.put("port", "102");
+        JSONObject subjsonObject = new JSONObject();
+        subjsonObject.put("content","123");
+        subjsonObject.put("positionIndex","1");
+        jObject.put("data",subjsonObject.toJSONString());
+
+
+        headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8"));
+        HttpEntity<String> formEntity = new HttpEntity<String>(jObject.toJSONString(),headers);
+        //TODO
+        //String instructionUrl = conMap.get("instructionUrl") + "/api/WriteRFID" ;
+        String  returnData = restTemplate.postForObject("", formEntity, String.class);
+
+        if(StringUtil.isNotEmpty(returnData)){
+            return  R.fail("写入rfid失败");
+        }
+
+
         if("begin".equals(type)) {
             if(null == tTask.getStartTime()) {
                 tTask.setStartTime(Calendar.getInstance().getTime());