mj-li 2 months ago
commit
1bae51a5ac
100 changed files with 3807 additions and 0 deletions
  1. 84 0
      .gitignore
  2. 35 0
      basic-application-api/pom.xml
  3. 39 0
      basic-application-api/src/main/java/com/xxh/cloud/basic/application/controller/BasicAppTestController.java
  4. 56 0
      basic-application-api/src/main/java/com/xxh/cloud/basic/application/controller/DictAppController.java
  5. 49 0
      basic-application-api/src/main/java/com/xxh/cloud/basic/application/controller/PageInfoAppController.java
  6. 65 0
      basic-application-api/src/main/java/com/xxh/cloud/basic/application/controller/SecurityAppController.java
  7. 68 0
      basic-application-api/src/main/java/com/xxh/cloud/basic/application/controller/VisitVerificationAppController.java
  8. 19 0
      basic-client-api/pom.xml
  9. 22 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/CompanyClientService.java
  10. 28 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/DictClientService.java
  11. 24 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/ParamsClientService.java
  12. 21 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/ProjectClientService.java
  13. 14 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/VisitVerificationClientService.java
  14. 113 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/CompanyBO.java
  15. 96 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/DictBO.java
  16. 99 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/DictMapBO.java
  17. 57 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/DictValBO.java
  18. 58 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/ParamsBO.java
  19. 4 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/ProjectBO.java
  20. 93 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/VisitVerificationBO.java
  21. 39 0
      basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/dto/VisitVerificationSearchDTO.java
  22. 42 0
      basic-framework/pom.xml
  23. 13 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/aop/annotation/OperationLog.java
  24. 96 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/aop/aspect/OperationLogAspect.java
  25. 90 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/Company.java
  26. 68 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/DictData.java
  27. 59 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/DictType.java
  28. 71 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/NoticeInfo.java
  29. 36 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/PageInfo.java
  30. 57 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/Params.java
  31. 82 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/ProjectInfo.java
  32. 62 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/SiteMessageInfo.java
  33. 53 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/SiteMessageUserInfo.java
  34. 49 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/VisitVerificationConfig.java
  35. 52 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/CompanyAddDTO.java
  36. 16 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/CompanyInfoDTO.java
  37. 32 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/CompanyListDTO.java
  38. 29 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/CompanyQueryDTO.java
  39. 14 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/CompanyTreeDTO.java
  40. 40 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/CompanyUpdateDTO.java
  41. 25 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictDataAdd2UpdateBatchDTO.java
  42. 35 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictDataAdd2UpdateItem.java
  43. 41 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictDataAddDTO.java
  44. 18 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictDataInfoDTO.java
  45. 24 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictDataListDTO.java
  46. 43 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictDataUpdateDTO.java
  47. 38 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictTypeAddDTO.java
  48. 18 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictTypeInfoDTO.java
  49. 25 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictTypeListDTO.java
  50. 31 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictTypeQueryDTO.java
  51. 34 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictTypeUpdateDTO.java
  52. 32 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/NoticeAddDTO.java
  53. 18 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/NoticeEditDTO.java
  54. 16 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/NoticeGetDTO.java
  55. 24 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/NoticeQueryDTO.java
  56. 20 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/NoticeUpdateStatusDTO.java
  57. 31 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/PageInfoEditDTO.java
  58. 17 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/PageInfoGetDTO.java
  59. 38 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ParamsAddDTO.java
  60. 18 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ParamsInfoDTO.java
  61. 44 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ParamsListDTO.java
  62. 20 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ParamsMetaListDTO.java
  63. 30 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ParamsQueryDTO.java
  64. 28 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ParamsUpdateDTO.java
  65. 54 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoAddDTO.java
  66. 41 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoEditDTO.java
  67. 26 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoEditKeyDTO.java
  68. 24 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoEditStatusDTO.java
  69. 17 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoGetDTO.java
  70. 20 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoListDTO.java
  71. 24 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoQueryDTO.java
  72. 28 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/SiteMessageAddDTO.java
  73. 17 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/SiteMessageByIdDTO.java
  74. 17 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/SiteMessageByIdsDTO.java
  75. 45 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/SiteMessageQueryDTO.java
  76. 36 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/VisitVerificationAddDTO.java
  77. 29 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/VisitVerificationEditDTO.java
  78. 13 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/VisitVerificationGetDTO.java
  79. 23 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/VisitVerificationQueryDTO.java
  80. 68 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/CompanyPropertyVO.java
  81. 51 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/CompanyVO.java
  82. 52 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/DictDataVO.java
  83. 35 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/DictTypeTreeVO.java
  84. 64 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/DictTypeVO.java
  85. 56 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/NoticeVO.java
  86. 24 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/PageVO.java
  87. 51 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/ParamsVO.java
  88. 68 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/ProjectVO.java
  89. 62 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/SiteMessageVO.java
  90. 21 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/VisitVerificationResult.java
  91. 13 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/CompanyMapper.java
  92. 13 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/DictDataMapper.java
  93. 13 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/DictTypeMapper.java
  94. 13 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/NoticeInfoMapper.java
  95. 14 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/PageInfoMapper.java
  96. 11 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/ParamsMapper.java
  97. 13 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/ProjectInfoMapper.java
  98. 13 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/SiteMessageInfoMapper.java
  99. 13 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/SiteMessageUserInfoMapper.java
  100. 13 0
      basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/VisitVerificationConfigMapper.java

+ 84 - 0
.gitignore

@@ -0,0 +1,84 @@
+# maven output files
+/target/
+*/target/
+**/target/
+
+# virtual machine crash logs
+hs_err_pid*
+/bin/
+/build/
+*/bin/
+*/gen/
+*/out/
+
+# Java class files
+*.class
+
+# Files for the Dalvik VM
+*.dex
+
+#Built application files
+*.apk
+*.ap_
+proguard/
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+# *.jar
+*.war
+*.ear
+
+# Eclipse Project files
+.classpath
+*/.classpath
+**/.classpath
+.project
+*/.project
+**/.project
+.factorypath
+*/.factorypath
+**/.factorypath
+.settings/
+/.settings/
+*/.settings/
+**/.settings/
+*/.apt_generated/
+**/.apt_generated/
+*/.apt_generated_tests/
+**/.apt_generated_tests/
+
+# IntelliJ IDEA Project files
+.idea
+*.iml
+*/*.iml
+**/*.iml
+*.ipr
+*.iws
+out
+*/.DS_Store
+**/.DS_Store
+.DS_Store
+Thumbs.db
+/.idea/
+*/.idea/
+**/.idea/
+.idea/
+
+#gradle wrapper
+gradle/
+/.gradle/
+# Gradle files
+.gradle/
+build/
+*/build/
+**/build/
+gradlew
+gradlew.bat
+
+# Log Files
+*.log
+
+# VSCode
+.vscode

+ 35 - 0
basic-application-api/pom.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>xx-user-java</artifactId>
+        <groupId>com.xxh.cloud</groupId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>basic-application-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>com.xxh.cloud</groupId>
+            <artifactId>xx-config-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.xxh.cloud</groupId>
+            <artifactId>basic-framework</artifactId>
+        </dependency>
+
+    </dependencies>
+
+
+</project>

+ 39 - 0
basic-application-api/src/main/java/com/xxh/cloud/basic/application/controller/BasicAppTestController.java

@@ -0,0 +1,39 @@
+package com.xxh.cloud.basic.application.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.mysql.cj.x.protobuf.Mysqlx;
+import com.xxh.cloud.framework.common.entity.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+// @SaIgnore
+// @RestController
+// @RequestMapping("/bat")
+// @Api(tags="BasicAppTestController")
+public class BasicAppTestController {
+
+
+//    @Autowired
+//    private TenantService tenantService;
+
+
+    //todo:测试git日志
+
+//    @SaCheckPermission("uat:t1")
+//     @ApiOperation("t1")
+//     @RequestMapping("t1")
+//     public Result<String> t1() {
+//         System.out.println("++++++++++++++++++++++ t1 ++++++++++++++++++++++++++++++++++");
+// //        List<Tenant> list= tenantService.list();
+// //        return new Result<List<Tenant>>().ok(list );
+//         return new Result<String>().ok("1111");
+//     }
+
+}

+ 56 - 0
basic-application-api/src/main/java/com/xxh/cloud/basic/application/controller/DictAppController.java

@@ -0,0 +1,56 @@
+package com.xxh.cloud.basic.application.controller;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.xxh.cloud.basic.framework.modules.base.entity.dto.DictTypeInfoDTO;
+import com.xxh.cloud.basic.framework.modules.base.entity.dto.DictTypeListDTO;
+import com.xxh.cloud.basic.framework.modules.base.entity.vos.DictTypeVO;
+import com.xxh.cloud.basic.framework.modules.base.service.DictDataService;
+import com.xxh.cloud.basic.framework.modules.base.service.DictTypeService;
+import com.xxh.cloud.framework.common.entity.Result;
+import com.xxh.cloud.framework.common.validator.ValidatorUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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.List;
+
+@SaIgnore
+@RestController
+@RequestMapping("/app/dict")
+@Api(tags="客户端_服务,字典管理")
+public class DictAppController {
+
+    @Autowired
+    private DictTypeService dictTypeService;
+    @Autowired
+    private DictDataService dictDataService;
+
+
+    @PostMapping("list")
+    @ApiOperation("字典分类列表")
+    public Result<List<DictTypeVO>> list(@RequestBody DictTypeListDTO params) {
+        ValidatorUtils.validateEntity(params);
+        List<DictTypeVO> data= dictTypeService.list(params);
+        return new Result<List<DictTypeVO>>().ok(data);
+    }
+
+
+    @PostMapping("info")
+    @ApiOperation("获取字典分类(数据)明细")
+    public Result<DictTypeVO> info(@RequestBody DictTypeInfoDTO params) {
+        ValidatorUtils.validateEntity(params);
+        DictTypeVO data=dictTypeService.infoById(params.getId());
+        return new Result<DictTypeVO>().ok(data);
+    }
+
+
+
+
+
+
+}

