Browse Source

提交修复

master
主管理员 5 months ago
parent
commit
a2e10aae30
58 changed files with 2249 additions and 287 deletions
  1. +4
    -4
      .idea/compiler.xml
  2. +0
    -3
      .idea/encodings.xml
  3. +0
    -12
      .idea/modules.xml
  4. +0
    -130
      han-hai-module-pay/han-hai-module-pay.iml
  5. +0
    -18
      jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml
  6. +0
    -18
      jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml
  7. +0
    -18
      jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml
  8. +171
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/controller/CityAddController.java
  9. +70
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/entity/CityAdd.java
  10. +17
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/mapper/CityAddMapper.java
  11. +5
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/mapper/xml/CityAddMapper.xml
  12. +14
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/service/ICityAddService.java
  13. +19
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/service/impl/CityAddServiceImpl.java
  14. +199
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue/CityAddList.vue
  15. +124
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue/modules/CityAddForm.vue
  16. +84
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue/modules/CityAddModal.Style#Drawer.vue
  17. +60
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue/modules/CityAddModal.vue
  18. +61
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue3/CityAdd.api.ts
  19. +71
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue3/CityAdd.data.ts
  20. +162
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue3/CityAddList.vue
  21. +58
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue3/components/CityAddModal.vue
  22. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/controller/CityHomeController.java
  23. +71
    -5
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/entity/CityHome.java
  24. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/mapper/CityHomeMapper.java
  25. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/ICityHomeService.java
  26. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/impl/CityHomeServiceImpl.java
  27. +127
    -3
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/CityHomeList.vue
  28. +82
    -2
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/modules/CityHomeForm.vue
  29. +194
    -4
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue3/CityHome.data.ts
  30. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/controller/CityJobController.java
  31. +39
    -2
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/entity/CityJob.java
  32. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/mapper/CityJobMapper.java
  33. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/ICityJobService.java
  34. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/impl/CityJobServiceImpl.java
  35. +57
    -2
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/CityJobList.vue
  36. +46
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/modules/CityJobForm.vue
  37. +94
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue3/CityJob.data.ts
  38. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/controller/CityShopController.java
  39. +39
    -7
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/entity/CityShop.java
  40. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/mapper/CityShopMapper.java
  41. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/ICityShopService.java
  42. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/impl/CityShopServiceImpl.java
  43. +83
    -5
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/CityShopList.vue
  44. +44
    -4
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/modules/CityShopForm.vue
  45. +112
    -5
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue3/CityShop.data.ts
  46. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/controller/CityTrendsController.java
  47. +17
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/entity/CityTrends.java
  48. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/mapper/CityTrendsMapper.java
  49. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/service/ICityTrendsService.java
  50. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/service/impl/CityTrendsServiceImpl.java
  51. +24
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/vue/CityTrendsList.vue
  52. +20
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/vue/modules/CityTrendsForm.vue
  53. +40
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/vue3/CityTrends.data.ts
  54. +0
    -8
      jeecg-boot-base/jeecg-boot-base-tools/jeecg-boot-base-tools.iml
  55. +0
    -18
      jeecg-boot-module-system/jeecg-boot-module-system.iml
  56. +4
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java
  57. +14
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java
  58. +7
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiController.java

+ 4
- 4
.idea/compiler.xml View File

@ -7,11 +7,11 @@
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="jeecg-system-cloud-api" />
<module name="jeecg-boot-base-core" />
<module name="jeecg-boot-base-tools" />
<module name="han-hai-module-pay" />
<module name="jeecg-boot-module-system" />
<module name="jeecg-system-cloud-api" />
<module name="jeecg-system-local-api" />
</profile>
</annotationProcessing>
@ -23,9 +23,9 @@
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="han-hai-module-pay" options="-parameters" />
<module name="han-hai-parent" options="-parameters" />
<module name="jeecg-boot-base" options="-parameters" />
<module name="jeecg-boot-base-api" options="-parameters" />
<module name="han-hai-parent" options="" />
<module name="jeecg-boot-base" options="" />
<module name="jeecg-boot-base-api" options="" />
<module name="jeecg-boot-base-core" options="-parameters" />
<module name="jeecg-boot-base-tools" options="-parameters" />
<module name="jeecg-boot-module-system" options="-parameters" />


+ 0
- 3
.idea/encodings.xml View File

@ -4,11 +4,8 @@
<file url="file://$PROJECT_DIR$/han-hai-module-pay/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot-base/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
</component>
</project>

+ 0
- 12
.idea/modules.xml View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml" filepath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml" />
<module fileurl="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/jeecg-boot-base-tools.iml" filepath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-tools/jeecg-boot-base-tools.iml" />
<module fileurl="file://$PROJECT_DIR$/jeecg-boot-module-system/jeecg-boot-module-system.iml" filepath="$PROJECT_DIR$/jeecg-boot-module-system/jeecg-boot-module-system.iml" />
<module fileurl="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml" filepath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml" />
<module fileurl="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml" filepath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml" />
</modules>
</component>
</project>

+ 0
- 130
han-hai-module-pay/han-hai-module-pay.iml View File

@ -1,130 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.9" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.6" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.60" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.60" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.60" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
<orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.11.33.ALL" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.5.3" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5" level="project" />
<orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
<orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-pay:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.11" level="project" />
<orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
<orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
<orderEntry type="library" name="Maven: com.github.binarywang:qrcode-utils:1.1" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:core:3.2.1" level="project" />
<orderEntry type="library" name="Maven: org.jodd:jodd-http:3.7.1" level="project" />
<orderEntry type="library" name="Maven: org.jodd:jodd-core:3.7.1" level="project" />
<orderEntry type="library" name="Maven: org.jodd:jodd-upload:3.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-miniapp:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.6.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.21.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.11.22" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.78" level="project" />
</component>
</module>

+ 0
- 18
jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="FacetManager">
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping>
<factory-entry name="jeecg-system-cloud-api" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
</module>

+ 0
- 18
jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="FacetManager">
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping>
<factory-entry name="jeecg-system-local-api" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
</module>

+ 0
- 18
jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="FacetManager">
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping>
<factory-entry name="jeecg-boot-base-core" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
</module>

+ 171
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/controller/CityAddController.java View File

