Merge branch 'feat-oe' into temp-pre

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

@@ -0,0 +1,57 @@
+package com.qunzhixinxi.hnqz.admin.oe;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 租户VO
+ */
+@Data
+public class OeTenantVO {
+
+    /**
+     * 租户id
+     */
+    private Long tenantId;
+
+    /**
+     * 租户名称
+     */
+    private String name;
+
+    /**
+     * 租户编号
+     */
+    private String code;
+
+    /**
+     * 等级名称
+     */
+    private String levelName;
+
+    /**
+     * 权限限制
+     */
+    private String[] permissions;
+
+    /**
+     * 结算渠道
+     */
+    private String[] settleChannels;
+
+    /**
+     * 删除标记
+     */
+    private String delFlagName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime modifiedTime;
+}

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

@@ -0,0 +1,34 @@
+package com.qunzhixinxi.hnqz.admin.oe.controller;
+
+import com.qunzhixinxi.hnqz.common.core.util.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 字典管理
+ */
+@Slf4j
+@RestController
+@RequestMapping("/oe/dict")
+public class OeDictController {
+
+    /**
+     * 通过字典标记查找字典
+     *
+     * @param symbol 字典标记
+     * @return 字典项
+     */
+    @GetMapping("/symbol/{symbol}")
+    public R<?> getDictBySymbol(@PathVariable("symbol") String symbol) {
+        switch (symbol) {
+            case "tenant_level":
+
+            // TODO
+        }
+
+        return null;
+    }
+}

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

@@ -1,9 +1,22 @@
 package com.qunzhixinxi.hnqz.admin.oe.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qunzhixinxi.hnqz.admin.oe.OeTenantVO;
+import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeTenantRequest;
+import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 租户管理
  */
@@ -11,4 +24,140 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/oe/tenant")
 public class OeTenantController {
+
+
+    /**
+     * 保存药企信息
+     *
+     * @param toSaveDrugCompany 参数
+     * @return {@link R}<{@link ?}>
+     */
+    @SysLog("OE保存药企信息")
+    @PostMapping("/drug-company/save")
+    public R<?> saveDrugCompany(@RequestBody OeTenantRequest.ToSaveDrugCompany toSaveDrugCompany) {
+        log.info("OE保存药企信息参数:{}", toSaveDrugCompany);
+        // TODO
+        return R.ok();
+    }
+
+    /**
+     * 保存代理商信息
+     *
+     * @param toSaveCso 拯救方案
+     * @return {@link R}<{@link ?}>
+     */
+    @SysLog("OE保存代理商信息")
+    @PostMapping("/cso/save")
+    public R<?> saveCso(@RequestBody OeTenantRequest.ToSaveCso toSaveCso) {
+        log.info("OE保存代理商信息参数:{}", toSaveCso);
+        // TODO
+        return R.ok();
+    }
+
+    @SysLog("OE保存终端信息")
+    @PostMapping("/terminal/save")
+    public R<?> saveTerminal(@RequestBody OeTenantRequest.ToSaveTerminal toSaveTerminal) {
+        log.info("OE保存终端信息参数:{}", toSaveTerminal);
+        // TODO
+        return R.ok();
+    }
+
+    /**
+     * 药企分页查询
+     *
+     * @param page 分页参数
+     * @param name 药企名称
+     * @param code 统一社会信用代码
+     * @return 分页结果
+     */
+    @GetMapping("/page-drug-company")
+    public R<IPage<OeTenantVO>> pageDrugCompany(Page<OeTenantVO> page, String name, String code) {
+        int total = 20;
+        List<OeTenantVO> list = new ArrayList<>();
+        for (int i = Math.toIntExact(page.getCurrent()); i < page.getSize(); i++) {
+            OeTenantVO oeTenantVO = new OeTenantVO();
+            oeTenantVO.setTenantId((long) i);
+            oeTenantVO.setCode("123456789123456");
+            oeTenantVO.setName("测试药企" + (i));
+            oeTenantVO.setLevelName("药企");
+            oeTenantVO.setPermissions(new String[]{"导出"});
+            oeTenantVO.setSettleChannels(new String[]{"中智","正启之星"});
+            oeTenantVO.setDelFlagName("启用");
+            oeTenantVO.setCreatedTime(LocalDateTime.now());
+            oeTenantVO.setModifiedTime(LocalDateTime.now());
+            list.add(oeTenantVO);
+        }
+
+        page.setRecords(list);
+        page.setTotal(total);
+        page.setPages((total + page.getSize() - 1) / page.getSize());
+
+        return R.ok(page);
+    }
+
+    /**
+     * CSO分页查询
+     *
+     * @param page 分页参数
+     * @param name 药企名称
+     * @param code 统一社会信用代码
+     * @return 分页结果
+     */
+    @GetMapping("/page-cso")
+    public R<IPage<OeTenantVO>> pageCso(Page<OeTenantVO> page, String name, String code) {
+        int total = 20;
+        List<OeTenantVO> list = new ArrayList<>();
+        for (int i = Math.toIntExact(page.getCurrent()); i < page.getSize(); i++) {
+            OeTenantVO oeTenantVO = new OeTenantVO();
+            oeTenantVO.setTenantId((long) i);
+            oeTenantVO.setCode("123456789123456");
+            oeTenantVO.setName("测试代理商" + (i));
+            oeTenantVO.setLevelName("CSO");
+            oeTenantVO.setPermissions(new String[]{"导出"});
+            oeTenantVO.setSettleChannels(new String[]{"中智","正启之星"});
+            oeTenantVO.setDelFlagName("启用");
+            oeTenantVO.setCreatedTime(LocalDateTime.now());
+            oeTenantVO.setModifiedTime(LocalDateTime.now());
+            list.add(oeTenantVO);
+        }
+
+        page.setRecords(list);
+        page.setTotal(total);
+        page.setPages((total + page.getSize() - 1) / page.getSize());
+
+        return R.ok(page);
+    }
+
+    /**
+     * 终端分页查询
+     *
+     * @param page 分页参数
+     * @param name 药企名称
+     * @param code 统一社会信用代码
+     * @return 分页结果
+     */
+    @GetMapping("/page-terminal")
+    public R<IPage<OeTenantVO>> pageTerminal(Page<OeTenantVO> page, String name, String code) {
+        int total = 20;
+        List<OeTenantVO> list = new ArrayList<>();
+        for (int i = Math.toIntExact(page.getCurrent()); i < page.getSize(); i++) {
+            OeTenantVO oeTenantVO = new OeTenantVO();
+            oeTenantVO.setTenantId((long) i);
+            oeTenantVO.setCode("123456789123456");
+            oeTenantVO.setName("测试终端" + (i));
+            oeTenantVO.setLevelName("CSO");
+            oeTenantVO.setPermissions(new String[]{"导出"});
+            oeTenantVO.setSettleChannels(new String[]{"中智","正启之星"});
+            oeTenantVO.setDelFlagName("启用");
+            oeTenantVO.setCreatedTime(LocalDateTime.now());
+            oeTenantVO.setModifiedTime(LocalDateTime.now());
+            list.add(oeTenantVO);
+        }
+
+        page.setRecords(list);
+        page.setTotal(total);
+        page.setPages((total + page.getSize() - 1) / page.getSize());
+
+        return R.ok(page);
+    }
 }

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

