From 36bfd4b06f769b678197ad9462cca3b6e1a40455 Mon Sep 17 00:00:00 2001
From: hanyong <james04224718>
Date: Thu, 15 Sep 2022 10:10:57 +0800
Subject: [PATCH] =?UTF-8?q?EventTemplate=E6=8E=A7=E5=88=B6=E5=99=A8?=
 =?UTF-8?q?=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EventTemplateController.java   |   2 -
 pqs.iws                                       | 338 +++---------------
 2 files changed, 50 insertions(+), 290 deletions(-)

diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java
index 1cf8e4fbb..947acbef4 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java
@@ -7,9 +7,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
-import com.njcn.system.pojo.param.DictDataParam;
 import com.njcn.system.pojo.param.EventTemplateParam;
-import com.njcn.system.pojo.vo.DictDataVO;
 import com.njcn.system.pojo.vo.EventTemplateTree;
 import com.njcn.system.pojo.vo.EventTemplateVO;
 import com.njcn.system.service.IEventTemplateService;
diff --git a/pqs.iws b/pqs.iws
index ed59ccc0c..e51aa2588 100644
--- a/pqs.iws
+++ b/pqs.iws
@@ -1,28 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="2448d918-1a26-4571-be80-21a8dfa375ac" name="Default" comment="EventTemplate控制器编写">
-      <change beforePath="" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/enums/EventResponseEnum.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventDict.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateTree.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateVO.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java" />
-      <change beforePath="$PROJECT_DIR$/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/TerminalParam.java" afterPath="$PROJECT_DIR$/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/TerminalParam.java" />
-      <change beforePath="$PROJECT_DIR$/pqs-device/device-boot/src/main/java/com/njcn/device/controller/TerminalMaintainController.java" afterPath="$PROJECT_DIR$/pqs-device/device-boot/src/main/java/com/njcn/device/controller/TerminalMaintainController.java" />
-      <change beforePath="$PROJECT_DIR$/pqs-device/device-boot/src/main/java/com/njcn/device/service/TerminalMaintainService.java" afterPath="$PROJECT_DIR$/pqs-device/device-boot/src/main/java/com/njcn/device/service/TerminalMaintainService.java" />
-      <change beforePath="$PROJECT_DIR$/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/TerminalMaintainServiceImpl.java" afterPath="$PROJECT_DIR$/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/TerminalMaintainServiceImpl.java" />
-      <change beforePath="$PROJECT_DIR$/pqs.ipr" afterPath="$PROJECT_DIR$/pqs.ipr" />
-      <change beforePath="$PROJECT_DIR$/pqs.iws" afterPath="$PROJECT_DIR$/pqs.iws" />
-    </list>
     <list id="8dc99cd4-ae87-448e-8b91-038fd7ebf613" name="no commit" comment="no commit">
       <change beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
       <change beforePath="$PROJECT_DIR$/pqs-common/common-influxdb/src/test/java/DataTest.java" afterPath="$PROJECT_DIR$/pqs-common/common-influxdb/src/test/java/DataTest.java" />
     </list>
+    <list default="true" id="2448d918-1a26-4571-be80-21a8dfa375ac" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java" afterPath="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java" />
+      <change beforePath="$PROJECT_DIR$/pqs.iws" afterPath="$PROJECT_DIR$/pqs.iws" />
+    </list>
     <ignored path="$PROJECT_DIR$/pqs-harmonic/harmonic-api/target/" />
     <ignored path="$PROJECT_DIR$/pqs-system/system-api/target/" />
     <ignored path="$PROJECT_DIR$/pqs-job/job-api/target/" />
@@ -228,7 +214,7 @@
       <file leaf-file-name="DictDataController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1998">
+            <state relative-caret-position="918">
               <caret line="60" column="111" lean-forward="false" selection-start-line="60" selection-start-column="111" selection-end-line="60" selection-end-column="111" />
               <folding />
             </state>
@@ -238,7 +224,7 @@
       <file leaf-file-name="DictDataParam.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictDataParam.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1458">
+            <state relative-caret-position="1782">
               <caret line="73" column="62" lean-forward="false" selection-start-line="73" selection-start-column="62" selection-end-line="73" selection-end-column="62" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -250,7 +236,7 @@
       <file leaf-file-name="IEventTemplateService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="297">
+            <state relative-caret-position="567">
               <caret line="27" column="76" lean-forward="false" selection-start-line="27" selection-start-column="76" selection-end-line="27" selection-end-column="76" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -262,21 +248,19 @@
       <file leaf-file-name="DictDataMapper.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="513">