@ -0,0 +1,171 @@
package org.jeecg.modules.cityAdd.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.cityAdd.entity.CityAdd;
import org.jeecg.modules.cityAdd.service.ICityAddService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 可发布功能
* @Author: jeecg-boot
* @Date: 2024-10-26
* @Version: V1.0
*/
@Api(tags="可发布功能")
@RestController
@RequestMapping("/cityAdd/cityAdd")
@Slf4j
public class CityAddController extends JeecgController<CityAdd, ICityAddService> {
@Autowired
private ICityAddService cityAddService;
/**
* 分页列表查询
*
* @param cityAdd
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "可发布功能-分页列表查询")
@ApiOperation(value="可发布功能-分页列表查询", notes="可发布功能-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<CityAdd>> queryPageList(CityAdd cityAdd,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CityAdd> queryWrapper = QueryGenerator.initQueryWrapper(cityAdd, req.getParameterMap());
Page<CityAdd> page = new Page<CityAdd>(pageNo, pageSize);
IPage<CityAdd> pageList = cityAddService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param cityAdd
* @return
*/
@AutoLog(value = "可发布功能-添加")
@ApiOperation(value="可发布功能-添加", notes="可发布功能-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody CityAdd cityAdd) {
cityAddService.save(cityAdd);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param cityAdd
* @return
*/
@AutoLog(value = "可发布功能-编辑")
@ApiOperation(value="可发布功能-编辑", notes="可发布功能-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody CityAdd cityAdd) {
cityAddService.updateById(cityAdd);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "可发布功能-通过id删除")
@ApiOperation(value="可发布功能-通过id删除", notes="可发布功能-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
cityAddService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "可发布功能-批量删除")
@ApiOperation(value="可发布功能-批量删除", notes="可发布功能-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.cityAddService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "可发布功能-通过id查询")
@ApiOperation(value="可发布功能-通过id查询", notes="可发布功能-通过id查询")
@GetMapping(value = "/queryById")
public Result<CityAdd> queryById(@RequestParam(name="id",required=true) String id) {
CityAdd cityAdd = cityAddService.getById(id);
if(cityAdd==null) {
return Result.error("未找到对应数据");
}
return Result.OK(cityAdd);
}
/**
* 导出excel
*
* @param request
* @param cityAdd
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CityAdd cityAdd) {
return super.exportXls(request, cityAdd, CityAdd.class, "可发布功能");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, CityAdd.class);
}
}

+ 70
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/entity/CityAdd.java View File

@ -0,0 +1,70 @@
package org.jeecg.modules.cityAdd.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 可发布功能
* @Author: jeecg-boot
* @Date: 2024-10-26
* @Version: V1.0
*/
@Data
@TableName("city_add")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="city_add对象", description="可发布功能")
public class CityAdd implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**名称*/
@Excel(name = "名称", width = 15)
@ApiModelProperty(value = "名称")
private java.lang.String name;
/**图片*/
@Excel(name = "图片", width = 15)
@ApiModelProperty(value = "图片")
private java.lang.String image;
/**开关*/
@Excel(name = "开关", width = 15)
@ApiModelProperty(value = "开关")
private java.lang.String isOpen;
/**说明*/
@Excel(name = "说明", width = 15)
@ApiModelProperty(value = "说明")
private java.lang.String context;
/**跳转地址*/
@Excel(name = "跳转地址", width = 15)
@ApiModelProperty(value = "跳转地址")
private java.lang.String url;
}

+ 17
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/mapper/CityAddMapper.java View File

@ -0,0 +1,17 @@
package org.jeecg.modules.cityAdd.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.cityAdd.entity.CityAdd;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 可发布功能
* @Author: jeecg-boot
* @Date: 2024-10-26
* @Version: V1.0
*/
public interface CityAddMapper extends BaseMapper<CityAdd> {
}

+ 5
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/mapper/xml/CityAddMapper.xml View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.cityAdd.mapper.CityAddMapper">
</mapper>

+ 14
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/service/ICityAddService.java View File

@ -0,0 +1,14 @@
package org.jeecg.modules.cityAdd.service;
import org.jeecg.modules.cityAdd.entity.CityAdd;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 可发布功能
* @Author: jeecg-boot
* @Date: 2024-10-26
* @Version: V1.0
*/
public interface ICityAddService extends IService<CityAdd> {
}

+ 19
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/service/impl/CityAddServiceImpl.java View File

@ -0,0 +1,19 @@
package org.jeecg.modules.cityAdd.service.impl;
import org.jeecg.modules.cityAdd.entity.CityAdd;
import org.jeecg.modules.cityAdd.mapper.CityAddMapper;
import org.jeecg.modules.cityAdd.service.ICityAddService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 可发布功能
* @Author: jeecg-boot
* @Date: 2024-10-26
* @Version: V1.0
*/
@Service
public class CityAddServiceImpl extends ServiceImpl<CityAddMapper, CityAdd> implements ICityAddService {
}

+ 199
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue/CityAddList.vue View File

@ -0,0 +1,199 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('可发布功能')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text,record">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<city-add-modal ref="modalForm" @ok="modalFormOk"></city-add-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CityAddModal from './modules/CityAddModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'CityAddList',
mixins:[JeecgListMixin, mixinDevice],
components: {
CityAddModal
},
data () {
return {
description: '可发布功能管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'名称',
align:"center",
dataIndex: 'name'
},
{
title:'图片',
align:"center",
dataIndex: 'image',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'开关',
align:"center",
dataIndex: 'isOpen',
customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isOpen'], text) : ''),
},
{
title:'说明',
align:"center",
dataIndex: 'context'
},
{
title:'跳转地址',
align:"center",
dataIndex: 'url'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/cityAdd/cityAdd/list",
delete: "/cityAdd/cityAdd/delete",
deleteBatch: "/cityAdd/cityAdd/deleteBatch",
exportXlsUrl: "/cityAdd/cityAdd/exportXls",
importExcelUrl: "cityAdd/cityAdd/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.$set(this.dictOptions, 'isOpen', [{text:'是',value:'Y'},{text:'否',value:'N'}])
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
fieldList.push({type:'switch',value:'isOpen',text:'开关'})
fieldList.push({type:'string',value:'context',text:'说明',dictCode:''})
fieldList.push({type:'string',value:'url',text:'跳转地址',dictCode:''})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

+ 124
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue/modules/CityAddForm.vue View File

@ -0,0 +1,124 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
<a-input v-model="model.name" placeholder="请输入名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
<j-image-upload isMultiple v-model="model.image" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="开关" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isOpen">
<j-switch v-model="model.isOpen" ></j-switch>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="说明" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="context">
<a-textarea v-model="model.context" rows="4" placeholder="请输入说明" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="跳转地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="url">
<a-input v-model="model.url" placeholder="请输入跳转地址" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'CityAddForm',
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/cityAdd/cityAdd/add",
edit: "/cityAdd/cityAdd/edit",
queryById: "/cityAdd/cityAdd/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
//
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
}
}
</script>

+ 84
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue/modules/CityAddModal.Style#Drawer.vue View File

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<city-add-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></city-add-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import CityAddForm from './CityAddForm'
export default {
name: 'CityAddModal',
components: {
CityAddForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

+ 60
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue/modules/CityAddModal.vue View File

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<city-add-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></city-add-form>
</j-modal>
</template>
<script>
import CityAddForm from './CityAddForm'
export default {
name: 'CityAddModal',
components: {
CityAddForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

+ 61
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue3/CityAdd.api.ts View File

@ -0,0 +1,61 @@
import {defHttp} from '/@/utils/http/axios';
import {Modal} from 'ant-design-vue';
enum Api {
list = '/cityAdd/cityAdd/list',
save='/cityAdd/cityAdd/add',
edit='/cityAdd/cityAdd/edit',
deleteOne = '/cityAdd/cityAdd/delete',
deleteBatch = '/cityAdd/cityAdd/deleteBatch',
importExcel = '/cityAdd/cityAdd/importExcel',
exportXls = '/cityAdd/cityAdd/exportXls',
}
/**
* api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* api
*/
export const getImportUrl = Api.importExcel;
/**
*
* @param params
*/
export const list = (params) =>
defHttp.get({url: Api.list, params});
/**
*
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
*
* @param params
*/
export const batchDelete = (params, handleSuccess) => {
Modal.confirm({
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
*
* @param params
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({url: url, params});
}

+ 71
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue3/CityAdd.data.ts View File

@ -0,0 +1,71 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '名称',
align:"center",
dataIndex: 'name'
},
{
title: '图片',
align:"center",
dataIndex: 'image',
customRender:render.renderAvatar,
},
{
title: '开关',
align:"center",
dataIndex: 'isOpen',
customRender:({text}) => {
return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
},
},
{
title: '说明',
align:"center",
dataIndex: 'context'
},
{
title: '跳转地址',
align:"center",
dataIndex: 'url'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '名称',
field: 'name',
component: 'Input',
},
{
label: '图片',
field: 'image',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '开关',
field: 'isOpen',
component: 'JSwitch',
componentProps:{
},
},
{
label: '说明',
field: 'context',
component: 'InputTextArea',//TODO 注意string转换问题
},
{
label: '跳转地址',
field: 'url',
component: 'Input',
},
];

+ 162
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue3/CityAddList.vue View File

@ -0,0 +1,162 @@
<template>
<div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-dropdown v-if="checkedKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
</template>
<!--字段回显插槽-->
<template #htmlSlot="{text}">
<div v-html="text"></div>
</template>
<template #fileSlot="{text}">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
</template>
</BasicTable>
<!-- 表单区域 -->
<CityAddModal @register="registerModal" @success="handleSuccess"></CityAddModal>
</div>
</template>
<script lang="ts" name="cityAdd-cityAdd" setup>
import {ref, computed, unref} from 'vue';
import {BasicTable, useTable, TableAction} from '/@/components/Table';
import {useModal} from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage'
import CityAddModal from './components/CityAddModal.vue'
import {columns, searchFormSchema} from './cityAdd.data';
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cityAdd.api';
const checkedKeys = ref<Array<string | number>>([]);
//model
const [registerModal, {openModal}] = useModal();
//table
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
tableProps:{
title: '可发布功能',
api: list,
columns,
canResize:false,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
autoSubmitOnEnter:true,
showAdvancedButton:true,
fieldMapToTime: [
],
},
actionColumn: {
width: 120,
},
},
exportConfig: {
name:"可发布功能",
url: getExportUrl,
},
importConfig: {
url: getImportUrl
},
})
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({id: record.id}, reload);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ids: checkedKeys.value}, reload);
}
/**
* 成功回调
*/
function handleSuccess() {
reload();
}
/**
* 操作栏
*/
function getTableAction(record){
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
}
]
}
/**
* 下拉操作栏
*/
function getDropDownAction(record){
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
}
]
}
</script>
<style scoped>
</style>

+ 58
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityAdd/vue3/components/CityAddModal.vue View File

@ -0,0 +1,58 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
<BasicForm @register="registerForm"/>
</BasicModal>
</template>
<script lang="ts" setup>
import {ref, computed, unref} from 'vue';
import {BasicModal, useModalInner} from '/@/components/Modal';
import {BasicForm, useForm} from '/@/components/Form/index';
import {formSchema} from '../cityAdd.data';
import {saveOrUpdate} from '../cityAdd.api';
// Emits
const emit = defineEmits(['register','success']);
const isUpdate = ref(true);
//
const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
labelWidth: 150,
schemas: formSchema,
showActionButtonGroup: false,
});
//
const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
//
await resetFields();
setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
isUpdate.value = !!data?.isUpdate;
if (unref(isUpdate)) {
//
await setFieldsValue({
...data.record,
});
}
//
setProps({ disabled: !data?.showFooter })
});
//
const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
//
async function handleSubmit(v) {
try {
let values = await validate();
setModalProps({confirmLoading: true});
//
await saveOrUpdate(values, isUpdate.value);
//
closeModal();
//
emit('success');
} finally {
setModalProps({confirmLoading: false});
}
}
</script>
<style lang="less" scoped>
</style>

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/controller/CityHomeController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 租房信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-26
* @Version: V1.0
*/
@Api(tags="租房信息表")


+ 71
- 5
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/entity/CityHome.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 租房信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-26
* @Version: V1.0
*/
@Data
@ -47,16 +47,82 @@ public class CityHome implements Serializable {
/**更新日期*/
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**发布用户*/
@Excel(name = "发布用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "发布用户")
private java.lang.String userId;
/**所属区域*/
@Excel(name = "所属区域", width = 15, dictTable = "city_addr", dicText = "name", dicCode = "id")
@Dict(dictTable = "city_addr", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "所属区域")
private java.lang.String addId;
/**标题*/
@Excel(name = "标题", width = 15)
@ApiModelProperty(value = "标题")
private java.lang.String title;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private java.lang.String titleSub;
/**图片*/
@Excel(name = "图片", width = 15)
@ApiModelProperty(value = "图片")
private java.lang.String image;
/**发布用户*/
@Excel(name = "发布用户", width = 15)
@ApiModelProperty(value = "发布用户")
private java.lang.String userId;
/**租金*/
@Excel(name = "租金", width = 15)
@ApiModelProperty(value = "租金")
private java.math.BigDecimal money;
/**面积*/
@Excel(name = "面积", width = 15)
@ApiModelProperty(value = "面积")
private java.lang.String crm;
/**楼层*/
@Excel(name = "楼层", width = 15)
@ApiModelProperty(value = "楼层")
private java.lang.String floor;
/**朝向*/
@Excel(name = "朝向", width = 15)
@ApiModelProperty(value = "朝向")
private java.lang.String face;
/**装修*/
@Excel(name = "装修", width = 15)
@ApiModelProperty(value = "装修")
private java.lang.String decoration;
/**付款*/
@Excel(name = "付款", width = 15)
@ApiModelProperty(value = "付款")
private java.lang.String payment;
/**电梯*/
@Excel(name = "电梯", width = 15)
@ApiModelProperty(value = "电梯")
private java.lang.String lift;
/**交付*/
@Excel(name = "交付", width = 15)
@ApiModelProperty(value = "交付")
private java.lang.String deliver;
/**看房*/
@Excel(name = "看房", width = 15)
@ApiModelProperty(value = "看房")
private java.lang.String showings;
/**电话*/
@Excel(name = "电话", width = 15)
@ApiModelProperty(value = "电话")
private java.lang.String phone;
/**地址*/
@Excel(name = "地址", width = 15)
@ApiModelProperty(value = "地址")
private java.lang.String address;
/**浏览量*/
@Excel(name = "浏览量", width = 15)
@ApiModelProperty(value = "浏览量")
private java.lang.String num;
/**经度*/
@Excel(name = "经度", width = 15)
@ApiModelProperty(value = "经度")
private java.lang.String longitude;
/**纬度*/
@Excel(name = "纬度", width = 15)
@ApiModelProperty(value = "纬度")
private java.lang.String latitude;
}

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/mapper/CityHomeMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 租房信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-26
* @Version: V1.0
*/
public interface CityHomeMapper extends BaseMapper<CityHome> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/ICityHomeService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 租房信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-26
* @Version: V1.0
*/
public interface ICityHomeService extends IService<CityHome> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/service/impl/CityHomeServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 租房信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-26
* @Version: V1.0
*/
@Service


+ 127
- 3
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/CityHomeList.vue View File

@ -4,6 +4,26 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="发布用户">
<j-search-select-tag placeholder="请选择发布用户" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="所属区域">
<j-search-select-tag placeholder="请选择所属区域" v-model="queryParam.addId" dict="city_addr,name,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -99,6 +119,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CityHomeModal from './modules/CityHomeModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'CityHomeList',
@ -121,11 +142,32 @@
return parseInt(index)+1;
}
},
{
title:'创建日期',
align:"center",
sorter: true,
dataIndex: 'createTime'
},
{
title:'发布用户',
align:"center",
dataIndex: 'userId_dictText'
},
{
title:'所属区域',
align:"center",
dataIndex: 'addId_dictText'
},
{
title:'标题',
align:"center",
dataIndex: 'title'
},
{
title:'备注',
align:"center",
dataIndex: 'titleSub'
},
{
title:'图片',
align:"center",
@ -133,9 +175,74 @@
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'发布用户',
title:'租金',
align:"center",
dataIndex: 'money'
},
{
title:'面积',
align:"center",
dataIndex: 'crm'
},
{
title:'楼层',
align:"center",
dataIndex: 'floor'
},
{
title:'朝向',
align:"center",
dataIndex: 'face'
},
{
title:'装修',
align:"center",
dataIndex: 'decoration'
},
{
title:'付款',
align:"center",
dataIndex: 'payment'
},
{
title:'电梯',
align:"center",
dataIndex: 'lift'
},
{
title:'交付',
align:"center",
dataIndex: 'deliver'
},
{
title:'看房',
align:"center",
dataIndex: 'showings'
},
{
title:'电话',
align:"center",
dataIndex: 'phone'
},
{
title:'地址',
align:"center",
dataIndex: 'address'
},
{
title:'浏览量',
align:"center",
dataIndex: 'num'
},
{
title:'经度',
align:"center",
dataIndex: 'longitude'
},
{
title:'纬度',
align:"center",
dataIndex: 'userId'
dataIndex: 'latitude'
},
{
title: '操作',
@ -171,9 +278,26 @@
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
fieldList.push({type:'sel_search',value:'userId',text:'发布用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
fieldList.push({type:'sel_search',value:'addId',text:'所属区域',dictTable:"city_addr", dictText:'name', dictCode:'id'})
fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
fieldList.push({type:'string',value:'titleSub',text:'备注',dictCode:''})
fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
fieldList.push({type:'string',value:'userId',text:'发布用户',dictCode:''})
fieldList.push({type:'BigDecimal',value:'money',text:'租金',dictCode:''})
fieldList.push({type:'string',value:'crm',text:'面积',dictCode:''})
fieldList.push({type:'string',value:'floor',text:'楼层',dictCode:''})
fieldList.push({type:'string',value:'face',text:'朝向',dictCode:''})
fieldList.push({type:'string',value:'decoration',text:'装修',dictCode:''})
fieldList.push({type:'string',value:'payment',text:'付款',dictCode:''})
fieldList.push({type:'string',value:'lift',text:'电梯',dictCode:''})
fieldList.push({type:'string',value:'deliver',text:'交付',dictCode:''})
fieldList.push({type:'string',value:'showings',text:'看房',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
fieldList.push({type:'string',value:'num',text:'浏览量',dictCode:''})
fieldList.push({type:'string',value:'longitude',text:'经度',dictCode:''})
fieldList.push({type:'string',value:'latitude',text:'纬度',dictCode:''})
this.superFieldList = fieldList
}
}


+ 82
- 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/modules/CityHomeForm.vue View File

@ -3,19 +3,99 @@
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="发布用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="所属区域" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addId">
<j-search-select-tag v-model="model.addId" dict="city_addr,name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
<a-input v-model="model.title" placeholder="请输入标题" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="titleSub">
<a-textarea v-model="model.titleSub" rows="4" placeholder="请输入备注" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
<j-image-upload isMultiple v-model="model.image" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="发布用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<a-input v-model="model.userId" placeholder="请输入发布用户" ></a-input>
<a-form-model-item label="租金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
<a-input-number v-model="model.money" placeholder="请输入租金" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="面积" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="crm">
<a-input v-model="model.crm" placeholder="请输入面积" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="楼层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="floor">
<a-input v-model="model.floor" placeholder="请输入楼层" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="朝向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="face">
<a-input v-model="model.face" placeholder="请输入朝向" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="装修" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="decoration">
<a-input v-model="model.decoration" placeholder="请输入装修" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="付款" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payment">
<a-input v-model="model.payment" placeholder="请输入付款" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="电梯" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lift">
<a-input v-model="model.lift" placeholder="请输入电梯" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="交付" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deliver">
<a-input v-model="model.deliver" placeholder="请输入交付" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="看房" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="showings">
<a-input v-model="model.showings" placeholder="请输入看房" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
<a-input v-model="model.phone" placeholder="请输入电话" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
<a-textarea v-model="model.address" rows="4" placeholder="请输入地址" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="浏览量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
<a-input v-model="model.num" placeholder="请输入浏览量" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="经度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="longitude">
<a-input v-model="model.longitude" placeholder="请输入经度" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="纬度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="latitude">
<a-input v-model="model.latitude" placeholder="请输入纬度" ></a-input>
</a-form-model-item>
</a-col>
</a-row>


+ 194
- 4
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue3/CityHome.data.ts View File

@ -5,10 +5,31 @@ import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '创建日期',
align:"center",
sorter: true,
dataIndex: 'createTime'
},
{
title: '发布用户',
align:"center",
dataIndex: 'userId_dictText'
},
{
title: '所属区域',
align:"center",
dataIndex: 'addId_dictText'
},
{
title: '标题',
align:"center",
dataIndex: 'title'
},
{
title: '备注',
align:"center",
dataIndex: 'titleSub'
},
{
title: '图片',
align:"center",
@ -16,21 +37,125 @@ export const columns: BasicColumn[] = [
customRender:render.renderAvatar,
},
{
title: '发布用户',
title: '租金',
align:"center",
dataIndex: 'money'
},
{
title: '面积',
align:"center",
dataIndex: 'crm'
},
{
title: '楼层',
align:"center",
dataIndex: 'floor'
},
{
title: '朝向',
align:"center",
dataIndex: 'face'
},
{
title: '装修',
align:"center",
dataIndex: 'decoration'
},
{
title: '付款',
align:"center",
dataIndex: 'payment'
},
{
title: '电梯',
align:"center",
dataIndex: 'lift'
},
{
title: '交付',
align:"center",
dataIndex: 'deliver'
},
{
title: '看房',
align:"center",
dataIndex: 'showings'
},
{
title: '电话',
align:"center",
dataIndex: 'phone'
},
{
title: '地址',
align:"center",
dataIndex: 'address'
},
{
title: '浏览量',
align:"center",
dataIndex: 'num'
},
{
title: '经度',
align:"center",
dataIndex: 'longitude'
},
{
title: '纬度',
align:"center",
dataIndex: 'userId'
dataIndex: 'latitude'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
{
label: "发布用户",
field: "userId",
component: 'JSearchSelect',
componentProps:{
dict:"han_hai_member,nick_name,id"
},
colProps: {span: 6},
},
{
label: "所属区域",
field: "addId",
component: 'JSearchSelect',
componentProps:{
dict:"city_addr,name,id"
},
colProps: {span: 6},
},
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '发布用户',
field: 'userId',
component: 'JSearchSelect',
componentProps:{
dict:"han_hai_member,nick_name,id"
},
},
{
label: '所属区域',
field: 'addId',
component: 'JSearchSelect',
componentProps:{
dict:"city_addr,name,id"
},
},
{
label: '标题',
field: 'title',
component: 'Input',
},
{
label: '备注',
field: 'titleSub',
component: 'InputTextArea',//TODO 注意string转换问题
},
{
label: '图片',
field: 'image',
@ -39,8 +164,73 @@ export const formSchema: FormSchema[] = [
},
},
{
label: '发布用户',
field: 'userId',
label: '租金',
field: 'money',
component: 'InputNumber',
},
{
label: '面积',
field: 'crm',
component: 'Input',
},
{
label: '楼层',
field: 'floor',
component: 'Input',
},
{
label: '朝向',
field: 'face',
component: 'Input',
},
{
label: '装修',
field: 'decoration',
component: 'Input',
},
{
label: '付款',
field: 'payment',
component: 'Input',
},
{
label: '电梯',
field: 'lift',
component: 'Input',
},
{
label: '交付',
field: 'deliver',
component: 'Input',
},
{
label: '看房',
field: 'showings',
component: 'Input',
},
{
label: '电话',
field: 'phone',
component: 'Input',
},
{
label: '地址',
field: 'address',
component: 'InputTextArea',//TODO 注意string转换问题
},
{
label: '浏览量',
field: 'num',
component: 'Input',
},
{
label: '经度',
field: 'longitude',
component: 'Input',
},
{
label: '纬度',
field: 'latitude',
component: 'Input',
},
];

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/controller/CityJobController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 工作信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-26
* @Version: V1.0
*/
@Api(tags="工作信息表")


+ 39
- 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/entity/CityJob.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 工作信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-26
* @Version: V1.0
*/
@Data
@ -52,7 +52,44 @@ public class CityJob implements Serializable {
@ApiModelProperty(value = "标题")
private java.lang.String title;
/**发布人*/
@Excel(name = "发布人", width = 15)
@Excel(name = "发布人", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "发布人")
private java.lang.String userId;
/**最低价格*/
@Excel(name = "最低价格", width = 15)
@ApiModelProperty(value = "最低价格")
private java.math.BigDecimal minPrice;
/**最高价格*/
@Excel(name = "最高价格", width = 15)
@ApiModelProperty(value = "最高价格")
private java.math.BigDecimal maxPrice;
/**地址*/
@Excel(name = "地址", width = 15)
@ApiModelProperty(value = "地址")
private java.lang.String address;
/**学历要求*/
@Excel(name = "学历要求", width = 15)
@ApiModelProperty(value = "学历要求")
private java.lang.String school;
/**岗位详情*/
@Excel(name = "岗位详情", width = 15)
@ApiModelProperty(value = "岗位详情")
private java.lang.String jobDetails;
/**经度*/
@Excel(name = "经度", width = 15)
@ApiModelProperty(value = "经度")
private java.lang.String latitude;
/**纬度*/
@Excel(name = "纬度", width = 15)
@ApiModelProperty(value = "纬度")
private java.lang.String longitude;
/**工作年限*/
@Excel(name = "工作年限", width = 15)
@ApiModelProperty(value = "工作年限")
private java.lang.String workYear;
/**标签列表*/
@Excel(name = "标签列表", width = 15)
@ApiModelProperty(value = "标签列表")
private java.lang.String iconText;
}

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/mapper/CityJobMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 工作信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-26
* @Version: V1.0
*/
public interface CityJobMapper extends BaseMapper<CityJob> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/ICityJobService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 工作信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-26
* @Version: V1.0
*/
public interface ICityJobService extends IService<CityJob> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/service/impl/CityJobServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 工作信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-26
* @Version: V1.0
*/
@Service


+ 57
- 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/CityJobList.vue View File

@ -99,6 +99,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CityJobModal from './modules/CityJobModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'CityJobList',
@ -129,7 +130,52 @@
{
title:'发布人',
align:"center",
dataIndex: 'userId'
dataIndex: 'userId_dictText'
},
{
title:'最低价格',
align:"center",
dataIndex: 'minPrice'
},
{
title:'最高价格',
align:"center",
dataIndex: 'maxPrice'
},
{
title:'地址',
align:"center",
dataIndex: 'address'
},
{
title:'学历要求',
align:"center",
dataIndex: 'school'
},
{
title:'岗位详情',
align:"center",
dataIndex: 'jobDetails'
},
{
title:'经度',
align:"center",
dataIndex: 'latitude'
},
{
title:'纬度',
align:"center",
dataIndex: 'longitude'
},
{
title:'工作年限',
align:"center",
dataIndex: 'workYear'
},
{
title:'标签列表',
align:"center",
dataIndex: 'iconText'
},
{
title: '操作',
@ -166,7 +212,16 @@
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
fieldList.push({type:'string',value:'userId',text:'发布人',dictCode:''})
fieldList.push({type:'sel_search',value:'userId',text:'发布人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
fieldList.push({type:'BigDecimal',value:'minPrice',text:'最低价格',dictCode:''})
fieldList.push({type:'BigDecimal',value:'maxPrice',text:'最高价格',dictCode:''})
fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
fieldList.push({type:'string',value:'school',text:'学历要求',dictCode:''})
fieldList.push({type:'string',value:'jobDetails',text:'岗位详情',dictCode:''})
fieldList.push({type:'string',value:'latitude',text:'经度',dictCode:''})
fieldList.push({type:'string',value:'longitude',text:'纬度',dictCode:''})
fieldList.push({type:'string',value:'workYear',text:'工作年限',dictCode:''})
fieldList.push({type:'string',value:'iconText',text:'标签列表',dictCode:''})
this.superFieldList = fieldList
}
}


+ 46
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue/modules/CityJobForm.vue View File

@ -10,7 +10,52 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="发布人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<a-input v-model="model.userId" placeholder="请输入发布人" ></a-input>
<j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="最低价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="minPrice">
<a-input-number v-model="model.minPrice" placeholder="请输入最低价格" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="最高价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="maxPrice">
<a-input-number v-model="model.maxPrice" placeholder="请输入最高价格" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
<a-input v-model="model.address" placeholder="请输入地址" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="学历要求" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="school">
<a-input v-model="model.school" placeholder="请输入学历要求" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="岗位详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jobDetails">
<a-textarea v-model="model.jobDetails" rows="4" placeholder="请输入岗位详情" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="经度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="latitude">
<a-input v-model="model.latitude" placeholder="请输入经度" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="纬度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="longitude">
<a-input v-model="model.longitude" placeholder="请输入纬度" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="工作年限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workYear">
<a-input v-model="model.workYear" placeholder="请输入工作年限" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="标签列表" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="iconText">
<a-input v-model="model.iconText" placeholder="请输入标签列表" ></a-input>
</a-form-model-item>
</a-col>
</a-row>


+ 94
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJob/vue3/CityJob.data.ts View File

@ -12,7 +12,52 @@ export const columns: BasicColumn[] = [
{
title: '发布人',
align:"center",
dataIndex: 'userId'
dataIndex: 'userId_dictText'
},
{
title: '最低价格',
align:"center",
dataIndex: 'minPrice'
},
{
title: '最高价格',
align:"center",
dataIndex: 'maxPrice'
},
{
title: '地址',
align:"center",
dataIndex: 'address'
},
{
title: '学历要求',
align:"center",
dataIndex: 'school'
},
{
title: '岗位详情',
align:"center",
dataIndex: 'jobDetails'
},
{
title: '经度',
align:"center",
dataIndex: 'latitude'
},
{
title: '纬度',
align:"center",
dataIndex: 'longitude'
},
{
title: '工作年限',
align:"center",
dataIndex: 'workYear'
},
{
title: '标签列表',
align:"center",
dataIndex: 'iconText'
},
];
//查询数据
@ -28,6 +73,54 @@ export const formSchema: FormSchema[] = [
{
label: '发布人',
field: 'userId',
component: 'JSearchSelect',
componentProps:{
dict:"han_hai_member,nick_name,id"
},
},
{
label: '最低价格',
field: 'minPrice',
component: 'InputNumber',
},
{
label: '最高价格',
field: 'maxPrice',
component: 'InputNumber',
},
{
label: '地址',
field: 'address',
component: 'Input',
},
{
label: '学历要求',
field: 'school',
component: 'Input',
},
{
label: '岗位详情',
field: 'jobDetails',
component: 'InputTextArea',//TODO 注意string转换问题
},
{
label: '经度',
field: 'latitude',
component: 'Input',
},
{
label: '纬度',
field: 'longitude',
component: 'Input',
},
{
label: '工作年限',
field: 'workYear',
component: 'Input',
},
{
label: '标签列表',
field: 'iconText',
component: 'Input',
},
];

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/controller/CityShopController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 商铺信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-25
* @Version: V1.0
*/
@Api(tags="商铺信息表")


+ 39
- 7
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/entity/CityShop.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 商铺信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-25
* @Version: V1.0
*/
@Data
@ -47,12 +47,44 @@ public class CityShop implements Serializable {
/**更新日期*/
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**标题*/
@Excel(name = "标题", width = 15)
@ApiModelProperty(value = "标题")
/**商户名称*/
@Excel(name = "商户名称", width = 15)
@ApiModelProperty(value = "商户名称")
private java.lang.String title;
/**内容*/
@Excel(name = "内容", width = 15)
@ApiModelProperty(value = "内容")
/**商户门头*/
@Excel(name = "商户门头", width = 15)
@ApiModelProperty(value = "商户门头")
private java.lang.String image;
/**商户LOGO*/
@Excel(name = "商户LOGO", width = 15)
@ApiModelProperty(value = "商户LOGO")
private java.lang.String logoImage;
/**商户简介*/
@Excel(name = "商户简介", width = 15)
@ApiModelProperty(value = "商户简介")
private java.lang.String titleSub;
/**商户标签*/
@Excel(name = "商户标签", width = 15)
@ApiModelProperty(value = "商户标签")
private java.lang.String iconSub;
/**营业时间*/
@Excel(name = "营业时间", width = 15)
@ApiModelProperty(value = "营业时间")
private java.lang.String workTime;
/**商户地址*/
@Excel(name = "商户地址", width = 15)
@ApiModelProperty(value = "商户地址")
private java.lang.String address;
/**商户介绍*/
@Excel(name = "商户介绍", width = 15)
@ApiModelProperty(value = "商户介绍")
private java.lang.String details;
/**商户图片*/
@Excel(name = "商户图片", width = 15)
@ApiModelProperty(value = "商户图片")
private java.lang.String detailsImage;
/**排序*/
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")
private java.lang.Integer sort;
}

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/mapper/CityShopMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 商铺信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-25
* @Version: V1.0
*/
public interface CityShopMapper extends BaseMapper<CityShop> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/ICityShopService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 商铺信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-25
* @Version: V1.0
*/
public interface ICityShopService extends IService<CityShop> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/impl/CityShopServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 商铺信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-25
* @Version: V1.0
*/
@Service


+ 83
- 5
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/CityShopList.vue View File

@ -4,6 +4,26 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="商户名称">
<a-input placeholder="请输入商户名称" v-model="queryParam.title"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="商户地址">
<a-input placeholder="请输入商户地址" v-model="queryParam.address"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -122,14 +142,63 @@
}
},
{
title:'标题',
title:'创建日期',
align:"center",
sorter: true,
dataIndex: 'createTime'
},
{
title:'商户名称',
align:"center",
dataIndex: 'title'
},
{
title:'内容',
title:'商户门头',
align:"center",
dataIndex: 'image',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'商户LOGO',
align:"center",
dataIndex: 'logoImage',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'商户简介',
align:"center",
dataIndex: 'titleSub'
},
{
title:'商户标签',
align:"center",
dataIndex: 'iconSub'
},
{
title:'营业时间',
align:"center",
dataIndex: 'workTime'
},
{
title:'商户地址',
align:"center",
dataIndex: 'address'
},
{
title:'商户介绍',
align:"center",
dataIndex: 'details'
},
{
title:'商户图片',
align:"center",
dataIndex: 'detailsImage',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'排序',
align:"center",
dataIndex: 'image'
dataIndex: 'sort'
},
{
title: '操作',
@ -165,8 +234,17 @@
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
fieldList.push({type:'string',value:'image',text:'内容',dictCode:''})
fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
fieldList.push({type:'string',value:'title',text:'商户名称',dictCode:''})
fieldList.push({type:'Text',value:'image',text:'商户门头',dictCode:''})
fieldList.push({type:'Text',value:'logoImage',text:'商户LOGO',dictCode:''})
fieldList.push({type:'string',value:'titleSub',text:'商户简介',dictCode:''})
fieldList.push({type:'string',value:'iconSub',text:'商户标签',dictCode:''})
fieldList.push({type:'string',value:'workTime',text:'营业时间',dictCode:''})
fieldList.push({type:'string',value:'address',text:'商户地址',dictCode:''})
fieldList.push({type:'Text',value:'details',text:'商户介绍',dictCode:''})
fieldList.push({type:'Text',value:'detailsImage',text:'商户图片',dictCode:''})
fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
this.superFieldList = fieldList
}
}