+ 49 - 0
basic-application-api/src/main/java/com/xxh/cloud/basic/application/controller/PageInfoAppController.java

@@ -0,0 +1,49 @@
+package com.xxh.cloud.basic.application.controller;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.xxh.cloud.basic.framework.modules.base.entity.dos.PageInfo;
+import com.xxh.cloud.basic.framework.modules.base.entity.dto.DictTypeInfoDTO;
+import com.xxh.cloud.basic.framework.modules.base.entity.dto.DictTypeListDTO;
+import com.xxh.cloud.basic.framework.modules.base.entity.dto.PageInfoGetDTO;
+import com.xxh.cloud.basic.framework.modules.base.entity.vos.DictTypeVO;
+import com.xxh.cloud.basic.framework.modules.base.entity.vos.PageVO;
+import com.xxh.cloud.basic.framework.modules.base.service.DictDataService;
+import com.xxh.cloud.basic.framework.modules.base.service.DictTypeService;
+import com.xxh.cloud.basic.framework.modules.base.service.PageInfoService;
+import com.xxh.cloud.basic.framework.modules.biz.service.PageInfoBizService;
+import com.xxh.cloud.framework.common.constant.YN;
+import com.xxh.cloud.framework.common.entity.Result;
+import com.xxh.cloud.framework.common.exception.BusinessBaseErrorEnum;
+import com.xxh.cloud.framework.common.exception.BusinessException;
+import com.xxh.cloud.framework.common.validator.ValidatorUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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.List;
+
+@SaIgnore
+@RestController
+@RequestMapping("/app/page")
+@Api(tags="客户端_服务,页面配置")
+public class PageInfoAppController {
+
+    @Autowired
+    private PageInfoBizService pageInfoBizService;
+
+    @PostMapping("get")
+    @ApiOperation("查询详情")
+    public Result<PageVO> get(@RequestBody PageInfoGetDTO params) {
+        PageVO pageVO= pageInfoBizService.get(params);
+        if (pageVO.getPageState().equals(YN.NO.getCode())) {
+            throw new BusinessException(BusinessBaseErrorEnum.DB_RECORD_NOT_EXISTS);
+        }
+        return new Result<PageVO>().ok(pageVO);
+    }
+
+}

+ 65 - 0
basic-application-api/src/main/java/com/xxh/cloud/basic/application/controller/SecurityAppController.java

@@ -0,0 +1,65 @@
+package com.xxh.cloud.basic.application.controller;
+
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.xxh.cloud.basic.framework.modules.base.security.SignCertificateGetParam;
+import com.xxh.cloud.basic.framework.modules.base.security.SignCertificateModel;
+import com.xxh.cloud.framework.common.entity.Result;
+import com.xxh.cloud.framework.common.redis.RedisUtils;
+import com.xxh.cloud.framework.common.utils.HttpContextUtils;
+import com.xxh.cloud.framework.common.validator.ValidatorUtils;
+import com.xxh.cloud.framework.security.bean.RsaPubPriKeyModel;
+import com.xxh.cloud.framework.security.utils.CacheKeys;
+import com.xxh.cloud.framework.security.utils.SecurityUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+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.Date;
+
+@Log4j2
+@RestController
+@RequestMapping("/app/user/security")
+@Api(tags="App_安全服务")
+public class SecurityAppController {
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @PostMapping("/getCertificate")
+    @ApiOperation(value="获取签名证书",response = SignCertificateModel.class )
+    public Result<SignCertificateModel> getCertificate(@RequestBody SignCertificateGetParam params) {
+        ValidatorUtils.validateEntity(params);
+        String key= CacheKeys.getRsaKey();
+        String token = HttpContextUtils.getRequest().getHeader("token");
+        if (StringUtils.hasText(token)) {
+            key= CacheKeys.getRsaKey(token, true);
+        }
+        RsaPubPriKeyModel model= (RsaPubPriKeyModel) redisUtils.get(key);
+
+        if(model==null) {
+            model = SecurityUtils.generateRSAKey(DateUtil.format(new Date(), DatePattern.PURE_DATETIME_FORMAT));
+            redisUtils.set(key, model);
+            SignCertificateModel data= new SignCertificateModel(model.getReqPubKey(),model.getRespPriKey(),model.getVersion());
+            return new Result<SignCertificateModel>().ok(data);
+        }
+
+        if(StrUtil.isNotEmpty(params.getVersion()) && params.getVersion().equals(model.getVersion())){
+            SignCertificateModel data= new SignCertificateModel(model.getVersion());
+            return new Result<SignCertificateModel>().ok(data);
+        }
+        System.out.println("redis_key:"+ key);
+        System.out.println("获取的加密key:"+ JSONObject.toJSONString(model));
+        SignCertificateModel data= new SignCertificateModel(model.getReqPubKey(),model.getRespPriKey(),model.getVersion());
+        return new Result<SignCertificateModel>().ok(data);
+    }
+}

+ 68 - 0
basic-application-api/src/main/java/com/xxh/cloud/basic/application/controller/VisitVerificationAppController.java

@@ -0,0 +1,68 @@
+package com.xxh.cloud.basic.application.controller;
+
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import com.xxh.cloud.basic.client.api.VisitVerificationClientService;
+import com.xxh.cloud.basic.client.api.bean.bos.VisitVerificationBO;
+import com.xxh.cloud.basic.client.api.bean.dto.VisitVerificationSearchDTO;
+import com.xxh.cloud.basic.framework.modules.biz.service.VisitVerificationConfigBizService;
+import com.xxh.cloud.basic.framework.modules.cache.service.VisitVerificationCacheService;
+import com.xxh.cloud.framework.common.entity.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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.List;
+import java.util.Map;
+
+@SaCheckLogin
+@RestController
+@RequestMapping("/app/basic/ver")
+@Api(tags="App_访问校验配置")
+public class VisitVerificationAppController {
+
+    @Autowired
+    private VisitVerificationClientService visitVerificationClientService;
+    @Autowired
+    private VisitVerificationConfigBizService visitVerificationConfigBizService;
+    @Autowired
+    private VisitVerificationCacheService visitVerificationCacheService;
+
+    @PostMapping("/syncPatientRecordBlackList")
+    @ApiOperation(value="同步黑名单",response = Void.class)
+    public Result<String> syncPatientRecordBlackList(@RequestBody Map<String, String> params) {
+        visitVerificationConfigBizService.syncPatientRecordBlackList();
+        return new Result<String>().success();
+    }
+
+    @PostMapping("/syncPatient4IdCard")
+    @ApiOperation(value="根据身份证扩展患者ID",response = Void.class)
+    public Result<String> syncPatient4IdCard(@RequestBody Map<String, String> params) {
+        visitVerificationConfigBizService.syncPatient4IdCard();
+        return new Result<String>().success();
+    }
+
+    @PostMapping("/cacheVisitVerification")
+    @ApiOperation(value="缓存访问校验配置",response = Void.class)
+    public Result<String> cacheVisitVerification(@RequestBody Map<String, String> params) {
+        visitVerificationCacheService.cacheVisitVerification();
+        return new Result<String>().success();
+    }
+
+    @PostMapping("/getVisitVerification")
+    @ApiOperation(value="查询访问校验配置",response = VisitVerificationBO.class)
+    public Result<Map<String, List<VisitVerificationBO>>> getVisitVerification(@RequestBody VisitVerificationSearchDTO params) {
+        VisitVerificationSearchDTO dto = new VisitVerificationSearchDTO(params.getVisitType(), params.getVisitIds());
+        return new Result<Map<String, List<VisitVerificationBO>>>().ok(visitVerificationClientService.getVisitVerification(dto));
+    }
+
+    @PostMapping("/getVisitVerificationByPatient")
+    @ApiOperation(value="查询访问校验配置byPatientId",response = VisitVerificationBO.class)
+    public Result<Map<String, List<VisitVerificationBO>>> getVisitVerificationByPatient(@RequestBody List<String> params) {
+        return new Result<Map<String, List<VisitVerificationBO>>>().ok(visitVerificationClientService.getVisitVerificationByPatient(params));
+    }
+}

+ 19 - 0
basic-client-api/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>xx-user-java</artifactId>
+        <groupId>com.xxh.cloud</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <artifactId>basic-client-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

+ 22 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/CompanyClientService.java

@@ -0,0 +1,22 @@
+package com.xxh.cloud.basic.client.api;
+
+
+import com.xxh.cloud.basic.client.api.bean.bos.CompanyBO;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public interface CompanyClientService {
+
+    public CompanyBO getCompanyById(String id);
+
+    public List<CompanyBO> getCompanyListByIds(Collection<String> ids);
+
+    public Map<String,CompanyBO> getCompanyMapByIds(Collection<String> ids);
+
+
+    public List<CompanyBO> getCompanyList();
+
+
+}

+ 28 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/DictClientService.java

@@ -0,0 +1,28 @@
+package com.xxh.cloud.basic.client.api;
+
+
+import com.xxh.cloud.basic.client.api.bean.bos.DictBO;
+import com.xxh.cloud.basic.client.api.bean.bos.DictMapBO;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public interface DictClientService {
+
+    public DictBO getDictById(String id);
+
+    public List<DictBO> getDictListByIds(Collection<String> ids);
+
+    public Map<String, DictBO> getDictMapByIds(Collection<String> ids);
+
+
+
+    public DictMapBO getDictValKVById(String id);
+
+    public List<DictMapBO> getDictValKVListByIds(Collection<String> ids);
+
+    public Map<String, DictMapBO> getDictValKVMapByIds(Collection<String> ids);
+
+
+}

+ 24 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/ParamsClientService.java