+            <state relative-caret-position="540">
               <caret line="28" column="94" lean-forward="false" selection-start-line="28" selection-start-column="94" selection-end-line="28" selection-end-column="94" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="EventTemplateController.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="EventTemplateController.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="747">
-              <caret line="68" column="21" lean-forward="false" selection-start-line="68" selection-start-column="21" selection-end-line="68" selection-end-column="21" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="216">
+              <caret line="8" column="37" lean-forward="false" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -284,7 +268,7 @@
       <file leaf-file-name="EventTemplateParam.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="486">
+            <state relative-caret-position="1431">
               <caret line="60" column="67" lean-forward="false" selection-start-line="60" selection-start-column="67" selection-end-line="60" selection-end-column="67" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -296,7 +280,7 @@
       <file leaf-file-name="EventTemplateServiceImpl.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="423">
+            <state relative-caret-position="297">
               <caret line="33" column="67" lean-forward="false" selection-start-line="33" selection-start-column="67" selection-end-line="33" selection-end-column="67" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -307,11 +291,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="EventTemplateMapper.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="EventTemplateMapper.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="432">
-              <caret line="22" column="129" lean-forward="true" selection-start-line="22" selection-start-column="129" selection-end-line="22" selection-end-column="129" />
+              <caret line="22" column="129" lean-forward="false" selection-start-line="22" selection-start-column="129" selection-end-line="22" selection-end-column="129" />
               <folding />
             </state>
           </provider>
@@ -366,12 +350,12 @@
         <option value="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EventDict.java" />
         <option value="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java" />
         <option value="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml" />
-        <option value="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java" />
         <option value="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java" />
         <option value="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java" />
         <option value="$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EventTemplateVO.java" />
         <option value="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java" />
         <option value="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java" />
+        <option value="$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java" />
       </list>
     </option>
   </component>
@@ -464,7 +448,10 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
+      <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -477,46 +464,6 @@
               <item name="pqs" type="462c0819:PsiDirectoryNode" />
               <item name="pqs-system" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="pqs" type="b2602c69:ProjectViewProjectNode" />
-              <item name="pqs" type="462c0819:PsiDirectoryNode" />
-              <item name="pqs-system" type="462c0819:PsiDirectoryNode" />
-              <item name="system-api" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="pqs" type="b2602c69:ProjectViewProjectNode" />
-              <item name="pqs" type="462c0819:PsiDirectoryNode" />
-              <item name="pqs-system" type="462c0819:PsiDirectoryNode" />
-              <item name="system-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="pqs" type="b2602c69:ProjectViewProjectNode" />
-              <item name="pqs" type="462c0819:PsiDirectoryNode" />
-              <item name="pqs-system" type="462c0819:PsiDirectoryNode" />
-              <item name="system-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="pqs" type="b2602c69:ProjectViewProjectNode" />
-              <item name="pqs" type="462c0819:PsiDirectoryNode" />
-              <item name="pqs-system" type="462c0819:PsiDirectoryNode" />
-              <item name="system-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="pqs" type="b2602c69:ProjectViewProjectNode" />
-              <item name="pqs" type="462c0819:PsiDirectoryNode" />
-              <item name="pqs-system" type="462c0819:PsiDirectoryNode" />
-              <item name="system-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="system" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="pqs" type="b2602c69:ProjectViewProjectNode" />
               <item name="pqs" type="462c0819:PsiDirectoryNode" />
@@ -568,36 +515,10 @@
               <item name="system" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="pqs" type="b2602c69:ProjectViewProjectNode" />
-              <item name="pqs" type="462c0819:PsiDirectoryNode" />
-              <item name="pqs-system" type="462c0819:PsiDirectoryNode" />
-              <item name="system-boot" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="system" type="462c0819:PsiDirectoryNode" />
-              <item name="mapper" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="pqs" type="b2602c69:ProjectViewProjectNode" />
-              <item name="pqs" type="462c0819:PsiDirectoryNode" />
-              <item name="pqs-system" type="462c0819:PsiDirectoryNode" />
-              <item name="system-boot" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="system" type="462c0819:PsiDirectoryNode" />
-              <item name="mapper" type="462c0819:PsiDirectoryNode" />
-              <item name="mapping" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="ProjectViewSettings">
@@ -618,7 +539,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
+    <property name="settings.editor.selected.configurable" value="MavenSettings" />
     <property name="RequestMappingsPanelWidth0" value="75" />
     <property name="RequestMappingsPanelOrder0" value="0" />
     <property name="RequestMappingsPanelWidth1" value="75" />