+ 44
- 4
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/modules/CityShopForm.vue View File

@ -4,13 +4,53 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
<a-input v-model="model.title" placeholder="请输入标题" ></a-input>
<a-form-model-item label="商户名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
<a-input v-model="model.title" placeholder="请输入商户名称" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
<a-input v-model="model.image" placeholder="请输入内容" ></a-input>
<a-form-model-item label="商户门头" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
<j-image-upload isMultiple v-model="model.image" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="商户LOGO" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logoImage">
<j-image-upload isMultiple v-model="model.logoImage" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="商户简介" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="titleSub">
<a-input v-model="model.titleSub" placeholder="请输入商户简介" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="商户标签" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="iconSub">
<a-input v-model="model.iconSub" placeholder="请输入商户标签" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="营业时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workTime">
<a-input v-model="model.workTime" placeholder="请输入营业时间" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="商户地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
<a-input v-model="model.address" placeholder="请输入商户地址" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="商户介绍" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="details">
<a-input v-model="model.details" placeholder="请输入商户介绍" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="商户图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="detailsImage">
<j-image-upload isMultiple v-model="model.detailsImage" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
<a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
</a-form-model-item>
</a-col>
</a-row>


+ 112
- 5
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue3/CityShop.data.ts View File

@ -5,29 +5,136 @@ import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '标题',
title: '创建日期',
align:"center",
sorter: true,
dataIndex: 'createTime'
},
{
title: '商户名称',
align:"center",
dataIndex: 'title'
},
{
title: '内容',
title: '商户门头',
align:"center",
dataIndex: 'image',
customRender:render.renderAvatar,
},
{
title: '商户LOGO',
align:"center",
dataIndex: 'logoImage',
customRender:render.renderAvatar,
},
{
title: '商户简介',
align:"center",
dataIndex: 'titleSub'
},
{
title: '商户标签',
align:"center",
dataIndex: 'iconSub'
},
{
title: '营业时间',
align:"center",
dataIndex: 'workTime'
},
{
title: '商户地址',
align:"center",
dataIndex: 'address'
},
{
title: '商户介绍',
align:"center",
dataIndex: 'details'
},
{
title: '商户图片',
align:"center",
dataIndex: 'image'
dataIndex: 'detailsImage',
customRender:render.renderAvatar,
},
{
title: '排序',
align:"center",
dataIndex: 'sort'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
{
label: "商户名称",
field: "title",
component: 'Input',
colProps: {span: 6},
},
{
label: "商户地址",
field: "address",
component: 'Input',
colProps: {span: 6},
},
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '标题',
label: '商户名称',
field: 'title',
component: 'Input',
},
{
label: '内容',
label: '商户门头',
field: 'image',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '商户LOGO',
field: 'logoImage',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '商户简介',
field: 'titleSub',
component: 'Input',
},
{
label: '商户标签',
field: 'iconSub',
component: 'Input',
},
{
label: '营业时间',
field: 'workTime',
component: 'Input',
},
{
label: '商户地址',
field: 'address',
component: 'Input',
},
{
label: '商户介绍',
field: 'details',
component: 'Input',
},
{
label: '商户图片',
field: 'detailsImage',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '排序',
field: 'sort',
component: 'InputNumber',
},
];

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/controller/CityTrendsController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 动态信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-25
* @Version: V1.0
*/
@Api(tags="动态信息表")


