瀏覽代碼

refactor: 删除无用代码

lixuesong 1 年之前
父節點
當前提交
eb76a66828
共有 22 個文件被更改,包括 0 次插入2019 次删除
  1. 0 73
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeDictController.java
  2. 0 46
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeFileController.java
  3. 0 111
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeMedicineController.java
  4. 0 108
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeTeamController.java
  5. 0 326
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeTenantController.java
  6. 0 110
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeUserController.java
  7. 0 126
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/dto/OeMedicineRequest.java
  8. 0 73
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/dto/OeTeamRequest.java
  9. 0 321
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/dto/OeTenantRequest.java
  10. 0 167
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/dto/OeUserRequest.java
  11. 0 37
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeDictItemVO.java
  12. 0 88
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeMedicineVO.java
  13. 0 47
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeTeamVO.java
  14. 0 80
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeTenantVO.java
  15. 0 72
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeTerminalVO.java
  16. 0 112
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeUserVO.java
  17. 0 10
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/OeDictService.java
  18. 0 4
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/OeTenantService.java
  19. 0 25
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/OeUserService.java
  20. 0 28
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/impl/OeDictServiceImpl.java
  21. 0 15
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/impl/OeTenantServiceImpl.java
  22. 0 40
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/impl/OeUserServiceImpl.java

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

@@ -1,73 +0,0 @@
-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;
-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;
-
-/**
- * 字典管理
- */
-@Slf4j
-@RestController
-@RequestMapping("/oe/dict")
-public class OeDictController {
-
-    /**
-     * 通过字典标记查找字典
-     *
-     * @param symbol 字典标记
-     * @return 字典项
-     */
-    @GetMapping("/symbol/{symbol}")
-    public R<List<OeDictItemVO>> getDictBySymbol(@PathVariable("symbol") String symbol) {
-        List<OeDictItemVO> list = new ArrayList<>();
-        switch (symbol) {
-            case "tenant_level":
-                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;
-            case "drug_type":
-                list.add(OeDictItemVO.builder().dictSymbol("drug_type").label("原研").itemValue("RLD").build());
-                list.add(OeDictItemVO.builder().dictSymbol("drug_type").label("仿制").itemValue("ANDA").build());
-                break;
-            default:
-        }
-
-        return R.ok(list);
-    }
-}

+ 0 - 46
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeFileController.java

@@ -1,46 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.controller;
-
-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.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * oe文件控制器
- *
- * @author lixuesong
- * @date 2023/08/08
- */
-@Slf4j
-@RestController
-@RequestMapping("/oe/file")
-public class OeFileController {
-
-    /**
-     * 文件上传
-     *
-     * @param file 文件
-     * @return {@link R}<{@link Map}<{@link String}, {@link String}>>
-     */
-    @SysLog("OE文件上传")
-    @PostMapping("/upload")
-    public R<Map<String, String>> upload(@RequestParam("file") MultipartFile file) {
-        log.info("OE文件上传参数:name={},size={},content-type={}", file.getOriginalFilename(), file.getSize(), file.getContentType());
-
-        // TODO
-
-        Map<String, String> resultMap = new HashMap<>(3);
-        resultMap.put("bucketName", "wmkj");
-        resultMap.put("fileName", "1f537bfcb30647889d5746403b2ce661.png");
-        resultMap.put("url", "/admin/sys-file/wmkj/1f537bfcb30647889d5746403b2ce661.png");
-
-        return R.ok(resultMap);
-    }
-}

+ 0 - 111
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeMedicineController.java

@@ -1,111 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.beust.jcommander.internal.Maps;
-import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeMedicineRequest;
-import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeMedicineVO;
-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.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * oe药品管理控制器
- *
- * @author lixuesong
- * @date 2023/08/07
- */
-@Slf4j
-@RestController
-@RequestMapping("/oe/medicine")
-public class OeMedicineController {
-
-    /**
-     * oe药品保存
-     *
-     * @param toSaveMedicine 保存参数
-     * @return {@link R}<{@link ?}>
-     */
-    @SysLog("oe药品保存")
-    @PostMapping("/save")
-    public R<?> saveMedicine(@RequestBody OeMedicineRequest.ToSaveMedicine toSaveMedicine) {
-        log.info("oe药品保存参数:{}", toSaveMedicine);
-        // TODO
-        return R.ok();
-    }
-
-    /**
-     * oe药品更新
-     *
-     * @param toUpdateMedicine 保存参数
-     * @return {@link R}<{@link ?}>
-     */
-    @SysLog("oe药品更新")
-    @PostMapping("/update")
-    public R<?> updateMedicine(@RequestBody OeMedicineRequest.ToUpdateMedicine toUpdateMedicine) {
-        log.info("oe药品更新参数:{}", toUpdateMedicine);
-        // TODO
-        return R.ok();
-    }
-
-    /**
-     * 推广药品列表
-     *
-     * @return {@link R}<{@link List}<{@link Map}<{@link String}, {@link String}>>>
-     */
-    @GetMapping("/list-tenant-medicine")
-    public R<List<Map<String, String>>> listTenantMedicine() {
-        List<Map<String, String>> list = new ArrayList<Map<String, String>>() {{
-            add(Maps.newHashMap("id", "1", "name", "药品1"));
-            add(Maps.newHashMap("id", "2", "name", "药品2"));
-            add(Maps.newHashMap("id", "3", "name", "药品3"));
-        }};
-
-        return R.ok(list);
-    }
-
-    /**
-     * 分页查询药品
-     *
-     * @param page                 分页参数
-     * @param name                 名称
-     * @param commonName           通用名称
-     * @param productionEnterprise 生产企业
-     * @return {@link R}<{@link IPage}<{@link String}>>
-     */
-    @GetMapping("/page-medicine")
-    public R<IPage<OeMedicineVO>> pageMedicine(Page<OeMedicineVO> page, String name, String commonName, String productionEnterprise) {
-        int total = 20;
-        List<OeMedicineVO> list = new ArrayList<>();
-        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
-            OeMedicineVO vo = new OeMedicineVO();
-            vo.setId((long) i);
-            vo.setName("商品名"+i);
-            vo.setCommonName("通用名"+i);
-            vo.setMah("上市许可持有人");
-            vo.setProductionEnterprise("生产企业"+i);
-            vo.setPromotedBusinessStatistics(10);
-            vo.setMedicalInsurance(i%2==0 ? Boolean.TRUE : Boolean.FALSE);
-            vo.setDosageForm(i%2==0 ?"片剂" : "注射液");
-            vo.setSpecification("0.1g");
-            vo.setDrugType(i%2==0 ? "ANDA" : "RLD");
-            vo.setDrugTypeName(i%2==0 ? "仿制" : "原研");
-            list.add(vo);
-        }
-
-        page.setRecords(list);
-        page.setTotal(total);
-        page.setPages((total + page.getSize() - 1) / page.getSize());
-
-        return R.ok(page);
-    }
-}

+ 0 - 108
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeTeamController.java

@@ -1,108 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.controller;
-
-import cn.hutool.core.map.MapUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.beust.jcommander.internal.Maps;
-import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeTeamRequest;
-import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeTenantRequest;
-import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeTeamVO;
-import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeTenantVO;
-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.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.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * oe团队管理控制器
- *
- * @author lixuesong
- * @date 2023/08/08
- */
-@Slf4j
-@RestController
-@RequestMapping("/oe/team")
-public class OeTeamController {
-
-    /**
-     * 分页查询团队
-     *
-     * @param page 分页参数
-     * @return {@link R}<{@link IPage}<{@link OeTeamVO}>>
-     */
-    @GetMapping("/page")
-    public R<IPage<OeTeamVO>> pageTeam(Page<OeTeamVO> page) {
-        int total = 20;
-        List<OeTeamVO> list = new ArrayList<>();
-        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
-            OeTeamVO vo = new OeTeamVO();
-            vo.setId((long) i);
-            vo.setName("测试团队"+i);
-            vo.setLeaderName(new String[]{"负责人1", "负责人2"});
-            vo.setLeader(new Long[]{1L, 2L});
-            vo.setMemberName(new String[]{"成员1", "成员2"});
-            vo.setMember(new Long[]{1L, 2L});
-            list.add(vo);
-        }
-
-        page.setRecords(list);
-        page.setTotal(total);
-        page.setPages((total + page.getSize() - 1) / page.getSize());
-
-        return R.ok(page);
-    }
-
-    /**
-     * 查询团队列表
-     *
-     * @return {@link R}<{@link List}<{@link OeTeamVO}>>
-     */
-    @GetMapping("/list")
-    public R<List<Map<String, Object>>> listTeam() {
-        int total = 5;
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (int i = 0; i < total; i++) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("name", "测试团队"+i);
-            map.put("id", (long) i);
-            list.add(map);
-        }
-
-        return R.ok(list);
-    }
-
-    /**
-     * 保存团队
-     *
-     * @param toSave 保存参数
-     * @return {@link R}<{@link Boolean}>
-     */
-    @PostMapping("/save")
-    public R<Boolean> saveTeam(@RequestBody OeTeamRequest.ToSave toSave) {
-        log.info("oe保存团队参数:{}", toSave);
-
-        return R.ok(Boolean.TRUE);
-    }
-
-    /**
-     * 更新团队
-     *
-     * @param toUpdate 更新
-     * @return {@link R}<{@link Boolean}>
-     */
-    @PostMapping("/update")
-    public R<Boolean> updateTeam(@RequestBody OeTeamRequest.ToUpdate toUpdate) {
-        log.info("更新团队参数:{}", toUpdate);
-
-        return R.ok(Boolean.TRUE);
-    }
-}

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