@@ -0,0 +1,136 @@
+package com.qunzhixinxi.hnqz.admin.oe.entity.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * oe租户请求
+ *
+ * @author lixuesong
+ * @date 2023/08/04
+ */
+public class OeTenantRequest {
+
+    /**
+     * 保存药企信息
+     *
+     * @author lixuesong
+     * @date 2023/08/04
+     */
+    @Data
+    public static class ToSaveDrugCompany implements Serializable {
+        private static final long serialVersionUID = -2731914147485157197L;
+
+        /**
+         * 租户名称
+         */
+        private String name;
+
+        /**
+         * 租户编号
+         */
+        private String code;
+
+        /**
+         * 权限限制
+         */
+        private String[] permissions;
+
+        /**
+         * 删除标记
+         */
+        private String delFlag;
+    }
+
+    /**
+     * 保存代理商
+     *
+     * @author lixuesong
+     * @date 2023/08/04
+     */
+    @Data
+    public static class ToSaveCso implements Serializable {
+        private static final long serialVersionUID = -3930419806595107388L;
+        
+        /**
+         * 租户名称
+         */
+        private String name;
+
+        /**
+         * 租户编号
+         */
+        private String code;
+
+        /**
+         * 代理商类型
+         */
+        private String csoType;
+
+        /**
+         * 推广药品
+         */
+        private Long medicineId;
+
+        /**
+         * 营业执照
+         */
+        private String[] licenseUrl;
+
+        /**
+         * 社保缴纳证明
+         */
+        private String[] socialSecurityUrl;
+
+        /**
+         * 删除标记
+         */
+        private String delFlag;
+    }
+
+    /**
+     * 保存终端参数
+     *
+     * @author lixuesong
+     * @date 2023/08/04
+     */
+    @Data
+    public static class ToSaveTerminal implements Serializable {
+        private static final long serialVersionUID = 3015462481533357880L;
+
+        /**
+         * 租户名称
+         */
+        @NotBlank(message = "企业名称必填")
+        private String name;
+
+        /**
+         * 租户编号
+         */
+        @NotBlank(message = "统一社会信用代码必填")
+        private String code;
+
+        /**
+         * 推广药品
+         */
+        private Long medicineId;
+
+        /**
+         * 营业执照
+         */
+        private String[] licenseUrl;
+
+        /**
+         * 社保缴纳证明
+         */
+        private String[] socialSecurityUrl;
+
+        /**
+         * 删除标记
+         */
+        private String delFlag;
+    }
+}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/SysTenantService.java → hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/OeTenantService.java

@@ -1,4 +1,4 @@
 package com.qunzhixinxi.hnqz.admin.oe.service;
 
-public interface SysTenantService {
+public interface OeTenantService {
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/impl/OeTenantServiceImpl.java

@@ -1,8 +1,15 @@
 package com.qunzhixinxi.hnqz.admin.oe.service.impl;
 
-import com.qunzhixinxi.hnqz.admin.oe.service.SysTenantService;
+import com.qunzhixinxi.hnqz.admin.oe.service.OeTenantService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+/**
+ * 租户服务层
+ */
+@Slf4j
 @Service
-public class OeTenantServiceImpl implements SysTenantService {
+@AllArgsConstructor
+public class OeTenantServiceImpl implements OeTenantService {
 }