+ 17
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/entity/CityTrends.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 动态信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-25
* @Version: V1.0
*/
@Data
@ -81,4 +81,20 @@ public class CityTrends implements Serializable {
@Excel(name = "标题", width = 15)
@ApiModelProperty(value = "标题")
private java.lang.String title;
/**点赞量*/
@Excel(name = "点赞量", width = 15)
@ApiModelProperty(value = "点赞量")
private java.lang.Integer isUp;
/**踩量*/
@Excel(name = "踩量", width = 15)
@ApiModelProperty(value = "踩量")
private java.lang.Integer isDown;
/**评论量*/
@Excel(name = "评论量", width = 15)
@ApiModelProperty(value = "评论量")
private java.lang.Integer isComment;
/**浏览量*/
@Excel(name = "浏览量", width = 15)
@ApiModelProperty(value = "浏览量")
private java.lang.Integer isBrowse;
}

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/mapper/CityTrendsMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 动态信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-25
* @Version: V1.0
*/
public interface CityTrendsMapper extends BaseMapper<CityTrends> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/service/ICityTrendsService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 动态信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-25
* @Version: V1.0
*/
public interface ICityTrendsService extends IService<CityTrends> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/service/impl/CityTrendsServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 动态信息表
* @Author: jeecg-boot
* @Date: 2024-10-14
* @Date: 2024-10-25
* @Version: V1.0
*/
@Service


