44509 查询条码状态

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesEnumExtService.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.ext.mes.pcn.api.base;
+
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Map;
+
+public interface IMesEnumExtService {
+
+    @ApiOperation("根据枚举名获取枚举")
+    Map<String, Object> doGetMesEnumByEnumName(String organizeCode, String enumName);
+
+}

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesEnumExtService.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.base;
+
+
+import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesEnumExtService;
+import cn.estsh.i3plus.mes.pcn.util.EnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
+import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceEnumUtil;
+import cn.estsh.i3plus.pojo.mes.repository.MesEnumDetailRepository;
+import cn.estsh.i3plus.pojo.mes.repository.MesEnumRepository;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Map;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/30 1:39 PM
+ * @Description:
+ **/
+@Slf4j
+@Service
+@ApiOperation(value = "获取MesEnumUtil")
+public class MesEnumExtService implements IMesEnumExtService {
+
+    @Override
+    public Map<String, Object> doGetMesEnumByEnumName(String organizeCode, String enumName) {
+        Map<String, Object> enumMap;
+        enumMap = getEnumByClazzEnum(enumName, MesExtEnumUtil.class);
+        if (CollectionUtils.isEmpty(enumMap)) enumMap = getEnumByClazzEnum(enumName, MesEnumUtil.class);
+        if (CollectionUtils.isEmpty(enumMap)) enumMap = getEnumByClazzEnum(enumName, MesInterfaceEnumUtil.class);
+        return enumMap;
+    }
+
+    public Map<String, Object> getEnumByClazzEnum(String enumName, Class clz) {
+        return EnumUtil.getEnumByName(clz, enumName);
+    }
+
+
+
+
+}

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesEnumDetailController.java

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi;
 
+import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesEnumExtService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesEnumDetailService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesEnumDetail;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@@ -13,9 +15,11 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : 枚举明细配置
@@ -27,6 +31,8 @@ import java.util.List;
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEnumDetail")
 public class MesEnumDetailController {
+    @Autowired
+    private IMesEnumExtService enumService;
 
     @Autowired
     private IMesEnumDetailService mesEnumDetailService;
@@ -45,4 +51,20 @@ public class MesEnumDetailController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+    @GetMapping(value = "/enumlist")
+    @ApiOperation(value = "获取MES系统枚举")
+    public ResultBean enumlistByOrg(@RequestParam(name = "enumName") String enumName, @RequestParam(name = "organizeCode", required = false) String organizeCode) {
+        try {
+            organizeCode = org.springframework.util.StringUtils.isEmpty(organizeCode) ? AuthUtil.getOrganize().getOrganizeCode() : organizeCode;
+            Map<String, Object> map = enumService.doGetMesEnumByEnumName(organizeCode, enumName);
+            return ResultBean.success("查询成功")
+                    .setResultObject(map)
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }