feat: oe字典

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeDictController.java

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.oe.controller;
 
+import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeDictItemVO;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -7,6 +8,9 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 字典管理
  */
@@ -22,11 +26,42 @@ public class OeDictController {
      * @return 字典项
      */
     @GetMapping("/symbol/{symbol}")
-    public R<?> getDictBySymbol(@PathVariable("symbol") String symbol) {
+    public R<List<OeDictItemVO>> getDictBySymbol(@PathVariable("symbol") String symbol) {
+        List<OeDictItemVO> list = new ArrayList<>();
         switch (symbol) {
             case "tenant_level":
-
-            // TODO
+                OeDictItemVO itemVO = OeDictItemVO.builder().build();
+                itemVO.setDictSymbol("tenant_level");
+                itemVO.setLabel("药企");
+                itemVO.setItemValue("ENT");
+                list.add(itemVO);
+                OeDictItemVO itemVO2 = OeDictItemVO.builder().build();
+                itemVO2.setDictSymbol("tenant_level");
+                itemVO2.setLabel("CSO");
+                itemVO2.setItemValue("CSO");
+                list.add(itemVO2);
+                OeDictItemVO itemVO3 = OeDictItemVO.builder().build();
+                itemVO3.setDictSymbol("tenant_level");
+                itemVO3.setLabel("终端");
+                itemVO3.setItemValue("TERMINAL");
+                list.add(itemVO3);
+                break;
+            case "loc_flag":
+                list.add(OeDictItemVO.builder().dictSymbol("loc_flag").label("启用").itemValue("OK").build());
+                list.add(OeDictItemVO.builder().dictSymbol("loc_flag").label("停用").itemValue("LOC").build());
+                break;
+            case "del_flag":
+                list.add(OeDictItemVO.builder().dictSymbol("del_flag").label("正常").itemValue("OK").build());
+                list.add(OeDictItemVO.builder().dictSymbol("del_flag").label("删除").itemValue("DEL").build());
+                break;
+            case "permissions":
+                list.add(OeDictItemVO.builder().dictSymbol("permissions").label("导出").itemValue("EXPORT").build());
+                break;
+            case "cso_type":
+                list.add(OeDictItemVO.builder().dictSymbol("cso_type").label("团队").itemValue("CSO_TEAM").build());
+                list.add(OeDictItemVO.builder().dictSymbol("cso_type").label("公司").itemValue("CSO_ENT").build());
+                break;
+            default:
         }
 
         return null;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeUserController.java

@@ -0,0 +1,23 @@
+package com.qunzhixinxi.hnqz.admin.oe.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeUserVO;
+import com.qunzhixinxi.hnqz.common.core.util.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * oe用户管理控制器
+ *
+ * @author lixuesong
+ * @date 2023/08/07
+ */
+@Slf4j
+@RestController
+@RequestMapping("/oe/user")
+public class OeUserController {
+
+//    public R<IPage<OeUserVO>>
+
+}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/dto/OeTenantRequest.java

@@ -40,12 +40,7 @@ public class OeTenantRequest {
         private String[] permissions;
 
         /**
-         * 删除标记
-         */
-        private String delFlag;
-
-        /**
-         * 锁定标记
+         * 锁定标记(OK-正常,LOC-已锁定)
          */
         private String locFlag;
     }
@@ -80,11 +75,6 @@ public class OeTenantRequest {
          */
         private String[] permissions;
 
-        /**
-         * 删除标记
-         */
-        private String delFlag;
-
         /**
          * 锁定标记
          */
@@ -132,12 +122,7 @@ public class OeTenantRequest {
         private String[] socialSecurityUrl;
 
         /**
-         * 删除标记
-         */
-        private String delFlag;
-
-        /**
-         * 锁定标记
+         * 锁定标记(OK-正常,LOC-已锁定)
          */
         private String locFlag;
     }
@@ -188,12 +173,7 @@ public class OeTenantRequest {
         private String[] socialSecurityUrl;
 
         /**
-         * 删除标记
-         */
-        private String delFlag;
-
-        /**
-         * 锁定标记
+         * 锁定标记(OK-正常,LOC-已锁定)
          */
         private String locFlag;
     }
@@ -236,12 +216,7 @@ public class OeTenantRequest {
         private String[] socialSecurityUrl;
 
         /**
-         * 删除标记
-         */
-        private String delFlag;
-
-        /**
-         * 锁定标记
+         * 锁定标记(OK-正常,LOC-已锁定)
          */
         private String locFlag;
     }
@@ -284,12 +259,7 @@ public class OeTenantRequest {
         private String[] socialSecurityUrl;
 
         /**
-         * 删除标记
-         */
-        private String delFlag;
-
-        /**
-         * 锁定标记
+         * 锁定标记(OK-正常,LOC-已锁定)
          */
         private String locFlag;
     }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeDictItemVO.java

@@ -0,0 +1,37 @@
+package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Builder
+@Data
+public class OeDictItemVO implements Serializable {
+    private static final long serialVersionUID = 1779251692675598313L;
+
+    /**
+     * 所属字典类id
+     */
+    private Long dictId;
+
+    /**
+     * 数据值
+     */
+    private String itemValue;
+
+    /**
+     * 标签名
+     */
+    private String label;
+
+    /**
+     * 类型
+     */
+    private String dictSymbol;
+
+    /**
+     * 描述
+     */
+    private String description;
+}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeMedicineVO.java

@@ -2,6 +2,7 @@ package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -11,7 +12,9 @@ import java.time.LocalDateTime;
  * @date 2023/08/07
  */
 @Data
-public class OeMedicineVO {
+public class OeMedicineVO implements Serializable {
+
+    private static final long serialVersionUID = -6120119934476311908L;
 
     /**
      * 主键id

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeTenantVO.java

@@ -2,13 +2,16 @@ package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
  * 租户VO
  */
 @Data
-public class OeTenantVO {
+public class OeTenantVO implements Serializable {
+
+    private static final long serialVersionUID = -8127002006960529514L;
 
     /**
      * 租户id
@@ -25,6 +28,11 @@ public class OeTenantVO {
      */
     private String code;
 
+    /**
+     * 等级
+     */
+    private String level;
+
     /**
      * 等级名称
      */
@@ -41,7 +49,7 @@ public class OeTenantVO {
     private String[] settleChannels;
 
     /**
-     * 删除标记
+     * 删除标记(OK-正常,DEL-已删除)
      */
     private String delFlag;
 
@@ -51,7 +59,7 @@ public class OeTenantVO {
     private String delFlagName;
 
     /**
-     * 锁定标记
+     * 锁定标记(OK-正常,LOC-已锁定)
      */
     private String locFlag;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeUserVO.java

@@ -0,0 +1,18 @@
+package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * oe用户VO
+ *
+ * @author lixuesong
+ * @date 2023/08/07
+ */
+@Data
+public class OeUserVO implements Serializable {
+    private static final long serialVersionUID = 1389173392702921120L;
+
+
+}