@@ -1,326 +0,0 @@
-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.entity.vo.OeTenantVO;
-import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeTenantRequest;
-import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeTerminalVO;
-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.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 租户管理
- */
-@Slf4j
-@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);
-        return R.ok();
-    }
-
-    /**
-     * 更新药企信息
-     *
-     * @param toUpdateDrugCompany 参数
-     * @return {@link R}<{@link ?}>
-     */
-    @SysLog("OE更新药企信息")
-    @PostMapping("/drug-company/update")
-    public R<?> updateDrugCompany(@RequestBody OeTenantRequest.ToUpdateDrugCompany toUpdateDrugCompany) {
-        log.info("OE更新药企信息参数:{}", toUpdateDrugCompany);
-        return R.ok();
-    }
-
-    /**
-     * 启用/停用药企/代理商/终端
-     *
-     * @param toLockUnlock 参数
-     * @return {@link R}<{@link ?}>
-     */
-    @SysLog("OE启用/停用药企/代理商/终端")
-    @PostMapping("/lock-unlock")
-    public R<?> updateLockUnlock(@RequestBody OeTenantRequest.ToLockUnlock toLockUnlock) {
-        log.info("OE启用/停用tenant参数:{}", toLockUnlock);
-        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);
-        return R.ok();
-    }
-
-    /**
-     * 更新代理商信息
-     *
-     * @param toUpdateCso 参数
-     * @return {@link R}<{@link ?}>
-     */
-    @SysLog("OE更新代理商信息")
-    @PostMapping("/cso/update")
-    public R<?> saveCso(@RequestBody OeTenantRequest.ToUpdateCso toUpdateCso) {
-        log.info("OE更新代理商信息参数:{}", toUpdateCso);
-        return R.ok();
-    }
-
-
-    /**
-     * 保存终端
-     *
-     * @param toSaveTerminal 参数
-     * @return {@link R}<{@link ?}>
-     */
-    @SysLog("OE保存终端信息")
-    @PostMapping("/terminal/save")
-    public R<?> saveTerminal(@RequestBody OeTenantRequest.ToSaveTerminal toSaveTerminal) {
-        log.info("OE保存终端信息参数:{}", toSaveTerminal);
-        return R.ok();
-    }
-
-    /**
-     * 更新终端
-     *
-     * @param toUpdateTerminal 参数
-     * @return {@link R}<{@link ?}>
-     */
-    @SysLog("OE更新终端信息")
-    @PostMapping("/terminal/update")
-    public R<?> saveTerminal(@RequestBody OeTenantRequest.ToUpdateTerminal toUpdateTerminal) {
-        log.info("OE更新终端信息参数:{}", toUpdateTerminal);
-        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 <= total; 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());
-            oeTenantVO.setDelFlag("OK");
-            oeTenantVO.setDelFlagName("正常");
-            oeTenantVO.setLocFlag("OK");
-            oeTenantVO.setLocFlagName("正常");
-            list.add(oeTenantVO);
-        }
-
-        page.setRecords(list);
-        page.setTotal(total);
-        page.setPages((total + page.getSize() - 1) / page.getSize());
-
-        return R.ok(page);
-    }
-
-    /**
-     * 药企查询
-     *
-     * @return {@link R}<{@link List}<{@link Map}<{@link String}, {@link String}>>>
-     */
-    @GetMapping("/list-drug-company")
-    public R<List<Map<String, Object>>> listDrugCompany() {
-        int total = 20;
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (int i = 0; i < total; i++) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("name", "测试药企" + (i));
-            map.put("tenantId", (long) i);
-            list.add(map);
-        }
-
-        return R.ok(list);
-    }
-
-    /**
-     * 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 <= total; 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());
-            oeTenantVO.setDelFlag("OK");
-            oeTenantVO.setDelFlagName("正常");
-            oeTenantVO.setLocFlag("OK");
-            oeTenantVO.setLocFlagName("正常");
-            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-for-dept")
-    public R<IPage<OeTenantVO>> pageCsoForDept(Page<OeTenantVO> page, String name, String code, String drugCompanyName) {
-        // 企业的权限 TODO
-
-        int total = 10;
-        List<OeTenantVO> list = new ArrayList<>();
-        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; 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());
-            oeTenantVO.setDelFlag("OK");
-            oeTenantVO.setDelFlagName("正常");
-            oeTenantVO.setLocFlag("OK");
-            oeTenantVO.setLocFlagName("正常");
-            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 <= total; 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());
-            oeTenantVO.setDelFlag("OK");
-            oeTenantVO.setDelFlagName("正常");
-            oeTenantVO.setLocFlag("OK");
-            oeTenantVO.setLocFlagName("正常");
-            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-for-dept")
-    public R<IPage<OeTerminalVO>> pageTerminalForDept(Page<OeTerminalVO> page, String name, String code) {
-        int total = 10;
-        List<OeTerminalVO> list = new ArrayList<>();
-        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
-            OeTerminalVO vo = new OeTerminalVO();
-            vo.setName(name);
-            vo.setCode("123456789123456");
-            vo.setTenantId((long) i);
-            vo.setServedCsoTenantId(12312L);
-            vo.setServedCsoName("代理商123");
-            vo.setServedDrugCompanyTenantId(23423L);
-            vo.setServedDrugCompanyName("药企234");
-            vo.setDrugCompanyApprovalStatus(i/2==0 ? "REJECT" : "PASS");
-            vo.setDrugCompanyApprovalStatusName(i/2==0 ? "审核不通过" : "通过");
-            vo.setCsoApprovalStatus("PASS");
-            vo.setCsoApprovalStatusName("审核通过");
-            list.add(vo);
-        }
-
-        page.setRecords(list);
-        page.setTotal(total);
-        page.setPages((total + page.getSize() - 1) / page.getSize());
-
-        return R.ok(page);
-    }
-}

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

@@ -1,110 +0,0 @@
-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.entity.dto.OeUserRequest;
-import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeUserVO;
-import com.qunzhixinxi.hnqz.common.core.util.R;
-import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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;
-
-/**
- * oe用户管理控制器
- *
- * @author lixuesong
- * @date 2023/08/07
- */
-@Slf4j
-@RestController
-@RequestMapping("/oe/user")
-public class OeUserController {
-
-    /**
-     * 保存用户
-     *
-     * @param toSave 保存参数
-     * @return {@link R}<{@link Boolean}>
-     */
-    @SysLog("OE保存用户")
-    @PostMapping("/save")
-    public R<Boolean> saveUser(@RequestBody @Validated OeUserRequest.ToSave toSave) {
-        log.info("OE保存用户参数:{}", toSave);
-        return R.ok(Boolean.TRUE);
-    }
-
-    /**
-     * 更新用户
-     *
-     * @param toUpdate 保存参数
-     * @return {@link R}<{@link Boolean}>
-     */
-    @SysLog("OE更新用户")
-    @PostMapping("/update")
-    public R<Boolean> updateUser(@RequestBody @Validated OeUserRequest.ToUpdate toUpdate) {
-        log.info("OE更新用户参数:{}", toUpdate);
-        return R.ok(Boolean.TRUE);
-    }
-
-    /**
-     * 删除用户
-     *
-     * @param userId 用户id
-     * @return {@link R}<{@link Boolean}>
-     */
-    @SysLog("OE删除用户")
-    @PostMapping("/delete/{userId}")
-    public R<Boolean> deleteUser(@PathVariable("userId") Long userId) {
-        return R.ok(Boolean.TRUE);
-    }
-
-    /**
-     * 分页查询
-     *
-     * @param page   分页参数
-     * @param toPage 查询参数
-     * @return {@link R}<{@link IPage}<{@link OeUserVO}>>
-     */
-    @GetMapping("/page")
-    public R<IPage<OeUserVO>> pageUser(Page<OeUserVO> page, OeUserRequest.ToPage toPage) {
-        int total = 20;
-        List<OeUserVO> list = new ArrayList<>();
-        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
-            OeUserVO vo = new OeUserVO();
-            vo.setUserId((long) i);
-            vo.setUsername("user"+i);
-            vo.setNickname("昵称"+i);
-            vo.setRealName("姓名"+i);
-            vo.setPhone("13800138000");
-            vo.setAvatar("https://pre.yaoyi.net/images/logo.jpg");
-            vo.setDeptId(1L);
-            vo.setTenantId(1L);
-            vo.setEmail("123456@qq.com");
-            vo.setDelFlag("OK");
-            vo.setLockFlag("OK");
-            vo.setCreatedBy("admin");
-            vo.setModifiedBy("admin");
-            vo.setCreatedTime(LocalDateTime.now());
-            vo.setModifiedTime(LocalDateTime.now());
-
-            list.add(vo);
-        }
-
-        page.setRecords(list);
-        page.setTotal(total);
-        page.setPages((total + page.getSize() - 1) / page.getSize());
-
-        return R.ok(page);
-    }
-
-}

+ 0 - 126
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/dto/OeMedicineRequest.java

@@ -1,126 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.entity.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-public class OeMedicineRequest {
-
-    /**
-     * oe药品保存参数
-     */
-    @Data
-    public static class ToSaveMedicine implements Serializable {
-        private static final long serialVersionUID = 498425117146760393L;
-
-        /**
-         * 药品名称
-         */
-        private String name;
-
-        /**
-         * 通用名称
-         */
-        private String commonName;
-
-        /**
-         * 上市许可持有人
-         */
-        private String mah;
-
-        /**
-         * 生产企业
-         */
-        private String productionEnterprise;
-
-        /**
-         * 推广企业统计
-         */
-        private Integer promotedBusinessStatistics;
-
-        /**
-         * 是否全国医保
-         */
-        private Boolean medicalInsurance;
-
-        /**
-         * 剂型
-         */
-        private String dosageForm;
-
-        /**
-         * 规格
-         */
-        private String specification;
-
-        /**
-         * 原研/仿制药
-         */
-        private String drugType;
-
-        /**
-         * 备注
-         */
-        private String remark;
-
-    }
-
-    /**
-     * oe药品更新参数
-     */
-    @Data
-    public static class ToUpdateMedicine implements Serializable {
-        private static final long serialVersionUID = -3961892156546807439L;
-
-        /**
-         * 药品名称
-         */
-        private String name;
-
-        /**
-         * 通用名称
-         */
-        private String commonName;
-
-        /**
-         * 上市许可持有人
-         */
-        private String mah;
-
-        /**
-         * 生产企业
-         */
-        private String productionEnterprise;
-
-        /**
-         * 推广企业统计
-         */
-        private Integer promotedBusinessStatistics;
-
-        /**
-         * 是否全国医保
-         */
-        private Boolean medicalInsurance;
-
-        /**
-         * 剂型
-         */
-        private String dosageForm;
-
-        /**
-         * 规格
-         */
-        private String specification;
-
-        /**
-         * 原研/仿制药
-         */
-        private String drugType;
-
-        /**
-         * 备注
-         */
-        private String remark;
-
-    }
-}

