20241203 窍笔修改

PCS/src/main/java/cn/cslg/permission/common/model/dto/AssoFunctionCodeDTO.java

@@ -10,4 +10,8 @@ import lombok.Data;
 public class AssoFunctionCodeDTO {
     private Integer functionId;
     private String code;
+    /**
+     * 是否授权（1未授权 2授权）
+     */
+    private Integer authType;
 }

PCS/src/main/java/cn/cslg/permission/common/model/dto/VersionDTO.java

@@ -47,15 +47,4 @@ public class VersionDTO {
      * 创建人id
      */
     private Integer createUser;
-
-    /**
-     * 是否删除（1是 0否）
-     */
-    private Boolean isDelete;
-
-    /**
-     * 是否授权（1未授权 2授权）
-     */
-    private Integer authType;
-
 }

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/QiaoApplitionController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.Arrays;
 
 /**
  * @author 沈永艺
@@ -34,8 +35,9 @@ public class QiaoApplitionController {
     @PostMapping("/queryApplication")
     @Operation(summary = "查询窍笔应用")
     public String personnelSignUp(@RequestBody ApplicationVO applicationVO) {
-        qiaoBiApplicationService.queryQiaoBiApplication(applicationVO);
-        return Response.success();
+        applicationVO.setApplicationCodes(Arrays.asList("4e95e3d926a2a4befa5d913acc0aa9f5"));
+        return  qiaoBiApplicationService.queryQiaoBiApplication(applicationVO);
+
     }
 
 }

PCS/src/main/java/cn/cslg/permission/controller/qiaobi/QiaoBiPersonController.java

@@ -53,4 +53,12 @@ public class QiaoBiPersonController {
         PersonnelVO personnelVO= qiaoBiPersonService.backPhoneLogin(vo,4);
         return Response.success(personnelVO);
     }
+
+
+    @PostMapping("/companySignUp")
+    @Operation(summary = "企业注册")
+    public String companySignUp(@RequestBody QiaoBiPersonSignUpDTO qiaoBiPersonSignUpDTO) {
+        qiaoBiPersonService.personSignUp(qiaoBiPersonSignUpDTO);
+        return Response.success();
+    }
 }

PCS/src/main/java/cn/cslg/permission/service/VersionService.java

@@ -54,7 +54,7 @@ public class VersionService extends ServiceImpl<VersionMapper, Version> {
                 // 版本号
                 assoFunctionModuleDTO.setVersion(versionNum);
                 // 字段配置
-                assoFunctionModuleDTO.setAuthType(versionDTO.getAuthType());
+                assoFunctionModuleDTO.setAuthType(codeDTO.getAuthType());
                 assoFunctionModuleDTO.setCreateUser(versionDTO.getCreateUser());
                 assoFunctionModuleDTO.setIsDelete(false);
                 assoFunctionModuleDTOS.add(assoFunctionModuleDTO);

PCS/src/main/java/cn/cslg/permission/service/associate/AssoFunctionModuleService.java

@@ -34,8 +34,6 @@ public class AssoFunctionModuleService extends ServiceImpl<AssoFunctionModuleMap
         for (AssoFunctionModuleDTO assoFunctionModuleDTO : assoFunctionModuleDTOS) {
             AssoFunctionModule assoFunctionModule = new AssoFunctionModule();
             BeanUtils.copyProperties(assoFunctionModuleDTO, assoFunctionModule);
-            assoFunctionModule.setFunctionId(assoFunctionModuleDTO.getFunctionId());
-            assoFunctionModule.setCode(assoFunctionModuleDTO.getCode());
             assoFunctionModules.add(assoFunctionModule);
         }
         if (!assoFunctionModules.isEmpty()) {

PCS/src/main/java/cn/cslg/permission/service/qiaobi/QiaoBiApplicationService.java

@@ -13,7 +13,7 @@ public class QiaoBiApplicationService {
 private ApplicationService applicationService;
 
 public String queryQiaoBiApplication(ApplicationVO applicationVO){
-    applicationVO.setApplicationCodes(Arrays.asList());
+
   return   applicationService.queryPageListWithCode(applicationVO);
 }
 }

PCS/src/main/resources/application.yml

@@ -23,7 +23,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: testNetIn
+    active: dev
   jackson:
     default-property-inclusion: non_null
     serialization: