fix：齐套性检测优化

imcs-admin-boot/imcs-authority-biz/src/main/java/com/github/zuihou/authority/service/common/DictionaryItemService.java

@@ -4,6 +4,7 @@ import com.github.zuihou.authority.entity.common.DictionaryItem;
 import com.github.zuihou.base.service.SuperCacheService;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -25,6 +26,14 @@ public interface DictionaryItemService extends SuperCacheService<DictionaryItem>
      */
     Map<String, Map<String, String>> map(String[] types);
 
+    /**
+     * 根据类型查询字典
+     *
+     * @param types
+     * @return
+     */
+    Map<String, List<DictionaryItem>> list(String[] types);
+
     /**
      * 根据类型查询字典对象
      *

imcs-admin-boot/imcs-authority-biz/src/main/java/com/github/zuihou/authority/service/common/impl/DictionaryItemServiceImpl.java

@@ -80,6 +80,23 @@ public class DictionaryItemServiceImpl extends SuperCacheServiceImpl<DictionaryI
         return typeCodeNameMap;
     }
 
+    @Override
+    public  Map<String, List<DictionaryItem>>  list(String[] types) {
+        if (ArrayUtil.isEmpty(types)) {
+            return Collections.emptyMap();
+        }
+        LbqWrapper<DictionaryItem> query = Wraps.<DictionaryItem>lbQ()
+                .in(DictionaryItem::getDictionaryType, types)
+                .eq(DictionaryItem::getStatus, true)
+                .orderByAsc(DictionaryItem::getSortValue);
+        List<DictionaryItem> list = super.list(query);
+
+        //key 是类型
+        Map<String, List<DictionaryItem>> typeMap = list.stream().collect(groupingBy(DictionaryItem::getDictionaryType, LinkedHashMap::new, toList()));
+
+        return typeMap;
+    }
+
 
     @Override
     public Map<String, Map<String, DictionaryItem>> mapObj(String[] types) {

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

@@ -289,13 +289,13 @@ public class CutterTestDataServiceImpl extends SuperServiceImpl<CutterTestDataMa
         if (result) {
             cutterTestDataEntity.setStatus(3);
             //新增或修改刀具数据
-            this.saveOrUpdate(cutterTestDataEntity, queryWrapper2);
+            this.update(cutterTestDataEntity, queryWrapper2);
             return true;
         }else {
             cutterTestDataEntity.setStatus(4);
             //新增或修改刀具数据
-            this.saveOrUpdate(cutterTestDataEntity, queryWrapper2);
-            throw new RuntimeException("刀具信息写入失败，刀柄号："+ cuttingToolNo+"错误信息："+ s);
+            this.update(cutterTestDataEntity, queryWrapper2);
+            return true;
         }
 
     }

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

@@ -194,6 +194,7 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
                         machineCuttingTool.setCuttingToolInstallPicture(cuttingTool.getCuttingToolInstallPicture());
                     }
                     machineCuttingTool.setCuttingToolPosition(position);
+                    machineCuttingTool.setKnifepStandNumber(Double.parseDouble(position.replace("1.","")));
                     String cuttingToolType = tool.getString("monitorType");
                     machineCuttingTool.setCuttingToolType(cuttingToolType);
                     machineCuttingTool.setEarlyWarnning(tool.getString("targetLife"));

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/MachineCuttingToolController.java

@@ -52,7 +52,8 @@ public class MachineCuttingToolController extends SuperCacheController<MachineCu
         MachineCuttingToolPageDTO machineCuttingToolPage = params.getModel();
         QueryWrap<MachineCuttingTool> wrap = handlerWrapper(null, params);
         LbqWrapper<MachineCuttingTool> wrapper = wrap.lambda();
-        wrapper.eq(MachineCuttingTool::getMachineId, machineCuttingToolPage.getMachineId());
+        wrapper.eq(MachineCuttingTool::getMachineId, machineCuttingToolPage.getMachineId())
+                .orderByAsc(MachineCuttingTool::getKnifepStandNumber);
         baseService.findPage(page, wrapper);
     }
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/MachineCuttingTool.java

@@ -46,6 +46,28 @@ public class MachineCuttingTool extends Entity<Long> {
 
     private Long id;
 
+
+    /**
+     * 刀具位置
+     */
+    @ApiModelProperty(value = "刀具位置")
+    @TableField(value = "cutting_tool_position", condition = LIKE)
+    @Excel(name = "刀具位置")
+    private String cuttingToolPosition;
+
+    @ApiModelProperty(value = "刀架号")
+    @TableField(value = "knifep_stand_number", condition = LIKE)
+    @Excel(name = "刀架号")
+    private double knifepStandNumber;
+
+    /**
+     * 机床刀具id
+     */
+    @ApiModelProperty(value = "机床刀具id")
+    @TableField(value = "cutting_tool_id", condition = LIKE)
+    @Excel(name = "机床刀具id")
+    private String cuttingToolId;
+
     /**
      * 刀具名称
      */
@@ -127,13 +149,6 @@ public class MachineCuttingTool extends Entity<Long> {
     @Excel(name = "极限预警")
     private String earlyWarnning;
 
-    /**
-     * 机床刀具id
-     */
-    @ApiModelProperty(value = "机床刀具id")
-    @TableField(value = "cutting_tool_id", condition = LIKE)
-    @Excel(name = "机床刀具id")
-    private String cuttingToolId;
 
     /**
      * 姊妹刀号
@@ -151,14 +166,6 @@ public class MachineCuttingTool extends Entity<Long> {
     @Excel(name = "刀沿号")
     private String knifeEdgeNumber;
 
-    /**
-     * 刀具位置
-     */
-    @ApiModelProperty(value = "刀具位置")
-    @TableField(value = "cutting_tool_position", condition = LIKE)
-    @Excel(name = "刀具位置")
-    private String cuttingToolPosition;
-
     /**
      * 机床同步刀具类型
      */

imcs-admin-boot/imcs-oauth-controller/src/main/java/com/github/zuihou/oauth/controller/OauthDictionaryItemController.java

@@ -1,6 +1,7 @@
 package com.github.zuihou.oauth.controller;
 
 
+import com.github.zuihou.authority.entity.common.DictionaryItem;
 import com.github.zuihou.authority.service.common.DictionaryItemService;
 import com.github.zuihou.base.R;
 import io.swagger.annotations.Api;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -53,4 +55,10 @@ public class OauthDictionaryItemController {
         return R.success(this.dictionaryItemService.map(types));
     }
 
+    @ApiOperation(value = "根据类型编码查询字典项", notes = "根据类型编码查询字典项")
+    @GetMapping("codes2")
+    public R< Map<String, List<DictionaryItem>>> list2(@RequestParam("codes[]") String[] types) {
+        return R.success(this.dictionaryItemService.list(types));
+    }
+
 }