+ 0 - 73
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/dto/OeTeamRequest.java

@@ -1,73 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.entity.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * oe团队请求
- *
- * @author lixuesong
- * @date 2023/08/08
- */
-public class OeTeamRequest {
-
-    /**
-     * 保存团队参数
-     *
-     * @author lixuesong
-     * @date 2023/08/08
-     */
-    @Data
-    public static class ToSave implements Serializable {
-
-        private static final long serialVersionUID = 8449495175671168735L;
-
-        /**
-         * 团队名称
-         */
-        private String name;
-
-        /**
-         * 团队负责人
-         */
-        private Long[] leader;
-
-        /**
-         * 团队成员
-         */
-        private Long[] member;
-    }
-
-    /**
-     * 更新团队参数
-     *
-     * @author lixuesong
-     * @date 2023/08/08
-     */
-    @Data
-    public static class ToUpdate implements Serializable {
-
-        private static final long serialVersionUID = 6010813670149051628L;
-
-        /**
-         * 主键id
-         */
-        private Long id;
-
-        /**
-         * 团队名称
-         */
-        private String name;
-
-        /**
-         * 团队负责人
-         */
-        private Long[] leader;
-
-        /**
-         * 团队成员
-         */
-        private Long[] member;
-    }
-}

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

@@ -1,321 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.entity.dto;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-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;
-
-        /**
-         * 锁定标记(OK-正常,LOC-已锁定)
-         */
-        private String locFlag;
-    }
-
-    /**
-     * 更新药企信息
-     *
-     * @author lixuesong
-     * @date 2023/08/04
-     */
-    @Data
-    public static class ToUpdateDrugCompany implements Serializable {
-        private static final long serialVersionUID = -8743428178584985176L;
-
-        /**
-         * 租户id
-         */
-        private Long tenantId;
-
-        /**
-         * 企业名称
-         */
-        private String name;
-
-        /**
-         * 统一社会信用代码
-         */
-        private String code;
-
-        /**
-         * 权限限制
-         */
-        private String[] permissions;
-
-        /**
-         * 锁定标记
-         */
-        private String locFlag;
-    }
-
-    /**
-     * 启用/停用药企
-     *
-     * @author lixuesong
-     * @date 2023/08/04
-     */
-    @Data
-    public static class ToLockUnlock implements Serializable {
-
-        private static final long serialVersionUID = -5033454666284018069L;
-
-        /**
-         * 租户id
-         */
-        @NotNull(message = "主键ID必填")
-        private Long tenantId;
-
-        /**
-         * 锁定标记(OK-正常,LOC-已锁定)
-         */
-        @NotBlank(message = "锁定标记必填")
-        private String locFlag;
-    }
-
-    /**
-     * 保存代理商
-     *
-     * @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;
-
-        /**
-         * 身份证正面url
-         */
-        private String idCardFrontUrl;
-
-        /**
-         * 身份证反面url
-         */
-        private String idCardBackUrl;
-
-        /**
-         * 身份证手持url
-         */
-        private String idCardHoldingUrl;
-
-        /**
-         * 锁定标记(OK-正常,LOC-已锁定)
-         */
-        private String locFlag;
-    }
-
-    /**
-     * 更新代理商
-     *
-     * @author lixuesong
-     * @date 2023/08/04
-     */
-    @Data
-    public static class ToUpdateCso implements Serializable {
-        private static final long serialVersionUID = 6561938432965789032L;
-
-        /**
-         * 租户id
-         */
-        private Long tenantId;
-
-        /**
-         * 企业名称
-         */
-        private String name;
-
-        /**
-         * 统一社会信用代码/身份证号
-         */
-        private String code;
-
-        /**
-         * 代理商类型
-         */
-        private String csoType;
-
-        /**
-         * 推广药品
-         */
-        private Long medicineId;
-
-        /**
-         * 营业执照
-         */
-        private String[] licenseUrl;
-
-        /**
-         * 社保缴纳证明
-         */
-        private String[] socialSecurityUrl;
-
-        /**
-         * 身份证正面url
-         */
-        private String idCardFrontUrl;
-
-        /**
-         * 身份证反面url
-         */
-        private String idCardBackUrl;
-
-        /**
-         * 身份证手持url
-         */
-        private String idCardHoldingUrl;
-
-        /**
-         * 锁定标记(OK-正常,LOC-已锁定)
-         */
-        private String locFlag;
-    }
-
-    /**
-     * 保存终端参数
-     *
-     * @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;
-
-        /**
-         * 锁定标记(OK-正常,LOC-已锁定)
-         */
-        private String locFlag;
-    }
-
-    /**
-     * 保存终端参数
-     *
-     * @author lixuesong
-     * @date 2023/08/04
-     */
-    @Data
-    public static class ToUpdateTerminal implements Serializable {
-        private static final long serialVersionUID = -1539062519797105804L;
-
-        /**
-         * 企业名称
-         */
-        @NotBlank(message = "企业名称必填")
-        private String name;
-
-        /**
-         * 统一社会信用代码
-         */
-        @NotBlank(message = "统一社会信用代码必填")
-        private String code;
-
-        /**
-         * 推广药品
-         */
-        private Long medicineId;
-
-        /**
-         * 营业执照
-         */
-        private String[] licenseUrl;
-
-        /**
-         * 社保缴纳证明
-         */
-        private String[] socialSecurityUrl;
-
-        /**
-         * 锁定标记(OK-正常,LOC-已锁定)
-         */
-        private String locFlag;
-    }
-}