+ 24
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/vue/CityTrendsList.vue View File

@ -186,6 +186,26 @@
align:"center",
dataIndex: 'title'
},
{
title:'点赞量',
align:"center",
dataIndex: 'isUp'
},
{
title:'踩量',
align:"center",
dataIndex: 'isDown'
},
{
title:'评论量',
align:"center",
dataIndex: 'isComment'
},
{
title:'浏览量',
align:"center",
dataIndex: 'isBrowse'
},
{
title: '操作',
dataIndex: 'action',
@ -230,6 +250,10 @@
fieldList.push({type:'switch',value:'isTop',text:'置顶'})
fieldList.push({type:'sel_search',value:'classId',text:'分类',dictTable:"citiy_class", dictText:'title', dictCode:'id'})
fieldList.push({type:'Text',value:'title',text:'标题',dictCode:''})
fieldList.push({type:'int',value:'isUp',text:'点赞量',dictCode:''})
fieldList.push({type:'int',value:'isDown',text:'踩量',dictCode:''})
fieldList.push({type:'int',value:'isComment',text:'评论量',dictCode:''})
fieldList.push({type:'int',value:'isBrowse',text:'浏览量',dictCode:''})
this.superFieldList = fieldList
}
}


+ 20
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/vue/modules/CityTrendsForm.vue View File

