后台代码更新

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -941,7 +941,7 @@ public class TaskWorkNode {
         bizJsonObject.put("aimStorge", aimStorge == null ? "" : aimStorge.getId().toString());
         bizJsonObject.put("bizType", bizType);
         bizJsonObject.put("handMode", handMode);
-        bizJsonObject.put("taskType", DictionaryKey.CARRY_TYPE.get("TRAY_HAND"));
+        bizJsonObject.put("taskType", conMap.get("taskType"));
 
         if(data.containsKey("locationNo")){
             bizJsonObject.put("locationNo", data.get("locationNo").toString());

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/MachineCuttingToolService.java

@@ -43,6 +43,6 @@ public interface MachineCuttingToolService extends SuperCacheService<MachineCutt
      * 同步设备刀具
      * @param
      */
-    void sysCuttingTools(MachineCuttingTool machineCuttingTool) throws Exception;
+    List<MachineCuttingTool> sysCuttingTools(MachineCuttingTool machineCuttingTool) throws Exception;
 
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/MachineCuttingToolServiceImpl.java

@@ -31,7 +31,9 @@ import com.github.zuihou.tenant.dao.ProductionresourceviewMapper;
 import com.github.zuihou.tenant.entity.Productionresource;
 import com.github.zuihou.tenant.service.ProductionresourceService;
 import com.github.zuihou.utils.BeanPlusUtil;
+import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
@@ -44,6 +46,7 @@ import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
@@ -94,10 +97,15 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
     }
 
     @Override
-    public void sysCuttingTools(MachineCuttingTool data) throws Exception{
+    public List<MachineCuttingTool> sysCuttingTools(MachineCuttingTool data) throws Exception{
         BaseContextHandler.setTenant("0000");
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
+        List<MachineCuttingTool> dataList = Lists.newArrayList();
+        int num = data.getIds().size();
+        if( num == 0 ) return dataList;
+        Map<Long, MachineCuttingTool> map = Maps.newConcurrentMap();
+
         for(long resourceId : data.getIds()){
             String paramKey = "hostSystemUrl";
             String plcUrl = (null == msgUtil.redis_get(ParameterKey.PARAMETERS)? "": ((Map<String,String>)msgUtil.redis_get(ParameterKey.PARAMETERS)).get(paramKey).toString());
@@ -125,11 +133,6 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
             productionresource.setToolSynTime(DateUtil.formatTime(Calendar.getInstance().getTime()));
             productionresource.setToolNum(upResult.size());
             productionresourceviewMapper.updateById(productionresource);
-            /*
-            List<MachineCuttingTool> machineCuttingToolList = machineCuttingToolService.list(new LbqWrapper<MachineCuttingTool>().eq(MachineCuttingTool::getMachineId, resourceId));
-            machineCuttingToolList.stream().filter(item -> {
-                
-            }); */
 
             baseMapper.delete(Wraps.<MachineCuttingTool>lbQ().eq(MachineCuttingTool::getMachineId, resourceId).eq(MachineCuttingTool::getStatus,"0"));
             for(int i = 0; i<upResult.size(); i++){
@@ -154,10 +157,16 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
                 //machineCuttingTool.setSisterCuttingToolId(tool.getString("sisterNo"));
                 //machineCuttingTool.setKnifeEdgeNumber(tool.getString("toolEdgeNo"));
                 //machineCuttingTool.setCuttingToolRadius(tool.getString("toolRadius"));
-                machineCuttingTool.setTl(tool.getString("tl"));
+                String tl = tool.getString("tl");
+                machineCuttingTool.setTl(tl);
                 baseMapper.insert(machineCuttingTool);
+                if(map.containsKey(resourceId) && tl.equals("L")){
+                    map.put(resourceId, machineCuttingTool);
+                }
             }
         }
+        dataList = new ArrayList<MachineCuttingTool>(map.values());
+        return dataList;
     }
 
     @Override

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/strategy/impl/CacheRobotStrategy.java

@@ -272,7 +272,10 @@ public class CacheRobotStrategy implements RobotStrategy {
             returnMap.put(YunjianConstant.YUNJIAN_HCW_XBKFLAG, "1");
             msgUtil.redis_set(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_STORE + taskNode.getId(), targetStorge, 10, TimeUnit.DAYS);
         } else {
-            //暂存位无占用直接处理(即size>1或者size=0)
+            //暂存位优先级处理判断
+            if(hcwList.size()==1){
+                targetStorge = hcwStorge;
+            }
             if (targetXbk.equals("0")) {
                 //目标缓存
                 msgUtil.redis_set(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_STORE + taskNode.getId(), targetStorge, 10, TimeUnit.DAYS);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/strategy/impl/ToolRobotStrategy.java

@@ -154,7 +154,7 @@ public class ToolRobotStrategy implements RobotStrategy {
             //从机床刀具库取需要预置处理
             Object cutToolAction = msgUtil.redis_get(DemoLineConstant.DEMOLINE_CUT_DEVICE_ACTION);
             if(ObjectUtil.isEmpty(cutToolAction)){
-                this.CNCTActionHandle(taskNode, false, pointId, orderTask);
+                //this.CNCTActionHandle(taskNode, false, pointId, orderTask);
                 msgUtil.redis_set(DemoLineConstant.DEMOLINE_CUT_DEVICE_ACTION, taskNode.getId().toString(),10, TimeUnit.MINUTES);
                 dataMap.put("result", false);
                 dataMap.put("resultMsg","已下发CNC刀具口请求");

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/ToolController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.controller.SuperController;
 import com.github.zuihou.base.request.PageParams;
+import com.github.zuihou.business.controller.operationManagementCenter.ToolbarController;
 import com.github.zuihou.business.productionReadyCenter.entity.MachineCuttingTool;
 import com.github.zuihou.business.productionReadyCenter.service.MachineCuttingToolService;
 import com.github.zuihou.business.productionResourceCenter.dto.ToolPageDTO;
@@ -17,6 +18,7 @@ import com.github.zuihou.business.productionResourceCenter.service.ToolService;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.log.annotation.SysLog;
+import com.google.common.collect.Maps;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -55,6 +58,8 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
     @Autowired
     private MachineCuttingToolService machineCuttingToolService;
 
+    @Autowired
+    private ToolbarController toolbarController;
 
     @Override
     public void query(PageParams<ToolPageDTO> params, IPage<Tool> page, Long defSize) {
@@ -100,8 +105,23 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
         MachineCuttingTool machineCuttingTool = new MachineCuttingTool();
         machineCuttingTool.setIds(ids);
         //同步更新处理
-        machineCuttingToolService.sysCuttingTools(machineCuttingTool);
-        //同步添加天轨处理订单
+        List<MachineCuttingTool> cutToolList = machineCuttingToolService.sysCuttingTools(machineCuttingTool);
+
+        if(cutToolList.size()>0){
+            cutToolList.stream().filter(item->{
+                //同步添加天轨处理订单
+                Map<String,String> data = Maps.newHashMap();
+                data.put("start","CT_"+);
+                data.put("goalType","");
+                data.put("goal","");
+                data.put("goal","");
+                toolbarController.addCutToolTask(data);
+            });
+        }
+
+
+
+
 
         return R.success();
     }