From 6ea5a8b52bdd0377847fe9848c7694ec120bd48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 27 五月 2021 09:03:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java | 88 ++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java | 113 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeEditDTO.java | 39 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml | 4
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeDetailsVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java | 113 +++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoMapper.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventAddDTO.java | 92 ++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoTypeMapper.java | 32
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoDetailsVO.java | 88 ++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoTypeMapper.xml | 43 +
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoTypeServiceImpl.java | 104 +++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml | 121 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java | 110 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeDeleteDTO.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoTypeDO.java | 41 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeVO.java | 32
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml | 4
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoDTO.java | 165 ++++
/dev/null | 387 -----------
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java | 104 +++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoTypeService.java | 60 +
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml | 4
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeAddDTO.java | 36 +
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoService.java | 60 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoTypeDTO.java | 69 ++
springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoDeleteDTO.java | 28
28 files changed, 1,637 insertions(+), 394 deletions(-)
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index b18cd00..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/springcloud_k8s_panzhihuazhihuishequ.iml" filepath="$PROJECT_DIR$/.idea/springcloud_k8s_panzhihuazhihuishequ.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index adab768..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="AutoImportSettings">
- <option name="autoReloadType" value="SELECTIVE" />
- </component>
- <component name="BranchesTreeState">
- <expand>
- <path>
- <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
- <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
- </path>
- <path>
- <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
- <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
- </path>
- <path>
- <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
- <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
- <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
- </path>
- </expand>
- <select />
- </component>
- <component name="ChangeListManager">
- <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="" />
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <component name="CompilerWorkspaceConfiguration">
- <option name="MAKE_PROJECT_ON_SAVE" value="true" />
- </component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="Class" />
- <option value="Interface" />
- </list>
- </option>
- </component>
- <component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- </component>
- <component name="JRebelWorkspace">
- <option name="jrebelEnabledAutocompile" value="true" />
- </component>
- <component name="MavenImportPreferences">
- <option name="generalSettings">
- <MavenGeneralSettings>
- <option name="mavenHome" value="F:\apache-maven-3.6.3" />
- <option name="userSettingsFile" value="F:\settings.xml" />
- </MavenGeneralSettings>
- </option>
- </component>
- <component name="ProjectId" id="1kUMLMzIgmKcJL7k1Kp3O7UaWYb" />
- <component name="ProjectLevelVcsManager" settingsEditedManually="true">
- <ConfirmationsSetting value="2" id="Add" />
- </component>
- <component name="ProjectViewState">
- <option name="hideEmptyMiddlePackages" value="true" />
- <option name="showExcludedFiles" value="false" />
- <option name="showLibraryContents" value="true" />
- <option name="showMembers" value="true" />
- <option name="showVisibilityIcons" value="true" />
- </component>
- <component name="PropertiesComponent">
- <property name="RequestMappingsPanelOrder0" value="0" />
- <property name="RequestMappingsPanelOrder1" value="1" />
- <property name="RequestMappingsPanelWidth0" value="75" />
- <property name="RequestMappingsPanelWidth1" value="75" />
- <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
- <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
- <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
- <property name="WebServerToolWindowFactoryState" value="false" />
- <property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="project.structure.last.edited" value="Modules" />
- <property name="project.structure.proportion" value="0.15" />
- <property name="project.structure.side.proportion" value="0.2850575" />
- <property name="settings.editor.selected.configurable" value="spring.boot" />
- </component>
- <component name="ReactorSettings">
- <option name="notificationShown" value="true" />
- </component>
- <component name="RebelAgentSelection">
- <selection>jr</selection>
- </component>
- <component name="RecentsManager">
- <key name="CopyClassDialog.RECENTS_KEY">
- <recent name="com.panzhihua.service_community.config" />
- <recent name="com.panzhihua.applets.api" />
- <recent name="com.panzhihua.applets.config" />
- <recent name="com.panzhihua.zuul.config" />
- <recent name="com.panzhihua.zuul.exceptions" />
- </key>
- <key name="CopyFile.RECENT_KEYS">
- <recent name="E:\springcloud_k8s_panzhihuazhihuishequ\auth\src\main\java\com\panzhihua\auth" />
- <recent name="E:\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\exceptions" />
- <recent name="E:\springcloud_k8s_panzhihuazhihuishequ\config_server\src\main\resources" />
- <recent name="E:\springcloud_k8s_panzhihuazhihuishequ\eureka_server\src\main\resources" />
- </key>
- </component>
- <component name="RunDashboard">
- <option name="configurationTypes">
- <set>
- <option value="SpringBootApplicationConfigurationType" />
- </set>
- </option>
- </component>
- <component name="RunManager" selected="Spring Boot.AppletsApplication">
- <configuration name="AES" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
- <option name="MAIN_CLASS_NAME" value="com.panzhihua.common.utlis.AES" />
- <module name="common" />
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="com.panzhihua.common.utlis.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="AESUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
- <option name="MAIN_CLASS_NAME" value="com.panzhihua.common.utlis.AESUtils" />
- <module name="common" />
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="com.panzhihua.common.utlis.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="CommonApi" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
- <option name="MAIN_CLASS_NAME" value="com.panzhihua.applets.api.CommonApi" />
- <module name="applets" />
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="com.panzhihua.applets.api.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="SFTPUtil" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
- <option name="MAIN_CLASS_NAME" value="com.panzhihua.common.utlis.SFTPUtil" />
- <module name="common" />
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="com.panzhihua.common.utlis.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="UserServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
- <option name="MAIN_CLASS_NAME" value="com.panzhihua.service_user.service.impl.UserServiceImpl" />
- <module name="service_user" />
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="com.panzhihua.service_user.service.impl.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="AppletsApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="applets" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.panzhihua.applets.AppletsApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="AppletsBackstageApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="applets_backstage" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.panzhihua.applets_backstage.AppletsBackstageApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="AuthApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="auth" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.panzhihua.auth.AuthApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="CommunityBackstageApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="community_backstage" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.panzhihua.community_backstage.CommunityBackstageApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="ConfigServerApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="config_server" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.panzhihua.config_server.ConfigServerApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="EurekaServerApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="eureka_server" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.panzhihua.eureka_server.EurekaServerApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="ServiceCommunityApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="service_community" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.panzhihua.service_community.ServiceCommunityApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="ServiceDangjianApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="service_partybuilding" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.panzhihua.service_dangjian.ServiceDangjianApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="ServiceUserApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="service_user" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.panzhihua.service_user.ServiceUserApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="ZuulApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="zuul" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.panzhihua.zuul.ZuulApplication" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <list>
- <item itemvalue="Spring Boot.AppletsApplication" />
- <item itemvalue="Spring Boot.AppletsBackstageApplication" />
- <item itemvalue="Spring Boot.AuthApplication" />
- <item itemvalue="Spring Boot.CommunityBackstageApplication" />
- <item itemvalue="Spring Boot.ConfigServerApplication" />
- <item itemvalue="Spring Boot.EurekaServerApplication" />
- <item itemvalue="Spring Boot.ServiceDangjianApplication" />
- <item itemvalue="Spring Boot.ServiceUserApplication" />
- <item itemvalue="Spring Boot.ZuulApplication" />
- <item itemvalue="Spring Boot.ServiceCommunityApplication" />
- <item itemvalue="应用程序.AES" />
- <item itemvalue="应用程序.AESUtils" />
- <item itemvalue="应用程序.CommonApi" />
- <item itemvalue="应用程序.SFTPUtil" />
- <item itemvalue="应用程序.UserServiceImpl" />
- </list>
- </component>
- <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="" />
- <created>1605750660308</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1605750660308</updated>
- <workItem from="1605750661610" duration="2769000" />
- <workItem from="1605753463949" duration="1966000" />
- <workItem from="1605755455806" duration="1190000" />
- <workItem from="1605756670457" duration="5348000" />
- <workItem from="1605768376644" duration="212000" />
- <workItem from="1605768597693" duration="671000" />
- <workItem from="1605769282873" duration="5833000" />
- <workItem from="1605776552008" duration="1125000" />
- <workItem from="1605777694925" duration="420000" />
- <workItem from="1605778126781" duration="940000" />
- <workItem from="1605779084672" duration="146000" />
- <workItem from="1605779238243" duration="486000" />
- <workItem from="1605779772534" duration="83000" />
- <workItem from="1605779882829" duration="13794000" />
- <workItem from="1605852722291" duration="3263000" />
- <workItem from="1605856028698" duration="757000" />
- <workItem from="1605856801467" duration="8253000" />
- <workItem from="1606012844445" duration="592000" />
- <workItem from="1606092663200" duration="1974000" />
- <workItem from="1606099134841" duration="251000" />
- <workItem from="1606099401473" duration="498000" />
- <workItem from="1606100044066" duration="7439000" />
- <workItem from="1606114224999" duration="17773000" />
- <workItem from="1606187169896" duration="77493000" />
- <workItem from="1606438775693" duration="4413000" />
- <workItem from="1606446210869" duration="11341000" />
- <workItem from="1606467664472" duration="2122000" />
- <workItem from="1606698659803" duration="4085000" />
- <workItem from="1606703749233" duration="1287000" />
- <workItem from="1606705041991" duration="10587000" />
- <workItem from="1606721255415" duration="1223000" />
- <workItem from="1606722484134" duration="1724000" />
- <workItem from="1606724213289" duration="7091000" />
- <workItem from="1606785502390" duration="157000" />
- <workItem from="1606785663563" duration="11341000" />
- <workItem from="1606803704337" duration="4916000" />
- <workItem from="1606809281566" duration="2208000" />
- <workItem from="1606872792282" duration="8993000" />
- <workItem from="1606895653276" duration="8114000" />
- <workItem from="1606956410404" duration="10859000" />
- <workItem from="1606969019446" duration="5043000" />
- <workItem from="1606974395015" duration="14012000" />
- <workItem from="1607090273089" duration="598000" />
- <workItem from="1607145411212" duration="693000" />
- <workItem from="1607222842770" duration="18483000" />
- <workItem from="1607302567070" duration="3015000" />
- <workItem from="1607309009922" duration="2033000" />
- <workItem from="1607311398305" duration="8623000" />
- <workItem from="1607327897503" duration="1522000" />
- <workItem from="1607329436172" duration="377000" />
- <workItem from="1607329820133" duration="1190000" />
- <workItem from="1607406602091" duration="10276000" />
- <workItem from="1607417586183" duration="4817000" />
- <workItem from="1607478449881" duration="11398000" />
- <workItem from="1607498319972" duration="3272000" />
- <workItem from="1607501628720" duration="14533000" />
- <workItem from="1607570466474" duration="3972000" />
- <workItem from="1607580952692" duration="2220000" />
- <workItem from="1607583182340" duration="7247000" />
- <workItem from="1607590469380" duration="2145000" />
- <workItem from="1607592622276" duration="2020000" />
- <workItem from="1607648791489" duration="21292000" />
- <workItem from="1607907225056" duration="7141000" />
- <workItem from="1607922968659" duration="15678000" />
- <workItem from="1607998646834" duration="1576000" />
- <workItem from="1608000245865" duration="2350000" />
- <workItem from="1608002622499" duration="7968000" />
- <workItem from="1608016705915" duration="11239000" />
- <workItem from="1608085111574" duration="4227000" />
- <workItem from="1608089348186" duration="4517000" />
- <workItem from="1608100946839" duration="18456000" />
- <workItem from="1608182608634" duration="10840000" />
- <workItem from="1608194451929" duration="4683000" />
- <workItem from="1608253717284" duration="5449000" />
- <workItem from="1608271758670" duration="13709000" />
- <workItem from="1608369374763" duration="1704000" />
- <workItem from="1608371107059" duration="646000" />
- <workItem from="1608371917868" duration="79000" />
- <workItem from="1608379508016" duration="46000" />
- <workItem from="1616487193167" duration="62000" />
- </task>
- <servers />
- </component>
- <component name="TypeScriptGeneratedFilesManager">
- <option name="version" value="3" />
- </component>
- <component name="Vcs.Log.Tabs.Properties">
- <option name="TAB_STATES">
- <map>
- <entry key="MAIN">
- <value>
- <State />
- </value>
- </entry>
- </map>
- </option>
- <option name="oldMeFiltersMigrated" value="true" />
- </component>
- <component name="XDebuggerManager">
- <breakpoint-manager>
- <breakpoints>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/handel/UserLoginSuccessHandler.java</url>
- <line>31</line>
- <option name="timeStamp" value="95" />
- </line-breakpoint>
- </breakpoints>
- </breakpoint-manager>
- <pin-to-top-manager>
- <pinned-members>
- <PinnedItemInfo parentTag="com.panzhihua.common.model.vos.R" memberName="data" />
- </pinned-members>
- </pin-to-top-manager>
- </component>
-</project>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java
new file mode 100644
index 0000000..5f0a51c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java
@@ -0,0 +1,110 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import org.hibernate.validator.constraints.Length;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("创建社区活动 》随手拍请求参数")
+public class ComActEasyPhotoAddDTO {
+
+ @NotNull() @Max(9223372036854775807L)
+ @ApiModelProperty(value = "发起人id", hidden = false, example = "1")
+ private Long sponsorId;
+
+ @NotBlank() @Length(max=100)
+ @ApiModelProperty(value = "发生地址", hidden = false, example = "")
+ private String happenAddr;
+
+ @NotBlank() @Length(max=100)
+ @ApiModelProperty(value = "地址备注", hidden = false, example = "")
+ private String addrRemark;
+
+ @NotNull() @Max(127)
+ @ApiModelProperty(value = "状态 1待处理 2已处理", hidden = false, example = "1")
+ private Integer status;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人id", hidden = false, example = "1")
+ private Long handlerId;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "审核时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date examineAt;
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "详情", hidden = false, example = "")
+ private String detail;
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "图片路径列表，逗号分隔", hidden = false, example = "")
+ private String photoPathList;
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "处理结果", hidden = false, example = "")
+ private String handleResult;
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "")
+ private String handlePhotoList;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = false, example = "1")
+ private Long communityId;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否匿名发布 0 否 1 是", hidden = false, example = "1")
+ private Integer isHide;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要", hidden = false, example = "1")
+ private Integer isNeedFeedBack;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "反馈时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date feedbackAt;
+
+ @Length(max=500)
+ @ApiModelProperty(value = "驳回原因", hidden = false, example = "")
+ private String rejectReason;
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "封面图片", hidden = false, example = "")
+ private String cover;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否删除 0 否 1 是", hidden = false, example = "1")
+ private Integer delTag;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)", hidden = false, example = "1")
+ private Integer isReport;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
+ private Integer isPublicity;
+
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoDeleteDTO.java
new file mode 100644
index 0000000..ba8b816
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoDeleteDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("删除社区活动 》随手拍请求参数")
+public class ComActEasyPhotoDeleteDTO {
+
+ @ApiModelProperty(value = "自增id", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java
new file mode 100644
index 0000000..06eb605
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java
@@ -0,0 +1,113 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("编辑社区活动 》随手拍请求参数")
+public class ComActEasyPhotoEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "自增id", hidden = false, example = "1")
+ private Long id;
+
+ @NotNull() @Max(9223372036854775807L)
+ @ApiModelProperty(value = "发起人id", hidden = false, example = "1")
+ private Long sponsorId;
+
+ @NotBlank() @Length(max=100)
+ @ApiModelProperty(value = "发生地址", hidden = false, example = "")
+ private String happenAddr;
+
+ @NotBlank() @Length(max=100)
+ @ApiModelProperty(value = "地址备注", hidden = false, example = "")
+ private String addrRemark;
+
+ @NotNull() @Max(127)
+ @ApiModelProperty(value = "状态 1待处理 2已处理", hidden = false, example = "1")
+ private Integer status;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人id", hidden = false, example = "1")
+ private Long handlerId;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "审核时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date examineAt;
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "详情", hidden = false, example = "")
+ private String detail;
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "图片路径列表，逗号分隔", hidden = false, example = "")
+ private String photoPathList;
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "处理结果", hidden = false, example = "")
+ private String handleResult;
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "")
+ private String handlePhotoList;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = false, example = "1")
+ private Long communityId;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否匿名发布 0 否 1 是", hidden = false, example = "1")
+ private Integer isHide;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要", hidden = false, example = "1")
+ private Integer isNeedFeedBack;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "反馈时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date feedbackAt;
+
+ @Length(max=500)
+ @ApiModelProperty(value = "驳回原因", hidden = false, example = "")
+ private String rejectReason;
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "封面图片", hidden = false, example = "")
+ private String cover;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否删除 0 否 1 是", hidden = false, example = "1")
+ private Integer delTag;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)", hidden = false, example = "1")
+ private Integer isReport;
+
+ @Max(127)
+ @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
+ private Integer isPublicity;
+
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeAddDTO.java
new file mode 100644
index 0000000..3f001ca
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeAddDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import org.hibernate.validator.constraints.Length;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("创建随手拍类型请求参数")
+public class ComActEasyPhotoTypeAddDTO {
+
+ @Length(max=50)
+ @ApiModelProperty(value = "随手拍类型名称", hidden = false, example = "")
+ private String name;
+
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeDeleteDTO.java
new file mode 100644
index 0000000..0ac5b00
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeDeleteDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("删除随手拍类型请求参数")
+public class ComActEasyPhotoTypeDeleteDTO {
+
+ @ApiModelProperty(value = "主键id", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeEditDTO.java
new file mode 100644
index 0000000..eac61e1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoTypeEditDTO.java
@@ -0,0 +1,39 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("编辑随手拍类型请求参数")
+public class ComActEasyPhotoTypeEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键id", hidden = false, example = "1")
+ private Long id;
+
+ @Length(max=50)
+ @ApiModelProperty(value = "随手拍类型名称", hidden = false, example = "")
+ private String name;
+
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventAddDTO.java
new file mode 100644
index 0000000..e21d5b5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EmergenciesEventAddDTO.java
@@ -0,0 +1,92 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("突发事件请求参数")
+public class EmergenciesEventAddDTO {
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50", required = true)
+ @NotNull
+ private Date happenTime;
+
+ @Length(max=255)
+ @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "41.40338,2.17403", required = true)
+ @NotNull
+ private String happentLatLng;
+
+ @Length(max=255)
+ @ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
+ private String happentAddress;
+
+ //位置备注
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "发生区域-网格ID", hidden = false, example = "1", required = true)
+ @NotNull
+ private Long gridId;
+
+ @Length(max=255)
+ @ApiModelProperty(value = "事件描述", hidden = false, example = "", required = true)
+ @NotNull
+ private String eventDes;
+
+ @Max(127)
+ @ApiModelProperty(value = "事件类型1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报", hidden = false, example = "1", required = true)
+ @NotNull
+ private Integer eventType;
+
+ @Max(127)
+ @ApiModelProperty(value = "危险级别", hidden = false, example = "1", required = true)
+ @NotNull
+ private Integer dangerLevel;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "死亡人数", hidden = false, example = "1", required = true)
+ @NotNull
+ private Integer deathsNumber;
+
+ @Max(9999999999L)
+ @ApiModelProperty(value = "受伤人数", hidden = false, example = "1", required = true)
+ @NotNull
+ private Integer injuriesNumber;
+
+ @ApiModelProperty(value = "是否紧急", hidden = false, example = "true", required = true)
+ @NotNull
+ private Boolean urgent;
+
+ @ApiModelProperty(value = "是否重大", hidden = false, example = "true", required = true)
+ @NotNull
+ private Boolean major;
+
+ @ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
+ private String audio;
+
+ @ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
+ private String video;
+
+ @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
+ example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
+ private String pics;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoDTO.java
new file mode 100644
index 0000000..5d24e5c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoDTO.java
@@ -0,0 +1,165 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("查询社区活动 》随手拍请求参数")
+public class PageComActEasyPhotoDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr="createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType="desc";
+
+ public String getSortColumns(){
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "自增id", hidden = false, example = "1")
+ private Long id;
+
+
+ @NotNull() @Max(9223372036854775807L)
+ @ApiModelProperty(value = "发起人id", hidden = false, example = "1")
+ private Long sponsorId;
+
+
+ @NotBlank() @Length(max=100)
+ @ApiModelProperty(value = "发生地址", hidden = false, example = "")
+ private String happenAddr;
+
+
+ @NotBlank() @Length(max=100)
+ @ApiModelProperty(value = "地址备注", hidden = false, example = "")
+ private String addrRemark;
+
+
+ @NotNull() @Max(127)
+ @ApiModelProperty(value = "状态 1待处理 2已处理", hidden = false, example = "1")
+ private Integer status;
+
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "处理人id", hidden = false, example = "1")
+ private Long handlerId;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "审核时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date examineAtBegin;
+ @ApiModelProperty(value = "审核时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date examineAtEnd;
+
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "详情", hidden = false, example = "")
+ private String detail;
+
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "图片路径列表，逗号分隔", hidden = false, example = "")
+ private String photoPathList;
+
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "处理结果", hidden = false, example = "")
+ private String handleResult;
+
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "")
+ private String handlePhotoList;
+
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "社区id", hidden = false, example = "1")
+ private Long communityId;
+
+
+ @Max(127)
+ @ApiModelProperty(value = "是否匿名发布 0 否 1 是", hidden = false, example = "1")
+ private Integer isHide;
+
+
+ @Max(127)
+ @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要", hidden = false, example = "1")
+ private Integer isNeedFeedBack;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "反馈时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date feedbackAtBegin;
+ @ApiModelProperty(value = "反馈时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date feedbackAtEnd;
+
+
+ @Length(max=500)
+ @ApiModelProperty(value = "驳回原因", hidden = false, example = "")
+ private String rejectReason;
+
+
+ @Length(max=65535)
+ @ApiModelProperty(value = "封面图片", hidden = false, example = "")
+ private String cover;
+
+
+ @Max(127)
+ @ApiModelProperty(value = "是否删除 0 否 1 是", hidden = false, example = "1")
+ private Integer delTag;
+
+
+ @Max(127)
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)", hidden = false, example = "1")
+ private Integer isReport;
+
+
+ @Max(127)
+ @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
+ private Integer isPublicity;
+
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoTypeDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoTypeDTO.java
new file mode 100644
index 0000000..b4325ed
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoTypeDTO.java
@@ -0,0 +1,69 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("查询随手拍类型请求参数")
+public class PageComActEasyPhotoTypeDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize = 10L;
+
+ @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt")
+ private String sortAttr="createAt";
+
+ @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc")
+ @Pattern(regexp = "asc|desc|ASC|DESC")
+ private String sortType="desc";
+
+ public String getSortColumns(){
+ String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
+ return dbColumn;
+ }
+
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "主键id", hidden = false, example = "1")
+ private Long id;
+
+
+ @Length(max=50)
+ @ApiModelProperty(value = "随手拍类型名称", hidden = false, example = "")
+ private String name;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
+ private Date createAtBegin;
+ @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAtEnd;
+
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoDetailsVO.java
new file mode 100644
index 0000000..e637735
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoDetailsVO.java
@@ -0,0 +1,88 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("社区活动 》随手拍详细返回参数")
+public class ComActEasyPhotoDetailsVO {
+
+ @ApiModelProperty(value = "自增id")
+ private Long id;
+
+ @ApiModelProperty(value = "发起人id")
+ private Long sponsorId;
+
+ @ApiModelProperty(value = "发生地址")
+ private String happenAddr;
+
+ @ApiModelProperty(value = "地址备注")
+ private String addrRemark;
+
+ @ApiModelProperty(value = "状态 1待处理 2已处理")
+ private Integer status;
+
+ @ApiModelProperty(value = "处理人id")
+ private Long handlerId;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date examineAt;
+
+ @ApiModelProperty(value = "详情")
+ private String detail;
+
+ @ApiModelProperty(value = "图片路径列表，逗号分隔")
+ private String photoPathList;
+
+ @ApiModelProperty(value = "处理结果")
+ private String handleResult;
+
+ @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔")
+ private String handlePhotoList;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "是否匿名发布 0 否 1 是")
+ private Integer isHide;
+
+ @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要")
+ private Integer isNeedFeedBack;
+
+ @ApiModelProperty(value = "反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date feedbackAt;
+
+ @ApiModelProperty(value = "驳回原因")
+ private String rejectReason;
+
+ @ApiModelProperty(value = "封面图片")
+ private String cover;
+
+ @ApiModelProperty(value = "是否删除 0 否 1 是")
+ private Integer delTag;
+
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
+ private Integer isReport;
+
+ @ApiModelProperty(value = "是否公示(0.否 1.是)")
+ private Integer isPublicity;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeDetailsVO.java
new file mode 100644
index 0000000..0e9fc2a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeDetailsVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("随手拍类型详细返回参数")
+public class ComActEasyPhotoTypeDetailsVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "随手拍类型名称")
+ private String name;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeVO.java
new file mode 100644
index 0000000..961b78b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoTypeVO.java
@@ -0,0 +1,32 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("随手拍类型返回参数")
+public class ComActEasyPhotoTypeVO {
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "随手拍类型名称")
+ private String name;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java
new file mode 100644
index 0000000..c7e902e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java
@@ -0,0 +1,88 @@
+package com.panzhihua.common.model.vos.grid;
+
+import java.util.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("社区活动 》随手拍返回参数")
+public class ComActEasyPhotoVO {
+
+ @ApiModelProperty(value = "自增id")
+ private Long id;
+
+ @ApiModelProperty(value = "发起人id")
+ private Long sponsorId;
+
+ @ApiModelProperty(value = "发生地址")
+ private String happenAddr;
+
+ @ApiModelProperty(value = "地址备注")
+ private String addrRemark;
+
+ @ApiModelProperty(value = "状态 1待处理 2已处理")
+ private Integer status;
+
+ @ApiModelProperty(value = "处理人id")
+ private Long handlerId;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "审核时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date examineAt;
+
+ @ApiModelProperty(value = "详情")
+ private String detail;
+
+ @ApiModelProperty(value = "图片路径列表，逗号分隔")
+ private String photoPathList;
+
+ @ApiModelProperty(value = "处理结果")
+ private String handleResult;
+
+ @ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔")
+ private String handlePhotoList;
+
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "是否匿名发布 0 否 1 是")
+ private Integer isHide;
+
+ @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要")
+ private Integer isNeedFeedBack;
+
+ @ApiModelProperty(value = "反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date feedbackAt;
+
+ @ApiModelProperty(value = "驳回原因")
+ private String rejectReason;
+
+ @ApiModelProperty(value = "封面图片")
+ private String cover;
+
+ @ApiModelProperty(value = "是否删除 0 否 1 是")
+ private Integer delTag;
+
+ @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)")
+ private Integer isReport;
+
+ @ApiModelProperty(value = "是否公示(0.否 1.是)")
+ private Integer isPublicity;
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
index b721eb2..0a8cf5f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@
enabled: true
service-id: config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:hostname}:8193/
profiles:
active: ${ENV:dev}
servlet:
@@ -18,5 +18,5 @@
eureka:
client:
service-url:
- defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
+ defaultZone: http://${EUREKA_URL:hostname}:8192/eureka
diff --git a/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml b/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml
index 93afcd5..fe81d64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
preferIpAddress: true
client:
serviceUrl:
- defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
+ defaultZone: http://${EUREKA_URL:hostname}:8192/eureka
spring:
application:
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
index f5c3342..d2e6ff5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@
enabled: true
service-id: config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:hostname}:8193/
profiles:
active: ${ENV:dev}
servlet:
@@ -19,7 +19,7 @@
eureka:
client:
service-url:
- defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
+ defaultZone: http://${EUREKA_URL:hostname}:8192/eureka
#实体加密、解密、字段脱敏拦截设置
domain:
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoMapper.java
new file mode 100644
index 0000000..5b85ee1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoMapper.java
@@ -0,0 +1,32 @@
+package com.panzhihua.service_grid.dao;
+
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoDTO;
+import com.panzhihua.service_grid.model.dos.ComActEasyPhotoDO;
+import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * DAO
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Mapper
+public interface ComActEasyPhotoMapper extends BaseMapper<ComActEasyPhotoDO> {
+
+ /**
+ * 分页查询
+ * @param pageComActEasyPhotoDTO
+ * @return
+ */
+ IPage<ComActEasyPhotoVO> findByPage(Page page, @Param("pageComActEasyPhotoDTO")PageComActEasyPhotoDTO pageComActEasyPhotoDTO);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoTypeMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoTypeMapper.java
new file mode 100644
index 0000000..eaa9898
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/ComActEasyPhotoTypeMapper.java
@@ -0,0 +1,32 @@
+package com.panzhihua.service_grid.dao;
+
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoTypeDTO;
+import com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeDO;
+import com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * DAO
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Mapper
+public interface ComActEasyPhotoTypeMapper extends BaseMapper<ComActEasyPhotoTypeDO> {
+
+ /**
+ * 分页查询
+ * @param pageComActEasyPhotoTypeDTO
+ * @return
+ */
+ IPage<ComActEasyPhotoTypeVO> findByPage(Page page, @Param("pageComActEasyPhotoTypeDTO")PageComActEasyPhotoTypeDTO pageComActEasyPhotoTypeDTO);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java
new file mode 100644
index 0000000..fd1993e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java
@@ -0,0 +1,113 @@
+package com.panzhihua.service_grid.model.dos;
+
+import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+
+/**
+ * 社区活动 》随手拍实体类
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@TableName("com_act_easy_photo")
+public class ComActEasyPhotoDO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 自增id 列: id
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ private Long id;
+ /**
+ * 发起人id 列: sponsor_id
+ */
+ private Long sponsorId;
+ /**
+ * 发生地址 列: happen_addr
+ */
+ private String happenAddr;
+ /**
+ * 地址备注 列: addr_remark
+ */
+ private String addrRemark;
+ /**
+ * 状态 1待处理 2已处理 列: status
+ */
+ private Integer status;
+ /**
+ * 处理人id 列: handler_id
+ */
+ private Long handlerId;
+ /**
+ * 创建时间 列: create_at
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Date createAt;
+ /**
+ * 审核时间 列: examine_at
+ */
+ private Date examineAt;
+ /**
+ * 详情 列: detail
+ */
+ private String detail;
+ /**
+ * 图片路径列表，逗号分隔 列: photo_path_list
+ */
+ private String photoPathList;
+ /**
+ * 处理结果 列: handle_result
+ */
+ private String handleResult;
+ /**
+ * 处理结果，图片路径列表，逗号分隔 列: handle_photo_list
+ */
+ private String handlePhotoList;
+ /**
+ * 社区id 列: community_id
+ */
+ private Long communityId;
+ /**
+ * 是否匿名发布 0 否 1 是 列: is_hide
+ */
+ private Integer isHide;
+ /**
+ * 是否需要反馈 0 不需要 1 需要 列: is_need_feed_back
+ */
+ private Integer isNeedFeedBack;
+ /**
+ * 反馈时间 列: feedback_at
+ */
+ private Date feedbackAt;
+ /**
+ * 驳回原因 列: reject_reason
+ */
+ private String rejectReason;
+ /**
+ * 封面图片 列: cover
+ */
+ private String cover;
+ /**
+ * 是否删除 0 否 1 是 列: del_tag
+ */
+ private Integer delTag;
+ /**
+ * 是否上报社区处理(0.否 1.是) 列: is_report
+ */
+ private Integer isReport;
+ /**
+ * 是否公示(0.否 1.是) 列: is_publicity
+ */
+ private Integer isPublicity;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoTypeDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoTypeDO.java
new file mode 100644
index 0000000..ad74825
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoTypeDO.java
@@ -0,0 +1,41 @@
+package com.panzhihua.service_grid.model.dos;
+
+import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+
+/**
+ * 随手拍类型实体类
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@TableName("com_act_easy_photo_type")
+public class ComActEasyPhotoTypeDO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id 列: id
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ private Long id;
+ /**
+ * 随手拍类型名称 列: name
+ */
+ private String name;
+ /**
+ * 创建时间 列: create_at
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Date createAt;
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoService.java
new file mode 100644
index 0000000..77fba44
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoService.java
@@ -0,0 +1,60 @@
+package com.panzhihua.service_grid.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoAddDTO;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoDeleteDTO;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoEditDTO;
+import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.grid.ComActEasyPhotoDetailsVO;
+import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
+import com.panzhihua.service_grid.model.dos.ComActEasyPhotoDO;
+
+/**
+ * 社区活动 》随手拍 service
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+public interface ComActEasyPhotoService extends IService<ComActEasyPhotoDO> {
+
+ /**
+ * 新增社区活动 》随手拍
+ * @param comActEasyPhotoAddDTO
+ * @return 新增结果
+ */
+ R add(ComActEasyPhotoAddDTO comActEasyPhotoAddDTO);
+
+ /**
+ * 修改社区活动 》随手拍
+ * @param comActEasyPhotoEditDTO
+ * @return 维护结果
+ */
+ R edit(ComActEasyPhotoEditDTO comActEasyPhotoEditDTO);
+
+ /**
+ * 分页查找社区活动 》随手拍
+ * @param pageComActEasyPhotoDTO
+ * @return 维护结果
+ */
+ R<IPage<ComActEasyPhotoVO>> query(PageComActEasyPhotoDTO pageComActEasyPhotoDTO);
+
+ /**
+ * 删除社区活动 》随手拍
+ * @param ComActEasyPhotoDeleteDTO
+ * @return 平台用户信息
+ */
+ R delete(ComActEasyPhotoDeleteDTO ComActEasyPhotoDeleteDTO);
+
+ /**
+ * 查询社区活动 》随手拍详细信息
+ * @param id 社区活动 》随手拍 id
+ * @return 查找结果
+ */
+ R<ComActEasyPhotoDetailsVO> comActEasyPhotoDetails(Long id);
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoTypeService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoTypeService.java
new file mode 100644
index 0000000..98bf2b7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/ComActEasyPhotoTypeService.java
@@ -0,0 +1,60 @@
+package com.panzhihua.service_grid.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoTypeAddDTO;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoTypeDeleteDTO;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoTypeEditDTO;
+import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoTypeDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeDetailsVO;
+import com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeVO;
+import com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeDO;
+
+/**
+ * 随手拍类型 service
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+public interface ComActEasyPhotoTypeService extends IService<ComActEasyPhotoTypeDO> {
+
+ /**
+ * 新增随手拍类型
+ * @param comActEasyPhotoTypeAddDTO
+ * @return 新增结果
+ */
+ R add(ComActEasyPhotoTypeAddDTO comActEasyPhotoTypeAddDTO);
+
+ /**
+ * 修改随手拍类型
+ * @param comActEasyPhotoTypeEditDTO
+ * @return 维护结果
+ */
+ R edit(ComActEasyPhotoTypeEditDTO comActEasyPhotoTypeEditDTO);
+
+ /**
+ * 分页查找随手拍类型
+ * @param pageComActEasyPhotoTypeDTO
+ * @return 维护结果
+ */
+ R<IPage<ComActEasyPhotoTypeVO>> query(PageComActEasyPhotoTypeDTO pageComActEasyPhotoTypeDTO);
+
+ /**
+ * 删除随手拍类型
+ * @param ComActEasyPhotoTypeDeleteDTO
+ * @return 平台用户信息
+ */
+ R delete(ComActEasyPhotoTypeDeleteDTO ComActEasyPhotoTypeDeleteDTO);
+
+ /**
+ * 查询随手拍类型详细信息
+ * @param id 随手拍类型 id
+ * @return 查找结果
+ */
+ R<ComActEasyPhotoTypeDetailsVO> comActEasyPhotoTypeDetails(Long id);
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java
new file mode 100644
index 0000000..f74aa70
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java
@@ -0,0 +1,104 @@
+package com.panzhihua.service_grid.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoAddDTO;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoDeleteDTO;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoEditDTO;
+import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.grid.ComActEasyPhotoDetailsVO;
+import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
+import com.panzhihua.service_grid.dao.*;
+import com.panzhihua.service_grid.model.dos.*;
+import com.panzhihua.service_grid.service.ComActEasyPhotoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.BeanUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:03:01
+ * @describe 订单表服务实现类
+ */
+@Slf4j
+@Service
+public class ComActEasyPhotoServiceImpl extends ServiceImpl<ComActEasyPhotoMapper, ComActEasyPhotoDO> implements ComActEasyPhotoService {
+
+ @Resource
+ private ComActEasyPhotoMapper comActEasyPhotoMapper;
+ /**
+ * 新增社区活动 》随手拍
+ * @param comActEasyPhotoAddDTO
+ * @return 新增结果
+ */
+ public R add(ComActEasyPhotoAddDTO comActEasyPhotoAddDTO){
+ ComActEasyPhotoDO comActEasyPhotoDO = new ComActEasyPhotoDO();
+ BeanUtils.copyProperties(comActEasyPhotoAddDTO, comActEasyPhotoDO);
+ comActEasyPhotoDO.setCreateAt(new Date());
+ if(comActEasyPhotoMapper.insert(comActEasyPhotoDO)>0){
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 修改社区活动 》随手拍
+ * @param comActEasyPhotoEditDTO
+ * @return 维护结果
+ */
+ public R edit(ComActEasyPhotoEditDTO comActEasyPhotoEditDTO){
+ ComActEasyPhotoDO comActEasyPhotoDO = new ComActEasyPhotoDO();
+ BeanUtils.copyProperties(comActEasyPhotoEditDTO, comActEasyPhotoDO);
+ //comActEasyPhotoDO.setUpdateAt(new Date());
+ if(comActEasyPhotoMapper.updateById(comActEasyPhotoDO)>0){
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 分页查找社区活动 》随手拍
+ * @param pageComActEasyPhotoDTO
+ * @return 维护结果
+ */
+ public R<IPage<ComActEasyPhotoVO>> query(PageComActEasyPhotoDTO pageComActEasyPhotoDTO){
+ Page page = new Page(1,10);
+ if(pageComActEasyPhotoDTO.getPageNum()!=null) {
+ page.setCurrent(pageComActEasyPhotoDTO.getPageNum());
+ }
+ if(pageComActEasyPhotoDTO.getPageSize()!=null) {
+ page.setSize(pageComActEasyPhotoDTO.getPageSize());
+ }
+ return R.ok(comActEasyPhotoMapper.findByPage(page, pageComActEasyPhotoDTO));
+ }
+
+ /**
+ * 删除社区活动 》随手拍
+ * @param ComActEasyPhotoDeleteDTO
+ * @return 平台用户信息
+ */
+ public R delete(ComActEasyPhotoDeleteDTO ComActEasyPhotoDeleteDTO){
+ return R.fail();
+ }
+
+ /**
+ * 查询社区活动 》随手拍详细信息
+ * @param id 社区活动 》随手拍 id
+ * @return 查找结果
+ */
+ public R<ComActEasyPhotoDetailsVO> comActEasyPhotoDetails(Long id){
+ ComActEasyPhotoDO comActEasyPhotoDO = comActEasyPhotoMapper.selectById(id);
+ if(comActEasyPhotoDO!=null) {
+ ComActEasyPhotoDetailsVO comActEasyPhotoDetailsVO = new ComActEasyPhotoDetailsVO();
+ BeanUtils.copyProperties(comActEasyPhotoDO, comActEasyPhotoDetailsVO);
+ return R.ok(comActEasyPhotoDetailsVO);
+ }
+ return R.fail();
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoTypeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoTypeServiceImpl.java
new file mode 100644
index 0000000..3bb6306
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoTypeServiceImpl.java
@@ -0,0 +1,104 @@
+package com.panzhihua.service_grid.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoTypeAddDTO;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoTypeDeleteDTO;
+import com.panzhihua.common.model.dtos.grid.ComActEasyPhotoTypeEditDTO;
+import com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoTypeDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeDetailsVO;
+import com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeVO;
+import com.panzhihua.service_grid.dao.*;
+import com.panzhihua.service_grid.model.dos.*;
+import com.panzhihua.service_grid.service.ComActEasyPhotoTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.BeanUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * @auther lyq
+ * @create 2021-04-14 15:03:01
+ * @describe 订单表服务实现类
+ */
+@Slf4j
+@Service
+public class ComActEasyPhotoTypeServiceImpl extends ServiceImpl<ComActEasyPhotoTypeMapper, ComActEasyPhotoTypeDO> implements ComActEasyPhotoTypeService {
+
+ @Resource
+ private ComActEasyPhotoTypeMapper comActEasyPhotoTypeMapper;
+ /**
+ * 新增随手拍类型
+ * @param comActEasyPhotoTypeAddDTO
+ * @return 新增结果
+ */
+ public R add(ComActEasyPhotoTypeAddDTO comActEasyPhotoTypeAddDTO){
+ ComActEasyPhotoTypeDO comActEasyPhotoTypeDO = new ComActEasyPhotoTypeDO();
+ BeanUtils.copyProperties(comActEasyPhotoTypeAddDTO, comActEasyPhotoTypeDO);
+ comActEasyPhotoTypeDO.setCreateAt(new Date());
+ if(comActEasyPhotoTypeMapper.insert(comActEasyPhotoTypeDO)>0){
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 修改随手拍类型
+ * @param comActEasyPhotoTypeEditDTO
+ * @return 维护结果
+ */
+ public R edit(ComActEasyPhotoTypeEditDTO comActEasyPhotoTypeEditDTO){
+ ComActEasyPhotoTypeDO comActEasyPhotoTypeDO = new ComActEasyPhotoTypeDO();
+ BeanUtils.copyProperties(comActEasyPhotoTypeEditDTO, comActEasyPhotoTypeDO);
+ //comActEasyPhotoTypeDO.setUpdateAt(new Date());
+ if(comActEasyPhotoTypeMapper.updateById(comActEasyPhotoTypeDO)>0){
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 分页查找随手拍类型
+ * @param pageComActEasyPhotoTypeDTO
+ * @return 维护结果
+ */
+ public R<IPage<ComActEasyPhotoTypeVO>> query(PageComActEasyPhotoTypeDTO pageComActEasyPhotoTypeDTO){
+ Page page = new Page(1,10);
+ if(pageComActEasyPhotoTypeDTO.getPageNum()!=null) {
+ page.setCurrent(pageComActEasyPhotoTypeDTO.getPageNum());
+ }
+ if(pageComActEasyPhotoTypeDTO.getPageSize()!=null) {
+ page.setSize(pageComActEasyPhotoTypeDTO.getPageSize());
+ }
+ return R.ok(comActEasyPhotoTypeMapper.findByPage(page, pageComActEasyPhotoTypeDTO));
+ }
+
+ /**
+ * 删除随手拍类型
+ * @param ComActEasyPhotoTypeDeleteDTO
+ * @return 平台用户信息
+ */
+ public R delete(ComActEasyPhotoTypeDeleteDTO ComActEasyPhotoTypeDeleteDTO){
+ return R.fail();
+ }
+
+ /**
+ * 查询随手拍类型详细信息
+ * @param id 随手拍类型 id
+ * @return 查找结果
+ */
+ public R<ComActEasyPhotoTypeDetailsVO> comActEasyPhotoTypeDetails(Long id){
+ ComActEasyPhotoTypeDO comActEasyPhotoTypeDO = comActEasyPhotoTypeMapper.selectById(id);
+ if(comActEasyPhotoTypeDO!=null) {
+ ComActEasyPhotoTypeDetailsVO comActEasyPhotoTypeDetailsVO = new ComActEasyPhotoTypeDetailsVO();
+ BeanUtils.copyProperties(comActEasyPhotoTypeDO, comActEasyPhotoTypeDetailsVO);
+ return R.ok(comActEasyPhotoTypeDetailsVO);
+ }
+ return R.fail();
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml
new file mode 100644
index 0000000..9295754
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml
@@ -0,0 +1,121 @@
+<?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="com.panzhihua.service_grid.dao.ComActEasyPhotoMapper">
+
+ <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.ComActEasyPhotoDO">
+ <result property="id" column="id"/>
+ <result property="sponsorId" column="sponsor_id"/>
+ <result property="happenAddr" column="happen_addr"/>
+ <result property="addrRemark" column="addr_remark"/>
+ <result property="status" column="status"/>
+ <result property="handlerId" column="handler_id"/>
+ <result property="createAt" column="create_at"/>
+ <result property="examineAt" column="examine_at"/>
+ <result property="detail" column="detail"/>
+ <result property="photoPathList" column="photo_path_list"/>
+ <result property="handleResult" column="handle_result"/>
+ <result property="handlePhotoList" column="handle_photo_list"/>
+ <result property="communityId" column="community_id"/>
+ <result property="isHide" column="is_hide"/>
+ <result property="isNeedFeedBack" column="is_need_feed_back"/>
+ <result property="feedbackAt" column="feedback_at"/>
+ <result property="rejectReason" column="reject_reason"/>
+ <result property="cover" column="cover"/>
+ <result property="delTag" column="del_tag"/>
+ <result property="isReport" column="is_report"/>
+ <result property="isPublicity" column="is_publicity"/>
+ </resultMap>
+
+ <sql id="columns">
+ <![CDATA[
+ id,sponsor_id,happen_addr,addr_remark,status,handler_id,create_at,examine_at,detail,photo_path_list,handle_result,handle_photo_list,community_id,is_hide,is_need_feed_back,feedback_at,reject_reason,cover,del_tag,is_report,is_publicity
+ ]]>
+ </sql>
+
+
+ <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO"
+ parameterType="com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoDTO">
+ SELECT <include refid="columns" />
+ FROM com_act_easy_photo
+ <where>
+ <if test="pageComActEasyPhotoDTO.id!=null">
+ AND id = #{pageComActEasyPhotoDTO.id}
+ </if>
+ <if test="pageComActEasyPhotoDTO.sponsorId!=null">
+ AND sponsor_id = #{pageComActEasyPhotoDTO.sponsorId}
+ </if>
+ <if test="pageComActEasyPhotoDTO.happenAddr!=null">
+ AND happen_addr = #{pageComActEasyPhotoDTO.happenAddr}
+ </if>
+ <if test="pageComActEasyPhotoDTO.addrRemark!=null">
+ AND addr_remark = #{pageComActEasyPhotoDTO.addrRemark}
+ </if>
+ <if test="pageComActEasyPhotoDTO.status!=null">
+ AND status = #{pageComActEasyPhotoDTO.status}
+ </if>
+ <if test="pageComActEasyPhotoDTO.handlerId!=null">
+ AND handler_id = #{pageComActEasyPhotoDTO.handlerId}
+ </if>
+ <if test="pageComActEasyPhotoDTO.createAtBegin!=null">
+ AND create_at >= #{pageComActEasyPhotoDTO.createAtBegin}
+ </if>
+ <if test="pageComActEasyPhotoDTO.createAtEnd!=null">
+ AND create_at <= #{pageComActEasyPhotoDTO.createAtEnd}
+ </if>
+ <if test="pageComActEasyPhotoDTO.examineAtBegin!=null">
+ AND examine_at >= #{pageComActEasyPhotoDTO.examineAtBegin}
+ </if>
+ <if test="pageComActEasyPhotoDTO.examineAtEnd!=null">
+ AND examine_at <= #{pageComActEasyPhotoDTO.examineAtEnd}
+ </if>
+ <if test="pageComActEasyPhotoDTO.detail!=null">
+ AND detail = #{pageComActEasyPhotoDTO.detail}
+ </if>
+ <if test="pageComActEasyPhotoDTO.photoPathList!=null">
+ AND photo_path_list = #{pageComActEasyPhotoDTO.photoPathList}
+ </if>
+ <if test="pageComActEasyPhotoDTO.handleResult!=null">
+ AND handle_result = #{pageComActEasyPhotoDTO.handleResult}
+ </if>
+ <if test="pageComActEasyPhotoDTO.handlePhotoList!=null">
+ AND handle_photo_list = #{pageComActEasyPhotoDTO.handlePhotoList}
+ </if>
+ <if test="pageComActEasyPhotoDTO.communityId!=null">
+ AND community_id = #{pageComActEasyPhotoDTO.communityId}
+ </if>
+ <if test="pageComActEasyPhotoDTO.isHide!=null">
+ AND is_hide = #{pageComActEasyPhotoDTO.isHide}
+ </if>
+ <if test="pageComActEasyPhotoDTO.isNeedFeedBack!=null">
+ AND is_need_feed_back = #{pageComActEasyPhotoDTO.isNeedFeedBack}
+ </if>
+ <if test="pageComActEasyPhotoDTO.feedbackAtBegin!=null">
+ AND feedback_at >= #{pageComActEasyPhotoDTO.feedbackAtBegin}
+ </if>
+ <if test="pageComActEasyPhotoDTO.feedbackAtEnd!=null">
+ AND feedback_at <= #{pageComActEasyPhotoDTO.feedbackAtEnd}
+ </if>
+ <if test="pageComActEasyPhotoDTO.rejectReason!=null">
+ AND reject_reason = #{pageComActEasyPhotoDTO.rejectReason}
+ </if>
+ <if test="pageComActEasyPhotoDTO.cover!=null">
+ AND cover = #{pageComActEasyPhotoDTO.cover}
+ </if>
+ <if test="pageComActEasyPhotoDTO.delTag!=null">
+ AND del_tag = #{pageComActEasyPhotoDTO.delTag}
+ </if>
+ <if test="pageComActEasyPhotoDTO.isReport!=null">
+ AND is_report = #{pageComActEasyPhotoDTO.isReport}
+ </if>
+ <if test="pageComActEasyPhotoDTO.isPublicity!=null">
+ AND is_publicity = #{pageComActEasyPhotoDTO.isPublicity}
+ </if>
+ </where>
+ <if test="pageComActEasyPhotoDTO.sortColumns!=null">
+ ORDER BY ${pageComActEasyPhotoDTO.sortColumns} ${pageComActEasyPhotoDTO.sortType}
+ </if>
+ </select>
+
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoTypeMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoTypeMapper.xml
new file mode 100644
index 0000000..6ee55ff
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoTypeMapper.xml
@@ -0,0 +1,43 @@
+<?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="com.panzhihua.service_grid.dao.ComActEasyPhotoTypeMapper">
+
+ <resultMap id="baseResult" type="com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeDO">
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="createAt" column="create_at"/>
+ </resultMap>
+
+ <sql id="columns">
+ <![CDATA[
+ id,name,create_at
+ ]]>
+ </sql>
+
+
+ <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.ComActEasyPhotoTypeVO"
+ parameterType="com.panzhihua.common.model.dtos.grid.PageComActEasyPhotoTypeDTO">
+ SELECT <include refid="columns" />
+ FROM com_act_easy_photo_type
+ <where>
+ <if test="pageComActEasyPhotoTypeDTO.id!=null">
+ AND id = #{pageComActEasyPhotoTypeDTO.id}
+ </if>
+ <if test="pageComActEasyPhotoTypeDTO.name!=null">
+ AND name = #{pageComActEasyPhotoTypeDTO.name}
+ </if>
+ <if test="pageComActEasyPhotoTypeDTO.createAtBegin!=null">
+ AND create_at >= #{pageComActEasyPhotoTypeDTO.createAtBegin}
+ </if>
+ <if test="pageComActEasyPhotoTypeDTO.createAtEnd!=null">
+ AND create_at <= #{pageComActEasyPhotoTypeDTO.createAtEnd}
+ </if>
+ </where>
+ <if test="pageComActEasyPhotoTypeDTO.sortColumns!=null">
+ ORDER BY ${pageComActEasyPhotoTypeDTO.sortColumns} ${pageComActEasyPhotoTypeDTO.sortType}
+ </if>
+ </select>
+
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
index 8820a34..6e48411 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
@@ -7,12 +7,12 @@
enabled: true
service-id: config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:hostname}:8193/
profiles:
active: ${ENV:dev}
eureka:
client:
service-url:
- defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
+ defaultZone: http://${EUREKA_URL:hostname}:8192/eureka
--
Gitblit v1.7.1