+ 0 - 167
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/dto/OeUserRequest.java

@@ -1,167 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.entity.dto;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * oe用户请求
- *
- * @author lixuesong
- * @date 2023/08/08
- */
-
-public class OeUserRequest {
-
-    /**
-     * 保存参数
-     *
-     * @author lixuesong
-     * @date 2023/08/08
-     */
-
-    @Data
-    public static class ToSave implements Serializable {
-
-        private static final long serialVersionUID = 8049239105004782547L;
-
-        /**
-         * 用户名
-         */
-        @NotBlank(message = "手机号必填")
-        private String username;
-
-        /**
-         * 姓名
-         */
-        @NotBlank(message = "承接方必填")
-        private String realName;
-
-        /**
-         * 身份证号
-         */
-        private String idCardNumber;
-
-        /**
-         * 角色id
-         */
-        @NotNull(message = "角色必填")
-        private Long roleId;
-
-        /**
-         * 省
-         */
-        private String province;
-
-        /**
-         * 省编码
-         */
-        private String provinceCode;
-
-        /**
-         * 市
-         */
-        private String city;
-
-        /**
-         * 市编码
-         */
-        private String cityCode;
-
-    }
-
-    /**
-     * 更新参数
-     *
-     * @author lixuesong
-     * @date 2023/08/08
-     */
-
-    @Data
-    public static class ToUpdate implements Serializable {
-
-        private static final long serialVersionUID = 1588035989045460863L;
-
-        /**
-         * 主键id
-         */
-        @NotNull(message = "用户id必填")
-        private Long userId;
-
-        /**
-         * 姓名
-         */
-        private String realName;
-
-        /**
-         * 身份证号
-         */
-        private String idCardNumber;
-
-        /**
-         * 角色id
-         */
-        @NotNull(message = "角色必填")
-        private Long roleId;
-
-        /**
-         * 省
-         */
-        private String province;
-
-        /**
-         * 省编码
-         */
-        private String provinceCode;
-
-        /**
-         * 市
-         */
-        private String city;
-
-        /**
-         * 市编码
-         */
-        private String cityCode;
-
-    }
-
-    /**
-     * 分页参数
-     *
-     * @author lixuesong
-     * @date 2023/08/08
-     */
-    @Data
-    public static class ToPage implements Serializable {
-
-        private static final long serialVersionUID = -3670005114779918409L;
-
-        /**
-         * 承接方
-         */
-        private String realName;
-
-        /**
-         * 派工方
-         */
-        private String tenantName;
-
-        /**
-         * 手机号
-         */
-        private String phone;
-
-        /**
-         * 角色id
-         */
-        private Long roleId;
-
-        /**
-         * 启用状态
-         */
-        private String lockFlag;
-    }
-}

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

@@ -1,37 +0,0 @@
-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;
-}

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

@@ -1,88 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * oe药品
- *
- * @author lixuesong
- * @date 2023/08/07
- */
-@Data
-public class OeMedicineVO implements Serializable {
-
-    private static final long serialVersionUID = -6120119934476311908L;
-
-    /**
-     * 主键id
-     */
-    private Long id;
-
-    /**
-     * 药品名称
-     */
-    private String name;
-
-    /**
-     * 通用名称
-     */
-    private String commonName;
-
-    /**
-     * 上市许可持有人
-     */
-    private String mah;
-
-    /**
-     * 生产企业
-     */
-    private String productionEnterprise;
-
-    /**
-     * 推广企业统计
-     */
-    private Integer promotedBusinessStatistics;
-
-    /**
-     * 是否全国医保
-     */
-    private Boolean medicalInsurance;
-
-    /**
-     * 剂型
-     */
-    private String dosageForm;
-
-    /**
-     * 规格
-     */
-    private String specification;
-
-    /**
-     * 原研/仿制药类型
-     */
-    private String drugType;
-
-    /**
-     * 原研/仿制药类型名称
-     */
-    private String drugTypeName;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdTime;
-
-    /**
-     * 修改时间
-     */
-    private LocalDateTime modifiedTime;
-}

+ 0 - 47
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeTeamVO.java

@@ -1,47 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * oe团队管理VO
- *
- * @author lixuesong
- * @date 2023/08/08
- */
-@Data
-public class OeTeamVO implements Serializable {
-
-    private static final long serialVersionUID = -8166723468956394406L;
-
-    /**
-     * 主键id
-     */
-    private Long id;
-
-    /**
-     * 团队名称
-     */
-    private String name;
-
-    /**
-     * 团队负责人
-     */
-    private Long[] leader;
-
-    /**
-     * 团队负责人名称
-     */
-    private String[] leaderName;
-
-    /**
-     * 团队成员
-     */
-    private Long[] member;
-
-    /**
-     * 团队成员名称
-     */
-    private String[] memberName;
-}

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

@@ -1,80 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 租户VO
- */
-@Data
-public class OeTenantVO implements Serializable {
-
-    private static final long serialVersionUID = -8127002006960529514L;
-
-    /**
-     * 租户id
-     */
-    private Long tenantId;
-
-    /**
-     * 租户名称
-     */
-    private String name;
-
-    /**
-     * 租户编号
-     */
-    private String code;
-
-    /**
-     * 等级
-     */
-    private String level;
-
-    /**
-     * 等级名称
-     */
-    private String levelName;
-
-    /**
-     * 权限限制
-     */
-    private String[] permissions;
-
-    /**
-     * 结算渠道
-     */
-    private String[] settleChannels;
-
-    /**
-     * 删除标记(OK-正常,DEL-已删除)
-     */
-    private String delFlag;
-
-    /**
-     * 删除标记名称
-     */
-    private String delFlagName;
-
-    /**
-     * 锁定标记(OK-正常,LOC-已锁定)
-     */
-    private String locFlag;
-
-    /**
-     * 锁定标记名称
-     */
-    private String locFlagName;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdTime;
-
-    /**
-     * 修改时间
-     */
-    private LocalDateTime modifiedTime;
-}

+ 0 - 72
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeTerminalVO.java

@@ -1,72 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * oe终端VO
- *
- * @author lixuesong
- * @date 2023/08/08
- */
-@Data
-public class OeTerminalVO implements Serializable {
-
-    private static final long serialVersionUID = 7128806313743294064L;
-
-    /**
-     * 租户id
-     */
-    private Long tenantId;
-
-    /**
-     * 企业名称
-     */
-    private String name;
-
-    /**
-     * 统一社会信用代码
-     */
-    private String code;
-
-    /**
-     * 服务药企tenantId
-     */
-    private Long servedDrugCompanyTenantId;
-
-    /**
-     * 服务药企名称
-     */
-    private String servedDrugCompanyName;
-
-    /**
-     * 服务代理商tenantId
-     */
-    private Long servedCsoTenantId;
-
-    /**
-     * 服务代理商名称
-     */
-    private String servedCsoName;
-
-    /**
-     * 药企审核状态(PASS-通过,REJECT-拒绝,PENDING-未审核)
-     */
-    private String drugCompanyApprovalStatus;
-
-    /**
-     * 药企审核状态名称
-     */
-    private String drugCompanyApprovalStatusName;
-
-    /**
-     * 代理商审核状态(PASS-通过,REJECT-拒绝,PENDING-未审核)
-     */
-    private String csoApprovalStatus;
-
-    /**
-     * 代理商审核状态名称
-     */
-    private String csoApprovalStatusName;
-}

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

