Merge branch 'feat-oe' into temp-pre

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

@@ -38,7 +38,6 @@ public class OeTenantController {
     @PostMapping("/drug-company/save")
     public R<?> saveDrugCompany(@RequestBody OeTenantRequest.ToSaveDrugCompany toSaveDrugCompany) {
         log.info("OE保存药企信息参数:{}", toSaveDrugCompany);
-        // TODO
         return R.ok();
     }
 
@@ -52,7 +51,6 @@ public class OeTenantController {
     @PostMapping("/drug-company/update")
     public R<?> updateDrugCompany(@RequestBody OeTenantRequest.ToUpdateDrugCompany toUpdateDrugCompany) {
         log.info("OE更新药企信息参数:{}", toUpdateDrugCompany);
-        // TODO
         return R.ok();
     }
 
@@ -66,7 +64,6 @@ public class OeTenantController {
     @PostMapping("/lock-unlock")
     public R<?> updateLockUnlock(@RequestBody OeTenantRequest.ToLockUnlock toLockUnlock) {
         log.info("OE启用/停用tenant参数:{}", toLockUnlock);
-        // TODO
         return R.ok();
     }
 
@@ -80,7 +77,6 @@ public class OeTenantController {
     @PostMapping("/cso/save")
     public R<?> saveCso(@RequestBody OeTenantRequest.ToSaveCso toSaveCso) {
         log.info("OE保存代理商信息参数:{}", toSaveCso);
-        // TODO
         return R.ok();
     }
 
@@ -94,7 +90,6 @@ public class OeTenantController {
     @PostMapping("/cso/update")
     public R<?> saveCso(@RequestBody OeTenantRequest.ToUpdateCso toUpdateCso) {
         log.info("OE更新代理商信息参数:{}", toUpdateCso);
-        // TODO
         return R.ok();
     }
 
@@ -109,7 +104,6 @@ public class OeTenantController {
     @PostMapping("/terminal/save")
     public R<?> saveTerminal(@RequestBody OeTenantRequest.ToSaveTerminal toSaveTerminal) {
         log.info("OE保存终端信息参数:{}", toSaveTerminal);
-        // TODO
         return R.ok();
     }
 
@@ -119,11 +113,10 @@ public class OeTenantController {
      * @param toUpdateTerminal 参数
      * @return {@link R}<{@link ?}>
      */
-    @SysLog("OE保存终端信息")
+    @SysLog("OE更新终端信息")
     @PostMapping("/terminal/update")
     public R<?> saveTerminal(@RequestBody OeTenantRequest.ToUpdateTerminal toUpdateTerminal) {
-        log.info("OE保存终端信息参数:{}", toUpdateTerminal);
-        // TODO
+        log.info("OE更新终端信息参数:{}", toUpdateTerminal);
         return R.ok();
     }
 

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

@@ -39,6 +39,7 @@ public class OeUserController {
             OeUserVO vo = new OeUserVO();
             vo.setUserId((long) i);
             vo.setUsername("user"+i);
+            vo.setNickname("昵称"+i);
         // TODO
             list.add(vo);
         }

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

@@ -156,6 +156,11 @@ public class OeTenantRequest {
          */
         private String idCardBackUrl;
 
+        /**
+         * 身份证手持url
+         */
+        private String idCardHoldingUrl;
+
         /**
          * 锁定标记(OK-正常,LOC-已锁定)
          */

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

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

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

@@ -0,0 +1,28 @@
+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()
+//    }
+}