@@ -0,0 +1,24 @@
+package com.xxh.cloud.basic.client.api;
+
+
+import com.xxh.cloud.basic.client.api.bean.bos.ParamsBO;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public interface ParamsClientService {
+
+    public ParamsBO getParamsById(String id);
+
+    public List<ParamsBO> getParamsListByIds(Collection<String> ids);
+
+    public Map<String, ParamsBO> getParamsMapByIds(Collection<String> ids);
+
+    public  <T> T getParamConfig(String paramValType ,T bean);
+
+    public  <T> T getParamConfig(String id, String paramValType ,T bean);
+
+
+    public  <T> T getParamConfig(Map<String, Object>  valMap ,T bean);
+}

+ 21 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/ProjectClientService.java

@@ -0,0 +1,21 @@
+package com.xxh.cloud.basic.client.api;
+
+import com.xxh.cloud.basic.client.api.bean.bos.ProjectBO;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public interface ProjectClientService {
+
+    public ProjectBO getProjectById(String id);
+
+    public List<ProjectBO> getProjectListByIds(Collection<String> ids);
+
+    public Map<String,ProjectBO> getProjectMapByIds(Collection<String> ids);
+
+    public List<ProjectBO> getProjectList();
+
+    public List<ProjectBO> getProjectListByYes();
+
+}

+ 14 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/VisitVerificationClientService.java

@@ -0,0 +1,14 @@
+package com.xxh.cloud.basic.client.api;
+
+import com.xxh.cloud.basic.client.api.bean.bos.VisitVerificationBO;
+import com.xxh.cloud.basic.client.api.bean.dto.VisitVerificationSearchDTO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface VisitVerificationClientService {
+
+    Map<String, List<VisitVerificationBO>> getVisitVerification(VisitVerificationSearchDTO params);
+
+    Map<String, List<VisitVerificationBO>> getVisitVerificationByPatient(List<String> patientIds);
+}

+ 113 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/CompanyBO.java

@@ -0,0 +1,113 @@
+package com.xxh.cloud.basic.client.api.bean.bos;
+
+
+public class CompanyBO {
+
+
+    /**
+     * id
+     * */
+    private String id;
+
+
+    /**
+     * 分类
+     * */
+    private String type;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 系统分类(平台运营/商户)
+     */
+    private String sysType;
+
+    /**
+     * logo
+     */
+    private String logo;
+
+    /**
+     * 上级公司ID
+     */
+    private String pid;
+
+    /**
+     * 排序
+     * */
+    private Integer sort;
+
+    /**
+     * 说明
+     * */
+    private String remark;
+
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSysType() {
+        return sysType;
+    }
+
+    public void setSysType(String sysType) {
+        this.sysType = sysType;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

+ 96 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/DictBO.java

@@ -0,0 +1,96 @@
+package com.xxh.cloud.basic.client.api.bean.bos;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DictBO {
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 字典类型
+     */
+    private String type;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 字典值
+     */
+    private List<DictValBO> vals;
+
+
+    public void addItem(DictValBO item){
+        if(this.vals==null){
+            this.vals=new ArrayList<>();
+        }
+        if(item!=null){
+            this.vals.add(item);
+        }
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public List<DictValBO> getVals() {
+        return vals;
+    }
+
+    public void setVals(List<DictValBO> vals) {
+        this.vals = vals;
+    }
+
+}

+ 99 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/DictMapBO.java

@@ -0,0 +1,99 @@
+package com.xxh.cloud.basic.client.api.bean.bos;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class DictMapBO {
+
+
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 字典类型
+     */
+    private String type;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+
+    /**
+     * 字典值
+     */
+    private Map<String,String> vals;
+
+
+    public void addItem(String key ,String val){
+        if(this.vals==null){
+            this.vals=new HashMap<>();
+        }
+        if(key!=null && !"".equals(key) && val != null && !"".equals(val)){
+            this.vals.put(key,val);
+        }
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public Map<String, String> getVals() {
+        return vals;
+    }
+
+    public void setVals(Map<String, String> vals) {
+        this.vals = vals;
+    }
+}

+ 57 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/DictValBO.java

@@ -0,0 +1,57 @@
+package com.xxh.cloud.basic.client.api.bean.bos;
+
+public class DictValBO {
+
+
+    /**
+     * 字典标签
+     */
+    private String dictLabel;
+
+    /**
+     * 字典值
+     */
+    private String dictValue;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    public String getDictLabel() {
+        return dictLabel;
+    }
+
+    public void setDictLabel(String dictLabel) {
+        this.dictLabel = dictLabel;
+    }
+
+    public String getDictValue() {
+        return dictValue;
+    }
+
+    public void setDictValue(String dictValue) {
+        this.dictValue = dictValue;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+}

+ 58 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/ParamsBO.java

@@ -0,0 +1,58 @@
+package com.xxh.cloud.basic.client.api.bean.bos;
+
+
+import java.util.List;
+import java.util.Map;
+
+public class ParamsBO {
+
+    private String id;
+
+    private String paramType;
+
+    private String paramValueType;
+
+    private Map<String,Object> paramValue;
+
+    private List<Map> paramValueList;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getParamType() {
+        return paramType;
+    }
+
+    public void setParamType(String paramType) {
+        this.paramType = paramType;
+    }
+
+    public String getParamValueType() {
+        return paramValueType;
+    }
+
+    public void setParamValueType(String paramValueType) {
+        this.paramValueType = paramValueType;
+    }
+
+    public Map<String, Object> getParamValue() {
+        return paramValue;
+    }
+
+    public void setParamValue(Map<String, Object> paramValue) {
+        this.paramValue = paramValue;
+    }
+
+    public List<Map> getParamValueList() {
+        return paramValueList;
+    }
+
+    public void setParamValueList(List<Map> paramValueList) {
+        this.paramValueList = paramValueList;
+    }
+}

+ 4 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/ProjectBO.java

@@ -0,0 +1,4 @@
+package com.xxh.cloud.basic.client.api.bean.bos;
+
+public class ProjectBO {
+}

+ 93 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/bos/VisitVerificationBO.java

@@ -0,0 +1,93 @@
+package com.xxh.cloud.basic.client.api.bean.bos;
+
+
+public class VisitVerificationBO {
+
+    // 数据id
+    private String id;
+
+    // 校验目标分类
+    private String visitType;
+
+    // 校验目标ID
+    private String visitId;
+
+    // 校验规则分类
+    private String verType;
+
+    // 应用端范围(全部/患者端/医生端)
+    private String appScope;
+
+    // 应用端功能范围
+    private String bizScope;
+
+    // 校验条件配置
+    private String verificationConfig;
+
+    // 数据来源
+    private String dataSource;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getVisitType() {
+        return visitType;
+    }
+
+    public void setVisitType(String visitType) {
+        this.visitType = visitType;
+    }
+
+    public String getVisitId() {
+        return visitId;
+    }
+
+    public void setVisitId(String visitId) {
+        this.visitId = visitId;
+    }
+
+    public String getVerType() {
+        return verType;
+    }
+
+    public void setVerType(String verType) {
+        this.verType = verType;
+    }
+
+    public String getAppScope() {
+        return appScope;
+    }
+
+    public void setAppScope(String appScope) {
+        this.appScope = appScope;
+    }
+
+    public String getBizScope() {
+        return bizScope;
+    }
+
+    public void setBizScope(String bizScope) {
+        this.bizScope = bizScope;
+    }
+
+    public String getVerificationConfig() {
+        return verificationConfig;
+    }
+
+    public void setVerificationConfig(String verificationConfig) {
+        this.verificationConfig = verificationConfig;
+    }
+
+    public String getDataSource() {
+        return dataSource;
+    }
+
+    public void setDataSource(String dataSource) {
+        this.dataSource = dataSource;
+    }
+}

+ 39 - 0
basic-client-api/src/main/java/com/xxh/cloud/basic/client/api/bean/dto/VisitVerificationSearchDTO.java

@@ -0,0 +1,39 @@
+package com.xxh.cloud.basic.client.api.bean.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class VisitVerificationSearchDTO {
+
+    // 校验目标分类 BasicVisitConstant.VisitType
+    private String visitType;
+
+    // 校验目标ID
+    private List<String> visitIds = new ArrayList<>();
+
+    public VisitVerificationSearchDTO(String visitType, String visitId){
+        this.visitType = visitType;
+        this.visitIds.add(visitId);
+    }
+
+    public VisitVerificationSearchDTO(String visitType, List<String> visitIds){
+        this.visitType = visitType;
+        this.visitIds.addAll(visitIds);
+    }
+
+    public String getVisitType() {
+        return visitType;
+    }
+
+    public void setVisitType(String visitType) {
+        this.visitType = visitType;
+    }
+
+    public List<String> getVisitIds() {
+        return visitIds;
+    }
+
+    public void setVisitIds(List<String> visitIds) {
+        this.visitIds = visitIds;
+    }
+}

+ 42 - 0
basic-framework/pom.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>xx-user-java</artifactId>
+        <groupId>com.xxh.cloud</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <artifactId>basic-framework</artifactId>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>com.xxh.cloud</groupId>
+            <artifactId>xx-config-framework</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.xxh.cloud</groupId>
+            <artifactId>xx-config-mybatisplus</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.xxh.cloud</groupId>
+            <artifactId>basic-client-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.xxh.cloud</groupId>
+            <artifactId>user-client-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>

+ 13 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/aop/annotation/OperationLog.java

@@ -0,0 +1,13 @@
+package com.xxh.cloud.basic.framework.modules.aop.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 接口签名注解
+ */
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(value = RetentionPolicy.RUNTIME)
+@Inherited
+public @interface OperationLog {
+
+}

+ 96 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/aop/aspect/OperationLogAspect.java

@@ -0,0 +1,96 @@
+package com.xxh.cloud.basic.framework.modules.aop.aspect;
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.basic.framework.modules.log.entity.dos.LogOperation;
+import com.xxh.cloud.basic.framework.modules.log.service.LogOperationService;
+import com.xxh.cloud.framework.common.user.AuthContextUtils;
+import com.xxh.cloud.framework.common.user.LoginUser;
+import com.xxh.cloud.framework.common.utils.IpUtils;
+import io.swagger.annotations.ApiModelProperty;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+
+/**
+ * API安全AOP
+ */
+@Aspect
+@Primary
+@Component
+public class OperationLogAspect {
+
+    @Autowired
+    private LogOperationService logOperationService;
+
+    /**
+     * APIWrap pointcut
+     */
+    @Pointcut("@within(com.xxh.cloud.basic.framework.modules.aop.annotation.OperationLog) || @annotation(com.xxh.cloud.basic.framework.modules.aop.annotation.OperationLog)")
+    public void apiWrapPointcut() {
+        // Do nothing because of pointcut
+    }
+
+    /**
+     * AOP 之前插入
+     *
+     * @param joinPoint {@link JoinPoint}
+     */
+    @Before("apiWrapPointcut()")
+    public void before(JoinPoint joinPoint) {
+        MethodSignature sign = (MethodSignature) joinPoint.getSignature();
+        Method method = sign.getMethod();
+        System.out.println("----------AOP 之前插入-----------");
+
+        Object[] args = joinPoint.getArgs();
+        for (Object obj : args) {
+            LoginUser loginUser= AuthContextUtils.getCurrentLoginUser();
+            // 操作日志entity
+            LogOperation entity = new LogOperation();
+            entity.setId(IdUtil.getSnowflake(3,3).nextIdStr());
+            entity.setOperation(method.getName());
+            entity.setRequestParams(JSONObject.toJSONString(obj));
+            entity.setOpIp(IpUtils.getIpAddr());
+            entity.setStatus("1");
+            // 请求参数和地址
+            getRequestUri(entity);
+            if (loginUser != null) {
+                entity.setUserId(loginUser.getId());
+            }
+            System.out.println(JSONObject.toJSONString(entity));
+            logOperationService.save(entity);
+        }
+
+    }
+
+    private void getRequestUri(LogOperation entity) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        StringBuilder stringBuilder = new StringBuilder();
+        //拼接请求地址
+        stringBuilder.append(request.getRequestURI());
+
+        //参数不为空则拼接参数
+        if (!request.getParameterMap().isEmpty()) {
+            stringBuilder.append(JSONUtil.toJsonStr(request.getParameterMap()));
+        }
+        //请求地址
+        entity.setRequestUri(stringBuilder.toString());
+        entity.setRequestMethod(request.getMethod());
+    }
+
+
+
+}

+ 90 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/Company.java

@@ -0,0 +1,90 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dos;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.basic.framework.modules.base.entity.vos.CompanyPropertyVO;
+import com.xxh.cloud.framework.common.mybatisplus.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 公司信息表
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("basic_company")
+public class Company extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.INPUT)
+    private String id;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    /**
+     * 系统分类(平台运营/商户)
+     */
+    @ApiModelProperty(value = "系统分类(平台运营/商户)")
+    private String sysType;
+
+    /**
+     * logo
+     */
+    @ApiModelProperty(value = "logo")
+    private String logo;
+
+    /**
+     * 上级公司ID
+     */
+    @ApiModelProperty(value = "上级公司ID")
+    private String pid;
+
+    /**
+     * 公司分类
+     */
+    @ApiModelProperty(value = "公司分类")
+    private String type;
+
+
+    @ApiModelProperty(value = "扩展信息")
+    private String propertyJson;
+
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 说明
+     */
+    @ApiModelProperty(value = "说明")
+    private String remark;
+
+
+    /**
+     * 逻辑删除标记(Y:正常,N:删除)
+     */
+    @ApiModelProperty(value = "逻辑删除标记(Y:正常,N:删除)")
+    private String rowsStatus;
+
+
+
+
+}

+ 68 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/DictData.java

@@ -0,0 +1,68 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dos;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.framework.common.mybatisplus.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 字典数据表
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("basic_dict_data")
+public class DictData extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+     @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.INPUT)
+      private String id;
+
+    /**
+     * 字典类型ID
+     */
+     @ApiModelProperty(value = "字典类型ID")
+      private String dictTypeId;
+
+    /**
+     * 字典标签
+     */
+     @ApiModelProperty(value = "字典标签")
+      private String dictLabel;
+
+    /**
+     * 字典值
+     */
+     @ApiModelProperty(value = "字典值")
+      private String dictValue;
+
+    /**
+     * 备注
+     */
+     @ApiModelProperty(value = "备注")
+      private String remark;
+
+    /**
+     * 排序
+     */
+     @ApiModelProperty(value = "排序")
+      private Integer sort;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+
+}