@@ -637,126 +558,6 @@
       <recent name="com.njcn.system.service" />
     </key>
   </component>
-  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
-    <UpdatedFiles>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Updated from server" />
-        <option name="myStatusName" value="Changed on server" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="CHANGED_ON_SERVER" />
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Updated" />
-          <option name="myStatusName" value="Changed" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="UPDATED" />
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/mapper/InfluxDBResultMapperCn.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/DeviceInfoParam.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/AreaLineInfoVO.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/pqs-device/device-boot/src/main/java/com/njcn/device/controller/TerminalTreeController.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDetailNew.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/UserRoleMapper.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/UserRoleMapper.xml</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/pqs-user/user-boot/src/main/java/com/njcn/user/service/IRoleService.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserRoleService.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ComponentServiceImpl.java</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserRoleServiceImpl.java</PATH>
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Created" />
-          <option name="myStatusName" value="Created" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="CREATED" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Deleted" />
-          <option name="myStatusName" value="Deleted" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="true" />
-          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Restored" />
-          <option name="myStatusName" value="Will be restored" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="RESTORED" />
-        </FILE-GROUP>
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Modified" />
-        <option name="myStatusName" value="Modified" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="MODIFIED" />
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Skipped" />
-        <option name="myStatusName" value="Skipped" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="SKIPPED" />
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Merged with conflicts" />
-        <option name="myStatusName" value="Will be merged with conflicts" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="MERGED_WITH_CONFLICTS" />
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Merged with tree conflicts" />
-        <option name="myStatusName" value="Merged with tree conflicts" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Merged with property conflicts" />
-        <option name="myStatusName" value="Will be merged with property conflicts" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Merged" />
-        <option name="myStatusName" value="Will be merged" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="MERGED" />
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Not in repository" />
-        <option name="myStatusName" value="Not in repository" />
-        <option name="mySupportsDeletion" value="true" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="UNKNOWN" />
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Locally added" />
-        <option name="myStatusName" value="Locally added" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="LOCALLY_ADDED" />
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Locally removed" />
-        <option name="myStatusName" value="Locally removed" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="LOCALLY_REMOVED" />
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Switched" />
-        <option name="myStatusName" value="Switched" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="SWITCHED" />
-      </FILE-GROUP>
-    </UpdatedFiles>
-  </component>
   <component name="RunDashboard">
     <option name="configurationTypes">
       <set>
@@ -993,12 +794,22 @@
       <workItem from="1662597751151" duration="15429000" />
       <workItem from="1662683773395" duration="4505000" />
       <workItem from="1662690905939" duration="9068000" />
-      <workItem from="1663029650131" duration="12755000" />
+      <workItem from="1663029650131" duration="12789000" />
+      <workItem from="1663117208099" duration="1186000" />
+      <workItem from="1663207780590" duration="47000" />
     </task>
+    <task id="LOCAL-00001" summary="EventTemplate控制器编写">
+      <created>1663058049505</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1663058049505</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="143281000" />
+    <option name="totallyTimeSpent" value="144548000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1025,14 +836,13 @@
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.37366548" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32979977" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32977462" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32979977" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Run Dashboard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32977462" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32977462" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32977462" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32977462" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32979977" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32979977" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2998927" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1045,6 +855,7 @@
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32977462" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1142,7 +953,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="756">
           <caret line="31" column="0" lean-forward="false" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="53" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1150,7 +960,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="29153">
           <caret line="1143" column="49" lean-forward="false" selection-start-line="1143" selection-start-column="49" selection-end-line="1143" selection-end-column="49" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1214,9 +1023,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="477">
           <caret line="56" column="61" lean-forward="false" selection-start-line="56" selection-start-column="61" selection-end-line="56" selection-end-column="61" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1231,7 +1037,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="324">
           <caret line="14" column="33" lean-forward="false" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1239,7 +1044,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="25" column="17" lean-forward="false" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1247,7 +1051,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-2592">
           <caret line="11" column="34" lean-forward="false" selection-start-line="11" selection-start-column="34" selection-end-line="11" selection-end-column="34" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1255,9 +1058,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="261">
           <caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1265,7 +1065,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="5724">
           <caret line="245" column="49" lean-forward="true" selection-start-line="245" selection-start-column="49" selection-end-line="245" selection-end-column="49" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1273,7 +1072,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="77" column="11" lean-forward="false" selection-start-line="77" selection-start-column="11" selection-end-line="77" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1281,7 +1079,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="189">
           <caret line="32" column="13" lean-forward="false" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1289,7 +1086,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="48" column="69" lean-forward="true" selection-start-line="48" selection-start-column="69" selection-end-line="48" selection-end-column="69" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1297,7 +1093,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="27">
           <caret line="15" column="17" lean-forward="false" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1313,7 +1108,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="999">
           <caret line="46" column="24" lean-forward="false" selection-start-line="46" selection-start-column="24" selection-end-line="46" selection-end-column="24" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1321,7 +1115,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1329,7 +1122,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="243">
           <caret line="18" column="31" lean-forward="true" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1337,7 +1129,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="324">
           <caret line="12" column="11" lean-forward="false" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1345,10 +1136,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="596">
           <caret line="605" column="26" lean-forward="false" selection-start-line="605" selection-start-column="26" selection-end-line="605" selection-end-column="26" />