@ -43,6 +43,26 @@
<a-textarea v-model="model.title" rows="4" placeholder="请输入标题" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="点赞量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isUp">
<a-input-number v-model="model.isUp" placeholder="请输入点赞量" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="踩量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isDown">
<a-input-number v-model="model.isDown" placeholder="请输入踩量" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="评论量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isComment">
<a-input-number v-model="model.isComment" placeholder="请输入评论量" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="浏览量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isBrowse">
<a-input-number v-model="model.isBrowse" placeholder="请输入浏览量" style="width: 100%" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>


+ 40
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/vue3/CityTrends.data.ts View File

@ -55,6 +55,26 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'title'
},
{
title: '点赞量',
align:"center",
dataIndex: 'isUp'
},
{
title: '踩量',
align:"center",
dataIndex: 'isDown'
},
{
title: '评论量',
align:"center",
dataIndex: 'isComment'
},
{
title: '浏览量',
align:"center",
dataIndex: 'isBrowse'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
@ -122,4 +142,24 @@ export const formSchema: FormSchema[] = [
field: 'title',
component: 'InputTextArea',//TODO 注意string转换问题
},
{
label: '点赞量',
field: 'isUp',
component: 'InputNumber',
},
{
label: '踩量',
field: 'isDown',
component: 'InputNumber',
},
{
label: '评论量',
field: 'isComment',
component: 'InputNumber',
},
{
label: '浏览量',
field: 'isBrowse',
component: 'InputNumber',
},
];

+ 0
- 8
jeecg-boot-base/jeecg-boot-base-tools/jeecg-boot-base-tools.iml View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
</module>

+ 0
- 18
jeecg-boot-module-system/jeecg-boot-module-system.iml View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="FacetManager">
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping>
<factory-entry name="jeecg-boot-module-system" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
</module>

+ 4
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java View File

@ -70,6 +70,9 @@ public interface YaoDuApiService {
//获取评论信息列表
Result<?> getCommentPage(PageBean pageBean);
//获取发布按钮列表
Result<?> getPublishButtonList();
//点击查看联系方式 类型 0帖子 1租房 2工作 3门店
@ -97,4 +100,5 @@ public interface YaoDuApiService {
}

+ 14
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java View File

@ -13,6 +13,8 @@ import org.jeecg.modules.citiyUserAuthentication.entity.CitiyUserAuthentication;
import org.jeecg.modules.citiyUserAuthentication.service.ICitiyUserAuthenticationService;
import org.jeecg.modules.cityActivity.entity.CityActivity;
import org.jeecg.modules.cityActivity.service.ICityActivityService;
import org.jeecg.modules.cityAdd.entity.CityAdd;
import org.jeecg.modules.cityAdd.service.ICityAddService;
import org.jeecg.modules.cityAddr.entity.CityAddr;
import org.jeecg.modules.cityAddr.service.ICityAddrService;
import org.jeecg.modules.cityAddressLog.service.ICityAddressLogService;
@ -85,6 +87,9 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
//店铺认证
@Resource
private ICitiyShopAuthenticationService cityShopAuthenticationService;
//发布按钮
@Resource
private ICityAddService cityAddService;
//获取城市列表服务区域
@ -237,6 +242,15 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
}
//获取发布按钮列表
@Override
public Result<?> getPublishButtonList(){
List<CityAdd> list = cityAddService
.lambdaQuery()
.list();
return Result.OK(list);
}
//点击查看联系方式 类型 0帖子 1租房 2工作 3门店
@Override
public Result<?> checkGivePhone(String token,String type, String id){


+ 7
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiController.java View File

@ -105,4 +105,11 @@ public class YaoDuApiController {
}
//发布按钮列表
@ApiOperation(value="发布按钮列表")
@GetMapping(value = "/getPublishList")
public Result<?> getPublishList() {
return yaoDuApiService.getPublishButtonList();
}
}

Loading…
Cancel
Save