+ 59 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/DictType.java

@@ -0,0 +1,59 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dos;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.framework.common.mybatisplus.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 字典类型
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("basic_dict_type")
+public class DictType extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+     @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.INPUT)
+      private String id;
+
+    /**
+     * 字典类型
+     */
+     @ApiModelProperty(value = "字典类型")
+      private String type;
+
+    /**
+     * 名称
+     */
+     @ApiModelProperty(value = "名称")
+      private String name;
+
+    /**
+     * 备注
+     */
+     @ApiModelProperty(value = "备注")
+      private String remark;
+
+    /**
+     * 排序
+     */
+     @ApiModelProperty(value = "排序")
+      private Integer sort;
+
+
+
+
+
+}

+ 71 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/NoticeInfo.java

@@ -0,0 +1,71 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dos;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.framework.common.mybatisplus.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 公告信息表
+ * </p>
+ *
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("basic_notice_info")
+public class NoticeInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+     @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.INPUT)
+      private String id;
+
+    /**
+     * 标题
+     */
+     @ApiModelProperty(value = "标题")
+      private String title;
+
+    /**
+     * 内容
+     */
+     @ApiModelProperty(value = "内容")
+      private String content;
+
+    /**
+     * 公告通知用户Ids
+     */
+     @ApiModelProperty(value = "公告通知用户Ids")
+      private String toUserIds;
+
+    /**
+     * 附件
+     */
+     @ApiModelProperty(value = "附件")
+      private String files;
+
+    /**
+     * 状态
+     */
+     @ApiModelProperty(value = "状态")
+      private String status;
+
+    /**
+     * 逻辑删除标记(Y:正常,N:删除)
+     */
+     @ApiModelProperty(value = "逻辑删除标记(Y:正常,N:删除)")
+      private String rowsStatus;
+
+
+
+
+}

+ 36 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/PageInfo.java

@@ -0,0 +1,36 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xxh.cloud.framework.common.mybatisplus.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 页面数据DO
+ *
+ */
+@Data
+@TableName("sys_page_info")
+@NoArgsConstructor
+public class PageInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "页面code")
+    @TableId(value = "code", type = IdType.INPUT)
+    private String code;
+
+    @ApiModelProperty(value = "页面名称")
+    private String name;
+
+    @ApiModelProperty(value = "页面数据")
+    private String pageData;
+
+    @ApiModelProperty(value = "页面状态")
+    private String pageState;
+
+}

+ 57 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/Params.java

@@ -0,0 +1,57 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dos;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.framework.common.mybatisplus.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 系统参数表
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("basic_params")
+public class Params extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+     @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.INPUT)
+     private String id;
+
+
+    /**
+     * 参数分类
+     */
+    @ApiModelProperty(value = "参数分类")
+    private String paramType;
+
+
+    /**
+     * 参数值分类
+     */
+     @ApiModelProperty(value = "参数值分类")
+      private String paramValueType;
+
+    /**
+     * 参数值
+     */
+     @ApiModelProperty(value = "参数值")
+      private String paramValue;
+
+    /**
+     * 逻辑删除标记(Y:正常,N:删除)
+     */
+     @ApiModelProperty(value = "逻辑删除标记(Y:正常,N:删除)")
+      private String rowsStatus;
+
+
+
+}

+ 82 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/ProjectInfo.java

@@ -0,0 +1,82 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dos;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.framework.common.mybatisplus.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 项目信息表
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("basic_project_info")
+public class ProjectInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目编号
+     */
+     @ApiModelProperty(value = "项目编号")
+    @TableId(value = "code", type = IdType.INPUT)
+      private String code;
+
+    /**
+     * 项目名称
+     */
+     @ApiModelProperty(value = "项目名称")
+      private String name;
+
+    /**
+     * 状态
+     */
+     @ApiModelProperty(value = "状态")
+      private String status;
+
+    /**
+     * 负责人
+     */
+     @ApiModelProperty(value = "负责人")
+      private String director;
+
+    /**
+     * 描述
+     */
+     @ApiModelProperty(value = "描述")
+      private String remark;
+
+    @ApiModelProperty(value = "是否默认")
+     private String isDef;
+
+    /**
+     * 加密私钥
+     */
+     @ApiModelProperty(value = "加密私钥")
+      private String dataPrivateKey;
+
+    /**
+     * 加密公钥
+     */
+     @ApiModelProperty(value = "加密公钥")
+      private String dataPublicKey;
+
+
+    @ApiModelProperty(value = "数据连接配置")
+     private String dataLinkConfig;
+
+    /**
+     * 逻辑删除标记(Y:正常,N:删除)
+     */
+     @ApiModelProperty(value = "逻辑删除标记(Y:正常,N:删除)")
+      private String rowsStatus;
+
+
+
+}

+ 62 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/SiteMessageInfo.java