@@ -1,112 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * oe用户VO
- *
- * @author lixuesong
- * @date 2023/08/07
- */
-@Data
-public class OeUserVO implements Serializable {
-    private static final long serialVersionUID = 1389173392702921120L;
-
-    /**
-     * 主键ID
-     */
-    private Long userId;
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 昵称
-     */
-    private String nickname;
-
-    /**
-     * 姓名
-     */
-    private String realName;
-
-    /**
-     * 手机号
-     */
-    private String phone;
-
-    /**
-     * 头像
-     */
-    private String avatar;
-
-    /**
-     * 部门ID
-     */
-    private Long deptId;
-
-    /**
-     * 租户ID
-     */
-    private Long tenantId;
-
-    /**
-     * 邮箱
-     */
-    private String email;
-
-    /**
-     * 省
-     */
-    private String province;
-
-    /**
-     * 省编码
-     */
-    private String provinceCode;
-
-    /**
-     * 市
-     */
-    private String city;
-
-    /**
-     * 市编码
-     */
-    private String cityCode;
-
-    /**
-     * 删除标记(OK-正常,DEL-已删除)
-     */
-    private String delFlag;
-
-    /**
-     * 锁定标记(OK-正常,LOC-已锁定)
-     */
-    private String lockFlag;
-
-    /**
-     * 创建人
-     */
-    private String createdBy;
-
-    /**
-     * 修改人
-     */
-    private String modifiedBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdTime;
-
-    /**
-     * 修改时间
-     */
-    private LocalDateTime modifiedTime;
-}

+ 0 - 10
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/OeDictService.java

@@ -1,10 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.service;
-
-/**
- * oe字典服务
- *
- * @author lixuesong
- * @date 2023/08/08
- */
-public interface OeDictService {
-}

+ 0 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/OeTenantService.java

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

+ 0 - 25
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/OeUserService.java

@@ -1,25 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeUserRequest;
-import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeUserVO;
-import com.qunzhixinxi.hnqz.common.core.util.R;
-
-/**
- * oe用户服务
- *
- * @author lixuesong
- * @date 2023/08/08
- */
-public interface OeUserService {
-
-    /**
-     * 分页查询
-     *
-     * @param page   分页参数
-     * @param toPage 查询参数
-     * @return {@link IPage}<{@link OeUserVO}>
-     */
-    IPage<OeUserVO> pageUser(Page<OeUserVO> page, OeUserRequest.ToPage toPage);
-}

+ 0 - 28
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/impl/OeDictServiceImpl.java

@@ -1,28 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.service.impl;
-
-import com.qunzhixinxi.hnqz.admin.oe.service.OeDictService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * oe字典服务
- *
- * @author lixuesong
- * @date 2023/08/08
- */
-@Slf4j
-@Service
-public class OeDictServiceImpl implements OeDictService {
-
-//    private DictService dictService;
-//
-//    @PostConstruct
-//    public void init() {
-//        YaoyicloudConfig config = new YaoyicloudConfig.Builder().secretId("admin").secretKey("123456").terminalType(TerminalType.YYC_CSO).build();
-//        dictService = new DictService.Builder().hostName(HostName.PROD).config(config).build();
-//    }
-//
-//    public List<OeDictItemVO> getDictBySymbol() {
-//        dictService.getDictItemById()
-//    }
-}

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

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

+ 0 - 40
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/impl/OeUserServiceImpl.java

@@ -1,40 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.oe.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeUserRequest;
-import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeUserVO;
-import com.qunzhixinxi.hnqz.admin.oe.service.OeUserService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * oe用户服务
- *
- * @author lixuesong
- * @date 2023/08/08
- */
-@Slf4j
-@Service
-public class OeUserServiceImpl implements OeUserService {
-
-//    private UserService userService;
-//
-//    @PostConstruct
-//    public void init() {
-//        YaoyicloudConfig config = new YaoyicloudConfig.Builder().secretId("admin").secretKey("123456").terminalType(TerminalType.YYC_CSO).build();
-//        userService = new UserService.Builder().hostName(HostName.PROD).config(config).build();
-//    }
-
-    /**
-     * 分页查询
-     *
-     * @param page   分页参数
-     * @param toPage 查询参数
-     * @return {@link IPage}<{@link OeUserVO}>
-     */
-    @Override
-    public IPage<OeUserVO> pageUser(Page<OeUserVO> page, OeUserRequest.ToPage toPage) {
-        return null;
-    }
-}