-          <folding>
-            <element signature="e#13638#13639#0" expanded="false" />
-            <element signature="e#13681#13682#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1356,7 +1143,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="53" column="16" lean-forward="false" selection-start-line="53" selection-start-column="16" selection-end-line="53" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1364,7 +1150,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-135">
           <caret line="15" column="27" lean-forward="true" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1372,7 +1157,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="297">
           <caret line="16" column="38" lean-forward="true" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1380,7 +1164,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="621">
           <caret line="41" column="18" lean-forward="false" selection-start-line="41" selection-start-column="18" selection-end-line="41" selection-end-column="18" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1388,7 +1171,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="36" column="13" lean-forward="false" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1396,7 +1178,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="326">
           <caret line="19" column="4" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1422,7 +1203,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="513">
           <caret line="29" column="33" lean-forward="false" selection-start-line="29" selection-start-column="33" selection-end-line="29" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1430,13 +1210,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="243">
           <caret line="42" column="11" lean-forward="false" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEventTemplateService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
+        <state relative-caret-position="567">
           <caret line="27" column="76" lean-forward="false" selection-start-line="27" selection-start-column="76" selection-end-line="27" selection-end-column="76" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1446,7 +1225,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EventTemplateParam.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="486">
+        <state relative-caret-position="1431">
           <caret line="60" column="67" lean-forward="false" selection-start-line="60" selection-start-column="67" selection-end-line="60" selection-end-column="67" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1458,9 +1237,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="189">
           <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1468,15 +1244,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1998">
+        <state relative-caret-position="918">
           <caret line="60" column="111" lean-forward="false" selection-start-line="60" selection-start-column="111" selection-end-line="60" selection-end-column="111" />
           <folding />
         </state>
@@ -1484,7 +1257,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventTemplateServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="423">
+        <state relative-caret-position="297">
           <caret line="33" column="67" lean-forward="false" selection-start-line="33" selection-start-column="67" selection-end-line="33" selection-end-column="67" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1498,18 +1271,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-270">
           <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-          <folding>
-            <marker date="1660184526615" expanded="true" signature="283:518" ph="SELECT sys_d... sys_dict_data" />
-            <marker date="1660184526615" expanded="true" signature="629:859" ph="SELECT sys_d... sys_dict_data" />
-            <marker date="1660184526615" expanded="true" signature="964:1073" ph="SELECT sys_d... sys_dict_data" />
-            <marker date="1660184526615" expanded="true" signature="1165:1437" ph="SELECT T2.* sys_dict_type" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="513">
+        <state relative-caret-position="540">
           <caret line="28" column="94" lean-forward="false" selection-start-line="28" selection-start-column="94" selection-end-line="28" selection-end-column="94" />
           <folding />
         </state>
@@ -1517,7 +1284,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/DictDataParam.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1458">
+        <state relative-caret-position="1782">
           <caret line="73" column="62" lean-forward="false" selection-start-line="73" selection-start-column="62" selection-end-line="73" selection-end-column="62" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1525,30 +1292,25 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="747">
-          <caret line="68" column="21" lean-forward="false" selection-start-line="68" selection-start-column="21" selection-end-line="68" selection-end-column="21" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EventTemplateMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="189">
           <caret line="7" column="51" lean-forward="true" selection-start-line="7" selection-start-column="51" selection-end-line="7" selection-end-column="51" />
-          <folding>
-            <marker date="1663057555168" expanded="true" signature="309:412" ph="SELECT event... eventreport_dict" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="432">
-          <caret line="22" column="129" lean-forward="true" selection-start-line="22" selection-start-column="129" selection-end-line="22" selection-end-column="129" />
+          <caret line="22" column="129" lean-forward="false" selection-start-line="22" selection-start-column="129" selection-end-line="22" selection-end-column="129" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="216">
+          <caret line="8" column="37" lean-forward="false" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
           <folding />
         </state>
       </provider>