@@ -0,0 +1,62 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dos;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.framework.common.mybatisplus.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 站内消息表
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("basic_site_message_info")
+public class SiteMessageInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+     @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.INPUT)
+      private String id;
+
+    /**
+     * 标题
+     */
+     @ApiModelProperty(value = "标题")
+      private String title;
+
+    /**
+     * 内容
+     */
+     @ApiModelProperty(value = "内容")
+      private String content;
+
+    /**
+     * 信息分类
+     */
+     @ApiModelProperty(value = "信息分类")
+      private String type;
+
+    /**
+     * 消息参数
+     */
+     @ApiModelProperty(value = "消息参数")
+      private String params;
+
+    /**
+     * 逻辑删除标记(Y:正常,N:删除)
+     */
+     @ApiModelProperty(value = "逻辑删除标记(Y:正常,N:删除)")
+      private String rowsStatus;
+
+
+}

+ 53 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/SiteMessageUserInfo.java

@@ -0,0 +1,53 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dos;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 站内消息发送人表
+ * </p>
+ */
+@Data
+@TableName("basic_site_message_user_info")
+public class SiteMessageUserInfo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+     @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.INPUT)
+      private String id;
+
+    /**
+     * 站内消息ID
+     */
+     @ApiModelProperty(value = "站内消息ID")
+      private String siteMessageId;
+
+    /**
+     * 消息接受人
+     */
+     @ApiModelProperty(value = "消息接受人")
+      private String toUserId;
+
+    /**
+     * 消息状态
+     */
+     @ApiModelProperty(value = "消息状态")
+      private String status;
+
+    /**
+     * 信息读取时间
+     */
+     @ApiModelProperty(value = "信息读取时间")
+      private Date readDate;
+
+
+}

+ 49 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dos/VisitVerificationConfig.java

@@ -0,0 +1,49 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xxh.cloud.framework.common.mybatisplus.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("basic_visit_verification_config")
+public class VisitVerificationConfig extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.INPUT)
+    private String id;
+
+    @ApiModelProperty(value = "校验目标分类")
+    private String visitType;
+
+    @ApiModelProperty(value = "校验目标ID")
+    private String visitId;
+
+    @ApiModelProperty(value = "'校验规则分类'")
+    private String verType;
+
+    @ApiModelProperty(value = "应用端范围(全部/患者端/医生端)")
+    private String appScope;
+
+    @ApiModelProperty(value = "应用端功能范围")
+    private String bizScope;
+
+    @ApiModelProperty(value = "校验条件配置")
+    private String verificationConfig;
+
+    @ApiModelProperty(value = "数据来源")
+    private String dataSource;
+
+    @ApiModelProperty(value = "逻辑删除标记")
+    private String rowsStatus;
+
+
+}

+ 52 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/CompanyAddDTO.java

@@ -0,0 +1,52 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.basic.framework.modules.base.entity.vos.CompanyPropertyVO;
+import com.xxh.cloud.basic.framework.modules.constant.CompanySysType;
+import com.xxh.cloud.framework.common.constant.Constant;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class CompanyAddDTO {
+
+
+
+    @ApiModelProperty(value = "机构ID")
+    private String id;
+
+    @ApiModelProperty(value = "名称",required = true)
+    @NotEmpty(message = "名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "系统分类(CompanySysType)")
+    private String sysType= CompanySysType.Company_Merchant.getCode();
+
+    @ApiModelProperty(value = "公司logo")
+    private String logo;
+
+    @ApiModelProperty(value = "公司分类")
+    private String type;
+
+    @ApiModelProperty(value = "上级公司ID",required = true)
+    @NotEmpty(message = "上级公司不能为空")
+    private String pid= Constant.RootParentNodeId;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "说明")
+    private String remark;
+
+
+    @ApiModelProperty(value = "扩展信息")
+    private CompanyPropertyVO propertyJson;
+
+
+
+}

+ 16 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/CompanyInfoDTO.java

@@ -0,0 +1,16 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class CompanyInfoDTO {
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotEmpty(message = "ID不能为空")
+    private String id;
+}

+ 32 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/CompanyListDTO.java

@@ -0,0 +1,32 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Collection;
+
+@Getter
+@Setter
+public class CompanyListDTO {
+
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "ids")
+    private Collection<String> ids;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "公司分类")
+    private String type;
+
+    @ApiModelProperty(value = "系统分类(平台运营/商户)")
+    private String sysType;
+
+
+}

+ 29 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/CompanyQueryDTO.java

@@ -0,0 +1,29 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.xxh.cloud.framework.common.entity.BasePageDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Collection;
+
+@Getter
+@Setter
+public class CompanyQueryDTO extends BasePageDTO {
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "ids")
+    private Collection<String> ids;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "公司分类")
+    private String type;
+
+    @ApiModelProperty(value = "系统分类(平台运营/商户)")
+    private String sysType;
+
+}

+ 14 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/CompanyTreeDTO.java

@@ -0,0 +1,14 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CompanyTreeDTO {
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+}

+ 40 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/CompanyUpdateDTO.java

@@ -0,0 +1,40 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.xxh.cloud.basic.framework.modules.base.entity.vos.CompanyPropertyVO;
+import com.xxh.cloud.basic.framework.modules.constant.CompanySysType;
+import com.xxh.cloud.framework.common.constant.Constant;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class CompanyUpdateDTO {
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotEmpty(message = "ID不能为空")
+    private String id;
+
+    @ApiModelProperty(value = "公司分类")
+    private String type;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "logo")
+    private String logo;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "说明")
+    private String remark;
+
+    @ApiModelProperty(value = "扩展信息")
+    private CompanyPropertyVO propertyJson;
+
+
+
+}

+ 25 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictDataAdd2UpdateBatchDTO.java

@@ -0,0 +1,25 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+
+@Getter
+@Setter
+public class DictDataAdd2UpdateBatchDTO {
+
+    @ApiModelProperty(value = "字典类型ID",required = true)
+    @NotEmpty(message = "字典类型ID不能为空")
+    private String dictTypeId;
+
+    @ApiModelProperty(value = "字典列表",required = true)
+    @NotNull(message = "字典列表不能为空")
+    private List<DictDataAdd2UpdateItem> items;
+
+
+}

+ 35 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictDataAdd2UpdateItem.java

@@ -0,0 +1,35 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.xxh.cloud.framework.common.constant.YN;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+@Getter
+@Setter
+public class DictDataAdd2UpdateItem {
+
+
+    @ApiModelProperty(value = "字典标签",required = true)
+    @NotEmpty(message = "字典标签不能为空")
+    private String dictLabel;
+
+    @ApiModelProperty(value = "字典值",required = true)
+    @NotEmpty(message = "字典值不能为空")
+    private String dictValue;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "排序",required = true)
+    @NotNull(message = "排序不能为空")
+    private Integer sort=0;
+
+    @ApiModelProperty(value = "状态(YN)" ,required = true)
+    @NotEmpty(message = "状态不能为空")
+    private String status= YN.YES.getCode();
+
+
+}

+ 41 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictDataAddDTO.java

@@ -0,0 +1,41 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.xxh.cloud.framework.common.constant.YN;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class DictDataAddDTO {
+
+
+    @ApiModelProperty(value = "字典类型ID",required = true)
+    @NotEmpty(message = "字典类型ID不能为空")
+    private String dictTypeId;
+
+    @ApiModelProperty(value = "字典标签",required = true)
+    @NotEmpty(message = "字典标签不能为空")
+    private String dictLabel;
+
+    @ApiModelProperty(value = "字典值",required = true)
+    @NotEmpty(message = "字典值不能为空")
+    private String dictValue;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "状态(YN)" ,required = true)
+    @NotEmpty(message = "状态不能为空")
+    private String status= YN.YES.getCode();
+
+    @ApiModelProperty(value = "排序",required = true)
+    @NotNull(message = "排序不能为空")
+    private Integer sort=0;
+
+
+
+}

+ 18 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictDataInfoDTO.java

@@ -0,0 +1,18 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class DictDataInfoDTO {
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotEmpty(message = "ID不能为空")
+    private String id;
+
+
+}

+ 24 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictDataListDTO.java

@@ -0,0 +1,24 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Collection;
+
+@Getter
+@Setter
+public class DictDataListDTO {
+
+
+    @ApiModelProperty(value = "字典类型ID")
+    private String dictTypeId;
+
+
+    @ApiModelProperty(value = "字典类型ID")
+    private Collection<String> dictTypeIds;
+
+
+
+
+}

+ 43 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictDataUpdateDTO.java

@@ -0,0 +1,43 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.framework.common.constant.YN;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class DictDataUpdateDTO {
+
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotEmpty(message = "ID不能为空")
+    private String id;
+
+
+    @ApiModelProperty(value = "字典标签",required = true)
+    @NotEmpty(message = "字典标签不能为空")
+    private String dictLabel;
+
+    @ApiModelProperty(value = "字典值",required = true)
+    @NotEmpty(message = "字典值不能为空")
+    private String dictValue;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "排序",required = true)
+    @NotNull(message = "排序不能为空")
+    private Integer sort=0;
+
+    @ApiModelProperty(value = "状态(YN)" ,required = true)
+    @NotEmpty(message = "状态不能为空")
+    private String status= YN.YES.getCode();
+
+
+}

+ 38 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictTypeAddDTO.java

@@ -0,0 +1,38 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class DictTypeAddDTO {
+
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "字典类型(DictTypeCategory)")
+    private String type;
+
+    @ApiModelProperty(value = "名称",required = true)
+    @NotEmpty(message = "名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "排序",required = true)
+    @NotNull(message = "名称不能为空")
+    private Integer sort=0;
+
+    @ApiModelProperty("上级id")
+    private String pid;
+
+
+}

+ 18 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictTypeInfoDTO.java

@@ -0,0 +1,18 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class DictTypeInfoDTO {
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotEmpty(message = "ID不能为空")
+    private String id;
+
+
+}

+ 25 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictTypeListDTO.java

@@ -0,0 +1,25 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Collection;
+
+@Getter
+@Setter
+public class DictTypeListDTO {
+
+
+    @ApiModelProperty(value = "字典分类编号")
+    private String id;
+
+    @ApiModelProperty(value = "字典分类编号")
+    private Collection<String> ids;
+
+    @ApiModelProperty(value = "字典分类类型")
+    private String type;
+
+    @ApiModelProperty(value = "字典分类名称")
+    private String name;
+}

+ 31 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictTypeQueryDTO.java

@@ -0,0 +1,31 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.framework.common.entity.BasePageDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Collection;
+
+@Getter
+@Setter
+public class DictTypeQueryDTO extends BasePageDTO {
+
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "id")
+    private Collection<String> ids;
+
+    @ApiModelProperty(value = "字典类型")
+    private String type;
+
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+
+}

+ 34 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/DictTypeUpdateDTO.java

@@ -0,0 +1,34 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class DictTypeUpdateDTO {
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotEmpty(message = "ID不能为空")
+    private String id;
+
+    @ApiModelProperty(value = "字典类型(DictTypeCategory)",required = true)
+    @NotEmpty(message = "字典类型不能为空")
+    private String type;
+
+    @ApiModelProperty(value = "名称",required = true)
+    @NotEmpty(message = "名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "排序",required = true)
+    @NotNull(message = "排序不能为空")
+    private Integer sort=0;
+
+
+}

+ 32 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/NoticeAddDTO.java

@@ -0,0 +1,32 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Date;
+import java.util.List;
+
+@Getter
+@Setter
+public class NoticeAddDTO {
+
+    @ApiModelProperty(value = "标题",required = true)
+    @NotEmpty(message = "标题不能为空")
+    private String title;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "公告通知用户Ids")
+    private List<String> toUserIds;
+
+    @ApiModelProperty(value = "附件")
+    private List<String> files;
+
+    @ApiModelProperty(value = "状态 1:重要公告 2:普通公告 3:过期",required = true)
+    @NotEmpty(message = "状态能为空")
+    private String status;
+
+}

+ 18 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/NoticeEditDTO.java

@@ -0,0 +1,18 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class NoticeEditDTO extends NoticeAddDTO {
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotEmpty(message = "ID不能为空")
+    private String id;
+
+
+}

+ 16 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/NoticeGetDTO.java

@@ -0,0 +1,16 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+@Getter
+@Setter
+public class NoticeGetDTO {
+
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotEmpty(message = "ID不能为空")
+    private String id;
+}

+ 24 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/NoticeQueryDTO.java

@@ -0,0 +1,24 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.xxh.cloud.framework.common.entity.BasePageDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class NoticeQueryDTO extends BasePageDTO {
+
+    @ApiModelProperty(value = "公告标题")
+    private String title;
+
+    @ApiModelProperty(value = "公告状态")
+    private String status;
+
+    @ApiModelProperty(value = "公告时间-开始")
+    private String noticeDateStart;
+
+    @ApiModelProperty(value = "公告时间-截止")
+    private String noticeDateEnd;
+
+}

+ 20 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/NoticeUpdateStatusDTO.java

@@ -0,0 +1,20 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class NoticeUpdateStatusDTO {
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotEmpty(message = "ID不能为空")
+    private String id;
+
+    @ApiModelProperty(value = "状态 1:重要公告 2:普通公告 3:过期",required = true)
+    @NotEmpty(message = "状态能为空")
+    private String status;
+}

+ 31 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/PageInfoEditDTO.java

@@ -0,0 +1,31 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.xxh.cloud.framework.common.constant.YN;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Map;
+
+@Getter
+@Setter
+public class PageInfoEditDTO {
+
+    @ApiModelProperty(value = "页面code",required = true)
+    @NotEmpty(message = "页面code不能为空")
+    private String code;
+
+    @ApiModelProperty(value = "页面名称",required = true)
+    @NotEmpty(message = "页面名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "页面数据",required = true)
+    @NotNull(message = "页面数据不能为空")
+    private Map<String,Object> pageData;
+
+    @ApiModelProperty(value = "页面状态")
+    private String pageState = YN.YES.getCode();
+
+}

+ 17 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/PageInfoGetDTO.java

@@ -0,0 +1,17 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class PageInfoGetDTO {
+
+    @ApiModelProperty(value = "页面code",required = true)
+    @NotEmpty(message = "页面code不能为空")
+    private String code;
+
+}

+ 38 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ParamsAddDTO.java

@@ -0,0 +1,38 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.xxh.cloud.framework.common.param.constant.ParamTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Date;
+import java.util.Map;
+
+@Getter
+@Setter
+public class ParamsAddDTO {
+
+
+    @ApiModelProperty(value = "参数ID",required = true)
+    @NotEmpty(message = "参数ID不能为空")
+    private String id;
+
+    @ApiModelProperty(value = "参数分类(ParamTypeEnum)",required = true)
+    @NotEmpty(message = "参数分类不能为空")
+    private String paramType= ParamTypeEnum.BizParam.getCode();
+
+    @ApiModelProperty(value = "参数值分类(ParamValTypeEnum)",required = true)
+    @NotEmpty(message = "业务类型不能为空")
+    private String paramValueType;
+
+    @ApiModelProperty(value = "参数值")
+    private Map<String,Object> paramValue;
+
+
+
+
+
+}

+ 18 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ParamsInfoDTO.java

@@ -0,0 +1,18 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class ParamsInfoDTO {
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotEmpty(message = "ID不能为空")
+    private String id;
+
+
+}

+ 44 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ParamsListDTO.java

@@ -0,0 +1,44 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import cn.hutool.core.util.StrUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@Getter
+@Setter
+public class ParamsListDTO {
+
+    @ApiModelProperty(value = "参数编码")
+    private String id;
+
+    @ApiModelProperty(value = "参数编码")
+    private Collection<String> ids;
+
+    @ApiModelProperty(value = "参数分类")
+    private String paramType;
+
+
+    @ApiModelProperty(value = "参数值分类")
+    private String paramValueType;
+
+    @ApiModelProperty(value = "参数值分类(ParamValTypeEnum)")
+    private List<String> paramValueTypeList;
+
+
+
+    public void addParamValueType(String item){
+        if(this.paramValueTypeList==null){
+            this.paramValueTypeList=new ArrayList<>();
+        }
+        if(StrUtil.isNotEmpty(item)){
+            this.paramValueTypeList.add(item);
+        }
+    }
+
+
+}

+ 20 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ParamsMetaListDTO.java

@@ -0,0 +1,20 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Getter
+@Setter
+public class ParamsMetaListDTO {
+
+
+    @ApiModelProperty(value = "数据分类",required = true)
+    @NotNull(message = "数据分类不能为空")
+    private List<String> dataTypeList;
+
+
+}

+ 30 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ParamsQueryDTO.java

@@ -0,0 +1,30 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.xxh.cloud.framework.common.entity.BasePageDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class ParamsQueryDTO extends BasePageDTO {
+
+
+    @ApiModelProperty(value = "参数编码")
+    private String id;
+
+    @ApiModelProperty(value = "参数分类(ParamTypeEnum)")
+    private String paramType;
+
+    @ApiModelProperty(value = "参数值分类(ParamValTypeEnum)")
+    private String paramValueType;
+
+    @ApiModelProperty(value = "参数值分类(ParamValTypeEnum)")
+    private List<String> paramValueTypeList;
+
+
+
+
+}

+ 28 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ParamsUpdateDTO.java

@@ -0,0 +1,28 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Map;
+
+@Getter
+@Setter
+public class ParamsUpdateDTO {
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotEmpty(message = "ID不能为空")
+    private String id;
+
+
+    @ApiModelProperty(value = "参数值分类(ParamValTypeEnum)",required = true)
+    @NotEmpty(message = "业务类型不能为空")
+    private String paramValueType;
+
+
+    @ApiModelProperty(value = "参数值")
+    private Map<String,Object> paramValue;
+}

+ 54 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoAddDTO.java

@@ -0,0 +1,54 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.xxh.cloud.framework.common.param.bos.DataSourceConfigBO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class ProjectInfoAddDTO {
+
+    @ApiModelProperty(value = "项目编号",required = true)
+    @NotEmpty(message = "项目编号不能为空")
+    private String code;
+
+
+    @ApiModelProperty(value = "项目名称",required = true)
+    @NotEmpty(message = "项目名称不能为空")
+    private String name;
+
+
+    @ApiModelProperty(value = "状态(YN)",required = true)
+    @NotEmpty(message = "状态不能为空")
+    private String status;
+
+
+    @ApiModelProperty(value = "是否默认(YN)",required = true)
+    @NotEmpty(message = "是否默认不能为空")
+    private String isDef;
+
+
+    @ApiModelProperty(value = "负责人")
+    private String director;
+
+
+    @ApiModelProperty(value = "描述")
+    private String remark;
+
+
+    @ApiModelProperty(value = "数据连接配置")
+    private DataSourceConfigBO dataLinkConfig;
+
+
+//    @ApiModelProperty(value = "加密私钥")
+//    private String dataPrivateKey;
+//
+//
+//    @ApiModelProperty(value = "加密公钥")
+//    private String dataPublicKey;
+
+
+}

+ 41 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoEditDTO.java

@@ -0,0 +1,41 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.xxh.cloud.framework.common.param.bos.DataSourceConfigBO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class ProjectInfoEditDTO {
+
+
+
+
+    @ApiModelProperty(value = "项目编号",required = true)
+    @NotEmpty(message = "项目编号不能为空")
+    private String code;
+
+
+    @ApiModelProperty(value = "项目名称",required = true)
+    @NotEmpty(message = "项目名称不能为空")
+    private String name;
+
+
+    @ApiModelProperty(value = "负责人")
+    private String director;
+
+
+    @ApiModelProperty(value = "描述")
+    private String remark;
+
+
+    @ApiModelProperty(value = "数据连接配置")
+    private DataSourceConfigBO dataLinkConfig;
+
+
+
+
+}

+ 26 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoEditKeyDTO.java

@@ -0,0 +1,26 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class ProjectInfoEditKeyDTO {
+
+    @ApiModelProperty(value = "项目编号",required = true)
+    @NotEmpty(message = "项目编号不能为空")
+    private String code;
+
+
+    @ApiModelProperty(value = "加密私钥",required = true)
+    @NotEmpty(message = "项目私钥不能为空")
+    private String dataPrivateKey;
+
+
+    @ApiModelProperty(value = "加密公钥",required = true)
+    @NotEmpty(message = "项目公钥不能为空")
+    private String dataPublicKey;
+}

+ 24 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoEditStatusDTO.java

@@ -0,0 +1,24 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class ProjectInfoEditStatusDTO {
+
+
+    @ApiModelProperty(value = "项目编号",required = true)
+    @NotEmpty(message = "项目编号不能为空")
+    private String code;
+
+
+    @ApiModelProperty(value = "状态(YN)",required = true)
+    @NotEmpty(message = "状态不能为空")
+    private String status;
+
+
+}

+ 17 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoGetDTO.java

@@ -0,0 +1,17 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class ProjectInfoGetDTO {
+
+    @ApiModelProperty(value = "项目编号",required = true)
+    @NotEmpty(message = "项目编号不能为空")
+    private String code;
+
+}

+ 20 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoListDTO.java

@@ -0,0 +1,20 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ProjectInfoListDTO {
+
+    @ApiModelProperty(value = "项目编号")
+    private String code;
+
+
+    @ApiModelProperty(value = "项目名称")
+    private String name;
+
+
+
+}

+ 24 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/ProjectInfoQueryDTO.java

@@ -0,0 +1,24 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.xxh.cloud.framework.common.entity.BasePageDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ProjectInfoQueryDTO extends BasePageDTO {
+
+    @ApiModelProperty(value = "项目编号")
+    private String code;
+
+
+    @ApiModelProperty(value = "项目名称")
+    private String name;
+
+
+    @ApiModelProperty(value = "状态(YN)")
+    private String status;
+
+
+}

+ 28 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/SiteMessageAddDTO.java

@@ -0,0 +1,28 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Map;
+import java.util.Set;
+
+@Getter
+@Setter
+public class SiteMessageAddDTO {
+
+    @ApiModelProperty(value = "信息分类")
+    private String type;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "消息参数")
+    private Map<String,Object> params;
+
+    @ApiModelProperty(value = "发送人",required = true)
+    private Set<String> toUserIds;
+}

+ 17 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/SiteMessageByIdDTO.java

@@ -0,0 +1,17 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class SiteMessageByIdDTO {
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotEmpty(message = "ID不能为空")
+    private String id;
+
+}

+ 17 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/SiteMessageByIdsDTO.java

@@ -0,0 +1,17 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.Set;
+
+@Getter
+@Setter
+public class SiteMessageByIdsDTO {
+
+    @ApiModelProperty(value = "id",required = true)
+    @NotNull(message = "ID不能为空")
+    private Set<String> ids;
+}

+ 45 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/SiteMessageQueryDTO.java

@@ -0,0 +1,45 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.xxh.cloud.framework.common.entity.BasePageDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SiteMessageQueryDTO extends BasePageDTO {
+
+
+    @ApiModelProperty(value = "消息ID")
+    private String messageId;
+
+    @ApiModelProperty(value = "消息标题")
+    private String messageTitle;
+
+    @ApiModelProperty(value = "消息分类")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息发送人")
+    private String fromUserId;
+
+    @ApiModelProperty(value = "消息接受人")
+    private String toUserId;
+
+    @ApiModelProperty(value = "消息读取状态(site_message_status)")
+    private String status;
+
+    @ApiModelProperty(value = "发送时间-开始")
+    private String sendDateStart;
+
+    @ApiModelProperty(value = "发送时间-截止")
+    private String sendDateEnd;
+
+    @ApiModelProperty(value = "读取时间-开始")
+    private String readDateStart;
+
+    @ApiModelProperty(value = "读取时间-截止")
+    private String readDateEnd;
+
+
+
+}

+ 36 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/VisitVerificationAddDTO.java

@@ -0,0 +1,36 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class VisitVerificationAddDTO {
+
+    @ApiModelProperty(value = "校验目标分类",required = true)
+    @NotEmpty(message = "校验目标分类不能为空")
+    private String visitType;
+
+    @ApiModelProperty(value = "校验目标ID",required = true)
+    @NotEmpty(message = "校验目标ID不能为空")
+    private String visitId;
+
+    @ApiModelProperty(value = "校验规则分类", required = true)
+    @NotEmpty(message = "校验规则分类不能为空")
+    private String verType;
+
+    @ApiModelProperty(value = "应用端范围(全部/患者端/医生端)", required = true)
+    @NotEmpty(message = "应用端范围不能为空")
+    private String appScope;
+
+    @ApiModelProperty(value = "应用端功能范围", required = true)
+    @NotEmpty(message = "应用端功能范围不能为空")
+    private String bizScope;
+
+    @ApiModelProperty(value = "校验条件配置")
+    private String verificationConfig;
+
+}

+ 29 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/VisitVerificationEditDTO.java

@@ -0,0 +1,29 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Getter
+@Setter
+public class VisitVerificationEditDTO {
+
+    @ApiModelProperty(value = "数据ID",required = true)
+    @NotEmpty(message = "数据ID不能为空")
+    private String id;
+
+    @ApiModelProperty(value = "应用端范围(全部/患者端/医生端)", required = true)
+    @NotEmpty(message = "应用端范围不能为空")
+    private String appScope;
+
+    @ApiModelProperty(value = "应用端功能范围", required = true)
+    @NotEmpty(message = "应用端功能范围不能为空")
+    private String bizScope;
+
+    @ApiModelProperty(value = "校验条件配置")
+    private String verificationConfig;
+
+}

+ 13 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/VisitVerificationGetDTO.java

@@ -0,0 +1,13 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class VisitVerificationGetDTO {
+
+    @ApiModelProperty(value = "数据ID",required = true)
+    private String id;
+}

+ 23 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/dto/VisitVerificationQueryDTO.java

@@ -0,0 +1,23 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.dto;
+
+import com.xxh.cloud.framework.common.entity.BasePageDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+
+@Getter
+@Setter
+public class VisitVerificationQueryDTO extends BasePageDTO {
+
+    @ApiModelProperty(value = "校验目标分类")
+    private String visitType;
+
+    @ApiModelProperty(value = "校验目标ID")
+    private String visitId;
+
+    @ApiModelProperty(value = "校验规则分类")
+    private String verType;
+
+}

+ 68 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/CompanyPropertyVO.java

@@ -0,0 +1,68 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.vos;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CompanyPropertyVO {
+
+
+
+    @ApiModelProperty(value = "公司简称")
+    private String shortName;
+
+    @ApiModelProperty(value = "公司性质")
+    private String enterpriseNature;
+
+
+    @ApiModelProperty(value = "所属行业")
+    private String industry;
+
+
+    @ApiModelProperty(value = "成立时间")
+    private String foundedTime;
+
+
+    @ApiModelProperty(value = "公司电话")
+    private String telePhone;
+
+    @ApiModelProperty(value = "公司传真")
+    private String fax;
+
+
+    @ApiModelProperty(value = "公司主页")
+    private String webSite;
+
+
+    @ApiModelProperty(value = "公司地址")
+    private String address;
+
+
+    @ApiModelProperty(value = "公司法人")
+    private String managerName;
+
+    @ApiModelProperty(value = "公司法人-联系电话")
+    private String managerTelePhone;
+
+
+    @ApiModelProperty(value = "公司法人-联系手机")
+    private String managerMobilePhone;
+
+
+    @ApiModelProperty(value = "公司法人-联系邮箱")
+    private String manageEmail;
+
+    @ApiModelProperty(value = "开户银行")
+    private String bankName;
+
+
+    @ApiModelProperty(value = "银行账户")
+    private String bankAccount;
+
+    @ApiModelProperty(value = "经营范围")
+    private String businessscope;
+
+
+}

+ 51 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/CompanyVO.java

@@ -0,0 +1,51 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.vos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.framework.common.tree.TreeNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class CompanyVO extends TreeNode<CompanyVO> {
+
+
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "公司分类")
+    private String type;
+
+
+    @ApiModelProperty(value = "系统分类")
+    private String sysType;
+
+    @ApiModelProperty(value = "logo")
+    private String logo;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "说明")
+    private String remark;
+
+    @ApiModelProperty(value = "扩展信息")
+    private CompanyPropertyVO propertyJson;
+
+    @ApiModelProperty(value = "创建者")
+    private String creator;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "更新者")
+    private String updater;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateDate;
+}

+ 52 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/DictDataVO.java

@@ -0,0 +1,52 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.vos;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class DictDataVO {
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "字典类型ID")
+    private String dictTypeId;
+
+    @ApiModelProperty(value = "字典标签")
+    private String dictLabel;
+
+    @ApiModelProperty(value = "字典值")
+    private String dictValue;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty("创建者")
+    private String creator;
+
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+
+    @ApiModelProperty("更新者")
+    private String updater;
+
+    @ApiModelProperty("更新时间")
+    private Date updateDate;
+
+
+
+}

+ 35 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/DictTypeTreeVO.java

@@ -0,0 +1,35 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.vos;
+
+import com.xxh.cloud.framework.common.tree.TreeNode;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DictTypeTreeVO extends TreeNode<DictTypeTreeVO> {
+
+
+    private String type;
+
+    private String name;
+
+
+    public DictTypeTreeVO(){
+
+    }
+
+    public DictTypeTreeVO(String id ,String name,String pid){
+        this.setId(id);
+        this.setPid(pid);
+        this.name=name;
+        this.type="DictType";
+    }
+
+    public DictTypeTreeVO(String id ,String name){
+        this.setId(id);
+        this.setPid("0");
+        this.name=name;
+        this.type="DictCategory";
+    }
+
+}

+ 64 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/DictTypeVO.java

@@ -0,0 +1,64 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.vos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.framework.common.tree.TreeNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Getter
+@Setter
+public class DictTypeVO{
+
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+
+    @ApiModelProperty(value = "字典类型")
+    private String type;
+
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+
+    @ApiModelProperty("创建者")
+    private String creator;
+
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+
+    @ApiModelProperty("更新者")
+    private String updater;
+
+    @ApiModelProperty("更新时间")
+    private Date updateDate;
+
+    @ApiModelProperty("字典内容列表")
+    private List<DictDataVO> items;
+
+    public void addItem(DictDataVO item){
+        if(this.items==null){
+            this.items=new ArrayList<>();
+        }
+        if(item!=null){
+            this.items.add(item);
+        }
+    }
+
+
+}

+ 56 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/NoticeVO.java

@@ -0,0 +1,56 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.vos;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+@Getter
+@Setter
+public class NoticeVO {
+
+
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "公告通知用户Ids")
+    private List<String> toUserIds;
+
+    @ApiModelProperty(value = "附件")
+    private List<String> files;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty("创建者")
+    private String creator;
+
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+
+    @ApiModelProperty("更新者")
+    private String updater;
+
+    @ApiModelProperty("更新时间")
+    private Date updateDate;
+
+    //===============
+    @ApiModelProperty("创建者姓名")
+    private String creatorName;
+
+    @ApiModelProperty("更新者姓名")
+    private String updaterName;
+}

+ 24 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/PageVO.java

@@ -0,0 +1,24 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.vos;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Map;
+
+@Getter
+@Setter
+public class PageVO {
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "页面名称")
+    private String name;
+
+    @ApiModelProperty(value = "页面数据")
+    private Map<String,Object> pageData;
+
+    @ApiModelProperty(value = "页面状态")
+    private String pageState;
+}

+ 51 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/ParamsVO.java

@@ -0,0 +1,51 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.vos;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Setter
+public class ParamsVO {
+
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "参数分类")
+    private String paramType;
+
+    @ApiModelProperty(value = "参数值分类")
+    private String paramValueType;
+
+    @ApiModelProperty(value = "参数值")
+    private Map<String,Object> paramValue;
+
+    @ApiModelProperty(value = "参数值")
+    private List<Map> paramValueList;
+
+
+    @ApiModelProperty("创建者")
+    private String creator;
+
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+
+    @ApiModelProperty("更新者")
+    private String updater;
+
+    @ApiModelProperty("更新时间")
+    private Date updateDate;
+
+
+
+
+}

+ 68 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/ProjectVO.java

@@ -0,0 +1,68 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.vos;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.xxh.cloud.framework.common.param.bos.DataSourceConfigBO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class ProjectVO {
+
+
+    @ApiModelProperty(value = "项目编号")
+    private String code;
+
+
+    @ApiModelProperty(value = "项目名称")
+    private String name;
+
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+
+    @ApiModelProperty(value = "负责人")
+    private String director;
+
+
+    @ApiModelProperty(value = "描述")
+    private String remark;
+
+    @ApiModelProperty(value = "是否默认")
+    private String isDef;
+
+
+    @ApiModelProperty(value = "加密私钥")
+    private String dataPrivateKey;
+
+
+    @ApiModelProperty(value = "加密公钥")
+    private String dataPublicKey;
+
+
+    @ApiModelProperty("创建者")
+    private String creator;
+
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+
+    @ApiModelProperty("更新者")
+    private String updater;
+
+    @ApiModelProperty("更新时间")
+    private Date updateDate;
+
+    @ApiModelProperty(value = "数据连接配置")
+    private DataSourceConfigBO dataLinkConfig;
+
+    //==========================================
+
+
+}

+ 62 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/SiteMessageVO.java

@@ -0,0 +1,62 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.vos;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.Map;
+
+@Getter
+@Setter
+public class SiteMessageVO {
+
+
+    @ApiModelProperty(value = "消息ID")
+    private String messageId;
+
+    @ApiModelProperty(value = "消息标题")
+    private String messageTitle;
+
+    @ApiModelProperty(value = "消息分类")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息参数")
+    private  Map<String,Object> messageParams;
+
+    @ApiModelProperty(value = "消息内容")
+    private String messageContent;
+
+    @ApiModelProperty(value = "信息发送时间")
+    private Date messageSendDate;
+
+    @ApiModelProperty(value = "信息发送人ID")
+    private String fromUserId;
+
+    @ApiModelProperty(value = "消息读取ID")
+    private String id;
+
+    @ApiModelProperty(value = "消息接受人")
+    private String toUserId;
+
+    @ApiModelProperty(value = "消息读取状态")
+    private String status;
+
+    @ApiModelProperty(value = "信息读取时间")
+    private Date readDate;
+
+    //==================================
+
+    @ApiModelProperty(value = "信息发送人-名称")
+    private String fromUserName;
+
+    @ApiModelProperty(value = "消息接受人-名称")
+    private String toUserIdName;
+
+
+
+
+
+
+
+}

+ 21 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/entity/vos/VisitVerificationResult.java

@@ -0,0 +1,21 @@
+package com.xxh.cloud.basic.framework.modules.base.entity.vos;
+
+import com.xxh.cloud.basic.client.api.bean.bos.VisitVerificationBO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Setter
+public class VisitVerificationResult {
+
+    @ApiModelProperty(value = "校验目标ID的MAP")
+    private Map<String, List<String>> visitIdMap;
+
+    @ApiModelProperty(value = "校验目标配置的MAP")
+    private Map<String, List<VisitVerificationBO>> visitVerMap;
+
+}

+ 13 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/CompanyMapper.java

@@ -0,0 +1,13 @@
+package com.xxh.cloud.basic.framework.modules.base.mapper;
+
+import com.xxh.cloud.basic.framework.modules.base.entity.dos.Company;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 公司信息表 Mapper 接口
+ * </p>
+ */
+public interface CompanyMapper extends BaseMapper<Company> {
+
+}

+ 13 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/DictDataMapper.java

@@ -0,0 +1,13 @@
+package com.xxh.cloud.basic.framework.modules.base.mapper;
+
+import com.xxh.cloud.basic.framework.modules.base.entity.dos.DictData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 字典数据表 Mapper 接口
+ * </p>
+ */
+public interface DictDataMapper extends BaseMapper<DictData> {
+
+}

+ 13 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/DictTypeMapper.java

@@ -0,0 +1,13 @@
+package com.xxh.cloud.basic.framework.modules.base.mapper;
+
+import com.xxh.cloud.basic.framework.modules.base.entity.dos.DictType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 字典类型 Mapper 接口
+ * </p>
+ */
+public interface DictTypeMapper extends BaseMapper<DictType> {
+
+}

+ 13 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/NoticeInfoMapper.java

@@ -0,0 +1,13 @@
+package com.xxh.cloud.basic.framework.modules.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xxh.cloud.basic.framework.modules.base.entity.dos.NoticeInfo;
+
+/**
+ * <p>
+ * 公告信息表 Mapper 接口
+ * </p>
+ */
+public interface NoticeInfoMapper extends BaseMapper<NoticeInfo> {
+
+}

+ 14 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/PageInfoMapper.java

@@ -0,0 +1,14 @@
+package com.xxh.cloud.basic.framework.modules.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xxh.cloud.basic.framework.modules.base.entity.dos.PageInfo;
+
+/**
+ * 楼层装修设置数据处理层
+ *
+ * ao
+ *
+ */
+public interface PageInfoMapper extends BaseMapper<PageInfo> {
+
+}

+ 11 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/ParamsMapper.java

@@ -0,0 +1,11 @@
+package com.xxh.cloud.basic.framework.modules.base.mapper;
+
+import com.xxh.cloud.basic.framework.modules.base.entity.dos.Params;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 系统参数表 Mapper 接口
+ */
+public interface ParamsMapper extends BaseMapper<Params> {
+
+}

+ 13 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/ProjectInfoMapper.java

@@ -0,0 +1,13 @@
+package com.xxh.cloud.basic.framework.modules.base.mapper;
+
+import com.xxh.cloud.basic.framework.modules.base.entity.dos.ProjectInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 项目信息表 Mapper 接口
+ * </p>
+ */
+public interface ProjectInfoMapper extends BaseMapper<ProjectInfo> {
+
+}

+ 13 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/SiteMessageInfoMapper.java

@@ -0,0 +1,13 @@
+package com.xxh.cloud.basic.framework.modules.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xxh.cloud.basic.framework.modules.base.entity.dos.SiteMessageInfo;
+
+/**
+ * <p>
+ * 站内消息表 Mapper 接口
+ * </p>
+ */
+public interface SiteMessageInfoMapper extends BaseMapper<SiteMessageInfo> {
+
+}

+ 13 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/SiteMessageUserInfoMapper.java

@@ -0,0 +1,13 @@
+package com.xxh.cloud.basic.framework.modules.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xxh.cloud.basic.framework.modules.base.entity.dos.SiteMessageUserInfo;
+
+/**
+ * <p>
+ * 站内消息发送人表 Mapper 接口
+ * </p>
+ */
+public interface SiteMessageUserInfoMapper extends BaseMapper<SiteMessageUserInfo> {
+
+}

+ 13 - 0
basic-framework/src/main/java/com/xxh/cloud/basic/framework/modules/base/mapper/VisitVerificationConfigMapper.java

@@ -0,0 +1,13 @@
+package com.xxh.cloud.basic.framework.modules.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xxh.cloud.basic.framework.modules.base.entity.dos.VisitVerificationConfig;
+
+/**
+ * <p>
+ * 访问校验配置表 Mapper 接口
+ * </p>
+ */
+public interface VisitVerificationConfigMapper extends BaseMapper<VisitVerificationConfig> {
+
+}

Some files were not shown because too many files changed in this diff